@basmilius/apple-airplay 0.9.18 → 0.9.19

package/dist/index.d.mts

@@ -42,6 +42,51 @@ declare class Verify {
   start(credentials: AccessoryCredentials): Promise<AccessoryKeys>;
 }
 //#endregion
+//#region src/audioStream.d.ts
+type AudioStreamContext = {
+  sampleRate: number;
+  channels: number;
+  bytesPerChannel: number;
+  frameSize: number;
+  packetSize: number;
+  rtpSeq: number;
+  rtpTime: number;
+  headTs: number;
+  latency: number;
+  paddingSent: number;
+  totalFrames: number;
+};
+declare class AudioStream {
+  #private;
+  constructor(protocol: Protocol);
+  setup(): Promise<{
+    dataPort: number;
+    controlPort: number;
+  }>;
+  /**
+  * Prepare the audio stream for sending. Connects the UDP data socket,
+  * initializes stream context, sends FLUSH, and starts RTCP sync.
+  */
+  prepare(remoteAddress: string): Promise<AudioStreamContext>;
+  /**
+  * Send pre-read frame data as an RTP packet. Used by AudioMultiplexer
+  * for multi-room streaming where frames are read once and sent to
+  * multiple streams.
+  */
+  sendFrameData(frames: Buffer, firstPacket: boolean): Promise<number>;
+  /**
+  * Send padding frames (silence) after audio ends and TEARDOWN.
+  */
+  finish(): Promise<void>;
+  /**
+  * Stream audio from a source. Convenience method that uses prepare(),
+  * sendFrameData() and finish() internally.
+  */
+  stream(source: AudioSource, remoteAddress: string): Promise<void>;
+  getPacket(seqno: number): Buffer | undefined;
+  close(): void;
+}
+//#endregion
 //#region ../../node_modules/.bun/@bufbuild+protobuf@2.11.0/node_modules/@bufbuild/protobuf/dist/esm/json-value.d.ts
 /**
  * Represents any possible JSON value:
@@ -10341,6 +10386,7 @@ type EventMap$1 = {
   readonly rawMessage: [ProtocolMessage];
   readonly deviceInfo: [DeviceInfoMessage];
   readonly deviceInfoUpdate: [DeviceInfoMessage];
+  readonly keyboard: [KeyboardMessage];
   readonly originClientProperties: [OriginClientPropertiesMessage];
   readonly playerClientProperties: [PlayerClientPropertiesMessage];
   readonly removeClient: [RemoveClientMessage];
@@ -10380,6 +10426,16 @@ declare class EventStream extends BaseStream {
 }
 //#endregion
 //#region src/protocol.d.ts
+type PlaybackInfo = {
+  duration?: number;
+  position?: number;
+  rate?: number;
+  readyToPlay?: boolean;
+  error?: {
+    code: number;
+    domain: string;
+  };
+};
 declare class Protocol {
   #private;
   get context(): Context;
@@ -10400,24 +10456,39 @@ declare class Protocol {
   setupEventStream(sharedSecret: Buffer, pairingId: Buffer): Promise<void>;
   setupEventStreamForAudioStreaming(sharedSecret: Buffer, pairingId: Buffer): Promise<void>;
   playUrl(url: string, sharedSecret: Buffer, pairingId: Buffer, position?: number): Promise<void>;
+  getPlaybackInfo(): Promise<PlaybackInfo | null>;
+  waitForPlaybackEnd(): Promise<void>;
+  stopPlayUrl(): void;
   setupAudioStream(source: AudioSource): Promise<void>;
   useTimingServer(timingServer: TimingServer): void;
 }
 //#endregion
-//#region src/audioStream.d.ts
-declare class AudioStream {
+//#region src/audioMultiplexer.d.ts
+/**
+* Streams audio from a single source to multiple AirPlay devices
+* simultaneously. Each device gets its own AudioStream with independent
+* encryption and RTP state, but they all receive the same audio data
+* with shared timing.
+*/
+declare class AudioMultiplexer {
   #private;
-  constructor(protocol: Protocol);
-  setup(): Promise<{
-    dataPort: number;
-    controlPort: number;
-  }>;
-  stream(source: AudioSource, remoteAddress: string): Promise<void>;
-  getPacket(seqno: number): Buffer | undefined;
-  close(): void;
+  constructor(context: Context);
+  /**
+  * Add a target device to stream to.
+  */
+  addTarget(protocol: Protocol): void;
+  /**
+  * Remove all targets and close their streams.
+  */
+  clear(): void;
+  /**
+  * Stream audio from a source to all targets simultaneously.
+  * Sets up, prepares, and streams to all devices, then tears down.
+  */
+  stream(source: AudioSource): Promise<void>;
 }
 declare namespace dataStreamMessages_d_exports {
-  export { clientUpdatesConfig, configureConnection, deviceInfo, getExtension, getState, getVolume, getVolumeMuted, modifyOutputContext, notification, playbackQueueRequest, protocol, sendButtonEvent, sendCommand, sendCommandWithPlaybackPosition, sendCommandWithPlaybackRate, sendCommandWithRepeatMode, sendCommandWithShuffleMode, sendCommandWithSkipInterval, sendHIDEvent, sendVirtualTouchEvent, setConnectionState, setReadyState, setVolume, setVolumeMuted, wakeDevice };
+  export { clientUpdatesConfig, configureConnection, deviceInfo, getExtension, getKeyboardSession, getState, getVolume, getVolumeMuted, modifyOutputContext, notification, playbackQueueRequest, protocol, sendButtonEvent, sendCommand, sendCommandWithPlaybackPosition, sendCommandWithPlaybackRate, sendCommandWithRepeatMode, sendCommandWithShuffleMode, sendCommandWithSkipInterval, sendHIDEvent, sendVirtualTouchEvent, setConnectionState, setReadyState, setVolume, setVolumeMuted, textInput, wakeDevice };
 }
 declare function protocol(type: ProtocolMessage_Type, errorCode?: ErrorCode_Enum): ProtocolMessage;
 declare function clientUpdatesConfig(artworkUpdates?: boolean, nowPlayingUpdates?: boolean, volumeUpdates?: boolean, keyboardUpdates?: boolean, outputDeviceUpdates?: boolean, systemEndpointUpdates?: boolean): [ProtocolMessage, DescExtension];
