@moqtap/codec 0.2.0 → 0.2.1

package/src/drafts/draft07/rules.ts

@@ -1,104 +1,101 @@
-import type { MoqtMessageType } from "../../core/types.js";
-
-export const CONTROL_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
-  "client_setup",
-  "server_setup",
-  "subscribe",
-  "subscribe_ok",
-  "subscribe_error",
-  "subscribe_done",
-  "subscribe_update",
-  "unsubscribe",
-  "announce",
-  "announce_ok",
-  "announce_error",
-  "announce_cancel",
-  "unannounce",
-  "track_status_request",
-  "track_status",
-  "goaway",
-  "subscribe_announces",
-  "subscribe_announces_ok",
-  "subscribe_announces_error",
-  "unsubscribe_announces",
-  "max_subscribe_id",
-  "fetch",
-  "fetch_ok",
-  "fetch_error",
-  "fetch_cancel",
-]);
-
-export const DATA_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
-  "object_stream",
-  "object_datagram",
-  "stream_header_track",
-  "stream_header_group",
-  "stream_header_subgroup",
-]);
-
-// Messages that only a client can send
-export const CLIENT_ONLY_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
-  "client_setup",
-  "subscribe",
-  "subscribe_update",
-  "unsubscribe",
-  "announce",
-  "unannounce",
-  "subscribe_announces",
-  "unsubscribe_announces",
-  "fetch",
-  "fetch_cancel",
-  "track_status_request",
-]);
-
-// Messages that only a server can send
-export const SERVER_ONLY_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
-  "server_setup",
-  "subscribe_ok",
-  "subscribe_error",
-  "subscribe_done",
-  "announce_ok",
-  "announce_error",
-  "announce_cancel",
-  "subscribe_announces_ok",
-  "subscribe_announces_error",
-  "max_subscribe_id",
-  "fetch_ok",
-  "fetch_error",
-  "track_status",
-  "goaway",
-]);
-
-// Messages legal in each session phase -- for outbound validation
-export function getLegalOutgoing(phase: string, role: "client" | "server"): Set<MoqtMessageType> {
-  const legal = new Set<MoqtMessageType>();
-
-  switch (phase) {
-    case "idle":
-      if (role === "client") legal.add("client_setup");
-      break;
-    case "setup":
-      if (role === "server") legal.add("server_setup");
-      break;
-    case "ready": {
-      const roleMessages = role === "client" ? CLIENT_ONLY_MESSAGES : SERVER_ONLY_MESSAGES;
-      for (const msg of roleMessages) {
-        if (msg !== "client_setup" && msg !== "server_setup") {
-          legal.add(msg);
-        }
-      }
-      break;
-    }
-    case "draining":
-      // Limited set during draining - can still finish active operations
-      break;
-  }
-
-  return legal;
-}
-
-export function getLegalIncoming(phase: string, role: "client" | "server"): Set<MoqtMessageType> {
-  // Incoming from remote = the other role's outgoing
-  const remoteRole = role === "client" ? "server" : "client";
-  return getLegalOutgoing(phase, remoteRole);
-}
+import type { MoqtMessageType } from "../../core/types.js";
+
+export const CONTROL_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
+  "client_setup",
+  "server_setup",
+  "subscribe",
+  "subscribe_ok",
+  "subscribe_error",
+  "subscribe_done",
+  "subscribe_update",
+  "unsubscribe",
+  "announce",
+  "announce_ok",
+  "announce_error",
+  "announce_cancel",
+  "unannounce",
+  "track_status_request",
+  "track_status",
+  "goaway",
+  "subscribe_announces",
+  "subscribe_announces_ok",
+  "subscribe_announces_error",
+  "unsubscribe_announces",
+  "max_subscribe_id",
+  "fetch",
+  "fetch_ok",
+  "fetch_error",
+  "fetch_cancel",
+]);
+
+export const DATA_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
+  "object_datagram",
+  "stream_header_subgroup",
+]);
+
+// Messages that only a client can send
+export const CLIENT_ONLY_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
+  "client_setup",
+  "subscribe",
+  "subscribe_update",
+  "unsubscribe",
+  "announce",
+  "unannounce",
+  "subscribe_announces",
+  "unsubscribe_announces",
+  "fetch",
+  "fetch_cancel",
+  "track_status_request",
+]);
+
+// Messages that only a server can send
+export const SERVER_ONLY_MESSAGES: ReadonlySet<MoqtMessageType> = new Set([
+  "server_setup",
+  "subscribe_ok",
+  "subscribe_error",
+  "subscribe_done",
+  "announce_ok",
+  "announce_error",
+  "announce_cancel",
+  "subscribe_announces_ok",
+  "subscribe_announces_error",
+  "max_subscribe_id",
+  "fetch_ok",
+  "fetch_error",
+  "track_status",
+  "goaway",
+]);
+
+// Messages legal in each session phase -- for outbound validation
+export function getLegalOutgoing(phase: string, role: "client" | "server"): Set<MoqtMessageType> {
+  const legal = new Set<MoqtMessageType>();
+
+  switch (phase) {
+    case "idle":
+      if (role === "client") legal.add("client_setup");
+      break;
+    case "setup":
+      if (role === "server") legal.add("server_setup");
+      break;
+    case "ready": {
+      const roleMessages = role === "client" ? CLIENT_ONLY_MESSAGES : SERVER_ONLY_MESSAGES;
+      for (const msg of roleMessages) {
+        if (msg !== "client_setup" && msg !== "server_setup") {
+          legal.add(msg);
+        }
+      }
+      break;
+    }
+    case "draining":
+      // Limited set during draining - can still finish active operations
+      break;
+  }
+
+  return legal;
+}
+
+export function getLegalIncoming(phase: string, role: "client" | "server"): Set<MoqtMessageType> {
+  // Incoming from remote = the other role's outgoing
+  const remoteRole = role === "client" ? "server" : "client";
+  return getLegalOutgoing(phase, remoteRole);
+}

