@moqtap/codec 0.2.2 → 0.3.0

package/src/drafts/draft11/data-streams.ts

@@ -1,7 +1,7 @@
-import { BufferReader } from "../../core/buffer-reader.js";
-import { BufferWriter } from "../../core/buffer-writer.js";
-import type { DecodeResult } from "../../core/types.js";
-import { DecodeError } from "../../core/types.js";
+import { BufferReader } from '../../core/buffer-reader.js'
+import { BufferWriter } from '../../core/buffer-writer.js'
+import type { DecodeResult } from '../../core/types.js'
+import { DecodeError } from '../../core/types.js'
 import type {
   DatagramObject,
   Draft11DataStream,
@@ -9,127 +9,152 @@ import type {
   FetchStream,
   ObjectPayload,
   SubgroupStream,
-} from "./types.js";
+} from './types.js'
 
 // ─── Data Stream Encoding/Decoding ─────────────────────────────────────────────
 
-const FETCH_STREAM_TYPE = 0x05n;
+const FETCH_STREAM_TYPE = 0x05n
 
 export function encodeSubgroupStream(stream: SubgroupStream): Uint8Array {
-  const w = new BufferWriter();
-  const typeId = stream.streamTypeId;
-  w.writeVarInt(BigInt(typeId));
-  w.writeVarInt(stream.trackAlias);
-  w.writeVarInt(stream.groupId);
-  const extensionsPresent = (typeId & 0x01) !== 0;
-  const hasSubgroupField = (typeId & 0x04) !== 0;
-  if (hasSubgroupField) w.writeVarInt(stream.subgroupId);
-  w.writeUint8(stream.publisherPriority);
+  const w = new BufferWriter()
+  const typeId = stream.streamTypeId
+  w.writeVarInt(BigInt(typeId))
+  w.writeVarInt(stream.trackAlias)
+  w.writeVarInt(stream.groupId)
+  const extensionsPresent = (typeId & 0x01) !== 0
+  const hasSubgroupField = (typeId & 0x04) !== 0
+  if (hasSubgroupField) w.writeVarInt(stream.subgroupId)
+  w.writeUint8(stream.publisherPriority)
   for (const obj of stream.objects) {
-    w.writeVarInt(obj.objectId);
+    w.writeVarInt(obj.objectId)
     if (extensionsPresent) {
-      w.writeVarInt(BigInt(obj.extensionData.length));
-      if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
+      w.writeVarInt(BigInt(obj.extensionData.length))
+      if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData)
     }
-    w.writeVarInt(obj.payloadLength);
+    w.writeVarInt(obj.payloadLength)
     if (obj.payloadLength === 0 && obj.status !== undefined) {
-      w.writeVarInt(obj.status);
+      w.writeVarInt(obj.status)
     } else {
-      w.writeBytes(obj.payload);
+      w.writeBytes(obj.payload)
     }
   }
