alphatheta-connect 0.28.2 → 0.28.5

package/lib/cli.js

@@ -2238,7 +2238,16 @@ class DeviceManager {
         this.off = __classPrivateFieldGet(this, _DeviceManager_emitter, "f").removeListener.bind(__classPrivateFieldGet(this, _DeviceManager_emitter, "f"));
         this.once = __classPrivateFieldGet(this, _DeviceManager_emitter, "f").once.bind(__classPrivateFieldGet(this, _DeviceManager_emitter, "f"));
         _DeviceManager_handleAnnounce.set(this, (message) => {
-            const device = (0, utils_1.deviceFromPacket)(message);
+            // This runs on every UDP datagram the announce socket receives, so a parse
+            // failure here would surface as an uncaught exception on the socket and
+            // crash the process. Foreign or truncated packets are ignored instead.
+            let device;
+            try {
+                device = (0, utils_1.deviceFromPacket)(message);
+            }
+            catch {
+                return;
+            }
             if (device === null) {
                 return;
             }
@@ -2354,10 +2363,15 @@ const ip = __importStar(__webpack_require__(/*! ip-address */ "ip-address"));
 const constants_1 = __webpack_require__(/*! src/constants */ "./src/constants.ts");
 /**
  * Converts a announce packet to a device object.
+ *
+ * Returns null for any packet that is not a stage-3 Pro DJ Link announce. The
+ * announce socket receives every UDP broadcast on its port, so foreign traffic
+ * (other apps, other protocols) is normal and must be ignored, not treated as
+ * an error.
  */
 function deviceFromPacket(packet) {
     if (packet.indexOf(constants_1.PROLINK_HEADER) !== 0) {
-        throw new Error('Announce packet does not start with expected header');
+        return null;
     }
     if (packet[0x0a] !== 0x06) {
         return null;
@@ -9392,6 +9406,10 @@ var ItemType;
     ItemType[ItemType["MenuBit"] = 147] = "MenuBit";
     ItemType[ItemType["MenuFilename"] = 148] = "MenuFilename";
     ItemType[ItemType["MenuHistory"] = 149] = "MenuHistory";
+    // Native streaming players return the track title and artist together in
+    // this otherwise undocumented item instead of the normal 0x0004/0x0007
+    // pair. Observed from direct Beatport streaming (NP3-591).
+    ItemType[ItemType["StreamingTrackMetadata"] = 153] = "StreamingTrackMetadata";
     ItemType[ItemType["MenuAll"] = 160] = "MenuAll";
     ItemType[ItemType["TrackTitleAlbum"] = 516] = "TrackTitleAlbum";
     ItemType[ItemType["TrackTitleGenre"] = 1540] = "TrackTitleGenre";
@@ -9438,6 +9456,10 @@ const transformItem = {
         title: a.label1,
         artworkId: a.artworkId,
     }),
+    [ItemType.StreamingTrackMetadata]: (a) => ({
+        title: a.label1,
+        artist: a.label2,
+    }),
     [ItemType.AlbumTitle]: mapIdName,
     [ItemType.Artist]: mapIdName,
     [ItemType.Genre]: mapIdName,
@@ -9836,7 +9858,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, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+    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 { conn, lookupDescriptor, span, args } = opts;
     const { trackId, onResponse } = args;
     const request = new message_1.Message({
@@ -9857,24 +9879,25 @@ async function getMetadata(opts) {
     onResponse === null || onResponse === void 0 ? void 0 : onResponse({ itemsAvailable: resp.data.itemsAvailable, items: received });
     // Translate our trackItems into a (partial) Track entity.
     // Use optional chaining for all fields since streaming tracks may omit some.
+    const streamingMetadata = trackItems[item_1.ItemType.StreamingTrackMetadata];
     const track = {
         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,
+        title: (_e = (_d = (_c = trackItems[item_1.ItemType.TrackTitle]) === null || _c === void 0 ? void 0 : _c.title) !== null && _d !== void 0 ? _d : streamingMetadata === null || streamingMetadata === void 0 ? void 0 : streamingMetadata.title) !== null && _e !== void 0 ? _e : '',
+        duration: (_g = (_f = trackItems[item_1.ItemType.Duration]) === null || _f === void 0 ? void 0 : _f.duration) !== null && _g !== void 0 ? _g : 0,
+        tempo: (_j = (_h = trackItems[item_1.ItemType.Tempo]) === null || _h === void 0 ? void 0 : _h.bpm) !== null && _j !== void 0 ? _j : 0,
+        comment: (_l = (_k = trackItems[item_1.ItemType.Comment]) === null || _k === void 0 ? void 0 : _k.comment) !== null && _l !== void 0 ? _l : '',
+        rating: (_o = (_m = trackItems[item_1.ItemType.Rating]) === null || _m === void 0 ? void 0 : _m.rating) !== null && _o !== void 0 ? _o : 0,
+        year: (_p = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.Year]) === null || _p === void 0 ? void 0 : _p.year,
+        bitrate: (_q = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.BitRate]) === null || _q === void 0 ? void 0 : _q.bitrate,
+        artwork: { id: (_s = (_r = trackItems[item_1.ItemType.TrackTitle]) === null || _r === void 0 ? void 0 : _r.artworkId) !== null && _s !== void 0 ? _s : 0 },
+        album: (_t = trackItems[item_1.ItemType.AlbumTitle]) !== null && _t !== void 0 ? _t : null,
+        artist: (_u = trackItems[item_1.ItemType.Artist]) !== null && _u !== void 0 ? _u : ((streamingMetadata === null || streamingMetadata === void 0 ? void 0 : streamingMetadata.artist) ? { id: 0, name: streamingMetadata.artist } : null),
+        genre: (_v = trackItems[item_1.ItemType.Genre]) !== null && _v !== void 0 ? _v : null,
+        key: (_w = trackItems[item_1.ItemType.Key]) !== null && _w !== void 0 ? _w : null,
+        color: (_x = (0, utils_1.findColor)(Object.values(trackItems))) !== null && _x !== void 0 ? _x : null,
+        label: (_y = trackItems[item_1.ItemType.Label]) !== null && _y !== void 0 ? _y : null,
+        remixer: (_z = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.Remixer]) !== null && _z !== void 0 ? _z : null,
+        originalArtist: (_0 = trackItems === null || trackItems === void 0 ? void 0 : trackItems[item_1.ItemType.OriginalArtist]) !== null && _0 !== void 0 ? _0 : null,
         composer: null,
         fileName: '',
         filePath: '',