@moqtap/codec 0.2.2 → 0.3.0

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

@@ -1,125 +1,125 @@
-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 as Draft07DatagramObject,
   FetchObjectPayload,
   FetchStream,
   ObjectPayload,
   SubgroupStream,
-} from "./types.js";
+} from './types.js'
 
 // ─── Data Stream Encoding/Decoding ─────────────────────────────────────────────
 
 // Stream type IDs for draft-07
-const SUBGROUP_STREAM_TYPE = 0x04n;
-const FETCH_STREAM_TYPE = 0x05n;
-const DATAGRAM_TYPE = 0x01n;
+const SUBGROUP_STREAM_TYPE = 0x04n
+const FETCH_STREAM_TYPE = 0x05n
+const DATAGRAM_TYPE = 0x01n
 
 export function encodeSubgroupStream(stream: SubgroupStream): Uint8Array {
-  const w = new BufferWriter();
-  w.writeVarInt(SUBGROUP_STREAM_TYPE);
-  w.writeVarInt(stream.trackAlias);
-  w.writeVarInt(stream.groupId);
-  w.writeVarInt(stream.subgroupId);
-  w.writeUint8(stream.publisherPriority);
+  const w = new BufferWriter()
+  w.writeVarInt(SUBGROUP_STREAM_TYPE)
+  w.writeVarInt(stream.trackAlias)
+  w.writeVarInt(stream.groupId)
+  w.writeVarInt(stream.subgroupId)
+  w.writeUint8(stream.publisherPriority)
   for (const obj of stream.objects) {
-    w.writeVarInt(obj.objectId);
-    w.writeVarInt(obj.payloadLength);
+    w.writeVarInt(obj.objectId)
+    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: Draft07DatagramObject): Uint8Array {
-  const w = new BufferWriter();
-  w.writeVarInt(DATAGRAM_TYPE);
-  w.writeVarInt(dg.trackAlias);
-  w.writeVarInt(dg.groupId);
-  w.writeVarInt(dg.objectId);
-  w.writeUint8(dg.publisherPriority);
-  w.writeVarInt(dg.payloadLength);
+  const w = new BufferWriter()
+  w.writeVarInt(DATAGRAM_TYPE)
+  w.writeVarInt(dg.trackAlias)
+  w.writeVarInt(dg.groupId)
+  w.writeVarInt(dg.objectId)
+  w.writeUint8(dg.publisherPriority)
+  w.writeVarInt(dg.payloadLength)
   if (dg.payloadLength === 0 && dg.status !== undefined) {
-    w.writeVarInt(dg.status);
+    w.writeVarInt(dg.status)
   } 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.subscribeId);
+  const w = new BufferWriter()
+  w.writeVarInt(FETCH_STREAM_TYPE)
+  w.writeVarInt(stream.subscribeId)
   for (const obj of stream.objects) {
-    w.writeVarInt(obj.groupId);
-    w.writeVarInt(obj.subgroupId);
-    w.writeVarInt(obj.objectId);
-    w.writeUint8(obj.publisherPriority);
-    w.writeVarInt(obj.payloadLength);
+    w.writeVarInt(obj.groupId)
+    w.writeVarInt(obj.subgroupId)
+    w.writeVarInt(obj.objectId)
+    w.writeUint8(obj.publisherPriority)
+    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 decodeSubgroupStream(bytes: Uint8Array): DecodeResult<SubgroupStream> {
   try {
-    const r = new BufferReader(bytes);
-    const streamType = Number(r.readVarInt());
+    const r = new BufferReader(bytes)
+    const streamType = Number(r.readVarInt())
     if (streamType !== 0x04) {
       return {
         ok: false,
         error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
+          'CONSTRAINT_VIOLATION',
           `Expected subgroup type 0x04, got 0x${streamType.toString(16)}`,
           0,
         ),
-      };
+      }
     }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const subgroupId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const objects: ObjectPayload[] = [];
+    const trackAlias = r.readVarInt()
+    const groupId = r.readVarInt()
+    const subgroupId = r.readVarInt()
+    const publisherPriority = r.readUint8()
+    const objects: ObjectPayload[] = []
     while (r.remaining > 0) {
-      const byteOffset = r.offset;
-      const objectId = r.readVarInt();
-      const payloadLength = Number(r.readVarInt());
-      let payload: Uint8Array;
-      let status: bigint | undefined;
-      let payloadByteOffset: number;
+      const byteOffset = r.offset
+      const objectId = r.readVarInt()
+      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",
+        type: 'object',
         objectId,
         payloadLength,
         payload,
         byteOffset,
         payloadByteOffset,
-      };
-      if (status !== undefined) (obj as unknown as Record<string, unknown>).status = status;
-      objects.push(obj);
+      }
+      if (status !== undefined) (obj as unknown as Record<string, unknown>).status = status
+      objects.push(obj)
     }
     return {
       ok: true,
       value: {
-        type: "subgroup",
+        type: 'subgroup',
         streamTypeId: 0x04,
         trackAlias,
         groupId,
@@ -128,42 +128,42 @@ 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<Draft07DatagramObject> {
   try {
-    const r = new BufferReader(bytes);
-    const streamType = Number(r.readVarInt());
+    const r = new BufferReader(bytes)
+    const streamType = Number(r.readVarInt())
     if (streamType !== 0x01) {
       return {
         ok: false,
         error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
+          'CONSTRAINT_VIOLATION',
           `Expected datagram type 0x01, got 0x${streamType.toString(16)}`,
           0,
         ),
-      };
+      }
     }
-    const trackAlias = r.readVarInt();
-    const groupId = r.readVarInt();
-    const objectId = r.readVarInt();
-    const publisherPriority = r.readUint8();
-    const payloadLength = Number(r.readVarInt());
-    let status: bigint | undefined;
-    let payload: Uint8Array;
+    const trackAlias = r.readVarInt()
+    const groupId = r.readVarInt()
+    const objectId = r.readVarInt()
+    const publisherPriority = r.readUint8()
+    const payloadLength = Number(r.readVarInt())
+    let status: bigint | undefined
+    let payload: Uint8Array
     if (payloadLength === 0) {
-      status = r.readVarInt();
-      payload = new Uint8Array(0);
+      status = r.readVarInt()
+      payload = new Uint8Array(0)
     } else {
-      payload = r.readBytes(payloadLength);
+      payload = r.readBytesView(payloadLength)
     }
     const result: Draft07DatagramObject = {
-      type: "datagram",
+      type: 'datagram',
       streamTypeId: 0x01,
       trackAlias,
       groupId,
@@ -171,51 +171,51 @@ export function decodeDatagram(bytes: Uint8Array): DecodeResult<Draft07DatagramO
       publisherPriority,
       payloadLength,
       payload,
-    };
-    if (status !== undefined) (result as unknown as Record<string, unknown>).status = status;
-    return { ok: true, value: result, bytesRead: r.offset };
+    }
+    if (status !== undefined) (result as unknown as Record<string, unknown>).status = status
+    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 = Number(r.readVarInt());
+    const r = new BufferReader(bytes)
+    const streamType = Number(r.readVarInt())
     if (streamType !== 0x05) {
       return {
         ok: false,
         error: new DecodeError(
-          "CONSTRAINT_VIOLATION",
+          'CONSTRAINT_VIOLATION',
           `Expected fetch type 0x05, got 0x${streamType.toString(16)}`,
           0,
         ),
-      };
+      }
     }