package/src/drafts/draft07/types.ts

@@ -0,0 +1,72 @@
+// Draft-07 data stream types
+// Matches the API pattern of draft-08+ data stream types
+
+export interface ObjectPayload {
+  readonly type: "object";
+  readonly objectId: bigint;
+  readonly payloadLength: number;
+  readonly status?: bigint;
+  readonly payload: Uint8Array;
+  readonly byteOffset: number;
+  readonly payloadByteOffset: number;
+}
+
+export interface SubgroupStream {
+  readonly type: "subgroup";
+  readonly streamTypeId: 0x04;
+  readonly trackAlias: bigint;
+  readonly groupId: bigint;
+  readonly subgroupId: bigint;
+  readonly publisherPriority: number;
+  readonly objects: ObjectPayload[];
+}
+
+export interface DatagramObject {
+  readonly type: "datagram";
+  readonly streamTypeId: 0x01;
+  readonly trackAlias: bigint;
+  readonly groupId: bigint;
+  readonly objectId: bigint;
+  readonly publisherPriority: number;
+  readonly payloadLength: number;
+  readonly status?: bigint;
+  readonly payload: Uint8Array;
+}
+
+export interface FetchObjectPayload {
+  readonly type: "object";
+  readonly groupId: bigint;
+  readonly subgroupId: bigint;
+  readonly objectId: bigint;
+  readonly publisherPriority: number;
+  readonly payloadLength: number;
+  readonly status?: bigint;
+  readonly payload: Uint8Array;
+  readonly byteOffset: number;
+  readonly payloadByteOffset: number;
+}
+
+export interface FetchStream {
+  readonly type: "fetch";
+  readonly subscribeId: bigint;
+  readonly objects: FetchObjectPayload[];
+}
+
+export type Draft07DataStream = SubgroupStream | DatagramObject | FetchStream;
+
+// Streaming data stream decoder types
+export interface SubgroupStreamHeader {
+  readonly type: "subgroup_header";
+  readonly trackAlias: bigint;
+  readonly groupId: bigint;
+  readonly subgroupId: bigint;
+  readonly publisherPriority: number;
+}
+
+export interface FetchStreamHeader {
+  readonly type: "fetch_header";
+  readonly subscribeId: bigint;
+}
+
+export type DataStreamHeader = SubgroupStreamHeader | FetchStreamHeader;
+export type DataStreamEvent = DataStreamHeader | ObjectPayload;