alphatheta-connect 0.21.10 → 0.23.0

package/lib/cli.js

@@ -10795,6 +10795,155 @@ function udpClose(conn) {
 }
 
 
+/***/ },
+
+/***/ "./src/virtualcdj/device-id.ts"
+/*!*************************************!*\
+  !*** ./src/virtualcdj/device-id.ts ***!
+  \*************************************/
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DEFAULT_MIXER_PLAYER_CEILING = exports.MIXER_PLAYER_CEILING = exports.MAX_DEVICE_ID = exports.REMOTEDB_MAX_DEVICE_ID = void 0;
+exports.playerNumberCeiling = playerNumberCeiling;
+exports.pickAvailableDeviceId = pickAvailableDeviceId;
+/**
+ * The highest device ID a CDJ will answer remotedb queries from.
+ *
+ * CDJs ignore metadata requests from devices numbered above this, which is why
+ * the 1-6 range is worth preferring even though real players live there too.
+ */
+exports.REMOTEDB_MAX_DEVICE_ID = 6;
+/**
+ * The highest device ID the prolink protocol allows.
+ */
+exports.MAX_DEVICE_ID = 32;
+/**
+ * `DeviceType.Mixer`, inlined so this module stays free of runtime imports —
+ * it is re-exported into consumers' test environments, where pulling in the
+ * whole type module (and its ip-address dependency) is dead weight.
+ */
+const MIXER_DEVICE_TYPE = 0x03;
+/**
+ * How many player numbers each mixer can hand out.
+ *
+ * Players take their number from the mixer channel they are plugged into, so
+ * an N-channel mixer only ever produces players 1..N — and N+1 is the lowest
+ * number that no player on that rig can claim.
+ *
+ * These are physical channel counts, deliberately NOT the `channelCount` in
+ * the app's own capability table, which caps the DJM-V10 at 4 for its mixer
+ * signal model. Capping here would put us on player 5 of a 6-channel rig,
+ * which is the collision this table exists to avoid.
+ */
+exports.MIXER_PLAYER_CEILING = {
+    // 6-channel flagships — no player number in 1-6 is safe on these
+    'DJM-V10': 6,
+    'DJM-V10-LF': 6,
+    // 4-channel
+    'DJM-A9': 4,
+    'DJM-900NXS2': 4,
+    'DJM-900NXS': 4,
+    'DJM-900SRT': 4,
+    'DJM-850': 4,
+    'DJM-800': 4,
+    'DJM-750MK2': 4,
+    'DJM-750': 4,
+    'DJM-TOUR1': 4,
+    'DJM-2000NXS': 4,
+    'DJM-2000': 4,
+    EUPHONIA: 4,
+    // 3-channel (2026)
+    'DJM-V5': 3,
+    // 2-channel
+    'DJM-450': 2,
+    'DJM-350': 2,
+    'DJM-250MK2': 2,
+    // All-in-ones: their built-in players occupy numbers too, so the ceiling is
+    // however many decks the unit announces rather than its mixer channel count
+    'XDJ-XZ': 4,
+    'XDJ-AZ': 4,
+    'XDJ-RX3': 2,
+    'XDJ-RX2': 2,
+    'XDJ-RX': 2,
+    'XDJ-AN': 2,
+    'OPUS-QUAD': 4,
+};
+/**
+ * What to assume about a mixer whose model we do not recognise.
+ *
+ * Four is both the most common layout and the choice that keeps remotedb
+ * metadata working: assuming six would push us to player 7 on every mixer
+ * released after this table was written, silently losing metadata for
+ * unanalyzed and streaming tracks. A six-channel unit we failed to recognise
+ * may later claim the number we took, which the announcer's conflict handling
+ * resolves by moving us.
+ */
+exports.DEFAULT_MIXER_PLAYER_CEILING = 4;
+/**
+ * The highest player number the discovered gear can hand out, or undefined
+ * when nothing on the network implies one.
+ *
+ * Undefined means we have no mixer to reason from — players may have been
+ * numbered by hand anywhere in 1-6, and there is no better guess available.
+ */
+function playerNumberCeiling(devices) {
+    let ceiling;
+    for (const device of devices) {
+        const known = exports.MIXER_PLAYER_CEILING[device.name.trim().toUpperCase()];
+        const value = known !== null && known !== void 0 ? known : (device.type === MIXER_DEVICE_TYPE ? exports.DEFAULT_MIXER_PLAYER_CEILING : undefined);
+        if (value !== undefined && (ceiling === undefined || value > ceiling)) {
+            ceiling = value;
+        }
+    }
+    return ceiling;
+}
+const descending = (from, to) => {
+    const ids = [];
+    for (let id = from; id >= to; id--) {
+        ids.push(id);
+    }
+    return ids;
+};
+const ascending = (from, to) => {
+    const ids = [];
+    for (let id = from; id <= to; id++) {
+        ids.push(id);
+    }
+    return ids;
+};
+/**
+ * Pick a device ID that no device on the network is currently using.
+ *
+ * Taking an ID a live player already holds knocks that player off the network
+ * mid-set, so every caller that chooses its own ID should route through here
+ * rather than hardcoding one.
+ *
+ * Returns null when every ID from 1 to 32 is occupied, in which case there is
+ * no safe ID and the caller must not join the network.
+ */
+function pickAvailableDeviceId(usedIds, { preferRemoteDb = false, playerCeiling } = {}) {
+    var _a;
+    const used = new Set(usedIds);
+    const aboveThePlayers = playerCeiling === undefined
+        ? descending(exports.REMOTEDB_MAX_DEVICE_ID, 1)
+        : ascending(playerCeiling + 1, exports.REMOTEDB_MAX_DEVICE_ID);
+    const outsideRemoteDb = ascending(exports.REMOTEDB_MAX_DEVICE_ID + 1, exports.MAX_DEVICE_ID);
+    // Numbers a player on this rig could be assigned. Last resort: better to
+    // contend for a slot than not to join at all, and the announcer moves us if
+    // the player that owns it shows up.
+    const amongThePlayers = playerCeiling === undefined
+        ? []
+        : descending(Math.min(playerCeiling, exports.REMOTEDB_MAX_DEVICE_ID), 1);
+    const search = preferRemoteDb
+        ? [...aboveThePlayers, ...outsideRemoteDb, ...amongThePlayers]
+        : [...outsideRemoteDb, ...aboveThePlayers, ...amongThePlayers];
+    return (_a = search.find(id => !used.has(id))) !== null && _a !== void 0 ? _a : null;
+}
+
+
 /***/ },
 
 /***/ "./src/virtualcdj/index.ts"
