last.fm - add option to download more users (#4)

by request body param

Author: landsman

README.md

@@ -35,7 +35,7 @@ supabase start
 **run server to allow you to invoke Edge Functions locally**
 
 ```bash
-supabase function serve --no-verify-jwt
+supabase functions serve --no-verify-jwt
 ```
 
 **deploy modified function**

supabase/functions/.env.example

@@ -1,3 +1,4 @@
+DEVELOPER_MODE=true
 SENTRY_DSN=xxx
 LASTFM_API_KEY=xxx
 LASTFM_USERNAME=Insuit

supabase/functions/_shared/supabase-table.ts

@@ -0,0 +1,21 @@
+import { SupabaseClient } from "https://esm.sh/@supabase/supabase-js@2";
+
+interface SupabaseTableInterface {
+  readonly supabase: SupabaseClient | undefined;
+  getSupabase(): SupabaseClient | undefined;
+}
+
+export class DbSupabaseTable implements SupabaseTableInterface {
+  readonly supabase: SupabaseClient | undefined;
+
+  constructor(supabase: SupabaseClient) {
+    this.supabase = supabase;
+  }
+
+  getSupabase(): SupabaseClient {
+    if (!this.supabase) {
+      throw new Error("supabase is not initialized");
+    }
+    return this.supabase;
+  }
+}

supabase/functions/fetch-scrobbles/_index.http

@@ -1,3 +1,7 @@
-# test request without JWT
-GET http://localhost:54321/functions/v1/fetch-scrobbles
-Accept: application/json
+### test request without JWT
+POST http://localhost:54321/functions/v1/fetch-scrobbles
+Content-Type: application/json
+
+{
+  "lastFmUser": "Insuit"
+}

supabase/functions/fetch-scrobbles/db.hooman.ts

@@ -0,0 +1,49 @@
+import { DbSupabaseTable } from "../_shared/supabase-table.ts";
+
+export interface Row {
+  created_at: string;
+  lastfm_user: string;
+}
+
+const columnName: Row = {
+  created_at: "created_at",
+  lastfm_user: "lastfm_user",
+};
+
+export class TableHooman extends DbSupabaseTable {
+  tableName = "hooman";
+
+  async findOrCreateByLastFmUser(lastFmUser: string): Promise<string> {
+    const { data, error } = await this.getSupabase()
+      .from(this.tableName)
+      .select("id")
+      .eq(columnName.lastfm_user, lastFmUser)
+      .limit(1)
+      .maybeSingle<{ id: string } | null>();
+
+    if (error) {
+      throw new Error("Error fetching hooman: " + JSON.stringify(error));
+    }
+
+    if (data) {
+      return data.id;
+    }
+
+    console.log(`Creating new user: ${lastFmUser}`);
+
+    const { data: insertData, error: insertError } = await this.getSupabase()
+      .from(this.tableName)
+      .insert({
+        [columnName.created_at]: new Date(),
+        [columnName.lastfm_user]: lastFmUser,
+      })
+      .select("id")
+      .maybeSingle<{ id: string }>();
+
+    if (insertError || !insertData) {
+      throw new Error("Error creating hooman: " + JSON.stringify(insertError));
+    }
+
+    return insertData.id;
+  }
+}

supabase/functions/fetch-scrobbles/table.ts renamed to supabase/functions/fetch-scrobbles/db.listened.ts

@@ -1,43 +1,35 @@
-import { SupabaseClient } from "https://esm.sh/@supabase/supabase-js@2";
+import { DbSupabaseTable } from "../_shared/supabase-table.ts";
 
-const tableName = "listened";
-
-export interface Row {
+export interface ListenedRow {
   created_at: string;
   listened_at: string;
   artist_name: string;
   track_name: string;
   album_name: string | null;
   lastfm_data: string | object;
+  hooman_id: string | null;
 }
 
-const columnName: Row = {
+const columnName: ListenedRow = {
   created_at: "created_at",
   listened_at: "listened_at",
   artist_name: "artist_name",
   track_name: "track_name",
   album_name: "album_name",
   lastfm_data: "lastfm_data",
+  hooman_id: "hooman_id",
 };
 
-export class TableListened {
-  private readonly supabase: SupabaseClient | undefined;
-
-  constructor(supabase: SupabaseClient) {
-    this.supabase = supabase;
-  }
+export class TableListened extends DbSupabaseTable {
+  tableName = "listened";
 
   /**
    * Get the latest timestamp from the scrobbles table.
    * @returns The latest timestamp in Unix seconds or null.
    */
   async getLastListenedDate(): Promise<number | null> {
-    if (!this.supabase) {
-      throw new Error("supabase is not initialized");
-    }
-
-    const { data, error } = await this.supabase
-      .from(tableName)
+    const { data, error } = await this.getSupabase()
+      .from(this.tableName)
       .select(columnName.listened_at)
       .order(columnName.listened_at, { ascending: false })
       .limit(1)
@@ -58,17 +50,17 @@ export class TableListened {
    * @param tracks - Array of new scrobbles to save.
    * @returns An object containing a message or error.
    */
-  async save(tracks: Row[]): Promise<{ message?: string; error?: unknown }> {
+  async save(
+    tracks: ListenedRow[],
+  ): Promise<{ message?: string; error?: unknown }> {
     if (tracks.length === 0) {
       console.log("No new scrobbles to save.");
       return { message: "No new scrobbles" };
     }
 
-    if (!this.supabase) {
-      throw new Error("supabase is not initialized");
-    }
-
-    const { error } = await this.supabase.from(tableName).insert(tracks);
+    const { error } = await this.getSupabase()
+      .from(this.tableName)
+      .insert(tracks);
 
     if (error) {
       console.error("Error inserting data:", error);

supabase/functions/fetch-scrobbles/index.ts

@@ -2,29 +2,43 @@ import * as Sentry from "https://deno.land/x/sentry/index.mjs";
 import { scrobbles } from "./scrobbles.ts";
 import { env } from "./env.ts";
 
-Sentry.init({
-  dsn: Deno.env.get("SENTRY_DSN")!,
-  defaultIntegrations: false,
-  tracesSampleRate: 1.0,
-  // deno-lint-ignore ban-ts-comment
-  // @ts-ignore
-  profilesSampleRate: 1.0,
-});
+const isProduction = Deno.env.get("DEVELOPER_MODE") !== "true";
+
+if (isProduction) {
+  Sentry.init({
+    dsn: Deno.env.get("SENTRY_DSN")!,
+    defaultIntegrations: false,
+    tracesSampleRate: 1.0,
+    // deno-lint-ignore ban-ts-comment
+    // @ts-ignore
+    profilesSampleRate: 1.0,
+  });
 
-// Set region and execution_id as custom tags
-Sentry.setTag("region", Deno.env.get("SB_REGION"));
-Sentry.setTag("execution_id", Deno.env.get("SB_EXECUTION_ID"));
-Sentry.setTag("url", env.SUPABASE_URL);
+  // Set region and execution_id as custom tags
+  Sentry.setTag("region", Deno.env.get("SB_REGION"));
+  Sentry.setTag("execution_id", Deno.env.get("SB_EXECUTION_ID"));
+  Sentry.setTag("url", env.SUPABASE_URL);
+}
 
-Deno.serve(async () => {
+Deno.serve(async (req) => {
   try {
-    const result = await scrobbles(env);
+    const body = await req.json();
+
+    const lastFmUser = typeof body.lastFmUser === "string"
+      ? body.lastFmUser
+      : null;
+
+    const result = await scrobbles(env, lastFmUser);
+
     return new Response(result, {
       status: 200,
       headers: { "Content-Type": "text/plain" },
     });
   } catch (e) {
-    Sentry.captureException(e);
+    if (isProduction) {
+      Sentry.captureException(e);
+    }
+    console.error(e);
     return new Response("error occured, please check sentry/supabase logs", {
       status: 500,
       headers: { "Content-Type": "text/plain" },

supabase/functions/fetch-scrobbles/scrobbles.ts

@@ -1,13 +1,22 @@
 import { createClient } from "https://esm.sh/@supabase/supabase-js@2";
 import { getRecentTracks } from "./lastfm.ts";
-import { Row, TableListened } from "./table.ts";
 import { Variables } from "./env.ts";
+import { TableHooman } from "./db.hooman.ts";
+import { ListenedRow, TableListened } from "./db.listened.ts";
 
-export async function scrobbles(env: Variables): Promise<string> {
+/**
+ * Sync data from Last.fm to Supabase Database.
+ */
+export async function scrobbles(
+  env: Variables,
+  lastFmUser: string | null = null,
+): Promise<string> {
   const size = 50;
   const supabaseClient = createClient(env.SUPABASE_URL, env.SUPABASE_ANON_KEY);
-  const table = new TableListened(supabaseClient);
-  const startFrom: number | null = await table.getLastListenedDate();
+  const listened = new TableListened(supabaseClient);
+  const hooman = new TableHooman(supabaseClient);
+  const startFrom: number | null = await listened.getLastListenedDate();
+
   let totalPages = 1;
   let total = 0;
   let page = 1;
@@ -21,9 +30,14 @@ export async function scrobbles(env: Variables): Promise<string> {
     console.log("Database is empty, starting from the last page");
   }
 
+  const lastFmUserToUse = lastFmUser ? lastFmUser : env.LASTFM_USERNAME;
+  console.log(`Last.fm user: ${lastFmUserToUse}`);
+
+  const hoomanId = await hooman.findOrCreateByLastFmUser(lastFmUserToUse);
+
   const fmInitial = await getRecentTracks(
     env.LASTFM_API_KEY,
-    env.LASTFM_USERNAME,
+    lastFmUserToUse,
     1,
     size,
     startFrom,
@@ -37,8 +51,8 @@ export async function scrobbles(env: Variables): Promise<string> {
   page = totalPages;
 
   if (total === 0) {
-    console.log('Nothing new to save.');
-    return 'ok';
+    console.log("Nothing new to save.");
+    return "ok";
   }
 
   if (startFrom) {
@@ -64,7 +78,7 @@ export async function scrobbles(env: Variables): Promise<string> {
 
     const fm = await getRecentTracks(
       env.LASTFM_API_KEY,
-      env.LASTFM_USERNAME,
+      lastFmUserToUse,
       page,
       size,
       startFrom,
@@ -82,7 +96,7 @@ export async function scrobbles(env: Variables): Promise<string> {
 
     console.log(`Fetching page ${page}/${totalPages}`);
 
-    const toInsert: Row[] = tracks
+    const toInsert: ListenedRow[] = tracks
       .filter((track) => !(track["@attr"] && track["@attr"].nowplaying))
       .map((track) => ({
         created_at: new Date().toISOString(),
@@ -91,9 +105,10 @@ export async function scrobbles(env: Variables): Promise<string> {
         track_name: track.name,
         album_name: track.album["#text"],
         lastfm_data: track,
+        hooman_id: hoomanId,
       }));
 
-    const { error, message } = await table.save(toInsert);
+    const { error, message } = await listened.save(toInsert);
     if (error) {
       throw new Error(error.toString());
     }

supabase/migrations/20250202081123_listened_with_user.sql

@@ -0,0 +1,8 @@
+CREATE TABLE hooman
+(
+    id          UUID DEFAULT gen_random_uuid() PRIMARY KEY,
+    created_at  TIMESTAMPTZ NOT NULL,
+    lastfm_user TEXT        NOT NULL
+);
+
+ALTER TABLE listened ADD COLUMN hooman_id UUID DEFAULT NULL;