-  return w.finish();
+  return w.finish()
 }
 
 export function encodeDatagram(dg: DatagramObject): Uint8Array {
-  const w = new BufferWriter();
-  w.writeVarInt(BigInt(dg.streamTypeId));
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  w.writeVarInt(dg.objectId);
-  w.writeUint8(dg.publisherPriority);
-  if (dg.streamTypeId === 0x02) {
-    // Datagram status — write status varint
-    w.writeVarInt(dg.objectStatus ?? 0n);
+  const w = new BufferWriter()
+  w.writeVarInt(BigInt(dg.streamTypeId))
+  w.writeVarInt(dg.trackAlias)
+  w.writeVarInt(dg.groupId)
+  w.writeVarInt(dg.objectId)
+  w.writeUint8(dg.publisherPriority)
+  const extensionsPresent = (dg.streamTypeId & 0x01) !== 0
+  if (extensionsPresent) {
+    const extData = dg.extensionData ?? new Uint8Array(0)
+    w.writeVarInt(extData.byteLength)
+    if (extData.byteLength > 0) w.writeBytes(extData)
+  }
+  const isStatus = dg.streamTypeId === 0x02 || dg.streamTypeId === 0x03
+  if (isStatus) {
+    w.writeVarInt(dg.objectStatus ?? 0n)
   } else {
-    w.writeBytes(dg.payload);
+    w.writeBytes(dg.payload)
   }
-  return w.finish();
+  return w.finish()
 }
 
 export function encodeFetchStream(stream: FetchStream): Uint8Array {
-  const w = new BufferWriter();
-  w.writeVarInt(FETCH_STREAM_TYPE);
-  w.writeVarInt(stream.requestId);
+  const w = new BufferWriter()
+  w.writeVarInt(FETCH_STREAM_TYPE)
+  w.writeVarInt(stream.requestId)
   for (const obj of stream.objects) {
-    w.writeVarInt(obj.groupId);
-    w.writeVarInt(obj.subgroupId);
-    w.writeVarInt(obj.objectId);
-    w.writeUint8(obj.publisherPriority);
-    w.writeVarInt(BigInt(obj.extensionData.length));
-    if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData);
-    w.writeVarInt(obj.payloadLength);
-    w.writeBytes(obj.payload);
+    w.writeVarInt(obj.groupId)
+    w.writeVarInt(obj.subgroupId)
+    w.writeVarInt(obj.objectId)
+    w.writeUint8(obj.publisherPriority)
+    w.writeVarInt(BigInt(obj.extensionData.length))
+    if (obj.extensionData.length > 0) w.writeBytes(obj.extensionData)
+    w.writeVarInt(obj.payloadLength)
+    if (obj.payloadLength === 0) {
+      const status = (obj as unknown as Record<string, unknown>).objectStatus as bigint | undefined
+      w.writeVarInt(status ?? 0n)
+    } else {
+      w.writeBytes(obj.payload)
+    }
   }
-  return w.finish();
+  return w.finish()
 }
 
 export function decodeSubgroupStream(bytes: Uint8Array): DecodeResult<SubgroupStream> {
   try {
-    const r = new BufferReader(bytes);
-    const streamTypeId = Number(r.readVarInt());
+    const r = new BufferReader(bytes)
+    const streamTypeId = Number(r.readVarInt())
     if (streamTypeId < 0x08 || streamTypeId > 0x0d) {
       return {
         ok: false,
         error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
+          'CONSTRAINT_VIOLATION',
           `Expected subgroup type 0x08-0x0D, got 0x${streamTypeId.toString(16)}`,
           0,
         ),
-      };
+      }
     }
