SATORIII

Author: NellowTCS

Build/package-lock.json

@@ -34,7 +34,7 @@
     "@fontsource/inter": "^5.2.8",
     "@fontsource/jetbrains-mono": "^5.2.8",
     "@fontsource/poppins": "^5.2.7",
-    "@nisoku/satori-log": "^0.1.2",
+    "@nisoku/satori": "^0.1.3",
     "@radix-ui/react-collapsible": "^1.1.12",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",

Build/package.json

@@ -0,0 +1,39 @@
+export const PIP_WINDOW_WIDTH = 400;
+export const PIP_WINDOW_HEIGHT = 70;
+export const PIP_STYLE_DELAY_MS = 300;
+
+export const PIP_THEME_VARIABLES = [
+  "--themecolor",
+  "--themecolor2",
+  "--themecolor3",
+  "--themecolor4",
+  "--themegradient",
+  "--themecolor-transparent",
+  "--themecolor2-transparent",
+  "--themecolor3-transparent",
+  "--foreground",
+  "--foreground-strong",
+  "--foreground-stronger",
+  "--foreground-muted",
+  "--foreground-subtle",
+  "--background",
+  "--surface",
+  "--surface-foreground",
+  "--surface-transparent-05",
+  "--surface-transparent-1",
+  "--surface-transparent-2",
+  "--primary",
+  "--primary-foreground",
+  "--primary-transparent",
+  "--primary-border",
+  "--primary-border-strong",
+  "--secondary",
+  "--secondary-foreground",
+  "--menu-background",
+  "--spacing-1",
+  "--spacing-2",
+  "--spacing-3",
+  "--spacing-4",
+  "--radius",
+  "--radius-lg",
+] as const;

Build/src/constants/pip.ts

@@ -1,4 +1,5 @@
 import { toast } from "sonner";
+import { logger } from "./logger";
 import {
   createMetadataExtractor,
   createFloMetadataExtractor,
@@ -32,7 +33,11 @@ async function extractAudioMetadata(
     try {
       albumArt = await compressAlbumArt(albumArt);
     } catch (e) {
-      console.warn("Failed to compress album art:", e);
+      if (e instanceof Error) {
+        logger.warn("Failed to compress album art:", { error: e.message });
+      } else {
+        logger.warn("Failed to compress album art");
+      }
     }
   }
 
@@ -104,7 +109,7 @@ export async function importAudioFiles(
                 { type: "audio/wav" },
               );
               processedMimeType = "audio/wav";
-              console.log(`Pre-decoded flo to WAV for Safari: ${file.name}`);
+              logger.info(`Pre-decoded flo to WAV for Safari: ${file.name}`);
             } else {
               // Non-Safari: Pre-decode to PCM for Web Audio API
               const { decodeFloToAudioBuffer } =
@@ -148,13 +153,14 @@ export async function importAudioFiles(
               // Close the temporary AudioContext
               await audioContext.close();
 
-              console.log(`Pre-decoded flo to PCM: ${file.name}`);
+              logger.info(`Pre-decoded flo to PCM: ${file.name}`);
             }
           } catch (error) {
-            console.warn(
-              "Failed to pre-decode flo file, storing original:",
-              error,
-            );
+            if (error instanceof Error) {
+              logger.warn("Failed to pre-decode flo file, storing original:", { error: error.message });
+            } else {
+              logger.warn("Failed to pre-decode flo file, storing original");
+            }
             // Keep original file if pre-decoding fails
             processedMimeType = "audio/x-flo";
           }
@@ -192,7 +198,11 @@ export async function importAudioFiles(
 
         successCount++;
       } catch (error) {
-        console.error("Failed to process song:", error);
+        if (error instanceof Error) {
+          logger.error("Failed to process song:", { error: error.message });
+        } else {
+          logger.error("Failed to process song");
+        }
         errorCount++;
       }
     }

Build/src/helpers/importAudioFiles.tsx

