alphatheta-connect 0.15.0 → 0.19.1

package/lib/cli.js

@@ -14,6 +14,7 @@ exports.PictureType = exports.createNfsFileReaderWithInfo = exports.createNfsFil
 exports.isArtworkExtractionSupported = isArtworkExtractionSupported;
 exports.extractArtwork = extractArtwork;
 exports.extractArtworkFromDevice = extractArtworkFromDevice;
+const logger_1 = __webpack_require__(/*! src/logger */ "./src/logger.ts");
 const nfs_1 = __webpack_require__(/*! src/nfs */ "./src/nfs/index.ts");
 const parsers_1 = __webpack_require__(/*! ./parsers */ "./src/artwork/parsers/index.ts");
 const reader_1 = __webpack_require__(/*! ./reader */ "./src/artwork/reader.ts");
@@ -50,10 +51,14 @@ async function extractArtwork(reader) {
         }
     }
 }
-async function extractArtworkFromDevice(device, slot, filePath) {
+async function extractArtworkFromDevice(device, slot, filePath, logger = logger_1.noopLogger) {
+    logger.debug(`[artwork-nfs] getFileInfo: device=${device.ip.address}, slot=${slot}, path=${filePath}`);
     const fileInfo = await (0, nfs_1.getFileInfo)({ device, slot, path: filePath });
+    logger.debug(`[artwork-nfs] File found: ${fileInfo.size} bytes`);
     const reader = (0, reader_1.createNfsFileReader)(device, slot, filePath, fileInfo.size);
-    return extractArtwork(reader);
+    const result = await extractArtwork(reader);
+    logger.debug(`[artwork-nfs] extractArtwork result: ${result ? `${result.mimeType} (${result.data.length}b)` : 'null'}`);
+    return result;
 }
 
 
@@ -674,7 +679,7 @@ cli();
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.VIRTUAL_CDJ_FIRMWARE = exports.VIRTUAL_CDJ_NAME = exports.PROLINK_HEADER = exports.STARTUP_STAGE_INTERVAL = exports.ANNOUNCE_INTERVAL = exports.STATUS_PORT = exports.BEAT_PORT = exports.ANNOUNCE_PORT = exports.DEFAULT_VCDJ_ID = void 0;
+exports.MAX_CDJ_DEVICE_ID = exports.MIN_CDJ_DEVICE_ID = exports.VIRTUAL_CDJ_FIRMWARE = exports.VIRTUAL_CDJ_NAME = exports.PROLINK_HEADER = exports.STARTUP_STAGE_INTERVAL = exports.ANNOUNCE_INTERVAL = exports.STATUS_PORT = exports.BEAT_PORT = exports.ANNOUNCE_PORT = exports.DEFAULT_VCDJ_ID = void 0;
 /**
  * The default virtual CDJ ID to use.
  *
@@ -715,7 +720,13 @@ exports.VIRTUAL_CDJ_NAME = 'ProLink-Connect';
  * VirtualCDJFirmware is a string indicating the firmware version reported with
  * status packets.
  */
-exports.VIRTUAL_CDJ_FIRMWARE = '1.43';
+exports.VIRTUAL_CDJ_FIRMWARE = '3.20';
+/**
+ * CDJs use device IDs 1-6. Devices outside this range (e.g. Stagehand at 154)
+ * should not be queried for media slots or databases as they may crash.
+ */
+exports.MIN_CDJ_DEVICE_ID = 1;
+exports.MAX_CDJ_DEVICE_ID = 6;
 
 
 /***/ },
@@ -833,37 +844,46 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.viaFileExtraction = viaFileExtraction;
 const artwork_1 = __webpack_require__(/*! src/artwork */ "./src/artwork/index.ts");
+const logger_1 = __webpack_require__(/*! src/logger */ "./src/logger.ts");
 const types_1 = __webpack_require__(/*! src/types */ "./src/types.ts");