@@ -10429,6 +10500,8 @@ declare function getVolume(outputDeviceUID: string): [ProtocolMessage, DescExten
 declare function getVolumeMuted(outputDeviceUID: string): [ProtocolMessage, DescExtension];
 declare function notification(notification: string): [ProtocolMessage, DescExtension];
 declare function playbackQueueRequest(location: number, length: number, artworkWidth?: number, artworkHeight?: number): [ProtocolMessage, DescExtension];
+declare function getKeyboardSession(): [ProtocolMessage, DescExtension];
+declare function textInput(text: string, actionType: ActionType_Enum): [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];
@@ -10445,4 +10518,4 @@ declare function setVolumeMuted(outputDeviceUID: string, isMuted: boolean): [Pro
 declare function wakeDevice(): [ProtocolMessage, DescExtension];
 declare function getExtension<Desc extends DescExtension>(message: Extendee<Desc>, extension: Desc): ExtensionValueShape<Desc>;
 //#endregion
-export { AudioStream, ControlStream, DataStream, dataStreamMessages_d_exports as DataStreamMessage, EventStream, Pairing, index_d_exports as Proto, Protocol, Verify };
+export { AudioMultiplexer, AudioStream, ControlStream, DataStream, dataStreamMessages_d_exports as DataStreamMessage, EventStream, Pairing, type PlaybackInfo, index_d_exports as Proto, Protocol, Verify };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./chunk-DQk6qfdC.mjs";
 import { randomBytes } from "node:crypto";
 import { createSocket } from "node:dgram";
-import { AccessoryPair, AccessoryVerify, Context, EncryptionAwareConnection, EncryptionState, HTTP_TIMEOUT, generateActiveRemoteId, generateDacpId, generateSessionId, getMacAddress, randomInt32, randomInt64, uint16ToBE, uuid } from "@basmilius/apple-common";
+import { AccessoryPair, AccessoryVerify, ConnectionClosedError, Context, EncryptionAwareConnection, EncryptionError, EncryptionState, HTTP_TIMEOUT, PairingError, PlaybackError, SetupError, TimeoutError, generateActiveRemoteId, generateDacpId, generateSessionId, getMacAddress, randomInt32, randomInt64, uint16ToBE, uuid, waitFor } from "@basmilius/apple-common";
 import { NTP, Plist } from "@basmilius/apple-encoding";
 import { Chacha20, hkdf } from "@basmilius/apple-encryption";
 import { RtspClient, buildResponse, parseRequest } from "@basmilius/apple-rtsp";
@@ -14,6 +14,8 @@ const FRAMES_PER_PACKET = 352;
 const LATENCY_FRAMES = 11025;
 const PACKET_BACKLOG_SIZE = 1e3;
 const SYNC_INTERVAL = 1e3;
+const MAX_PACKETS_COMPENSATE$1 = 3;
+const SLOW_WARNING_THRESHOLD$1 = 5;
 const ntpFromTs = (timestamp, sampleRate) => {
 	const seconds = Math.floor(timestamp / sampleRate);
 	const fraction = timestamp % sampleRate * 4294967295 / sampleRate;
@@ -60,7 +62,7 @@ var AudioStream = class {
 			latencyMax: 88200,
 			latencyMin: 11025,
 			shk: shkArrayBuffer,
-			spf: FRAMES_PER_PACKET,
+			spf: 352,
 			sr: SAMPLE_RATE,
 			streamConnectionID,
 			supportsDynamicStreamID: false,
@@ -71,7 +73,7 @@ var AudioStream = class {
 		const response = await this.#protocol.controlStream.setup(`/${this.#protocol.controlStream.sessionId}`, Buffer.from(setupBody), { "Content-Type": "application/x-apple-binary-plist" });
 		if (response.status !== 200) {
 			const text = await response.text();
-			throw new Error(`Failed to setup audio stream: ${response.status} - ${text}`);
+			throw new SetupError(`Failed to setup audio stream: ${response.status} - ${text}`);
 		}
 		const plist = Plist.parse(await response.arrayBuffer());
 		this.#context.logger.debug("[audio]", "Setup stream response:", plist);
@@ -80,7 +82,7 @@ var AudioStream = class {
 			this.#dataPort = streamInfo.dataPort & 65535;
 			this.#remoteControlPort = streamInfo.controlPort & 65535;
 			this.#context.logger.info("[audio]", `Audio stream setup: dataPort=${this.#dataPort}, controlPort=${this.#remoteControlPort}`);
-		} else throw new Error("No stream info in SETUP response");
+		} else throw new SetupError("No stream info in SETUP response.");
 		this.#context.logger.debug("[audio]", "Sending RECORD...");
 		await this.#protocol.controlStream.record(`/${this.#protocol.controlStream.sessionId}`);
 		this.#context.logger.debug("[audio]", "RECORD complete");
@@ -89,45 +91,86 @@ var AudioStream = class {
 			controlPort: this.#remoteControlPort
 		};
 	}
-	async stream(source, remoteAddress) {
-		if (!this.#controlSocket || !this.#sharedKey || !this.#dataPort) throw new Error("Audio stream not setup");
+	/**
+	* Prepare the audio stream for sending. Connects the UDP data socket,
+	* initializes stream context, sends FLUSH, and starts RTCP sync.
+	*/
+	async prepare(remoteAddress) {
+		if (!this.#controlSocket || !this.#sharedKey || !this.#dataPort) throw new SetupError("Audio stream not setup.");
 		this.#dataSocket = createSocket("udp4");
-		try {
-			await new Promise((resolve, reject) => {
-				this.#dataSocket.once("error", reject);
-				this.#dataSocket.connect(this.#dataPort, remoteAddress, () => {
-					this.#dataSocket.removeListener("error", reject);
-					resolve();
-				});
-			});
-			const frameSize = CHANNELS * BYTES_PER_CHANNEL;
-			const ctx = {
-				sampleRate: SAMPLE_RATE,
-				channels: CHANNELS,
-				bytesPerChannel: BYTES_PER_CHANNEL,
-				frameSize,
-				packetSize: FRAMES_PER_PACKET * frameSize,
-				rtpSeq: randomInt32() & 65535,
-				rtpTime: 0,
-				headTs: 0,
-				latency: LATENCY_FRAMES,
-				paddingSent: 0,
-				totalFrames: 0
-			};
-			this.#streamContext = ctx;
-			this.#context.logger.debug("[audio]", "Sending FLUSH...");
-			await this.#protocol.controlStream.flush(`/${this.#protocol.controlStream.sessionId}`, {
-				"Range": "npt=0-",
-				"RTP-Info": `seq=${ctx.rtpSeq};rtptime=${ctx.rtpTime}`
+		await new Promise((resolve, reject) => {
+			this.#dataSocket.once("error", reject);
+			this.#dataSocket.connect(this.#dataPort, remoteAddress, () => {
+				this.#dataSocket.removeListener("error", reject);
+				resolve();
 			});
-			this.#context.logger.debug("[audio]", "FLUSH complete");
+		});
+		const frameSize = CHANNELS * BYTES_PER_CHANNEL;
+		const ctx = {
+			sampleRate: SAMPLE_RATE,
+			channels: CHANNELS,
+			bytesPerChannel: BYTES_PER_CHANNEL,
+			frameSize,
+			packetSize: 352 * frameSize,
+			rtpSeq: randomInt32() & 65535,
+			rtpTime: 0,
+			headTs: 0,
+			latency: LATENCY_FRAMES,
+			paddingSent: 0,
+			totalFrames: 0
+		};
+		this.#streamContext = ctx;
+		this.#context.logger.debug("[audio]", "Sending FLUSH...");
+		await this.#protocol.controlStream.flush(`/${this.#protocol.controlStream.sessionId}`, {
+			"Range": "npt=0-",
+			"RTP-Info": `seq=${ctx.rtpSeq};rtptime=${ctx.rtpTime}`
+		});
+		this.#context.logger.debug("[audio]", "FLUSH complete");
+		this.#context.logger.debug("[audio]", `RTP start: seq=${ctx.rtpSeq}, time=${ctx.rtpTime}, ssrc=${this.#ssrc}`);
+		this.#packetBacklog.clear();
+		this.#startSync();
+		return ctx;
+	}
+	/**
+	* Send pre-read frame data as an RTP packet. Used by AudioMultiplexer
+	* for multi-room streaming where frames are read once and sent to
+	* multiple streams.
+	*/
+	async sendFrameData(frames, firstPacket) {
+		if (!this.#streamContext) throw new SetupError("Audio stream not prepared.");
+		return this.#sendFrameBuffer(frames, firstPacket, this.#streamContext);
+	}
+	/**
+	* Send padding frames (silence) after audio ends and TEARDOWN.
+	*/
+	async finish() {
+		if (!this.#streamContext) return;
+		const ctx = this.#streamContext;
+		while (ctx.paddingSent < ctx.latency) {
+			const silence = Buffer.alloc(ctx.packetSize, 0);
+			const sent = await this.#sendFrameBuffer(silence, false, ctx);
+			if (sent === 0) break;
+			ctx.paddingSent += sent;
+			const sleepTime = ctx.totalFrames / SAMPLE_RATE * 1e3 - performance.now();
+			if (sleepTime > 0) await this.#sleep(sleepTime);
+		}
+		this.#stopSync();
+		this.#context.logger.debug("[audio]", "Sending TEARDOWN...");
+		await this.#protocol.controlStream.teardown(`/${this.#protocol.controlStream.sessionId}`);
+		this.#context.logger.debug("[audio]", "TEARDOWN complete");
+	}
+	/**
+	* Stream audio from a source. Convenience method that uses prepare(),
+	* sendFrameData() and finish() internally.
+	*/
+	async stream(source, remoteAddress) {
+		const ctx = await this.prepare(remoteAddress);
+		try {
 			let firstPacket = true;
 			let packetCount = 0;
+			let slowCount = 0;
 			const startTime = performance.now();
 			this.#context.logger.info("[audio]", "Starting audio stream...");
-			this.#context.logger.debug("[audio]", `RTP start: seq=${ctx.rtpSeq}, time=${ctx.rtpTime}, ssrc=${this.#ssrc}`);
-			this.#packetBacklog.clear();
-			this.#startSync();
 			while (true) {
 				if (await this.#sendPacket(source, firstPacket, ctx) === 0) {
 					this.#context.logger.debug("[audio]", `End of audio stream after ${packetCount} packets (padding complete)`);
@@ -137,7 +180,24 @@ var AudioStream = class {
 				firstPacket = false;
 				if (packetCount % 100 === 0) this.#context.logger.debug("[audio]", `Sent ${packetCount} packets, ${ctx.totalFrames} frames`);
 				const sleepTime = ctx.totalFrames / SAMPLE_RATE * 1e3 - (performance.now() - startTime);
-				if (sleepTime > 0) await this.#sleep(sleepTime);
+				if (sleepTime > 0) {
+					slowCount = 0;
+					await this.#sleep(sleepTime);
+				} else {
+					const framesBehind = Math.floor(-sleepTime / 1e3 * SAMPLE_RATE);
+					if (framesBehind >= 352) {
+						const extraPackets = Math.min(Math.floor(framesBehind / 352), MAX_PACKETS_COMPENSATE$1);
+						for (let i = 0; i < extraPackets; i++) {
+							if (await this.#sendPacket(source, false, ctx) === 0) break;
+							packetCount++;
+						}
+					}
+					slowCount++;
+					if (slowCount >= SLOW_WARNING_THRESHOLD$1) {
+						this.#context.logger.warn("[audio]", `Stream is behind schedule (${slowCount} consecutive slow packets, ${Math.abs(sleepTime).toFixed(1)}ms behind)`);
+						slowCount = 0;
+					}
+				}
 			}
 			this.#context.logger.info("[audio]", `Audio stream finished, sent ${packetCount} packets`);
 			this.#stopSync();
@@ -154,7 +214,7 @@ var AudioStream = class {
 	}
 	async #sendPacket(source, firstPacket, ctx) {
 		if (ctx.paddingSent >= ctx.latency) return 0;
-		let frames = await source.readFrames(FRAMES_PER_PACKET);
+		let frames = await source.readFrames(352);
 		if (!frames || frames.length === 0) {
 			frames = Buffer.alloc(ctx.packetSize, 0);
 			ctx.paddingSent += Math.floor(frames.length / ctx.frameSize);
@@ -163,6 +223,9 @@ var AudioStream = class {
 			frames.copy(padded);
 			frames = padded;
 		}
+		return this.#sendFrameBuffer(frames, firstPacket, ctx);
+	}
+	#sendFrameBuffer(frames, firstPacket, ctx) {
 		const rtpHeader = Buffer.allocUnsafe(12);
 		rtpHeader.writeUInt8(128, 0);
 		rtpHeader.writeUInt8(firstPacket ? 224 : 96, 1);
@@ -173,12 +236,11 @@ var AudioStream = class {
 		const payload = this.#encryptAudio(frames, aad, ctx.rtpSeq);
 		const packet = Buffer.concat([rtpHeader, payload]);
 		this.#storePacket(ctx.rtpSeq, packet);
-		await this.#send(packet);
 		const framesSent = Math.floor(frames.length / ctx.frameSize);
 		ctx.rtpSeq = ctx.rtpSeq + 1 & 65535;
 		ctx.headTs = ctx.headTs + framesSent >>> 0;
 		ctx.totalFrames += framesSent;
-		return framesSent;
+		return this.#send(packet).then(() => framesSent);
 	}
 	#storePacket(seqno, packet) {
 		this.#packetBacklog.set(seqno, packet);
@@ -191,7 +253,7 @@ var AudioStream = class {
 		return this.#packetBacklog.get(seqno);
 	}
 	#encryptAudio(data, aad, seqNumber) {
-		if (!this.#sharedKey) throw new Error("Encryption not setup");
+		if (!this.#sharedKey) throw new EncryptionError("Encryption not setup.");
 		const nonceBytes = Buffer.alloc(12, 0);
 		nonceBytes.writeUInt32LE(seqNumber, 4);
 		const result = Chacha20.encrypt(this.#sharedKey, nonceBytes, aad, data);
@@ -227,7 +289,9 @@ var AudioStream = class {
 			packet.writeUInt32BE(currentFrac, 12);
 			packet.writeUInt32BE(ctx.headTs >>> 0, 16);
 			firstPacket = false;
-			this.#controlSocket.send(packet, this.#remoteControlPort, this.#protocol.discoveryResult.address);
+			this.#controlSocket.send(packet, this.#remoteControlPort, this.#protocol.discoveryResult.address, (err) => {
+				if (err) this.#protocol.context.logger.warn("[audio]", "Sync packet send failed", err);
+			});
 		};
 		sendSync();
 		this.#syncInterval = setInterval(sendSync, SYNC_INTERVAL);
@@ -261,14 +325,135 @@ var AudioStream = class {
 	}
 	close() {
 		this.#stopSync();
-		this.#controlSocket?.close();
+		try {
+			this.#controlSocket?.removeAllListeners();
+			this.#controlSocket?.close();
+		} catch {}
 		this.#controlSocket = void 0;
-		this.#dataSocket?.close();
+		try {
+			this.#dataSocket?.close();
+		} catch {}
 		this.#dataSocket = void 0;
 		this.#packetBacklog.clear();
 	}
 };
 
+//#endregion
+//#region src/audioMultiplexer.ts
+const MAX_PACKETS_COMPENSATE = 3;
+const SLOW_WARNING_THRESHOLD = 5;
+/**
+* Streams audio from a single source to multiple AirPlay devices
+* simultaneously. Each device gets its own AudioStream with independent
+* encryption and RTP state, but they all receive the same audio data
+* with shared timing.
+*/
+var AudioMultiplexer = class {
+	#context;
+	#targets = [];
+	constructor(context) {
+		this.#context = context;
+	}
+	/**
+	* Add a target device to stream to.
+	*/
+	addTarget(protocol) {
+		const stream = new AudioStream(protocol);
+		this.#targets.push({
+			protocol,
+			stream
+		});
+	}
+	/**
+	* Remove all targets and close their streams.
+	*/
+	clear() {
+		for (const target of this.#targets) target.stream.close();
+		this.#targets.length = 0;
+	}
+	/**
+	* Stream audio from a source to all targets simultaneously.
+	* Sets up, prepares, and streams to all devices, then tears down.
+	*/
+	async stream(source) {
+		if (this.#targets.length === 0) return;
+		this.#context.logger.info("[multiplexer]", `Streaming to ${this.#targets.length} device(s)...`);
+		await Promise.all(this.#targets.map(async (target) => {
+			await target.stream.setup();
+		}));
+		await Promise.all(this.#targets.map(async (target) => {
+			await target.stream.prepare(target.protocol.discoveryResult.address);
+		}));
+		const packetSize = 352 * 4;
+		try {
+			let firstPacket = true;
+			let packetCount = 0;
+			let slowCount = 0;
+			let totalFrames = 0;
+			const startTime = performance.now();
+			this.#context.logger.info("[multiplexer]", "Starting multi-room audio stream...");
+			while (true) {
+				let frames = await source.readFrames(352);
+				if (!frames || frames.length === 0) {
+					this.#context.logger.debug("[multiplexer]", `End of source after ${packetCount} packets`);
+					break;
+				}
+				if (frames.length < packetSize) {
+					const padded = Buffer.alloc(packetSize, 0);
+					frames.copy(padded);
+					frames = padded;
+				}
+				await Promise.all(this.#targets.map(async (target) => {
+					await target.stream.sendFrameData(frames, firstPacket);
+				}));
+				totalFrames += 352;
+				packetCount++;
+				firstPacket = false;
+				if (packetCount % 100 === 0) this.#context.logger.debug("[multiplexer]", `Sent ${packetCount} packets to ${this.#targets.length} device(s)`);
+				const sleepTime = totalFrames / SAMPLE_RATE * 1e3 - (performance.now() - startTime);
+				if (sleepTime > 0) {
+					slowCount = 0;
+					await this.#sleep(sleepTime);
+				} else {
+					const framesBehind = Math.floor(-sleepTime / 1e3 * SAMPLE_RATE);
+					if (framesBehind >= 352) {
+						const extraPackets = Math.min(Math.floor(framesBehind / 352), MAX_PACKETS_COMPENSATE);
+						for (let i = 0; i < extraPackets; i++) {
+							let extraFrames = await source.readFrames(352);
+							if (!extraFrames || extraFrames.length === 0) break;
+							if (extraFrames.length < packetSize) {
+								const padded = Buffer.alloc(packetSize, 0);
+								extraFrames.copy(padded);
+								extraFrames = padded;
+							}
+							await Promise.all(this.#targets.map(async (target) => {
+								await target.stream.sendFrameData(extraFrames, false);
+							}));
+							totalFrames += 352;
+							packetCount++;
+						}
+					}
+					slowCount++;
+					if (slowCount >= SLOW_WARNING_THRESHOLD) {
+						this.#context.logger.warn("[multiplexer]", `Stream behind schedule (${slowCount} consecutive, ${Math.abs(sleepTime).toFixed(1)}ms behind)`);
+						slowCount = 0;
+					}
+				}
+			}
+			this.#context.logger.info("[multiplexer]", `Multi-room stream finished, sent ${packetCount} packets to ${this.#targets.length} device(s)`);
+			await Promise.all(this.#targets.map(async (target) => {
+				await target.stream.finish();
+			}));
+		} catch (err) {
+			for (const target of this.#targets) target.stream.close();
+			throw err;
+		}
+	}
+	#sleep(ms) {
+		return new Promise((resolve) => setTimeout(resolve, ms));
+	}
+};
+
 //#endregion
 //#region ../../node_modules/.bun/@bufbuild+protobuf@2.11.0/node_modules/@bufbuild/protobuf/dist/esm/is-message.js
 /**
@@ -10672,7 +10857,7 @@ function readVariant(buf, offset = 0) {
 	let result = 0;
 	let shift = 0;
 	let bytesRead = 0;
-	while (true) {
+	while (offset + bytesRead < buf.length) {
 		const byte = buf[offset + bytesRead++];
 		result |= (byte & 127) << shift;
 		if ((byte & 128) === 0) break;
@@ -10691,6 +10876,7 @@ function chacha20Decrypt(state, data) {
 		if (offset + 2 > data.length) return false;
 		const frameLength = data.readUInt16LE(offset);
 		offset += 2;
+		if (frameLength === 0 || frameLength > 65535) return false;
 		const end = offset + frameLength + 16;
 		if (end > data.length) return false;
 		const ciphertext = data.subarray(offset, offset + frameLength);
@@ -10848,6 +11034,7 @@ var DataStream = class extends BaseStream {
 		this.on("close", this.#onClose.bind(this));
 		this.on("data", this.#onData.bind(this));
 		this.on("error", this.#onError.bind(this));
+		this.#handlers[ProtocolMessage_Type.KEYBOARD_MESSAGE] = [keyboardMessage, this.#onKeyboardMessage.bind(this)];
 		this.#handlers[ProtocolMessage_Type.DEVICE_INFO_MESSAGE] = [deviceInfoMessage, this.#onDeviceInfoMessage.bind(this)];
 		this.#handlers[ProtocolMessage_Type.DEVICE_INFO_UPDATE_MESSAGE] = [deviceInfoMessage, this.#onDeviceInfoUpdateMessage.bind(this)];
 		this.#handlers[ProtocolMessage_Type.ORIGIN_CLIENT_PROPERTIES_MESSAGE] = [originClientPropertiesMessage, this.#onOriginClientPropertiesMessage.bind(this)];
@@ -10879,7 +11066,7 @@ var DataStream = class extends BaseStream {
 		return new Promise((resolve, reject) => {
 			const timer = setTimeout(() => {
 				this.#outstanding.delete(identifier);
-				reject(/* @__PURE__ */ new Error(`Exchange timed out for ${identifier}`));
+				reject(new TimeoutError(`Exchange timed out for ${identifier}`));
 			}, timeout);
 			this.#outstanding.set(identifier, {
 				resolve,