-    const extensionsPresent = (streamTypeId & 0x01) !== 0;
-    const hasSubgroupField = (streamTypeId & 0x04) !== 0;
-    const subgroupIsFirstObjId = (streamTypeId & 0x02) !== 0 && !hasSubgroupField;
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    let subgroupId = 0n;
-    if (hasSubgroupField) subgroupId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const objects: ObjectPayload[] = [];
-    let firstObject = true;
+    const extensionsPresent = (streamTypeId & 0x01) !== 0
+    const hasSubgroupField = (streamTypeId & 0x04) !== 0
+    const subgroupIsFirstObjId = (streamTypeId & 0x02) !== 0 && !hasSubgroupField
+    const trackAlias = r.readVarInt()
+    const groupId = r.readVarInt()
+    let subgroupId = 0n
+    if (hasSubgroupField) subgroupId = r.readVarInt()
+    const publisherPriority = r.readUint8()
+    const objects: ObjectPayload[] = []
+    let firstObject = true
     while (r.remaining > 0) {
-      const byteOffset = r.offset;
-      const objectId = r.readVarInt();
+      const byteOffset = r.offset
+      const objectId = r.readVarInt()
       if (firstObject && subgroupIsFirstObjId) {
-        subgroupId = objectId;
-        firstObject = false;
+        subgroupId = objectId
+        firstObject = false
       }
-      let extensionData = new Uint8Array(0);
+      let extensionData = new Uint8Array(0)
+      let extensionHeadersLength: bigint | undefined
       if (extensionsPresent) {
-        const extLen = Number(r.readVarInt());
-        extensionData = extLen > 0 ? r.readBytes(extLen) : new Uint8Array(0);
+        extensionHeadersLength = r.readVarInt()
+        extensionData =
+          extensionHeadersLength > 0n
+            ? r.readBytesView(Number(extensionHeadersLength))
+            : new Uint8Array(0)
       }
-      const payloadLength = Number(r.readVarInt());
-      let payload: Uint8Array;
-      let status: bigint | undefined;
-      let payloadByteOffset: number;
+      const payloadLength = Number(r.readVarInt())
+      let payload: Uint8Array
+      let status: bigint | undefined
+      let payloadByteOffset: number
       if (payloadLength === 0) {
-        status = r.readVarInt();
-        payloadByteOffset = r.offset;
-        payload = new Uint8Array(0);
+        status = r.readVarInt()
+        payloadByteOffset = r.offset
+        payload = new Uint8Array(0)
       } else {
-        payloadByteOffset = r.offset;
-        payload = r.readBytes(payloadLength);
+        payloadByteOffset = r.offset
+        payload = r.readBytesView(payloadLength)
+      }
+      const obj: ObjectPayload = {
+        type: 'object',
+        byteOffset,
+        payloadByteOffset,
+        objectId,
+        extensionData,
+        payloadLength,
+        payload,
       }
-      const obj: ObjectPayload = { type: "object", byteOffset, payloadByteOffset, objectId, extensionData, payloadLength, payload };
-      if (status !== undefined) (obj as unknown as Record<string, unknown>).status = status;
-      objects.push(obj);
+      if (extensionHeadersLength !== undefined)
+        (obj as unknown as Record<string, unknown>).extensionHeadersLength = extensionHeadersLength
+      if (status !== undefined) (obj as unknown as Record<string, unknown>).status = status
+      objects.push(obj)
     }
     return {
       ok: true,
       value: {
-        type: "subgroup",
+        type: 'subgroup',
         streamTypeId,
         trackAlias,
         groupId,
@@ -138,41 +163,52 @@ export function decodeSubgroupStream(bytes: Uint8Array): DecodeResult<SubgroupSt
         objects,
       },
       bytesRead: r.offset,
-    };
+    }
   } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
+    if (e instanceof DecodeError) return { ok: false, error: e }
+    throw e
   }
 }
 
 export function decodeDatagram(bytes: Uint8Array): DecodeResult<DatagramObject> {
   try {
-    const r = new BufferReader(bytes);
-    const streamTypeId = Number(r.readVarInt());
-    if (streamTypeId !== 0x00 && streamTypeId !== 0x02) {
+    const r = new BufferReader(bytes)
+    const streamTypeId = Number(r.readVarInt())
+    if (streamTypeId < 0x00 || streamTypeId > 0x03) {
       return {
         ok: false,
         error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
-          `Expected datagram type 0x00 or 0x02, got 0x${streamTypeId.toString(16)}`,
+          'CONSTRAINT_VIOLATION',
+          `Expected datagram type 0x00-0x03, got 0x${streamTypeId.toString(16)}`,
           0,
         ),
-      };
+      }
+    }
+    const extensionsPresent = (streamTypeId & 0x01) !== 0
+    const isStatus = streamTypeId === 0x02 || streamTypeId === 0x03
+    const trackAlias = r.readVarInt()
+    const groupId = r.readVarInt()
+    const objectId = r.readVarInt()
+    const publisherPriority = r.readUint8()
+    let extensionHeadersLength: bigint | undefined
+    let extensionData: Uint8Array | undefined
+    if (extensionsPresent) {
+      extensionHeadersLength = r.readVarInt()
+      extensionData =
+        extensionHeadersLength > 0n
+          ? r.readBytesView(Number(extensionHeadersLength))
+          : new Uint8Array(0)
     }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const objectId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    let objectStatus: bigint | undefined;
-    let payload: Uint8Array;
-    if (streamTypeId === 0x02) {
-      objectStatus = r.readVarInt();
-      payload = new Uint8Array(0);
+    let objectStatus: bigint | undefined
+    let payload: Uint8Array
+    if (isStatus) {
+      objectStatus = r.readVarInt()
+      payload = new Uint8Array(0)
     } else {
-      payload = r.readBytes(r.remaining);
+      payload = r.readBytesView(r.remaining)
     }
     const result: DatagramObject = {
-      type: "datagram",
+      type: 'datagram',
       streamTypeId,
       trackAlias,
       groupId,
@@ -180,54 +216,61 @@ export function decodeDatagram(bytes: Uint8Array): DecodeResult<DatagramObject>
       publisherPriority,
       payloadLength: payload.byteLength,
       payload,
-    };
+    }
+    if (extensionHeadersLength !== undefined)
+      (result as unknown as Record<string, unknown>).extensionHeadersLength = extensionHeadersLength
+    if (extensionData !== undefined)
+      (result as unknown as Record<string, unknown>).extensionData = extensionData
     if (objectStatus !== undefined)
-      (result as unknown as Record<string, unknown>).objectStatus = objectStatus;
-    return { ok: true, value: result, bytesRead: r.offset };
+      (result as unknown as Record<string, unknown>).objectStatus = objectStatus
+    return { ok: true, value: result, bytesRead: r.offset }
   } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
