alphatheta-connect 0.25.2 → 0.26.0

package/lib/cli.js

@@ -7111,7 +7111,12 @@ class ProlinkNetwork {
         }
         const tx = Telemetry.startTransaction({ name: 'connect' });
         const connectMethod = (_a = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").connectMethod) !== null && _a !== void 0 ? _a : 'active';
+        // Pick the device number once and keep it. A CDJ-3000 that already holds
+        // a record for our IP ignores a re-claim under a different number, so a
+        // disconnect/connect cycle must present the same identity (see
+        // getStagehandMac).
         const vcdjId = (_b = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").vcdjId) !== null && _b !== void 0 ? _b : (connectMethod === 'stagehand' ? (0, virtualcdj_1.generateStagehandDeviceId)() : constants_1.DEFAULT_VCDJ_ID);
+        __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").vcdjId = vcdjId;
         const vcdjName = (_c = __classPrivateFieldGet(this, _ProlinkNetwork_config, "f").vcdjName) !== null && _c !== void 0 ? _c : (connectMethod === 'stagehand' ? 'Stagehand' : undefined);
         // Create VCDJ or Stagehand device
         const vcdj = connectMethod === 'stagehand'
@@ -12000,7 +12005,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _StagehandAnnouncer_instances, _StagehandAnnouncer_announceSocket, _StagehandAnnouncer_vcdj, _StagehandAnnouncer_intervalHandle, _StagehandAnnouncer_currentStage, _StagehandAnnouncer_stageCounter, _StagehandAnnouncer_iface, _StagehandAnnouncer_logger, _StagehandAnnouncer_onStartupComplete, _StagehandAnnouncer_mac, _StagehandAnnouncer_startStartup, _StagehandAnnouncer_sendPacket, _StagehandAnnouncer_sendStagePackets, _StagehandAnnouncer_advanceStage, _StagehandAnnouncer_startKeepAlive;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.StagehandAnnouncer = exports.getVirtualStagehand = exports.StagehandStartupStage = exports.STAGEHAND_KEEP_ALIVE_INTERVAL = exports.STAGEHAND_STARTUP_INTERVAL = void 0;
-exports.generateStagehandMac = generateStagehandMac;
+exports.getStagehandMac = getStagehandMac;
 exports.generateStagehandDeviceId = generateStagehandDeviceId;
 exports.makeStagehand0aPacket = makeStagehand0aPacket;
 exports.makeStagehand02Packet = makeStagehand02Packet;
@@ -12019,17 +12024,21 @@ var StagehandStartupStage;
     StagehandStartupStage[StagehandStartupStage["KeepAlive"] = 6] = "KeepAlive";
 })(StagehandStartupStage || (exports.StagehandStartupStage = StagehandStartupStage = {}));
 /**
- * Generates a randomized MAC address with the AlphaTheta OUI (c8:3d:fc).
+ * The protocol-layer MAC a Stagehand device embeds in its 0x02 claim and 0x06
+ * keep-alive: the AlphaTheta OUI (c8:3d:fc) followed by the low three bytes of
+ * the interface's own MAC.
+ *
+ * This must stay stable for the life of the host. A CDJ-3000 records a peer by
+ * the identity in its claim, and once it holds a record for our IP it ignores
+ * later claims from the same IP that carry a different MAC or device number:
+ * the new peer never receives the unicast status/position stream. Observed on
+ * emulated CDJ-3000 firmware 3.20: a freshly randomized identity on every
+ * connect() was served once and then never again until the player rebooted,
+ * while the previously registered identity kept being served immediately.
  */
-function generateStagehandMac() {
-    const mac = new Uint8Array(6);
-    mac[0] = 0xc8;
-    mac[1] = 0x3d;
-    mac[2] = 0xfc;
-    mac[3] = Math.floor(Math.random() * 256);
-    mac[4] = Math.floor(Math.random() * 256);
-    mac[5] = Math.floor(Math.random() * 256);
-    return mac;
+function getStagehandMac(iface) {
+    const ifaceMac = iface.mac.split(':').map(s => parseInt(s, 16));
+    return Uint8Array.from([0xc8, 0x3d, 0xfc, ...ifaceMac.slice(3, 6)]);
 }
 /**
  * Generates a random Stagehand device ID in the observed range of 141 to 211.
@@ -12043,9 +12052,9 @@ function generateStagehandDeviceId() {
  * @param iface - The network interface to use
  * @param id - The device ID to use (defaults to random Stagehand ID)
  * @param name - The device name (defaults to 'Stagehand')
- * @param macAddr - The optional randomized MAC address
+ * @param macAddr - The protocol-layer MAC (defaults to one derived from iface)
  */
-const getVirtualStagehand = (iface, id = generateStagehandDeviceId(), name = 'Stagehand', macAddr = generateStagehandMac()) => ({
+const getVirtualStagehand = (iface, id = generateStagehandDeviceId(), name = 'Stagehand', macAddr = getStagehandMac(iface)) => ({
     id,
     name,
     type: types_1.DeviceType.Stagehand,