alphatheta-connect 0.25.3 → 0.26.1

package/lib/cli.js

@@ -1467,7 +1467,9 @@ async function viaLocal(local, opts) {
             if (!orm) {
                 break;
             }
-            yield orm.findTrack(entry.id);
+            // Playlist entries reference the track through trackId; entry.id is the
+            // entry's own row id (or its index, for OneLibrary), not a track.
+            yield orm.findTrack(entry.trackId);
         }
     };
     const tracks = { [Symbol.asyncIterator]: iterateTracks };
@@ -3285,7 +3287,9 @@ var RekordboxAnlz = (function() {
       this.time = this._io.readU4be();
       this.loopTime = this._io.readU4be();
       this.colorId = this._io.readU1();
-      this._unnamed9 = this._io.readBytes(11);
+      this._unnamed9 = this._io.readBytes(7);
+      this.loopNumerator = this._io.readU2be();
+      this.loopDenominator = this._io.readU2be();
       if (this.lenEntry > 43) {
         this.lenComment = this._io.readU4be();
       }
@@ -3305,7 +3309,7 @@ var RekordboxAnlz = (function() {
         this.colorBlue = this._io.readU1();
       }
       if ((this.lenEntry - this.lenComment) > 48) {
-        this._unnamed16 = this._io.readBytes(((this.lenEntry - 48) - this.lenComment));
+        this._unnamed18 = this._io.readBytes(((this.lenEntry - 48) - this.lenComment));
       }
     }
 
@@ -3337,6 +3341,16 @@ var RekordboxAnlz = (function() {
      * and has been assigned a color.
      */
 
+    /**
+     * The numerator of the loop size fraction for a quantized loop,
+     * e.g. 4 for a 4-beat loop. Zero when the loop is not quantized.
+     */
+
+    /**
+     * The denominator of the loop size fraction for a quantized loop,
+     * e.g. 1 for a 4-beat loop.
+     */
+
     /**
      * The comment assigned to this cue by the DJ, if any, with a trailing NUL.
      */
@@ -5767,16 +5781,20 @@ function makeBeatGrid(data) {
  * Fill cue and loop data from the ANLZ section
  */
 function makeCueAndLoop(data) {
-    return data.body.cues.map((entry) => {
+    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;
+        // `hotCue` is the button number (1-8, A-H); zero marks a memory cue.
+        // `type` only says whether the entry is a cue point (1) or a loop (2).
+        const button = entry.hotCue === 0 ? false : entry.hotCue;
         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);
-    });
+    })
+        .filter((c) => c !== null);
 }
 /**
  * Fill waveform HD data from the ANLZ section
@@ -5812,9 +5830,13 @@ function makeExtendedCues(data) {
                 b: (_c = entry.colorBlue) !== null && _c !== void 0 ? _c : 0,
             };
         }
-        // Add comment if present
+        // Add comment if present. The tag stores it with a trailing NUL, which
+        // is not part of what the DJ typed.
         if (entry.lenComment > 0 && entry.comment) {
-            cue.comment = entry.comment;
+            const comment = entry.comment.replace(/\0+$/, '');
+            if (comment.length > 0) {
+                cue.comment = comment;
+            }
         }
         // Add quantized loop information if present
         if (entry.loopNumerator !== undefined && entry.loopNumerator > 0) {
@@ -5880,19 +5902,24 @@ function makeSongStructure(data) {
         },
     };
     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 bank = (_b = bankMap[data.body.bank]) !== null && _b !== void 0 ? _b : 'default';
+    // Field names follow the Kaitai-generated object (rekordbox_anlz.ksy
+    // `song_structure_entry`): `phraseNumber`, `beatNumber`, `fillIn`,
+    // `fillInBeatNumber`, and `kind` is a `phrase_high` / `phrase_mid` /
+    // `phrase_low` object whose `id` carries the raw kind value.
     const phrases = data.body.entries.map((entry) => {
         var _a;
+        const kind = typeof entry.kind === 'object' ? entry.kind.id : entry.kind;
         const phrase = {
-            index: entry.index,
-            beat: entry.beat,
-            kind: entry.kind,
-            phraseType: (_a = phraseTypeMap[mood][entry.kind]) !== null && _a !== void 0 ? _a : 'Unknown',
+            index: entry.phraseNumber,
+            beat: entry.beatNumber,
+            kind,
+            phraseType: (_a = phraseTypeMap[mood][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;
+        if (entry.fillIn > 0) {
+            phrase.fill = entry.fillIn;
+            phrase.fillBeat = entry.fillInBeatNumber;
         }
         return phrase;
     });
@@ -7111,7 +7138,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 +12032,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 +12051,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 +12079,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,