@moqtap/codec 0.1.1 → 0.2.0

package/dist/types-r-CasCf1.d.ts

@@ -0,0 +1,262 @@
+interface UnknownParam {
+    readonly id: string;
+    readonly length: number;
+    readonly raw_hex: string;
+}
+interface Draft08SetupParams {
+    path?: string;
+    max_subscribe_id?: bigint;
+    unknown?: UnknownParam[];
+}
+interface Draft08Params {
+    authorization_info?: string;
+    delivery_timeout?: bigint;
+    max_cache_duration?: bigint;
+    unknown?: UnknownParam[];
+}
+type Draft08MessageType = "client_setup" | "server_setup" | "subscribe" | "subscribe_ok" | "subscribe_error" | "subscribe_update" | "subscribe_done" | "unsubscribe" | "announce" | "announce_ok" | "announce_error" | "unannounce" | "announce_cancel" | "subscribe_announces" | "subscribe_announces_ok" | "subscribe_announces_error" | "unsubscribe_announces" | "fetch" | "fetch_ok" | "fetch_error" | "fetch_cancel" | "track_status_request" | "track_status" | "goaway" | "max_subscribe_id" | "subscribes_blocked";
+interface Draft08BaseMessage {
+    readonly type: Draft08MessageType;
+}
+interface Draft08ClientSetup extends Draft08BaseMessage {
+    readonly type: "client_setup";
+    readonly supported_versions: bigint[];
+    readonly parameters: Draft08SetupParams;
+}
+interface Draft08ServerSetup extends Draft08BaseMessage {
+    readonly type: "server_setup";
+    readonly selected_version: bigint;
+    readonly parameters: Draft08SetupParams;
+}
+interface Draft08Subscribe extends Draft08BaseMessage {
+    readonly type: "subscribe";
+    readonly subscribe_id: bigint;
+    readonly track_alias: bigint;
+    readonly track_namespace: string[];
+    readonly track_name: string;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
+    readonly filter_type: bigint;
+    readonly start_group?: bigint;
+    readonly start_object?: bigint;
+    readonly end_group?: bigint;
+    readonly parameters: Draft08Params;
+}
+interface Draft08SubscribeOk extends Draft08BaseMessage {
+    readonly type: "subscribe_ok";
+    readonly subscribe_id: bigint;
+    readonly expires: bigint;
+    readonly group_order: number;
+    readonly content_exists: number;
+    readonly largest_group_id?: bigint;
+    readonly largest_object_id?: bigint;
+    readonly parameters: Draft08Params;
+}
+interface Draft08SubscribeError extends Draft08BaseMessage {
+    readonly type: "subscribe_error";
+    readonly subscribe_id: bigint;
+    readonly error_code: bigint;
+    readonly reason_phrase: string;
+    readonly track_alias: bigint;
+}
+interface Draft08SubscribeDone extends Draft08BaseMessage {
+    readonly type: "subscribe_done";
+    readonly subscribe_id: bigint;
+    readonly status_code: bigint;
+    readonly stream_count: bigint;
+    readonly reason_phrase: string;
+}
+interface Draft08SubscribeUpdate extends Draft08BaseMessage {
+    readonly type: "subscribe_update";
+    readonly subscribe_id: bigint;
+    readonly start_group: bigint;
+    readonly start_object: bigint;
+    readonly end_group: bigint;
+    readonly subscriber_priority: number;
+    readonly parameters: Draft08Params;
+}
+interface Draft08Unsubscribe extends Draft08BaseMessage {
+    readonly type: "unsubscribe";
+    readonly subscribe_id: bigint;
+}
+interface Draft08Announce extends Draft08BaseMessage {
+    readonly type: "announce";
+    readonly track_namespace: string[];
+    readonly parameters: Draft08Params;
+}
+interface Draft08AnnounceOk extends Draft08BaseMessage {
+    readonly type: "announce_ok";
+    readonly track_namespace: string[];
+}
+interface Draft08AnnounceError extends Draft08BaseMessage {
+    readonly type: "announce_error";
+    readonly track_namespace: string[];
+    readonly error_code: bigint;
+    readonly reason_phrase: string;
+}
+interface Draft08Unannounce extends Draft08BaseMessage {
+    readonly type: "unannounce";
+    readonly track_namespace: string[];
+}
+interface Draft08AnnounceCancel extends Draft08BaseMessage {
+    readonly type: "announce_cancel";
+    readonly track_namespace: string[];
+    readonly error_code: bigint;
+    readonly reason_phrase: string;
+}
+interface Draft08SubscribeAnnounces extends Draft08BaseMessage {
+    readonly type: "subscribe_announces";
+    readonly track_namespace_prefix: string[];
+    readonly parameters: Draft08Params;
+}
+interface Draft08SubscribeAnnouncesOk extends Draft08BaseMessage {
+    readonly type: "subscribe_announces_ok";
+    readonly track_namespace_prefix: string[];
+}
+interface Draft08SubscribeAnnouncesError extends Draft08BaseMessage {
+    readonly type: "subscribe_announces_error";
+    readonly track_namespace_prefix: string[];
+    readonly error_code: bigint;
+    readonly reason_phrase: string;
+}
+interface Draft08UnsubscribeAnnounces extends Draft08BaseMessage {
+    readonly type: "unsubscribe_announces";
+    readonly track_namespace_prefix: string[];
+}
+interface StandaloneFetch {
+    readonly track_namespace: string[];
+    readonly track_name: string;
+    readonly start_group: bigint;
+    readonly start_object: bigint;
+    readonly end_group: bigint;
+    readonly end_object: bigint;
+}
+interface JoiningFetch {
+    readonly joining_subscribe_id: bigint;
+    readonly preceding_group_offset: bigint;
+}
+interface Draft08Fetch extends Draft08BaseMessage {
+    readonly type: "fetch";
+    readonly subscribe_id: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
+    readonly fetch_type: bigint;
+    readonly standalone?: StandaloneFetch;
+    readonly joining?: JoiningFetch;
+    readonly parameters: Draft08Params;
+}
+interface Draft08FetchOk extends Draft08BaseMessage {
+    readonly type: "fetch_ok";
+    readonly subscribe_id: bigint;
+    readonly group_order: number;
+    readonly end_of_track: number;
+    readonly largest_group_id: bigint;
+    readonly largest_object_id: bigint;
+    readonly parameters: Draft08Params;
+}
+interface Draft08FetchError extends Draft08BaseMessage {
+    readonly type: "fetch_error";
+    readonly subscribe_id: bigint;
+    readonly error_code: bigint;
+    readonly reason_phrase: string;
+}
+interface Draft08FetchCancel extends Draft08BaseMessage {
+    readonly type: "fetch_cancel";
+    readonly subscribe_id: bigint;
+}
+interface Draft08TrackStatusRequest extends Draft08BaseMessage {
+    readonly type: "track_status_request";
+    readonly track_namespace: string[];
+    readonly track_name: string;
+}
+interface Draft08TrackStatus extends Draft08BaseMessage {
+    readonly type: "track_status";
+    readonly track_namespace: string[];
+    readonly track_name: string;
+    readonly status_code: bigint;
+    readonly last_group_id: bigint;
+    readonly last_object_id: bigint;
+}
+interface Draft08GoAway extends Draft08BaseMessage {
+    readonly type: "goaway";
+    readonly new_session_uri: string;
+}
+interface Draft08MaxSubscribeId extends Draft08BaseMessage {
+    readonly type: "max_subscribe_id";
+    readonly subscribe_id: bigint;
+}
+interface Draft08SubscribesBlocked extends Draft08BaseMessage {
+    readonly type: "subscribes_blocked";
+    readonly maximum_subscribe_id: bigint;
+}
+type Draft08Message = Draft08ClientSetup | Draft08ServerSetup | Draft08Subscribe | Draft08SubscribeOk | Draft08SubscribeError | Draft08SubscribeUpdate | Draft08SubscribeDone | Draft08Unsubscribe | Draft08Announce | Draft08AnnounceOk | Draft08AnnounceError | Draft08Unannounce | Draft08AnnounceCancel | Draft08SubscribeAnnounces | Draft08SubscribeAnnouncesOk | Draft08SubscribeAnnouncesError | Draft08UnsubscribeAnnounces | Draft08Fetch | Draft08FetchOk | Draft08FetchError | Draft08FetchCancel | Draft08TrackStatusRequest | Draft08TrackStatus | Draft08GoAway | Draft08MaxSubscribeId | Draft08SubscribesBlocked;
+interface ObjectPayload {
+    readonly type: "object";
+    readonly objectId: bigint;
+    readonly extensionCount: bigint;
+    readonly payloadLength: number;
+    readonly status?: bigint;
+    readonly payload: Uint8Array;
+}
+interface SubgroupStream {
+    readonly type: "subgroup";
+    readonly streamTypeId: 0x04;
+    readonly trackAlias: bigint;
+    readonly groupId: bigint;
+    readonly subgroupId: bigint;
+    readonly publisherPriority: number;
+    readonly objects: ObjectPayload[];
+}
+interface DatagramObject {
+    readonly type: "datagram";
+    readonly streamTypeId: 0x01;
+    readonly trackAlias: bigint;
+    readonly groupId: bigint;
+    readonly objectId: bigint;
+    readonly publisherPriority: number;
+    readonly extensionCount: bigint;
+    readonly objectStatus: bigint;
+    readonly payloadLength: number;
+    readonly payload: Uint8Array;
+}
+interface DatagramStatusObject {
+    readonly type: "datagram_status";
+    readonly streamTypeId: 0x02;
+    readonly trackAlias: bigint;
+    readonly groupId: bigint;
+    readonly objectId: bigint;
+    readonly publisherPriority: number;
+    readonly objectStatus: bigint;
+}
+interface FetchObjectPayload {
+    readonly type: "object";
+    readonly groupId: bigint;
+    readonly subgroupId: bigint;
+    readonly objectId: bigint;
+    readonly publisherPriority: number;
+    readonly extensionCount: bigint;
+    readonly payloadLength: number;
+    readonly status?: bigint;
+    readonly payload: Uint8Array;
+}
+interface FetchStream {
+    readonly type: "fetch";
+    readonly subscribeId: bigint;
+    readonly objects: FetchObjectPayload[];
+}
+type Draft08DataStream = SubgroupStream | DatagramObject | DatagramStatusObject | FetchStream;
+interface SubgroupStreamHeader {
+    readonly type: "subgroup_header";
+    readonly trackAlias: bigint;
+    readonly groupId: bigint;
+    readonly subgroupId: bigint;
+    readonly publisherPriority: number;
+}
+interface FetchStreamHeader {
+    readonly type: "fetch_header";
+    readonly subscribeId: bigint;
+}
+type DataStreamHeader = SubgroupStreamHeader | FetchStreamHeader;
+type DataStreamEvent = DataStreamHeader | ObjectPayload;
+
+export type { Draft08SubscribeError as A, Draft08SubscribeOk as B, Draft08SubscribeUpdate as C, Draft08DataStream as D, Draft08SubscribesBlocked as E, Draft08TrackStatus as F, Draft08TrackStatusRequest as G, Draft08Unannounce as H, Draft08Unsubscribe as I, Draft08UnsubscribeAnnounces as J, FetchObjectPayload as K, FetchStream as L, FetchStreamHeader as M, JoiningFetch as N, ObjectPayload as O, SubgroupStream as P, SubgroupStreamHeader as Q, StandaloneFetch as S, UnknownParam as U, Draft08Message as a, Draft08Params as b, Draft08SetupParams as c, Draft08MessageType as d, DataStreamEvent as e, DataStreamHeader as f, DatagramObject as g, DatagramStatusObject as h, Draft08Announce as i, Draft08AnnounceCancel as j, Draft08AnnounceError as k, Draft08AnnounceOk as l, Draft08BaseMessage as m, Draft08ClientSetup as n, Draft08Fetch as o, Draft08FetchCancel as p, Draft08FetchError as q, Draft08FetchOk as r, Draft08GoAway as s, Draft08MaxSubscribeId as t, Draft08ServerSetup as u, Draft08Subscribe as v, Draft08SubscribeAnnounces as w, Draft08SubscribeAnnouncesError as x, Draft08SubscribeAnnouncesOk as y, Draft08SubscribeDone as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moqtap/codec",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "MoQT wire-format codec and session state machine — multi-draft, zero dependencies",
   "type": "module",
   "license": "MIT",
@@ -41,6 +41,78 @@
       "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",
@@ -64,6 +136,42 @@
       "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": [
@@ -76,7 +184,7 @@
     "test": "vitest run"
   },
   "devDependencies": {
-    "@moqtap/test-vectors": "^0.1.0",
+    "@moqtap/test-vectors": "^0.6.0",
     "tsup": "^8.0.0",
     "typescript": "^5.5.0",
     "vitest": "^3.0.0"

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;

package/src/drafts/draft07/codec.ts

@@ -288,46 +288,45 @@ function encodeFetchCancel(msg: FetchCancel, writer: BufferWriter): void {
 }
 
 // Data stream encoders (no type+length framing)
+function encodeObjectPayload(
+  msg: { objectStatus?: number; payload: Uint8Array },
+  writer: BufferWriter,
+): void {
+  if (msg.payload.byteLength === 0) {
+    writer.writeVarInt(0); // payloadLength = 0 signals objectStatus follows
+    writer.writeVarInt(msg.objectStatus ?? 0);
+  } else {
+    writer.writeVarInt(msg.payload.byteLength);
+    writer.writeBytes(msg.payload);
+  }
+}
+
 function encodeObjectStream(msg: ObjectStream, writer: BufferWriter): void {
   writer.writeVarInt(MESSAGE_TYPE_IDS.object_stream);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeVarInt(msg.objectId);
   writer.writeUint8(msg.publisherPriority);
-  if (msg.objectStatus !== undefined) {
-    writer.writeVarInt(msg.objectStatus);
-  } else {
-    writer.writeVarInt(0);
-  }
-  writer.writeBytes(msg.payload);
+  encodeObjectPayload(msg, writer);
 }
 
 function encodeObjectDatagram(msg: ObjectDatagram, writer: BufferWriter): void {
   writer.writeVarInt(MESSAGE_TYPE_IDS.object_datagram);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeVarInt(msg.objectId);
   writer.writeUint8(msg.publisherPriority);
-  if (msg.objectStatus !== undefined) {
-    writer.writeVarInt(msg.objectStatus);
-  } else {
-    writer.writeVarInt(0);
-  }
-  writer.writeBytes(msg.payload);
+  encodeObjectPayload(msg, writer);
 }
 
 function encodeStreamHeaderTrack(msg: StreamHeaderTrack, writer: BufferWriter): void {
   writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_track);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeUint8(msg.publisherPriority);
 }
 
 function encodeStreamHeaderGroup(msg: StreamHeaderGroup, writer: BufferWriter): void {
   writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_group);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeUint8(msg.publisherPriority);
@@ -335,7 +334,6 @@ function encodeStreamHeaderGroup(msg: StreamHeaderGroup, writer: BufferWriter):
 
 function encodeStreamHeaderSubgroup(msg: StreamHeaderSubgroup, writer: BufferWriter): void {
   writer.writeVarInt(MESSAGE_TYPE_IDS.stream_header_subgroup);
-  writer.writeVarInt(msg.subscribeId);
   writer.writeVarInt(msg.trackAlias);
   writer.writeVarInt(msg.groupId);
   writer.writeVarInt(msg.subgroupId);
@@ -687,75 +685,85 @@ function decodeFetchCancel(reader: BufferReader): FetchCancel {
 }
 
 function decodeObjectStream(reader: BufferReader): ObjectStream {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const objectId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  const objectStatusRaw = Number(reader.readVarInt());
-  const payload = reader.readBytes(reader.remaining);
-  const base = {
+  const payloadLength = Number(reader.readVarInt());
+  if (payloadLength === 0) {
+    // Object Status follows when payload length is 0
+    const objectStatus = reader.remaining > 0 ? Number(reader.readVarInt()) : 0;
+    return {
+      type: "object_stream" as const,
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      objectStatus,
+      payload: new Uint8Array(0),
+    };
+  }
+  const payload = reader.readBytes(payloadLength);
+  return {
     type: "object_stream" as const,
-    subscribeId,
     trackAlias,
     groupId,
     objectId,
     publisherPriority,
     payload,
   };
-  if (objectStatusRaw !== 0) {
-    return { ...base, objectStatus: objectStatusRaw };
-  }
-  return base;
 }
 
 function decodeObjectDatagram(reader: BufferReader): ObjectDatagram {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const objectId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  const objectStatusRaw = Number(reader.readVarInt());
-  const payload = reader.readBytes(reader.remaining);
-  const base = {
+  const payloadLength = Number(reader.readVarInt());
+  if (payloadLength === 0) {
+    // Object Status follows when payload length is 0
+    const objectStatus = reader.remaining > 0 ? Number(reader.readVarInt()) : 0;
+    return {
+      type: "object_datagram" as const,
+      trackAlias,
+      groupId,
+      objectId,
+      publisherPriority,
+      objectStatus,
+      payload: new Uint8Array(0),
+    };
+  }
+  const payload = reader.readBytes(payloadLength);
+  return {
     type: "object_datagram" as const,
-    subscribeId,
     trackAlias,
     groupId,
     objectId,
     publisherPriority,
     payload,
   };
-  if (objectStatusRaw !== 0) {
-    return { ...base, objectStatus: objectStatusRaw };
-  }
-  return base;
 }
 
 function decodeStreamHeaderTrack(reader: BufferReader): StreamHeaderTrack {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  return { type: "stream_header_track", subscribeId, trackAlias, publisherPriority };
+  return { type: "stream_header_track", trackAlias, publisherPriority };
 }
 
 function decodeStreamHeaderGroup(reader: BufferReader): StreamHeaderGroup {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
-  return { type: "stream_header_group", subscribeId, trackAlias, groupId, publisherPriority };
+  return { type: "stream_header_group", trackAlias, groupId, publisherPriority };
 }
 
 function decodeStreamHeaderSubgroup(reader: BufferReader): StreamHeaderSubgroup {
-  const subscribeId = reader.readVarInt();
   const trackAlias = reader.readVarInt();
   const groupId = reader.readVarInt();
   const subgroupId = reader.readVarInt();
   const publisherPriority = reader.readUint8();
   return {
     type: "stream_header_subgroup",
-    subscribeId,
     trackAlias,
     groupId,
     subgroupId,

package/src/drafts/draft07/rules.ts

@@ -46,7 +46,6 @@ export const CLIENT_ONLY_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
   "unannounce",
   "subscribe_announces",
   "unsubscribe_announces",
-  "max_subscribe_id",
   "fetch",
   "fetch_cancel",
   "track_status_request",
@@ -67,6 +66,7 @@ export const SERVER_ONLY_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
   "fetch_ok",
   "fetch_error",
   "track_status",
+  "goaway",
 ]);
 
 // Messages legal in each session phase -- for outbound validation
@@ -81,8 +81,6 @@ export function getLegalOutgoing(phase: string, role: "client" | "server"): Set<
       if (role === "server") legal.add("server_setup");
       break;
     case "ready": {
-      // Both roles can send goaway
-      legal.add("goaway");
       const roleMessages = role === "client" ? CLIENT_ONLY_MESSAGES : SERVER_ONLY_MESSAGES;
       for (const msg of roleMessages) {
         if (msg !== "client_setup" && msg !== "server_setup") {