@moqtap/codec 0.2.2 → 0.3.0

package/src/index.ts

@@ -5,118 +5,65 @@
  * `createCodec()` factory which requires an explicit draft version.
  *
  * For direct access to a specific draft, use subpath imports:
- *   import { createDraft07Codec } from '@moqtap/codec/draft7';
- *   import { createDraft14Codec } from '@moqtap/codec/draft14';
+ *   import { createDraft17Codec } from '@moqtap/codec/draft17';
  *
  * A default (versionless) codec will be available once the MoQT
  * specification reaches RFC status. Until then, always specify a draft.
  */
 
-import type { Codec, CodecOptions, Draft } from "./core/types.js";
-import { createDraft07Codec } from "./drafts/draft07/codec.js";
-import type { Draft08Codec } from "./drafts/draft08/codec.js";
-import { createDraft08Codec } from "./drafts/draft08/codec.js";
-import type { Draft09Codec } from "./drafts/draft09/codec.js";
-import { createDraft09Codec } from "./drafts/draft09/codec.js";
-import type { Draft10Codec } from "./drafts/draft10/codec.js";
-import { createDraft10Codec } from "./drafts/draft10/codec.js";
-import type { Draft11Codec } from "./drafts/draft11/codec.js";
-import { createDraft11Codec } from "./drafts/draft11/codec.js";
-import type { Draft12Codec } from "./drafts/draft12/codec.js";
-import { createDraft12Codec } from "./drafts/draft12/codec.js";
-import type { Draft13Codec } from "./drafts/draft13/codec.js";
-import { createDraft13Codec } from "./drafts/draft13/codec.js";
-import type { Draft14Codec } from "./drafts/draft14/codec.js";
-import { createDraft14Codec } from "./drafts/draft14/codec.js";
-import type { Draft15Codec } from "./drafts/draft15/codec.js";
-import { createDraft15Codec } from "./drafts/draft15/codec.js";
-import type { Draft16Codec } from "./drafts/draft16/codec.js";
-import { createDraft16Codec } from "./drafts/draft16/codec.js";
-import type { Draft17Codec } from "./drafts/draft17/codec.js";
-import { createDraft17Codec } from "./drafts/draft17/codec.js";
+import type { CodecOptions } from './core/types.js'
+import type { Draft07Codec } from './drafts/draft07/codec.js'
+import { createDraft07Codec } from './drafts/draft07/codec.js'
+import type { Draft08Codec } from './drafts/draft08/codec.js'
+import { createDraft08Codec } from './drafts/draft08/codec.js'
+import type { Draft09Codec } from './drafts/draft09/codec.js'
+import { createDraft09Codec } from './drafts/draft09/codec.js'
+import type { Draft10Codec } from './drafts/draft10/codec.js'
+import { createDraft10Codec } from './drafts/draft10/codec.js'
+import type { Draft11Codec } from './drafts/draft11/codec.js'
+import { createDraft11Codec } from './drafts/draft11/codec.js'
+import type { Draft12Codec } from './drafts/draft12/codec.js'
+import { createDraft12Codec } from './drafts/draft12/codec.js'
+import type { Draft13Codec } from './drafts/draft13/codec.js'
+import { createDraft13Codec } from './drafts/draft13/codec.js'
+import type { Draft14Codec } from './drafts/draft14/codec.js'
+import { createDraft14Codec } from './drafts/draft14/codec.js'
+import type { Draft15Codec } from './drafts/draft15/codec.js'
+import { createDraft15Codec } from './drafts/draft15/codec.js'
+import type { Draft16Codec } from './drafts/draft16/codec.js'
+import { createDraft16Codec } from './drafts/draft16/codec.js'
+import type { Draft17Codec } from './drafts/draft17/codec.js'
+import { createDraft17Codec } from './drafts/draft17/codec.js'
 
