@basmilius/apple-airplay 0.9.16 → 0.9.18

package/dist/index.d.mts

@@ -1,34 +1,26 @@
 import { AccessoryCredentials, AccessoryKeys, AccessoryPair, AccessoryVerify, AudioSource, Context, DiscoveryResult, EncryptionAwareConnection, EventMap, TimingServer } from "@basmilius/apple-common";
+import { RtspClient } from "@basmilius/apple-rtsp";
 
-//#region src/baseStream.d.ts
-type DefaultEventMap = {
-  close: [];
-  connect: [];
-  error: [Error];
-  timeout: [];
-};
-declare class BaseStream<TEventMap extends EventMap = {}> extends EncryptionAwareConnection<DefaultEventMap & TEventMap> {
-  #private;
-  decrypt(data: Buffer): Buffer | false;
-  encrypt(data: Buffer): Buffer;
-}
-//#endregion
 //#region src/controlStream.d.ts
-declare class ControlStream extends BaseStream {
+declare class ControlStream extends RtspClient {
   #private;
   get activeRemoteId(): string;
   get dacpId(): string;
   get sessionId(): string;
+  get isEncrypted(): boolean;
   constructor(context: Context, address: string, port: number);
-  disconnect(): Promise<void>;
+  enableEncryption(readKey: Buffer, writeKey: Buffer): void;
+  protected getDefaultHeaders(): Record<string, string | number>;
+  protected transformIncoming(data: Buffer): Buffer | false;
+  protected transformOutgoing(data: Buffer): Buffer;
   flush(uri: string, headers: Record<string, string>): Promise<Response>;
-  get(path: string, headers?: HeadersInit, timeout?: number): Promise<Response>;
-  post(path: string, body?: Buffer | string | null, headers?: HeadersInit, timeout?: number): Promise<Response>;
-  put(path: string, body?: Buffer | string | null, headers?: HeadersInit, timeout?: number): Promise<Response>;
-  record(path: string, headers?: HeadersInit, timeout?: number): Promise<Response>;
-  setup(path: string, body?: Buffer | string | null, headers?: HeadersInit, timeout?: number): Promise<Response>;
+  get(path: string, headers?: Record<string, string>, timeout?: number): Promise<Response>;
+  post(path: string, body?: Buffer | string | Record<string, unknown>, headers?: Record<string, string>, timeout?: number): Promise<Response>;
+  put(path: string, body?: Buffer | string | Record<string, unknown>, headers?: Record<string, string>, timeout?: number): Promise<Response>;
+  record(path: string, headers?: Record<string, string>, timeout?: number): Promise<Response>;
+  setup(path: string, body?: Buffer | string | Record<string, unknown>, headers?: Record<string, string>, timeout?: number): Promise<Response>;
   setParameter(parameter: string, value: string): Promise<Response>;
-  teardown(path: string, headers?: HeadersInit, timeout?: number): Promise<Response>;
+  teardown(path: string, headers?: Record<string, string>, timeout?: number): Promise<Response>;
 }
 //#endregion
 //#region src/pairing.d.ts
@@ -10332,6 +10324,18 @@ declare namespace index_d_exports {
   export { AVEndpointDescriptor, AVEndpointDescriptorSchema, AVOutputDeviceDescriptor, AVOutputDeviceDescriptorSchema, AVOutputDeviceSourceInfo, AVOutputDeviceSourceInfoSchema, ActionType, ActionTypeSchema, ActionType_Enum, ActionType_EnumSchema, ActiveFormatJustification, ActiveFormatJustificationSchema, ActiveFormatJustification_Enum, ActiveFormatJustification_EnumSchema, AlbumTraits, AlbumTraitsSchema, AlbumTraits_Enum, AlbumTraits_EnumSchema, AnimatedArtwork, AnimatedArtworkSchema, AudioBuffer, AudioBufferSchema, AudioDataBlock, AudioDataBlockSchema, AudioFadeMessage, AudioFadeMessageSchema, AudioFadeResponseMessage, AudioFadeResponseMessageSchema, AudioFormat, AudioFormatSchema, AudioFormatSettings, AudioFormatSettingsSchema, AudioRoute, AudioRouteSchema, AudioRouteType, AudioRouteTypeSchema, AudioRouteType_Enum, AudioRouteType_EnumSchema, AudioStreamPacketDescription, AudioStreamPacketDescriptionSchema, AudioTier, AudioTierSchema, AudioTier_Enum, AudioTier_EnumSchema, AudioTime, AudioTimeSchema, AutocapitalizationType, AutocapitalizationTypeSchema, AutocapitalizationType_Enum, AutocapitalizationType_EnumSchema, ChangeType, ChangeTypeSchema, ChangeType_Enum, ChangeType_EnumSchema, ClientUpdatesConfigMessage, ClientUpdatesConfigMessageSchema, ClusterType, ClusterTypeSchema, ClusterType_Enum, ClusterType_EnumSchema, Command, CommandInfo, CommandInfoSchema, CommandOptions, CommandOptionsSchema, CommandSchema, ConfigureConnectionMessage, ConfigureConnectionMessageSchema, ContentItem, ContentItemMetadata, ContentItemMetadataSchema, ContentItemMetadata_MediaSubType, ContentItemMetadata_MediaSubTypeSchema, ContentItemMetadata_MediaType, ContentItemMetadata_MediaTypeSchema, ContentItemSchema, CryptoPairingMessage, CryptoPairingMessageSchema, DataArtwork, DataArtworkSchema, DeviceClass, DeviceClassSchema, DeviceClass_Enum, DeviceClass_EnumSchema, DeviceInfoMessage, DeviceInfoMessageSchema, DeviceSubType, DeviceSubTypeSchema, DeviceSubType_Enum, DeviceSubType_EnumSchema, DeviceType, DeviceTypeSchema, DeviceType_Enum, DeviceType_EnumSchema, Dictionary, DictionarySchema, DisableReason, DisableReasonSchema, DisableReason_Enum, DisableReason_EnumSchema, EndpointOptions, EndpointOptionsSchema, EndpointOptions_Enum, EndpointOptions_EnumSchema, ErrorCode, ErrorCodeSchema, ErrorCode_Enum, ErrorCode_EnumSchema, FormatTier, FormatTierSchema, FormatTier_Enum, FormatTier_EnumSchema, GenericMessage, GenericMessageSchema, GetKeyboardSessionMessage, GetKeyboardSessionMessageSchema, GetRemoteTextInputSessionMessage, GetRemoteTextInputSessionMessageSchema, GetStateMessage, GetStateMessageSchema, GetVolumeMessage, GetVolumeMessageSchema, GetVolumeMutedMessage, GetVolumeMutedMessageSchema, GetVolumeMutedResultMessage, GetVolumeMutedResultMessageSchema, GetVolumeResultMessage, GetVolumeResultMessageSchema, GroupSessionRouteType, GroupSessionRouteTypeSchema, GroupSessionRouteType_Enum, GroupSessionRouteType_EnumSchema, HandlerReturnStatus, HandlerReturnStatusSchema, HandlerReturnStatus_Enum, HandlerReturnStatus_EnumSchema, KeyValuePair, KeyValuePairSchema, KeyboardMessage, KeyboardMessageSchema, KeyboardState, KeyboardStateSchema, KeyboardState_Enum, KeyboardState_EnumSchema, KeyboardType, KeyboardTypeSchema, KeyboardType_Enum, KeyboardType_EnumSchema, LanguageOption, LanguageOptionGroup, LanguageOptionGroupSchema, LanguageOptionSchema, LyricsItem, LyricsItemSchema, LyricsToken, LyricsTokenSchema, ModifyOutputContextRequestMessage, ModifyOutputContextRequestMessageSchema, ModifyOutputContextRequestType, ModifyOutputContextRequestTypeSchema, ModifyOutputContextRequestType_Enum, ModifyOutputContextRequestType_EnumSchema, NotificationMessage, NotificationMessageSchema, NowPlayingClient, NowPlayingClientSchema, NowPlayingInfo, NowPlayingInfoSchema, NowPlayingPlayer, NowPlayingPlayerSchema, Origin, OriginClientPropertiesMessage, OriginClientPropertiesMessageSchema, OriginSchema, Origin_Type, Origin_TypeSchema, PlaybackQueue, PlaybackQueueCapabilities, PlaybackQueueCapabilitiesSchema, PlaybackQueueContext, PlaybackQueueContextSchema, PlaybackQueueRequestMessage, PlaybackQueueRequestMessageSchema, PlaybackQueueSchema, PlaybackQueueType, PlaybackQueueTypeSchema, PlaybackQueueType_Enum, PlaybackQueueType_EnumSchema, PlaybackSessionMigrateRequestEventRole, PlaybackSessionMigrateRequestEventRoleSchema, PlaybackSessionMigrateRequestEventRole_Enum, PlaybackSessionMigrateRequestEventRole_EnumSchema, PlaybackState, PlaybackStateSchema, PlaybackState_Enum, PlaybackState_EnumSchema, PlayerClientPropertiesMessage, PlayerClientPropertiesMessageSchema, PlayerOptions, PlayerOptionsSchema, PlayerOptions_Enum, PlayerOptions_EnumSchema, PlayerPath, PlayerPathSchema, PlaylistTraits, PlaylistTraitsSchema, PlaylistTraits_Enum, PlaylistTraits_EnumSchema, PreferredEncoding, PreferredEncodingSchema, PreferredEncoding_Enum, PreferredEncoding_EnumSchema, PreloadedPlaybackSessionInfo, PreloadedPlaybackSessionInfoSchema, ProtocolMessage, ProtocolMessageSchema, ProtocolMessage_Type, ProtocolMessage_TypeSchema, QueueEndAction, QueueEndActionSchema, QueueEndAction_Enum, QueueEndAction_EnumSchema, RecipeType, RecipeTypeSchema, RecipeType_Enum, RecipeType_EnumSchema, RegisterForGameControllerEventsMessage, RegisterForGameControllerEventsMessageSchema, RegisterForGameControllerEventsMessage_InputModeFlags, RegisterForGameControllerEventsMessage_InputModeFlagsSchema, RegisterHIDDeviceMessage, RegisterHIDDeviceMessageSchema, RegisterHIDDeviceResultMessage, RegisterHIDDeviceResultMessageSchema, RegisterVoiceInputDeviceMessage, RegisterVoiceInputDeviceMessageSchema, RegisterVoiceInputDeviceResponseMessage, RegisterVoiceInputDeviceResponseMessageSchema, RemoteArtwork, RemoteArtworkSchema, RemoteTextInputMessage, RemoteTextInputMessageSchema, RemoveClientMessage, RemoveClientMessageSchema, RemoveEndpointsMessage, RemoveEndpointsMessageSchema, RemoveOutputDevicesMessage, RemoveOutputDevicesMessageSchema, RemovePlayerMessage, RemovePlayerMessageSchema, RepeatMode, RepeatModeSchema, RepeatMode_Enum, RepeatMode_EnumSchema, ReplaceIntent, ReplaceIntentSchema, ReplaceIntent_Enum, ReplaceIntent_EnumSchema, ReturnKeyType, ReturnKeyTypeSchema, ReturnKeyType_Enum, ReturnKeyType_EnumSchema, SendButtonEventMessage, SendButtonEventMessageSchema, SendCommandMessage, SendCommandMessageSchema, SendCommandResult, SendCommandResultMessage, SendCommandResultMessageSchema, SendCommandResultSchema, SendCommandResultStatus, SendCommandResultStatusSchema, SendCommandResultType, SendCommandResultTypeSchema, SendCommandResultType_Enum, SendCommandResultType_EnumSchema, SendCommandStatusCode, SendCommandStatusCodeSchema, SendCommandStatusCode_Enum, SendCommandStatusCode_EnumSchema, SendError, SendErrorSchema, SendError_Enum, SendError_EnumSchema, SendHIDEventMessage, SendHIDEventMessageSchema, SendHIDReportMessage, SendHIDReportMessageSchema, SendPackedVirtualTouchEventMessage, SendPackedVirtualTouchEventMessageSchema, SendPackedVirtualTouchEventMessage_Phase, SendPackedVirtualTouchEventMessage_PhaseSchema, SendVirtualTouchEventMessage, SendVirtualTouchEventMessageSchema, SendVoiceInputMessage, SendVoiceInputMessageSchema, SetArtworkMessage, SetArtworkMessageSchema, SetConnectionStateMessage, SetConnectionStateMessageSchema, SetConnectionStateMessage_ConnectionState, SetConnectionStateMessage_ConnectionStateSchema, SetDefaultSupportedCommandsMessage, SetDefaultSupportedCommandsMessageSchema, SetDiscoveryModeMessage, SetDiscoveryModeMessageSchema, SetHiliteModeMessage, SetHiliteModeMessageSchema, SetNowPlayingClientMessage, SetNowPlayingClientMessageSchema, SetNowPlayingPlayerMessage, SetNowPlayingPlayerMessageSchema, SetReadyStateMessage, SetReadyStateMessageSchema, SetRecordingStateMessage, SetRecordingStateMessageSchema, SetRecordingStateMessage_RecordingState, SetRecordingStateMessage_RecordingStateSchema, SetStateMessage, SetStateMessageSchema, SetVolumeMessage, SetVolumeMessageSchema, SetVolumeMutedMessage, SetVolumeMutedMessageSchema, ShuffleMode, ShuffleModeSchema, ShuffleMode_Enum, ShuffleMode_EnumSchema, SongTraits, SongTraitsSchema, SongTraits_Enum, SongTraits_EnumSchema, SupportedCommands, SupportedCommandsSchema, SystemPlaybackCustomData, SystemPlaybackCustomDataSchema, SystemPlaybackGenericTracklistQueue, SystemPlaybackGenericTracklistQueueSchema, SystemPlaybackQueue, SystemPlaybackQueueSchema, TextEditingAttributes, TextEditingAttributesSchema, TextInputMessage, TextInputMessageSchema, TextInputTraits, TextInputTraitsSchema, TransactionKey, TransactionKeySchema, TransactionMessage, TransactionMessageSchema, TransactionPacket, TransactionPacketSchema, TransactionPackets, TransactionPacketsSchema, TranscriptAlignment, TranscriptAlignmentSchema, UpdateClientMessage, UpdateClientMessageSchema, UpdateContentItemArtworkMessage, UpdateContentItemArtworkMessageSchema, UpdateContentItemMessage, UpdateContentItemMessageSchema, UpdateEndPointsMessage, UpdateEndPointsMessageSchema, UpdateOutputDeviceMessage, UpdateOutputDeviceMessageSchema, UpdatePlayerMessage, UpdatePlayerMessageSchema, Value, ValueSchema, VirtualTouchDeviceDescriptor, VirtualTouchDeviceDescriptorSchema, VirtualTouchEvent, VirtualTouchEventSchema, VirtualTouchPhase, VirtualTouchPhaseSchema, VirtualTouchPhase_Enum, VirtualTouchPhase_EnumSchema, VoiceInputDeviceDescriptor, VoiceInputDeviceDescriptorSchema, VolumeCapabilities, VolumeCapabilitiesSchema, VolumeCapabilities_Enum, VolumeCapabilities_EnumSchema, VolumeControlAvailabilityMessage, VolumeControlAvailabilityMessageSchema, VolumeControlCapabilitiesDidChangeMessage, VolumeControlCapabilitiesDidChangeMessageSchema, VolumeDidChangeMessage, VolumeDidChangeMessageSchema, VolumeMutedDidChangeMessage, VolumeMutedDidChangeMessageSchema, WakeDeviceMessage, WakeDeviceMessageSchema, audioFadeMessage, audioFadeResponseMessage, clientUpdatesConfigMessage, configureConnectionMessage, cryptoPairingMessage, deviceInfoMessage, file_Artwork, file_AudioFadeMessage, file_AudioFadeResponseMessage, file_AudioFormatSettingsMessage, file_ClientUpdatesConfigMessage, file_CommandInfo, file_CommandOptions, file_Common, file_ConfigureConnectionMessage, file_ContentItem, file_ContentItemMetadata, file_CryptoPairingMessage, file_DeviceInfoMessage, file_Dictionary, file_GenericMessage, file_GetKeyboardSessionMessage, file_GetRemoteTextInputSessionMessage, file_GetStateMessage, file_GetVolumeMessage, file_GetVolumeMutedMessage, file_GetVolumeMutedResultMessage, file_GetVolumeResultMessage, file_KeyboardMessage, file_LanguageOption, file_LyricsItem, file_ModifyOutputContextRequestMessage, file_NotificationMessage, file_NowPlayingClient, file_NowPlayingInfo, file_NowPlayingPlayer, file_Origin, file_OriginClientPropertiesMessage, file_PlaybackQueue, file_PlaybackQueueCapabilities, file_PlaybackQueueContext, file_PlaybackQueueRequestMessage, file_PlayerClientPropertiesMessage, file_PlayerPath, file_ProtocolMessage, file_RegisterForGameControllerEventsMessage, file_RegisterHIDDeviceMessage, file_RegisterHIDDeviceResultMessage, file_RegisterVoiceInputDeviceMessage, file_RegisterVoiceInputDeviceResponseMessage, file_RemoteTextInputMessage, file_RemoveClientMessage, file_RemoveEndpointsMessage, file_RemoveOutputDevicesMessage, file_RemovePlayerMessage, file_SendButtonEventMessage, file_SendCommandMessage, file_SendCommandResultMessage, file_SendHIDEventMessage, file_SendHIDReportMessage, file_SendPackedVirtualTouchEventMessage, file_SendVirtualTouchEventMessage, file_SendVoiceInputMessage, file_SetArtworkMessage, file_SetConnectionStateMessage, file_SetDefaultSupportedCommandsMessage, file_SetDiscoveryModeMessage, file_SetHiliteModeMessage, file_SetNowPlayingClientMessage, file_SetNowPlayingPlayerMessage, file_SetReadyStateMessage, file_SetRecordingStateMessage, file_SetStateMessage, file_SetVolumeMessage, file_SetVolumeMutedMessage, file_SupportedCommands, file_SystemPlaybackQueue, file_TextInputMessage, file_TransactionKey, file_TransactionMessage, file_TransactionPacket, file_TransactionPackets, file_Transcript, file_UpdateClientMessage, file_UpdateContentItemArtworkMessage, file_UpdateContentItemMessage, file_UpdateEndPointsMessage, file_UpdateOutputDeviceMessage, file_UpdatePlayerPath, file_VirtualTouchDeviceDescriptorMessage, file_VoiceInputDeviceDescriptorMessage, file_VolumeControlAvailabilityMessage, file_VolumeControlCapabilitiesDidChangeMessage, file_VolumeDidChangeMessage, file_VolumeMutedDidChangeMessage, file_WakeDeviceMessage, genericMessage, getKeyboardSessionMessage, getRemoteTextInputSessionMessage, getStateMessage, getVolumeMessage, getVolumeMutedMessage, getVolumeMutedResultMessage, getVolumeResultMessage, keyboardMessage, modifyOutputContextRequestMessage, notificationMessage, originClientPropertiesMessage, playbackQueueRequestMessage, playerClientPropertiesMessage, readyStateMessage, registerForGameControllerEventsMessage, registerHIDDeviceMessage, registerHIDDeviceResultMessage, registerVoiceInputDeviceMessage, registerVoiceInputDeviceResponseMessage, remoteTextInputMessage, removeClientMessage, removeEndpointsMessage, removeOutputDevicesMessage, removePlayerMessage, sendButtonEventMessage, sendCommandMessage, sendCommandResultMessage, sendHIDEventMessage, sendHIDReportMessage, sendPackedVirtualTouchEventMessage, sendVirtualTouchEventMessage, sendVoiceInputMessage, setArtworkMessage, setConnectionStateMessage, setDefaultSupportedCommandsMessage, setDiscoveryModeMessage, setHiliteModeMessage, setNowPlayingClientMessage, setNowPlayingPlayerMessage, setRecordingStateMessage, setStateMessage, setVolumeMessage, setVolumeMutedMessage, textInputMessage, transactionMessage, updateClientMessage, updateContentItemArtworkMessage, updateContentItemMessage, updateEndPointsMessage, updateOutputDeviceMessage, updatePlayerMessage, volumeControlAvailabilityMessage, volumeControlCapabilitiesDidChangeMessage, volumeDidChangeMessage, volumeMutedDidChangeMessage, wakeDeviceMessage };
 }
 //#endregion
+//#region src/baseStream.d.ts
+type DefaultEventMap = {
+  close: [];
+  connect: [];
+  error: [Error];
+  timeout: [];
+};
+declare class BaseStream<TEventMap extends EventMap = {}> extends EncryptionAwareConnection<DefaultEventMap & TEventMap> {
+  decrypt(data: Buffer): Buffer | false;
+  encrypt(data: Buffer): Buffer;
+}
+//#endregion
 //#region src/dataStream.d.ts
 type EventMap$1 = {
   readonly rawMessage: [ProtocolMessage];
@@ -10371,7 +10375,7 @@ declare class EventStream extends BaseStream {
   #private;
   constructor(context: Context, address: string, port: number);
   disconnect(): Promise<void>;
-  respond(response: Response): Promise<void>;
+  respond(status: number, statusText: string, headers?: Record<string, string | number>, body?: Buffer): void;
   setup(sharedSecret: Buffer): void;
 }
 //#endregion
@@ -10441,4 +10445,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, BaseStream, ControlStream, DataStream, dataStreamMessages_d_exports as DataStreamMessage, EventStream, Pairing, index_d_exports as Proto, Protocol, Verify };
+export { AudioStream, ControlStream, DataStream, dataStreamMessages_d_exports as DataStreamMessage, EventStream, Pairing, index_d_exports as Proto, Protocol, Verify };

package/dist/index.mjs

@@ -1,9 +1,10 @@
 import { t as __exportAll } from "./chunk-DQk6qfdC.mjs";
 import { randomBytes } from "node:crypto";
 import { createSocket } from "node:dgram";
-import { AccessoryPair, AccessoryVerify, Context, EncryptionAwareConnection, HTTP_TIMEOUT, generateActiveRemoteId, generateDacpId, generateSessionId, getMacAddress, randomInt32, randomInt64, uint16ToBE, uuid } from "@basmilius/apple-common";
-import { NTP, Plist, RTSP } from "@basmilius/apple-encoding";
+import { AccessoryPair, AccessoryVerify, Context, EncryptionAwareConnection, EncryptionState, HTTP_TIMEOUT, generateActiveRemoteId, generateDacpId, generateSessionId, getMacAddress, randomInt32, randomInt64, uint16ToBE, uuid } 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";
 
 //#region src/audioStream.ts
 const SAMPLE_RATE = 44100;
@@ -10681,54 +10682,43 @@ function readVariant(buf, offset = 0) {
 }
 
 //#endregion
-//#region src/baseStream.ts
-var BaseStream = class extends EncryptionAwareConnection {
-	get #encryptionState() {
-		return this._encryption;
-	}
-	decrypt(data) {
-		const result = [];
-		let offset = 0;
-		let readCount = this.#encryptionState.readCount ?? 0;
-		while (offset < data.length) {
-			if (offset + 2 > data.length) {
-				this.context.logger.warn("Expected frame length to be within buffer bounds.");
-				return false;
-			}
-			const frameLength = data.readUInt16LE(offset);
-			offset += 2;
-			const end = offset + frameLength + 16;
-			if (end > data.length) {
-				this.context.logger.warn(`Truncated frame end=${end} length=${data.length}`);
-				return false;
-			}
-			const ciphertext = data.subarray(offset, offset + frameLength);
-			const authTag = data.subarray(offset + frameLength, end);
-			offset = end;
-			const plaintext = Chacha20.decrypt(this.#encryptionState.readKey, nonce(readCount++), Buffer.from(Uint16Array.of(frameLength).buffer.slice(0, 2)), ciphertext, authTag);
-			result.push(plaintext);
-		}
-		this.#encryptionState.readCount = readCount;
-		return Buffer.concat(result);
-	}
-	encrypt(data) {
-		const FRAME_LENGTH = 1024;
-		const result = [];
-		for (let offset = 0; offset < data.length;) {
-			const frame = data.subarray(offset, offset + FRAME_LENGTH);
-			offset += frame.length;
-			const leLength = Buffer.allocUnsafe(2);
-			leLength.writeUInt16LE(frame.length, 0);
-			const encrypted = Chacha20.encrypt(this.#encryptionState.writeKey, nonce(this.#encryptionState.writeCount++), leLength, frame);
-			result.push(leLength, encrypted.ciphertext, encrypted.authTag);
-		}
-		return Buffer.concat(result);
-	}
-};
+//#region src/encryption.ts
+function chacha20Decrypt(state, data) {
+	const result = [];
+	let offset = 0;
+	let readCount = state.readCount ?? 0;
+	while (offset < data.length) {
+		if (offset + 2 > data.length) return false;
+		const frameLength = data.readUInt16LE(offset);
+		offset += 2;
+		const end = offset + frameLength + 16;
+		if (end > data.length) return false;
+		const ciphertext = data.subarray(offset, offset + frameLength);
+		const authTag = data.subarray(offset + frameLength, end);
+		offset = end;
+		const plaintext = Chacha20.decrypt(state.readKey, nonce(readCount++), Buffer.from(Uint16Array.of(frameLength).buffer.slice(0, 2)), ciphertext, authTag);
+		result.push(plaintext);
+	}
+	state.readCount = readCount;
+	return Buffer.concat(result);
+}
+function chacha20Encrypt(state, data) {
+	const FRAME_LENGTH = 1024;
+	const result = [];
+	for (let offset = 0; offset < data.length;) {
+		const frame = data.subarray(offset, offset + FRAME_LENGTH);
+		offset += frame.length;
+		const leLength = Buffer.allocUnsafe(2);
+		leLength.writeUInt16LE(frame.length, 0);
+		const encrypted = Chacha20.encrypt(state.writeKey, nonce(state.writeCount++), leLength, frame);
+		result.push(leLength, encrypted.ciphertext, encrypted.authTag);
+	}
+	return Buffer.concat(result);
+}
 
 //#endregion
 //#region src/controlStream.ts
-var ControlStream = class extends BaseStream {
+var ControlStream = class extends RtspClient {
 	get activeRemoteId() {
 		return this.#activeRemoteId;
 	}
@@ -10738,126 +10728,109 @@ var ControlStream = class extends BaseStream {
 	get sessionId() {
 		return this.#sessionId;
 	}
+	get isEncrypted() {
+		return !!this.#encryptionState;
+	}
 	#activeRemoteId;
 	#dacpId;
 	#sessionId;
-	#buffer = Buffer.alloc(0);
-	#cseq = 0;
-	#requesting = false;
-	#requestTimer;
-	#reject;
-	#resolve;
+	#encryptionState;
 	constructor(context, address, port) {
 		super(context, address, port);
 		this.#activeRemoteId = generateActiveRemoteId();
 		this.#dacpId = generateDacpId();
 		this.#sessionId = generateSessionId();
-		this.on("close", this.#onClose.bind(this));
-		this.on("data", this.#onData.bind(this));
-		this.on("error", this.#onError.bind(this));
-		this.on("timeout", this.#onTimeout.bind(this));
 	}
-	async disconnect() {
-		this.#cleanup();
-		await super.disconnect();
+	enableEncryption(readKey, writeKey) {
+		this.#encryptionState = new EncryptionState(readKey, writeKey);
+	}
+	getDefaultHeaders() {
+		return {
+			"Active-Remote": this.#activeRemoteId,
+			"Client-Instance": this.#dacpId,
+			"DACP-ID": this.#dacpId,
+			"User-Agent": "AirPlay/320.20",
+			"X-Apple-ProtocolVersion": 1,
+			"X-Apple-Session-ID": this.#sessionId,
+			"X-ProtocolVersion": 1
+		};
+	}
+	transformIncoming(data) {
+		if (!this.#encryptionState) return data;
+		return chacha20Decrypt(this.#encryptionState, data);
+	}
+	transformOutgoing(data) {
+		if (!this.#encryptionState) return data;
+		return chacha20Encrypt(this.#encryptionState, data);
 	}
 	async flush(uri, headers) {
-		return await this.#request("FLUSH", uri, null, headers);
+		return await this.exchange("FLUSH", uri, {
+			headers,
+			allowError: true
+		});
 	}
 	async get(path, headers = {}, timeout = HTTP_TIMEOUT) {
-		return await this.#request("GET", path, null, headers, timeout);
+		return await this.exchange("GET", path, {
+			headers,
+			timeout,
+			allowError: true
+		});
 	}
-	async post(path, body = null, headers = {}, timeout = HTTP_TIMEOUT) {
-		return await this.#request("POST", path, body, headers, timeout);
+	async post(path, body, headers = {}, timeout = HTTP_TIMEOUT) {
+		return await this.exchange("POST", path, {
+			headers,
+			body,
+			timeout,
+			allowError: true
+		});
 	}
-	async put(path, body = null, headers = {}, timeout = HTTP_TIMEOUT) {
-		return await this.#request("PUT", path, body, headers, timeout);
+	async put(path, body, headers = {}, timeout = HTTP_TIMEOUT) {
+		return await this.exchange("PUT", path, {
+			headers,
+			body,
+			timeout,
+			allowError: true
+		});
 	}
 	async record(path, headers = {}, timeout = HTTP_TIMEOUT) {
-		return await this.#request("RECORD", path, null, headers, timeout);
+		return await this.exchange("RECORD", path, {
+			headers,
+			timeout,
+			allowError: true
+		});
 	}
-	async setup(path, body = null, headers = {}, timeout = HTTP_TIMEOUT) {
-		return await this.#request("SETUP", path, body, headers, timeout);
+	async setup(path, body, headers = {}, timeout = HTTP_TIMEOUT) {
+		return await this.exchange("SETUP", path, {
+			headers,
+			body,
+			timeout,
+			allowError: true
+		});
 	}
 	async setParameter(parameter, value) {
-		return await this.#request("SET_PARAMETER", `/${this.sessionId}`, `${parameter}: ${value}\r\n`, { "Content-Type": "text/parameters" });
+		return await this.exchange("SET_PARAMETER", `/${this.sessionId}`, {
+			contentType: "text/parameters",
+			body: `${parameter}: ${value}\r\n`,
+			allowError: true
+		});
 	}
 	async teardown(path, headers = {}, timeout = HTTP_TIMEOUT) {
-		return await this.#request("TEARDOWN", path, null, headers, timeout);
-	}
-	#cleanup() {
-		if (this.#requestTimer) {
-			clearTimeout(this.#requestTimer);
-			this.#requestTimer = void 0;
-		}
-		this.#buffer = Buffer.alloc(0);
-		this.#reject = void 0;
-		this.#resolve = void 0;
-		this.#requesting = false;
-	}
-	#handle(data, err) {
-		if (this.#requestTimer) {
-			clearTimeout(this.#requestTimer);
-			this.#requestTimer = void 0;
-		}
-		if (err) this.#reject?.(err);
-		else this.#resolve?.(data);
-		this.#reject = void 0;
-		this.#resolve = void 0;
-		this.#requesting = false;
-	}
-	#request(method, path, body, headers, timeout = HTTP_TIMEOUT) {
-		if (this.#requesting) return Promise.reject(/* @__PURE__ */ new Error("Another request is currently being made."));
-		this.#requesting = true;
-		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, this.#activeRemoteId, this.#dacpId, this.#sessionId)), Buffer.from(body)]);
-		} else {
-			headers["Content-Length"] = 0;
-			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) data = this.encrypt(data);
-		return new Promise((resolve, reject) => {
-			this.#reject = reject;
-			this.#resolve = resolve;
-			this.#requestTimer = setTimeout(() => this.#handle(void 0, /* @__PURE__ */ new Error("Request timed out")), timeout);
-			this.write(data);
+		return await this.exchange("TEARDOWN", path, {
+			headers,
+			timeout,
+			allowError: true
 		});
 	}
-	#onClose() {
-		this.#cleanup();
-		this.#handle(void 0, /* @__PURE__ */ new Error("Connection closed."));
-		this.context.logger.net("[control]", "#onClose()");
-	}
-	#onData(data) {
-		try {
-			this.#buffer = Buffer.concat([this.#buffer, data]);
-			if (this.isEncrypted) {
-				const decrypted = this.decrypt(this.#buffer);
-				if (!decrypted) return;
-				this.#buffer = decrypted;
-			}
-			while (this.#buffer.byteLength > 0) {
-				const result = RTSP.makeResponse(this.#buffer);
-				if (result === null) return;
-				this.#buffer = this.#buffer.subarray(result.responseLength);
-				this.#handle(result.response, void 0);
-			}
-		} catch (err) {
-			this.context.logger.error("[control]", "#onData()", err);
-			this.emit("error", err);
-		}
-	}
-	#onError(err) {
-		this.#handle(void 0, err);
-		this.context.logger.error("[control]", "#onError()", err);
+};
+
+//#endregion
+//#region src/baseStream.ts
+var BaseStream = class extends EncryptionAwareConnection {
+	decrypt(data) {
+		return chacha20Decrypt(this._encryption, data);
 	}
-	#onTimeout() {
-		this.#handle(void 0, /* @__PURE__ */ new Error("Request timed out."));
-		this.context.logger.net("[control]", "#onTimeout()");
+	encrypt(data) {
+		return chacha20Encrypt(this._encryption, data);
 	}
 };
 
@@ -11133,19 +11106,13 @@ var EventStream = class extends BaseStream {
 		this.#cleanup();
 		await super.disconnect();
 	}
-	async respond(response) {
-		const body = Buffer.from(await response.arrayBuffer());
-		const header = [];
-		header.push(`RTSP/1.0 ${response.status} ${response.statusText}`);
-		for (const [name, value] of Object.entries(response.headers)) header.push(`${name}: ${value}`);
-		if (body.byteLength > 0) header.push(`Content-Length: ${body.byteLength}`);
-		else header.push("Content-Length: 0");
-		header.push("");
-		header.push("");
-		const headers = header.join("\r\n");
-		let data;
-		if (response.body) data = Buffer.concat([Buffer.from(headers), body]);
-		else data = Buffer.from(headers);
+	respond(status, statusText, headers, body) {
+		let data = buildResponse({
+			status,
+			statusText,
+			headers,
+			body
+		});
 		if (this.isEncrypted) data = this.encrypt(data);
 		this.write(data);
 	}
@@ -11175,15 +11142,10 @@ var EventStream = class extends BaseStream {
 			case "POST /command":
 				const data = Plist.parse(body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength));
 				this.context.logger.info("[event]", "Received event stream request.", data);
-				const response = new Response(null, {
-					status: 200,
-					statusText: "OK",
-					headers: {
-						"Audio-Latency": "0",
-						"CSeq": (headers["CSeq"] ?? 0).toString()
-					}
+				this.respond(200, "OK", {
+					"Audio-Latency": 0,
+					"CSeq": headers["CSeq"] ?? 0
 				});
-				await this.respond(response);
 				break;
 			default:
 				this.context.logger.warn("[event]", "No handler for url", key);
@@ -11205,7 +11167,7 @@ var EventStream = class extends BaseStream {
 				this.#buffer = decrypted;
 			}
 			while (this.#buffer.byteLength > 0) {
-				const result = RTSP.makeRequest(this.#buffer);
+				const result = parseRequest(this.#buffer);
 				if (result === null) return;
 				this.#buffer = this.#buffer.subarray(result.requestLength);
 				await this.#handle(result.method, result.path, result.headers, result.body);
@@ -11368,16 +11330,24 @@ var Protocol = class {
 	disconnect() {
 		try {
 			this.#audioStream?.close();
-		} catch {}
+		} catch (err) {
+			this.#context.logger.warn("[protocol]", "Error closing audio stream", err);
+		}
 		try {
 			this.#dataStream?.destroy();
-		} catch {}
+		} catch (err) {
+			this.#context.logger.warn("[protocol]", "Error destroying data stream", err);
+		}
 		try {
 			this.#eventStream?.destroy();
-		} catch {}
+		} catch (err) {
+			this.#context.logger.warn("[protocol]", "Error destroying event stream", err);
+		}
 		try {
 			this.#controlStream.destroy();
-		} catch {}
+		} catch (err) {
+			this.#context.logger.warn("[protocol]", "Error destroying control stream", err);
+		}
 		this.#audioStream = void 0;
 		this.#dataStream = void 0;
 		this.#eventStream = void 0;
@@ -11388,7 +11358,7 @@ var Protocol = class {
 	}
 	async setupDataStream(sharedSecret, onBeforeConnect) {
 		const seed = randomInt64();
-		const request = Plist.serialize({ streams: [{
+		const response = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, { streams: [{
 			controlType: 2,
 			channelID: uuid().toUpperCase(),
 			seed,
@@ -11397,7 +11367,6 @@ var Protocol = class {
 			wantsDedicatedSocket: true,
 			clientTypeUUID: "1910A70F-DBC0-4242-AF95-115DB30604E1"
 		}] });
-		const response = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, Buffer.from(request), { "Content-Type": "application/x-apple-binary-plist" });
 		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.");
@@ -11427,8 +11396,7 @@ var Protocol = class {
 			body.timingPort = this.#timingServer.port;
 			body.timingProtocol = "NTP";
 		}
-		const request = Plist.serialize(body);
-		const response = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, Buffer.from(request), { "Content-Type": "application/x-apple-binary-plist" });
+		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.");
@@ -11466,8 +11434,7 @@ var Protocol = class {
 			body.timingPort = this.#timingServer.port;
 			body.timingProtocol = "NTP";
 		}
-		const request = Plist.serialize(body);
-		const response = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, Buffer.from(request), { "Content-Type": "application/x-apple-binary-plist" });
+		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.");
@@ -11499,14 +11466,14 @@ var Protocol = class {
 			setupBody.timingPort = this.#timingServer.port;
 			setupBody.timingProtocol = "NTP";
 		} else setupBody.timingProtocol = "None";
-		const setupResponse = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, Buffer.from(Plist.serialize(setupBody)), { "Content-Type": "application/x-apple-binary-plist" });
+		const setupResponse = await this.#controlStream.setup(`/${this.#controlStream.sessionId}`, setupBody);
 		if (setupResponse.status !== 200) throw new Error(`Failed to setup for playback: ${setupResponse.status}`);
 		const eventPort = Plist.parse(await setupResponse.arrayBuffer()).eventPort & 65535;
 		this.#eventStream = new EventStream(this.#context, this.#controlStream.address, eventPort);
 		this.#eventStream.setup(sharedSecret);
 		await this.#eventStream.connect();
 		await this.#controlStream.record(`/${this.#controlStream.sessionId}`);
-		const playBody = Plist.serialize({
+		const response = await this.#controlStream.post("/play", {
 			"Content-Location": url,
 			"Start-Position-Seconds": position,
 			uuid: this.#sessionUUID.toUpperCase(),
@@ -11520,7 +11487,6 @@ var Protocol = class {
 			model: "iPhone16,2",
 			SenderMACAddress: getMacAddress().toUpperCase()
 		});
-		const response = await this.#controlStream.post("/play", Buffer.from(playBody), { "Content-Type": "application/x-apple-binary-plist" });
 		this.context.logger.info("[protocol]", `play_url response: ${response.status}`);
 		if (response.status !== 200) throw new Error(`Failed to play URL: ${response.status}`);
 		await this.#putProperty("isInterestedInDateRange", { value: true });
@@ -11540,7 +11506,7 @@ var Protocol = class {
 		} });
 	}
 	async #putProperty(property, body) {
-		await this.#controlStream.put(`/setProperty?${property}`, Buffer.from(Plist.serialize(body)), { "Content-Type": "application/x-apple-binary-plist" });
+		await this.#controlStream.put(`/setProperty?${property}`, body);
 	}
 	async setupAudioStream(source) {
 		this.#audioStream = new AudioStream(this);
@@ -11792,4 +11758,4 @@ function getExtension(message, extension) {
 }
 
 //#endregion
-export { AudioStream, BaseStream, ControlStream, DataStream, dataStreamMessages_exports as DataStreamMessage, EventStream, Pairing, proto_exports as Proto, Protocol, Verify };
+export { 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.16",
+    "version": "0.9.18",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -48,9 +48,10 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-common": "0.9.16",
-        "@basmilius/apple-encoding": "0.9.16",
-        "@basmilius/apple-encryption": "0.9.16"
+        "@basmilius/apple-common": "0.9.18",
+        "@basmilius/apple-encoding": "0.9.18",
+        "@basmilius/apple-encryption": "0.9.18",
+        "@basmilius/apple-rtsp": "0.9.18"
     },
     "devDependencies": {
         "@bufbuild/buf": "^1.66.1",