@@ -10937,7 +11124,7 @@ var DataStream = class extends BaseStream {
 		this.#buffer = Buffer.alloc(0);
 		for (const [id, req] of this.#outstanding) {
 			clearTimeout(req.timer);
-			req.reject(/* @__PURE__ */ new Error("Connection closed."));
+			req.reject(new ConnectionClosedError());
 		}
 		this.#outstanding.clear();
 	}
@@ -11010,6 +11197,10 @@ var DataStream = class extends BaseStream {
 			handler(getExtension$1(message, extension));
 		} else if (message.type !== ProtocolMessage_Type.UNKNOWN_MESSAGE) this.context.logger.warn("[data]", `Unknown message type ${message.type}.`);
 	}
+	#onKeyboardMessage(message) {
+		this.context.logger.info("[data]", "Keyboard message", message);
+		this.emit("keyboard", message);
+	}
 	#onDeviceInfoMessage(message) {
 		this.context.logger.info("[data]", "Connected to device", message.name);
 		this.emit("deviceInfo", message);
@@ -11217,7 +11408,7 @@ var Pairing = class {
 			"Content-Type": "application/octet-stream",
 			"X-Apple-HKP": this.#hkp.toString()
 		});
-		if (response.status !== 200) throw new Error(`Cannot start pairing session. ${response.status} ${response.statusText} ${await response.text()}`);
+		if (response.status !== 200) throw new PairingError(`Cannot start pairing session. ${response.status} ${response.statusText} ${await response.text()}`);
 	}
 	async #request(_, data) {
 		const response = await this.#controlStream.post("/pair-setup", data, {
