kevinfrei · kevinfrei · Aug 29, 2023 · Aug 11, 2023 · Aug 12, 2023 · Aug 12, 2023
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -2,4 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"
 . "$(dirname "$0")/common.sh"
 
-yarn format
+yarn hook-commit
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -2,4 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"
 . "$(dirname "$0")/common.sh"
 
-yarn chk
+yarn hook-push
diff --git a/.prettierrc b/.prettierrc
@@ -9,10 +9,6 @@
     {
       "files": ".prettierrc",
       "options": { "parser": "json" }
-    },
-    {
-      "files": "*.json",
-      "options": { "parser": "json" }
     }
   ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -82,9 +82,9 @@
         "${workspaceFolder}/node_modules/jest/bin/jest.js",
         "--runInBand",
         "--config",
-        "${workspaceFolder}/packages/audiofileindex/jestconfig.json"
+        "${workspaceFolder}/modules/audiofileindex/jestconfig.json"
       ],
-      "cwd": "${workspaceFolder}/packages/audiofileindex",
+      "cwd": "${workspaceFolder}/modules/audiofileindex",
       "console": "integratedTerminal",
       "internalConsoleOptions": "openOnSessionStart"
     }

diff --git a/.yarn/releases/yarn-3.6.0.cjs → .yarn/releases/yarn-3.6.3.cjs b/.yarn/releases/yarn-3.6.0.cjs → .yarn/releases/yarn-3.6.3.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: '@yarnpkg/plugin-workspace-tools'
 
-yarnPath: .yarn/releases/yarn-3.6.0.cjs
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
diff --git a/about.html b/about.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -17,20 +17,24 @@
         flex-direction: column;
         font-family: Arial, Helvetica, sans-serif;
       }
+
       #title {
         font-weight: bold;
         font-size: x-large;
       }
+
       #version {
         font-weight: lighter;
         font-size: smaller;
       }
+
       #source-code {
         font-weight: bolder;
         font-size: large;
       }
     </style>
   </head>
+
   <body>
     <div id="title">Electron Music Player</div>
     <br />
@@ -39,7 +43,7 @@
     </div>
     <br />
     <!-- This line gets read & written by the config/set-version.js script -->
-    <div id="version">Version 0.8.8</div>
+    <div id="version">Version 0.8.9</div>
     <br />
     <div id="source-code">
       <a href="https://github.com/kevinfrei/EMP">Source code</a>

