@moqtap/codec 0.2.2 → 0.3.0

package/src/drafts/draft16/index.ts

@@ -1,4 +1,6 @@
-export type { Draft16Codec } from "./codec.js";
+export const DRAFT_VERSION = 0xff000010n
+
+export type { Draft16Codec } from './codec.js'
 export {
   createDataStreamDecoder,
   createDraft16Codec,
@@ -14,7 +16,7 @@ export {
   encodeFetchStream,
   encodeMessage,
   encodeSubgroupStream,
-} from "./codec.js";
+} from './codec.js'
 export {
   MESSAGE_ID_MAP,
   MESSAGE_TYPE_MAP,
@@ -47,7 +49,7 @@ export {
   SETUP_PARAM_MAX_REQUEST_ID,
   SETUP_PARAM_MOQT_IMPLEMENTATION,
   SETUP_PARAM_PATH,
-} from "./messages.js";
+} from './messages.js'
 export {
   BIDIRECTIONAL_MESSAGES,
   CLIENT_ONLY_MESSAGES,
@@ -55,7 +57,7 @@ export {
   getLegalIncoming,
   getLegalOutgoing,
   SERVER_ONLY_MESSAGES,
-} from "./rules.js";
+} from './rules.js'
 export type {
   FetchPhase,
   FetchState,
@@ -65,16 +67,15 @@ export type {
   PublishState,
   SessionPhase,
   SessionState,
-  SessionStateOptions,
   SideEffect,
   SubscriptionPhase,
   SubscriptionState,
   TransitionResult,
   ValidationResult,
-} from "./session.js";
+} from './session.js'
+export { createDraft16SessionState } from './session.js'
 // Session state machine
-export { createDraft16SessionState } from "./session.js";
-export { Draft16SessionFSM } from "./session-fsm.js";
+export { Draft16SessionFSM } from './session-fsm.js'
 export type {
   DatagramObject,
   DataStreamEvent,
@@ -120,4 +121,4 @@ export type {
   SubgroupStreamHeader,
   SubscriptionFilter,
   UnknownParam,
-} from "./types.js";
+} from './types.js'

package/src/drafts/draft16/messages.ts

@@ -1,67 +1,68 @@
 // Draft-16 message type wire IDs
 
-export const MSG_REQUEST_UPDATE = 0x02n; // renamed from SUBSCRIBE_UPDATE
-export const MSG_SUBSCRIBE = 0x03n;
-export const MSG_SUBSCRIBE_OK = 0x04n;
-export const MSG_REQUEST_ERROR = 0x05n;
-export const MSG_PUBLISH_NAMESPACE = 0x06n;
-export const MSG_REQUEST_OK = 0x07n;
-export const MSG_NAMESPACE = 0x08n; // new in draft-16
-export const MSG_PUBLISH_NAMESPACE_DONE = 0x09n;
-export const MSG_UNSUBSCRIBE = 0x0an;
-export const MSG_PUBLISH_DONE = 0x0bn;
-export const MSG_PUBLISH_NAMESPACE_CANCEL = 0x0cn;
-export const MSG_TRACK_STATUS = 0x0dn;
-export const MSG_NAMESPACE_DONE = 0x0en; // new in draft-16
-export const MSG_GOAWAY = 0x10n;
-export const MSG_SUBSCRIBE_NAMESPACE = 0x11n;
+export const MSG_REQUEST_UPDATE = 0x02n // renamed from SUBSCRIBE_UPDATE
+export const MSG_SUBSCRIBE = 0x03n
+export const MSG_SUBSCRIBE_OK = 0x04n
+export const MSG_REQUEST_ERROR = 0x05n
+export const MSG_PUBLISH_NAMESPACE = 0x06n
+export const MSG_REQUEST_OK = 0x07n
+export const MSG_NAMESPACE = 0x08n // new in draft-16
+export const MSG_PUBLISH_NAMESPACE_DONE = 0x09n
+export const MSG_UNSUBSCRIBE = 0x0an
+export const MSG_PUBLISH_DONE = 0x0bn
+export const MSG_PUBLISH_NAMESPACE_CANCEL = 0x0cn
+export const MSG_TRACK_STATUS = 0x0dn
+export const MSG_NAMESPACE_DONE = 0x0en // new in draft-16
+export const MSG_GOAWAY = 0x10n
+export const MSG_SUBSCRIBE_NAMESPACE = 0x11n
 // 0x14 (UNSUBSCRIBE_NAMESPACE) removed in draft-16