@@ -11272,6 +11463,10 @@ var Verify = class {
 
 //#endregion
 //#region src/protocol.ts
+const FEEDBACK_INTERVAL = 2e3;
+const PLAY_RETRIES = 3;
+const PLAYBACK_POLL_INTERVAL = 1e3;
+const PLAYBACK_IDLE_THRESHOLD = 5;
 var Protocol = class {
 	get context() {
 		return this.#context;
@@ -11309,6 +11504,7 @@ var Protocol = class {
 	#audioStream;
 	#dataStream;
 	#eventStream;
+	#playUrlFeedbackInterval;
 	#timingServer;
 	constructor(discoveryResult) {
 		this.#context = new Context(discoveryResult.id);
@@ -11348,6 +11544,7 @@ var Protocol = class {
 		} catch (err) {
 			this.#context.logger.warn("[protocol]", "Error destroying control stream", err);
 		}
+		this.#stopPlayUrlFeedback();
 		this.#audioStream = void 0;
 		this.#dataStream = void 0;
 		this.#eventStream = void 0;
@@ -11369,7 +11566,7 @@ var Protocol = class {
 		}] });
 		if (response.status !== 200) {
 			this.context.logger.error("[protocol]", "Failed to setup data stream.", response.status, response.statusText, await response.text());
-			throw new Error("Failed to setup data stream.");
+			throw new SetupError("Failed to setup data stream.");
 		}
 		const dataPort = Plist.parse(await response.arrayBuffer()).streams[0].dataPort & 65535;
 		this.context.logger.net("[protocol]", `Connecting to data stream on port ${dataPort}...`);
@@ -11399,10 +11596,11 @@ var Protocol = class {
 		const response = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, body);
 		if (response.status !== 200) {
 			this.context.logger.error("[protocol]", "Failed to setup event stream.", response.status, response.statusText, await response.text());
-			throw new Error("Failed to setup event stream.");
+			throw new SetupError("Failed to setup event stream.");
 		}
 		const eventPort = Plist.parse(await response.arrayBuffer()).eventPort & 65535;
 		this.context.logger.net("[protocol]", `Connecting to event stream on port ${eventPort}...`);
+		this.#eventStream?.destroy();
 		this.#eventStream = new EventStream(this.#context, this.#controlStream.address, eventPort);
 		this.#eventStream.setup(sharedSecret);
 		await this.#eventStream.connect();
@@ -11437,10 +11635,11 @@ var Protocol = class {
 		const response = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, body);
 		if (response.status !== 200) {
 			this.context.logger.error("[protocol]", "Failed to setup event stream.", response.status, response.statusText, await response.text());
-			throw new Error("Failed to setup event stream.");
+			throw new SetupError("Failed to setup event stream.");
 		}
 		const eventPort = Plist.parse(await response.arrayBuffer()).eventPort & 65535;
 		this.context.logger.net("[protocol]", `Connecting to event stream on port ${eventPort}...`);
+		this.#eventStream?.destroy();
 		this.#eventStream = new EventStream(this.#context, this.#controlStream.address, eventPort);
 		this.#eventStream.setup(sharedSecret);
 		await this.#eventStream.connect();
@@ -11467,28 +11666,46 @@ var Protocol = class {
 			setupBody.timingProtocol = "NTP";
 		} else setupBody.timingProtocol = "None";
 		const setupResponse = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, setupBody);
-		if (setupResponse.status !== 200) throw new Error(`Failed to setup for playback: ${setupResponse.status}`);
+		if (setupResponse.status !== 200) throw new SetupError(`Failed to setup for playback: ${setupResponse.status}`);
 		const eventPort = Plist.parse(await setupResponse.arrayBuffer()).eventPort & 65535;
+		this.#eventStream?.destroy();
 		this.#eventStream = new EventStream(this.#context, this.#controlStream.address, eventPort);
 		this.#eventStream.setup(sharedSecret);
 		await this.#eventStream.connect();
+		this.#startPlayUrlFeedback();
 		await this.#controlStream.record(`/${this.#controlStream.sessionId}`);
-		const response = await this.#controlStream.post("/play", {
-			"Content-Location": url,
-			"Start-Position-Seconds": position,
-			uuid: this.#sessionUUID.toUpperCase(),
-			streamType: 1,
-			mediaType: "file",
-			volume: 1,
-			rate: 1,
-			clientBundleID: "com.basmilius.apple-protocols",
-			clientProcName: "apple-protocols",
-			osBuildVersion: "18C66",
-			model: "iPhone16,2",
-			SenderMACAddress: getMacAddress().toUpperCase()
-		});
-		this.context.logger.info("[protocol]", `play_url response: ${response.status}`);
-		if (response.status !== 200) throw new Error(`Failed to play URL: ${response.status}`);
+		let lastStatus = 0;
+		for (let retry = 0; retry < PLAY_RETRIES; retry++) {
+			lastStatus = (await this.#controlStream.post("/play", {
+				"Content-Location": url,
+				"Start-Position-Seconds": position,
+				uuid: this.#sessionUUID.toUpperCase(),
+				streamType: 1,
+				mediaType: "file",
+				volume: 1,
+				rate: 1,
+				clientBundleID: "com.basmilius.apple-protocols",
+				clientProcName: "apple-protocols",
+				osBuildVersion: "18C66",
+				model: "iPhone16,2",
+				SenderMACAddress: getMacAddress().toUpperCase()
+			})).status;
+			this.context.logger.info("[protocol]", `play_url response: ${lastStatus} (attempt ${retry + 1}/${PLAY_RETRIES})`);
+			if (lastStatus === 200) break;
+			if (lastStatus === 500) {
+				this.context.logger.warn("[protocol]", "play_url returned 500, retrying...");
+				await waitFor(1e3);
+				continue;
+			}
+			if (lastStatus >= 400) {
+				this.#stopPlayUrlFeedback();
+				throw new PlaybackError(`Failed to play URL: ${lastStatus}`);
+			}
+		}
+		if (lastStatus !== 200) {
+			this.#stopPlayUrlFeedback();
+			throw new PlaybackError(`Failed to play URL after ${PLAY_RETRIES} retries: ${lastStatus}`);
+		}
 		await this.#putProperty("isInterestedInDateRange", { value: true });
 		await this.#putProperty("actionAtItemEnd", { value: 0 });
 		await this.#controlStream.post("/rate?value=1.000000");
