alphatheta-connect 0.23.1 → 0.23.2

package/lib/cli.js

@@ -1383,11 +1383,11 @@ async function viaLocal(local, device, opts) {
     }
     const adapter = await local.get(deviceId, trackSlot);
     if (adapter === null) {
-        return null;
+        return { track: null, miss: 'no-database' };
     }
     const dbTrack = adapter.findTrack(trackId);
     if (dbTrack === null) {
-        return null;
+        return { track: null, miss: 'track-absent' };
     }
     const anlz = await (0, rekordbox_1.loadAnlz)(dbTrack, 'DAT', (0, utils_1.anlzLoader)({ device, slot: trackSlot }));
     const track = {
@@ -1395,7 +1395,7 @@ async function viaLocal(local, device, opts) {
         beatGrid: anlz.beatGrid,
         waveformHd: null,
     };
-    return track;
+    return { track, miss: null };
 }
 
 
@@ -1645,8 +1645,10 @@ 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_deviceManager, _Database_localDatabase, _Database_remoteDatabase, _Database_getTrackLookupStrategy, _Database_getMediaLookupStrategy;
+var _Database_instances, _Database_deviceManager, _Database_localDatabase, _Database_remoteDatabase, _Database_logger, _Database_getTrackLookupStrategy, _Database_getMediaLookupStrategy, _Database_metadataViaRemoteFallback;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+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");
 const Telemetry = __importStar(__webpack_require__(/*! src/utils/telemetry */ "./src/utils/telemetry.ts"));
