@9c5s/node-tcnet 0.5.1 → 0.6.0

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7;var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13;var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
   if (typeof require !== "undefined") return require.apply(this, arguments);
@@ -360,6 +360,163 @@ var TCNetDataPacketMetadata = (_class5 = class extends TCNetDataPacket {construc
     return 548;
   }
 }, _class5);
+var TCNetDataPacketCUE = (_class6 = class extends TCNetDataPacket {constructor(...args5) { super(...args5); _class6.prototype.__init7.call(this); }
+  __init7() {this.data = null}
+  read() {
+    const loopInTime = this.buffer.readUInt32LE(42);
+    const loopOutTime = this.buffer.readUInt32LE(46);
+    const cues = [];
+    const cueStart = 50;
+    for (let i = 0; i < 18; i++) {
+      const offset = cueStart + i * 22;
+      if (offset + 22 > this.buffer.length) break;
+      const type = this.buffer.readUInt8(offset);
+      if (type === 0) continue;
+      cues.push({
+        index: i + 1,
+        type,
+        inTime: this.buffer.readUInt32LE(offset + 2),
+        outTime: this.buffer.readUInt32LE(offset + 6),
+        color: {
+          r: this.buffer.readUInt8(offset + 11),
+          g: this.buffer.readUInt8(offset + 12),
+          b: this.buffer.readUInt8(offset + 13)
+        }
+      });
+    }
+    this.data = { loopInTime, loopOutTime, cues };
+  }
+  write() {
+    throw new Error("not supported!");
+  }
+  length() {
+    return 436;
+  }
+}, _class6);
+function parseWaveformBars(source, dataStart, maxBytes) {
+  const bars = [];
+  const end = maxBytes !== void 0 ? Math.min(dataStart + maxBytes, source.length) : source.length;
+  const safeEnd = dataStart + (end - dataStart & ~1);
+  for (let i = dataStart; i < safeEnd; i += 2) {
+    bars.push({
+      level: source.readUInt8(i),
+      color: source.readUInt8(i + 1)
+    });
+  }
+  return bars;
+}
+var TCNetDataPacketSmallWaveForm = (_class7 = class extends TCNetDataPacket {constructor(...args6) { super(...args6); _class7.prototype.__init8.call(this); }
+  __init8() {this.data = null}
+  read() {
+    this.data = { bars: parseWaveformBars(this.buffer, 42, 2400) };
+  }
+  write() {
+    throw new Error("not supported!");
+  }
+  length() {
+    return 2442;
+  }
+}, _class7);
+var TCNetDataPacketMixer = (_class8 = class extends TCNetDataPacket {constructor(...args7) { super(...args7); _class8.prototype.__init9.call(this); }
+  __init9() {this.data = null}
+  read() {
+    if (this.buffer.length < 259) {
+      return;
+    }
+    const parseChannel = (offset) => ({
+      sourceSelect: this.buffer.readUInt8(offset),
+      audioLevel: this.buffer.readUInt8(offset + 1),
+      faderLevel: this.buffer.readUInt8(offset + 2),
+      trimLevel: this.buffer.readUInt8(offset + 3),
+      compLevel: this.buffer.readUInt8(offset + 4),
+      eqHi: this.buffer.readUInt8(offset + 5),
+      eqHiMid: this.buffer.readUInt8(offset + 6),
+      eqLowMid: this.buffer.readUInt8(offset + 7),
+      eqLow: this.buffer.readUInt8(offset + 8),
+      filterColor: this.buffer.readUInt8(offset + 9),
+      send: this.buffer.readUInt8(offset + 10),
+      cueA: this.buffer.readUInt8(offset + 11),
+      cueB: this.buffer.readUInt8(offset + 12),
+      crossfaderAssign: this.buffer.readUInt8(offset + 13)
+    });
+    this.data = {
+      mixerId: this.buffer.readUInt8(25),
+      mixerType: this.buffer.readUInt8(26),
+      mixerName: this.buffer.slice(29, 45).toString("ascii").replace(/\0.*$/g, ""),
+      masterAudioLevel: this.buffer.readUInt8(61),
+      masterFaderLevel: this.buffer.readUInt8(62),
+      masterFilter: this.buffer.readUInt8(69),
+      masterIsolatorOn: this.buffer.readUInt8(74) === 1,
+      masterIsolatorHi: this.buffer.readUInt8(75),
+      masterIsolatorMid: this.buffer.readUInt8(76),
+      masterIsolatorLow: this.buffer.readUInt8(77),
+      filterHpf: this.buffer.readUInt8(79),
+      filterLpf: this.buffer.readUInt8(80),
+      filterResonance: this.buffer.readUInt8(81),
+      crossFader: this.buffer.readUInt8(99),
+      crossFaderCurve: this.buffer.readUInt8(98),
+      channelFaderCurve: this.buffer.readUInt8(97),
+      beatFxOn: this.buffer.readUInt8(100) === 1,
+      beatFxSelect: this.buffer.readUInt8(103),
+      beatFxLevelDepth: this.buffer.readUInt8(101),
+      beatFxChannelSelect: this.buffer.readUInt8(102),
+      headphonesALevel: this.buffer.readUInt8(108),
+      headphonesBLevel: this.buffer.readUInt8(110),
+      boothLevel: this.buffer.readUInt8(112),
+      channels: [125, 149, 173, 197, 221, 245].map(parseChannel)
+    };
+  }
+  write() {
+    throw new Error("not supported!");
+  }
+  length() {
+    return 270;
+  }
+}, _class8);
+var TCNetDataPacketBeatGrid = (_class9 = class extends TCNetDataPacket {constructor(...args8) { super(...args8); _class9.prototype.__init10.call(this); }
+  __init10() {this.data = null}
+  read() {
+    this.readFromOffset(42);
+  }
+  // アセンブル済みバッファからのパース用
+  readAssembled(assembled) {
+    this.readFromOffset(0, assembled);
+  }
+  readFromOffset(dataStart, buf) {
+    const source = _nullishCoalesce(buf, () => ( this.buffer));
+    const entries = [];
+    for (let offset = dataStart; offset + 8 <= source.length; offset += 8) {
+      const beatNumber = source.readUInt16LE(offset);
+      const beatType = source.readUInt8(offset + 2);
+      const timestampMs = source.readUInt32LE(offset + 4);
+      if (beatNumber === 0 && timestampMs === 0) continue;
+      entries.push({ beatNumber, beatType, timestampMs });
+    }
+    this.data = { entries };
+  }
+  write() {
+    throw new Error("not supported!");
+  }
+  length() {
+    return 2442;
+  }
+}, _class9);
+var TCNetDataPacketBigWaveForm = (_class10 = class extends TCNetDataPacket {constructor(...args9) { super(...args9); _class10.prototype.__init11.call(this); }
+  __init11() {this.data = null}
+  read() {
+    this.data = { bars: parseWaveformBars(this.buffer, 42) };
+  }
+  // アセンブル済みバッファからのパース用
+  readAssembled(assembled) {
+    this.data = { bars: parseWaveformBars(assembled, 0) };
+  }
+  write() {
+    throw new Error("not supported!");
+  }
+  length() {
+    return -1;
+  }
+}, _class10);
 var TCNetPackets = {
   [2 /* OptIn */]: TCNetOptInPacket,
   [3 /* OptOut */]: TCNetOptOutPacket,
@@ -385,54 +542,80 @@ var TCNetPackets = {
 var TCNetDataPackets = {
   [2 /* MetricsData */]: TCNetDataPacketMetrics,
   [4 /* MetaData */]: TCNetDataPacketMetadata,
-  [8 /* BeatGridData */]: null,
-  // not yet implemented
-  [12 /* CUEData */]: null,
-  // not yet implemented
-  [16 /* SmallWaveFormData */]: null,
-  // not yet implemented
-  [32 /* BigWaveFormData */]: null,
-  // not yet implemented
-  [150 /* MixerData */]: null
-  // not yet implemented
+  [8 /* BeatGridData */]: TCNetDataPacketBeatGrid,
+  [12 /* CUEData */]: TCNetDataPacketCUE,
+  [16 /* SmallWaveFormData */]: TCNetDataPacketSmallWaveForm,
+  [32 /* BigWaveFormData */]: TCNetDataPacketBigWaveForm,
+  [150 /* MixerData */]: TCNetDataPacketMixer
 };
 
+// src/multi-packet.ts
+var MultiPacketAssembler = (_class11 = class {constructor() { _class11.prototype.__init12.call(this);_class11.prototype.__init13.call(this); }
+  __init12() {this.packets = /* @__PURE__ */ new Map()}
+  __init13() {this.totalPackets = 0}
+  // パケットを追加し、全パケットが揃ったら true を返す
+  add(buffer) {
+    if (buffer.length < 42) return false;
+    const newTotalPackets = buffer.readUInt32LE(30);
+    if (newTotalPackets === 0) return false;
+    if (this.totalPackets > 0 && newTotalPackets !== this.totalPackets) return false;
+    this.totalPackets = newTotalPackets;
+    const packetNo = buffer.readUInt32LE(34);
+    const clusterSize = buffer.readUInt32LE(38);
+    const dataStart = 42;
+    if (dataStart + clusterSize > buffer.length) return false;
+    this.packets.set(packetNo, Buffer.from(buffer.slice(dataStart, dataStart + clusterSize)));
+    return this.packets.size >= this.totalPackets;
+  }
+  // packetNo 順にソートしてデータを結合する
+  assemble() {
+    const sorted = [...this.packets.entries()].sort((a, b) => a[0] - b[0]);
+    return Buffer.concat(sorted.map(([, buf]) => buf));
+  }
+  // 状態をリセットする
+  reset() {
+    this.packets.clear();
+    this.totalPackets = 0;
+  }
+}, _class11);
+
 // src/tcnet.ts
 var EventEmitter = __require("events");
 var TCNET_BROADCAST_PORT = 6e4;
 var TCNET_TIMESTAMP_PORT = 60001;
-var TCNetConfiguration = (_class6 = class {constructor() { _class6.prototype.__init7.call(this);_class6.prototype.__init8.call(this);_class6.prototype.__init9.call(this);_class6.prototype.__init10.call(this);_class6.prototype.__init11.call(this);_class6.prototype.__init12.call(this);_class6.prototype.__init13.call(this);_class6.prototype.__init14.call(this);_class6.prototype.__init15.call(this);_class6.prototype.__init16.call(this);_class6.prototype.__init17.call(this); }
-  __init7() {this.logger = null}
-  __init8() {this.unicastPort = 65023}
-  __init9() {this.applicationCode = 65535}
-  __init10() {this.nodeId = Math.floor(Math.random() * 65535)}
-  __init11() {this.nodeName = "TCNET.JS"}
-  __init12() {this.vendorName = "CHDXD1"}
-  __init13() {this.appName = "NODE-TCNET"}
-  __init14() {this.broadcastInterface = null}
-  __init15() {this.broadcastAddress = "255.255.255.255"}
-  __init16() {this.broadcastListeningAddress = ""}
-  __init17() {this.requestTimeout = 2e3}
-}, _class6);
+var MULTI_PACKET_TYPES = /* @__PURE__ */ new Set([32 /* BigWaveFormData */, 8 /* BeatGridData */]);
+var TCNetConfiguration = (_class12 = class {constructor() { _class12.prototype.__init14.call(this);_class12.prototype.__init15.call(this);_class12.prototype.__init16.call(this);_class12.prototype.__init17.call(this);_class12.prototype.__init18.call(this);_class12.prototype.__init19.call(this);_class12.prototype.__init20.call(this);_class12.prototype.__init21.call(this);_class12.prototype.__init22.call(this);_class12.prototype.__init23.call(this);_class12.prototype.__init24.call(this); }
+  __init14() {this.logger = null}
+  __init15() {this.unicastPort = 65023}
+  __init16() {this.applicationCode = 65535}
+  __init17() {this.nodeId = Math.floor(Math.random() * 65535)}
+  __init18() {this.nodeName = "TCNET.JS"}
+  __init19() {this.vendorName = "CHDXD1"}
+  __init20() {this.appName = "NODE-TCNET"}
+  __init21() {this.broadcastInterface = null}
+  __init22() {this.broadcastAddress = "255.255.255.255"}
+  __init23() {this.broadcastListeningAddress = ""}
+  __init24() {this.requestTimeout = 2e3}
+}, _class12);
 var closeSocket = (socket) => new Promise((resolve) => socket.close(() => resolve()));
-var TCNetClient = (_class7 = class extends EventEmitter {
+var TCNetClient = (_class13 = class extends EventEmitter {
   
   
   
   
   
-  __init18() {this.seq = 0}
-  __init19() {this.uptime = 0}
-  __init20() {this.connected = false}
-  __init21() {this.connectedHandler = null}
-  __init22() {this.requests = /* @__PURE__ */ new Map()}
+  __init25() {this.seq = 0}
+  __init26() {this.uptime = 0}
+  __init27() {this.connected = false}
+  __init28() {this.connectedHandler = null}
+  __init29() {this.requests = /* @__PURE__ */ new Map()}
   
   /**
    *
    * @param config configuration for TCNet access
    */
   constructor(config) {
-    super();_class7.prototype.__init18.call(this);_class7.prototype.__init19.call(this);_class7.prototype.__init20.call(this);_class7.prototype.__init21.call(this);_class7.prototype.__init22.call(this);;
+    super();_class13.prototype.__init25.call(this);_class13.prototype.__init26.call(this);_class13.prototype.__init27.call(this);_class13.prototype.__init28.call(this);_class13.prototype.__init29.call(this);;
     this.config = config || new TCNetConfiguration();
     if (this.config.broadcastInterface && this.config.broadcastAddress == "255.255.255.255") {
       this.config.broadcastAddress = interfaceAddress(this.config.broadcastInterface);
@@ -589,15 +772,44 @@ var TCNetClient = (_class7 = class extends EventEmitter {
         dataPacket.dataType = packet.dataType;
         dataPacket.layer = packet.layer;
         dataPacket.read();
-        if (this.connected) {
-          this.emit("data", dataPacket);
-        }
         const key = `${dataPacket.dataType}-${dataPacket.layer}`;
         const pendingRequest = this.requests.get(key);
-        if (pendingRequest) {
-          this.requests.delete(key);
-          clearTimeout(pendingRequest.timeout);
-          pendingRequest.resolve(dataPacket);
+        if (pendingRequest && pendingRequest.assembler) {
+          const complete = pendingRequest.assembler.add(msg);
+          if (complete) {
+            const assembled = pendingRequest.assembler.assemble();
+            const finalPacket = new dataPacketClass();
+            finalPacket.buffer = msg;
+            finalPacket.header = mgmtHeader;
+            finalPacket.dataType = dataPacket.dataType;
+            finalPacket.layer = dataPacket.layer;
+            if ("readAssembled" in finalPacket && typeof finalPacket.readAssembled === "function") {
+              finalPacket.readAssembled(assembled);
+            }
+            this.requests.delete(key);
+            clearTimeout(pendingRequest.timeout);
+            if (this.connected) {
+              this.emit("data", finalPacket);
+            }
+            pendingRequest.resolve(finalPacket);
+          } else {
+            clearTimeout(pendingRequest.timeout);
+            pendingRequest.timeout = setTimeout(() => {
+              if (this.requests.delete(key)) {
+                _optionalChain([pendingRequest, 'access', _23 => _23.assembler, 'optionalAccess', _24 => _24.reset, 'call', _25 => _25()]);
+                pendingRequest.reject(new Error("Timeout while requesting data"));
+              }
+            }, this.config.requestTimeout);
+          }
+        } else {
+          if (this.connected) {
+            this.emit("data", dataPacket);
+          }
+          if (pendingRequest) {
+            this.requests.delete(key);
+            clearTimeout(pendingRequest.timeout);
+            pendingRequest.resolve(dataPacket);
+          }
         }
       }
     } else if (packet instanceof TCNetOptInPacket) {
@@ -625,7 +837,7 @@ var TCNetClient = (_class7 = class extends EventEmitter {
     const mgmtHeader = new TCNetManagementHeader(msg);
     mgmtHeader.read();
     if (mgmtHeader.messageType !== 254 /* Time */) {
-      _optionalChain([this, 'access', _23 => _23.log, 'optionalAccess', _24 => _24.debug, 'call', _25 => _25("Received non Time packet on Time port")]);
+      _optionalChain([this, 'access', _26 => _26.log, 'optionalAccess', _27 => _27.debug, 'call', _28 => _28("Received non Time packet on Time port")]);
       return;
     }
     const packet = this.parsePacket(mgmtHeader);
@@ -725,11 +937,18 @@ var TCNetClient = (_class7 = class extends EventEmitter {
       request.layer = layer + 1;
       const key = `${dataType}-${layer}`;
       const timeout = setTimeout(() => {
-        if (this.requests.delete(key)) {
+        const req = this.requests.get(key);
+        if (req && this.requests.delete(key)) {
+          _optionalChain([req, 'access', _29 => _29.assembler, 'optionalAccess', _30 => _30.reset, 'call', _31 => _31()]);
           reject(new Error("Timeout while requesting data"));
         }
       }, this.config.requestTimeout);
-      this.requests.set(key, { resolve, timeout });
+      this.requests.set(key, {
+        resolve,
+        reject,
+        timeout,
+        assembler: MULTI_PACKET_TYPES.has(dataType) ? new MultiPacketAssembler() : void 0
+      });
       this.sendServer(request).catch((err) => {
         if (this.requests.delete(key)) {
           clearTimeout(timeout);
@@ -738,7 +957,13 @@ var TCNetClient = (_class7 = class extends EventEmitter {
       });
     });
   }
-}, _class7);
+}, _class13);
+
+
+
+
+
+
 
 
 
@@ -761,4 +986,4 @@ var TCNetClient = (_class7 = class extends EventEmitter {
 
 
 
-exports.NodeType = NodeType; exports.TCNetClient = TCNetClient; exports.TCNetConfiguration = TCNetConfiguration; exports.TCNetDataPacket = TCNetDataPacket; exports.TCNetDataPacketMetadata = TCNetDataPacketMetadata; exports.TCNetDataPacketMetrics = TCNetDataPacketMetrics; exports.TCNetDataPacketType = TCNetDataPacketType; exports.TCNetDataPackets = TCNetDataPackets; exports.TCNetLayerStatus = TCNetLayerStatus; exports.TCNetLayerSyncMaster = TCNetLayerSyncMaster; exports.TCNetManagementHeader = TCNetManagementHeader; exports.TCNetMessageType = TCNetMessageType; exports.TCNetOptInPacket = TCNetOptInPacket; exports.TCNetOptOutPacket = TCNetOptOutPacket; exports.TCNetPacket = TCNetPacket; exports.TCNetPackets = TCNetPackets; exports.TCNetRequestPacket = TCNetRequestPacket; exports.TCNetStatusPacket = TCNetStatusPacket; exports.TCNetTimePacket = TCNetTimePacket; exports.TCNetTimecode = TCNetTimecode; exports.TCNetTimecodeState = TCNetTimecodeState;
+exports.MultiPacketAssembler = MultiPacketAssembler; exports.NodeType = NodeType; exports.TCNetClient = TCNetClient; exports.TCNetConfiguration = TCNetConfiguration; exports.TCNetDataPacket = TCNetDataPacket; exports.TCNetDataPacketBeatGrid = TCNetDataPacketBeatGrid; exports.TCNetDataPacketBigWaveForm = TCNetDataPacketBigWaveForm; exports.TCNetDataPacketCUE = TCNetDataPacketCUE; exports.TCNetDataPacketMetadata = TCNetDataPacketMetadata; exports.TCNetDataPacketMetrics = TCNetDataPacketMetrics; exports.TCNetDataPacketMixer = TCNetDataPacketMixer; exports.TCNetDataPacketSmallWaveForm = TCNetDataPacketSmallWaveForm; exports.TCNetDataPacketType = TCNetDataPacketType; exports.TCNetDataPackets = TCNetDataPackets; exports.TCNetLayerStatus = TCNetLayerStatus; exports.TCNetLayerSyncMaster = TCNetLayerSyncMaster; exports.TCNetManagementHeader = TCNetManagementHeader; exports.TCNetMessageType = TCNetMessageType; exports.TCNetOptInPacket = TCNetOptInPacket; exports.TCNetOptOutPacket = TCNetOptOutPacket; exports.TCNetPacket = TCNetPacket; exports.TCNetPackets = TCNetPackets; exports.TCNetRequestPacket = TCNetRequestPacket; exports.TCNetStatusPacket = TCNetStatusPacket; exports.TCNetTimePacket = TCNetTimePacket; exports.TCNetTimecode = TCNetTimecode; exports.TCNetTimecodeState = TCNetTimecodeState;