@@ -11505,6 +11722,63 @@ var Protocol = class {
 			timescale: 0
 		} });
 	}
+	async getPlaybackInfo() {
+		try {
+			const response = await this.#controlStream.get("/playback-info");
+			if (!response.ok) return null;
+			const body = await response.arrayBuffer();
+			if (body.byteLength === 0) return {};
+			return Plist.parse(body);
+		} catch {
+			return null;
+		}
+	}
+	async waitForPlaybackEnd() {
+		let playbackStarted = false;
+		let idleCount = 0;
+		while (true) {
+			const info = await this.getPlaybackInfo();
+			if (!info) {
+				this.context.logger.debug("[protocol]", "Connection lost, assuming playback stopped.");
+				break;
+			}
+			if (info.error) {
+				this.#stopPlayUrlFeedback();
+				throw new PlaybackError(`Playback error: ${info.error.code} (${info.error.domain})`);
+			}
+			if (info.duration !== void 0) {
+				playbackStarted = true;
+				idleCount = 0;
+			} else if (playbackStarted) {
+				idleCount++;
+				if (idleCount >= PLAYBACK_IDLE_THRESHOLD) {
+					this.context.logger.debug("[protocol]", "Playback ended.");
+					break;
+				}
+			}
+			await waitFor(PLAYBACK_POLL_INTERVAL);
+		}
+		this.#stopPlayUrlFeedback();
+	}
+	stopPlayUrl() {
+		this.#stopPlayUrlFeedback();
+	}
+	#startPlayUrlFeedback() {
+		this.#stopPlayUrlFeedback();
+		this.#playUrlFeedbackInterval = setInterval(async () => {
+			try {
+				await this.feedback();
+			} catch (err) {
+				this.#context.logger.warn("[protocol]", "playUrl feedback error", err);
+			}
+		}, FEEDBACK_INTERVAL);
+	}
+	#stopPlayUrlFeedback() {
+		if (this.#playUrlFeedbackInterval) {
+			clearInterval(this.#playUrlFeedbackInterval);
+			this.#playUrlFeedbackInterval = void 0;
+		}
+	}
 	async #putProperty(property, body) {
 		await this.#controlStream.put(`/setProperty?${property}`, body);
 	}