+    if (e instanceof DecodeError) return { ok: false, error: e }
+    throw e
   }
 }
 
 export function decodeFetchStream(bytes: Uint8Array): DecodeResult<FetchStream> {
   try {
-    const r = new BufferReader(bytes);
-    const streamType = r.readVarInt();
+    const r = new BufferReader(bytes)
+    const streamType = r.readVarInt()
     if (streamType !== FETCH_STREAM_TYPE) {
       return {
         ok: false,
         error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
+          'CONSTRAINT_VIOLATION',
           `Expected fetch type 0x05, got 0x${streamType.toString(16)}`,
           0,
         ),
-      };
+      }
     }
-    const requestId = r.readVarInt();
-    const objects: FetchObjectPayload[] = [];
+    const requestId = r.readVarInt()
+    const objects: FetchObjectPayload[] = []
     while (r.remaining > 0) {
-      const byteOffset = r.offset;
-      const groupId = r.readVarInt();
-      const subgroupId = r.readVarInt();
-      const objectId = r.readVarInt();
-      const publisherPriority = r.readUint8();
-      const extensionHeadersLength = r.readVarInt();
-      const extensionData = extensionHeadersLength > 0n ? r.readBytes(Number(extensionHeadersLength)) : new Uint8Array(0);
-      const payloadLength = Number(r.readVarInt());
-      let payload: Uint8Array;
-      let objectStatus: bigint | undefined;
-      let payloadByteOffset: number;
+      const byteOffset = r.offset
+      const groupId = r.readVarInt()
+      const subgroupId = r.readVarInt()
+      const objectId = r.readVarInt()
+      const publisherPriority = r.readUint8()
+      const extensionHeadersLength = r.readVarInt()
+      const extensionData =
+        extensionHeadersLength > 0n
+          ? r.readBytesView(Number(extensionHeadersLength))
+          : new Uint8Array(0)
+      const payloadLength = Number(r.readVarInt())
+      let payload: Uint8Array
+      let objectStatus: bigint | undefined
+      let payloadByteOffset: number
       if (payloadLength === 0) {
-        objectStatus = r.readVarInt();
-        payloadByteOffset = r.offset;
-        payload = new Uint8Array(0);
+        objectStatus = r.readVarInt()
+        payloadByteOffset = r.offset
+        payload = new Uint8Array(0)
       } else {
-        payloadByteOffset = r.offset;
-        payload = r.readBytes(payloadLength);
+        payloadByteOffset = r.offset
+        payload = r.readBytesView(payloadLength)
       }
       const obj: FetchObjectPayload = {
-        type: "object",
+        type: 'object',
         byteOffset,
         payloadByteOffset,
         groupId,
@@ -238,32 +281,36 @@ export function decodeFetchStream(bytes: Uint8Array): DecodeResult<FetchStream>
         extensionData,
         payloadLength,
         payload,
-      };
+      }
       if (objectStatus !== undefined)
