karaoke-eternal 2.0.0-beta.6 → 2.0.0-beta.7

package/build/server/Scanner/FileScanner/FileScanner.js

@@ -26,11 +26,12 @@ class FileScanner extends Scanner {
     async scan(pathId) {
         const dir = this.paths.entities[pathId]?.path;
         const validMediaIds = [];
+        const stats = { new: 0, removed: 0, existing: 0 };
         let files; // { file, stats }[]
         let prevDir;
         if (!dir) {
             log.error('invalid pathId: %s', pathId);
-            return;
+            return stats;
         }
         log.info('Searching: %s', dir);
         this.emitStatus(`Searching: ${dir}`, 0);
@@ -40,7 +41,7 @@ class FileScanner extends Scanner {
         }
         catch (err) {
             log.error(`  => ${err.message} (path offline)`);
-            return;
+            return stats;
         }
         for (let i = 0; i < files.length; i++) {
             const curDir = path.dirname(files[i].file);
@@ -51,24 +52,30 @@ class FileScanner extends Scanner {
                 this.parser = new MetaParser(cfg);
             }
             log.info('[%s/%s] %s', i + 1, files.length, files[i].file);
-            this.emitStatus(`Processing (${i + 1} of ${files.length})`, (i + 1) / files.length);
+            this.emitStatus(`Scanning (${i + 1} of ${files.length})`, (i + 1) / files.length);
             // process file
             try {
                 const res = await this.process(files[i], pathId);
                 validMediaIds.push(res.mediaId);
+                if (res.isNew)
+                    stats.new++;
+                else
+                    stats.existing++;
             }
             catch (err) {
                 log.warn(`  => ${err.message}`);
             }
             if (this.isCanceling) {
                 this.emitStatus('Stopped', 100, false);
-                return;
+                return stats;
             }
         } // end for
-        log.info('Processed %s valid media files', validMediaIds.length.toLocaleString());
+        log.info('Scanned %s valid media files', validMediaIds.length.toLocaleString());
         log.info('Searching for invalid media entries');
         const numRemoved = await this.removeInvalid(pathId, validMediaIds);
+        stats.removed = numRemoved;
         log.info(`Removed ${numRemoved} invalid media entries`);
+        return stats;
     }
     async process({ file }, pathId) {
         let buffer = await fsPromises.readFile(file);

package/build/server/Scanner/MetaParser/defaultMiddleware.js

@@ -75,7 +75,11 @@ m.set('remove quotes', (ctx, next) => {
 // some artist-specific tweaks
 m.set('artist tweaks', (ctx, next) => {
     // Last, First [Middle] -> First [Middle] Last
-    ctx.artist = ctx.artist.replace(/^(\w+), (\w+ ?\w+)$/ig, '$2 $1');
+    // Use negative lookahead to avoid matching when second part starts with an article (e.g., "Tyler, The Creator")
+    const articles = Array.isArray(ctx.cfg.articles) ? ctx.cfg.articles.join(' |') + ' ' : '';
+    const articleLookahead = articles ? `(?!${articles})` : '';
+    const pattern = new RegExp(`^([\\w ]+), ${articleLookahead}(\\w+ ?\\w+)$`, 'i');
+    ctx.artist = ctx.artist.replace(pattern, '$2 $1');
     // featuring/feat/ft -> ft.
     ctx.artist = ctx.artist.replace(/ featuring /i, ' ft. ');
     ctx.artist = ctx.artist.replace(/ f(ea)?t\.? /i, ' ft. ');
@@ -139,7 +143,7 @@ function moveArticles(str, articles) {
         if (new RegExp(`^${search}`, 'i').test(str)) {
             const parens = /[([{].*$/.exec(str);
             if (parens) {
-                str = str.substring(search.length, parens.index - search.length)
+                str = str.substring(search.length, parens.index)
                     .trim() + `, ${article} ${parens[0]}`;
             }
             else {

package/build/server/User/router.js

@@ -346,9 +346,8 @@ router.post('/setup', async (ctx) => {
 router.get('/user/:userId/image', async (ctx) => {
     const targetId = parseInt(ctx.params.userId, 10);
     if (ctx.user.userId !== targetId && !ctx.user.isAdmin) {
-        // ensure users are in the same room
-        const sockets = await ctx.io.in(Rooms.prefix(ctx.user.roomId)).fetchSockets();
-        if (!sockets.some(s => s?.user && s?.user.userId === targetId)) {
+        // ensure target user has been in the same room
+        if (!Rooms.hasUserBeenInRoom(ctx.user.roomId, targetId)) {
             ctx.throw(403);
         }
     }

package/build/server/scannerWorker.js

@@ -42,8 +42,13 @@ let IPC;
     log.debug('parsed pathIds: %s', pathIds);
     q.queue(pathIds);
 })();
-// @todo
+const totals = { new: 0, existing: 0, removed: 0 };
 function onIteration(stats) {
+    if (stats) {
+        totals.new += stats.new;
+        totals.existing += stats.existing;
+        totals.removed += stats.removed;
+    }
     return stats;
 }
 function onDone() {
@@ -52,7 +57,7 @@ function onDone() {
         payload: {
             isScanning: false,
             pct: 100,
-            text: 'Finished',
+            text: `Scan finished (${totals.new} new, ${totals.removed} removed)`,
         },
     });
     process.exit(0); // eslint-disable-line n/no-process-exit

package/build/server/socket.js

@@ -111,8 +111,9 @@ export default function (io, jwtKey) {
         if (typeof sock.user.roomId !== 'number')
             return;
         // beyond this point assumes there is a room
-        // add user to room
+        // add user to room and track membership
         sock.join(Rooms.prefix(sock.user.roomId));
+        Rooms.trackUser(sock.user.roomId, sock.user.userId);
         // if there's a player in room, emit its last known status
         // @todo this just emits the first status found
         for (const s of io.of('/').sockets.values()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karaoke-eternal",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "Open karaoke party system",
   "keywords": [
     "karaoke",
@@ -57,7 +57,7 @@
     "bcrypt": "^5.1.1",
     "ctx-compose": "^3.0.0",
     "electron-log": "^5.4.3",
-    "fs-extra": "^11.3.2",
+    "fs-extra": "^11.3.3",
     "json-e": "^4.8.0",
     "json5": "^2.2.3",
     "jsonwebtoken": "^9.0.3",
@@ -86,7 +86,7 @@
     "@babel/preset-typescript": "^7.28.5",
     "@hello-pangea/dnd": "^18.0.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
-    "@reduxjs/toolkit": "^2.11.0",
+    "@reduxjs/toolkit": "^2.11.2",
     "@stylistic/eslint-plugin": "^5.6.1",
     "@types/bcrypt": "^6.0.0",
     "@types/blueimp-load-image": "^5.16.6",
@@ -100,7 +100,7 @@
     "@types/koa-static": "^4.0.4",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "@types/react-highlight-words": "^0.20.0",
+    "@types/react-highlight-words": "^0.20.1",
     "@types/react-transition-group": "^4.4.12",
     "@types/react-window": "^1.8.8",
     "@types/redux-optimistic-ui": "^0.4.14",
@@ -117,13 +117,13 @@
     "cdgraphics": "^7.0.0",
     "clsx": "^2.1.1",
     "css-loader": "^7.1.2",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-n": "^17.23.1",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.4.24",
+    "eslint-plugin-react-refresh": "^0.4.26",
     "fast-fuzzy": "^1.12.0",
     "file-loader": "^6.2.0",
     "gl-chromakey": "^2.0.0",
@@ -145,7 +145,7 @@
     "react-qrcode-logo": "^4.0.0",
     "react-redux": "^9.2.0",
     "react-refresh": "^0.18.0",
-    "react-router": "^7.10.1",
+    "react-router": "^7.11.0",
     "react-swipeable": "^7.0.2",
     "react-transition-group": "^4.4.5",
     "react-window": "^2.2.3",
@@ -156,11 +156,11 @@
     "socket.io-client": "^4.8.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.48.1",
+    "typescript-eslint": "^8.50.0",
     "typescript-plugin-css-modules": "^5.2.0",
     "use-long-press": "^3.3.0",
     "use-resize-observer": "^9.1.0",
-    "webpack": "^5.103.0",
+    "webpack": "^5.104.1",
     "webpack-cli": "^6.0.1",
     "webpack-dev-middleware": "^7.4.5",
     "webpack-hot-middleware": "^2.26.1",