-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_REQUESTS_BLOCKED = 0x1an;
-export const MSG_PUBLISH = 0x1dn;
-export const MSG_PUBLISH_OK = 0x1en;
-export const MSG_CLIENT_SETUP = 0x20n;
-export const MSG_SERVER_SETUP = 0x21n;
+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_REQUESTS_BLOCKED = 0x1an
+export const MSG_PUBLISH = 0x1dn
+export const MSG_PUBLISH_OK = 0x1en
+export const MSG_CLIENT_SETUP = 0x20n
+export const MSG_SERVER_SETUP = 0x21n
 
 // Setup parameter type IDs
-export const SETUP_PARAM_PATH = 0x01n;
-export const SETUP_PARAM_MAX_REQUEST_ID = 0x02n;
-export const SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE = 0x04n;
-export const SETUP_PARAM_AUTHORITY = 0x05n;
-export const SETUP_PARAM_MOQT_IMPLEMENTATION = 0x07n;
+export const SETUP_PARAM_PATH = 0x01n
+export const SETUP_PARAM_MAX_REQUEST_ID = 0x02n
+export const SETUP_PARAM_AUTHORIZATION_TOKEN = 0x03n
+export const SETUP_PARAM_MAX_AUTH_TOKEN_CACHE_SIZE = 0x04n
+export const SETUP_PARAM_AUTHORITY = 0x05n
+export const SETUP_PARAM_MOQT_IMPLEMENTATION = 0x07n
 
 // 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_REQUEST_UPDATE, "request_update"],
-  [MSG_UNSUBSCRIBE, "unsubscribe"],
-  [MSG_PUBLISH, "publish"],
-  [MSG_PUBLISH_OK, "publish_ok"],
-  [MSG_PUBLISH_DONE, "publish_done"],
-  [MSG_PUBLISH_NAMESPACE, "publish_namespace"],
-  [MSG_PUBLISH_NAMESPACE_DONE, "publish_namespace_done"],
-  [MSG_PUBLISH_NAMESPACE_CANCEL, "publish_namespace_cancel"],
-  [MSG_SUBSCRIBE_NAMESPACE, "subscribe_namespace"],
-  [MSG_NAMESPACE, "namespace"],
-  [MSG_NAMESPACE_DONE, "namespace_done"],
-  [MSG_FETCH, "fetch"],
-  [MSG_FETCH_OK, "fetch_ok"],
-  [MSG_FETCH_CANCEL, "fetch_cancel"],
-  [MSG_TRACK_STATUS, "track_status"],
-  [MSG_REQUEST_OK, "request_ok"],
-  [MSG_REQUEST_ERROR, "request_error"],
-  [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_REQUEST_UPDATE, 'request_update'],
+  [MSG_UNSUBSCRIBE, 'unsubscribe'],
+  [MSG_PUBLISH, 'publish'],
+  [MSG_PUBLISH_OK, 'publish_ok'],
+  [MSG_PUBLISH_DONE, 'publish_done'],
+  [MSG_PUBLISH_NAMESPACE, 'publish_namespace'],
+  [MSG_PUBLISH_NAMESPACE_DONE, 'publish_namespace_done'],
+  [MSG_PUBLISH_NAMESPACE_CANCEL, 'publish_namespace_cancel'],
+  [MSG_SUBSCRIBE_NAMESPACE, 'subscribe_namespace'],
+  [MSG_NAMESPACE, 'namespace'],
+  [MSG_NAMESPACE_DONE, 'namespace_done'],
+  [MSG_FETCH, 'fetch'],
+  [MSG_FETCH_OK, 'fetch_ok'],
+  [MSG_FETCH_CANCEL, 'fetch_cancel'],
+  [MSG_TRACK_STATUS, 'track_status'],
+  [MSG_REQUEST_OK, 'request_ok'],
+  [MSG_REQUEST_ERROR, 'request_error'],
+  [MSG_GOAWAY, 'goaway'],
+  [MSG_MAX_REQUEST_ID, 'max_request_id'],
+  [MSG_REQUESTS_BLOCKED, 'requests_blocked'],
+])
 
 // Reverse map from message type name to wire ID
 export const MESSAGE_ID_MAP: ReadonlyMap<string, bigint> = new Map(
   [...MESSAGE_TYPE_MAP.entries()].map(([id, name]) => [name, id]),
-);
+)

package/src/drafts/draft16/rules.ts

