Cleaned up deps, added the dep viewer, updated js dependencies

.gitignore

@@ -39,3 +39,4 @@ dist-electron
 shared/build
 modules/*/lib
 .nx
+*-deps.svg

.yarnrc.yml

@@ -6,4 +6,4 @@ enableGlobalCache: true
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.3.0.cjs
+yarnPath: .yarn/releases/yarn-4.3.1.cjs

electron/AudioDatabase.ts

@@ -21,7 +21,7 @@ import { Sleep } from '@freik/sync';
 import { SafelyUnpickle, isArrayOfString } from '@freik/typechk';
 import { statSync } from 'fs';
 import path from 'path';
-import { SendToUI } from './Communication';
+import { SendToUI } from './SendToUI';
 
 const { log, wrn } = MakeLog('EMP:main:AudioDatabase');
 // log.enabled = true;

electron/Communication.ts → electron/CommsSetup.ts

@@ -57,7 +57,7 @@ import {
   RestoreWindow,
 } from './window';
 
-const { wrn, log } = MakeLog('EMP:main:Communication');
+const { wrn } = MakeLog('EMP:main:Communication');
 
 /**
  * Show a file in the shell
@@ -191,12 +191,3 @@ export function CommsSetup(): void {
     isIgnoreItemFn,
   );
 }
-
-// This is for one-way comms to the UI process
-export function SendToUI<T>(name: IpcId, data: T) {
-  const obj: { [key: string]: T } = {};
-  obj[name] = data;
-  log(`Sending ${name} with data:`);
-  log(data);
-  Comms.AsyncSend(obj);
-}

electron/RegisterProtocols.ts

@@ -0,0 +1,48 @@
+import { Comms, Persistence } from '@freik/electron-main';
+import { MakeLog } from '@freik/logger';
+import { protocol } from 'electron';
+import { UpdateAudioLocations } from './AudioDatabase';
+import { PictureHandler } from './cover-art';
+import { tuneNewProtocolHandler, tuneProtocolHandler } from './protocols';
+
+const { log } = MakeLog('EMP:main:RegisterProtocols');
+
+export function RegisterPrivileges(): void {
+  protocol.registerSchemesAsPrivileged([
+    {
+      scheme: 'tune',
+      privileges: {
+        // secure: true,
+        standard: true,
+        supportFetchAPI: true, // Add this if you want to use fetch with this protocol.
+        stream: true, // Add this if you intend to use the protocol for streaming i.e. in video/audio html tags.
+        // corsEnabled: true, // Add this if you need to enable cors for this protocol.
+        // bypassCSP: false
+      },
+    },
+  ]);
+}
+// This sets up all protocol handlers
+
+export function RegisterProtocols(): void {
+  // TODO: Enable both song & album pictures
+  // folder-level photos are fine, but for song requests, check the song
+  // then fall back to the album
+  log('Registering pic://key/ protocol');
+  protocol.handle('pic', PictureHandler);
+  log('Registering tune://song/ protocol');
+  protocol.handle('tune', tuneNewProtocolHandler);
+  Comms.registerOldProtocolHandler(
+    'trune://song/',
+
+    protocol.registerFileProtocol,
+    tuneProtocolHandler,
+  );
+  log('Finished protocol registration');
+}
+// This sets up reactive responses to changes, for example:
+// locations change, so music needs to be rescanned
+
+export function RegisterListeners(): void {
+  Persistence.subscribe('locations', UpdateAudioLocations);
+}

electron/SendToUI.ts

@@ -0,0 +1,15 @@
+import { Comms } from '@freik/electron-main';
+import { IpcId } from '@freik/emp-shared';
+import { MakeLog } from '@freik/logger';
+
+const { log } = MakeLog('EMP:main:SendToUI');
+
+// This is for one-way comms to the UI process
+
+export function SendToUI<T>(name: IpcId, data: T) {
+  const obj: { [key: string]: T } = {};
+  obj[name] = data;
+  log(`Sending ${name} with data:`);
+  log(data);
+  Comms.AsyncSend(obj);
+}

electron/Startup.ts

@@ -3,12 +3,12 @@ import { MakeLog } from '@freik/logger';
 import { isString } from '@freik/typechk';
 import { app } from 'electron';
 import { UpdateLocations } from './AudioDatabase';
-import { CommsSetup } from './Communication';
+import { CommsSetup } from './CommsSetup';
 import {
   RegisterListeners,
   RegisterPrivileges,
   RegisterProtocols,
-} from './protocols';
+} from './RegisterProtocols';
 
 const { wrn } = MakeLog('EMP:main:Startup');
 

electron/Transcoding.ts

@@ -23,7 +23,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { rimraf } from 'rimraf';
 import { GetAudioDB } from './AudioDatabase';
-import { SendToUI } from './Communication';
+import { SendToUI } from './SendToUI';
 import { LoadPlaylist } from './playlists';
 
 const { log, wrn } = MakeLog('EMP:main:Transcoding');

electron/electronSetup.ts

@@ -1,14 +1,13 @@
 import { MakeLog } from '@freik/logger';
 import { app } from 'electron';
 import { MakeMainMenu } from './menu';
+import { OnWindowCreated } from './types';
 import { CreateWindow, HasWindow } from './window';
 
 const { wrn } = MakeLog('EMP:main:electronSetup');
 
 app.commandLine.appendSwitch('disable-http-cache');
 
-export type OnWindowCreated = () => Promise<void>;
-
 /*
 
 function registerGlobalShortcuts() {

electron/menu.ts

@@ -11,7 +11,7 @@ import {
 } from 'electron';
 import { KeyboardEvent } from 'electron/main';
 import { ShowAbout } from './About.js';
-import { SendToUI } from './Communication.js';
+import { SendToUI } from './SendToUI.js';
 import { ToggleMiniPlayer } from './window.js';
 
 // const { wrn } = MakeLog('EMP:main:menu');

electron/protocols.ts

@@ -1,13 +1,11 @@
 import { SongWithPath } from '@freik/audiodb';
-import { Comms, Persistence } from '@freik/electron-main';
 import { MakeLog } from '@freik/logger';
 import { SongKey } from '@freik/media-core';
 import { asString, hasStrField } from '@freik/typechk';
-import { ProtocolRequest, ProtocolResponse, protocol } from 'electron';
+import { ProtocolRequest, ProtocolResponse } from 'electron';
 import fs from 'fs';
 import path from 'path';
-import { GetAudioDB, UpdateAudioLocations } from './AudioDatabase';
-import { PictureHandler } from './cover-art';
+import { GetAudioDB } from './AudioDatabase';
 
 const fsp = fs.promises;
 
@@ -118,7 +116,7 @@ async function getRealFile(
   return { extension, thePath };
 }
 
-async function tuneProtocolHandler(
+export async function tuneProtocolHandler(
   _: ProtocolRequest,
   trimmedUrl: string,
 ): Promise<FileResponse> {
@@ -137,7 +135,7 @@ async function tuneProtocolHandler(
   }
 }
 
-async function tuneNewProtocolHandler(req: Request): Promise<Response> {
+export async function tuneNewProtocolHandler(req: Request): Promise<Response> {
   const { pathname } = new URL(req.url);
   const key: SongKey = pathname.substring(1);
   log(`SongKey: ${key}`);
@@ -176,43 +174,3 @@ async function tuneNewProtocolHandler(req: Request): Promise<Response> {
   log('Song not found');
   return e404;
 }
-
-export function RegisterPrivileges(): void {
-  protocol.registerSchemesAsPrivileged([
-    {
-      scheme: 'tune',
-      privileges: {
-        // secure: true,
-        standard: true,
-        supportFetchAPI: true, // Add this if you want to use fetch with this protocol.
-        stream: true, // Add this if you intend to use the protocol for streaming i.e. in video/audio html tags.
-        // corsEnabled: true, // Add this if you need to enable cors for this protocol.
-        // bypassCSP: false
-      },
-    },
-  ]);
-}
-
-// This sets up all protocol handlers
-export function RegisterProtocols(): void {
-  // TODO: Enable both song & album pictures
-  // folder-level photos are fine, but for song requests, check the song
-  // then fall back to the album
-  log('Registering pic://key/ protocol');
-  protocol.handle('pic', PictureHandler);
-  log('Registering tune://song/ protocol');
-  protocol.handle('tune', tuneNewProtocolHandler);
-  Comms.registerOldProtocolHandler(
-    'trune://song/',
-
-    protocol.registerFileProtocol,
-    tuneProtocolHandler,
-  );
-  log('Finished protocol registration');
-}
-
-// This sets up reactive responses to changes, for example:
-// locations change, so music needs to be rescanned
-export function RegisterListeners(): void {
-  Persistence.subscribe('locations', UpdateAudioLocations);
-}

electron/types.ts

@@ -0,0 +1 @@
+export type OnWindowCreated = () => Promise<void>;

electron/window.ts

@@ -13,7 +13,7 @@ import {
 } from 'electron';
 import * as path from 'path';
 import process from 'process';
-import { OnWindowCreated } from './electronSetup';
+import { OnWindowCreated } from './types';
 
 const { wrn } = MakeLog('EMP:main:window');
 

modules/audiofileindex/package.json

@@ -44,18 +44,18 @@
     "@types/jest": "^29.5.12",
     "@types/rmfr": "^2.0.5",
     "@types/xxhashjs": "^0.2.4",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
     "eslint": "^9.5.0",
     "eslint-config-prettier": "^9.1.0",
     "jest": "^29.7.0",
     "prettier": "^3.3.2",
     "rimraf": "^5.0.7",
     "rmfr": "^2.0.0",
     "ts-jest": "^29.1.5",
-    "typedoc": "^0.25.13",
-    "typedoc-plugin-markdown": "^4.0.3",
-    "typescript": "^5.4.5"
+    "typedoc": "^0.26.2",
+    "typedoc-plugin-markdown": "^4.1.0",
+    "typescript": "^5.5.2"
   },
   "files": [
     "lib/**/*"