@@ -0,0 +1,47 @@
+import { createSatori, type SatoriInstance } from "@nisoku/satori";
+
+export const satori: SatoriInstance = createSatori({
+  logLevel: "debug",
+  rateLimiting: {
+    enabled: true,
+    maxEventsPerSecond: 100,
+  },
+});
+
+export const logger = {
+  debug: (message: string, data?: Record<string, unknown>) => {
+    satori.rootLogger.debug(message, data ? { state: data } : undefined);
+  },
+  info: (message: string, data?: Record<string, unknown>) => {
+    satori.rootLogger.info(message, data ? { state: data } : undefined);
+  },
+  warn: (message: string, data?: Record<string, unknown>) => {
+    satori.rootLogger.warn(message, data ? { state: data } : undefined);
+  },
+  error: (message: string, data?: Record<string, unknown>) => {
+    satori.rootLogger.error(message, data ? { state: data } : undefined);
+  },
+};
+
+export const createLogger = (scope: string) => {
+  const scoped = satori.createLogger(scope);
+  return {
+    debug: (message: string, data?: Record<string, unknown>) => {
+      scoped.debug(message, data ? { state: data } : undefined);
+    },
+    info: (message: string, data?: Record<string, unknown>) => {
+      scoped.info(message, data ? { state: data } : undefined);
+    },
+    warn: (message: string, data?: Record<string, unknown>) => {
+      scoped.warn(message, data ? { state: data } : undefined);
+    },
+    error: (message: string, data?: Record<string, unknown>) => {
+      scoped.error(message, data ? { state: data } : undefined);
+    },
+  };
+};
+
+export const throwError = (message: string, data?: Record<string, unknown>): never => {
+  satori.rootLogger.error(message, { state: { ...data, fatal: true } });
+  throw new Error(message);
+};

Build/src/helpers/logger.ts

@@ -5,6 +5,9 @@ import {
   type FileHandlerResult,
 } from "../platform/storage/fileHandler";
 import type { Track } from "../core/engine/types";
+import { createLogger } from "../helpers/logger";
+
+const logger = createLogger("useFileHandler");
 
 export function useFileHandler(
   addSong: (song: Track) => Promise<void>,
@@ -65,7 +68,7 @@ export function useFileHandler(
           );
         })
         .catch((error) => {
-          console.error("Failed to process queued files:", error);
+          logger.error("Failed to process queued files:", { error: String(error) });
           toast.error(
             t("filePicker.failedImport", { count: filesToProcess.length }),
           );

Build/src/hooks/useFileHandler.ts

@@ -5,6 +5,9 @@ import {
   type ShortcutConfig,
 } from "../platform/storage/shortcuts";
 import type { UseKomorebiReturn } from "./useKomorebi";
+import { createLogger } from "../helpers/logger";
+
+const logger = createLogger("keyboardShortcuts");
 
 interface UseKeyboardShortcutsProps {
   komorebi: UseKomorebiReturn;
@@ -30,7 +33,7 @@ export const useKeyboardShortcuts = ({
   });
 
   useEffect(() => {
-    shortcutsDb.getAllShortcuts().then(setShortcuts).catch(console.error);
+    shortcutsDb.getAllShortcuts().then(setShortcuts).catch((e) => logger.error("Failed to load shortcuts", { error: String(e) }));
   }, []);
 
   useEffect(() => {

Build/src/hooks/useKeyboardShortcuts.ts

@@ -11,6 +11,9 @@ import { HTMLAudioBackend } from "../platform/audio/backends/HTMLBackend";
 import { LibraryManager } from "../platform/library/library";
 import { libraryPersistence } from "../platform/library/persistence";
 import { SettingsManager } from "../platform/settings/settings";
+import { createLogger } from "../helpers/logger";
+
+const logger = createLogger("useKomorebi");
 
 export interface UseKomorebiOptions {
   autoPlay?: boolean;
@@ -191,7 +194,7 @@ export function useKomorebi(
           });
         }
       } catch (err) {
-        console.error("Failed to load library:", err);
+        logger.error("Failed to load library:", { error: String(err) });
       }
     };
 

Build/src/hooks/useKomorebi.ts

@@ -10,6 +10,7 @@
   },
   "common": {
     "cancel": "Cancel",
+    "confirm": "Confirm",
     "close": "Close",
     "create": "Create",
     "delete": "Delete",

Build/src/locales/en/translation.json

@@ -10,6 +10,7 @@
   },
   "common": {
     "cancel": "Annuler",
+    "confirm": "Confirmer",
     "close": "Fermer",
     "create": "Créer",
     "delete": "Supprimer",