@@ -1,96 +1,96 @@
-import type { Draft16MessageType } from "./types.js";
+import type { Draft16MessageType } from './types.js'
 
 // All draft-16 control messages
 export const CONTROL_MESSAGES: ReadonlySet<Draft16MessageType> = new Set([
-  "client_setup",
-  "server_setup",
-  "subscribe",
-  "subscribe_ok",
-  "request_update",
-  "unsubscribe",
-  "publish",
-  "publish_ok",
-  "publish_done",
-  "publish_namespace",
-  "publish_namespace_done",
-  "publish_namespace_cancel",
-  "subscribe_namespace",
-  "namespace",
-  "namespace_done",
-  "fetch",
-  "fetch_ok",
-  "fetch_cancel",
-  "track_status",
-  "request_ok",
-  "request_error",
-  "goaway",
-  "max_request_id",
-  "requests_blocked",
-]);
+  'client_setup',
+  'server_setup',
+  'subscribe',
+  'subscribe_ok',
+  'request_update',
+  'unsubscribe',
+  'publish',
+  'publish_ok',
+  'publish_done',
+  'publish_namespace',
+  'publish_namespace_done',
+  'publish_namespace_cancel',
+  'subscribe_namespace',
+  'namespace',
+  'namespace_done',
+  'fetch',
+  'fetch_ok',
+  'fetch_cancel',
+  'track_status',
+  'request_ok',
+  'request_error',
+  'goaway',
+  'max_request_id',
+  'requests_blocked',
+])
 
 // Draft-16 is symmetric: only setup messages are role-restricted.
-export const CLIENT_ONLY_MESSAGES: ReadonlySet<Draft16MessageType> = new Set(["client_setup"]);
+export const CLIENT_ONLY_MESSAGES: ReadonlySet<Draft16MessageType> = new Set(['client_setup'])
 
-export const SERVER_ONLY_MESSAGES: ReadonlySet<Draft16MessageType> = new Set(["server_setup"]);
+export const SERVER_ONLY_MESSAGES: ReadonlySet<Draft16MessageType> = new Set(['server_setup'])
 
 // Messages that are bidirectional (both client and server can send)
 export const BIDIRECTIONAL_MESSAGES: ReadonlySet<Draft16MessageType> = new Set([
-  "subscribe",
-  "subscribe_ok",
-  "request_update",
-  "unsubscribe",
-  "publish",
-  "publish_ok",
-  "publish_done",
-  "publish_namespace",
-  "publish_namespace_done",
-  "publish_namespace_cancel",
-  "subscribe_namespace",
-  "namespace",
-  "namespace_done",
-  "fetch",
-  "fetch_ok",
-  "fetch_cancel",
-  "track_status",
-  "request_ok",
-  "request_error",
-  "goaway",
-  "max_request_id",
-  "requests_blocked",
-]);
+  'subscribe',
+  'subscribe_ok',
+  'request_update',
+  'unsubscribe',
+  'publish',
+  'publish_ok',
+  'publish_done',
+  'publish_namespace',
+  'publish_namespace_done',
+  'publish_namespace_cancel',
+  'subscribe_namespace',
+  'namespace',
+  'namespace_done',
+  'fetch',
+  'fetch_ok',
+  'fetch_cancel',
+  'track_status',
+  'request_ok',
+  'request_error',
+  'goaway',
+  'max_request_id',
+  'requests_blocked',
+])
 
 // Messages legal in each session phase -- for outbound validation
 export function getLegalOutgoing(
   phase: string,
-  role: "client" | "server",
+  role: 'client' | 'server',
 ): Set<Draft16MessageType> {
-  const legal = new Set<Draft16MessageType>();
+  const legal = new Set<Draft16MessageType>()
 
   switch (phase) {
-    case "idle":
-      if (role === "client") legal.add("client_setup");
-      break;
-    case "setup":
-      if (role === "server") legal.add("server_setup");
-      break;
-    case "ready": {
-      legal.add("goaway");
+    case 'idle':
+      if (role === 'client') legal.add('client_setup')
+      break
+    case 'setup':
+      if (role === 'server') legal.add('server_setup')
+      break
+    case 'ready': {
+      legal.add('goaway')
       for (const msg of BIDIRECTIONAL_MESSAGES) {
-        legal.add(msg);
+        legal.add(msg)
       }
-      break;
+      break
     }
-    case "draining":
-      break;
+    case 'draining':
+      break
   }
 
-  return legal;
+  return legal
 }
 
 export function getLegalIncoming(
   phase: string,
-  role: "client" | "server",
+  role: 'client' | 'server',
 ): Set<Draft16MessageType> {
-  const remoteRole = role === "client" ? "server" : "client";
-  return getLegalOutgoing(phase, remoteRole);
+  const remoteRole = role === 'client' ? 'server' : 'client'
+  return getLegalOutgoing(phase, remoteRole)
 }