-        (obj as unknown as Record<string, unknown>).objectStatus = objectStatus;
-      objects.push(obj);
+        (obj as unknown as Record<string, unknown>).objectStatus = objectStatus
+      objects.push(obj)
+    }
+    return {
+      ok: true,
+      value: { type: 'fetch', requestId, objects },
+      bytesRead: r.offset,
     }
-    return { ok: true, value: { type: "fetch", requestId, objects }, bytesRead: r.offset };
   } catch (e) {
-    if (e instanceof DecodeError) return { ok: false, error: e };
-    throw e;
+    if (e instanceof DecodeError) return { ok: false, error: e }
+    throw e
   }
 }
 
 export function decodeDataStream(
-  streamType: "subgroup" | "datagram" | "fetch",
+  streamType: 'subgroup' | 'datagram' | 'fetch',
   bytes: Uint8Array,
 ): DecodeResult<Draft11DataStream> {
   switch (streamType) {
-    case "subgroup":
-      return decodeSubgroupStream(bytes);
-    case "datagram":
-      return decodeDatagram(bytes);
-    case "fetch":
-      return decodeFetchStream(bytes);
+    case 'subgroup':
+      return decodeSubgroupStream(bytes)
+    case 'datagram':
+      return decodeDatagram(bytes)
+    case 'fetch':
+      return decodeFetchStream(bytes)
     default: {
-      const _: never = streamType;
-      throw new Error(`Unknown: ${_}`);
+      const _: never = streamType
+      throw new Error(`Unknown: ${_}`)
     }
   }
 }

package/src/drafts/draft11/index.ts

@@ -1,4 +1,6 @@
-export type { Draft11Codec } from "./codec.js";
+export const DRAFT_VERSION = 0xff00000bn
+
+export type { Draft11Codec } from './codec.js'
 export {
   createDraft11Codec,
   createStreamDecoder,
@@ -11,7 +13,7 @@ export {
   encodeFetchStream,
   encodeMessage,
   encodeSubgroupStream,
-} from "./codec.js";
+} from './codec.js'
 export {
   MESSAGE_ID_MAP,
   MESSAGE_TYPE_MAP,
@@ -45,7 +47,7 @@ export {
   PARAM_DELIVERY_TIMEOUT,
   SETUP_PARAM_MAX_REQUEST_ID,
   SETUP_PARAM_PATH,
-} from "./messages.js";
+} from './messages.js'
 export {
   BIDIRECTIONAL_MESSAGES,
   CLIENT_ONLY_MESSAGES,
@@ -53,7 +55,7 @@ export {
   getLegalIncoming,
   getLegalOutgoing,
   SERVER_ONLY_MESSAGES,
-} from "./rules.js";
+} from './rules.js'
 export type {
   AnnouncePhase,
   AnnounceState,
@@ -63,16 +65,15 @@ export type {
   ProtocolViolationCode,
   SessionPhase,
   SessionState,
-  SessionStateOptions,
   SideEffect,
   SubscriptionPhase,
   SubscriptionState,
   TransitionResult,
   ValidationResult,
-} from "./session.js";
+} from './session.js'
+export { createDraft11SessionState } from './session.js'
 // Session state machine
-export { createDraft11SessionState } from "./session.js";
-export { Draft11SessionFSM } from "./session-fsm.js";
+export { Draft11SessionFSM } from './session-fsm.js'
 export type {
   AuthorizationToken,
   DatagramObject,
@@ -120,4 +121,4 @@ export type {
   SubgroupStream,
   SubgroupStreamHeader,
   UnknownParam,
-} from "./types.js";
+} from './types.js'

package/src/drafts/draft11/messages.ts

@@ -1,71 +1,72 @@
 // Draft-11 message type wire IDs
 
