@9c5s/node-tcnet 0.5.1 → 0.6.0

package/dist/index.mjs

@@ -360,6 +360,163 @@ var TCNetDataPacketMetadata = class extends TCNetDataPacket {
     return 548;
   }
 };
+var TCNetDataPacketCUE = class extends TCNetDataPacket {
+  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;
+  }
+};
+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 = class extends TCNetDataPacket {
+  data = null;
+  read() {
+    this.data = { bars: parseWaveformBars(this.buffer, 42, 2400) };
+  }
+  write() {
+    throw new Error("not supported!");
+  }
+  length() {
+    return 2442;
+  }
+};
+var TCNetDataPacketMixer = class extends TCNetDataPacket {
+  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;
+  }
+};
+var TCNetDataPacketBeatGrid = class extends TCNetDataPacket {
+  data = null;
+  read() {
+    this.readFromOffset(42);
+  }
+  // アセンブル済みバッファからのパース用
+  readAssembled(assembled) {
+    this.readFromOffset(0, assembled);
+  }
+  readFromOffset(dataStart, buf) {
+    const source = 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;
+  }
+};
+var TCNetDataPacketBigWaveForm = class extends TCNetDataPacket {
+  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;
+  }
+};
 var TCNetPackets = {
   [2 /* OptIn */]: TCNetOptInPacket,
   [3 /* OptOut */]: TCNetOptOutPacket,
@@ -385,22 +542,48 @@ 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 = class {
+  packets = /* @__PURE__ */ new Map();
+  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;
+  }
 };
 
 // src/tcnet.ts
 var EventEmitter = __require("events");
 var TCNET_BROADCAST_PORT = 6e4;
 var TCNET_TIMESTAMP_PORT = 60001;
+var MULTI_PACKET_TYPES = /* @__PURE__ */ new Set([32 /* BigWaveFormData */, 8 /* BeatGridData */]);
 var TCNetConfiguration = class {
   logger = null;
   unicastPort = 65023;
@@ -589,15 +772,44 @@ var TCNetClient = 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)) {
+                pendingRequest.assembler?.reset();
+                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) {
@@ -725,11 +937,18 @@ var TCNetClient = 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)) {
+          req.assembler?.reset();
           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);
@@ -740,12 +959,18 @@ var TCNetClient = class extends EventEmitter {
   }
 };
 export {
+  MultiPacketAssembler,
   NodeType,
   TCNetClient,
   TCNetConfiguration,
   TCNetDataPacket,
+  TCNetDataPacketBeatGrid,
+  TCNetDataPacketBigWaveForm,
+  TCNetDataPacketCUE,
   TCNetDataPacketMetadata,
   TCNetDataPacketMetrics,
+  TCNetDataPacketMixer,
+  TCNetDataPacketSmallWaveForm,
   TCNetDataPacketType,
   TCNetDataPackets,
   TCNetLayerStatus,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@9c5s/node-tcnet",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "description": "Implements the TC-Supply TCNet protocol used by ShowKontrol and ProDJLink Bridge app from Pioneer",
     "exports": {
         ".": {
@@ -19,15 +19,17 @@
         "/dist"
     ],
     "scripts": {
+        "test": "vitest run",
+        "test:watch": "vitest",
         "example": "node --import tsx examples",
         "build": "rm -rf dist && tsup && check-export-map",
         "watch": "tsc -b -w",
         "changeset": "changeset",
         "clean": "tsc -b --clean",
         "lint": "eslint . --ext ts --ignore-pattern '**/*.d.ts'",
-        "format:fix": "prettier --write \"./**/*.{ts,html,css,json,jsonc}\"",
-        "format:check": "prettier --check \"./**/*.{ts,html,css,json,jsonc}\"",
-        "format-pre-commit": "pretty-quick --staged --pattern '*/**/*.{ts,html,css,json,jsonc}'",
+        "format:fix": "prettier --write \"./**/*.{ts,js,mjs,json,jsonc}\"",
+        "format:check": "prettier --check \"./**/*.{ts,js,mjs,json,jsonc}\"",
+        "format-pre-commit": "pretty-quick --staged --pattern '*/**/*.{ts,js,mjs,json,jsonc}'",
         "mdlint": "markdownlint-cli2 \"docs/wiki/**/*.md\" \"*.{md,MD}\" \"!CHANGELOG.md\"",
         "mdlint:fix": "markdownlint-cli2 --fix \"docs/wiki/**/*.md\" \"*.{md,MD}\" \"!CHANGELOG.md\"",
         "textlint": "textlint \"docs/wiki/**/*.md\" \"README.MD\"",
@@ -35,9 +37,10 @@
     },
     "devDependencies": {
         "@changesets/cli": "^2.27.9",
+        "@changesets/parse": "^0.4.3",
         "@commitlint/cli": "^20.5.0",
         "@commitlint/config-conventional": "^20.5.0",
-        "@types/node": "^15.12.5",
+        "@types/node": "^25.5.0",
         "@typescript-eslint/eslint-plugin": "^4.22.1",
         "@typescript-eslint/parser": "^4.22.1",
         "check-export-map": "^1.3.1",
@@ -50,7 +53,8 @@
         "textlint-rule-preset-ja-technical-writing": "^12.0.2",
         "tsup": "^8.3.5",
         "tsx": "^4.19.2",
-        "typescript": "^4.2.4"
+        "typescript": "^4.2.4",
+        "vitest": "^4.1.0"
     },
     "publishConfig": {
         "access": "public",