@moqtap/codec 0.1.1 → 0.2.1

package/package.json

@@ -1,84 +1,192 @@
-{
-  "name": "@moqtap/codec",
-  "version": "0.1.1",
-  "description": "MoQT wire-format codec and session state machine — multi-draft, zero dependencies",
-  "type": "module",
-  "license": "MIT",
-  "author": "moqtap",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/moqtap/moqtap-js.git",
-    "directory": "packages/codec"
-  },
-  "homepage": "https://github.com/moqtap/moqtap-js/tree/master/packages/codec",
-  "bugs": "https://github.com/moqtap/moqtap-js/issues",
-  "keywords": [
-    "moqt",
-    "moq",
-    "media-over-quic",
-    "webtransport",
-    "codec",
-    "protocol",
-    "ietf",
-    "quic",
-    "streaming",
-    "real-time"
-  ],
-  "sideEffects": false,
-  "engines": {
-    "node": ">=18"
-  },
-  "exports": {
-    ".": {
-      "bun": "./src/index.ts",
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    },
-    "./draft7": {
-      "bun": "./src/drafts/draft07/index.ts",
-      "types": "./dist/draft7.d.ts",
-      "import": "./dist/draft7.js",
-      "require": "./dist/draft7.cjs"
-    },
-    "./draft14": {
-      "bun": "./src/drafts/draft14/index.ts",
-      "types": "./dist/draft14.d.ts",
-      "import": "./dist/draft14.js",
-      "require": "./dist/draft14.cjs"
-    },
-    "./session": {
-      "bun": "./src/session.ts",
-      "types": "./dist/session.d.ts",
-      "import": "./dist/session.js",
-      "require": "./dist/session.cjs"
-    },
-    "./draft7/session": {
-      "bun": "./src/drafts/draft07/session.ts",
-      "types": "./dist/draft7-session.d.ts",
-      "import": "./dist/draft7-session.js",
-      "require": "./dist/draft7-session.cjs"
-    },
-    "./draft14/session": {
-      "bun": "./src/drafts/draft14/session.ts",
-      "types": "./dist/draft14-session.d.ts",
-      "import": "./dist/draft14-session.js",
-      "require": "./dist/draft14-session.cjs"
-    }
-  },
-  "files": [
-    "dist",
-    "src",
-    "!src/__tests__"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "test": "vitest run"
-  },
-  "devDependencies": {
-    "@moqtap/test-vectors": "^0.1.0",
-    "tsup": "^8.0.0",
-    "typescript": "^5.5.0",
-    "vitest": "^3.0.0"
-  }
-}
+{
+  "name": "@moqtap/codec",
+  "version": "0.2.1",
+  "description": "MoQT wire-format codec and session state machine — multi-draft, zero dependencies",
+  "type": "module",
+  "license": "MIT",
+  "author": "moqtap",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/moqtap/moqtap-js.git",
+    "directory": "packages/codec"
+  },
+  "homepage": "https://github.com/moqtap/moqtap-js/tree/master/packages/codec",
+  "bugs": "https://github.com/moqtap/moqtap-js/issues",
+  "keywords": [
+    "moqt",
+    "moq",
+    "media-over-quic",
+    "webtransport",
+    "codec",
+    "protocol",
+    "ietf",
+    "quic",
+    "streaming",
+    "real-time"
+  ],
+  "sideEffects": false,
+  "engines": {
+    "node": ">=18"
+  },
+  "exports": {
+    ".": {
+      "bun": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./draft7": {
+      "bun": "./src/drafts/draft07/index.ts",
+      "types": "./dist/draft7.d.ts",
+      "import": "./dist/draft7.js",
+      "require": "./dist/draft7.cjs"
+    },
+    "./draft8": {
+      "bun": "./src/drafts/draft08/index.ts",
+      "types": "./dist/draft8.d.ts",
+      "import": "./dist/draft8.js",
+      "require": "./dist/draft8.cjs"
+    },
+    "./draft8/session": {
+      "bun": "./src/drafts/draft08/session.ts",
+      "types": "./dist/draft8-session.d.ts",
+      "import": "./dist/draft8-session.js",
+      "require": "./dist/draft8-session.cjs"
+    },
+    "./draft9": {
+      "bun": "./src/drafts/draft09/index.ts",
+      "types": "./dist/draft9.d.ts",
+      "import": "./dist/draft9.js",
+      "require": "./dist/draft9.cjs"
+    },
+    "./draft9/session": {
+      "bun": "./src/drafts/draft09/session.ts",
+      "types": "./dist/draft9-session.d.ts",
+      "import": "./dist/draft9-session.js",
+      "require": "./dist/draft9-session.cjs"
+    },
+    "./draft10": {
+      "bun": "./src/drafts/draft10/index.ts",
+      "types": "./dist/draft10.d.ts",
+      "import": "./dist/draft10.js",
+      "require": "./dist/draft10.cjs"
+    },
+    "./draft10/session": {
+      "bun": "./src/drafts/draft10/session.ts",
+      "types": "./dist/draft10-session.d.ts",
+      "import": "./dist/draft10-session.js",
+      "require": "./dist/draft10-session.cjs"
+    },
+    "./draft11": {
+      "bun": "./src/drafts/draft11/index.ts",
+      "types": "./dist/draft11.d.ts",
+      "import": "./dist/draft11.js",
+      "require": "./dist/draft11.cjs"
+    },
+    "./draft11/session": {
+      "bun": "./src/drafts/draft11/session.ts",
+      "types": "./dist/draft11-session.d.ts",
+      "import": "./dist/draft11-session.js",
+      "require": "./dist/draft11-session.cjs"
+    },
+    "./draft12": {
+      "bun": "./src/drafts/draft12/index.ts",
+      "types": "./dist/draft12.d.ts",
+      "import": "./dist/draft12.js",
+      "require": "./dist/draft12.cjs"
+    },
+    "./draft12/session": {
+      "bun": "./src/drafts/draft12/session.ts",
+      "types": "./dist/draft12-session.d.ts",
+      "import": "./dist/draft12-session.js",
+      "require": "./dist/draft12-session.cjs"
+    },
+    "./draft13": {
+      "bun": "./src/drafts/draft13/index.ts",
+      "types": "./dist/draft13.d.ts",
+      "import": "./dist/draft13.js",
+      "require": "./dist/draft13.cjs"
+    },
+    "./draft13/session": {
+      "bun": "./src/drafts/draft13/session.ts",
+      "types": "./dist/draft13-session.d.ts",
+      "import": "./dist/draft13-session.js",
+      "require": "./dist/draft13-session.cjs"
+    },
+    "./draft14": {
+      "bun": "./src/drafts/draft14/index.ts",
+      "types": "./dist/draft14.d.ts",
+      "import": "./dist/draft14.js",
+      "require": "./dist/draft14.cjs"
+    },
+    "./session": {
+      "bun": "./src/session.ts",
+      "types": "./dist/session.d.ts",
+      "import": "./dist/session.js",
+      "require": "./dist/session.cjs"
+    },
+    "./draft7/session": {
+      "bun": "./src/drafts/draft07/session.ts",
+      "types": "./dist/draft7-session.d.ts",
+      "import": "./dist/draft7-session.js",
+      "require": "./dist/draft7-session.cjs"
+    },
+    "./draft14/session": {
+      "bun": "./src/drafts/draft14/session.ts",
+      "types": "./dist/draft14-session.d.ts",
+      "import": "./dist/draft14-session.js",
+      "require": "./dist/draft14-session.cjs"
+    },
+    "./draft15": {
+      "bun": "./src/drafts/draft15/index.ts",
+      "types": "./dist/draft15.d.ts",
+      "import": "./dist/draft15.js",
+      "require": "./dist/draft15.cjs"
+    },
+    "./draft15/session": {
+      "bun": "./src/drafts/draft15/session.ts",
+      "types": "./dist/draft15-session.d.ts",
+      "import": "./dist/draft15-session.js",
+      "require": "./dist/draft15-session.cjs"
+    },
+    "./draft16": {
+      "bun": "./src/drafts/draft16/index.ts",
+      "types": "./dist/draft16.d.ts",
+      "import": "./dist/draft16.js",
+      "require": "./dist/draft16.cjs"
+    },
+    "./draft16/session": {
+      "bun": "./src/drafts/draft16/session.ts",
+      "types": "./dist/draft16-session.d.ts",
+      "import": "./dist/draft16-session.js",
+      "require": "./dist/draft16-session.cjs"
+    },
+    "./draft17": {
+      "bun": "./src/drafts/draft17/index.ts",
+      "types": "./dist/draft17.d.ts",
+      "import": "./dist/draft17.js",
+      "require": "./dist/draft17.cjs"
+    },
+    "./draft17/session": {
+      "bun": "./src/drafts/draft17/session.ts",
+      "types": "./dist/draft17-session.d.ts",
+      "import": "./dist/draft17-session.js",
+      "require": "./dist/draft17-session.cjs"
+    }
+  },
+  "files": [
+    "dist",
+    "src",
+    "!src/__tests__"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "test": "vitest run"
+  },
+  "devDependencies": {
+    "@moqtap/test-vectors": "^0.7.1",
+    "tsup": "^8.0.0",
+    "typescript": "^5.5.0",
+    "vitest": "^3.0.0"
+  }
+}