@@ -11525,6 +11799,7 @@ var dataStreamMessages_exports = /* @__PURE__ */ __exportAll({
 	configureConnection: () => configureConnection,
 	deviceInfo: () => deviceInfo,
 	getExtension: () => getExtension,
+	getKeyboardSession: () => getKeyboardSession,
 	getState: () => getState,
 	getVolume: () => getVolume,
 	getVolumeMuted: () => getVolumeMuted,
@@ -11545,6 +11820,7 @@ var dataStreamMessages_exports = /* @__PURE__ */ __exportAll({
 	setReadyState: () => setReadyState,
 	setVolume: () => setVolume,
 	setVolumeMuted: () => setVolumeMuted,
+	textInput: () => textInput,
 	wakeDevice: () => wakeDevice
 });
 function protocol(type, errorCode = ErrorCode_Enum.NoError) {
@@ -11593,7 +11869,9 @@ function deviceInfo(pairingId) {
 		supportsExtendedMotion: true,
 		sharedQueueVersion: 2,
 		deviceClass: DeviceClass_Enum.iPhone,
-		logicalDeviceCount: 1
+		logicalDeviceCount: 1,
+		clusterType: 0,
+		isClusterAware: true
 	});
 	setExtension(protocolMessage, deviceInfoMessage, message);
 	return [protocolMessage, deviceInfoMessage];
@@ -11604,7 +11882,10 @@ function modifyOutputContext(addingDevices = [], removingDevices = [], settingDe
 		type: ModifyOutputContextRequestType_Enum.SharedAudioPresentation,
 		addingDevices,
 		removingDevices,
-		settingDevices
+		settingDevices,
+		clusterAwareAddingDevices: addingDevices,
+		clusterAwareRemovingDevices: removingDevices,
+		clusterAwareSettingDevices: settingDevices
 	});
 	setExtension(protocolMessage, modifyOutputContextRequestMessage, message);
 	return [protocolMessage, modifyOutputContextRequestMessage];
@@ -11654,6 +11935,21 @@ function playbackQueueRequest(location, length, artworkWidth = 600, artworkHeigh
 	setExtension(protocolMessage, playbackQueueRequestMessage, message);
 	return [protocolMessage, playbackQueueRequestMessage];
 }
+function getKeyboardSession() {
+	const protocolMessage = protocol(ProtocolMessage_Type.GET_KEYBOARD_SESSION_MESSAGE);
+	setExtension(protocolMessage, getKeyboardSessionMessage, "");
+	return [protocolMessage, getKeyboardSessionMessage];
+}
+function textInput(text, actionType) {
+	const protocolMessage = protocol(ProtocolMessage_Type.TEXT_INPUT_MESSAGE);
+	const message = create(TextInputMessageSchema, {
+		timestamp: Date.now() / 1e3,
+		text,
+		actionType
+	});
+	setExtension(protocolMessage, textInputMessage, message);
+	return [protocolMessage, textInputMessage];
+}
 function sendButtonEvent(usagePage, usage, buttonDown) {
 	const protocolMessage = protocol(ProtocolMessage_Type.SEND_BUTTON_EVENT_MESSAGE);
 	const message = create(SendButtonEventMessageSchema, {
@@ -11758,4 +12054,4 @@ function getExtension(message, extension) {
 }
 
 //#endregion
-export { AudioStream, ControlStream, DataStream, dataStreamMessages_exports as DataStreamMessage, EventStream, Pairing, proto_exports as Proto, Protocol, Verify };
+export { AudioMultiplexer, AudioStream, ControlStream, DataStream, dataStreamMessages_exports as DataStreamMessage, EventStream, Pairing, proto_exports as Proto, Protocol, Verify };

package/package.json

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