@@ -10852,7 +11001,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 _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;
+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_armConflictListener, _Announcer_startFullStartup, _Announcer_handleConflict, _Announcer_clearTimer, _Announcer_sendPacket, _Announcer_sendStagePackets, _Announcer_advanceStage, _Announcer_startKeepAlive;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Announcer = exports.getVirtualCDJ = void 0;
 exports.makeStatusPacket = makeStatusPacket;
@@ -10862,6 +11011,7 @@ 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 device_id_1 = __webpack_require__(/*! src/virtualcdj/device-id */ "./src/virtualcdj/device-id.ts");
 /**
  * Constructs a virtual CDJ Device.
  *
@@ -11183,6 +11333,7 @@ class Announcer {
         });
     }
     start() {
+        __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_armConflictListener).call(this);
         if (__classPrivateFieldGet(this, _Announcer_fullStartup, "f")) {
             __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_startFullStartup).call(this);
         }
@@ -11191,11 +11342,7 @@ class Announcer {
         }
     }
     stop() {
-        if (__classPrivateFieldGet(this, _Announcer_intervalHandle, "f") !== undefined) {
-            clearInterval(__classPrivateFieldGet(this, _Announcer_intervalHandle, "f"));
-            clearTimeout(__classPrivateFieldGet(this, _Announcer_intervalHandle, "f"));
-            __classPrivateFieldSet(this, _Announcer_intervalHandle, undefined, "f");
-        }
+        __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_clearTimer).call(this);
         // Remove conflict listener if active
         if (__classPrivateFieldGet(this, _Announcer_conflictListener, "f")) {
             __classPrivateFieldGet(this, _Announcer_announceSocket, "f").off('message', __classPrivateFieldGet(this, _Announcer_conflictListener, "f"));
@@ -11204,10 +11351,10 @@ 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_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
+_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_armConflictListener = function _Announcer_armConflictListener() {
+    if (__classPrivateFieldGet(this, _Announcer_conflictListener, "f")) {
+        return;
+    }
     __classPrivateFieldSet(this, _Announcer_conflictListener, (msg) => {
         const conflictDeviceId = parseConflictPacket(msg);
         if (conflictDeviceId === __classPrivateFieldGet(this, _Announcer_vcdj, "f").id) {
@@ -11216,43 +11363,52 @@ _Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMa
         }
     }, "f");
     __classPrivateFieldGet(this, _Announcer_announceSocket, "f").on('message', __classPrivateFieldGet(this, _Announcer_conflictListener, "f"));
+}, _Announcer_startFullStartup = function _Announcer_startFullStartup() {
+    __classPrivateFieldSet(this, _Announcer_currentStage, StartupStage.InitialAnnounce, "f");
+    __classPrivateFieldSet(this, _Announcer_stageCounter, 0, "f");
     __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_sendStagePackets).call(this);
 }, _Announcer_handleConflict = function _Announcer_handleConflict() {
-    // Stop current startup
-    if (__classPrivateFieldGet(this, _Announcer_intervalHandle, "f")) {
-        clearTimeout(__classPrivateFieldGet(this, _Announcer_intervalHandle, "f"));
-        __classPrivateFieldSet(this, _Announcer_intervalHandle, undefined, "f");
-    }
-    // Find an available device ID
-    const usedIds = new Set([...__classPrivateFieldGet(this, _Announcer_deviceManager, "f").devices.values()].map(d => d.id));
-    let newId = null;
-    // Try IDs from 7-32 first (recommended range), then 1-6 if needed
-    for (let id = 7; id <= 32; id++) {
-        if (!usedIds.has(id)) {
-            newId = id;
-            break;
-        }
-    }
-    if (newId === null) {
-        for (let id = 1; id <= 6; id++) {
-            if (!usedIds.has(id)) {
-                newId = id;
-                break;
-            }
-        }
-    }
+    // Stop announcing under the contested ID
+    __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_clearTimer).call(this);
+    // Stay in whichever range we were already in. Dropping out of 1-6 would
+    // silently lose remotedb metadata for unanalyzed and streaming tracks, so
+    // a conflict on player 5 looks for another free player number first.
+    //
+    // The mixer decides which of those numbers are actually safe: a player can
+    // only be assigned a number its mixer has a channel for, so anything above
+    // that is out of reach of the rig that just contested us.
+    const devices = [...__classPrivateFieldGet(this, _Announcer_deviceManager, "f").devices.values()];
+    const newId = (0, device_id_1.pickAvailableDeviceId)(devices.map(d => d.id), {
+        preferRemoteDb: __classPrivateFieldGet(this, _Announcer_vcdj, "f").id <= device_id_1.REMOTEDB_MAX_DEVICE_ID,
+        playerCeiling: (0, device_id_1.playerNumberCeiling)(devices),
+    });
     if (newId === null) {
         __classPrivateFieldGet(this, _Announcer_logger, "f").error('No available device IDs. All 32 slots are occupied.');
         this.stop();
         return;
     }
     __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);
+    // Mutate in place rather than building a replacement device. The remotedb,
+    // localdb and control services were all handed this same object when the
+    // network connected and read `.id` when they build packets, so swapping
+    // the reference here would leave us announcing as one ID and querying as
+    // another.
+    __classPrivateFieldGet(this, _Announcer_vcdj, "f").id = newId;
+    // Re-announce under the new ID
+    if (__classPrivateFieldGet(this, _Announcer_fullStartup, "f")) {
+        __classPrivateFieldSet(this, _Announcer_currentStage, StartupStage.InitialAnnounce, "f");
+        __classPrivateFieldSet(this, _Announcer_stageCounter, 0, "f");
+        __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_sendStagePackets).call(this);
+    }
+    else {
+        __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_startKeepAlive).call(this);
+    }
+}, _Announcer_clearTimer = function _Announcer_clearTimer() {
+    if (__classPrivateFieldGet(this, _Announcer_intervalHandle, "f") !== undefined) {
+        clearTimeout(__classPrivateFieldGet(this, _Announcer_intervalHandle, "f"));
+        clearInterval(__classPrivateFieldGet(this, _Announcer_intervalHandle, "f"));
+        __classPrivateFieldSet(this, _Announcer_intervalHandle, undefined, "f");
+    }
 }, _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));
@@ -11312,15 +11468,7 @@ _Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMa
             break;
     }
 }, _Announcer_startKeepAlive = function _Announcer_startKeepAlive() {
-    if (__classPrivateFieldGet(this, _Announcer_intervalHandle, "f")) {
-        clearTimeout(__classPrivateFieldGet(this, _Announcer_intervalHandle, "f"));
-        __classPrivateFieldSet(this, _Announcer_intervalHandle, undefined, "f");
-    }
-    // Remove conflict listener once we're in keep-alive mode
-    if (__classPrivateFieldGet(this, _Announcer_conflictListener, "f")) {
-        __classPrivateFieldGet(this, _Announcer_announceSocket, "f").off('message', __classPrivateFieldGet(this, _Announcer_conflictListener, "f"));
-        __classPrivateFieldSet(this, _Announcer_conflictListener, undefined, "f");
-    }
+    __classPrivateFieldGet(this, _Announcer_instances, "m", _Announcer_clearTimer).call(this);
     const sendKeepAlive = () => {
         const peerCount = __classPrivateFieldGet(this, _Announcer_deviceManager, "f").devices.size + 1; // +1 for ourselves
         const packet = __classPrivateFieldGet(this, _Announcer_fullStartup, "f")
@@ -11333,6 +11481,7 @@ _Announcer_announceSocket = new WeakMap(), _Announcer_deviceManager = new WeakMa
     // Then schedule regular keep-alives
     __classPrivateFieldSet(this, _Announcer_intervalHandle, setInterval(sendKeepAlive, constants_1.ANNOUNCE_INTERVAL), "f");
 };
+__exportStar(__webpack_require__(/*! ./device-id */ "./src/virtualcdj/device-id.ts"), exports);
 __exportStar(__webpack_require__(/*! ./stagehand */ "./src/virtualcdj/stagehand.ts"), exports);