package/src/core/buffer-reader.ts

@@ -29,7 +29,7 @@ export class BufferReader {
     return value;
   }
 
-  readBytes(length: number): Uint8Array {
+  readBytes(length: number): Uint8Array<ArrayBuffer> {
     if (this.remaining < length) {
       throw new DecodeError(
         "UNEXPECTED_END",

package/src/core/hex.ts

@@ -0,0 +1,17 @@
+/** Convert a Uint8Array to a lowercase hex string. */
+export function bytesToHex(bytes: Uint8Array): string {
+  let hex = "";
+  for (let i = 0; i < bytes.byteLength; i++) {
+    hex += (bytes[i] as number).toString(16).padStart(2, "0");
+  }
+  return hex;
+}
+
+/** Convert a hex string to a Uint8Array. */
+export function hexToBytes(hex: string): Uint8Array {
+  const bytes = new Uint8Array(hex.length / 2);
+  for (let i = 0; i < hex.length; i += 2) {
+    bytes[i / 2] = Number.parseInt(hex.substring(i, i + 2), 16);
+  }
+  return bytes;
+}

package/src/core/types.ts

@@ -1,6 +1,28 @@
 // Draft identifiers
-export type Draft = "draft-ietf-moq-transport-07" | "draft-ietf-moq-transport-14";
-export type DraftShorthand = "07" | "14";
+export type Draft =
+  | "draft-ietf-moq-transport-07"
+  | "draft-ietf-moq-transport-08"
+  | "draft-ietf-moq-transport-09"
+  | "draft-ietf-moq-transport-10"
+  | "draft-ietf-moq-transport-11"
+  | "draft-ietf-moq-transport-12"
+  | "draft-ietf-moq-transport-13"
+  | "draft-ietf-moq-transport-14"
+  | "draft-ietf-moq-transport-15"
+  | "draft-ietf-moq-transport-16"
+  | "draft-ietf-moq-transport-17";
+export type DraftShorthand =
+  | "07"
+  | "08"
+  | "09"
+  | "10"
+  | "11"
+  | "12"
+  | "13"
+  | "14"
+  | "15"
+  | "16"
+  | "17";
 
 // All MoQT message type tags
 export type MoqtMessageType =
@@ -169,7 +191,6 @@ export interface TrackStatus extends BaseMessage {
 // Object/stream messages
 export interface ObjectStream extends BaseMessage {
   readonly type: "object_stream";
-  readonly subscribeId: bigint;
   readonly trackAlias: bigint;
   readonly groupId: bigint;
   readonly objectId: bigint;
@@ -180,7 +201,6 @@ export interface ObjectStream extends BaseMessage {
 
 export interface ObjectDatagram extends BaseMessage {
   readonly type: "object_datagram";
-  readonly subscribeId: bigint;
   readonly trackAlias: bigint;
   readonly groupId: bigint;
   readonly objectId: bigint;
@@ -191,14 +211,12 @@ export interface ObjectDatagram extends BaseMessage {
 
 export interface StreamHeaderTrack extends BaseMessage {
   readonly type: "stream_header_track";
-  readonly subscribeId: bigint;
   readonly trackAlias: bigint;
   readonly publisherPriority: number;
 }
 
 export interface StreamHeaderGroup extends BaseMessage {
   readonly type: "stream_header_group";
-  readonly subscribeId: bigint;
   readonly trackAlias: bigint;
   readonly groupId: bigint;
   readonly publisherPriority: number;
@@ -206,7 +224,6 @@ export interface StreamHeaderGroup extends BaseMessage {
 
 export interface StreamHeaderSubgroup extends BaseMessage {
   readonly type: "stream_header_subgroup";
-  readonly subscribeId: bigint;
   readonly trackAlias: bigint;
   readonly groupId: bigint;
   readonly subgroupId: bigint;