@basmilius/apple-airplay 0.5.2 → 0.5.4

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024-2025 Bas Milius
+Copyright (c) 2024-present Bas Milius
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/eventStream.d.ts

@@ -1,4 +1,4 @@
-import { type Context } from "@basmilius/apple-common";
+import type { Context } from "@basmilius/apple-common";
 import BaseStream from "./baseStream";
 export default class EventStream extends BaseStream {
 	#private;

package/dist/index.js

@@ -10,9 +10,11 @@ var __export = (target, all) => {
 };
 
 // src/baseStream.ts
-import { Chacha20, ENCRYPTION, EncryptionAwareConnection } from "@basmilius/apple-common";
+import { ENCRYPTION, EncryptionAwareConnection } from "@basmilius/apple-common";
+import { Chacha20 } from "@basmilius/apple-encryption";
 
 // src/utils.ts
+import { uuid } from "@basmilius/apple-common";
 import { Plist } from "@basmilius/apple-encoding";
 import { fromBinary } from "@bufbuild/protobuf";
 
@@ -1488,7 +1490,7 @@ function generateDacpId() {
   return Math.floor(Math.random() * 2 ** 64).toString(16).toUpperCase();
 }
 function generateSessionId() {
-  return Math.floor(Math.random() * 2 ** 32).toString(10);
+  return uuid().toUpperCase();
 }
 function nonce(counter) {
   const nonceArray = new Uint8Array(12);
@@ -1676,25 +1678,22 @@ class ControlStream extends BaseStream {
     this.#resolve = undefined;
     this.#requesting = false;
   }
-  async#request(method, path, body, headers, timeout = HTTP_TIMEOUT) {
+  #request(method, path, body, headers, timeout = HTTP_TIMEOUT) {
     if (this.#requesting) {
       return Promise.reject(new Error("Another request is currently being made."));
     }
     this.#requesting = true;
-    headers["Active-Remote"] = this.activeRemoteId;
-    headers["Client-Instance"] = this.dacpId;
-    headers["DACP-ID"] = this.dacpId;
     const cseq = this.#cseq++;
     let data;
     if (body) {
       headers["Content-Length"] = Buffer.byteLength(body);
       data = Buffer.concat([
-        Buffer.from(RTSP.makeHeader(method, path, headers, cseq)),
+        Buffer.from(RTSP.makeHeader(method, path, headers, cseq, this.#activeRemoteId, this.#dacpId, this.#sessionId)),
         Buffer.from(body)
       ]);
     } else {
       headers["Content-Length"] = 0;
-      data = Buffer.from(RTSP.makeHeader(method, path, headers, cseq));
+      data = Buffer.from(RTSP.makeHeader(method, path, headers, cseq, this.#activeRemoteId, this.#dacpId, this.#sessionId));
     }
     this.context.logger.net("[control]", method, path, `cseq = ${cseq}`);
     if (this.isEncrypted) {
@@ -1745,8 +1744,9 @@ class ControlStream extends BaseStream {
   }
 }
 // src/dataStream.ts
-import { hkdf, randomInt32 } from "@basmilius/apple-common";
+import { randomInt32 } from "@basmilius/apple-common";
 import { Plist as Plist2 } from "@basmilius/apple-encoding";
+import { hkdf } from "@basmilius/apple-encryption";
 import { getExtension, toBinary } from "@bufbuild/protobuf";
 var DATA_HEADER_LENGTH = 32;
 
@@ -1968,8 +1968,8 @@ class DataStream extends BaseStream {
   }
 }
 // src/eventStream.ts
-import { hkdf as hkdf2 } from "@basmilius/apple-common";
 import { Plist as Plist3, RTSP as RTSP2 } from "@basmilius/apple-encoding";
+import { hkdf as hkdf2 } from "@basmilius/apple-encryption";
 class EventStream extends BaseStream {
   #buffer = Buffer.alloc(0);
   constructor(context, address, port) {
@@ -2069,11 +2069,12 @@ class EventStream extends BaseStream {
   }
 }
 // src/protocol.ts
-import { Context, getMacAddress, randomInt64, uuid } from "@basmilius/apple-common";
+import { Context, getMacAddress, randomInt64, uuid as uuid2 } from "@basmilius/apple-common";
 import { Plist as Plist4 } from "@basmilius/apple-encoding";
 
 // src/pairing.ts
-import { AccessoryPair, AccessoryVerify, hkdf as hkdf3 } from "@basmilius/apple-common";
+import { AccessoryPair, AccessoryVerify } from "@basmilius/apple-common";
+import { hkdf as hkdf3 } from "@basmilius/apple-encryption";
 
 class Pairing {
   get controlStream() {
@@ -2207,7 +2208,7 @@ class Protocol {
   constructor(discoveryResult) {
     this.#context = new Context(discoveryResult.id);
     this.#discoveryResult = discoveryResult;
-    this.#sessionUUID = uuid();
+    this.#sessionUUID = uuid2();
     this.#controlStream = new ControlStream(this.#context, discoveryResult.address, discoveryResult.service.port);
     this.#pairing = new Pairing(this);
     this.#verify = new Verify(this);
@@ -2233,9 +2234,9 @@ class Protocol {
     const request = Plist4.serialize({
       streams: [{
         controlType: 2,
-        channelID: uuid().toUpperCase(),
+        channelID: uuid2().toUpperCase(),
         seed,
-        clientUUID: uuid().toUpperCase(),
+        clientUUID: uuid2().toUpperCase(),
         type: 130,
         wantsDedicatedSocket: true,
         clientTypeUUID: "1910A70F-DBC0-4242-AF95-115DB30604E1"
@@ -2265,7 +2266,7 @@ class Protocol {
       osBuildVersion: "18C66",
       osName: "iPhone OS",
       osVersion: "14.3",
-      sourceVersion: "550.10",
+      sourceVersion: "320.20",
       sessionUUID: this.#sessionUUID,
       timingProtocol: "None",
       isRemoteControlOnly: true
@@ -2316,14 +2317,14 @@ __export(exports_dataStreamMessages, {
   configureConnection: () => configureConnection,
   clientUpdatesConfig: () => clientUpdatesConfig
 });
-import { uint16ToBE, uuid as uuid2 } from "@basmilius/apple-common";
+import { uint16ToBE, uuid as uuid3 } from "@basmilius/apple-common";
 import { create, getExtension as _getExtension, setExtension } from "@bufbuild/protobuf";
 function protocol(type, errorCode = 0 /* NoError */) {
   return create(ProtocolMessageSchema, {
     type,
     errorCode,
-    identifier: uuid2().toUpperCase(),
-    uniqueIdentifier: uuid2().toUpperCase()
+    identifier: uuid3().toUpperCase(),
+    uniqueIdentifier: uuid3().toUpperCase()
   });
 }
 function clientUpdatesConfig(artworkUpdates = true, nowPlayingUpdates = true, volumeUpdates = true, keyboardUpdates = false, outputDeviceUpdates = true, systemEndpointUpdates = true) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-airplay",
     "description": "Implementation of Apple's AirPlay2 in Node.js.",
-    "version": "0.5.2",
+    "version": "0.5.4",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -41,13 +41,14 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-common": "0.5.2",
-        "@basmilius/apple-encoding": "0.5.2",
+        "@basmilius/apple-common": "0.5.4",
+        "@basmilius/apple-encoding": "0.5.4",
+        "@basmilius/apple-encryption": "0.5.4",
         "@bufbuild/protobuf": "^2.11.0"
     },
     "devDependencies": {
         "@basmilius/tools": "^2.23.0",
-        "@bufbuild/buf": "^1.64.0",
+        "@bufbuild/buf": "^1.65.0",
         "@bufbuild/protoc-gen-es": "^2.11.0",
         "@types/bun": "^1.3.8"
     }