@moqtap/codec 0.6.0 → 0.8.0

package/dist/index.cjs

@@ -1,45 +1,93 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
 
-var _chunkA33U4WVScjs = require('./chunk-A33U4WVS.cjs');
+var _chunkKTVN4P6Jcjs = require('./chunk-KTVN4P6J.cjs');
 
 
-var _chunkMSG2FXJ2cjs = require('./chunk-MSG2FXJ2.cjs');
+var _chunkMH7537FBcjs = require('./chunk-MH7537FB.cjs');
 
 
-var _chunkJTRU76JNcjs = require('./chunk-JTRU76JN.cjs');
+var _chunkBQHLUT37cjs = require('./chunk-BQHLUT37.cjs');
 
 
-var _chunkWMJVSBBEcjs = require('./chunk-WMJVSBBE.cjs');
+var _chunkJ3ASFPCXcjs = require('./chunk-J3ASFPCX.cjs');
 
 
-var _chunkBAG6YWCPcjs = require('./chunk-BAG6YWCP.cjs');
+var _chunkIEJULBKBcjs = require('./chunk-IEJULBKB.cjs');
 
 
-var _chunkOGZTQA24cjs = require('./chunk-OGZTQA24.cjs');
+var _chunkEQAYMCXOcjs = require('./chunk-EQAYMCXO.cjs');
 
 
-var _chunkPKEOQSSZcjs = require('./chunk-PKEOQSSZ.cjs');
+var _chunkRIIA4ALQcjs = require('./chunk-RIIA4ALQ.cjs');
 
 
-var _chunkHO44OANKcjs = require('./chunk-HO44OANK.cjs');
+var _chunkQGIHC6BAcjs = require('./chunk-QGIHC6BA.cjs');
 
 
-var _chunkJB5VDJ2Vcjs = require('./chunk-JB5VDJ2V.cjs');
+var _chunkB56AG5HUcjs = require('./chunk-B56AG5HU.cjs');
 
 
-var _chunkSIYYMFCCcjs = require('./chunk-SIYYMFCC.cjs');
+var _chunkKCH4BQXKcjs = require('./chunk-KCH4BQXK.cjs');
 
 
-var _chunkHZHSO7EWcjs = require('./chunk-HZHSO7EW.cjs');
+var _chunkIDV2JYJ6cjs = require('./chunk-IDV2JYJ6.cjs');
 
 
-var _chunkXZE5R57Rcjs = require('./chunk-XZE5R57R.cjs');
+var _chunkVZHL2U2Ncjs = require('./chunk-VZHL2U2N.cjs');
 
 
-var _chunk4HBKHNU2cjs = require('./chunk-4HBKHNU2.cjs');
+var _chunkCZNW3R5Ecjs = require('./chunk-CZNW3R5E.cjs');
 
 
-var _chunkJL3NEW3Ocjs = require('./chunk-JL3NEW3O.cjs');
+var _chunk4XLYCT5Qcjs = require('./chunk-4XLYCT5Q.cjs');
+
+// src/core/accessors.ts
+function pick(msg, names) {
+  for (const name of names) {
+    const value = msg[name];
+    if (value != null) return value;
+  }
+  return void 0;
+}
+function bigintOf(value) {
+  if (value == null) return void 0;
+  if (typeof value === "bigint") return value;
+  if (typeof value === "number" || typeof value === "string") {
+    try {
+      return BigInt(value);
+    } catch (e) {
+      return void 0;
+    }
+  }
+  return void 0;
+}
+function requestIdOf(msg) {
+  return bigintOf(pick(msg, ["request_id", "requestId", "subscribe_id", "subscribeId"]));
+}
+function trackAliasOf(msg) {
+  return bigintOf(pick(msg, ["track_alias", "trackAlias"]));
+}
+function trackOf(msg) {
+  const source = _nullishCoalesce(pick(msg, ["standalone"]), () => ( msg));
+  const name = pick(source, ["track_name", "trackName"]);
+  if (typeof name !== "string") return void 0;
+  const namespace = pick(source, ["track_namespace", "trackNamespace"]);
+  return {
+    namespace: Array.isArray(namespace) ? namespace.map(String) : [],
+    name
+  };
+}
+function joiningRequestIdOf(msg) {
+  const source = _nullishCoalesce(pick(msg, ["joining"]), () => ( msg));
+  return bigintOf(
+    pick(source, [
+      "joining_request_id",
+      "joiningRequestId",
+      "joining_subscribe_id",
+      "joiningSubscribeId"
+    ])
+  );
+}
 
 // src/index.ts
 var DRAFT_VERSIONS = {
@@ -67,31 +115,31 @@ Supported draft values: ${Object.keys(DRAFT_VERSIONS).join(", ")}`
   }
   switch (options.draft) {
     case "07":
-      return _chunkHZHSO7EWcjs.createDraft07Codec.call(void 0, );
+      return _chunkIDV2JYJ6cjs.createDraft07Codec.call(void 0, );
     case "08":
-      return _chunkXZE5R57Rcjs.createDraft08Codec.call(void 0, );
+      return _chunkVZHL2U2Ncjs.createDraft08Codec.call(void 0, );
     case "09":
-      return _chunk4HBKHNU2cjs.createDraft09Codec.call(void 0, );
+      return _chunkCZNW3R5Ecjs.createDraft09Codec.call(void 0, );
     case "10":
-      return _chunkPKEOQSSZcjs.createDraft10Codec.call(void 0, );
+      return _chunkRIIA4ALQcjs.createDraft10Codec.call(void 0, );
     case "11":
-      return _chunkHO44OANKcjs.createDraft11Codec.call(void 0, );
+      return _chunkQGIHC6BAcjs.createDraft11Codec.call(void 0, );
     case "12":
-      return _chunkJB5VDJ2Vcjs.createDraft12Codec.call(void 0, );
+      return _chunkB56AG5HUcjs.createDraft12Codec.call(void 0, );
     case "13":
-      return _chunkSIYYMFCCcjs.createDraft13Codec.call(void 0, );
+      return _chunkKCH4BQXKcjs.createDraft13Codec.call(void 0, );
     case "14":
-      return _chunkJTRU76JNcjs.createDraft14Codec.call(void 0, );
+      return _chunkBQHLUT37cjs.createDraft14Codec.call(void 0, );
     case "15":
-      return _chunkWMJVSBBEcjs.createDraft15Codec.call(void 0, );
+      return _chunkJ3ASFPCXcjs.createDraft15Codec.call(void 0, );
     case "16":
-      return _chunkBAG6YWCPcjs.createDraft16Codec.call(void 0, );
+      return _chunkIEJULBKBcjs.createDraft16Codec.call(void 0, );
     case "17":
-      return _chunkOGZTQA24cjs.createDraft17Codec.call(void 0, );
+      return _chunkEQAYMCXOcjs.createDraft17Codec.call(void 0, );
     case "18":
-      return _chunkA33U4WVScjs.createDraft18Codec.call(void 0, );
+      return _chunkKTVN4P6Jcjs.createDraft18Codec.call(void 0, );
     case "19":
-      return _chunkMSG2FXJ2cjs.createDraft19Codec.call(void 0, );
+      return _chunkMH7537FBcjs.createDraft19Codec.call(void 0, );
     default:
       throw new Error(`Unsupported draft: ${draft}`);
   }
@@ -100,4 +148,8 @@ Supported draft values: ${Object.keys(DRAFT_VERSIONS).join(", ")}`
 
 
 
-exports.DRAFT_VERSIONS = DRAFT_VERSIONS; exports.DecodeError = _chunkJL3NEW3Ocjs.DecodeError; exports.createCodec = createCodec;
+
+
+
+
+exports.DRAFT_VERSIONS = DRAFT_VERSIONS; exports.DecodeError = _chunk4XLYCT5Qcjs.DecodeError; exports.createCodec = createCodec; exports.joiningRequestIdOf = joiningRequestIdOf; exports.requestIdOf = requestIdOf; exports.trackAliasOf = trackAliasOf; exports.trackOf = trackOf;

package/dist/index.d.cts

@@ -7,7 +7,7 @@ import { D as Draft10Codec } from './codec-BOyrk_C9.cjs';
 import { D as Draft11Codec } from './codec-cou9XBMF.cjs';
 import { D as Draft12Codec } from './codec-BOtv3R5j.cjs';
 import { D as Draft13Codec } from './codec-hvkJfCF5.cjs';
-import { D as Draft14Codec } from './codec-B1snaM9L.cjs';
+import { D as Draft14Codec } from './codec-BnamSx7L.cjs';
 import { D as Draft15Codec } from './codec-BqqoYdh_.cjs';
 import { D as Draft16Codec } from './codec-CyApDKwf.cjs';
 import { D as Draft17Codec } from './codec-NMsTK0GX.cjs';
@@ -20,13 +20,83 @@ import './types-0IWbU9Z_.cjs';
 import './types-Ck45Ex5S.cjs';
 import './types-Bio-91Rt.cjs';
 import './types-CXlSn0I9.cjs';
-import './types-DjmrHp_s.cjs';
+import './types-CVeKIk7A.cjs';
 import './types-CPaYBsMG.cjs';
 import './types-Cm9fjeYC.cjs';
 import './types-D9eiB_9A.cjs';
 import './types-Cqp10JtB.cjs';
 import './types-zHgCS6o5.cjs';
 
+/**
+ * Draft-agnostic readers for decoded control messages.
+ *
+ * The codec keeps one message model per draft, because the drafts genuinely
+ * disagree: a track alias travels in SUBSCRIBE through draft-11 and in
+ * SUBSCRIBE_OK from draft-12; a request was a `subscribe_id` through draft-10
+ * and a `request_id` after it; a joining FETCH points at a
+ * `joining_subscribe_id` through draft-13 and a `joining_request_id` after it.
+ * Faithfulness to each draft is the point of the codec.
+ *
+ * What consumers usually want is the answer, not the archaeology — and every
+ * one of them that has asked has written the same field-spelling ladder by
+ * hand. These accessors are that ladder, written once.
+ *
+ * Each returns `undefined` when the message does not carry the field, which
+ * includes the cases where the draft has not assigned it yet: `trackAliasOf`
+ * on a draft-14 SUBSCRIBE is `undefined` because the publisher has not chosen
+ * the alias until SUBSCRIBE_OK.
+ *
+ * Both snake_case (what this codec emits) and camelCase spellings are read, so
+ * these also work on messages recovered from qlog-style traces written by
+ * other tools.
+ */
+/** Any decoded control message, from any draft. */
+type AnyMessage = Readonly<Record<string, unknown>>;
+/** A track's full identity: the namespace tuple plus the name within it. */
+interface TrackIdentity {
+    readonly namespace: string[];
+    readonly name: string;
+}
+/**
+ * The request this message belongs to.
+ *
+ * Named `subscribe_id` through draft-10 and `request_id` from draft-11, when
+ * the id space widened to cover every request type rather than subscriptions
+ * alone.
+ *
+ * Returns `undefined` for draft-17+ responses, which carry no id at all: each
+ * request there has its own bidirectional stream, and that stream — not a
+ * field — is what ties a response to its request.
+ */
+declare function requestIdOf(msg: AnyMessage): bigint | undefined;
+/**
+ * The track alias this message assigns or refers to, if any.
+ *
+ * Which message carries it moved: SUBSCRIBE through draft-11, then SUBSCRIBE_OK
+ * from draft-12, when assigning the alias became the publisher's job. PUBLISH
+ * carries it alongside the track name in every draft that has PUBLISH.
+ */
+declare function trackAliasOf(msg: AnyMessage): bigint | undefined;
+/**
+ * The track this message names, or `undefined` if it names none.
+ *
+ * Covers SUBSCRIBE, PUBLISH, TRACK_STATUS and a standalone FETCH — whose track
+ * sits under `standalone` in most drafts and flat in draft-07, which predates
+ * joining fetch. A joining FETCH names no track of its own; use
+ * {@link joiningRequestIdOf} to find the request whose track it continues.
+ *
+ * PUBLISH_NAMESPACE and its relatives are namespace-only and yield
+ * `undefined`: a namespace is not a track.
+ */
+declare function trackOf(msg: AnyMessage): TrackIdentity | undefined;
+/**
+ * For a joining FETCH, the request whose track it continues.
+ *
+ * Spelled `joining_subscribe_id` through draft-13 and `joining_request_id`
+ * after it, nested under `joining` in every draft that has one.
+ */
+declare function joiningRequestIdOf(msg: AnyMessage): bigint | undefined;
+
 /**
  * @moqtap/codec — MoQT wire-format codec
  *
@@ -91,4 +161,4 @@ declare function createCodec(options: CodecOptions & {
  */
 declare function createCodec(options: CodecOptions): Draft07Codec | Draft08Codec | Draft09Codec | Draft10Codec | Draft11Codec | Draft12Codec | Draft13Codec | Draft14Codec | Draft15Codec | Draft16Codec | Draft17Codec | Draft18Codec | Draft19Codec;
 
-export { CodecOptions, DRAFT_VERSIONS, createCodec };
+export { type AnyMessage, CodecOptions, DRAFT_VERSIONS, type TrackIdentity, createCodec, joiningRequestIdOf, requestIdOf, trackAliasOf, trackOf };

package/dist/index.d.ts

@@ -7,7 +7,7 @@ import { D as Draft10Codec } from './codec-BLYAy2OP.js';
 import { D as Draft11Codec } from './codec-DL0njGkL.js';
 import { D as Draft12Codec } from './codec-D47r_-Rl.js';
 import { D as Draft13Codec } from './codec-CWj5iTxA.js';
-import { D as Draft14Codec } from './codec-D49OofBr.js';
+import { D as Draft14Codec } from './codec-CFhUGTu2.js';
 import { D as Draft15Codec } from './codec-BNS3gS77.js';
 import { D as Draft16Codec } from './codec-D2JbI2tp.js';
 import { D as Draft17Codec } from './codec-DJmV04i0.js';
@@ -20,13 +20,83 @@ import './types-0IWbU9Z_.js';
 import './types-Ck45Ex5S.js';
 import './types-Bio-91Rt.js';
 import './types-CXlSn0I9.js';
-import './types-DjmrHp_s.js';
+import './types-CVeKIk7A.js';
 import './types-CPaYBsMG.js';
 import './types-Cm9fjeYC.js';
 import './types-D9eiB_9A.js';
 import './types-Cqp10JtB.js';
 import './types-zHgCS6o5.js';
 
+/**
+ * Draft-agnostic readers for decoded control messages.
+ *
+ * The codec keeps one message model per draft, because the drafts genuinely
+ * disagree: a track alias travels in SUBSCRIBE through draft-11 and in
+ * SUBSCRIBE_OK from draft-12; a request was a `subscribe_id` through draft-10
+ * and a `request_id` after it; a joining FETCH points at a
+ * `joining_subscribe_id` through draft-13 and a `joining_request_id` after it.
+ * Faithfulness to each draft is the point of the codec.
+ *
+ * What consumers usually want is the answer, not the archaeology — and every
+ * one of them that has asked has written the same field-spelling ladder by
+ * hand. These accessors are that ladder, written once.
+ *
+ * Each returns `undefined` when the message does not carry the field, which
+ * includes the cases where the draft has not assigned it yet: `trackAliasOf`
+ * on a draft-14 SUBSCRIBE is `undefined` because the publisher has not chosen
+ * the alias until SUBSCRIBE_OK.
+ *
+ * Both snake_case (what this codec emits) and camelCase spellings are read, so
+ * these also work on messages recovered from qlog-style traces written by
+ * other tools.
+ */
+/** Any decoded control message, from any draft. */
+type AnyMessage = Readonly<Record<string, unknown>>;
+/** A track's full identity: the namespace tuple plus the name within it. */
+interface TrackIdentity {
+    readonly namespace: string[];
+    readonly name: string;
+}
+/**
+ * The request this message belongs to.
+ *
+ * Named `subscribe_id` through draft-10 and `request_id` from draft-11, when
+ * the id space widened to cover every request type rather than subscriptions
+ * alone.
+ *
+ * Returns `undefined` for draft-17+ responses, which carry no id at all: each
+ * request there has its own bidirectional stream, and that stream — not a
+ * field — is what ties a response to its request.
+ */
+declare function requestIdOf(msg: AnyMessage): bigint | undefined;
+/**
+ * The track alias this message assigns or refers to, if any.
+ *
+ * Which message carries it moved: SUBSCRIBE through draft-11, then SUBSCRIBE_OK
+ * from draft-12, when assigning the alias became the publisher's job. PUBLISH
+ * carries it alongside the track name in every draft that has PUBLISH.
+ */
+declare function trackAliasOf(msg: AnyMessage): bigint | undefined;
+/**
+ * The track this message names, or `undefined` if it names none.
+ *
+ * Covers SUBSCRIBE, PUBLISH, TRACK_STATUS and a standalone FETCH — whose track
+ * sits under `standalone` in most drafts and flat in draft-07, which predates
+ * joining fetch. A joining FETCH names no track of its own; use
+ * {@link joiningRequestIdOf} to find the request whose track it continues.
+ *
+ * PUBLISH_NAMESPACE and its relatives are namespace-only and yield
+ * `undefined`: a namespace is not a track.
+ */
+declare function trackOf(msg: AnyMessage): TrackIdentity | undefined;
+/**
+ * For a joining FETCH, the request whose track it continues.
+ *
+ * Spelled `joining_subscribe_id` through draft-13 and `joining_request_id`
+ * after it, nested under `joining` in every draft that has one.
+ */
+declare function joiningRequestIdOf(msg: AnyMessage): bigint | undefined;
+
 /**
  * @moqtap/codec — MoQT wire-format codec
  *
@@ -91,4 +161,4 @@ declare function createCodec(options: CodecOptions & {
  */
 declare function createCodec(options: CodecOptions): Draft07Codec | Draft08Codec | Draft09Codec | Draft10Codec | Draft11Codec | Draft12Codec | Draft13Codec | Draft14Codec | Draft15Codec | Draft16Codec | Draft17Codec | Draft18Codec | Draft19Codec;
 
-export { CodecOptions, DRAFT_VERSIONS, createCodec };
+export { type AnyMessage, CodecOptions, DRAFT_VERSIONS, type TrackIdentity, createCodec, joiningRequestIdOf, requestIdOf, trackAliasOf, trackOf };

package/dist/index.js

@@ -1,45 +1,93 @@
 import {
   createDraft18Codec
-} from "./chunk-DLSGOZ6P.js";
+} from "./chunk-5XZKO2U5.js";
 import {
   createDraft19Codec
-} from "./chunk-62LYLROG.js";
+} from "./chunk-APTV6F72.js";
 import {
   createDraft14Codec
-} from "./chunk-Q5D6OW6Q.js";
+} from "./chunk-JJEN2VG5.js";
 import {
   createDraft15Codec
-} from "./chunk-RZ3UML47.js";
+} from "./chunk-MD2OA7SE.js";
 import {
   createDraft16Codec
-} from "./chunk-HYI6LFMD.js";
+} from "./chunk-HEO2JG6C.js";
 import {
   createDraft17Codec
-} from "./chunk-UP4XPH4J.js";
+} from "./chunk-I55J3KXD.js";
 import {
   createDraft10Codec
-} from "./chunk-SHMA4PBY.js";
+} from "./chunk-N2V7Z37J.js";
 import {
   createDraft11Codec
-} from "./chunk-COWGGUL4.js";
+} from "./chunk-JKMYAUGY.js";
 import {
   createDraft12Codec
-} from "./chunk-NZ7GYEMT.js";
+} from "./chunk-KNLPX3YA.js";
 import {
   createDraft13Codec
-} from "./chunk-CXFAQKL3.js";
+} from "./chunk-23KRITJ6.js";
 import {
   createDraft07Codec
-} from "./chunk-7KBAWOBA.js";
+} from "./chunk-KYVTM5VI.js";
 import {
   createDraft08Codec
-} from "./chunk-RW4UG7CN.js";
+} from "./chunk-XHAP2YST.js";
 import {
   createDraft09Codec
-} from "./chunk-Y6KCSM3V.js";
+} from "./chunk-IJAF6PAY.js";
 import {
   DecodeError
-} from "./chunk-VOU7PNHI.js";
+} from "./chunk-KLPWJU6W.js";
+
+// src/core/accessors.ts
+function pick(msg, names) {
+  for (const name of names) {
+    const value = msg[name];
+    if (value != null) return value;
+  }
+  return void 0;
+}
+function bigintOf(value) {
+  if (value == null) return void 0;
+  if (typeof value === "bigint") return value;
+  if (typeof value === "number" || typeof value === "string") {
+    try {
+      return BigInt(value);
+    } catch {
+      return void 0;
+    }
+  }
+  return void 0;
+}
+function requestIdOf(msg) {
+  return bigintOf(pick(msg, ["request_id", "requestId", "subscribe_id", "subscribeId"]));
+}
+function trackAliasOf(msg) {
+  return bigintOf(pick(msg, ["track_alias", "trackAlias"]));
+}
+function trackOf(msg) {
+  const source = pick(msg, ["standalone"]) ?? msg;
+  const name = pick(source, ["track_name", "trackName"]);
+  if (typeof name !== "string") return void 0;
+  const namespace = pick(source, ["track_namespace", "trackNamespace"]);
+  return {
+    namespace: Array.isArray(namespace) ? namespace.map(String) : [],
+    name
+  };
+}
+function joiningRequestIdOf(msg) {
+  const source = pick(msg, ["joining"]) ?? msg;
+  return bigintOf(
+    pick(source, [
+      "joining_request_id",
+      "joiningRequestId",
+      "joining_subscribe_id",
+      "joiningSubscribeId"
+    ])
+  );
+}
 
 // src/index.ts
 var DRAFT_VERSIONS = {
@@ -99,5 +147,9 @@ Supported draft values: ${Object.keys(DRAFT_VERSIONS).join(", ")}`
 export {
   DRAFT_VERSIONS,
   DecodeError,
-  createCodec
+  createCodec,
+  joiningRequestIdOf,
+  requestIdOf,
+  trackAliasOf,
+  trackOf
 };

package/dist/session.d.cts

@@ -8,7 +8,7 @@ import { D as Draft10Message, a as Draft10MessageType } from './types-0IWbU9Z_.c
 import { D as Draft11Message, a as Draft11MessageType } from './types-Ck45Ex5S.cjs';
 import { D as Draft12Message, a as Draft12MessageType } from './types-Bio-91Rt.cjs';
 import { D as Draft13Message, a as Draft13MessageType } from './types-CXlSn0I9.cjs';
-import { D as Draft14Message, a as Draft14MessageType } from './types-DjmrHp_s.cjs';
+import { D as Draft14Message, a as Draft14MessageType } from './types-CVeKIk7A.cjs';
 import { D as Draft15Message, a as Draft15MessageType } from './types-CPaYBsMG.cjs';
 import { D as Draft16Message, a as Draft16MessageType } from './types-Cm9fjeYC.cjs';
 import { D as Draft17Message, a as Draft17MessageType } from './types-D9eiB_9A.cjs';

package/dist/session.d.ts

@@ -8,7 +8,7 @@ import { D as Draft10Message, a as Draft10MessageType } from './types-0IWbU9Z_.j
 import { D as Draft11Message, a as Draft11MessageType } from './types-Ck45Ex5S.js';
 import { D as Draft12Message, a as Draft12MessageType } from './types-Bio-91Rt.js';
 import { D as Draft13Message, a as Draft13MessageType } from './types-CXlSn0I9.js';
-import { D as Draft14Message, a as Draft14MessageType } from './types-DjmrHp_s.js';
+import { D as Draft14Message, a as Draft14MessageType } from './types-CVeKIk7A.js';
 import { D as Draft15Message, a as Draft15MessageType } from './types-CPaYBsMG.js';
 import { D as Draft16Message, a as Draft16MessageType } from './types-Cm9fjeYC.js';
 import { D as Draft17Message, a as Draft17MessageType } from './types-D9eiB_9A.js';

package/dist/{types-DjmrHp_s.d.cts → types-CVeKIk7A.d.cts}

@@ -63,8 +63,8 @@ interface Draft14Subscribe extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_namespace: string[];
     readonly track_name: string;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly forward: bigint;
     readonly filter_type: bigint;
     readonly start_group?: bigint;
@@ -77,7 +77,7 @@ interface Draft14SubscribeOk extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_alias: bigint;
     readonly expires: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly content_exists: bigint;
     readonly largest_location?: Location;
     readonly parameters: Draft14Params;
@@ -89,7 +89,7 @@ interface Draft14SubscribeUpdate extends Draft14BaseMessage {
     readonly start_group: bigint;
     readonly start_object: bigint;
     readonly end_group: bigint;
-    readonly subscriber_priority: bigint;
+    readonly subscriber_priority: number;
     readonly forward: bigint;
     readonly parameters: Draft14Params;
 }
@@ -109,7 +109,7 @@ interface Draft14Publish extends Draft14BaseMessage {
     readonly track_namespace: string[];
     readonly track_name: string;
     readonly track_alias: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly content_exists: bigint;
     readonly largest_location?: Location;
     readonly forward: bigint;
@@ -119,8 +119,8 @@ interface Draft14PublishOk extends Draft14BaseMessage {
     readonly type: 'publish_ok';
     readonly request_id: bigint;
     readonly forward: bigint;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly filter_type: bigint;
     readonly start_group?: bigint;
     readonly start_object?: bigint;
@@ -188,26 +188,34 @@ interface Draft14UnsubscribeNamespace extends Draft14BaseMessage {
     readonly type: 'unsubscribe_namespace';
     readonly track_namespace_prefix: string[];
 }
+interface StandaloneFetch {
+    readonly track_namespace: string[];
+    readonly track_name: string;
+    readonly start_group: bigint;
+    readonly start_object: bigint;
+    readonly end_group: bigint;
+    readonly end_object: bigint;
+}
+interface JoiningFetch {
+    readonly joining_request_id: bigint;
+    readonly joining_start: bigint;
+}
 interface Draft14Fetch extends Draft14BaseMessage {
     readonly type: 'fetch';
     readonly request_id: bigint;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly fetch_type: bigint;
-    readonly track_namespace?: string[];
-    readonly track_name?: string;
-    readonly start_group?: bigint;
-    readonly start_object?: bigint;
-    readonly end_group?: bigint;
-    readonly end_object?: bigint;
-    readonly joining_request_id?: bigint;
-    readonly joining_start?: bigint;
+    /** Present when fetch_type = 1 */
+    readonly standalone?: StandaloneFetch;
+    /** Present when fetch_type = 2 or 3 */
+    readonly joining?: JoiningFetch;
     readonly parameters: Draft14Params;
 }
 interface Draft14FetchOk extends Draft14BaseMessage {
     readonly type: 'fetch_ok';
     readonly request_id: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly end_of_track: bigint;
     readonly end_location: Location;
     readonly parameters: Draft14Params;
@@ -227,8 +235,8 @@ interface Draft14TrackStatus extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_namespace: string[];
     readonly track_name: string;
-    readonly subscriber_priority: bigint;
-    readonly group_order: bigint;
+    readonly subscriber_priority: number;
+    readonly group_order: number;
     readonly forward: bigint;
     readonly filter_type: bigint;
     readonly start_group?: bigint;
@@ -240,7 +248,7 @@ interface Draft14TrackStatusOk extends Draft14BaseMessage {
     readonly request_id: bigint;
     readonly track_alias: bigint;
     readonly expires: bigint;
-    readonly group_order: bigint;
+    readonly group_order: number;
     readonly content_exists: bigint;
     readonly largest_location?: Location;
     readonly parameters: Draft14Params;