-const DRAFT_ALIASES: Record<string, Draft> = {
-  "07": "draft-ietf-moq-transport-07",
-  "draft-ietf-moq-transport-07": "draft-ietf-moq-transport-07",
-  "08": "draft-ietf-moq-transport-08",
-  "draft-ietf-moq-transport-08": "draft-ietf-moq-transport-08",
-  "09": "draft-ietf-moq-transport-09",
-  "draft-ietf-moq-transport-09": "draft-ietf-moq-transport-09",
-  "10": "draft-ietf-moq-transport-10",
-  "draft-ietf-moq-transport-10": "draft-ietf-moq-transport-10",
-  "11": "draft-ietf-moq-transport-11",
-  "draft-ietf-moq-transport-11": "draft-ietf-moq-transport-11",
-  "12": "draft-ietf-moq-transport-12",
-  "draft-ietf-moq-transport-12": "draft-ietf-moq-transport-12",
-  "13": "draft-ietf-moq-transport-13",
-  "draft-ietf-moq-transport-13": "draft-ietf-moq-transport-13",
-  "14": "draft-ietf-moq-transport-14",
-  "draft-ietf-moq-transport-14": "draft-ietf-moq-transport-14",
-  "15": "draft-ietf-moq-transport-15",
-  "draft-ietf-moq-transport-15": "draft-ietf-moq-transport-15",
-  "16": "draft-ietf-moq-transport-16",
-  "draft-ietf-moq-transport-16": "draft-ietf-moq-transport-16",
-  "17": "draft-ietf-moq-transport-17",
-  "draft-ietf-moq-transport-17": "draft-ietf-moq-transport-17",
-};
-
-/**
- * Create a codec for draft-07 (returns full Codec with stream decoder).
- */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-07" | "07" },
-): Codec;
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-08" | "08" },
-): Draft08Codec;
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-09" | "09" },
-): Draft09Codec;
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-10" | "10" },
-): Draft10Codec;
-/**
- * Create a codec for draft-11 (returns Draft11Codec with data stream support).
- */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-11" | "11" },
-): Draft11Codec;
-/**
- * Create a codec for draft-12 (returns Draft12Codec with data stream support).
- */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-12" | "12" },
-): Draft12Codec;
 /**
- * Create a codec for draft-13 (returns Draft13Codec with data stream support).
+ * Wire version numbers for each MoQT draft, keyed by short aliases.
  */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-13" | "13" },