diff --git a/config/jest.jsdom.js b/config/jest.jsdom.js
@@ -67,7 +67,7 @@ module.exports = {
   moduleDirectories: [
     'node_modules',
     '<rootDir>/../shared',
-    '<rootDir>/../packages',
+    '<rootDir>/../modules',
   ],
 
   // An array of file extensions your modules use

diff --git a/config/set-version.js b/config/set-version.js
@@ -85,13 +85,13 @@ async function readJSONFile(filename) {
 
 async function writeJSONFile(filename, json, options) {
   const text = JSON.stringify(json);
-  const formatted = prettier.format(text, { ...options, parser: 'json' });
+  const formatted = await prettier.format(text, { ...options, parser: 'json' });
   await fsp.writeFile(filename, formatted, 'utf-8');
 }
 
 async function writeHTMLFile(filename, html, options) {
   const text = html.join('\n');
-  const formatted = prettier.format(text, { ...options, parser: 'html' });
+  const formatted = await prettier.format(text, { ...options, parser: 'html' });
   await fsp.writeFile(filename, formatted, 'utf-8');
 }
 
@@ -114,7 +114,7 @@ async function main() {
   const curDir = process.cwd();
   const pkgPath = path.join(curDir, 'package.json');
   const pkg = await readJSONFile(pkgPath);
-  const aboutPath = path.join(curDir, 'public', 'about.html');
+  const aboutPath = path.join(curDir, 'about.html');
   const about = await getAboutVersion(aboutPath);
   const aboutVer = about.version;
   const packageVer = pkg.version;

diff --git a/electron/Communication.ts b/electron/Communication.ts
@@ -188,8 +188,8 @@ export function CommsSetup(): void {
 }
 
 // This is for one-way comms to the UI process
-export function SendToUI(name: IpcId, data: unknown) {
-  const obj: { [key: string]: unknown } = {};
+export function SendToUI<T>(name: IpcId, data: T) {
+  const obj: { [key: string]: T } = {};
   obj[name] = data;
   log(`Sending ${name} with data:`);
   log(data);

diff --git a/electron/Startup.ts b/electron/Startup.ts
@@ -4,7 +4,11 @@ import { isString } from '@freik/typechk';
 import { app } from 'electron';
 import { UpdateLocations } from './AudioDatabase';
 import { CommsSetup } from './Communication';
-import { RegisterListeners, RegisterProtocols } from './protocols';
+import {
+  RegisterListeners,
+  RegisterPrivileges,
+  RegisterProtocols,
+} from './protocols';
 
 const { wrn } = MakeLog('EMP:main:Startup');
 
@@ -13,6 +17,7 @@ const { wrn } = MakeLog('EMP:main:Startup');
  */
 export function InitBeforeAnythingElse(): void {
   CommsSetup();
+  RegisterPrivileges();
   app.whenReady().then(RegisterProtocols).catch(wrn);
   RegisterListeners();
 }

diff --git a/electron/Transcoding.ts b/electron/Transcoding.ts
@@ -1,3 +1,9 @@
+import {
+  IpcId,
+  TranscodeInfo,
+  TranscodeSourceType,
+  TranscodeState,
+} from '@freik/emp-shared';
 import { MakeLog } from '@freik/logger';
 import type { Attributes } from '@freik/media-core';
 import { Encode, Metadata as MD } from '@freik/media-utils';
@@ -16,12 +22,6 @@ import { promises as fsp } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { rimraf } from 'rimraf';
-import {
-  IpcId,
-  TranscodeInfo,
-  TranscodeSourceType,
-  TranscodeState,
-} from '@freik/emp-shared';
 import { GetAudioDB } from './AudioDatabase';
 import { SendToUI } from './Communication';
 import { LoadPlaylist } from './playlists';
@@ -91,6 +91,7 @@ export async function toMp4Async(
         hasFieldType(res.error, 'toString', isFunction)
       ) {
         // MediaInfo failed: no continue, sorry
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
         const resStr = asString(res.error.toString(), 'Unknown error');
         return tr(
           XcodeResCode.mediaInfoFailure,

diff --git a/electron/cover-art.ts b/electron/cover-art.ts
@@ -24,20 +24,20 @@ import {
   isSetOfString,
 } from '@freik/typechk';
 import albumArt from 'album-art';
-import { ProtocolRequest } from 'electron';
 import Jimp from 'jimp';
 import { promises as fs } from 'node:fs';
 import https from 'node:https';
 import path from 'node:path';
 import { GetAudioDB } from './AudioDatabase';
 import {
-  BufferResponse,
-  GetDefaultAlbumPicBuffer,
+  GetDefaultAlbumPicResponse,
   GetDefaultAlbumPicUri,
-  GetDefaultArtistPicBuffer,
+  // GetDefaultAlbumPicUri,
+  GetDefaultArtistPicResponse,
 } from './protocols';
 
 const { log, wrn } = MakeLog('EMP:main:cover-art');
+log.enabled = true;
 
 async function shouldDownloadAlbumArtwork(): Promise<boolean> {
   return (await Persistence.getItemAsync('downloadAlbumArtwork')) === 'true';
@@ -271,27 +271,32 @@ async function TryToGetPic(id: MediaKey): Promise<PicData | undefined> {
   }
 }
 
-export async function PictureHandler(
-  req: ProtocolRequest,
-  id: MediaKey,
-): Promise<BufferResponse> {
+export async function PictureHandler(req: Request): Promise<Response> {
   // Check to see if there's a song in the album that has a cover image
+  const { pathname } = new URL(req.url);
+  let id = pathname.substring(1);
   try {
     log(`Got a request for ${id}`);
     if (id.lastIndexOf('#') !== -1) {
       id = id.substring(0, id.lastIndexOf('#'));
     }
     const d = await TryToGetPic(id);
     if (isDefined(d)) {
-      return d;
+      log(`Sending data for ${id}`);
+      return new Response(
+        d.data.buffer.slice(
+          d.data.byteOffset,
+          d.data.byteOffset + d.data.byteLength,
+        ),
+      );
     }
   } catch (error) {
     wrn(`Error while trying to get picture for ${id}`);
     wrn(error);
   }
   return isArtistKey(id)
-    ? GetDefaultArtistPicBuffer()
-    : GetDefaultAlbumPicBuffer();
+    ? GetDefaultArtistPicResponse()
+    : GetDefaultAlbumPicResponse();
 }
 
 async function SavePicForAlbum(

diff --git a/electron/menu.ts b/electron/menu.ts
@@ -1,4 +1,5 @@
 import { Persistence } from '@freik/electron-main';
+import { CurrentView, IpcId, Keys } from '@freik/emp-shared';
 import { isFunction, isString } from '@freik/typechk';
 import {
   BrowserWindow,
@@ -9,7 +10,6 @@ import {
   shell,
 } from 'electron';
 import { KeyboardEvent } from 'electron/main';
-import { CurrentView, IpcId, Keys } from '@freik/emp-shared';
 import { ShowAbout } from './About.js';
 import { SendToUI } from './Communication.js';
 import { ToggleMiniPlayer } from './window.js';
@@ -27,12 +27,12 @@ const isMac = process.platform === 'darwin';
 // eslint-disable-next-line
 const ___: MenuItemConstructorOptions = { type: 'separator' };
 
-function getClick(handler?: ClickHandler | unknown): ClickHandler | undefined {
+function getClick<T>(handler?: ClickHandler | T): ClickHandler | undefined {
   if (!handler) {
     return;
   }
   if (isFunction(handler)) {
-    return handler as ClickHandler;
+    return handler;
   }
   return () => SendToUI(IpcId.MenuAction, handler);
 }
@@ -42,10 +42,10 @@ function getId(lbl: string): string {
 }
 
 // TODO: Add an action to be taken, with a quick x-plat shortcut key
-function xaction(
+function xaction<T>(
   label: string,
   accelerator: string,
-  handler?: ClickHandler | unknown,
+  handler?: ClickHandler | T,
 ): MenuItemConstructorOptions {
   return {
     label,
@@ -56,10 +56,10 @@ function xaction(
 }
 
 // Typescript Method Overloading is kinda weird...
-function action(
+function action<T>(
   label: string,
-  accOrHdlr: string | ClickHandler | unknown | void,
-  handler?: ClickHandler | unknown,
+  accOrHdlr: string | ClickHandler | T,
+  handler?: ClickHandler | T,
 ): MenuItemConstructorOptions {
   if (isString(accOrHdlr)) {
     return {