@basmilius/apple-airplay 0.9.7 → 0.9.9

package/dist/index.d.mts

@@ -10334,6 +10334,7 @@ declare namespace index_d_exports {
 //#endregion
 //#region src/dataStream.d.ts
 type EventMap$1 = {
+  readonly rawMessage: [ProtocolMessage];
   readonly deviceInfo: [DeviceInfoMessage];
   readonly deviceInfoUpdate: [DeviceInfoMessage];
   readonly originClientProperties: [OriginClientPropertiesMessage];
@@ -10358,7 +10359,7 @@ declare class DataStream extends BaseStream<EventMap$1> {
   #private;
   constructor(context: Context, address: string, port: number);
   disconnect(): Promise<void>;
-  exchange(message: ProtocolMessage | [ProtocolMessage, DescExtension]): Promise<ProtocolMessage>;
+  exchange(message: ProtocolMessage | [ProtocolMessage, DescExtension], timeout?: number): Promise<ProtocolMessage>;
   reply(seqno: bigint): void;
   send(message: ProtocolMessage | [ProtocolMessage, DescExtension]): void;
   setup(sharedSecret: Buffer, seed: bigint): void;
@@ -10422,7 +10423,7 @@ declare function getState(): [ProtocolMessage, DescExtension];
 declare function getVolume(outputDeviceUID: string): [ProtocolMessage, DescExtension];
 declare function getVolumeMuted(outputDeviceUID: string): [ProtocolMessage, DescExtension];
 declare function notification(notification: string): [ProtocolMessage, DescExtension];
-declare function playbackQueueRequest(location: number, length: number, includeMetadata?: boolean, includeLanguageOptions?: boolean): [ProtocolMessage, DescExtension];
+declare function playbackQueueRequest(location: number, length: number, artworkWidth?: number, artworkHeight?: number): [ProtocolMessage, DescExtension];
 declare function sendButtonEvent(usagePage: number, usage: number, buttonDown: boolean): [ProtocolMessage, DescExtension];
 declare function sendCommandWithSkipInterval(command: Command, skipInterval: number): [ProtocolMessage, DescExtension];
 declare function sendCommandWithPlaybackPosition(command: Command, playbackPosition: number): [ProtocolMessage, DescExtension];

package/dist/index.mjs

@@ -10625,15 +10625,13 @@ function buildHeader(totalSize, seqno) {
 }
 function buildReply(seqno) {
 	const header = Buffer.allocUnsafe(32);
-	header.writeUInt32BE(0, 0);
+	header.writeUInt32BE(32, 0);
 	header.write("rply", 4, "ascii");
 	header.fill(0, 8, 16);
+	header.fill(0, 16, 20);
 	header.writeBigUInt64BE(seqno, 20);
 	header.writeUInt32BE(0, 28);
-	const plist = Buffer.from(Plist.serialize(Buffer.alloc(0)));
-	const total = header.length + plist.length;
-	header.writeUInt32BE(total, 0);
-	return Buffer.concat([header, plist]);
+	return header;
 }
 function encodeVarint(value) {
 	if (value < 0) throw new RangeError("Varint only supports non-negative integers");
@@ -10869,7 +10867,7 @@ const DATA_HEADER_LENGTH = 32;
 var DataStream = class extends BaseStream {
 	#buffer = Buffer.alloc(0);
 	#seqno;
-	#handler;
+	#outstanding = /* @__PURE__ */ new Map();
 	#handlers = {};
 	constructor(context, address, port) {
 		super(context, address, port);
@@ -10901,13 +10899,24 @@ var DataStream = class extends BaseStream {
 		this.#cleanup();
 		await super.disconnect();
 	}
-	exchange(message) {
+	exchange(message, timeout = 5e3) {
+		let msg = Array.isArray(message) ? message[0] : message;
+		const identifier = msg.identifier || `type_${msg.type}`;
 		return new Promise((resolve, reject) => {
-			this.#handler = [resolve, reject];
+			const timer = setTimeout(() => {
+				this.#outstanding.delete(identifier);
+				reject(/* @__PURE__ */ new Error(`Exchange timed out for ${identifier}`));
+			}, timeout);
+			this.#outstanding.set(identifier, {
+				resolve,
+				reject,
+				timer
+			});
 			try {
 				this.send(message);
 			} catch (err) {
-				this.#handler = void 0;
+				this.#outstanding.delete(identifier);
+				clearTimeout(timer);
 				reject(err);
 			}
 		});
@@ -10952,22 +10961,22 @@ var DataStream = class extends BaseStream {
 	}
 	#cleanup() {
 		this.#buffer = Buffer.alloc(0);
-		if (this.#handler) {
-			const [, reject] = this.#handler;
-			this.#handler = void 0;
-			reject(/* @__PURE__ */ new Error("Connection closed."));
+		for (const [id, req] of this.#outstanding) {
+			clearTimeout(req.timer);
+			req.reject(/* @__PURE__ */ new Error("Connection closed."));
 		}
+		this.#outstanding.clear();
 	}
 	#onClose() {
 		this.#cleanup();
 	}
 	#onError(err) {
 		this.context.logger.error("[data]", "#onError()", err);
-		if (this.#handler) {
-			const [, reject] = this.#handler;
-			this.#handler = void 0;
-			reject(err);
+		for (const [id, req] of this.#outstanding) {
+			clearTimeout(req.timer);
+			req.reject(err);
 		}
+		this.#outstanding.clear();
 	}
 	async #onData(data) {
 		try {
@@ -10989,13 +10998,16 @@ var DataStream = class extends BaseStream {
 				const command = header.toString("ascii", 4, 8);
 				this.#buffer = this.#buffer.subarray(totalLength);
 				if (!plist || !plist.params || !plist.params.data) {
-					if (command === "rply") this.context.logger.raw("[data]", "Received reply packet.");
-					else if (command === "sync") this.reply(parseHeaderSeqno(header));
-					if (this.#handler) {
-						const [resolve] = this.#handler;
-						this.#handler = void 0;
-						resolve();
-					}
+					if (command === "rply") {
+						this.context.logger.raw("[data]", "Received reply packet.");
+						const first = this.#outstanding.entries().next();
+						if (!first.done) {
+							const [id, req] = first.value;
+							this.#outstanding.delete(id);
+							clearTimeout(req.timer);
+							req.resolve(void 0);
+						}
+					} else if (command === "sync") this.reply(parseHeaderSeqno(header));
 					continue;
 				}
 				const content = Buffer.from(plist.params.data);
@@ -11011,10 +11023,13 @@ var DataStream = class extends BaseStream {
 		}
 	}
 	#handleMessage(message) {
-		if (this.#handler) {
-			const [resolve] = this.#handler;
-			this.#handler = void 0;
-			resolve(message);
+		this.emit("rawMessage", message);
+		const identifier = message.identifier || `type_${message.type}`;
+		const outstanding = this.#outstanding.get(identifier);
+		if (outstanding) {
+			this.#outstanding.delete(identifier);
+			clearTimeout(outstanding.timer);
+			outstanding.resolve(message);
 		}
 		if (message.type in this.#handlers) {
 			const [extension, handler] = this.#handlers[message.type];
@@ -11647,15 +11662,16 @@ function notification(notification) {
 	setExtension(protocolMessage, notificationMessage, message);
 	return [protocolMessage, notificationMessage];
 }
-function playbackQueueRequest(location, length, includeMetadata = true, includeLanguageOptions = false) {
+function playbackQueueRequest(location, length, artworkWidth = 600, artworkHeight = -1) {
 	const protocolMessage = protocol(ProtocolMessage_Type.PLAYBACK_QUEUE_REQUEST_MESSAGE);
 	const message = create(PlaybackQueueRequestMessageSchema, {
 		location,
 		length,
-		includeMetadata,
-		includeLanguageOptions,
-		artworkHeight: 600,
-		artworkWidth: 600,
+		artworkWidth,
+		artworkHeight,
+		returnContentItemAssetsInUserCompletion: true,
+		includeMetadata: true,
+		includeLanguageOptions: false,
 		includeInfo: true,
 		includeLyrics: true,
 		includeSections: true,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-airplay",
     "description": "Implementation of Apple's AirPlay2 in Node.js.",
-    "version": "0.9.7",
+    "version": "0.9.9",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -48,9 +48,9 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-common": "0.9.7",
-        "@basmilius/apple-encoding": "0.9.7",
-        "@basmilius/apple-encryption": "0.9.7"
+        "@basmilius/apple-common": "0.9.9",
+        "@basmilius/apple-encoding": "0.9.9",
+        "@basmilius/apple-encryption": "0.9.9"
     },
     "devDependencies": {
         "@bufbuild/buf": "^1.66.0",