-): Draft13Codec;
-/**
- * Create a codec for draft-14 (returns Draft14Codec with data stream support).
- */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-14" | "14" },
-): Draft14Codec;
-/**
- * Create a codec for draft-15 (returns Draft15Codec with data stream support).
- */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-15" | "15" },
-): Draft15Codec;
-/**
- * Create a codec for draft-16 (returns Draft16Codec with data stream support).
- */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-16" | "16" },
-): Draft16Codec;
-/**
- * Create a codec for draft-17 (returns Draft17Codec with data stream support).
- */
-export function createCodec(
-  options: CodecOptions & { draft: "draft-ietf-moq-transport-17" | "17" },
-): Draft17Codec;
+export const DRAFT_VERSIONS: Record<string, bigint> = {
+  '07': 0xff000007n,
+  '08': 0xff000008n,
+  '09': 0xff000009n,
+  '10': 0xff00000an,
+  '11': 0xff00000bn,
+  '12': 0xff00000cn,
+  '13': 0xff00000dn,
+  '14': 0xff00000en,
+  '15': 0xff00000fn,
+  '16': 0xff000010n,
+  '17': 0xff000011n,
+}
+
+export function createCodec(options: CodecOptions & { draft: '07' }): Draft07Codec
+export function createCodec(options: CodecOptions & { draft: '08' }): Draft08Codec
+export function createCodec(options: CodecOptions & { draft: '09' }): Draft09Codec
+export function createCodec(options: CodecOptions & { draft: '10' }): Draft10Codec
+export function createCodec(options: CodecOptions & { draft: '11' }): Draft11Codec
+export function createCodec(options: CodecOptions & { draft: '12' }): Draft12Codec
+export function createCodec(options: CodecOptions & { draft: '13' }): Draft13Codec
+export function createCodec(options: CodecOptions & { draft: '14' }): Draft14Codec
+export function createCodec(options: CodecOptions & { draft: '15' }): Draft15Codec
+export function createCodec(options: CodecOptions & { draft: '16' }): Draft16Codec
+export function createCodec(options: CodecOptions & { draft: '17' }): Draft17Codec
+
 /**
  * Create a codec for the specified draft version.
  *
@@ -126,7 +73,7 @@ export function createCodec(
 export function createCodec(
   options: CodecOptions,
 ):
-  | Codec
+  | Draft07Codec
   | Draft08Codec
   | Draft09Codec
   | Draft10Codec
@@ -136,11 +83,11 @@ export function createCodec(
   | Draft14Codec
   | Draft15Codec
   | Draft16Codec
-  | Draft17Codec;
+  | Draft17Codec
 export function createCodec(
   options: CodecOptions,
 ):
-  | Codec
+  | Draft07Codec
   | Draft08Codec
   | Draft09Codec
   | Draft10Codec
@@ -151,185 +98,49 @@ export function createCodec(
   | Draft15Codec
   | Draft16Codec
   | Draft17Codec {
-  const draft = DRAFT_ALIASES[options.draft];
+  const draft = DRAFT_VERSIONS[options.draft]
   if (!draft) {
     throw new Error(
       `Unsupported draft: "${options.draft}". ` +
-        `Use a draft-scoped import instead:\n` +
-        `  import { createDraft07Codec } from '@moqtap/codec/draft7'\n` +
-        `  import { createDraft08Codec } from '@moqtap/codec/draft8'\n` +
-        `  import { createDraft09Codec } from '@moqtap/codec/draft9'\n` +
-        `  import { createDraft10Codec } from '@moqtap/codec/draft10'\n` +
-        `  import { createDraft11Codec } from '@moqtap/codec/draft11'\n` +
-        `  import { createDraft12Codec } from '@moqtap/codec/draft12'\n` +
-        `  import { createDraft13Codec } from '@moqtap/codec/draft13'\n` +
-        `  import { createDraft14Codec } from '@moqtap/codec/draft14'\n` +
-        `  import { createDraft15Codec } from '@moqtap/codec/draft15'\n` +
-        `  import { createDraft16Codec } from '@moqtap/codec/draft16'\n` +
-        `  import { createDraft17Codec } from '@moqtap/codec/draft17'\n` +
-        `Supported draft values: ${Object.keys(DRAFT_ALIASES).join(", ")}`,
-    );
+        `Use a draft-scoped import instead.\n` +
+        `Supported draft values: ${Object.keys(DRAFT_VERSIONS).join(', ')}`,
+    )
   }
 
-  switch (draft) {
-    case "draft-ietf-moq-transport-07":
-      return createDraft07Codec();
-    case "draft-ietf-moq-transport-08":
-      return createDraft08Codec();
-    case "draft-ietf-moq-transport-09":
-      return createDraft09Codec();
-    case "draft-ietf-moq-transport-10":
-      return createDraft10Codec();
-    case "draft-ietf-moq-transport-11":
-      return createDraft11Codec();
-    case "draft-ietf-moq-transport-12":
-      return createDraft12Codec();
-    case "draft-ietf-moq-transport-13":
-      return createDraft13Codec();
-    case "draft-ietf-moq-transport-14":
-      return createDraft14Codec();
-    case "draft-ietf-moq-transport-15":
-      return createDraft15Codec();
-    case "draft-ietf-moq-transport-16":
-      return createDraft16Codec();
-    case "draft-ietf-moq-transport-17":
-      return createDraft17Codec();
+  switch (options.draft) {
+    case '07':
+      return createDraft07Codec()
+    case '08':
+      return createDraft08Codec()
+    case '09':
+      return createDraft09Codec()
+    case '10':
+      return createDraft10Codec()
+    case '11':
+      return createDraft11Codec()
+    case '12':
+      return createDraft12Codec()
+    case '13':
+      return createDraft13Codec()
+    case '14':
+      return createDraft14Codec()
+    case '15':
+      return createDraft15Codec()
+    case '16':
+      return createDraft16Codec()
+    case '17':
+      return createDraft17Codec()
     default:
-      throw new Error(`Unsupported draft: ${draft}`);
+      throw new Error(`Unsupported draft: ${draft}`)
   }
 }
 
-// Re-export shared types
 export type {
-  Announce,
-  AnnounceCancel,
-  AnnounceError,
-  AnnounceOk,
   BaseCodec,
-  ClientSetup,
-  Codec,
   CodecOptions,
   DecodeErrorCode,
   DecodeResult,
   Draft,
-  DraftShorthand,
-  Fetch,
-  FetchCancel,
-  FetchError,
-  FetchOk,
-  FilterType,
-  GoAway,
-  GroupOrderValue,
-  MaxSubscribeId,
-  MoqtMessage,
-  MoqtMessageType,
-  ObjectDatagram,
-  ObjectStream,
-  ServerSetup,
-  StreamHeaderGroup,
-  StreamHeaderSubgroup,
-  StreamHeaderTrack,
-  Subscribe,
-  SubscribeAnnounces,
-  SubscribeAnnouncesError,
-  SubscribeAnnouncesOk,
-  SubscribeDone,
-  SubscribeError,
-  SubscribeOk,
-  SubscribeUpdate,
-  TrackStatus,
-  TrackStatusRequest,
-  Unannounce,
-  Unsubscribe,
-  UnsubscribeAnnounces,
-} from "./core/types.js";
-export { DecodeError } from "./core/types.js";
-
-// Re-export draft-08 types
-export type { Draft08Codec } from "./drafts/draft08/codec.js";
-export type {
-  Draft08DataStream,
-  Draft08Message,
-  Draft08Params,
-  Draft08SetupParams,
-} from "./drafts/draft08/types.js";
-
-// Re-export draft-09 types
-export type { Draft09Codec } from "./drafts/draft09/codec.js";
-export type {
-  Draft09DataStream,
-  Draft09Message,
-  Draft09Params,
-  Draft09SetupParams,
-} from "./drafts/draft09/types.js";
-
-// Re-export draft-10 types
-export type { Draft10Codec } from "./drafts/draft10/codec.js";
-export type {
-  Draft10DataStream,
-  Draft10Message,
-  Draft10Params,
-  Draft10SetupParams,
-} from "./drafts/draft10/types.js";
-
-// Re-export draft-11 types
-export type { Draft11Codec } from "./drafts/draft11/codec.js";
-export type {
-  Draft11DataStream,
-  Draft11Message,
-  Draft11Params,
-  Draft11SetupParams,
-} from "./drafts/draft11/types.js";
-
-// Re-export draft-12 types
-export type { Draft12Codec } from "./drafts/draft12/codec.js";
-export type {
-  Draft12DataStream,
-  Draft12Message,
-  Draft12Params,
-  Draft12SetupParams,
-} from "./drafts/draft12/types.js";
-
-// Re-export draft-13 types
-export type { Draft13Codec } from "./drafts/draft13/codec.js";
-export type {
-  Draft13DataStream,
-  Draft13Message,
-  Draft13Params,
-  Draft13SetupParams,
-} from "./drafts/draft13/types.js";
-
-// Re-export draft-14 types
-export type { Draft14Codec } from "./drafts/draft14/codec.js";
-export type {
-  Draft14DataStream,
-  Draft14Message,
-  Draft14Params,
-} from "./drafts/draft14/types.js";
-
-// Re-export draft-15 types
-export type { Draft15Codec } from "./drafts/draft15/codec.js";
-export type {
-  Draft15DataStream,
-  Draft15Message,
-  Draft15Params,
-  Draft15SetupParams,
-} from "./drafts/draft15/types.js";
-
-// Re-export draft-16 types
-export type { Draft16Codec } from "./drafts/draft16/codec.js";
-export type {
-  Draft16DataStream,
-  Draft16Message,
-  Draft16Params,
-  Draft16SetupParams,
-} from "./drafts/draft16/types.js";
-
-// Re-export draft-17 types
-export type { Draft17Codec } from "./drafts/draft17/codec.js";
-export type {
-  Draft17DataStream,
-  Draft17Message,
-  Draft17Params,
-  Draft17SetupOptions,
-} from "./drafts/draft17/types.js";
+} from './core/types.js'
+// Re-export shared types
+export { DecodeError } from './core/types.js'

package/src/session.ts

@@ -7,34 +7,73 @@
  *   import { createDraft14SessionState } from '@moqtap/codec/draft14/session';
  */
 