@@ -1669,7 +1671,8 @@ var LookupStrategy;
  * network for information from their databases.
  */
 class Database {
-    constructor(local, remote, deviceManager) {
+    constructor(local, remote, deviceManager, logger = logger_1.noopLogger) {
+        _Database_instances.add(this);
         _Database_deviceManager.set(this, void 0);
         /**
          * The local database service, used when querying media devices connected
@@ -1681,6 +1684,7 @@ class Database {
          * CDJ with an unanalyzed media device connected (when possible).
          */
         _Database_remoteDatabase.set(this, void 0);
+        _Database_logger.set(this, void 0);
         _Database_getTrackLookupStrategy.set(this, (device, type) => {
             const isUnanalyzed = type === types_1.TrackType.AudioCD || type === types_1.TrackType.Unanalyzed;
             const isStreaming = type === types_1.TrackType.Streaming;
@@ -1703,6 +1707,7 @@ class Database {
         __classPrivateFieldSet(this, _Database_localDatabase, local, "f");
         __classPrivateFieldSet(this, _Database_remoteDatabase, remote, "f");
         __classPrivateFieldSet(this, _Database_deviceManager, deviceManager, "f");
+        __classPrivateFieldSet(this, _Database_logger, logger, "f");
     }
     /**
      * Get the database type (oneLibrary or pdb) for a loaded device slot.
@@ -1733,7 +1738,18 @@ class Database {
             track = await GetMetadata.viaRemote(__classPrivateFieldGet(this, _Database_remoteDatabase, "f"), callOpts);
         }
         if (strategy === LookupStrategy.Local) {
-            track = await GetMetadata.viaLocal(__classPrivateFieldGet(this, _Database_localDatabase, "f"), device, callOpts);
+            const local = await GetMetadata.viaLocal(__classPrivateFieldGet(this, _Database_localDatabase, "f"), device, callOpts);
+            track = local.track;
+            // A local miss used to end the lookup, so the DJ's track silently never
+            // reached the overlay for the rest of the set (NP3-361). Say what was
+            // missed, then give the CDJ's own database a chance to answer.
+            if (local.miss !== null) {
+                __classPrivateFieldGet(this, _Database_logger, "f").warn(`Local metadata lookup missed track ${opts.trackId} on device ${deviceId} ` +
+                    `${(0, utils_1.getSlotName)(trackSlot)}: ${local.miss === 'no-database'
+                        ? 'no rekordbox database is loaded for that slot'
+                        : 'the loaded database holds no track with that id'}`);
+                track = await __classPrivateFieldGet(this, _Database_instances, "m", _Database_metadataViaRemoteFallback).call(this, callOpts);
+            }
         }
         if (strategy === LookupStrategy.NoneAvailable) {
             tx.setStatus(telemetry_1.SpanStatus.Unavailable);
@@ -1927,7 +1943,40 @@ class Database {
         return contents;
     }
 }
-_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_logger = new WeakMap(), _Database_getTrackLookupStrategy = new WeakMap(), _Database_getMediaLookupStrategy = new WeakMap(), _Database_instances = new WeakSet(), _Database_metadataViaRemoteFallback = 
+/**
+ * Second chance for a track the local database could not answer for.
+ *
+ * CDJs only answer remote database queries from a host announcing a device
+ * ID in the 1-6 range, so this is unavailable whenever the virtual CDJ sits
+ * outside it (the package default is 7). That is a real configuration, not
+ * an error — log why the fallback was skipped rather than throwing, so the
+ * next report says which of the two happened.
+ */
+async function _Database_metadataViaRemoteFallback(opts) {
+    const hostId = __classPrivateFieldGet(this, _Database_remoteDatabase, "f").hostDevice.id;
+    if (hostId < constants_1.MIN_CDJ_DEVICE_ID || hostId > constants_1.MAX_CDJ_DEVICE_ID) {
+        __classPrivateFieldGet(this, _Database_logger, "f").warn(`No remote fallback for track ${opts.trackId}: this player is device ` +
+            `${hostId}, and CDJs only answer remote database queries from ` +
+            `devices ${constants_1.MIN_CDJ_DEVICE_ID}-${constants_1.MAX_CDJ_DEVICE_ID}`);
+        return null;
+    }
+    try {
+        const track = await GetMetadata.viaRemote(__classPrivateFieldGet(this, _Database_remoteDatabase, "f"), opts);
+        if (track === null) {
+            __classPrivateFieldGet(this, _Database_logger, "f").warn(`Remote fallback found no track ${opts.trackId} on device ${opts.deviceId}`);
+            return null;
+        }
+        __classPrivateFieldGet(this, _Database_logger, "f").info(`Remote fallback recovered track ${opts.trackId} from device ${opts.deviceId}`);
+        return track;
+    }
+    catch (e) {
+        const message = e instanceof Error ? e.message : String(e);
+        __classPrivateFieldGet(this, _Database_logger, "f").warn(`Remote fallback failed for track ${opts.trackId} on device ` +
+            `${opts.deviceId}: ${message}`);
+        return null;
+    }
+};
 exports["default"] = Database;
 
 
@@ -6975,7 +7024,7 @@ class ProlinkNetwork {
         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"), (_f = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").databasePreference) !== null && _f !== void 0 ? _f : 'auto');
         // Create unified database
-        const database = new db_1.default(localdb, remotedb, __classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f"));
+        const database = new db_1.default(localdb, remotedb, __classPrivateFieldGet(this, _ProlinkNetwork_deviceManager, "f"), __classPrivateFieldGet(this, _ProlinkNetwork_logger, "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");
@@ -8656,6 +8705,15 @@ class RemoteDatabase {
         __classPrivateFieldSet(this, _RemoteDatabase_deviceManager, deviceManager, "f");
         __classPrivateFieldSet(this, _RemoteDatabase_hostDevice, hostDevice, "f");
     }
+    /**
+     * The device we introduce ourselves as when opening a remote database
+     * connection. CDJs only answer queries from a host announcing an ID in the
+     * 1-6 range, so callers need to read this before deciding a remote lookup is
+     * even possible.
+     */
+    get hostDevice() {
+        return __classPrivateFieldGet(this, _RemoteDatabase_hostDevice, "f");
+    }
     /**
      * Gets the remote database query interface for the given device.
      *