-export const MSG_SUBSCRIBE_UPDATE = 0x02n;
-export const MSG_SUBSCRIBE = 0x03n;
-export const MSG_SUBSCRIBE_OK = 0x04n;
-export const MSG_SUBSCRIBE_ERROR = 0x05n;
-export const MSG_ANNOUNCE = 0x06n;
-export const MSG_ANNOUNCE_OK = 0x07n;
-export const MSG_ANNOUNCE_ERROR = 0x08n;
-export const MSG_UNANNOUNCE = 0x09n;
-export const MSG_UNSUBSCRIBE = 0x0an;
-export const MSG_SUBSCRIBE_DONE = 0x0bn;
-export const MSG_ANNOUNCE_CANCEL = 0x0cn;
-export const MSG_TRACK_STATUS_REQUEST = 0x0dn;
-export const MSG_TRACK_STATUS = 0x0en;
-export const MSG_GOAWAY = 0x10n;
-export const MSG_SUBSCRIBE_ANNOUNCES = 0x11n;
-export const MSG_SUBSCRIBE_ANNOUNCES_OK = 0x12n;
-export const MSG_SUBSCRIBE_ANNOUNCES_ERROR = 0x13n;
-export const MSG_UNSUBSCRIBE_ANNOUNCES = 0x14n;
-export const MSG_MAX_REQUEST_ID = 0x15n;
-export const MSG_FETCH = 0x16n;
-export const MSG_FETCH_CANCEL = 0x17n;
-export const MSG_FETCH_OK = 0x18n;
-export const MSG_FETCH_ERROR = 0x19n;
-export const MSG_REQUESTS_BLOCKED = 0x1an;
-export const MSG_CLIENT_SETUP = 0x20n;
-export const MSG_SERVER_SETUP = 0x21n;
+export const MSG_SUBSCRIBE_UPDATE = 0x02n
+export const MSG_SUBSCRIBE = 0x03n
+export const MSG_SUBSCRIBE_OK = 0x04n
+export const MSG_SUBSCRIBE_ERROR = 0x05n
+export const MSG_ANNOUNCE = 0x06n
+export const MSG_ANNOUNCE_OK = 0x07n
+export const MSG_ANNOUNCE_ERROR = 0x08n
+export const MSG_UNANNOUNCE = 0x09n
+export const MSG_UNSUBSCRIBE = 0x0an
+export const MSG_SUBSCRIBE_DONE = 0x0bn
+export const MSG_ANNOUNCE_CANCEL = 0x0cn
+export const MSG_TRACK_STATUS_REQUEST = 0x0dn
+export const MSG_TRACK_STATUS = 0x0en
+export const MSG_GOAWAY = 0x10n
+export const MSG_SUBSCRIBE_ANNOUNCES = 0x11n
+export const MSG_SUBSCRIBE_ANNOUNCES_OK = 0x12n
+export const MSG_SUBSCRIBE_ANNOUNCES_ERROR = 0x13n
+export const MSG_UNSUBSCRIBE_ANNOUNCES = 0x14n
+export const MSG_MAX_REQUEST_ID = 0x15n
+export const MSG_FETCH = 0x16n
+export const MSG_FETCH_CANCEL = 0x17n
+export const MSG_FETCH_OK = 0x18n
+export const MSG_FETCH_ERROR = 0x19n
+export const MSG_REQUESTS_BLOCKED = 0x1an
+export const MSG_CLIENT_SETUP = 0x20n
+export const MSG_SERVER_SETUP = 0x21n
 
 // Setup parameter type IDs (even/odd encoding)
-export const SETUP_PARAM_PATH = 0x01n; // odd: length-prefixed
-export const SETUP_PARAM_MAX_REQUEST_ID = 0x02n; // even: varint
+export const SETUP_PARAM_PATH = 0x01n // odd: length-prefixed
+export const SETUP_PARAM_MAX_REQUEST_ID = 0x02n // even: varint
 