-import type { SessionState, SessionStateOptions } from "./core/session-types.js";
-import { createDraft07SessionState } from "./drafts/draft07/session.js";
-import { createDraft14SessionState } from "./drafts/draft14/session.js";
+import type { SessionState, SessionStateOptions } from './core/session-types.js'
+import type { Draft } from './core/types.js'
+import { createDraft07SessionState } from './drafts/draft07/session.js'
+import type { Draft07Message, Draft07MessageType } from './drafts/draft07/types.js'
+import { createDraft08SessionState } from './drafts/draft08/session.js'
+import type { Draft08Message, Draft08MessageType } from './drafts/draft08/types.js'
+import { createDraft09SessionState } from './drafts/draft09/session.js'
+import type { Draft09Message, Draft09MessageType } from './drafts/draft09/types.js'
+import { createDraft10SessionState } from './drafts/draft10/session.js'
+import type { Draft10Message, Draft10MessageType } from './drafts/draft10/types.js'
+import { createDraft11SessionState } from './drafts/draft11/session.js'
+import type { Draft11Message, Draft11MessageType } from './drafts/draft11/types.js'
+import { createDraft12SessionState } from './drafts/draft12/session.js'
+import type { Draft12Message, Draft12MessageType } from './drafts/draft12/types.js'
+import { createDraft13SessionState } from './drafts/draft13/session.js'
+import type { Draft13Message, Draft13MessageType } from './drafts/draft13/types.js'
+import { createDraft14SessionState } from './drafts/draft14/session.js'
+import type { Draft14Message, Draft14MessageType } from './drafts/draft14/types.js'
+import { createDraft15SessionState } from './drafts/draft15/session.js'
+import type { Draft15Message, Draft15MessageType } from './drafts/draft15/types.js'
+import { createDraft16SessionState } from './drafts/draft16/session.js'
+import type { Draft16Message, Draft16MessageType } from './drafts/draft16/types.js'
+import { createDraft17SessionState } from './drafts/draft17/session.js'
+import type { Draft17Message, Draft17MessageType } from './drafts/draft17/types.js'
+
+type DraftSessionStateMap = {
+  '07': SessionState<Draft07Message, Draft07MessageType>
+  '08': SessionState<Draft08Message, Draft08MessageType>
+  '09': SessionState<Draft09Message, Draft09MessageType>
+  '10': SessionState<Draft10Message, Draft10MessageType>
+  '11': SessionState<Draft11Message, Draft11MessageType>
+  '12': SessionState<Draft12Message, Draft12MessageType>
+  '13': SessionState<Draft13Message, Draft13MessageType>
+  '14': SessionState<Draft14Message, Draft14MessageType>
+  '15': SessionState<Draft15Message, Draft15MessageType>
+  '16': SessionState<Draft16Message, Draft16MessageType>
+  '17': SessionState<Draft17Message, Draft17MessageType>
+}
 
 /**
  * Create a session state machine for the given draft version.
- *
- * For type-safe access with draft-specific message types, use the
- * draft-scoped factory functions directly:
- *   import { createDraft07SessionState } from '@moqtap/codec/draft7/session';
- *   import { createDraft14SessionState } from '@moqtap/codec/draft14/session';
  */