-    const subscribeId = r.readVarInt();
-    const objects: FetchObjectPayload[] = [];
+    const subscribeId = 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 payloadLength = Number(r.readVarInt());
-      let payload: Uint8Array;
-      let status: 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 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: FetchObjectPayload = {
-        type: "object",
+        type: 'object',
         groupId,
         subgroupId,
         objectId,
@@ -224,17 +224,17 @@ export function decodeFetchStream(bytes: Uint8Array): DecodeResult<FetchStream>
         payload,
         byteOffset,
         payloadByteOffset,
-      };
-      if (status !== undefined) (obj as unknown as Record<string, unknown>).status = status;
-      objects.push(obj);
+      }
+      if (status !== undefined) (obj as unknown as Record<string, unknown>).status = status
+      objects.push(obj)
     }
     return {
       ok: true,
-      value: { type: "fetch", subscribeId, objects },
+      value: { type: 'fetch', subscribeId, 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
   }
 }

package/src/drafts/draft07/index.ts

@@ -1,89 +1,124 @@
-// Re-export types consumers need
-export type {
-  Announce,
-  AnnounceCancel,
-  AnnounceError,
-  AnnounceOk,
-  ClientSetup,
-  DecodeErrorCode,
-  DecodeResult,
-  Fetch,
-  FetchCancel,
-  FetchError,
-  FetchOk,
-  FilterType,
-  GoAway,
-  GroupOrderValue,
-  MaxSubscribeId,
-  MoqtMessage,
-  MoqtMessageType,
-  ObjectDatagram,
-  ServerSetup,
-  StreamHeaderSubgroup,
-  Subscribe,
-  SubscribeAnnounces,
-  SubscribeAnnouncesError,
-  SubscribeAnnouncesOk,
-  SubscribeDone,
-  SubscribeError,
-  SubscribeOk,
-  SubscribeUpdate,
-  TrackStatus,
-  TrackStatusRequest,
-  Unannounce,
-  Unsubscribe,
-  UnsubscribeAnnounces,
-} from "../../core/types.js";
-export { DecodeError } from "../../core/types.js";
-export type { Draft07Codec } from "./codec.js";
-export {
-  createDraft07Codec,
-  decodeDatagram,
-  decodeFetchStream,
-  decodeSubgroupStream,
-  encodeDatagram,
-  encodeFetchStream,
-  encodeSubgroupStream,
-} from "./codec.js";
-export { MESSAGE_ID_TO_TYPE, MESSAGE_TYPE_IDS } from "./messages.js";
-export { decodeParameters, encodeParameters } from "./parameters.js";
-export {
-  CLIENT_ONLY_MESSAGES,
-  CONTROL_MESSAGES,
-  DATA_MESSAGES,
-  getLegalIncoming,
-  getLegalOutgoing,
-  SERVER_ONLY_MESSAGES,
-} from "./rules.js";
-export { decodeVarInt, encodeVarInt } from "./varint.js";
-export type {
-  DatagramObject as Draft07DatagramObject,
-  DataStreamEvent,
-  DataStreamHeader,
-  Draft07DataStream,
-  FetchObjectPayload,
-  FetchStream,
-  FetchStreamHeader,
-  ObjectPayload,
-  SubgroupStream,
-  SubgroupStreamHeader,
-} from "./types.js";
-
-import type { DecodeResult, MoqtMessage } from "../../core/types.js";
-import type { FetchStream, SubgroupStream } from "./types.js";
-import type { DatagramObject } from "./types.js";
-import { createDraft07Codec } from "./codec.js";
-
-const defaultCodec = createDraft07Codec();
-
-export function encodeMessage(message: MoqtMessage): Uint8Array {
-  return defaultCodec.encodeMessage(message);
-}
-
-export function decodeMessage(bytes: Uint8Array): DecodeResult<MoqtMessage> {
-  return defaultCodec.decodeMessage(bytes);
-}
-
-export function createStreamDecoder(): TransformStream<Uint8Array, MoqtMessage> {
-  return defaultCodec.createStreamDecoder();
-}
+export const DRAFT_VERSION = 0xff000007n
+
+export type { DecodeErrorCode, DecodeResult } from '../../core/types.js'
+// Re-export types consumers need
+export { DecodeError } from '../../core/types.js'
+export type { Draft07Codec } from './codec.js'
+export {
+  createDraft07Codec,
+  decodeDatagram,
+  decodeFetchStream,
+  decodeSubgroupStream,
+  encodeDatagram,
+  encodeFetchStream,
+  encodeSubgroupStream,
+} from './codec.js'
+export {
+  MESSAGE_ID_MAP,
+  MESSAGE_TYPE_MAP,
+  MSG_ANNOUNCE,
+  MSG_ANNOUNCE_CANCEL,
+  MSG_ANNOUNCE_ERROR,
+  MSG_ANNOUNCE_OK,
+  MSG_CLIENT_SETUP,
+  MSG_FETCH,
+  MSG_FETCH_CANCEL,
+  MSG_FETCH_ERROR,
+  MSG_FETCH_HEADER,
+  MSG_FETCH_OK,
+  MSG_GOAWAY,
+  MSG_MAX_SUBSCRIBE_ID,
+  MSG_OBJECT_DATAGRAM,
+  MSG_SERVER_SETUP,
+  MSG_STREAM_HEADER_SUBGROUP,
+  MSG_SUBSCRIBE,
+  MSG_SUBSCRIBE_ANNOUNCES,
+  MSG_SUBSCRIBE_ANNOUNCES_ERROR,
+  MSG_SUBSCRIBE_ANNOUNCES_OK,
+  MSG_SUBSCRIBE_DONE,
+  MSG_SUBSCRIBE_ERROR,
+  MSG_SUBSCRIBE_OK,
+  MSG_SUBSCRIBE_UPDATE,
+  MSG_TRACK_STATUS,
+  MSG_TRACK_STATUS_REQUEST,
+  MSG_UNANNOUNCE,
+  MSG_UNSUBSCRIBE,
+  MSG_UNSUBSCRIBE_ANNOUNCES,
+  PARAM_AUTHORIZATION_INFO,
+  PARAM_DELIVERY_TIMEOUT,
+  PARAM_MAX_CACHE_DURATION,
+  SETUP_PARAM_MAX_SUBSCRIBE_ID,
+  SETUP_PARAM_PATH,
+  SETUP_PARAM_ROLE,
+} from './messages.js'
+export {
+  CLIENT_ONLY_MESSAGES,
+  CONTROL_MESSAGES,
+  DATA_MESSAGES,
+  getLegalIncoming,
+  getLegalOutgoing,
+  SERVER_ONLY_MESSAGES,
+} from './rules.js'
+export type {
+  Announce,
+  AnnounceCancel,
+  AnnounceError,
+  AnnounceOk,
+  ClientSetup,
+  DatagramObject as Draft07DatagramObject,
+  DataStreamEvent,
+  DataStreamHeader,
+  Draft07DataStream,
+  Draft07Message,
+  Draft07MessageType,
+  Draft07Params,
+  Draft07SetupParams,
+  Fetch,
+  FetchCancel,
+  FetchError,
+  FetchObjectPayload,
+  FetchOk,
+  FetchStream,
+  FetchStreamHeader,
+  GoAway,
+  MaxSubscribeId,
+  ObjectDatagram,
+  ObjectPayload,
+  ServerSetup,
+  StreamHeaderSubgroup,
+  SubgroupStream,
+  SubgroupStreamHeader,
+  Subscribe,
+  SubscribeAnnounces,
+  SubscribeAnnouncesError,
+  SubscribeAnnouncesOk,
+  SubscribeDone,
+  SubscribeError,
+  SubscribeOk,
+  SubscribeUpdate,
+  TrackStatus,
+  TrackStatusRequest,
+  Unannounce,
+  UnknownParam,
+  Unsubscribe,
+  UnsubscribeAnnounces,
+} from './types.js'
+export { decodeVarInt, encodeVarInt } from './varint.js'
+
+import type { DecodeResult } from '../../core/types.js'
+import { createDraft07Codec } from './codec.js'
+import type { Draft07Message } from './types.js'
+
+const defaultCodec = createDraft07Codec()
+
+export function encodeMessage(message: Draft07Message): Uint8Array {
+  return defaultCodec.encodeMessage(message)
+}
+
+export function decodeMessage(bytes: Uint8Array): DecodeResult<Draft07Message> {
+  return defaultCodec.decodeMessage(bytes)
+}
+
+export function createStreamDecoder(): TransformStream<Uint8Array, Draft07Message> {
+  return defaultCodec.createStreamDecoder()
+}