modules/emain/package.json

@@ -40,9 +40,9 @@
     "@freik/node-utils": "^1.6.3",
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
-    "electron": "^31.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
+    "electron": "^31.0.2",
     "eslint": "^9.5.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
@@ -51,9 +51,9 @@
     "prettier": "^3.3.2",
     "rimraf": "^5.0.7",
     "ts-jest": "^29.1.5",
-    "typedoc": "^0.25.13",
-    "typedoc-plugin-markdown": "^4.0.3",
-    "typescript": "^5.4.5"
+    "typedoc": "^0.26.2",
+    "typedoc-plugin-markdown": "^4.1.0",
+    "typescript": "^5.5.2"
   },
   "files": [
     "lib/**/*"

modules/epreload/package.json

@@ -36,9 +36,9 @@
     "@freik/electron-render": "^0.1.0",
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
-    "electron": "^31.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
+    "electron": "^31.0.2",
     "eslint": "^9.5.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
@@ -47,7 +47,7 @@
     "prettier": "^3.3.2",
     "rimraf": "^5.0.7",
     "ts-jest": "^29.1.5",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "files": ["lib/**/*"],
   "dependencies": {

modules/erenderer/package.json

@@ -36,7 +36,7 @@
     "@freik/seqnum": "^1.1.10",
     "@freik/typechk": "^0.5.11",
     "@freik/web-utils": "^0.5.2",
-    "electron": "^31.0.1"
+    "electron": "^31.0.2"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -50,15 +50,15 @@
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@types/react-test-renderer": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
-    "electron": "^31.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
+    "electron": "^31.0.2",
     "eslint": "^9.5.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-jsx-a11y": "^6.9.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.34.2",
+    "eslint-plugin-react": "^7.34.3",
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -70,9 +70,9 @@
     "recoil": "^0.7.7",
     "rimraf": "^5.0.7",
     "ts-jest": "^29.1.5",
-    "typedoc": "^0.25.13",
-    "typedoc-plugin-markdown": "^4.0.3",
-    "typescript": "^5.4.5"
+    "typedoc": "^0.26.2",
+    "typedoc-plugin-markdown": "^4.1.0",
+    "typescript": "^5.5.2"
   },
   "files": ["lib/**/*"],
   "engines": {

modules/shared/package.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "rimraf": "^5.0.7",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "files": [
     "./lib/**/*"