-export function createSessionState(options: SessionStateOptions): SessionState<unknown, string> {
-  const draft = options.codec.draft;
+export function createSessionState<T extends Draft>(
+  options: SessionStateOptions<T>,
+): DraftSessionStateMap[T] {
+  const draft = options.codec.draft
+
+  const factories: Record<Draft, (role: 'client' | 'server') => DraftSessionStateMap[Draft]> = {
+    '07': createDraft07SessionState,
+    '08': createDraft08SessionState,
+    '09': createDraft09SessionState,
+    '10': createDraft10SessionState,
+    '11': createDraft11SessionState,
+    '12': createDraft12SessionState,
+    '13': createDraft13SessionState,
+    '14': createDraft14SessionState,
+    '15': createDraft15SessionState,
+    '16': createDraft16SessionState,
+    '17': createDraft17SessionState,
+  }
 
-  switch (draft) {
-    case "draft-ietf-moq-transport-07":
-      return createDraft07SessionState(options);
-    case "draft-ietf-moq-transport-14":
-      return createDraft14SessionState(options) as SessionState<unknown, string>;
-    default:
-      throw new Error(
-        `Unsupported draft for session: "${draft}". ` +
-          `Use a draft-scoped import instead:\n` +
-          `  import { createDraft07SessionState } from '@moqtap/codec/draft7/session'\n` +
-          `  import { createDraft14SessionState } from '@moqtap/codec/draft14/session'`,
-      );
+  const factory = factories[draft]
+  if (!factory) {
+    throw new Error(`Unsupported draft for session: "${draft}". Use a draft-scoped import instead.`)
   }
+
+  return factory(options.role) as DraftSessionStateMap[T]
 }
 
 // Re-export all session types
@@ -55,4 +94,4 @@ export type {
   SubscriptionState,
   TransitionResult,
   ValidationResult,
-} from "./core/session-types.js";
+} from './core/session-types.js'