+const utils_1 = __webpack_require__(/*! src/utils */ "./src/utils/index.ts");
 const Telemetry = __importStar(__webpack_require__(/*! src/utils/telemetry */ "./src/utils/telemetry.ts"));
 /**
  * Extract artwork directly from an audio file via NFS.
  */
 async function viaFileExtraction(device, opts) {
-    var _a, _b;
+    var _a, _b, _c;
     const { trackSlot, track, span } = opts;
+    const logger = (_a = opts.logger) !== null && _a !== void 0 ? _a : logger_1.noopLogger;
     if (trackSlot !== types_1.MediaSlot.USB &&
         trackSlot !== types_1.MediaSlot.SD &&
         trackSlot !== types_1.MediaSlot.RB) {
+        logger.debug(`[artwork-nfs] Skipping: unsupported slot ${(0, utils_1.getSlotName)(trackSlot)} (device ${device.name})`);
         return null;
     }
     const slot = trackSlot;
     if (!track.filePath) {
+        logger.debug('[artwork-nfs] Skipping: no filePath on track');
         return null;
     }
-    const extension = (_b = (_a = track.filePath.split('.').pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
+    const extension = (_c = (_b = track.filePath.split('.').pop()) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : '';
     if (!(0, artwork_1.isArtworkExtractionSupported)(extension)) {
+        logger.debug(`[artwork-nfs] Skipping: unsupported extension ".${extension}" (${track.filePath})`);
         return null;
     }
+    logger.debug(`[artwork-nfs] Extracting from ${track.filePath} (slot=${(0, utils_1.getSlotName)(trackSlot)}, device=${device.name} @ ${device.ip.address})`);
     const tx = span
         ? span.startChild({ op: 'getArtworkFromFile' })
         : Telemetry.startTransaction({ name: 'getArtworkFromFile' });
     try {
-        const artwork = await (0, artwork_1.extractArtworkFromDevice)(device, slot, track.filePath);
+        const artwork = await (0, artwork_1.extractArtworkFromDevice)(device, slot, track.filePath, logger);
         if (!artwork) {
+            logger.debug('[artwork-nfs] No embedded artwork found in file');
             tx.setData('result', 'no_artwork');
             tx.finish();
             return null;
         }
+        logger.debug(`[artwork-nfs] Success: ${artwork.mimeType} (${artwork.data.length} bytes)`);
         tx.setData('result', 'success');
         tx.setData('mimeType', artwork.mimeType);
         tx.setData('size', artwork.data.length);
@@ -871,6 +891,8 @@ async function viaFileExtraction(device, opts) {
         return artwork.data;
     }
     catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        logger.warn(`[artwork-nfs] NFS extraction failed: ${msg}`);
         tx.setData('result', 'error');
         tx.finish();
         Telemetry.captureException(error);
@@ -1018,12 +1040,15 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.viaRemote = viaRemote;
 exports.viaLocal = viaLocal;
+const logger_1 = __webpack_require__(/*! src/logger */ "./src/logger.ts");
 const nfs_1 = __webpack_require__(/*! src/nfs */ "./src/nfs/index.ts");
 const types_1 = __webpack_require__(/*! src/types */ "./src/types.ts");
 const Telemetry = __importStar(__webpack_require__(/*! src/utils/telemetry */ "./src/utils/telemetry.ts"));
 const CHUNK_SIZE = 8192; // Maximum allowed XDR read size
 function viaRemote(_remote, _device, _opts) {
-    console.error('Getting a file from Rekordbox via ProDJ-Link is not yet supported.');
+    var _a;
+    const logger = (_a = _opts.logger) !== null && _a !== void 0 ? _a : logger_1.noopLogger;
+    logger.error('Getting a file from Rekordbox via ProDJ-Link is not yet supported.');
     return null;
     // const conn = await remote.get(deviceId);
     // if (conn === null) {
@@ -1045,7 +1070,9 @@ function viaRemote(_remote, _device, _opts) {
     // });
 }
 async function viaLocal(local, device, opts) {
+    var _a;
     const { deviceId, trackSlot, track } = opts;
+    const logger = (_a = opts.logger) !== null && _a !== void 0 ? _a : logger_1.noopLogger;
     if (trackSlot !== types_1.MediaSlot.USB && trackSlot !== types_1.MediaSlot.SD) {
         throw new Error('Expected USB or SD or RB slot for remote database query');
     }
@@ -1059,7 +1086,7 @@ async function viaLocal(local, device, opts) {
             slot: trackSlot,
             path: track.filePath,
             onProgress: progress => {
-                console.log(progress.read, progress.total);
+                logger.trace('%d %d', progress.read, progress.total);
             },
             chunkSize: CHUNK_SIZE,
         });
@@ -1099,24 +1126,41 @@ async function viaRemote(remote, opts) {
         trackType,
         menuTarget: remotedb_1.MenuTarget.Main,
     };
+    const isUnanalyzed = trackType === types_1.TrackType.Unanalyzed || trackType === types_1.TrackType.AudioCD;
+    const isStreaming = trackType === types_1.TrackType.Streaming;
+    const skipLocalFileLookups = isUnanalyzed || isStreaming;
+    // Unanalyzed tracks use GetGenericMetadata (reads ID3 tags from the audio file).
+    // Streaming tracks (Beatport) use the regular GetMetadata query.
     const track = await conn.query({
         queryDescriptor,
-        query: remotedb_1.Query.GetMetadata,
-        args: { trackId },
-        span,
-    });
-    track.filePath = await conn.query({
-        queryDescriptor,
-        query: remotedb_1.Query.GetTrackInfo,
-        args: { trackId },
-        span,
-    });
-    track.beatGrid = await conn.query({
-        queryDescriptor,
-        query: remotedb_1.Query.GetBeatGrid,
+        query: isUnanalyzed ? remotedb_1.Query.GetGenericMetadata : remotedb_1.Query.GetMetadata,
         args: { trackId },
         span,
     });
+    // Try to get file path — for streaming tracks this returns the Beatport track ID
+    // (e.g. "/26883657.m4a") which we use for Beatport API lookups
+    try {
+        track.filePath = await conn.query({
+            queryDescriptor,
+            query: remotedb_1.Query.GetTrackInfo,
+            args: { trackId },
+            span,
+        });
+    }
+    catch (err) {
+        if (!skipLocalFileLookups) {
+            throw err;
+        }
+    }
+    // Beat grid is only available for analyzed local tracks
+    if (!skipLocalFileLookups) {
+        track.beatGrid = await conn.query({
+            queryDescriptor,
+            query: remotedb_1.Query.GetBeatGrid,
+            args: { trackId },
+            span,
+        });
+    }
     return track;
 }
 async function viaLocal(local, device, opts) {
@@ -1128,13 +1172,16 @@ async function viaLocal(local, device, opts) {
     if (adapter === null) {
         return null;
     }
-    const track = adapter.findTrack(trackId);
-    if (track === null) {
+    const dbTrack = adapter.findTrack(trackId);
+    if (dbTrack === null) {
         return null;
     }
-    const anlz = await (0, rekordbox_1.loadAnlz)(track, 'DAT', (0, utils_1.anlzLoader)({ device, slot: trackSlot }));
-    track.beatGrid = anlz.beatGrid;
-    track.cueAndLoops = anlz.cueAndLoops;
+    const anlz = await (0, rekordbox_1.loadAnlz)(dbTrack, 'DAT', (0, utils_1.anlzLoader)({ device, slot: trackSlot }));
+    const track = {
+        ...dbTrack,
+        beatGrid: anlz.beatGrid,
+        waveformHd: null,
+    };
     return track;
 }
 
@@ -1215,6 +1262,48 @@ async function viaLocal(local, opts) {
 }
 
 
+/***/ },
+
+/***/ "./src/db/getTrackAnalysis.ts"
+/*!************************************!*\
+  !*** ./src/db/getTrackAnalysis.ts ***!
+  \************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.viaLocal = viaLocal;
+const rekordbox_1 = __webpack_require__(/*! src/localdb/rekordbox */ "./src/localdb/rekordbox.ts");
+const types_1 = __webpack_require__(/*! src/types */ "./src/types.ts");
+const utils_1 = __webpack_require__(/*! ./utils */ "./src/db/utils.ts");
+async function viaLocal(local, device, opts) {
+    var _a, _b, _c, _d;
+    const { deviceId, trackSlot, track } = opts;
+    if (trackSlot !== types_1.MediaSlot.USB && trackSlot !== types_1.MediaSlot.SD) {
+        throw new Error('Expected USB or SD slot for local database query');
+    }
+    const conn = await local.get(deviceId, trackSlot);
+    if (conn === null) {
+        return null;
+    }
+    const resolver = (0, utils_1.anlzLoader)({ device, slot: trackSlot });
+    const [extResult, twoxResult] = await Promise.all([
+        (0, rekordbox_1.loadAnlz)(track, 'EXT', resolver),
+        (0, rekordbox_1.loadAnlz)(track, '2EX', resolver).catch(() => null),
+    ]);
+    return {
+        extendedCues: extResult.extendedCues,
+        songStructure: extResult.songStructure,
+        waveformColorPreview: (_a = extResult.waveformColorPreview) !== null && _a !== void 0 ? _a : undefined,
+        waveformHd: extResult.waveformHd,
+        waveform3BandPreview: (_b = twoxResult === null || twoxResult === void 0 ? void 0 : twoxResult.waveform3BandPreview) !== null && _b !== void 0 ? _b : null,
+        waveform3BandDetail: (_c = twoxResult === null || twoxResult === void 0 ? void 0 : twoxResult.waveform3BandDetail) !== null && _c !== void 0 ? _c : null,
+        vocalConfig: (_d = twoxResult === null || twoxResult === void 0 ? void 0 : twoxResult.vocalConfig) !== null && _d !== void 0 ? _d : null,
+    };
+}
+
+
 /***/ },
 
 /***/ "./src/db/getWaveforms.ts"
@@ -1249,9 +1338,30 @@ async function viaRemote(remote, opts) {
         args: { trackId: track.id },
         span,
     });
-    return { waveformHd };
+    const isStreaming = trackType === types_1.TrackType.Streaming;
+    if (!isStreaming) {
+        return { waveformHd };
+    }
+    // Streaming tracks (e.g. Beatport LINK) have no local ANLZ file but the CDJ
+    // serves waveform preview and detailed via remotedb.
+    const [waveformPreview, waveformDetailed] = await Promise.all([
+        conn.query({
+            queryDescriptor,
+            query: remotedb_1.Query.GetWaveformPreview,
+            args: { trackId: track.id },
+            span,
+        }),
+        conn.query({
+            queryDescriptor,
+            query: remotedb_1.Query.GetWaveformDetailed,
+            args: { trackId: track.id },
+            span,
+        }),
+    ]);
+    return { waveformHd, waveformPreview, waveformDetailed };
 }
 async function viaLocal(local, device, opts) {
+    var _a;
     const { deviceId, trackSlot, track } = opts;
     if (trackSlot !== types_1.MediaSlot.USB && trackSlot !== types_1.MediaSlot.SD) {
         throw new Error('Expected USB or SD slot for remote database query');
@@ -1261,7 +1371,10 @@ async function viaLocal(local, device, opts) {
         return null;
     }
     const anlz = await (0, rekordbox_1.loadAnlz)(track, 'EXT', (0, utils_1.anlzLoader)({ device, slot: trackSlot }));
-    return { waveformHd: anlz.waveformHd };
+    return {
+        waveformHd: anlz.waveformHd,
+        waveformColorPreview: (_a = anlz.waveformColorPreview) !== null && _a !== void 0 ? _a : undefined,
+    };
 }
 
 
@@ -1319,7 +1432,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Database_hostDevice, _Database_deviceManager, _Database_localDatabase, _Database_remoteDatabase, _Database_getTrackLookupStrategy, _Database_getMediaLookupStrategy;
+var _Database_deviceManager, _Database_localDatabase, _Database_remoteDatabase, _Database_getTrackLookupStrategy, _Database_getMediaLookupStrategy;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const types_1 = __webpack_require__(/*! src/types */ "./src/types.ts");
 const utils_1 = __webpack_require__(/*! src/utils */ "./src/utils/index.ts");
@@ -1330,6 +1443,7 @@ const GetArtworkThumbnail = __importStar(__webpack_require__(/*! ./getArtworkThu
 const GetFile = __importStar(__webpack_require__(/*! ./getFile */ "./src/db/getFile.ts"));
 const GetMetadata = __importStar(__webpack_require__(/*! ./getMetadata */ "./src/db/getMetadata.ts"));
 const GetPlaylist = __importStar(__webpack_require__(/*! ./getPlaylist */ "./src/db/getPlaylist.ts"));
+const GetTrackAnalysis = __importStar(__webpack_require__(/*! ./getTrackAnalysis */ "./src/db/getTrackAnalysis.ts"));
 const GetWaveforms = __importStar(__webpack_require__(/*! ./getWaveforms */ "./src/db/getWaveforms.ts"));
 var LookupStrategy;
 (function (LookupStrategy) {
@@ -1342,8 +1456,7 @@ var LookupStrategy;
  * network for information from their databases.
  */
 class Database {
-    constructor(hostDevice, local, remote, deviceManager) {
-        _Database_hostDevice.set(this, void 0);
+    constructor(local, remote, deviceManager) {
         _Database_deviceManager.set(this, void 0);
         /**
          * The local database service, used when querying media devices connected
@@ -1357,8 +1470,13 @@ class Database {
         _Database_remoteDatabase.set(this, void 0);
         _Database_getTrackLookupStrategy.set(this, (device, type) => {
             const isUnanalyzed = type === types_1.TrackType.AudioCD || type === types_1.TrackType.Unanalyzed;
-            const requiresCdjRemote = device.type === types_1.DeviceType.CDJ && isUnanalyzed && this.cdjSupportsRemotedb;
-            return device.type === types_1.DeviceType.Rekordbox || requiresCdjRemote
+            const isStreaming = type === types_1.TrackType.Streaming;
+            // Unanalyzed and streaming tracks on CDJs must use RemoteDB
+            // (streaming services like Beatport have no local database)
+            if (device.type === types_1.DeviceType.CDJ && (isUnanalyzed || isStreaming)) {
+                return LookupStrategy.Remote;
+            }
+            return device.type === types_1.DeviceType.Rekordbox
                 ? LookupStrategy.Remote
                 : device.type === types_1.DeviceType.CDJ && type === types_1.TrackType.RB
                     ? LookupStrategy.Local
@@ -1369,19 +1487,10 @@ class Database {
             : device.type === types_1.DeviceType.Rekordbox
                 ? LookupStrategy.NoneAvailable
                 : LookupStrategy.Local);
-        __classPrivateFieldSet(this, _Database_hostDevice, hostDevice, "f");
         __classPrivateFieldSet(this, _Database_localDatabase, local, "f");
         __classPrivateFieldSet(this, _Database_remoteDatabase, remote, "f");
         __classPrivateFieldSet(this, _Database_deviceManager, deviceManager, "f");
     }
-    /**
-     * Reports weather or not the CDJs can be communicated to over the remote
-     * database protocol. This is important when trying to query for unanalyzed or
-     * compact disc tracks.
-     */
-    get cdjSupportsRemotedb() {
-        return __classPrivateFieldGet(this, _Database_hostDevice, "f").id > 0 && __classPrivateFieldGet(this, _Database_hostDevice, "f").id < 7;
-    }
     /**
      * Get the database type (oneLibrary or pdb) for a loaded device slot.
      * Returns null if the slot uses remote database or no database is loaded.
@@ -1542,6 +1651,35 @@ class Database {
         tx.finish();
         return waveforms;
     }
+    /**
+     * Retrieves all analysis data from the EXT file for a track.
+     * Returns extended cues, song structure, waveform color preview, and HD waveform.
+     */
+    async getTrackAnalysis(opts) {
+        const { deviceId, trackType, trackSlot, span } = opts;
+        const tx = span
+            ? span.startChild({ op: 'dbGetTrackAnalysis' })
+            : Telemetry.startTransaction({ name: 'dbGetTrackAnalysis' });
+        tx.setTag('deviceId', deviceId.toString());
+        tx.setTag('trackType', (0, utils_1.getTrackTypeName)(trackType));
+        tx.setTag('trackSlot', (0, utils_1.getSlotName)(trackSlot));
+        const callOpts = { ...opts, span: tx };
+        const device = await __classPrivateFieldGet(this, _Database_deviceManager, "f").getDeviceEnsured(deviceId);
+        if (device === null) {
+            tx.finish();
+            return null;
+        }
+        const strategy = __classPrivateFieldGet(this, _Database_getTrackLookupStrategy, "f").call(this, device, trackType);
+        let analysis = null;
+        if (strategy === LookupStrategy.Local) {
+            analysis = await GetTrackAnalysis.viaLocal(__classPrivateFieldGet(this, _Database_localDatabase, "f"), device, callOpts);
+        }
+        if (strategy === LookupStrategy.NoneAvailable || strategy === LookupStrategy.Remote) {
+            tx.setStatus(telemetry_1.SpanStatus.Unavailable);
+        }
+        tx.finish();
+        return analysis;
+    }
     /**
      * Retrieve folders, playlists, and tracks within the playlist tree. The id
      * may be left undefined to query the root of the playlist tree.
@@ -1576,7 +1714,7 @@ class Database {
         return contents;
     }
 }
-_Database_hostDevice = new WeakMap(), _Database_deviceManager = new WeakMap(), _Database_localDatabase = new WeakMap(), _Database_remoteDatabase = new WeakMap(), _Database_getTrackLookupStrategy = new WeakMap(), _Database_getMediaLookupStrategy = new WeakMap();
+_Database_deviceManager = new WeakMap(), _Database_localDatabase = new WeakMap(), _Database_remoteDatabase = new WeakMap(), _Database_getTrackLookupStrategy = new WeakMap(), _Database_getMediaLookupStrategy = new WeakMap();
 exports["default"] = Database;
 
 
@@ -1858,16 +1996,17 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _LocalDatabase_hostDevice, _LocalDatabase_deviceManager, _LocalDatabase_statusEmitter, _LocalDatabase_emitter, _LocalDatabase_slotLocks, _LocalDatabase_dbs, _LocalDatabase_preference, _LocalDatabase_handleDeviceRemoved, _LocalDatabase_fetchFileWithFallback, _LocalDatabase_tryLoadOneLibrary, _LocalDatabase_loadPdbDatabase, _LocalDatabase_hydrateDatabase;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const async_mutex_1 = __webpack_require__(/*! async-mutex */ "async-mutex");
+const onelibrary_connect_1 = __webpack_require__(/*! onelibrary-connect */ "onelibrary-connect");
 const crypto_1 = __webpack_require__(/*! crypto */ "crypto");
 const events_1 = __webpack_require__(/*! events */ "events");
 const fs = __importStar(__webpack_require__(/*! fs */ "fs"));
 const os = __importStar(__webpack_require__(/*! os */ "os"));
 const path = __importStar(__webpack_require__(/*! path */ "path"));
+const constants_1 = __webpack_require__(/*! src/constants */ "./src/constants.ts");
 const nfs_1 = __webpack_require__(/*! src/nfs */ "./src/nfs/index.ts");
 const types_1 = __webpack_require__(/*! src/types */ "./src/types.ts");
 const utils_1 = __webpack_require__(/*! src/utils */ "./src/utils/index.ts");
 const Telemetry = __importStar(__webpack_require__(/*! src/utils/telemetry */ "./src/utils/telemetry.ts"));
-const onelibrary_1 = __webpack_require__(/*! ./onelibrary */ "./src/localdb/onelibrary.ts");
 const orm_1 = __webpack_require__(/*! ./orm */ "./src/localdb/orm.ts");
 const rekordbox_1 = __webpack_require__(/*! ./rekordbox */ "./src/localdb/rekordbox.ts");
 /**
@@ -1944,7 +2083,9 @@ class LocalDatabase {
          * Helper to fetch a file from device, trying both dotted and non-dotted paths
          */
         _LocalDatabase_fetchFileWithFallback.set(this, async (device, slot, basePath, tx) => {
-            const attemptOrder = process.platform === 'win32' ? [basePath, `.${basePath}`] : [`.${basePath}`, basePath];
+            const attemptOrder = process.platform === 'win32'
+                ? [basePath, `.${basePath}`]
+                : [`.${basePath}`, basePath];
             try {
                 return await (0, nfs_1.fetchFile)({
                     device,
@@ -1955,7 +2096,7 @@ class LocalDatabase {
                 });
             }
             catch {
-                return await (0, nfs_1.fetchFile)({
+                return (0, nfs_1.fetchFile)({
                     device,
                     slot,
                     path: attemptOrder[1],
@@ -1976,7 +2117,7 @@ class LocalDatabase {
                 const tempDir = os.tmpdir();
                 const tempFile = path.join(tempDir, `prolink-onelibrary-${device.id}-${slot}-${Date.now()}.db`);
                 fs.writeFileSync(tempFile, dbData);
-                const adapter = new onelibrary_1.OneLibraryAdapter(tempFile);
+                const adapter = new onelibrary_connect_1.OneLibraryAdapter(tempFile);
                 return { adapter, tempFile };
             }
             catch {
@@ -2089,8 +2230,10 @@ class LocalDatabase {
         if (device === undefined) {
             return null;
         }
-        if (device.type !== types_1.DeviceType.CDJ) {
-            throw new Error('Cannot create database from devices that are not CDJs');
+        if (device.type !== types_1.DeviceType.CDJ ||
+            device.id < constants_1.MIN_CDJ_DEVICE_ID ||
+            device.id > constants_1.MAX_CDJ_DEVICE_ID) {
+            return null;
         }
         let media;
         try {
@@ -2133,7 +2276,9 @@ class LocalDatabase {
      */
     async preload() {
         const allDevices = [...__classPrivateFieldGet(this, _LocalDatabase_deviceManager, "f").devices.values()];
-        const cdjDevices = allDevices.filter(device => device.type === types_1.DeviceType.CDJ);
+        const cdjDevices = allDevices.filter(device => device.type === types_1.DeviceType.CDJ &&
+            device.id >= constants_1.MIN_CDJ_DEVICE_ID &&
+            device.id <= constants_1.MAX_CDJ_DEVICE_ID);
         if (cdjDevices.length === 0) {
             return;
         }
@@ -2254,6 +2399,9 @@ var RekordboxAnlz = (function() {
     WAVE_SCROLL: 1347900979,
     WAVE_COLOR_PREVIEW: 1347900980,
     WAVE_COLOR_SCROLL: 1347900981,
+    WAVE_COLOR_3BAND_PREVIEW: 1347900982,
+    WAVE_COLOR_3BAND_DETAIL: 1347900983,
+    VOCAL_CONFIG: 1347900995,
 
     1346588466: "CUES_2",
     1346588482: "CUES",
@@ -2266,6 +2414,9 @@ var RekordboxAnlz = (function() {
     1347900979: "WAVE_SCROLL",
     1347900980: "WAVE_COLOR_PREVIEW",
     1347900981: "WAVE_COLOR_SCROLL",
+    1347900982: "WAVE_COLOR_3BAND_PREVIEW",
+    1347900983: "WAVE_COLOR_3BAND_DETAIL",
+    1347900995: "VOCAL_CONFIG",
   });
 
   RekordboxAnlz.TrackMood = Object.freeze({
@@ -2387,6 +2538,39 @@ var RekordboxAnlz = (function() {
     return PathTag;
   })();
 
+  /**
+   * A 3-band color waveform preview (PWV6, found in .2EX files).
+   * Same resolution as PWV4 (typically 1200 entries) but with 3 bytes
+   * per entry representing low, mid, and high frequency band amplitudes.
+   * Layout is identical to wave_color_preview_tag (PWV4).
+   * @see {@link https://djl-analysis.deepsymmetry.org/djl-analysis/track-metadata.html#color-3band-preview-waveform|Source}
+   */
+
+  var WaveColor3bandPreviewTag = RekordboxAnlz.WaveColor3bandPreviewTag = (function() {
+    function WaveColor3bandPreviewTag(_io, _parent, _root) {
+      this._io = _io;
+      this._parent = _parent;
+      this._root = _root || this;
+
+      this._read();
+    }
+    WaveColor3bandPreviewTag.prototype._read = function() {
+      this.lenEntryBytes = this._io.readU4be();
+      this.lenEntries = this._io.readU4be();
+      this.entries = this._io.readBytes((this.lenEntries * this.lenEntryBytes));
+    }
+
+    /**
+     * The size of each entry, in bytes. Always 3 (low, mid, high).
+     */
+
+    /**
+     * The number of waveform data points. Typically 1200.
+     */
+
+    return WaveColor3bandPreviewTag;
+  })();
+
   /**
    * Stores a waveform preview image suitable for display above
    * the touch strip for jumping to a track position.
@@ -2532,6 +2716,76 @@ var RekordboxAnlz = (function() {
     return WaveColorPreviewTag;
   })();
 
+  /**
+   * A 3-band color detail waveform (PWV7, found in .2EX files).
+   * Higher resolution than PWV6. Each entry is 3 bytes (low, mid, high).
+   * Layout is identical to wave_color_scroll_tag (PWV5).
+   * @see {@link https://djl-analysis.deepsymmetry.org/djl-analysis/track-metadata.html#color-3band-detail-waveform|Source}
+   */
+
+  var WaveColor3bandDetailTag = RekordboxAnlz.WaveColor3bandDetailTag = (function() {
+    function WaveColor3bandDetailTag(_io, _parent, _root) {
+      this._io = _io;
+      this._parent = _parent;
+      this._root = _root || this;
+
+      this._read();
+    }
+    WaveColor3bandDetailTag.prototype._read = function() {
+      this.lenEntryBytes = this._io.readU4be();
+      this.lenEntries = this._io.readU4be();
+      this._unnamed2 = this._io.readU4be();
+      this.entries = this._io.readBytes((this.lenEntries * this.lenEntryBytes));
+    }
+
+    /**
+     * The size of each entry, in bytes. Always 3 (low, mid, high).
+     */
+
+    /**
+     * The number of columns of waveform data.
+     */
+
+    return WaveColor3bandDetailTag;
+  })();
+
+  /**
+   * Vocal detection configuration (PWVC, found in .2EX files).
+   * Contains threshold values used to classify frequency content
+   * as vocal or non-vocal. Body is 8 bytes: unknown(2) + 3 thresholds(2 each).
+   * Observed threshold ranges: low 80-114, mid 80-146, high 98-159.
+   */
+
+  var VocalConfigTag = RekordboxAnlz.VocalConfigTag = (function() {
+    function VocalConfigTag(_io, _parent, _root) {
+      this._io = _io;
+      this._parent = _parent;
+      this._root = _root || this;
+
+      this._read();
+    }
+    VocalConfigTag.prototype._read = function() {
+      this._unnamed0 = this._io.readU2be();
+      this.thresholdLow = this._io.readU2be();
+      this.thresholdMid = this._io.readU2be();
+      this.thresholdHigh = this._io.readU2be();
+    }
+
+    /**
+     * Low frequency vocal detection threshold. Observed range: 80-114.
+     */
+
+    /**
+     * Mid frequency vocal detection threshold. Observed range: 80-146.
+     */
+
+    /**
+     * High frequency vocal detection threshold. Observed range: 98-159.
+     */
+
+    return VocalConfigTag;
+  })();
+
   var PhraseHigh = RekordboxAnlz.PhraseHigh = (function() {
     function PhraseHigh(_io, _parent, _root) {
       this._io = _io;
@@ -3039,6 +3293,11 @@ var RekordboxAnlz = (function() {
         var _io__raw_body = new KaitaiStream(this._raw_body);
         this.body = new BeatGridTag(_io__raw_body, this, this._root);
         break;
+      case RekordboxAnlz.SectionTags.VOCAL_CONFIG:
+        this._raw_body = this._io.readBytes((this.lenTag - 12));
+        var _io__raw_body = new KaitaiStream(this._raw_body);
+        this.body = new VocalConfigTag(_io__raw_body, this, this._root);
+        break;
       case RekordboxAnlz.SectionTags.WAVE_PREVIEW:
         this._raw_body = this._io.readBytes((this.lenTag - 12));
         var _io__raw_body = new KaitaiStream(this._raw_body);
@@ -3059,6 +3318,16 @@ var RekordboxAnlz = (function() {
         var _io__raw_body = new KaitaiStream(this._raw_body);
         this.body = new WavePreviewTag(_io__raw_body, this, this._root);
         break;
+      case RekordboxAnlz.SectionTags.WAVE_COLOR_3BAND_DETAIL:
+        this._raw_body = this._io.readBytes((this.lenTag - 12));
+        var _io__raw_body = new KaitaiStream(this._raw_body);
+        this.body = new WaveColor3bandDetailTag(_io__raw_body, this, this._root);
+        break;
+      case RekordboxAnlz.SectionTags.WAVE_COLOR_3BAND_PREVIEW:
+        this._raw_body = this._io.readBytes((this.lenTag - 12));
+        var _io__raw_body = new KaitaiStream(this._raw_body);
+        this.body = new WaveColor3bandPreviewTag(_io__raw_body, this, this._root);
+        break;
       default:
         this._raw_body = this._io.readBytes((this.lenTag - 12));
         var _io__raw_body = new KaitaiStream(this._raw_body);
@@ -4874,141 +5143,14 @@ return RekordboxPdb;
 
 /***/ },
 
-/***/ "./src/localdb/onelibrary-schema.ts"
-/*!******************************************!*\
-  !*** ./src/localdb/onelibrary-schema.ts ***!
-  \******************************************/
-(__unused_webpack_module, exports) {
-
-"use strict";
-
-/**
- * TypeScript interfaces for the OneLibrary (exportLibrary.db) SQLite schema.
- *
- * These match the actual column names in the SQLite database,
- * which differ from the legacy PDB format.
- *
- * Note: Column names use camelCase in the database (e.g., bpmx100, titleForSearch)
- */
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MenuItemKind = exports.MyTagAttribute = exports.PlaylistAttribute = exports.CueKind = void 0;
-// ============================================================================
-// Cue Kind Constants
-// ============================================================================
-/**
- * Cue point types based on the 'kind' field in the cue table.
- *
- * Note: These values may vary. Verify with actual data.
- */
-exports.CueKind = {
-    MEMORY_CUE: 0,
-    HOT_CUE: 1,
-    // Additional types may exist
-};
-/**
- * Playlist attribute types based on the 'attribute' field.
- */
-exports.PlaylistAttribute = {
-    PLAYLIST: 0,
-    FOLDER: 1,
-};
-/**
- * MyTag attribute types based on the 'attribute' field.
- */
-exports.MyTagAttribute = {
-    TAG: 0,
-    FOLDER: 1,
-};
-// ============================================================================
-// Menu Item Kind Constants
-// ============================================================================
-/**
- * Menu item kinds for browsing categories.
- * These match the 'kind' field in the menuItem table.
- */
-exports.MenuItemKind = {
-    GENRE: 128,
-    ARTIST: 129,
-    ALBUM: 130,
-    TRACK: 131,
-    PLAYLIST: 132,
-    BPM: 133,
-    RATING: 134,
-    YEAR: 135,
-    REMIXER: 136,
-    LABEL: 137,
-    ORIGINAL_ARTIST: 138,
-    KEY: 139,
-    DATE_ADDED: 140,
-    CUE: 141,
-    COLOR: 142,
-    FOLDER: 144,
-    SEARCH: 145,
-    TIME: 146,
-    BITRATE: 147,
-    FILE_NAME: 148,
-    HISTORY: 149,
-    COMMENTS: 150,
-    DJ_PLAY_COUNT: 151,
-    HOT_CUE_BANK: 152,
-    DEFAULT: 161,
-    ALPHABET: 162,
-    MATCHING: 170,
-};
-
-
-/***/ },
-
-/***/ "./src/localdb/onelibrary.ts"
-/*!***********************************!*\
-  !*** ./src/localdb/onelibrary.ts ***!
-  \***********************************/
+/***/ "./src/localdb/orm.ts"
+/*!****************************!*\
+  !*** ./src/localdb/orm.ts ***!
+  \****************************/
 (__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
-/**
- * OneLibrary Database Adapter
- *
- * Provides an interface for reading the OneLibrary (exportLibrary.db) SQLite database
- * used by modern rekordbox versions and Pioneer DJ devices.
- *
- * The database is encrypted with SQLCipher 4. The encryption key is derived from
- * a hardcoded obfuscated blob.
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -5023,673 +5165,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _OneLibraryAdapter_instances, _OneLibraryAdapter_db, _OneLibraryAdapter_stmtCache, _OneLibraryAdapter_getStmt, _OneLibraryAdapter_contentToTrack, _OneLibraryAdapter_cueToCueAndLoop, _OneLibraryAdapter_playlistRowToPlaylist, _OneLibraryAdapter_myTagRowToMyTag;
+var _MetadataORM_conn, _MetadataORM_stmtCache, _MetadataORM_inTransaction;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.OneLibraryAdapter = void 0;
-exports.getEncryptionKey = getEncryptionKey;
-exports.openOneLibraryDb = openOneLibraryDb;
+exports.MetadataORM = exports.Table = void 0;
 const better_sqlite3_multiple_ciphers_1 = __importDefault(__webpack_require__(/*! better-sqlite3-multiple-ciphers */ "better-sqlite3-multiple-ciphers"));
-const zlib = __importStar(__webpack_require__(/*! zlib */ "zlib"));
-const onelibrary_schema_1 = __webpack_require__(/*! ./onelibrary-schema */ "./src/localdb/onelibrary-schema.ts");
-// ============================================================================
-// Encryption Key Derivation
-// ============================================================================
-/**
- * The obfuscated encryption key blob from pyrekordbox
- */
-const BLOB = Buffer.from('PN_1dH8$oLJY)16j_RvM6qphWw`476>;C1cWmI#se(PG`j}~xAjlufj?`#0i{;=glh(SkW)y0>n?YEiD`l%t(', 'ascii');
-/**
- * XOR key used for deobfuscation
- */
-const BLOB_KEY = Buffer.from('657f48f84c437cc1', 'ascii');
-/**
- * Base85 (RFC 1924) decode
- */
-function base85Decode(input) {
-    const alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~';
-    const charToValue = new Map();
-    for (let i = 0; i < alphabet.length; i++) {
-        charToValue.set(alphabet[i], i);
-    }
-    const inputStr = input.toString('ascii');
-    const result = [];
-    for (let i = 0; i < inputStr.length; i += 5) {
-        const chunk = inputStr.slice(i, i + 5);
-        let value = 0;
-        for (const char of chunk) {
-            const v = charToValue.get(char);
-            if (v === undefined) {
-                throw new Error(`Invalid base85 character: ${char}`);
-            }
-            value = value * 85 + v;
-        }
-        const bytes = [
-            (value >> 24) & 0xff,
-            (value >> 16) & 0xff,
-            (value >> 8) & 0xff,
-            value & 0xff,
-        ];
-        const numBytes = chunk.length === 5 ? 4 : chunk.length - 1;
-        result.push(...bytes.slice(0, numBytes));
-    }
-    return Buffer.from(result);
-}
-/**
- * Deobfuscate the blob to get the encryption key
- */
-function deobfuscate(blob) {
-    const decoded = base85Decode(blob);
-    const xored = Buffer.alloc(decoded.length);
-    for (let i = 0; i < decoded.length; i++) {
-        xored[i] = decoded[i] ^ BLOB_KEY[i % BLOB_KEY.length];
-    }
-    const decompressed = zlib.inflateSync(xored);
-    return decompressed.toString('utf-8');
-}
-/**
- * Get the SQLCipher encryption key for OneLibrary databases
- */
-function getEncryptionKey() {
-    const key = deobfuscate(BLOB);
-    if (!key.startsWith('r8gd')) {
-        throw new Error('Invalid encryption key derived');
-    }
-    return key;
-}
-// ============================================================================
-// Database Connection
-// ============================================================================
+const lodash_1 = __webpack_require__(/*! lodash */ "lodash");
+const schema_1 = __webpack_require__(/*! ./schema */ "./src/localdb/schema.ts");
 /**
- * Open a OneLibrary database with SQLCipher decryption
- */
-function openOneLibraryDb(dbPath) {
-    const key = getEncryptionKey();
-    const db = new better_sqlite3_multiple_ciphers_1.default(dbPath, { readonly: true });
-    db.pragma('cipher = sqlcipher');
-    db.pragma('legacy = 4');
-    db.pragma(`key = '${key}'`);
-    return db;
-}
-// ============================================================================
-// OneLibrary Adapter
-// ============================================================================
-/**
- * Adapter for OneLibrary database that matches the ORM interface.
- * Queries the SQLite file directly instead of hydrating into memory.
- */
-class OneLibraryAdapter {
-    constructor(dbPath) {
-        _OneLibraryAdapter_instances.add(this);
-        this.type = 'oneLibrary';
-        _OneLibraryAdapter_db.set(this, void 0);
-        _OneLibraryAdapter_stmtCache.set(this, new Map());
-        __classPrivateFieldSet(this, _OneLibraryAdapter_db, openOneLibraryDb(dbPath), "f");
-    }
-    /**
-     * Close the database connection
-     */
-    close() {
-        __classPrivateFieldGet(this, _OneLibraryAdapter_stmtCache, "f").clear();
-        __classPrivateFieldGet(this, _OneLibraryAdapter_db, "f").close();
-    }
-    // ==========================================================================
-    // Track Queries
-    // ==========================================================================
-    /**
-     * Find a track by ID
-     */
-    findTrack(id) {
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT c.*,
-             a.name as artistName,
-             al.name as albumName,
-             g.name as genreName,
-             k.name as keyName,
-             col.name as colorName,
-             lbl.name as labelName,
-             img.path as artworkPath,
-             remix.name as remixerName,
-             orig.name as originalArtistName,
-             comp.name as composerName
-      FROM content c
-      LEFT JOIN artist a ON c.artist_id_artist = a.artist_id
-      LEFT JOIN album al ON c.album_id = al.album_id
-      LEFT JOIN genre g ON c.genre_id = g.genre_id
-      LEFT JOIN key k ON c.key_id = k.key_id
-      LEFT JOIN color col ON c.color_id = col.color_id
-      LEFT JOIN label lbl ON c.label_id = lbl.label_id
-      LEFT JOIN image img ON c.image_id = img.image_id
-      LEFT JOIN artist remix ON c.artist_id_remixer = remix.artist_id
-      LEFT JOIN artist orig ON c.artist_id_originalArtist = orig.artist_id
-      LEFT JOIN artist comp ON c.artist_id_composer = comp.artist_id
-      WHERE c.content_id = ?
-    `).get(id);
-        if (!row) {
-            return null;
-        }
-        return __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_contentToTrack).call(this, row);
-    }
-    /**
-     * Find all tracks in the database
-     */
-    findAllTracks() {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT c.*,
-             a.name as artistName,
-             al.name as albumName,
-             g.name as genreName,
-             k.name as keyName,
-             col.name as colorName,
-             lbl.name as labelName,
-             img.path as artworkPath,
-             remix.name as remixerName,
-             orig.name as originalArtistName,
-             comp.name as composerName
-      FROM content c
-      LEFT JOIN artist a ON c.artist_id_artist = a.artist_id
-      LEFT JOIN album al ON c.album_id = al.album_id
-      LEFT JOIN genre g ON c.genre_id = g.genre_id
-      LEFT JOIN key k ON c.key_id = k.key_id
-      LEFT JOIN color col ON c.color_id = col.color_id
-      LEFT JOIN label lbl ON c.label_id = lbl.label_id
-      LEFT JOIN image img ON c.image_id = img.image_id
-      LEFT JOIN artist remix ON c.artist_id_remixer = remix.artist_id
-      LEFT JOIN artist orig ON c.artist_id_originalArtist = orig.artist_id
-      LEFT JOIN artist comp ON c.artist_id_composer = comp.artist_id
-    `).all();
-        return rows.map(row => __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_contentToTrack).call(this, row));
-    }
-    // ==========================================================================
-    // Cue Queries
-    // ==========================================================================
-    /**
-     * Find cue points for a track
-     */
-    findCues(trackId) {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM cue WHERE content_id = ?
-    `).all(trackId);
-        return rows.map(row => __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_cueToCueAndLoop).call(this, row));
-    }
-    // ==========================================================================
-    // Playlist Queries
-    // ==========================================================================
-    /**
-     * Find a playlist by ID
-     */
-    findPlaylistById(playlistId) {
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM playlist WHERE playlist_id = ?
-    `).get(playlistId);
-        return row ? __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_playlistRowToPlaylist).call(this, row) : null;
-    }
-    /**
-     * Query for a list of {folders, playlists, tracks} given a playlist ID.
-     * If no ID is provided the root list is queried.
-     */
-    findPlaylist(playlistId) {
-        const parentCondition = playlistId === undefined ? 'playlist_id_parent IS NULL' : 'playlist_id_parent = ?';
-        // Lookup playlists / folders for this playlist ID
-        const playlistRows = (playlistId === undefined
-            ? __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `SELECT * FROM playlist WHERE ${parentCondition}`).all()
-            : __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `SELECT * FROM playlist WHERE ${parentCondition}`).all(playlistId));
-        const folders = [];
-        const playlists = [];
-        for (const row of playlistRows) {
-            const playlist = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_playlistRowToPlaylist).call(this, row);
-            if (playlist.isFolder) {
-                folders.push(playlist);
-            }
-            else {
-                playlists.push(playlist);
-            }
-        }
-        // Get track entries for this playlist
-        const entryRows = playlistId === undefined
-            ? []
-            : __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-          SELECT * FROM playlist_content WHERE playlist_id = ? ORDER BY sequenceNo
-        `).all(playlistId);
-        const trackEntries = entryRows.map((row, index) => ({
-            id: index, // playlist_content doesn't have a unique ID, use index
-            sortIndex: row.sequenceNo,
-            playlistId: row.playlist_id,
-            trackId: row.content_id,
-        }));
-        return { folders, playlists, trackEntries };
-    }
-    /**
-     * Get track IDs for a playlist in order
-     */
-    findPlaylistContents(playlistId) {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT content_id FROM playlist_content
-      WHERE playlist_id = ? ORDER BY sequenceNo
-    `).all(playlistId);
-        return rows.map(r => r.content_id);
-    }
-    // ==========================================================================
-    // Reference Table Queries
-    // ==========================================================================
-    findArtist(artistId) {
-        var _a;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM artist WHERE artist_id = ?
-    `).get(artistId);
-        return row ? { id: row.artist_id, name: (_a = row.name) !== null && _a !== void 0 ? _a : '' } : null;
-    }
-    findAlbum(albumId) {
-        var _a;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM album WHERE album_id = ?
-    `).get(albumId);
-        return row ? { id: row.album_id, name: (_a = row.name) !== null && _a !== void 0 ? _a : '' } : null;
-    }
-    findGenre(genreId) {
-        var _a;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM genre WHERE genre_id = ?
-    `).get(genreId);
-        return row ? { id: row.genre_id, name: (_a = row.name) !== null && _a !== void 0 ? _a : '' } : null;
-    }
-    findKey(keyId) {
-        var _a;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM key WHERE key_id = ?
-    `).get(keyId);
-        return row ? { id: row.key_id, name: (_a = row.name) !== null && _a !== void 0 ? _a : '' } : null;
-    }
-    findColor(colorId) {
-        var _a;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM color WHERE color_id = ?
-    `).get(colorId);
-        return row ? { id: row.color_id, name: (_a = row.name) !== null && _a !== void 0 ? _a : '' } : null;
-    }
-    findLabel(labelId) {
-        var _a;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM label WHERE label_id = ?
-    `).get(labelId);
-        return row ? { id: row.label_id, name: (_a = row.name) !== null && _a !== void 0 ? _a : '' } : null;
-    }
-    findArtwork(imageId) {
-        var _a;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM image WHERE image_id = ?
-    `).get(imageId);
-        return row ? { id: row.image_id, path: (_a = row.path) !== null && _a !== void 0 ? _a : undefined } : null;
-    }
-    // ==========================================================================
-    // MyTag (User Tags) Queries
-    // ==========================================================================
-    /**
-     * Find all root-level MyTags (folders and tags with no parent)
-     */
-    findMyTags(parentId) {
-        const parentCondition = parentId === undefined
-            ? 'myTag_id_parent IS NULL OR myTag_id_parent = 0'
-            : 'myTag_id_parent = ?';
-        const rows = (parentId === undefined
-            ? __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `SELECT * FROM myTag WHERE ${parentCondition} ORDER BY sequenceNo`).all()
-            : __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `SELECT * FROM myTag WHERE ${parentCondition} ORDER BY sequenceNo`).all(parentId));
-        const folders = [];
-        const tags = [];
-        for (const row of rows) {
-            const tag = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_myTagRowToMyTag).call(this, row);
-            if (tag.isFolder) {
-                folders.push(tag);
-            }
-            else {
-                tags.push(tag);
-            }
-        }
-        return { folders, tags };
-    }
-    /**
-     * Find a MyTag by ID
-     */
-    findMyTagById(myTagId) {
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM myTag WHERE myTag_id = ?
-    `).get(myTagId);
-        return row ? __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_myTagRowToMyTag).call(this, row) : null;
-    }
-    /**
-     * Get track IDs for a MyTag
-     */
-    findMyTagContents(myTagId) {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT content_id FROM myTag_content WHERE myTag_id = ?
-    `).all(myTagId);
-        return rows.map(r => r.content_id);
-    }
-    /**
-     * Get all MyTags assigned to a track
-     */
-    findMyTagsForTrack(trackId) {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT t.* FROM myTag t
-      INNER JOIN myTag_content tc ON t.myTag_id = tc.myTag_id
-      WHERE tc.content_id = ?
-    `).all(trackId);
-        return rows.map(row => __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_myTagRowToMyTag).call(this, row));
-    }
-    // ==========================================================================
-    // History Queries
-    // ==========================================================================
-    /**
-     * Find all history sessions
-     */
-    findHistorySessions() {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM history ORDER BY sequenceNo
-    `).all();
-        return rows.map(row => {
-            var _a;
-            return ({
-                id: row.history_id,
-                name: (_a = row.name) !== null && _a !== void 0 ? _a : '',
-                parentId: row.history_id_parent,
-            });
-        });
-    }
-    /**
-     * Get track IDs for a history session in order
-     */
-    findHistoryContents(historyId) {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT content_id FROM history_content
-      WHERE history_id = ? ORDER BY sequenceNo
-    `).all(historyId);
-        return rows.map(r => r.content_id);
-    }
-    // ==========================================================================
-    // Hot Cue Bank Queries
-    // ==========================================================================
-    /**
-     * Find all hot cue bank lists
-     */
-    findHotCueBankLists() {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM hotCueBankList ORDER BY sequenceNo
-    `).all();
-        return rows.map(row => {
-            var _a;
-            return ({
-                id: row.hotCueBankList_id,
-                name: (_a = row.name) !== null && _a !== void 0 ? _a : '',
-                parentId: row.hotCueBankList_id_parent,
-            });
-        });
-    }
-    /**
-     * Get cue IDs for a hot cue bank list
-     */
-    findHotCueBankListCues(bankListId) {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT cue_id FROM hotCueBankList_cue
-      WHERE hotCueBankList_id = ? ORDER BY sequenceNo
-    `).all(bankListId);
-        return rows.map(r => r.cue_id);
-    }
-    // ==========================================================================
-    // Menu Configuration Queries
-    // ==========================================================================
-    /**
-     * Get all menu items (browse categories)
-     */
-    findMenuItems() {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM menuItem ORDER BY menuItem_id
-    `).all();
-        return rows.map(row => {
-            var _a, _b;
-            return ({
-                id: row.menuItem_id,
-                kind: (_a = row.kind) !== null && _a !== void 0 ? _a : 0,
-                name: (_b = row.name) !== null && _b !== void 0 ? _b : '',
-            });
-        });
-    }
-    /**
-     * Get visible categories with their menu item info
-     */
-    findVisibleCategories() {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT c.*, m.name as menuName, m.kind as menuKind
-      FROM category c
-      LEFT JOIN menuItem m ON c.menuItem_id = m.menuItem_id
-      WHERE c.isVisible = 1
-      ORDER BY c.sequenceNo
-    `).all();
-        return rows.map(row => {
-            var _a, _b, _c;
-            return ({
-                id: row.category_id,
-                menuItemId: (_a = row.menuItem_id) !== null && _a !== void 0 ? _a : 0,
-                name: (_b = row.menuName) !== null && _b !== void 0 ? _b : '',
-                kind: (_c = row.menuKind) !== null && _c !== void 0 ? _c : 0,
-                isVisible: !!row.isVisible,
-            });
-        });
-    }
-    /**
-     * Get visible sort options
-     */
-    findVisibleSortOptions() {
-        const rows = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT s.*, m.name as menuName, m.kind as menuKind
-      FROM sort s
-      LEFT JOIN menuItem m ON s.menuItem_id = m.menuItem_id
-      WHERE s.isVisible = 1
-      ORDER BY s.sequenceNo
-    `).all();
-        return rows.map(row => {
-            var _a, _b, _c;
-            return ({
-                id: row.sort_id,
-                menuItemId: (_a = row.menuItem_id) !== null && _a !== void 0 ? _a : 0,
-                name: (_b = row.menuName) !== null && _b !== void 0 ? _b : '',
-                kind: (_c = row.menuKind) !== null && _c !== void 0 ? _c : 0,
-                isVisible: !!row.isVisible,
-                isSelectedAsSubColumn: !!row.isSelectedAsSubColumn,
-            });
-        });
-    }
-    // ==========================================================================
-    // Device Property Queries
-    // ==========================================================================
-    /**
-     * Get device properties
-     */
-    getProperty() {
-        var _a, _b, _c, _d, _e;
-        const row = __classPrivateFieldGet(this, _OneLibraryAdapter_instances, "m", _OneLibraryAdapter_getStmt).call(this, `
-      SELECT * FROM property LIMIT 1
-    `).get();
-        if (!row) {
-            return null;
-        }
-        return {
-            deviceName: (_a = row.deviceName) !== null && _a !== void 0 ? _a : '',
-            dbVersion: (_b = row.dbVersion) !== null && _b !== void 0 ? _b : '',
-            numberOfContents: (_c = row.numberOfContents) !== null && _c !== void 0 ? _c : 0,
-            createdDate: (_d = row.createdDate) !== null && _d !== void 0 ? _d : '',
-            backgroundColorType: (_e = row.backGroundColorType) !== null && _e !== void 0 ? _e : 0,
-        };
-    }
-}
-exports.OneLibraryAdapter = OneLibraryAdapter;
-_OneLibraryAdapter_db = new WeakMap(), _OneLibraryAdapter_stmtCache = new WeakMap(), _OneLibraryAdapter_instances = new WeakSet(), _OneLibraryAdapter_getStmt = function _OneLibraryAdapter_getStmt(sql) {
-    let stmt = __classPrivateFieldGet(this, _OneLibraryAdapter_stmtCache, "f").get(sql);
-    if (!stmt) {
-        stmt = __classPrivateFieldGet(this, _OneLibraryAdapter_db, "f").prepare(sql);
-        __classPrivateFieldGet(this, _OneLibraryAdapter_stmtCache, "f").set(sql, stmt);
-    }
-    return stmt;
-}, _OneLibraryAdapter_contentToTrack = function _OneLibraryAdapter_contentToTrack(row) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
-    const track = {
-        id: row.content_id,
-        title: (_a = row.title) !== null && _a !== void 0 ? _a : '',
-        duration: row.length ? row.length / 1000 : 0, // ms to seconds
-        bitrate: (_b = row.bitrate) !== null && _b !== void 0 ? _b : undefined,
-        tempo: row.bpmx100 ? row.bpmx100 / 100 : 0,
-        rating: (_c = row.rating) !== null && _c !== void 0 ? _c : 0,
-        comment: (_d = row.djComment) !== null && _d !== void 0 ? _d : '',
-        filePath: (_e = row.path) !== null && _e !== void 0 ? _e : '',
-        fileName: (_f = row.fileName) !== null && _f !== void 0 ? _f : '',
-        trackNumber: (_g = row.trackNo) !== null && _g !== void 0 ? _g : undefined,
-        discNumber: (_h = row.discNo) !== null && _h !== void 0 ? _h : undefined,
-        sampleRate: (_j = row.samplingRate) !== null && _j !== void 0 ? _j : undefined,
-        sampleDepth: (_k = row.bitDepth) !== null && _k !== void 0 ? _k : undefined,
-        playCount: (_l = row.djPlayCount) !== null && _l !== void 0 ? _l : undefined,
-        year: (_m = row.releaseYear) !== null && _m !== void 0 ? _m : undefined,
-        mixName: (_o = row.subtitle) !== null && _o !== void 0 ? _o : undefined,
-        autoloadHotcues: !!row.isHotCueAutoLoadOn,
-        kuvoPublic: !!row.isKuvoDeliverStatusOn,
-        fileSize: (_p = row.fileSize) !== null && _p !== void 0 ? _p : undefined,
-        // Normalize analyzePath by trimming the .DAT extension (same as rekordbox.ts)
-        // loadAnlz() will append the appropriate extension (.DAT or .EXT) when loading
-        analyzePath: row.analysisDataFilePath
-            ? row.analysisDataFilePath.substring(0, row.analysisDataFilePath.length - 4)
-            : undefined,
-        releaseDate: (_q = row.releaseDate) !== null && _q !== void 0 ? _q : undefined,
-        dateAdded: row.dateAdded ? new Date(row.dateAdded) : undefined,
-        beatGrid: null,
-        cueAndLoops: null,
-        waveformHd: null,
-        artwork: row.image_id
-            ? { id: row.image_id, path: (_r = row.artworkPath) !== null && _r !== void 0 ? _r : undefined }
-            : null,
-        artist: row.artist_id_artist
-            ? { id: row.artist_id_artist, name: (_s = row.artistName) !== null && _s !== void 0 ? _s : '' }
-            : null,
-        originalArtist: row.artist_id_originalArtist
-            ? {
-                id: row.artist_id_originalArtist,
-                name: (_t = row.originalArtistName) !== null && _t !== void 0 ? _t : '',
-            }
-            : null,
-        remixer: row.artist_id_remixer
-            ? { id: row.artist_id_remixer, name: (_u = row.remixerName) !== null && _u !== void 0 ? _u : '' }
-            : null,
-        composer: row.artist_id_composer
-            ? { id: row.artist_id_composer, name: (_v = row.composerName) !== null && _v !== void 0 ? _v : '' }
-            : null,
-        album: row.album_id
-            ? { id: row.album_id, name: (_w = row.albumName) !== null && _w !== void 0 ? _w : '' }
-            : null,
-        label: row.label_id
-            ? { id: row.label_id, name: (_x = row.labelName) !== null && _x !== void 0 ? _x : '' }
-            : null,
-        genre: row.genre_id
-            ? { id: row.genre_id, name: (_y = row.genreName) !== null && _y !== void 0 ? _y : '' }
-            : null,
-        color: row.color_id
-            ? { id: row.color_id, name: (_z = row.colorName) !== null && _z !== void 0 ? _z : '' }
-            : null,
-        key: row.key_id ? { id: row.key_id, name: (_0 = row.keyName) !== null && _0 !== void 0 ? _0 : '' } : null,
-    };
-    return track;
-}, _OneLibraryAdapter_cueToCueAndLoop = function _OneLibraryAdapter_cueToCueAndLoop(row) {
-    var _a, _b, _c, _d, _e, _f;
-    const offset = row.inUsec ? row.inUsec / 1000 : 0; // microseconds to ms
-    const outOffset = (_a = row.outUsec) !== null && _a !== void 0 ? _a : null;
-    const isLoop = outOffset !== null && outOffset > 0;
-    const length = isLoop ? (outOffset - ((_b = row.inUsec) !== null && _b !== void 0 ? _b : 0)) / 1000 : 0;
-    // Determine if this is a hot cue (kind value mapping may vary)
-    // Based on observation: kind 0 = memory cue, kind >= 1 may be hot cue
-    const isHotCue = ((_c = row.kind) !== null && _c !== void 0 ? _c : 0) >= 1 && ((_d = row.kind) !== null && _d !== void 0 ? _d : 0) <= 8;
-    const button = isHotCue ? ((_e = row.kind) !== null && _e !== void 0 ? _e : 0) : undefined;
-    const label = (_f = row.cueComment) !== null && _f !== void 0 ? _f : undefined;
-    const color = row.colorTableIndex;
-    if (isLoop && isHotCue) {
-        return {
-            type: 'hot_loop',
-            offset,
-            length,
-            button: button,
-            label,
-            color,
-        };
-    }
-    if (isLoop) {
-        return {
-            type: 'loop',
-            offset,
-            length,
-            label,
-            color,
-        };
-    }
-    if (isHotCue) {
-        return {
-            type: 'hot_cue',
-            offset,
-            button: button,
-            label,
-            color,
-        };
-    }
-    return {
-        type: 'cue_point',
-        offset,
-        label,
-        color,
-    };
-}, _OneLibraryAdapter_playlistRowToPlaylist = function _OneLibraryAdapter_playlistRowToPlaylist(row) {
-    var _a;
-    return {
-        id: row.playlist_id,
-        name: (_a = row.name) !== null && _a !== void 0 ? _a : '',
-        isFolder: row.attribute === onelibrary_schema_1.PlaylistAttribute.FOLDER,
-        parentId: row.playlist_id_parent,
-    };
-}, _OneLibraryAdapter_myTagRowToMyTag = function _OneLibraryAdapter_myTagRowToMyTag(row) {
-    var _a;
-    return {
-        id: row.myTag_id,
-        name: (_a = row.name) !== null && _a !== void 0 ? _a : '',
-        isFolder: row.attribute === onelibrary_schema_1.MyTagAttribute.FOLDER,
-        parentId: row.myTag_id_parent,
-    };
-};
-
-
-/***/ },
-
-/***/ "./src/localdb/orm.ts"
-/*!****************************!*\
-  !*** ./src/localdb/orm.ts ***!
-  \****************************/
-(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _MetadataORM_conn, _MetadataORM_stmtCache, _MetadataORM_inTransaction;
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MetadataORM = exports.Table = void 0;
-const better_sqlite3_multiple_ciphers_1 = __importDefault(__webpack_require__(/*! better-sqlite3-multiple-ciphers */ "better-sqlite3-multiple-ciphers"));
-const lodash_1 = __webpack_require__(/*! lodash */ "lodash");
-const schema_1 = __webpack_require__(/*! ./schema */ "./src/localdb/schema.ts");
-/**
- * Table names available
+ * Table names available
  */
 var Table;
 (function (Table) {
@@ -5863,215 +5346,245 @@ _MetadataORM_conn = new WeakMap(), _MetadataORM_stmtCache = new WeakMap(), _Meta
 
 "use strict";
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _RekordboxHydrator_orm, _RekordboxHydrator_onProgress;
+/**
+ * Rekordbox Database Utilities
+ *
+ * Re-exports from the rekordbox/ folder for backward compatibility.
+ * @see ./rekordbox/index.ts for the implementation
+ */
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.hydrateDatabase = hydrateDatabase;
-exports.loadAnlz = loadAnlz;
-const kaitai_struct_1 = __webpack_require__(/*! kaitai-struct */ "kaitai-struct");
-const rekordbox_anlz_ksy_1 = __importDefault(__webpack_require__(/*! src/localdb/kaitai/rekordbox_anlz.ksy */ "./src/localdb/kaitai/rekordbox_anlz.ksy"));
-const rekordbox_pdb_ksy_1 = __importDefault(__webpack_require__(/*! src/localdb/kaitai/rekordbox_pdb.ksy */ "./src/localdb/kaitai/rekordbox_pdb.ksy"));
-const orm_1 = __webpack_require__(/*! src/localdb/orm */ "./src/localdb/orm.ts");
+exports.loadAnlz = exports.hydrateDatabase = void 0;
+var index_1 = __webpack_require__(/*! ./rekordbox/index */ "./src/localdb/rekordbox/index.ts");
+Object.defineProperty(exports, "hydrateDatabase", ({ enumerable: true, get: function () { return index_1.hydrateDatabase; } }));
+Object.defineProperty(exports, "loadAnlz", ({ enumerable: true, get: function () { return index_1.loadAnlz; } }));
+
+
+/***/ },
+
+/***/ "./src/localdb/rekordbox/anlz-parsers.ts"
+/*!***********************************************!*\
+  !*** ./src/localdb/rekordbox/anlz-parsers.ts ***!
+  \***********************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.makeBeatGrid = makeBeatGrid;
+exports.makeCueAndLoop = makeCueAndLoop;
+exports.makeWaveformHd = makeWaveformHd;
+exports.makeExtendedCues = makeExtendedCues;
+exports.makeSongStructure = makeSongStructure;
+exports.makeWaveformPreview = makeWaveformPreview;
+exports.makeWaveform3BandPreview = makeWaveform3BandPreview;
+exports.makeWaveform3BandDetail = makeWaveform3BandDetail;
+exports.makeVocalConfig = makeVocalConfig;
 const utils_1 = __webpack_require__(/*! src/localdb/utils */ "./src/localdb/utils.ts");
 const converters_1 = __webpack_require__(/*! src/utils/converters */ "./src/utils/converters.ts");
-const Telemetry = __importStar(__webpack_require__(/*! src/utils/telemetry */ "./src/utils/telemetry.ts"));
 /**
- * Given a rekordbox pdb file contents. This function will hydrate the provided
- * database with all entities from the Rekordbox database. This includes all
- * track metadata, including analyzed metadata (such as beatgrids and waveforms).
+ * Fill beatgrid data from the ANLZ section
  */
-async function hydrateDatabase({ pdbData, span, ...options }) {
-    const hydrator = new RekordboxHydrator(options);
-    await hydrator.hydrateFromPdb(pdbData, span);
+function makeBeatGrid(data) {
+    return data.body.beats.map((beat) => ({
+        offset: beat.time,
+        bpm: beat.tempo / 100,
+        count: beat.beatNumber,
+    }));
 }
 /**
- * Loads the ANLZ data of a Track entity from the analyzePath.
+ * Fill cue and loop data from the ANLZ section
  */
-async function loadAnlz(track, type, anlzResolver) {
-    const path = `${track.analyzePath}.${type}`;
-    const anlzData = await anlzResolver(path);
-    const stream = new kaitai_struct_1.KaitaiStream(anlzData);
-    const anlz = new rekordbox_anlz_ksy_1.default(stream);
-    const result = {};
-    const resultDat = result;
-    const resultExt = result;
-    for (const section of anlz.sections) {
-        switch (section.fourcc) {
-            case SectionTags.BEAT_GRID:
-                resultDat.beatGrid = makeBeatGrid(section);
-                break;
-            case SectionTags.CUES:
-                resultDat.cueAndLoops = makeCueAndLoop(section);
-                break;
-            case SectionTags.CUES_2:
-                resultExt.extendedCues = makeExtendedCues(section);
-                break;
-            case SectionTags.WAVE_PREVIEW:
-                resultDat.waveformPreview = makeWaveformPreview(section);
-                break;
-            case SectionTags.WAVE_TINY:
-                resultDat.waveformTiny = makeWaveformPreview(section);
-                break;
-            case SectionTags.WAVE_SCROLL:
-                resultExt.waveformDetail = Buffer.from(section.body.entries);
-                break;
-            case SectionTags.WAVE_COLOR_PREVIEW:
-                resultExt.waveformColorPreview = Buffer.from(section.body.entries);
-                break;
-            case SectionTags.WAVE_COLOR_SCROLL:
-                resultExt.waveformHd = makeWaveformHd(section);
-                break;
-            case SectionTags.SONG_STRUCTURE:
-                resultExt.songStructure = makeSongStructure(section);
-                break;
-            // VBR and PATH tags are defined but not currently extracted
-            // as they're not commonly needed in the application
-            case SectionTags.VBR:
-            case SectionTags.PATH:
-                break;
-        }
-    }
-    return result;
+function makeCueAndLoop(data) {
+    return data.body.cues.map((entry) => {
+        // Cues with the status 0 are likely leftovers that were removed
+        const button = entry.hotCue === 0 ? false : entry.type;
+        const isCue = entry.type === 0x01;
+        const isLoop = entry.type === 0x02;
+        // NOTE: Unlike the remotedb, these entries are already in milliseconds.
+        const offset = entry.time;
+        const length = entry.loopTime - offset;
+        return (0, utils_1.makeCueLoopEntry)(isCue, isLoop, offset, length, button);
+    });
 }
 /**
- * This service provides utilities for translating rekordbox database (pdb_ and
- * analysis (ANLZ) files into the common entity types used in this library.
+ * Fill waveform HD data from the ANLZ section
  */
-class RekordboxHydrator {
-    constructor({ orm, onProgress }) {
-        _RekordboxHydrator_orm.set(this, void 0);
-        _RekordboxHydrator_onProgress.set(this, void 0);
-        __classPrivateFieldSet(this, _RekordboxHydrator_orm, orm, "f");
-        __classPrivateFieldSet(this, _RekordboxHydrator_onProgress, onProgress !== null && onProgress !== void 0 ? onProgress : (() => null), "f");
-    }
-    /**
-     * Extract entries from a rekordbox pdb file and hydrate the passed database
-     * connection with entities derived from the rekordbox entries.
-     */
-    async hydrateFromPdb(pdbData, span) {
-        const tx = span
-            ? span.startChild({ op: 'hydrateFromPdb' })
-            : Telemetry.startTransaction({ name: 'hydrateFromPdb' });
-        const parseTx = tx.startChild({ op: 'parsePdbData', data: { size: pdbData.length } });
-        const stream = new kaitai_struct_1.KaitaiStream(pdbData);
-        const db = new rekordbox_pdb_ksy_1.default(stream);
-        parseTx.finish();
-        const hydrateTx = tx.startChild({ op: 'hydration' });
-        await Promise.all(db.tables.map((table) => this.hydrateFromTable(table, hydrateTx)));
-        hydrateTx.finish();
-        tx.finish();
-    }
-    /**
-     * Hydrate the database with entities from the provided RekordboxPdb table.
-     * See pdbEntityCreators for how tables are mapped into database entities.
-     */
-    async hydrateFromTable(table, span) {
-        const tableName = pdbTables[table.type];
-        const createObject = pdbEntityCreators[table.type];
-        const tx = span.startChild({ op: 'hydrateFromTable', description: tableName });
-        if (createObject === undefined) {
-            return;
+function makeWaveformHd(data) {
+    return (0, converters_1.convertWaveformHDData)(Buffer.from(data.body.entries));
+}
+/**
+ * Parse extended cues (PCO2) with colors and comments
+ */
+function makeExtendedCues(data) {
+    return data.body.cues.map((entry) => {
+        var _a, _b, _c, _d;
+        const cue = {
+            hotCue: entry.hotCue,
+            type: entry.type,
+            time: entry.time,
+        };
+        // Add loop end time if this is a loop
+        if (entry.type === 2 && entry.loopTime !== undefined) {
+            cue.loopTime = entry.loopTime;
         }
-        let totalSaved = 0;
-        let totalItems = 0;
-        for (const _row of tableRows(table)) {
-            void _row; // Intentionally unused - just counting
-            totalItems++;
+        // Add color ID for memory points/loops
+        if (entry.colorId !== undefined && entry.colorId > 0) {
+            cue.colorId = entry.colorId;
         }
-        tx.setData('items', totalItems);
-        // Use transaction for bulk inserts (10-100x faster)
-        __classPrivateFieldGet(this, _RekordboxHydrator_orm, "f").beginTransaction();
-        try {
-            for (const row of tableRows(table)) {
-                const entity = createObject(row);
-                __classPrivateFieldGet(this, _RekordboxHydrator_orm, "f").insertEntity(tableName, entity);
-                totalSaved++;
-                // Report progress and yield every 100 rows (instead of every row)
-                if (totalSaved % 100 === 0 || totalSaved === totalItems) {
-                    __classPrivateFieldGet(this, _RekordboxHydrator_onProgress, "f").call(this, { complete: totalSaved, table: tableName, total: totalItems });
-                    // Yield to event loop periodically to keep UI responsive
-                    await new Promise(r => setTimeout(r, 0));
-                }
-            }
+        // Add hot cue color information
+        if (entry.colorCode !== undefined && entry.colorCode > 0) {
+            cue.colorCode = entry.colorCode;
+            cue.colorRgb = {
+                r: (_a = entry.colorRed) !== null && _a !== void 0 ? _a : 0,
+                g: (_b = entry.colorGreen) !== null && _b !== void 0 ? _b : 0,
+                b: (_c = entry.colorBlue) !== null && _c !== void 0 ? _c : 0,
+            };
         }
-        finally {
-            __classPrivateFieldGet(this, _RekordboxHydrator_orm, "f").commit();
+        // Add comment if present
+        if (entry.lenComment > 0 && entry.comment) {
+            cue.comment = entry.comment;
         }
-        tx.finish();
-    }
+        // Add quantized loop information if present
+        if (entry.loopNumerator !== undefined && entry.loopNumerator > 0) {
+            cue.loopNumerator = entry.loopNumerator;
+            cue.loopDenominator = (_d = entry.loopDenominator) !== null && _d !== void 0 ? _d : 1;
+        }
+        return cue;
+    });
 }
-_RekordboxHydrator_orm = new WeakMap(), _RekordboxHydrator_onProgress = new WeakMap();
 /**
- * Utility generator that pages through a table and yields every present row.
- * This flattens the concept of rowGroups and refs.
+ * Parse song structure (PSSI) with phrase analysis
  */
-function* tableRows(table) {
-    const { firstPage, lastPage } = table;
-    let pageRef = firstPage;
-    do {
-        const page = pageRef.body;
-        // Adjust our page ref for the next iteration. We do this early in our loop
-        // so we can break without having to remember to update for the next iter.
-        pageRef = page.nextPage;
-        // Ignore non-data pages. Not sure what these are for?
-        if (!page.isDataPage) {
-            continue;
-        }
-        const rows = page.rowGroups
-            .map((group) => group.rows)
-            .flat()
-            .filter((row) => row.present);
-        for (const row of rows) {
-            yield row.body;
+function makeSongStructure(data) {
+    var _a, _b;
+    const moodMap = {
+        1: 'high',
+        2: 'mid',
+        3: 'low',
+    };
+    const bankMap = {
+        0: 'default',
+        1: 'cool',
+        2: 'natural',
+        3: 'hot',
+        4: 'subtle',
+        5: 'warm',
+        6: 'vivid',
+        7: 'club_1',
+        8: 'club_2',
+    };
+    // Phrase type mappings based on mood
+    const phraseTypeMap = {
+        high: {
+            1: 'Intro',
+            2: 'Up',
+            3: 'Down',
+            5: 'Chorus',
+            6: 'Outro',
+        },
+        mid: {
+            1: 'Intro',
+            2: 'Verse 1',
+            3: 'Verse 2',
+            4: 'Verse 3',
+            5: 'Verse 4',
+            6: 'Verse 5',
+            7: 'Verse 6',
+            8: 'Bridge',
+            9: 'Chorus',
+            10: 'Outro',
+        },
+        low: {
+            1: 'Intro',
+            2: 'Verse 1',
+            3: 'Verse 1',
+            4: 'Verse 1',
+            5: 'Verse 2',
+            6: 'Verse 2',
+            7: 'Verse 2',
+            8: 'Bridge',
+            9: 'Chorus',
+            10: 'Outro',
+        },
+    };
+    const mood = (_a = moodMap[data.body.mood]) !== null && _a !== void 0 ? _a : 'high';
+    const bank = (_b = bankMap[data.body.rawBank]) !== null && _b !== void 0 ? _b : 'default';
+    const phrases = data.body.entries.map((entry) => {
+        var _a;
+        const phrase = {
+            index: entry.index,
+            beat: entry.beat,
+            kind: entry.kind,
+            phraseType: (_a = phraseTypeMap[mood][entry.kind]) !== null && _a !== void 0 ? _a : 'Unknown',
+        };
+        // Add fill-in information if present
+        if (entry.fill > 0) {
+            phrase.fill = entry.fill;
+            phrase.fillBeat = entry.beatFill;
         }
-    } while (pageRef.index <= lastPage.index);
+        return phrase;
+    });
+    return {
+        mood,
+        bank,
+        endBeat: data.body.endBeat,
+        phrases,
+    };
 }
+/**
+ * Parse waveform preview data (PWAV/PWV2)
+ */
+function makeWaveformPreview(data) {
+    return {
+        data: Buffer.from(data.body.data),
+    };
+}
+/**
+ * Parse 3-band color waveform preview (PWV6 from .2EX files)
+ */
+function makeWaveform3BandPreview(data) {
+    return {
+        numEntries: data.body.lenEntries,
+        data: Buffer.from(data.body.entries),
+    };
+}
+/**
+ * Parse 3-band color detail waveform (PWV7 from .2EX files)
+ */
+function makeWaveform3BandDetail(data) {
+    return {
+        numEntries: data.body.lenEntries,
+        data: Buffer.from(data.body.entries),
+    };
+}
+/**
+ * Parse vocal detection config (PWVC from .2EX files)
+ */
+function makeVocalConfig(data) {
+    return {
+        thresholdLow: data.body.thresholdLow,
+        thresholdMid: data.body.thresholdMid,
+        thresholdHigh: data.body.thresholdHigh,
+    };
+}
+
+
+/***/ },
+
+/***/ "./src/localdb/rekordbox/entity-creators.ts"
+/*!**************************************************!*\
+  !*** ./src/localdb/rekordbox/entity-creators.ts ***!
+  \**************************************************/
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.makeIdNameHydrator = void 0;
+exports.createTrack = createTrack;
+exports.createPlaylist = createPlaylist;
+exports.createPlaylistEntry = createPlaylistEntry;
+exports.createArtworkEntry = createArtworkEntry;
 const ensureDate = (date) => date instanceof Date && !isNaN(date.valueOf()) ? date : undefined;
 /**
  * Utility to create a hydrator that hydrates the provided entity with the id
@@ -6084,6 +5597,7 @@ const makeIdNameHydrator = () => (row) => {
         name: (_a = row.name.body.text) !== null && _a !== void 0 ? _a : '',
     });
 };
+exports.makeIdNameHydrator = makeIdNameHydrator;
 /**
  * Translates a pdb track row entry to a {@link Track} entity.
  */
@@ -6176,170 +5690,282 @@ function createArtworkEntry(artworkRow) {
     };
     return art;
 }
+
+
+/***/ },
+
+/***/ "./src/localdb/rekordbox/hydrator.ts"
+/*!*******************************************!*\
+  !*** ./src/localdb/rekordbox/hydrator.ts ***!
+  \*******************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _RekordboxHydrator_orm, _RekordboxHydrator_onProgress;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RekordboxHydrator = void 0;
+const kaitai_struct_1 = __webpack_require__(/*! kaitai-struct */ "kaitai-struct");
+const rekordbox_pdb_ksy_1 = __importDefault(__webpack_require__(/*! src/localdb/kaitai/rekordbox_pdb.ksy */ "./src/localdb/kaitai/rekordbox_pdb.ksy"));
+const Telemetry = __importStar(__webpack_require__(/*! src/utils/telemetry */ "./src/utils/telemetry.ts"));
+const table_mappings_1 = __webpack_require__(/*! ./table-mappings */ "./src/localdb/rekordbox/table-mappings.ts");
 /**
- * Fill beatgrid data from the ANLZ section
- */
-function makeBeatGrid(data) {
-    return data.body.beats.map((beat) => ({
-        offset: beat.time,
-        bpm: beat.tempo / 100,
-        count: beat.beatNumber,
-    }));
-}
-/**
- * Fill cue and loop data from the ANLZ section
- */
-function makeCueAndLoop(data) {
-    return data.body.cues.map((entry) => {
-        // Cues with the status 0 are likely leftovers that were removed
-        const button = entry.hotCue === 0 ? false : entry.type;
-        const isCue = entry.type === 0x01;
-        const isLoop = entry.type === 0x02;
-        // NOTE: Unlike the remotedb, these entries are already in milliseconds.
-        const offset = entry.time;
-        const length = entry.loopTime - offset;
-        return (0, utils_1.makeCueLoopEntry)(isCue, isLoop, offset, length, button);
-    });
-}
-/**
- * Fill waveform HD data from the ANLZ section
- */
-function makeWaveformHd(data) {
-    return (0, converters_1.convertWaveformHDData)(Buffer.from(data.body.entries));
-}
-/**
- * Parse extended cues (PCO2) with colors and comments
+ * This service provides utilities for translating rekordbox database (pdb_ and
+ * analysis (ANLZ) files into the common entity types used in this library.
  */
-function makeExtendedCues(data) {
-    return data.body.cues.map((entry) => {
-        var _a, _b, _c, _d;
-        const cue = {
-            hotCue: entry.hotCue,
-            type: entry.type,
-            time: entry.time,
-        };
-        // Add loop end time if this is a loop
-        if (entry.type === 2 && entry.loopTime !== undefined) {
-            cue.loopTime = entry.loopTime;
+class RekordboxHydrator {
+    constructor({ orm, onProgress }) {
+        _RekordboxHydrator_orm.set(this, void 0);
+        _RekordboxHydrator_onProgress.set(this, void 0);
+        __classPrivateFieldSet(this, _RekordboxHydrator_orm, orm, "f");
+        __classPrivateFieldSet(this, _RekordboxHydrator_onProgress, onProgress !== null && onProgress !== void 0 ? onProgress : (() => null), "f");
+    }
+    /**
+     * Extract entries from a rekordbox pdb file and hydrate the passed database
+     * connection with entities derived from the rekordbox entries.
+     */
+    async hydrateFromPdb(pdbData, span) {
+        const tx = span
+            ? span.startChild({ op: 'hydrateFromPdb' })
+            : Telemetry.startTransaction({ name: 'hydrateFromPdb' });
+        const parseTx = tx.startChild({ op: 'parsePdbData', data: { size: pdbData.length } });
+        const stream = new kaitai_struct_1.KaitaiStream(pdbData);
+        const db = new rekordbox_pdb_ksy_1.default(stream);
+        parseTx.finish();
+        const hydrateTx = tx.startChild({ op: 'hydration' });
+        await Promise.all(db.tables.map((table) => this.hydrateFromTable(table, hydrateTx)));
+        hydrateTx.finish();
+        tx.finish();
+    }
+    /**
+     * Hydrate the database with entities from the provided RekordboxPdb table.
+     * See pdbEntityCreators for how tables are mapped into database entities.
+     */
+    async hydrateFromTable(table, span) {
+        const tableName = table_mappings_1.pdbTables[table.type];
+        const createObject = table_mappings_1.pdbEntityCreators[table.type];
+        const tx = span.startChild({ op: 'hydrateFromTable', description: tableName });
+        if (createObject === undefined) {
+            return;
         }
-        // Add color ID for memory points/loops
-        if (entry.colorId !== undefined && entry.colorId > 0) {
-            cue.colorId = entry.colorId;
+        let totalSaved = 0;
+        let totalItems = 0;
+        for (const _row of tableRows(table)) {
+            void _row; // Intentionally unused - just counting
+            totalItems++;
         }
-        // Add hot cue color information
-        if (entry.colorCode !== undefined && entry.colorCode > 0) {
-            cue.colorCode = entry.colorCode;
-            cue.colorRgb = {
-                r: (_a = entry.colorRed) !== null && _a !== void 0 ? _a : 0,
-                g: (_b = entry.colorGreen) !== null && _b !== void 0 ? _b : 0,
-                b: (_c = entry.colorBlue) !== null && _c !== void 0 ? _c : 0,
-            };
+        tx.setData('items', totalItems);
+        // Use transaction for bulk inserts (10-100x faster)
+        __classPrivateFieldGet(this, _RekordboxHydrator_orm, "f").beginTransaction();
+        try {
+            for (const row of tableRows(table)) {
+                const entity = createObject(row);
+                __classPrivateFieldGet(this, _RekordboxHydrator_orm, "f").insertEntity(tableName, entity);
+                totalSaved++;
+                // Report progress and yield every 100 rows (instead of every row)
+                if (totalSaved % 100 === 0 || totalSaved === totalItems) {
+                    __classPrivateFieldGet(this, _RekordboxHydrator_onProgress, "f").call(this, { complete: totalSaved, table: tableName, total: totalItems });
+                    // Yield to event loop periodically to keep UI responsive
+                    await new Promise(r => setTimeout(r, 0));
+                }
+            }
         }
-        // Add comment if present
-        if (entry.lenComment > 0 && entry.comment) {
-            cue.comment = entry.comment;
+        finally {
+            __classPrivateFieldGet(this, _RekordboxHydrator_orm, "f").commit();
         }
-        // Add quantized loop information if present
-        if (entry.loopNumerator !== undefined && entry.loopNumerator > 0) {
-            cue.loopNumerator = entry.loopNumerator;
-            cue.loopDenominator = (_d = entry.loopDenominator) !== null && _d !== void 0 ? _d : 1;
+        tx.finish();
+    }
+}
+exports.RekordboxHydrator = RekordboxHydrator;
+_RekordboxHydrator_orm = new WeakMap(), _RekordboxHydrator_onProgress = new WeakMap();
+/**
+ * Utility generator that pages through a table and yields every present row.
+ * This flattens the concept of rowGroups and refs.
+ */
+function* tableRows(table) {
+    const { firstPage, lastPage } = table;
+    let pageRef = firstPage;
+    do {
+        const page = pageRef.body;
+        // Adjust our page ref for the next iteration. We do this early in our loop
+        // so we can break without having to remember to update for the next iter.
+        pageRef = page.nextPage;
+        // Ignore non-data pages. Not sure what these are for?
+        if (!page.isDataPage) {
+            continue;
         }
-        return cue;
-    });
+        const rows = page.rowGroups
+            .map((group) => group.rows)
+            .flat()
+            .filter((row) => row.present);
+        for (const row of rows) {
+            yield row.body;
+        }
+    } while (pageRef.index <= lastPage.index);
 }
+
+
+/***/ },
+
+/***/ "./src/localdb/rekordbox/index.ts"
+/*!****************************************!*\
+  !*** ./src/localdb/rekordbox/index.ts ***!
+  \****************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.hydrateDatabase = hydrateDatabase;
+exports.loadAnlz = loadAnlz;
+const kaitai_struct_1 = __webpack_require__(/*! kaitai-struct */ "kaitai-struct");
+const rekordbox_anlz_ksy_1 = __importDefault(__webpack_require__(/*! src/localdb/kaitai/rekordbox_anlz.ksy */ "./src/localdb/kaitai/rekordbox_anlz.ksy"));
+const anlz_parsers_1 = __webpack_require__(/*! ./anlz-parsers */ "./src/localdb/rekordbox/anlz-parsers.ts");
+const hydrator_1 = __webpack_require__(/*! ./hydrator */ "./src/localdb/rekordbox/hydrator.ts");
+const { SectionTags } = rekordbox_anlz_ksy_1.default;
 /**
- * Parse song structure (PSSI) with phrase analysis
+ * Given a rekordbox pdb file contents. This function will hydrate the provided
+ * database with all entities from the Rekordbox database. This includes all
+ * track metadata, including analyzed metadata (such as beatgrids and waveforms).
  */
-function makeSongStructure(data) {
-    var _a, _b;
-    const moodMap = {
-        1: 'high',
-        2: 'mid',
-        3: 'low',
-    };
-    const bankMap = {
-        0: 'default',
-        1: 'cool',
-        2: 'natural',
-        3: 'hot',
-        4: 'subtle',
-        5: 'warm',
-        6: 'vivid',
-        7: 'club_1',
-        8: 'club_2',
-    };
-    // Phrase type mappings based on mood
-    const phraseTypeMap = {
-        high: {
-            1: 'Intro',
-            2: 'Up',
-            3: 'Down',
-            5: 'Chorus',
-            6: 'Outro',
-        },
-        mid: {
-            1: 'Intro',
-            2: 'Verse 1',
-            3: 'Verse 2',
-            4: 'Verse 3',
-            5: 'Verse 4',
-            6: 'Verse 5',
-            7: 'Verse 6',
-            8: 'Bridge',
-            9: 'Chorus',
-            10: 'Outro',
-        },
-        low: {
-            1: 'Intro',
-            2: 'Verse 1',
-            3: 'Verse 1',
-            4: 'Verse 1',
-            5: 'Verse 2',
-            6: 'Verse 2',
-            7: 'Verse 2',
-            8: 'Bridge',
-            9: 'Chorus',
-            10: 'Outro',
-        },
-    };
-    const mood = (_a = moodMap[data.body.mood]) !== null && _a !== void 0 ? _a : 'high';
-    const bank = (_b = bankMap[data.body.rawBank]) !== null && _b !== void 0 ? _b : 'default';
-    const phrases = data.body.entries.map((entry) => {
-        var _a;
-        const phrase = {
-            index: entry.index,
-            beat: entry.beat,
-            kind: entry.kind,
-            phraseType: (_a = phraseTypeMap[mood][entry.kind]) !== null && _a !== void 0 ? _a : 'Unknown',
-        };
-        // Add fill-in information if present
-        if (entry.fill > 0) {
-            phrase.fill = entry.fill;
-            phrase.fillBeat = entry.beatFill;
-        }
-        return phrase;
-    });
-    return {
-        mood,
-        bank,
-        endBeat: data.body.endBeat,
-        phrases,
-    };
+async function hydrateDatabase({ pdbData, span, ...options }) {
+    const hydrator = new hydrator_1.RekordboxHydrator(options);
+    await hydrator.hydrateFromPdb(pdbData, span);
 }
 /**
- * Parse waveform preview data (PWAV/PWV2)
+ * Loads the ANLZ data of a Track entity from the analyzePath.
  */
-function makeWaveformPreview(data) {
-    return {
-        data: Buffer.from(data.body.data),
-    };
+async function loadAnlz(track, type, anlzResolver) {
+    const path = `${track.analyzePath}.${type}`;
+    const anlzData = await anlzResolver(path);
+    const stream = new kaitai_struct_1.KaitaiStream(anlzData);
+    const anlz = new rekordbox_anlz_ksy_1.default(stream);
+    const result = {};
+    const resultDat = result;
+    const resultExt = result;
+    const result2ex = result;
+    for (const section of anlz.sections) {
+        switch (section.fourcc) {
+            case SectionTags.BEAT_GRID:
+                resultDat.beatGrid = (0, anlz_parsers_1.makeBeatGrid)(section);
+                break;
+            case SectionTags.CUES:
+                resultDat.cueAndLoops = (0, anlz_parsers_1.makeCueAndLoop)(section);
+                break;
+            case SectionTags.CUES_2:
+                resultExt.extendedCues = (0, anlz_parsers_1.makeExtendedCues)(section);
+                break;
+            case SectionTags.WAVE_PREVIEW:
+                resultDat.waveformPreview = (0, anlz_parsers_1.makeWaveformPreview)(section);
+                break;
+            case SectionTags.WAVE_TINY:
+                resultDat.waveformTiny = (0, anlz_parsers_1.makeWaveformPreview)(section);
+                break;
+            case SectionTags.WAVE_SCROLL:
+                resultExt.waveformDetail = Buffer.from(section.body.entries);
+                break;
+            case SectionTags.WAVE_COLOR_PREVIEW:
+                resultExt.waveformColorPreview = Buffer.from(section.body.entries);
+                break;
+            case SectionTags.WAVE_COLOR_SCROLL:
+                resultExt.waveformHd = (0, anlz_parsers_1.makeWaveformHd)(section);
+                break;
+            case SectionTags.SONG_STRUCTURE:
+                resultExt.songStructure = (0, anlz_parsers_1.makeSongStructure)(section);
+                break;
+            case SectionTags.WAVE_COLOR_3BAND_PREVIEW:
+                result2ex.waveform3BandPreview = (0, anlz_parsers_1.makeWaveform3BandPreview)(section);
+                break;
+            case SectionTags.WAVE_COLOR_3BAND_DETAIL:
+                result2ex.waveform3BandDetail = (0, anlz_parsers_1.makeWaveform3BandDetail)(section);
+                break;
+            case SectionTags.VOCAL_CONFIG:
+                result2ex.vocalConfig = (0, anlz_parsers_1.makeVocalConfig)(section);
+                break;
+            // VBR and PATH tags are defined but not currently extracted
+            // as they're not commonly needed in the application
+            case SectionTags.VBR:
+            case SectionTags.PATH:
+                break;
+        }
+    }
+    return result;
 }
+
+
+/***/ },
+
+/***/ "./src/localdb/rekordbox/table-mappings.ts"
+/*!*************************************************!*\
+  !*** ./src/localdb/rekordbox/table-mappings.ts ***!
+  \*************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.pdbEntityCreators = exports.pdbTables = void 0;
+const rekordbox_pdb_ksy_1 = __importDefault(__webpack_require__(/*! src/localdb/kaitai/rekordbox_pdb.ksy */ "./src/localdb/kaitai/rekordbox_pdb.ksy"));
+const orm_1 = __webpack_require__(/*! src/localdb/orm */ "./src/localdb/orm.ts");
+const entity_creators_1 = __webpack_require__(/*! ./entity-creators */ "./src/localdb/rekordbox/entity-creators.ts");
 const { PageType } = rekordbox_pdb_ksy_1.default;
-const { SectionTags } = rekordbox_anlz_ksy_1.default;
 /**
  * Maps rekordbox pdb table types to orm table names.
  */
-const pdbTables = {
+exports.pdbTables = {
     [PageType.TRACKS]: orm_1.Table.Track,
     [PageType.ARTISTS]: orm_1.Table.Artist,
     [PageType.GENRES]: orm_1.Table.Genre,
@@ -6355,17 +5981,17 @@ const pdbTables = {
  * Maps rekordbox pdb table types to functions that create entity objects for
  * the passed pdb row.
  */
-const pdbEntityCreators = {
-    [PageType.TRACKS]: createTrack,
-    [PageType.ARTISTS]: makeIdNameHydrator(),
-    [PageType.GENRES]: makeIdNameHydrator(),
-    [PageType.ALBUMS]: makeIdNameHydrator(),
-    [PageType.LABELS]: makeIdNameHydrator(),
-    [PageType.COLORS]: makeIdNameHydrator(),
-    [PageType.KEYS]: makeIdNameHydrator(),
-    [PageType.ARTWORK]: createArtworkEntry,
-    [PageType.PLAYLIST_TREE]: createPlaylist,
-    [PageType.PLAYLIST_ENTRIES]: createPlaylistEntry,
+exports.pdbEntityCreators = {
+    [PageType.TRACKS]: entity_creators_1.createTrack,
+    [PageType.ARTISTS]: (0, entity_creators_1.makeIdNameHydrator)(),
+    [PageType.GENRES]: (0, entity_creators_1.makeIdNameHydrator)(),
+    [PageType.ALBUMS]: (0, entity_creators_1.makeIdNameHydrator)(),
+    [PageType.LABELS]: (0, entity_creators_1.makeIdNameHydrator)(),
+    [PageType.COLORS]: (0, entity_creators_1.makeIdNameHydrator)(),
+    [PageType.KEYS]: (0, entity_creators_1.makeIdNameHydrator)(),
+    [PageType.ARTWORK]: entity_creators_1.createArtworkEntry,
+    [PageType.PLAYLIST_TREE]: entity_creators_1.createPlaylist,
+    [PageType.PLAYLIST_ENTRIES]: entity_creators_1.createPlaylistEntry,
     // TODO: Register PageType.HISTORY
 };
 
@@ -6506,6 +6132,27 @@ const makeCueLoopEntry = (isCue, isLoop, offset, length, button) => button !== f
 exports.makeCueLoopEntry = makeCueLoopEntry;
 
 
+/***/ },
+
+/***/ "./src/logger.ts"
+/*!***********************!*\
+  !*** ./src/logger.ts ***!
+  \***********************/
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.noopLogger = void 0;
+exports.noopLogger = {
+    trace() { },
+    debug() { },
+    info() { },
+    warn() { },
+    error() { },
+};
+
+
 /***/ },
 
 /***/ "./src/mixstatus/index.ts"
@@ -6527,7 +6174,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _MixstatusProcessor_emitter, _MixstatusProcessor_lastState, _MixstatusProcessor_lastStartTime, _MixstatusProcessor_lastStoppedTimes, _MixstatusProcessor_livePlayers, _MixstatusProcessor_isSetActive, _MixstatusProcessor_cancelSetEnding, _MixstatusProcessor_config, _MixstatusProcessor_onAir, _MixstatusProcessor_promotePlayer, _MixstatusProcessor_promoteNextPlayer, _MixstatusProcessor_markPlayerStopped, _MixstatusProcessor_setMayStop, _MixstatusProcessor_playerMayBeFirst, _MixstatusProcessor_playerMayStop, _MixstatusProcessor_handlePlaystateChange, _MixstatusProcessor_handleOnairChange;
+var _MixstatusProcessor_emitter, _MixstatusProcessor_lastState, _MixstatusProcessor_lastStartTime, _MixstatusProcessor_lastStoppedTimes, _MixstatusProcessor_livePlayers, _MixstatusProcessor_lastEmittedTrackId, _MixstatusProcessor_isSetActive, _MixstatusProcessor_cancelSetEnding, _MixstatusProcessor_config, _MixstatusProcessor_onAir, _MixstatusProcessor_promotePlayer, _MixstatusProcessor_promoteNextPlayer, _MixstatusProcessor_markPlayerStopped, _MixstatusProcessor_setMayStop, _MixstatusProcessor_playerMayBeFirst, _MixstatusProcessor_playerMayStop, _MixstatusProcessor_handlePlaystateChange, _MixstatusProcessor_handleOnairChange;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MixstatusProcessor = void 0;
 const events_1 = __webpack_require__(/*! events */ "events");
@@ -6583,6 +6230,14 @@ class MixstatusProcessor {
          * Records which players have been reported as 'live'
          */
         _MixstatusProcessor_livePlayers.set(this, new Set());
+        /**
+         * Records the last trackId emitted as 'nowPlaying' for each device. Used to
+         * suppress duplicate emissions when a deck is briefly cued/loaded and then
+         * resumed on the same track (a common pattern for House/Techno DJs who
+         * cue-juggle mid-track). The entry is replaced when a different trackId is
+         * emitted on the same deck, so subsequent track loads still emit normally.
+         */
+        _MixstatusProcessor_lastEmittedTrackId.set(this, new Map());
         /**
          * Incidates if we're currentiny in an active DJ set
          */
@@ -6617,6 +6272,14 @@ class MixstatusProcessor {
             if (__classPrivateFieldGet(this, _MixstatusProcessor_livePlayers, "f").has(deviceId)) {
                 return;
             }
+            // Suppress duplicate nowPlaying for the same track on the same deck. This
+            // can happen when a DJ cues mid-track and resumes (Cued/Loading/Ended are
+            // all stoppingStates that drop the deck from livePlayers, so the next play
+            // of the same trackId would otherwise re-emit). When a different track is
+            // loaded, the trackId differs and the new emission proceeds normally.
+            if (__classPrivateFieldGet(this, _MixstatusProcessor_lastEmittedTrackId, "f").get(deviceId) === state.trackId) {
+                return;
+            }
             if (!__classPrivateFieldGet(this, _MixstatusProcessor_isSetActive, "f")) {
                 __classPrivateFieldSet(this, _MixstatusProcessor_isSetActive, true, "f");
                 __classPrivateFieldGet(this, _MixstatusProcessor_emitter, "f").emit('setStarted');
@@ -6625,6 +6288,7 @@ class MixstatusProcessor {
                 __classPrivateFieldGet(this, _MixstatusProcessor_cancelSetEnding, "f").call(this);
             }
             __classPrivateFieldGet(this, _MixstatusProcessor_livePlayers, "f").add(deviceId);
+            __classPrivateFieldGet(this, _MixstatusProcessor_lastEmittedTrackId, "f").set(deviceId, state.trackId);
             __classPrivateFieldGet(this, _MixstatusProcessor_emitter, "f").emit('nowPlaying', state);
         });
         /**
@@ -6818,7 +6482,7 @@ class MixstatusProcessor {
     }
 }
 exports.MixstatusProcessor = MixstatusProcessor;
-_MixstatusProcessor_emitter = new WeakMap(), _MixstatusProcessor_lastState = new WeakMap(), _MixstatusProcessor_lastStartTime = new WeakMap(), _MixstatusProcessor_lastStoppedTimes = new WeakMap(), _MixstatusProcessor_livePlayers = new WeakMap(), _MixstatusProcessor_isSetActive = new WeakMap(), _MixstatusProcessor_cancelSetEnding = new WeakMap(), _MixstatusProcessor_config = new WeakMap(), _MixstatusProcessor_onAir = new WeakMap(), _MixstatusProcessor_promotePlayer = new WeakMap(), _MixstatusProcessor_promoteNextPlayer = new WeakMap(), _MixstatusProcessor_markPlayerStopped = new WeakMap(), _MixstatusProcessor_setMayStop = new WeakMap(), _MixstatusProcessor_playerMayBeFirst = new WeakMap(), _MixstatusProcessor_playerMayStop = new WeakMap(), _MixstatusProcessor_handlePlaystateChange = new WeakMap(), _MixstatusProcessor_handleOnairChange = new WeakMap();
+_MixstatusProcessor_emitter = new WeakMap(), _MixstatusProcessor_lastState = new WeakMap(), _MixstatusProcessor_lastStartTime = new WeakMap(), _MixstatusProcessor_lastStoppedTimes = new WeakMap(), _MixstatusProcessor_livePlayers = new WeakMap(), _MixstatusProcessor_lastEmittedTrackId = new WeakMap(), _MixstatusProcessor_isSetActive = new WeakMap(), _MixstatusProcessor_cancelSetEnding = new WeakMap(), _MixstatusProcessor_config = new WeakMap(), _MixstatusProcessor_onAir = new WeakMap(), _MixstatusProcessor_promotePlayer = new WeakMap(), _MixstatusProcessor_promoteNextPlayer = new WeakMap(), _MixstatusProcessor_markPlayerStopped = new WeakMap(), _MixstatusProcessor_setMayStop = new WeakMap(), _MixstatusProcessor_playerMayBeFirst = new WeakMap(), _MixstatusProcessor_playerMayStop = new WeakMap(), _MixstatusProcessor_handlePlaystateChange = new WeakMap(), _MixstatusProcessor_handleOnairChange = new WeakMap();
 
 
 /***/ },
@@ -6909,7 +6573,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _ProlinkNetwork_state, _ProlinkNetwork_announceSocket, _ProlinkNetwork_beatSocket, _ProlinkNetwork_statusSocket, _ProlinkNetwork_deviceManager, _ProlinkNetwork_statusEmitter, _ProlinkNetwork_positionEmitter, _ProlinkNetwork_config, _ProlinkNetwork_connection, _ProlinkNetwork_mixstatus;
+var _ProlinkNetwork_state, _ProlinkNetwork_announceSocket, _ProlinkNetwork_beatSocket, _ProlinkNetwork_statusSocket, _ProlinkNetwork_deviceManager, _ProlinkNetwork_statusEmitter, _ProlinkNetwork_positionEmitter, _ProlinkNetwork_logger, _ProlinkNetwork_config, _ProlinkNetwork_connection, _ProlinkNetwork_mixstatus;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ProlinkNetwork = void 0;
 exports.bringOnline = bringOnline;
@@ -6919,6 +6583,7 @@ const constants_1 = __webpack_require__(/*! src/constants */ "./src/constants.ts
 const control_1 = __importDefault(__webpack_require__(/*! src/control */ "./src/control/index.ts"));
 const db_1 = __importDefault(__webpack_require__(/*! src/db */ "./src/db/index.ts"));
 const devices_1 = __importDefault(__webpack_require__(/*! src/devices */ "./src/devices/index.ts"));
+const logger_1 = __webpack_require__(/*! src/logger */ "./src/logger.ts");
 const localdb_1 = __importDefault(__webpack_require__(/*! src/localdb */ "./src/localdb/index.ts"));
 const mixstatus_1 = __webpack_require__(/*! src/mixstatus */ "./src/mixstatus/index.ts");
 const remotedb_1 = __importDefault(__webpack_require__(/*! src/remotedb */ "./src/remotedb/index.ts"));
@@ -6949,6 +6614,9 @@ async function bringOnline(config) {
         await (0, udp_1.udpBind)(announceSocket, constants_1.ANNOUNCE_PORT, '0.0.0.0');
         await (0, udp_1.udpBind)(beatSocket, constants_1.BEAT_PORT, '0.0.0.0');
         await (0, udp_1.udpBind)(statusSocket, constants_1.STATUS_PORT, '0.0.0.0');
+        // Enable broadcast so the announcer can reach the whole subnet before any
+        // devices have been discovered.
+        announceSocket.setBroadcast(true);
     }
     catch (err) {
         Telemetry.captureException(err);
@@ -6976,6 +6644,7 @@ class ProlinkNetwork {
      * @internal
      */
     constructor({ config, announceSocket, beatSocket, statusSocket, deviceManager, statusEmitter, positionEmitter, }) {
+        var _a;
         _ProlinkNetwork_state.set(this, types_1.NetworkState.Online);
         _ProlinkNetwork_announceSocket.set(this, void 0);
         _ProlinkNetwork_beatSocket.set(this, void 0);
@@ -6983,10 +6652,12 @@ class ProlinkNetwork {
         _ProlinkNetwork_deviceManager.set(this, void 0);
         _ProlinkNetwork_statusEmitter.set(this, void 0);
         _ProlinkNetwork_positionEmitter.set(this, void 0);
+        _ProlinkNetwork_logger.set(this, void 0);
         _ProlinkNetwork_config.set(this, void 0);
         _ProlinkNetwork_connection.set(this, void 0);
         _ProlinkNetwork_mixstatus.set(this, void 0);
         __classPrivateFieldSet(this, _ProlinkNetwork_config, config !== null && config !== void 0 ? config : null, "f");
+        __classPrivateFieldSet(this, _ProlinkNetwork_logger, (_a = config === null || config === void 0 ? void 0 : config.logger) !== null && _a !== void 0 ? _a : logger_1.noopLogger, "f");
         __classPrivateFieldSet(this, _ProlinkNetwork_announceSocket, announceSocket, "f");
         __classPrivateFieldSet(this, _ProlinkNetwork_beatSocket, beatSocket, "f");
         __classPrivateFieldSet(this, _ProlinkNetwork_statusSocket, statusSocket, "f");
@@ -7006,6 +6677,9 @@ class ProlinkNetwork {
      */
     configure(config) {
         __classPrivateFieldSet(this, _ProlinkNetwork_config, { ...__classPrivateFieldGet(this, _ProlinkNetwork_config, "f"), ...config }, "f");
+        if (config.logger !== undefined) {
+            __classPrivateFieldSet(this, _ProlinkNetwork_logger, config.logger, "f");
+        }
     }
     /**
      * Wait for another device to show up on the network to determine which network
@@ -7039,7 +6713,7 @@ class ProlinkNetwork {
      * or manual configuration). This will then initialize all the network services.
      */
     connect() {
-        var _a, _b;
+        var _a, _b, _c;
         if (__classPrivateFieldGet(this, _ProlinkNetwork_config, "f") === null) {
             throw new Error(connectErrorHelp);
         }
@@ -7051,13 +6725,13 @@ class ProlinkNetwork {
             __classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f").reconfigure({ vcdjName: __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").vcdjName });
         }
         // Start announcing
-        const announcer = new virtualcdj_1.Announcer(vcdj, __classPrivateFieldGet(this, _ProlinkNetwork_announceSocket, "f"), this.deviceManager, __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").iface, (_a = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").fullStartup) !== null && _a !== void 0 ? _a : false);
+        const announcer = new virtualcdj_1.Announcer(vcdj, __classPrivateFieldGet(this, _ProlinkNetwork_announceSocket, "f"), this.deviceManager, __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").iface, (_a = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").fullStartup) !== null && _a !== void 0 ? _a : false, (_b = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").announceToStagehand) !== null && _b !== void 0 ? _b : false, __classPrivateFieldGet(this, _ProlinkNetwork_logger, "f"));
         announcer.start();
         // Create remote and local databases
         const remotedb = new remotedb_1.default(__classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f"), vcdj);
-        const localdb = new localdb_1.default(vcdj, __classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f"), __classPrivateFieldGet(this, _ProlinkNetwork_statusEmitter, "f"), (_b = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").databasePreference) !== null && _b !== void 0 ? _b : 'auto');
+        const localdb = new localdb_1.default(vcdj, __classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f"), __classPrivateFieldGet(this, _ProlinkNetwork_statusEmitter, "f"), (_c = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").databasePreference) !== null && _c !== void 0 ? _c : 'auto');
         // Create unified database
-        const database = new db_1.default(vcdj, localdb, remotedb, __classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f"));
+        const database = new db_1.default(localdb, remotedb, __classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f"));
         // Create controller service
         const control = new control_1.default(__classPrivateFieldGet(this, _ProlinkNetwork_beatSocket, "f"), vcdj);
         __classPrivateFieldSet(this, _ProlinkNetwork_state, types_1.NetworkState.Connected, "f");
@@ -7187,6 +6861,14 @@ class ProlinkNetwork {
         var _a, _b;
         return (_b = (_a = __classPrivateFieldGet(this, _ProlinkNetwork_connection, "f")) === null || _a === void 0 ? void 0 : _a.remotedb) !== null && _b !== void 0 ? _b : null;
     }
+    /**
+     * Returns a promise that resolves when the full startup protocol completes.
+     * Resolves immediately if fullStartup is disabled or not connected.
+     */
+    get startupReady() {
+        var _a, _b;
+        return (_b = (_a = __classPrivateFieldGet(this, _ProlinkNetwork_connection, "f")) === null || _a === void 0 ? void 0 : _a.announcer.ready) !== null && _b !== void 0 ? _b : Promise.resolve();
+    }
     /**
      * Get (and initialize) the {@link MixstatusProcessor} service. This service can
      * be used to monitor the 'status' of devices on the network as a whole.
@@ -7205,7 +6887,7 @@ class ProlinkNetwork {
     }
 }
 exports.ProlinkNetwork = ProlinkNetwork;
-_ProlinkNetwork_state = new WeakMap(), _ProlinkNetwork_announceSocket = new WeakMap(), _ProlinkNetwork_beatSocket = new WeakMap(), _ProlinkNetwork_statusSocket = new WeakMap(), _ProlinkNetwork_deviceManager = new WeakMap(), _ProlinkNetwork_statusEmitter = new WeakMap(), _ProlinkNetwork_positionEmitter = new WeakMap(), _ProlinkNetwork_config = new WeakMap(), _ProlinkNetwork_connection = new WeakMap(), _ProlinkNetwork_mixstatus = new WeakMap();
+_ProlinkNetwork_state = new WeakMap(), _ProlinkNetwork_announceSocket = new WeakMap(), _ProlinkNetwork_beatSocket = new WeakMap(), _ProlinkNetwork_statusSocket = new WeakMap(), _ProlinkNetwork_deviceManager = new WeakMap(), _ProlinkNetwork_statusEmitter = new WeakMap(), _ProlinkNetwork_positionEmitter = new WeakMap(), _ProlinkNetwork_logger = new WeakMap(), _ProlinkNetwork_config = new WeakMap(), _ProlinkNetwork_connection = new WeakMap(), _ProlinkNetwork_mixstatus = new WeakMap();
 
 
 /***/ },
@@ -7252,6 +6934,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.parseWindowsPath = parseWindowsPath;
+exports.resolveNfsPath = resolveNfsPath;
+exports.getPortmapPort = getPortmapPort;
 exports.fetchFileRange = fetchFileRange;
 exports.getFileInfo = getFileInfo;
 exports.fetchFile = fetchFile;
@@ -7269,8 +6954,54 @@ const xdr_1 = __webpack_require__(/*! ./xdr */ "./src/nfs/xdr.ts");
 const slotMountMapping = {
     [types_1.MediaSlot.USB]: '/C/',
     [types_1.MediaSlot.SD]: '/B/',
-    [types_1.MediaSlot.RB]: '/',
 };
+/**
+ * Parse a Windows absolute path (e.g. `C:\Users\chris\Music\track.mp3`)
+ * into the NFS mount path and relative file path.
+ *
+ * @internal Exported for testing
+ */
+function parseWindowsPath(filePath) {
+    const match = filePath.match(/^([A-Za-z]):[/\\](.*)$/);
+    if (!match) {
+        return null;
+    }
+    return {
+        mountPath: `/${match[1].toUpperCase()}/`,
+        nfsPath: match[2].replace(/\\/g, '/'),
+    };
+}
+/**
+ * Resolve the NFS mount path and file path for a given slot.
+ *
+ * For USB/SD slots, the mount path is well-known (/C/ and /B/).
+ * For the RB slot, the mount path is extracted from the file path returned
+ * by remotedb:
+ * - Windows: `C:\Users\chris\Music\track.mp3` → mount `/C/`, path `Users/chris/Music/track.mp3`
+ * - macOS: `/Users/chris/Music/track.mp3` → mount `/`, path `Users/chris/Music/track.mp3`
+ *
+ * @internal Exported for testing
+ */
+function resolveNfsPath(slot, filePath) {
+    if (slot === types_1.MediaSlot.RB) {
+        // Windows: C:\Users\chris\Music\track.mp3 → mount /C/, path Users/...
+        const parsed = parseWindowsPath(filePath);
+        if (parsed) {
+            return parsed;
+        }
+        // macOS: /Users/chris/Music/track.mp3 → mount /, path Users/...
+        if (filePath.startsWith('/')) {
+            return {
+                mountPath: '/',
+                nfsPath: filePath.slice(1),
+            };
+        }
+    }
+    return {
+        mountPath: slotMountMapping[slot],
+        nfsPath: filePath,
+    };
+}
 /**
  * The module-level retry configuration for newly created RpcConnections.
  */
@@ -7281,6 +7012,18 @@ let retryConfig = {};
  * still be connected.
  */
 const clientsCache = new Map();
+/**
+ * Get the portmapper port for the given device. Rekordbox software uses a
+ * non-standard port (50111) while CDJs and other hardware use the standard
+ * port (111).
+ *
+ * @internal Exported for testing
+ */
+function getPortmapPort(device) {
+    return device.type === types_1.DeviceType.Rekordbox
+        ? programs_1.REKORDBOX_PORTMAP_PORT
+        : programs_1.STANDARD_PORTMAP_PORT;
+}
 /**
  * Given a device address running a nfs and mountd RPC server, provide
  * RpcProgram clients that may be used to call these services.
@@ -7288,7 +7031,8 @@ const clientsCache = new Map();
  * NOTE: This function will cache the clients for the address, recreating the
  * connections if the cached clients have disconnected.
  */
-async function getClients(address) {
+async function getClients(device) {
+    const { address } = device.ip;
     const cachedSet = clientsCache.get(address);
     if (cachedSet !== undefined && cachedSet.conn.connected) {
         return cachedSet;
@@ -7298,49 +7042,50 @@ async function getClients(address) {
         clientsCache.delete(address);
     }
     const conn = new rpc_1.RpcConnection(address, retryConfig);
+    const portmapPort = getPortmapPort(device);
     const mountClient = await (0, programs_1.makeProgramClient)(conn, {
         id: xdr_1.mount.Program,
         version: xdr_1.mount.Version,
-    });
+    }, portmapPort);
     const nfsClient = await (0, programs_1.makeProgramClient)(conn, {
         id: xdr_1.nfs.Program,
         version: xdr_1.nfs.Version,
-    });
+    }, portmapPort);
     const set = { conn, mountClient, nfsClient };
     clientsCache.set(address, set);
     return set;
 }
 /**
- * This module maintains a singleton cached list of (device address + slot) -> file
+ * This module maintains a singleton cached list of (device address + mount path) -> file
  * handles. The file handles may become stale in this list should the devices
  * connected to the players slot change.
  */
 const rootHandleCache = new Map();
 /**
- * Locate the root filehandle of the given device slot.
+ * Locate the root filehandle of the given device mount path.
  *
- * NOTE: This function will cache the root handle for the device + slot. Should
+ * NOTE: This function will cache the root handle for the device + mount path. Should
  *       the device have changed the slot will not longer be valid (TODO,
  *       verify this). It is up to the caller to clear the cache and get the
  *       new root handle in that case.
  */
-async function getRootHandle({ device, slot, mountClient, span }) {
+async function getRootHandle({ device, mountPath, mountClient, span, }) {
     var _a;
     const tx = span === null || span === void 0 ? void 0 : span.startChild({ op: 'getRootHandle' });
     const { address } = device.ip;
-    const deviceSlotCache = (_a = rootHandleCache.get(address)) !== null && _a !== void 0 ? _a : new Map();
-    const cachedRootHandle = deviceSlotCache.get(slot);
+    const deviceMountCache = (_a = rootHandleCache.get(address)) !== null && _a !== void 0 ? _a : new Map();
+    const cachedRootHandle = deviceMountCache.get(mountPath);
     if (cachedRootHandle !== undefined) {
         return cachedRootHandle;
     }
     const exports = await (0, programs_1.getExports)(mountClient, tx);
-    const targetExport = exports.find(e => e.filesystem === slotMountMapping[slot]);
+    const targetExport = exports.find(e => e.filesystem === mountPath);
     if (targetExport === undefined) {
         return null;
     }
     const rootHandle = await (0, programs_1.mountFilesystem)(mountClient, targetExport, tx);
-    deviceSlotCache.set(slot, rootHandle);
-    rootHandleCache.set(address, deviceSlotCache);
+    deviceMountCache.set(mountPath, rootHandle);
+    rootHandleCache.set(address, deviceMountCache);
     tx === null || tx === void 0 ? void 0 : tx.finish();
     return rootHandle;
 }
@@ -7353,22 +7098,23 @@ async function fetchFileRange({ device, slot, path, offset, length, span, }) {
     const tx = span
         ? span.startChild({ op: 'fetchFileRange' })
         : Telemetry.startTransaction({ name: 'fetchFileRange' });
-    const { mountClient, nfsClient } = await getClients(device.ip.address);
-    const rootHandle = await getRootHandle({ device, slot, mountClient, span: tx });
+    const { mountPath, nfsPath } = resolveNfsPath(slot, path);
+    const { mountClient, nfsClient } = await getClients(device);
+    const rootHandle = await getRootHandle({ device, mountPath, mountClient, span: tx });
     if (rootHandle === null) {
         throw badRoothandleError(slot, device.id);
     }
     let fileInfo = null;
     try {
-        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, path, tx);
+        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, nfsPath, tx);
     }
     catch {
         rootHandleCache.delete(device.ip.address);
-        const newRootHandle = await getRootHandle({ device, slot, mountClient, span: tx });
+        const newRootHandle = await getRootHandle({ device, mountPath, mountClient, span: tx });
         if (newRootHandle === null) {
             throw badRoothandleError(slot, device.id);
         }
-        fileInfo = await (0, programs_1.lookupPath)(nfsClient, newRootHandle, path, tx);
+        fileInfo = await (0, programs_1.lookupPath)(nfsClient, newRootHandle, nfsPath, tx);
     }
     const actualOffset = Math.min(offset, fileInfo.size);
     const actualLength = Math.min(length, fileInfo.size - actualOffset);
@@ -7392,22 +7138,23 @@ async function getFileInfo({ device, slot, path, span, }) {
     const tx = span
         ? span.startChild({ op: 'getFileInfo' })
         : Telemetry.startTransaction({ name: 'getFileInfo' });
-    const { mountClient, nfsClient } = await getClients(device.ip.address);
-    const rootHandle = await getRootHandle({ device, slot, mountClient, span: tx });
+    const { mountPath, nfsPath } = resolveNfsPath(slot, path);
+    const { mountClient, nfsClient } = await getClients(device);
+    const rootHandle = await getRootHandle({ device, mountPath, mountClient, span: tx });
     if (rootHandle === null) {
         throw badRoothandleError(slot, device.id);
     }
     let fileInfo;
     try {
-        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, path, tx);
+        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, nfsPath, tx);
     }
     catch {
         rootHandleCache.delete(device.ip.address);
-        const newRootHandle = await getRootHandle({ device, slot, mountClient, span: tx });
+        const newRootHandle = await getRootHandle({ device, mountPath, mountClient, span: tx });
         if (newRootHandle === null) {
             throw badRoothandleError(slot, device.id);
         }
-        fileInfo = await (0, programs_1.lookupPath)(nfsClient, newRootHandle, path, tx);
+        fileInfo = await (0, programs_1.lookupPath)(nfsClient, newRootHandle, nfsPath, tx);
     }
     tx.setData('path', path);
     tx.setData('slot', (0, utils_1.getSlotName)(slot));
@@ -7427,8 +7174,9 @@ async function fetchFile({ device, slot, path, onProgress, span, chunkSize, }) {
     const tx = span
         ? span.startChild({ op: 'fetchFile' })
         : Telemetry.startTransaction({ name: 'fetchFile' });
-    const { mountClient, nfsClient } = await getClients(device.ip.address);
-    const rootHandle = await getRootHandle({ device, slot, mountClient, span: tx });
+    const { mountPath, nfsPath } = resolveNfsPath(slot, path);
+    const { mountClient, nfsClient } = await getClients(device);
+    const rootHandle = await getRootHandle({ device, mountPath, mountClient, span: tx });
     if (rootHandle === null) {
         throw badRoothandleError(slot, device.id);
     }
@@ -7436,16 +7184,16 @@ async function fetchFile({ device, slot, path, onProgress, span, chunkSize, }) {
     // a path lets first try and clear our roothandle cache
     let fileInfo = null;
     try {
-        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, path, tx);
+        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, nfsPath, tx);
     }
     catch {
         rootHandleCache.delete(device.ip.address);
-        const rootHandle = await getRootHandle({ device, slot, mountClient, span: tx });
+        const rootHandle = await getRootHandle({ device, mountPath, mountClient, span: tx });
         if (rootHandle === null) {
             throw badRoothandleError(slot, device.id);
         }
         // Desperately try once more to lookup the file
-        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, path, tx);
+        fileInfo = await (0, programs_1.lookupPath)(nfsClient, rootHandle, nfsPath, tx);
     }
     const file = await (0, programs_1.fetchFile)(nfsClient, fileInfo, onProgress, tx, chunkSize);
     tx.setData('path', path);
@@ -7483,6 +7231,7 @@ function configureRetryStrategy(config) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.REKORDBOX_PORTMAP_PORT = exports.STANDARD_PORTMAP_PORT = void 0;
 exports.makeProgramClient = makeProgramClient;
 exports.getExports = getExports;
 exports.mountFilesystem = mountFilesystem;
@@ -7497,10 +7246,19 @@ const xdr_1 = __webpack_require__(/*! ./xdr */ "./src/nfs/xdr.ts");
  * How many bytes of a file should we read at once.
  */
 const READ_SIZE = 8192;
+/**
+ * Standard portmapper port used by CDJs and other hardware.
+ */
+exports.STANDARD_PORTMAP_PORT = 111;
+/**
+ * Non-standard portmapper port used by rekordbox software.
+ * Rekordbox registers its RPC services on this port instead of 111.
+ */
+exports.REKORDBOX_PORTMAP_PORT = 50111;
 /**
  * Queries for the listening port of a RPC program
  */
-async function makeProgramClient(conn, program) {
+async function makeProgramClient(conn, program, portmapPort = exports.STANDARD_PORTMAP_PORT) {
     const getPortData = new xdr_1.portmap.GetPort({
         program: program.id,
         version: program.version,
@@ -7508,7 +7266,7 @@ async function makeProgramClient(conn, program) {
         port: 0,
     });
     const data = await conn.call({
-        port: 111,
+        port: portmapPort,
         program: xdr_1.portmap.Program,
         version: xdr_1.portmap.Version,
         procedure: xdr_1.portmap.Procedure.getPort().value,
@@ -8565,10 +8323,14 @@ class QueryInterface {
         const anyArgs = args;
         const handler = queries_1.queryHandlers[query];
         const releaseLock = await __classPrivateFieldGet(this, _QueryInterface_lock, "f").acquire();
-        const response = await handler({ conn, lookupDescriptor, span: tx, args: anyArgs });
-        releaseLock();
-        tx.finish();
-        return response;
+        try {
+            const response = await handler({ conn, lookupDescriptor, span: tx, args: anyArgs });
+            tx.finish();
+            return response;
+        }
+        finally {
+            releaseLock();
+        }
     }
 }
 exports.QueryInterface = QueryInterface;
@@ -8596,6 +8358,11 @@ class RemoteDatabase {
             const { ip } = device;
             const dbPort = await getRemoteDBServerPort(ip);
             const socket = new promise_socket_1.default(new net_1.Socket());
+            // Set a connection timeout to prevent hanging forever
+            socket.stream.setTimeout(10000);
+            socket.stream.once('timeout', () => {
+                socket.stream.destroy(new Error(`RemoteDB connection to ${ip.address}:${dbPort} timed out`));
+            });
             await socket.connect(dbPort, ip.address);
             // Send required preamble to open communications with the device
             const preamble = new fields_1.UInt32(0x01);
@@ -8617,6 +8384,9 @@ class RemoteDatabase {
             if (resp.type !== types_1.MessageType.Success) {
                 throw new Error(`Failed to introduce self to device ID: ${device.id}`);
             }
+            // Clear socket timeout after successful connection — the per-device mutex
+            // and application-level Promise.race timeouts handle query timeouts
+            socket.stream.setTimeout(0);
             __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").set(device.id, new Connection(device, socket));
             tx.finish();
         };
@@ -8658,15 +8428,19 @@ class RemoteDatabase {
         }
         const lock = (_a = __classPrivateFieldGet(this, _RemoteDatabase_deviceLocks, "f").get(device.id)) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _RemoteDatabase_deviceLocks, "f").set(device.id, new async_mutex_1.Mutex()).get(device.id);
         const releaseLock = await lock.acquire();
-        let conn = __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").get(deviceId);
-        if (conn === undefined) {
-            await this.connectToDevice(device);
+        try {
+            let conn = __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").get(deviceId);
+            if (conn === undefined) {
+                await this.connectToDevice(device);
+            }
+            conn = __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").get(deviceId);
+            // NOTE: We pass the same lock we use for this device to the query
+            // interface to ensure all query interfaces use the same lock.
+            return new QueryInterface(conn, lock, __classPrivateFieldGet(this, _RemoteDatabase_hostDevice, "f"));
+        }
+        finally {
+            releaseLock();
         }
-        conn = __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").get(deviceId);
-        releaseLock();
-        // NOTE: We pass the same lock we use for this device to the query
-        // interface to ensure all query interfaces use the same lock.
-        return new QueryInterface(conn, lock, __classPrivateFieldGet(this, _RemoteDatabase_hostDevice, "f"));
     }
 }
 _RemoteDatabase_hostDevice = new WeakMap(), _RemoteDatabase_deviceManager = new WeakMap(), _RemoteDatabase_connections = new WeakMap(), _RemoteDatabase_deviceLocks = new WeakMap();
@@ -9368,7 +9142,7 @@ const utils_1 = __webpack_require__(/*! ./utils */ "./src/remotedb/utils.ts");
  * Lookup track metadata from rekordbox and coerce it into a Track entity
  */
 async function getMetadata(opts) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     const { conn, lookupDescriptor, span, args } = opts;
     const { trackId } = args;
     const request = new message_1.Message({
@@ -9385,24 +9159,25 @@ async function getMetadata(opts) {
         trackItems[item.type] = item;
     }
     // Translate our trackItems into a (partial) Track entity.
+    // Use optional chaining for all fields since streaming tracks may omit some.
     const track = {
-        id: trackItems[item_1.ItemType.TrackTitle].id,
-        title: trackItems[item_1.ItemType.TrackTitle].title,
-        duration: trackItems[item_1.ItemType.Duration].duration,
-        tempo: trackItems[item_1.ItemType.Tempo].bpm,
-        comment: trackItems[item_1.ItemType.Comment].comment,
-        rating: trackItems[item_1.ItemType.Rating].rating,
-        year: (_a = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.Year]) === null || _a === void 0 ? void 0 : _a.year,
-        bitrate: (_b = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.BitRate]) === null || _b === void 0 ? void 0 : _b.bitrate,
-        artwork: { id: trackItems[item_1.ItemType.TrackTitle].artworkId },
-        album: trackItems[item_1.ItemType.AlbumTitle],
-        artist: trackItems[item_1.ItemType.Artist],
-        genre: trackItems[item_1.ItemType.Genre],
-        key: trackItems[item_1.ItemType.Key],
-        color: (0, utils_1.findColor)(Object.values(trackItems)),
-        label: (_c = trackItems[item_1.ItemType.Label]) !== null && _c !== void 0 ? _c : null,
-        remixer: (_d = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.Remixer]) !== null && _d !== void 0 ? _d : null,
-        originalArtist: (_e = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.OriginalArtist]) !== null && _e !== void 0 ? _e : null,
+        id: (_b = (_a = trackItems[item_1.ItemType.TrackTitle]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : 0,
+        title: (_d = (_c = trackItems[item_1.ItemType.TrackTitle]) === null || _c === void 0 ? void 0 : _c.title) !== null && _d !== void 0 ? _d : '',
+        duration: (_f = (_e = trackItems[item_1.ItemType.Duration]) === null || _e === void 0 ? void 0 : _e.duration) !== null && _f !== void 0 ? _f : 0,
+        tempo: (_h = (_g = trackItems[item_1.ItemType.Tempo]) === null || _g === void 0 ? void 0 : _g.bpm) !== null && _h !== void 0 ? _h : 0,
+        comment: (_k = (_j = trackItems[item_1.ItemType.Comment]) === null || _j === void 0 ? void 0 : _j.comment) !== null && _k !== void 0 ? _k : '',
+        rating: (_m = (_l = trackItems[item_1.ItemType.Rating]) === null || _l === void 0 ? void 0 : _l.rating) !== null && _m !== void 0 ? _m : 0,
+        year: (_o = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.Year]) === null || _o === void 0 ? void 0 : _o.year,
+        bitrate: (_p = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.BitRate]) === null || _p === void 0 ? void 0 : _p.bitrate,
+        artwork: { id: (_r = (_q = trackItems[item_1.ItemType.TrackTitle]) === null || _q === void 0 ? void 0 : _q.artworkId) !== null && _r !== void 0 ? _r : 0 },
+        album: (_s = trackItems[item_1.ItemType.AlbumTitle]) !== null && _s !== void 0 ? _s : null,
+        artist: (_t = trackItems[item_1.ItemType.Artist]) !== null && _t !== void 0 ? _t : null,
+        genre: (_u = trackItems[item_1.ItemType.Genre]) !== null && _u !== void 0 ? _u : null,
+        key: (_v = trackItems[item_1.ItemType.Key]) !== null && _v !== void 0 ? _v : null,
+        color: (_w = (0, utils_1.findColor)(Object.values(trackItems))) !== null && _w !== void 0 ? _w : null,
+        label: (_x = trackItems[item_1.ItemType.Label]) !== null && _x !== void 0 ? _x : null,
+        remixer: (_y = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.Remixer]) !== null && _y !== void 0 ? _y : null,
+        originalArtist: (_z = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.OriginalArtist]) !== null && _z !== void 0 ? _z : null,
         composer: null,
         fileName: '',
         filePath: '',
@@ -10010,7 +9785,7 @@ function mediaSlotFromPacket(packet) {
         return undefined;
     }
     const name = packet
-        .slice(0x2c, 0x0c + 40)
+        .slice(0x2c, 0x2c + 40)
         .toString()
         .replace(/\0/g, '');
     const createdDate = new Date(packet
@@ -10187,7 +9962,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MixstatusMode = exports.NetworkState = exports.CueColor = exports.HotcueButton = exports.TrackType = exports.MediaSlot = exports.MediaColor = exports.DeviceType = exports.CDJStatus = void 0;
+exports.MixstatusMode = exports.NetworkState = exports.HotcueButton = exports.CueColor = exports.TrackType = exports.MediaSlot = exports.MediaColor = exports.DeviceType = exports.CDJStatus = void 0;
 exports.CDJStatus = __importStar(__webpack_require__(/*! src/status/types */ "./src/status/types.ts"));
 /**
  * Known device types on the network
@@ -10220,6 +9995,11 @@ var MediaSlot;
     MediaSlot[MediaSlot["SD"] = 2] = "SD";
     MediaSlot[MediaSlot["USB"] = 3] = "USB";
     MediaSlot[MediaSlot["RB"] = 4] = "RB";
+    MediaSlot[MediaSlot["Unknown05"] = 5] = "Unknown05";
+    MediaSlot[MediaSlot["StreamingDirectPlay"] = 6] = "StreamingDirectPlay";
+    MediaSlot[MediaSlot["Unknown07"] = 7] = "Unknown07";
+    MediaSlot[MediaSlot["Unknown08"] = 8] = "Unknown08";
+    MediaSlot[MediaSlot["Beatport"] = 9] = "Beatport";
 })(MediaSlot || (exports.MediaSlot = MediaSlot = {}));
 /**
  * Track type flags
@@ -10230,46 +10010,14 @@ var TrackType;
     TrackType[TrackType["RB"] = 1] = "RB";
     TrackType[TrackType["Unanalyzed"] = 2] = "Unanalyzed";
     TrackType[TrackType["AudioCD"] = 5] = "AudioCD";
+    TrackType[TrackType["Streaming"] = 6] = "Streaming";
 })(TrackType || (exports.TrackType = TrackType = {}));
 /**
- * A hotcue button label
- */
-var HotcueButton;
-(function (HotcueButton) {
-    HotcueButton[HotcueButton["A"] = 1] = "A";
-    HotcueButton[HotcueButton["B"] = 2] = "B";
-    HotcueButton[HotcueButton["C"] = 3] = "C";
-    HotcueButton[HotcueButton["D"] = 4] = "D";
-    HotcueButton[HotcueButton["E"] = 5] = "E";
-    HotcueButton[HotcueButton["F"] = 6] = "F";
-    HotcueButton[HotcueButton["G"] = 7] = "G";
-    HotcueButton[HotcueButton["H"] = 8] = "H";
-})(HotcueButton || (exports.HotcueButton = HotcueButton = {}));
-/**
- * When a custom color is not configured the cue point will be one of these
- * colors.
+ * Re-export cue types from onelibrary-connect
  */
-var CueColor;
-(function (CueColor) {
-    CueColor[CueColor["None"] = 0] = "None";
-    CueColor[CueColor["Blank"] = 21] = "Blank";
-    CueColor[CueColor["Magenta"] = 49] = "Magenta";
-    CueColor[CueColor["Violet"] = 56] = "Violet";
-    CueColor[CueColor["Fuchsia"] = 60] = "Fuchsia";
-    CueColor[CueColor["LightSlateBlue"] = 62] = "LightSlateBlue";
-    CueColor[CueColor["Blue"] = 1] = "Blue";
-    CueColor[CueColor["SteelBlue"] = 5] = "SteelBlue";
-    CueColor[CueColor["Aqua"] = 9] = "Aqua";
-    CueColor[CueColor["SeaGreen"] = 14] = "SeaGreen";
-    CueColor[CueColor["Teal"] = 18] = "Teal";
-    CueColor[CueColor["Green"] = 22] = "Green";
-    CueColor[CueColor["Lime"] = 26] = "Lime";
-    CueColor[CueColor["Olive"] = 30] = "Olive";
-    CueColor[CueColor["Yellow"] = 32] = "Yellow";
-    CueColor[CueColor["Orange"] = 38] = "Orange";
-    CueColor[CueColor["Red"] = 42] = "Red";
-    CueColor[CueColor["Pink"] = 45] = "Pink";
-})(CueColor || (exports.CueColor = CueColor = {}));
+var onelibrary_connect_1 = __webpack_require__(/*! onelibrary-connect */ "onelibrary-connect");
+Object.defineProperty(exports, "CueColor", ({ enumerable: true, get: function () { return onelibrary_connect_1.CueColor; } }));
+Object.defineProperty(exports, "HotcueButton", ({ enumerable: true, get: function () { return onelibrary_connect_1.HotcueButton; } }));
 var NetworkState;
 (function (NetworkState) {
     /**
@@ -10427,6 +10175,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.buildName = buildName;
 exports.getMatchingInterface = getMatchingInterface;
+exports.getBroadcastAddress = getBroadcastAddress;
 exports.bpmToSeconds = bpmToSeconds;
 exports.getSlotName = getSlotName;
 exports.getTrackTypeName = getTrackTypeName;
@@ -10464,6 +10213,18 @@ function getMatchingInterface(ipAddr) {
     }
     return matchedIface;
 }
+/**
+ * Computes the IPv4 subnet broadcast address for a network interface.
+ *
+ * Builds the address from the interface CIDR so the broadcast covers the whole
+ * subnet (e.g. x.x.x.255 for a /24). Falls back to the bare interface address
+ * when no CIDR is available, which only reaches the host itself but avoids
+ * throwing.
+ */
+function getBroadcastAddress(iface) {
+    var _a;
+    return new ip.Address4((_a = iface.cidr) !== null && _a !== void 0 ? _a : iface.address).endAddress().address;
+}
 /**
  * Given a BPM and pitch value, compute how many seconds per beat
  */
@@ -10721,13 +10482,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Announcer_instances, _Announcer_announceSocket, _Announcer_deviceManager, _Announcer_vcdj, _Announcer_intervalHandle, _Announcer_fullStartup, _Announcer_currentStage, _Announcer_stageCounter, _Announcer_conflictListener, _Announcer_iface, _Announcer_startFullStartup, _Announcer_handleConflict, _Announcer_sendStagePackets, _Announcer_advanceStage, _Announcer_startKeepAlive;
+var _Announcer_instances, _Announcer_announceSocket, _Announcer_deviceManager, _Announcer_vcdj, _Announcer_intervalHandle, _Announcer_fullStartup, _Announcer_announceToStagehand, _Announcer_currentStage, _Announcer_stageCounter, _Announcer_conflictListener, _Announcer_iface, _Announcer_logger, _Announcer_onStartupComplete, _Announcer_startFullStartup, _Announcer_handleConflict, _Announcer_sendPacket, _Announcer_sendStagePackets, _Announcer_advanceStage, _Announcer_startKeepAlive;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Announcer = exports.getVirtualCDJ = void 0;
 exports.makeStatusPacket = makeStatusPacket;
 exports.makeAnnouncePacket = makeAnnouncePacket;
 const ip = __importStar(__webpack_require__(/*! ip-address */ "ip-address"));
 const constants_1 = __webpack_require__(/*! src/constants */ "./src/constants.ts");
+const logger_1 = __webpack_require__(/*! src/logger */ "./src/logger.ts");
 const types_1 = __webpack_require__(/*! src/types */ "./src/types.ts");
 const utils_1 = __webpack_require__(/*! src/utils */ "./src/utils/index.ts");
 /**
@@ -10975,7 +10737,7 @@ function parseConflictPacket(packet) {
  * as if it was a real CDJ.
  */
 class Announcer {
-    constructor(vcdj, announceSocket, deviceManager, iface, fullStartup = false) {
+    constructor(vcdj, announceSocket, deviceManager, iface, fullStartup = false, announceToStagehand = false, logger = logger_1.noopLogger) {
         _Announcer_instances.add(this);
         /**
          * The announce socket to use to make the announcements
@@ -10998,6 +10760,11 @@ class Announcer {
          * Whether to use full startup protocol
          */
         _Announcer_fullStartup.set(this, void 0);
+        /**
+         * Whether to send announcer packets to Pioneer Stagehand devices, which are
+         * normally excluded because they crash on our packets
+         */
+        _Announcer_announceToStagehand.set(this, void 0);
         /**
          * Current startup stage (only used when fullStartup is enabled)
          */
@@ -11014,11 +10781,36 @@ class Announcer {
          * Network interface for the virtual CDJ
          */
         _Announcer_iface.set(this, void 0);
+        /**
+         * Logger instance for diagnostic output
+         */
+        _Announcer_logger.set(this, void 0);
+        /**
+         * Callback invoked when the full startup protocol completes
+         */
+        _Announcer_onStartupComplete.set(this, void 0);
         __classPrivateFieldSet(this, _Announcer_vcdj, vcdj, "f");
         __classPrivateFieldSet(this, _Announcer_announceSocket, announceSocket, "f");
         __classPrivateFieldSet(this, _Announcer_deviceManager, deviceManager, "f");
         __classPrivateFieldSet(this, _Announcer_iface, iface, "f");
         __classPrivateFieldSet(this, _Announcer_fullStartup, fullStartup, "f");
+        __classPrivateFieldSet(this, _Announcer_announceToStagehand, announceToStagehand, "f");
+        __classPrivateFieldSet(this, _Announcer_logger, logger, "f");
+    }
+    /**
+     * Returns a promise that resolves when the startup protocol completes.
+     * Resolves immediately if fullStartup is disabled.
+     */
+    get ready() {
+        if (!__classPrivateFieldGet(this, _Announcer_fullStartup, "f")) {
+            return Promise.resolve();
+        }
+        if (__classPrivateFieldGet(this, _Announcer_currentStage, "f") === StartupStage.KeepAlive) {
+            return Promise.resolve();
+        }
+        return new Promise(resolve => {
+            __classPrivateFieldSet(this, _Announcer_onStartupComplete, resolve, "f");
+        });
     }
     start() {
         if (__classPrivateFieldGet(this, _Announcer_fullStartup, "f")) {
@@ -11042,14 +10834,14 @@ class Announcer {
     }
 }
 exports.Announcer = Announcer;
-_Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMap(), _Announcer_vcdj = new WeakMap(), _Announcer_intervalHandle = new WeakMap(), _Announcer_fullStartup = new WeakMap(), _Announcer_currentStage = new WeakMap(), _Announcer_stageCounter = new WeakMap(), _Announcer_conflictListener = new WeakMap(), _Announcer_iface = new WeakMap(), _Announcer_instances = new WeakSet(), _Announcer_startFullStartup = function _Announcer_startFullStartup() {
+_Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMap(), _Announcer_vcdj = new WeakMap(), _Announcer_intervalHandle = new WeakMap(), _Announcer_fullStartup = new WeakMap(), _Announcer_announceToStagehand = new WeakMap(), _Announcer_currentStage = new WeakMap(), _Announcer_stageCounter = new WeakMap(), _Announcer_conflictListener = new WeakMap(), _Announcer_iface = new WeakMap(), _Announcer_logger = new WeakMap(), _Announcer_onStartupComplete = new WeakMap(), _Announcer_instances = new WeakSet(), _Announcer_startFullStartup = function _Announcer_startFullStartup() {
     __classPrivateFieldSet(this, _Announcer_currentStage, StartupStage.InitialAnnounce, "f");
     __classPrivateFieldSet(this, _Announcer_stageCounter, 0, "f");
     // Set up conflict detection listener
     __classPrivateFieldSet(this, _Announcer_conflictListener, (msg) => {
         const conflictDeviceId = parseConflictPacket(msg);
         if (conflictDeviceId === __classPrivateFieldGet(this, _Announcer_vcdj, "f").id) {
-            console.warn(`Device ID ${__classPrivateFieldGet(this, _Announcer_vcdj, "f").id} is already in use. Finding alternative...`);
+            __classPrivateFieldGet(this, _Announcer_logger, "f").warn(`Device ID ${__classPrivateFieldGet(this, _Announcer_vcdj, "f").id} is already in use. Finding alternative...`);
             __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_handleConflict).call(this);
         }
     }, "f");
@@ -11080,20 +10872,29 @@ _Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMa
         }
     }
     if (newId === null) {
-        console.error('No available device IDs. All 32 slots are occupied.');
+        __classPrivateFieldGet(this, _Announcer_logger, "f").error('No available device IDs. All 32 slots are occupied.');
         this.stop();
         return;
     }
-    console.log(`Switching to device ID ${newId}`);
+    __classPrivateFieldGet(this, _Announcer_logger, "f").info(`Switching to device ID ${newId}`);
     // Update virtual CDJ with new ID
     __classPrivateFieldSet(this, _Announcer_vcdj, (0, exports.getVirtualCDJ)(__classPrivateFieldGet(this, _Announcer_iface, "f"), newId), "f");
     // Restart startup sequence
     __classPrivateFieldSet(this, _Announcer_currentStage, StartupStage.InitialAnnounce, "f");
     __classPrivateFieldSet(this, _Announcer_stageCounter, 0, "f");
     __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_sendStagePackets).call(this);
+}, _Announcer_sendPacket = function _Announcer_sendPacket(packet) {
+    const devices = [...__classPrivateFieldGet(this, _Announcer_deviceManager, "f").devices.values()].filter(d => __classPrivateFieldGet(this, _Announcer_announceToStagehand, "f") || !d.name.toLowerCase().includes('stagehand'));
+    devices.forEach(device => __classPrivateFieldGet(this, _Announcer_announceSocket, "f").send(packet, constants_1.ANNOUNCE_PORT, device.ip.address));
+    // Cold-start discovery broadcast — gated; see the method doc above.
+    if (devices.length === 0 && __classPrivateFieldGet(this, _Announcer_announceToStagehand, "f")) {
+        const broadcastAddr = (0, utils_1.getBroadcastAddress)(__classPrivateFieldGet(this, _Announcer_iface, "f"));
+        __classPrivateFieldGet(this, _Announcer_announceSocket, "f").send(packet, constants_1.ANNOUNCE_PORT, broadcastAddr);
+    }
 }, _Announcer_sendStagePackets = function _Announcer_sendStagePackets() {
     var _a;
-    __classPrivateFieldSet(this, _Announcer_stageCounter, (_a = __classPrivateFieldGet(this, _Announcer_stageCounter, "f"), _a++, _a), "f");
+    var _b;
+    __classPrivateFieldSet(this, _Announcer_stageCounter, (_b = __classPrivateFieldGet(this, _Announcer_stageCounter, "f"), _b++, _b), "f");
     // Build packet for current stage
     let packet;
     switch (__classPrivateFieldGet(this, _Announcer_currentStage, "f")) {
@@ -11112,16 +10913,11 @@ _Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMa
         case StartupStage.KeepAlive:
             // Transition to keep-alive mode
             __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_startKeepAlive).call(this);
+            (_a = __classPrivateFieldGet(this, _Announcer_onStartupComplete, "f")) === null || _a === void 0 ? void 0 : _a.call(this);
+            __classPrivateFieldSet(this, _Announcer_onStartupComplete, undefined, "f");
             return;
     }
-    // Broadcast packet to all known devices
-    const devices = [...__classPrivateFieldGet(this, _Announcer_deviceManager, "f").devices.values()];
-    devices.forEach(device => __classPrivateFieldGet(this, _Announcer_announceSocket, "f").send(packet, constants_1.ANNOUNCE_PORT, device.ip.address));
-    // Also broadcast to network if no devices yet
-    if (devices.length === 0) {
-        const broadcastAddr = __classPrivateFieldGet(this, _Announcer_vcdj, "f").ip.endAddress().address;
-        __classPrivateFieldGet(this, _Announcer_announceSocket, "f").send(packet, constants_1.ANNOUNCE_PORT, broadcastAddr);
-    }
+    __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_sendPacket).call(this, packet);
     // Progress to next packet or stage
     if (__classPrivateFieldGet(this, _Announcer_stageCounter, "f") >= 3) {
         // Move to next stage
@@ -11160,13 +10956,7 @@ _Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMa
         const packet = __classPrivateFieldGet(this, _Announcer_fullStartup, "f")
             ? makeStage06Packet(__classPrivateFieldGet(this, _Announcer_vcdj, "f"), peerCount)
             : makeAnnouncePacket(__classPrivateFieldGet(this, _Announcer_vcdj, "f"));
-        const devices = [...__classPrivateFieldGet(this, _Announcer_deviceManager, "f").devices.values()];
-        devices.forEach(device => __classPrivateFieldGet(this, _Announcer_announceSocket, "f").send(packet, constants_1.ANNOUNCE_PORT, device.ip.address));
-        // Also broadcast if no devices
-        if (devices.length === 0) {
-            const broadcastAddr = __classPrivateFieldGet(this, _Announcer_vcdj, "f").ip.endAddress().address;
-            __classPrivateFieldGet(this, _Announcer_announceSocket, "f").send(packet, constants_1.ANNOUNCE_PORT, broadcastAddr);
-        }
+        __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_sendPacket).call(this, packet);
     };
     // Send first keep-alive immediately
     sendKeepAlive();
@@ -11309,6 +11099,17 @@ module.exports = require("net");
 
 /***/ },
 
+/***/ "onelibrary-connect"
+/*!*************************************!*\
+  !*** external "onelibrary-connect" ***!
+  \*************************************/
+(module) {
+
+"use strict";
+module.exports = require("onelibrary-connect");
+
+/***/ },
+
 /***/ "os"
 /*!*********************!*\
   !*** external "os" ***!
@@ -11373,17 +11174,6 @@ module.exports = require("promise-timeout");
 "use strict";
 module.exports = require("signale");
 
-/***/ },
-
-/***/ "zlib"
-/*!***********************!*\
-  !*** external "zlib" ***!
-  \***********************/
-(module) {
-
-"use strict";
-module.exports = require("zlib");
-
 /***/ }
 
 /******/ 	});