@moqtap/codec 0.4.1 → 0.4.3

package/src/drafts/draft14/codec.ts

@@ -78,6 +78,7 @@ function encodeSetupParams(params: Draft14Params, writer: BufferWriter): void {
   if (params.role !== undefined) count++
   if (params.path !== undefined) count++
   if (params.max_request_id !== undefined) count++
+  if (params.authorization_token !== undefined) count++
   if (params.authority !== undefined) count++
   if (params.max_auth_token_cache_size !== undefined) count++
   if (params.moqt_implementation !== undefined) count++
@@ -99,6 +100,24 @@ function encodeSetupParams(params: Draft14Params, writer: BufferWriter): void {
     writer.writeVarInt(PARAM_MAX_REQUEST_ID)
     writer.writeVarInt(params.max_request_id)
   }
+  if (params.authorization_token !== undefined) {
+    writer.writeVarInt(PARAM_AUTHORIZATION_TOKEN)
+    const tok = params.authorization_token
+    const tmpWriter = new BufferWriter(64)
+    tmpWriter.writeVarInt(tok.alias_type)
+    if (tok.token_type !== undefined) {
+      tmpWriter.writeVarInt(tok.token_type)
+    }
+    if (tok.token_value !== undefined) {
+      tmpWriter.writeBytes(tok.token_value)
+    }
+    if (tok.token_alias !== undefined) {
+      tmpWriter.writeVarInt(tok.token_alias)
+    }
+    const tokenBytes = tmpWriter.finish()
+    writer.writeVarInt(tokenBytes.byteLength)
+    writer.writeBytes(tokenBytes)
+  }
   if (params.max_auth_token_cache_size !== undefined) {
     writer.writeVarInt(PARAM_MAX_AUTH_TOKEN_CACHE_SIZE)
     writer.writeVarInt(params.max_auth_token_cache_size)
@@ -157,6 +176,18 @@ function decodeSetupParams(reader: BufferReader): Draft14Params {
       const bytes = reader.readBytes(length)
       if (paramType === PARAM_PATH) {
         result.path = textDecoder.decode(bytes)
+      } else if (paramType === PARAM_AUTHORIZATION_TOKEN) {
+        const tokenReader = new BufferReader(bytes)
+        const alias_type = tokenReader.readVarInt()
+        const tok: Record<string, unknown> = { alias_type }
+        if (tokenReader.remaining > 0) {
+          tok.token_type = tokenReader.readVarInt()
+          if (tokenReader.remaining > 0) {
+            const tokenValue = tokenReader.readBytesView(tokenReader.remaining)
+            tok.token_value = new Uint8Array(tokenValue)
+          }
+        }
+        result.authorization_token = tok as unknown as AuthorizationToken
       } else if (paramType === PARAM_AUTHORITY) {
         result.authority = textDecoder.decode(bytes)
       } else if (paramType === PARAM_MOQT_IMPLEMENTATION) {
@@ -197,7 +228,7 @@ function encodeMessageParams(params: Draft14Params, writer: BufferWriter): void
       tmpWriter.writeVarInt(tok.token_type)
     }
     if (tok.token_value !== undefined) {
-      tmpWriter.writeBytes(hexToBytes(tok.token_value))
+      tmpWriter.writeBytes(tok.token_value)
     }
     if (tok.token_alias !== undefined) {
       tmpWriter.writeVarInt(tok.token_alias)
@@ -256,7 +287,7 @@ function decodeMessageParams(reader: BufferReader): Draft14Params {
           tok.token_type = tokenReader.readVarInt()
           if (tokenReader.remaining > 0) {
             const tokenValue = tokenReader.readBytesView(tokenReader.remaining)
-            tok.token_value = bytesToHex(tokenValue)
+            tok.token_value = new Uint8Array(tokenValue)
           }
         }
         result.authorization_token = tok as unknown as AuthorizationToken

package/src/drafts/draft14/types.ts

@@ -33,7 +33,7 @@ export interface UnknownParam {
 export interface AuthorizationToken {
   readonly alias_type: bigint
   readonly token_type?: bigint
-  readonly token_value?: string // raw hex
+  readonly token_value?: Uint8Array
   readonly token_alias?: bigint
 }
 

package/src/drafts/draft15/codec.ts

@@ -203,8 +203,7 @@ function encodeAuthorizationToken(token: AuthorizationToken, w: BufferWriter): v
   if (aliasType === 1 || aliasType === 3) {
     w.writeVarInt(token.token_type!)
     // token_value is the remaining bytes (no inner length prefix)
-    const tokenBytes = hexToBytes(token.token_value_hex!)
-    w.writeBytes(tokenBytes)
+    w.writeBytes(token.token_value!)
   }
 }
 
@@ -218,8 +217,7 @@ function decodeAuthorizationToken(r: BufferReader): AuthorizationToken {
   if (aliasType === 1 || aliasType === 3) {
     result.token_type = r.readVarInt()
     // token_value is the remaining bytes in the length-prefixed block
-    const tokenBytes = r.readBytesView(r.remaining)
-    result.token_value_hex = bytesToHex(tokenBytes)
+    result.token_value = r.readBytes(r.remaining)
   }
   return result as unknown as AuthorizationToken
 }

package/src/drafts/draft15/types.ts

@@ -13,7 +13,7 @@ export interface AuthorizationToken {
   readonly alias_type: bigint
   readonly token_alias?: bigint // present when alias_type = 0 or 1
   readonly token_type?: bigint // present when alias_type = 1 or 3
-  readonly token_value_hex?: string // present when alias_type = 1 or 3
+  readonly token_value?: Uint8Array // present when alias_type = 1 or 3
 }
 
 // Setup parameters (constant namespace across versions)

package/src/drafts/draft16/codec.ts

@@ -200,8 +200,7 @@ function encodeAuthorizationToken(token: AuthorizationToken, w: BufferWriter): v
   }
   if (aliasType === 1 || aliasType === 3) {
     w.writeVarInt(token.token_type!)
-    const tokenBytes = hexToBytes(token.token_value_hex!)
-    w.writeBytes(tokenBytes)
+    w.writeBytes(token.token_value!)
   }
 }
 
@@ -215,7 +214,7 @@ function decodeAuthorizationToken(r: BufferReader): AuthorizationToken {
   if (aliasType === 1 || aliasType === 3) {
     result.token_type = r.readVarInt()
     const tokenBytes = r.readBytesView(r.remaining)
-    result.token_value_hex = bytesToHex(tokenBytes)
+    result.token_value = new Uint8Array(tokenBytes)
   }
   return result as unknown as AuthorizationToken
 }

package/src/drafts/draft16/types.ts

@@ -13,7 +13,7 @@ export interface AuthorizationToken {
   readonly alias_type: bigint
   readonly token_alias?: bigint
   readonly token_type?: bigint
-  readonly token_value_hex?: string
+  readonly token_value?: Uint8Array
 }
 
 // Setup parameters (constant namespace across versions)

package/src/drafts/draft17/codec.ts

@@ -199,9 +199,9 @@ function encodeAuthorizationToken(token: AuthorizationToken, w: BufferWriter): v
   if (aliasType === 1 || aliasType === 3) {
     // REGISTER, USE_VALUE: token_type + token_value present
     w.writeVarInt(token.token_type ?? 0n)
-    const encoded = textEncoder.encode(token.token_value ?? '')
-    w.writeVarInt(BigInt(encoded.byteLength))
-    w.writeBytes(encoded)
+    const tv = token.token_value ?? new Uint8Array(0)
+    w.writeVarInt(BigInt(tv.byteLength))
+    w.writeBytes(tv)
   }
 }
 
@@ -217,7 +217,7 @@ function decodeAuthorizationToken(r: BufferReader): AuthorizationToken {
     ;(result as { token_type: bigint }).token_type = r.readVarInt()
     const len = Number(r.readVarInt())
     const bytes = r.readBytes(len)
-    ;(result as { token_value: string }).token_value = textDecoder.decode(bytes)
+    ;(result as { token_value: Uint8Array }).token_value = bytes
   }
 
   return result
@@ -464,7 +464,7 @@ function encodeTrackProperties(props: Draft17TrackProperties, writer: BufferWrit
     entries.push({
       type: TPROP_IMMUTABLE_PROPERTIES,
       encode: (w) => {
-        const raw = hexToBytes(props.immutable_properties!)
+        const raw = props.immutable_properties!
         w.writeVarInt(BigInt(raw.byteLength))
         w.writeBytes(raw)
       },
@@ -557,7 +557,7 @@ function decodeTrackProperties(reader: BufferReader, payloadEnd: number): Draft1
       const length = Number(reader.readVarInt())
       const bytes = reader.readBytes(length)
       if (propType === TPROP_IMMUTABLE_PROPERTIES) {
-        result.immutable_properties = bytesToHex(bytes)
+        result.immutable_properties = bytes
       } else {
         unknown.push({
           id: `0x${propType.toString(16)}`,

package/src/drafts/draft17/types.ts

@@ -12,7 +12,7 @@ export interface AuthorizationToken {
   readonly alias_type: bigint // 0=DELETE, 1=REGISTER, 2=USE_ALIAS, 3=USE_VALUE
   readonly token_alias?: bigint // present for DELETE(0), REGISTER(1), USE_ALIAS(2)
   readonly token_type?: bigint // present for REGISTER(1), USE_VALUE(3)
-  readonly token_value?: string // present for REGISTER(1), USE_VALUE(3)
+  readonly token_value?: Uint8Array // present for REGISTER(1), USE_VALUE(3)
 }
 
 // Setup options (KVP encoding, no count prefix)
@@ -58,7 +58,7 @@ export interface Draft17Params {
 export interface Draft17TrackProperties {
   delivery_timeout?: bigint // 0x02 even varint
   max_cache_duration?: bigint // 0x04 even varint
-  immutable_properties?: string // 0x0b odd length-prefixed raw hex
+  immutable_properties?: Uint8Array // 0x0b odd length-prefixed
   default_publisher_priority?: bigint // 0x0c even varint
   default_publisher_group_order?: bigint // 0x22 even varint
   dynamic_groups?: bigint // 0x30 even varint