-// Version-specific parameter type IDs (all length-prefixed)
-export const PARAM_AUTHORIZATION_TOKEN = 0x01n;
-export const PARAM_DELIVERY_TIMEOUT = 0x02n;
+// Version-specific parameter type IDs (even/odd encoding)
+export const PARAM_AUTHORIZATION_TOKEN = 0x01n // odd: length-prefixed
+export const PARAM_DELIVERY_TIMEOUT = 0x02n // even: varint
+export const PARAM_MAX_CACHE_DURATION = 0x04n // even: varint
 
 // Map from wire ID to message type name
 export const MESSAGE_TYPE_MAP: ReadonlyMap<bigint, string> = new Map([
-  [MSG_CLIENT_SETUP, "client_setup"],
-  [MSG_SERVER_SETUP, "server_setup"],
-  [MSG_SUBSCRIBE, "subscribe"],
-  [MSG_SUBSCRIBE_OK, "subscribe_ok"],
-  [MSG_SUBSCRIBE_ERROR, "subscribe_error"],
-  [MSG_SUBSCRIBE_UPDATE, "subscribe_update"],
-  [MSG_SUBSCRIBE_DONE, "subscribe_done"],
-  [MSG_UNSUBSCRIBE, "unsubscribe"],
-  [MSG_ANNOUNCE, "announce"],
-  [MSG_ANNOUNCE_OK, "announce_ok"],
-  [MSG_ANNOUNCE_ERROR, "announce_error"],
-  [MSG_UNANNOUNCE, "unannounce"],
-  [MSG_ANNOUNCE_CANCEL, "announce_cancel"],
-  [MSG_SUBSCRIBE_ANNOUNCES, "subscribe_announces"],
-  [MSG_SUBSCRIBE_ANNOUNCES_OK, "subscribe_announces_ok"],
-  [MSG_SUBSCRIBE_ANNOUNCES_ERROR, "subscribe_announces_error"],
-  [MSG_UNSUBSCRIBE_ANNOUNCES, "unsubscribe_announces"],
-  [MSG_FETCH, "fetch"],
-  [MSG_FETCH_OK, "fetch_ok"],
-  [MSG_FETCH_ERROR, "fetch_error"],
-  [MSG_FETCH_CANCEL, "fetch_cancel"],
-  [MSG_TRACK_STATUS_REQUEST, "track_status_request"],
-  [MSG_TRACK_STATUS, "track_status"],
-  [MSG_GOAWAY, "goaway"],
-  [MSG_MAX_REQUEST_ID, "max_request_id"],
-  [MSG_REQUESTS_BLOCKED, "requests_blocked"],
-]);
+  [MSG_CLIENT_SETUP, 'client_setup'],
+  [MSG_SERVER_SETUP, 'server_setup'],
+  [MSG_SUBSCRIBE, 'subscribe'],
+  [MSG_SUBSCRIBE_OK, 'subscribe_ok'],
+  [MSG_SUBSCRIBE_ERROR, 'subscribe_error'],
+  [MSG_SUBSCRIBE_UPDATE, 'subscribe_update'],
+  [MSG_SUBSCRIBE_DONE, 'subscribe_done'],
+  [MSG_UNSUBSCRIBE, 'unsubscribe'],
+  [MSG_ANNOUNCE, 'announce'],
+  [MSG_ANNOUNCE_OK, 'announce_ok'],
+  [MSG_ANNOUNCE_ERROR, 'announce_error'],
+  [MSG_UNANNOUNCE, 'unannounce'],
+  [MSG_ANNOUNCE_CANCEL, 'announce_cancel'],
+  [MSG_SUBSCRIBE_ANNOUNCES, 'subscribe_announces'],
+  [MSG_SUBSCRIBE_ANNOUNCES_OK, 'subscribe_announces_ok'],
+  [MSG_SUBSCRIBE_ANNOUNCES_ERROR, 'subscribe_announces_error'],
+  [MSG_UNSUBSCRIBE_ANNOUNCES, 'unsubscribe_announces'],
+  [MSG_FETCH, 'fetch'],
+  [MSG_FETCH_OK, 'fetch_ok'],
+  [MSG_FETCH_ERROR, 'fetch_error'],
+  [MSG_FETCH_CANCEL, 'fetch_cancel'],
+  [MSG_TRACK_STATUS_REQUEST, 'track_status_request'],
+  [MSG_TRACK_STATUS, 'track_status'],
+  [MSG_GOAWAY, 'goaway'],
+  [MSG_MAX_REQUEST_ID, 'max_request_id'],
+  [MSG_REQUESTS_BLOCKED, 'requests_blocked'],
+])
 
 // Reverse map
 export const MESSAGE_ID_MAP: ReadonlyMap<string, bigint> = new Map(
   [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id]),
-);
+)