@basmilius/apple-raop 0.9.16 → 0.9.18

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { Socket } from "node:dgram";
 import { EventEmitter } from "node:events";
-import { AudioSource, Connection, Context, DiscoveryResult, TimingServer } from "@basmilius/apple-common";
+import { AudioSource, Context, DiscoveryResult, TimingServer } from "@basmilius/apple-common";
+import { RtspClient } from "@basmilius/apple-rtsp";
 
 //#region src/types.d.ts
 type MediaMetadata = {
@@ -101,7 +102,7 @@ declare class ControlClient extends EventEmitter {
 }
 //#endregion
 //#region src/rtspClient.d.ts
-declare class RtspClient extends Connection<{}> {
+declare class RaopRtspClient extends RtspClient {
   #private;
   get activeRemoteId(): string;
   get dacpId(): string;
@@ -113,6 +114,7 @@ declare class RtspClient extends Connection<{}> {
     remoteIp: string;
   };
   constructor(context: Context, address: string, port: number);
+  protected getDefaultHeaders(): Record<string, string | number>;
   info(): Promise<Record<string, unknown>>;
   authSetup(): Promise<void>;
   announce(bytesPerChannel: number, channels: number, sampleRate: number, password?: string): Promise<Response>;
@@ -152,7 +154,7 @@ declare class StreamClient extends EventEmitter<EventMap$1> {
   #private;
   get info(): Record<string, unknown>;
   get playbackInfo(): PlaybackInfo;
-  constructor(context: Context, rtsp: RtspClient, streamContext: StreamContext, protocol: StreamProtocol, settings: Settings, timingServer: TimingServer);
+  constructor(context: Context, rtsp: RaopRtspClient, streamContext: StreamContext, protocol: StreamProtocol, settings: Settings, timingServer: TimingServer);
   close(): void;
   initialize(properties: Map<string, string>): Promise<void>;
   stop(): void;
@@ -185,4 +187,4 @@ declare class RaopClient extends EventEmitter<EventMap> {
   static discover(deviceId: string, timingServer: TimingServer): Promise<RaopClient>;
 }
 //#endregion
-export { AudioPacketHeader, ControlClient, EncryptionType, MediaMetadata, MetadataType, PacketFifo, PlaybackInfo, RaopClient, RaopListener, RetransmitRequest, RtspClient, Settings, Statistics, StreamClient, StreamContext, type StreamOptions, StreamProtocol, SyncPacket, decodeRetransmitRequest, getAudioProperties, getEncryptionTypes, getMetadataTypes, pctToDbfs };
+export { AudioPacketHeader, ControlClient, EncryptionType, MediaMetadata, MetadataType, PacketFifo, PlaybackInfo, RaopClient, RaopListener, RetransmitRequest, RaopRtspClient as RtspClient, Settings, Statistics, StreamClient, StreamContext, type StreamOptions, StreamProtocol, SyncPacket, decodeRetransmitRequest, getAudioProperties, getEncryptionTypes, getMetadataTypes, pctToDbfs };

package/dist/index.mjs

@@ -1,8 +1,9 @@
 import { createSocket } from "node:dgram";
 import { EventEmitter } from "node:events";
-import { DAAP, NTP, Plist, RTSP } from "@basmilius/apple-encoding";
+import { DAAP, NTP, Plist } from "@basmilius/apple-encoding";
 import { createHash } from "node:crypto";
-import { Connection, Context, Discovery, HTTP_TIMEOUT, generateActiveRemoteId, generateDacpId, generateSessionId, waitFor } from "@basmilius/apple-common";
+import { Context, Discovery, generateActiveRemoteId, generateDacpId, generateSessionId, waitFor } from "@basmilius/apple-common";
+import { RtspClient } from "@basmilius/apple-rtsp";
 
 //#region src/types.ts
 let EncryptionType = /* @__PURE__ */ function(EncryptionType) {
@@ -253,9 +254,6 @@ function getDigestPayload(method, uri, info) {
 	const response = createHash("md5").update(`${ha1}:${info.nonce}:${ha2}`).digest("hex");
 	return `Digest username="${info.username}", realm="${info.realm}", nonce="${info.nonce}", uri="${uri}", response="${response}"`;
 }
-function generateRandomSessionId() {
-	return Math.floor(Math.random() * 4294967295);
-}
 function buildAnnouncePayload(options) {
 	return [
 		"v=0",
@@ -268,7 +266,7 @@ function buildAnnouncePayload(options) {
 		`a=fmtp:96 ${FRAMES_PER_PACKET$1} 0 ${options.bitsPerChannel} 40 10 14 ${options.channels} 255 0 0 ${options.sampleRate}`
 	].join("\r\n") + "\r\n";
 }
-var RtspClient = class extends Connection {
+var RaopRtspClient = class extends RtspClient {
 	get activeRemoteId() {
 		return this.#activeRemoteId;
 	}
@@ -295,41 +293,48 @@ var RtspClient = class extends Connection {
 	#rtspSessionId;
 	#sessionId;
 	#localIp = "0.0.0.0";
-	#buffer = Buffer.alloc(0);
-	#cseq = 0;
 	#digestInfo;
-	#requests = /* @__PURE__ */ new Map();
 	constructor(context, address, port) {
 		super(context, address, port);
 		this.#activeRemoteId = generateActiveRemoteId();
 		this.#dacpId = generateDacpId();
 		this.#rtspSessionId = generateSessionId();
-		this.#sessionId = generateRandomSessionId();
-		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));
-		this.on("connect", this.#onConnect.bind(this));
+		this.#sessionId = Math.floor(Math.random() * 4294967295);
+		this.on("connect", () => {
+			this.#localIp = "0.0.0.0";
+		});
+	}
+	getDefaultHeaders() {
+		const headers = {
+			"DACP-ID": this.#dacpId,
+			"Active-Remote": this.#activeRemoteId,
+			"Client-Instance": this.#dacpId,
+			"User-Agent": USER_AGENT
+		};
+		if (this.#digestInfo) headers["Authorization"] = getDigestPayload("", this.uri, this.#digestInfo);
+		return headers;
 	}
 	async info() {
 		try {
-			const response = await this.#exchange("GET", "/info", { allowError: true });
+			const response = await this.exchange("GET", "/info", { allowError: true });
 			if (response.ok) {
 				const buffer = Buffer.from(await response.arrayBuffer());
 				if (buffer.length > 0) try {
 					return Plist.parse(buffer.buffer);
-				} catch {
+				} catch (err) {
+					this.context.logger.warn("[raop-rtsp]", "Failed to parse info plist", err);
 					return {};
 				}
 			}
 			return {};
-		} catch {
+		} catch (err) {
+			this.context.logger.warn("[raop-rtsp]", "Failed to get device info", err);
 			return {};
 		}
 	}
 	async authSetup() {
 		const body = Buffer.concat([AUTH_SETUP_UNENCRYPTED, CURVE25519_PUB_KEY]);
-		await this.#exchange("POST", "/auth-setup", {
+		await this.exchange("POST", "/auth-setup", {
 			contentType: "application/octet-stream",
 			body,
 			protocol: "HTTP/1.1"
@@ -344,7 +349,7 @@ var RtspClient = class extends Connection {
 			channels,
 			sampleRate
 		});
-		let response = await this.#exchange("ANNOUNCE", void 0, {
+		let response = await this.exchange("ANNOUNCE", this.uri, {
 			contentType: "application/sdp",
 			body,
 			allowError: !!password
@@ -360,7 +365,7 @@ var RtspClient = class extends Connection {
 						password,
 						nonce: parts[3]
 					};
-					response = await this.#exchange("ANNOUNCE", void 0, {
+					response = await this.exchange("ANNOUNCE", this.uri, {
 						contentType: "application/sdp",
 						body
 					});
@@ -370,19 +375,19 @@ var RtspClient = class extends Connection {
 		return response;
 	}
 	async setup(headers, body) {
-		return await this.#exchange("SETUP", void 0, {
+		return await this.exchange("SETUP", this.uri, {
 			headers,
 			body
 		});
 	}
 	async record(headers) {
-		await this.#exchange("RECORD", void 0, { headers });
+		await this.exchange("RECORD", this.uri, { headers });
 	}
 	async flush(options) {
-		await this.#exchange("FLUSH", void 0, { headers: options.headers });
+		await this.exchange("FLUSH", this.uri, { headers: options.headers });
 	}
 	async setParameter(name, value) {
-		await this.#exchange("SET_PARAMETER", void 0, {
+		await this.exchange("SET_PARAMETER", this.uri, {
 			contentType: "text/parameters",
 			body: `${name}: ${value}`
 		});
@@ -394,7 +399,7 @@ var RtspClient = class extends Connection {
 			album: metadata.album,
 			duration: metadata.duration
 		});
-		await this.#exchange("SET_PARAMETER", void 0, {
+		await this.exchange("SET_PARAMETER", this.uri, {
 			contentType: "application/x-dmap-tagged",
 			headers: {
 				"Session": session,
@@ -406,7 +411,7 @@ var RtspClient = class extends Connection {
 	async setArtwork(session, rtpseq, rtptime, artwork) {
 		let contentType = "image/jpeg";
 		if (artwork[0] === 137 && artwork[1] === 80) contentType = "image/png";
-		await this.#exchange("SET_PARAMETER", void 0, {
+		await this.exchange("SET_PARAMETER", this.uri, {
 			contentType,
 			headers: {
 				"Session": session,
@@ -416,111 +421,10 @@ var RtspClient = class extends Connection {
 		});
 	}
 	async feedback(allowError = false) {
-		return await this.#exchange("POST", "/feedback", { allowError });
+		return await this.exchange("POST", "/feedback", { allowError });
 	}
 	async teardown(session) {
-		await this.#exchange("TEARDOWN", void 0, { headers: { "Session": session } });
-	}
-	async #exchange(method, uri, options = {}) {
-		const { contentType, headers: extraHeaders = {}, allowError = false, protocol = "RTSP/1.0", timeout = HTTP_TIMEOUT } = options;
-		let { body } = options;
-		const cseq = this.#cseq++;
-		const targetUri = uri ?? this.uri;
-		const headers = {
-			"CSeq": cseq,
-			"DACP-ID": this.#dacpId,
-			"Active-Remote": this.#activeRemoteId,
-			"Client-Instance": this.#dacpId,
-			"User-Agent": USER_AGENT
-		};
-		if (this.#digestInfo) headers["Authorization"] = getDigestPayload(method, targetUri, this.#digestInfo);
-		Object.assign(headers, extraHeaders);
-		if (body && typeof body === "object" && !Buffer.isBuffer(body)) {
-			headers["Content-Type"] = "application/x-apple-binary-plist";
-			body = Buffer.from(Plist.serialize(body));
-		} else if (contentType) headers["Content-Type"] = contentType;
-		let bodyBuffer;
-		if (body) {
-			bodyBuffer = typeof body === "string" ? Buffer.from(body) : body;
-			headers["Content-Length"] = bodyBuffer.length;
-		} else headers["Content-Length"] = 0;
-		const headerLines = [
-			`${method} ${targetUri} ${protocol}`,
-			...Object.entries(headers).map(([k, v]) => `${k}: ${v}`),
-			"",
-			""
-		].join("\r\n");
-		const data = bodyBuffer ? Buffer.concat([Buffer.from(headerLines), bodyBuffer]) : Buffer.from(headerLines);
-		this.context.logger.net("[rtsp]", method, targetUri, `cseq=${cseq}`);
-		return new Promise((resolve, reject) => {
-			this.#requests.set(cseq, {
-				resolve,
-				reject
-			});
-			const timer = setTimeout(() => {
-				this.#requests.delete(cseq);
-				reject(/* @__PURE__ */ new Error(`No response to CSeq ${cseq} (${targetUri})`));
-			}, timeout);
-			this.write(data);
-			const originalResolve = resolve;
-			this.#requests.set(cseq, {
-				resolve: (response) => {
-					clearTimeout(timer);
-					if (!allowError && !response.ok) reject(/* @__PURE__ */ new Error(`RTSP error: ${response.status} ${response.statusText}`));
-					else originalResolve(response);
-				},
-				reject: (error) => {
-					clearTimeout(timer);
-					reject(error);
-				}
-			});
-		});
-	}
-	#onConnect() {
-		this.#localIp = "0.0.0.0";
-	}
-	#onClose() {
-		this.#buffer = Buffer.alloc(0);
-		for (const [cseq, { reject }] of this.#requests) {
-			reject(/* @__PURE__ */ new Error("Connection closed"));
-			this.#requests.delete(cseq);
-		}
-		this.context.logger.net("[rtsp]", "#onClose()");
-	}
-	#onData(data) {
-		try {
-			this.#buffer = Buffer.concat([this.#buffer, data]);
-			while (this.#buffer.byteLength > 0) {
-				const result = RTSP.makeResponse(this.#buffer);
-				if (result === null) return;
-				this.#buffer = this.#buffer.subarray(result.responseLength);
-				const cseqHeader = result.response.headers.get("CSeq");
-				const cseq = cseqHeader ? parseInt(cseqHeader, 10) : -1;
-				if (this.#requests.has(cseq)) {
-					const { resolve } = this.#requests.get(cseq);
-					this.#requests.delete(cseq);
-					resolve(result.response);
-				} else this.context.logger.warn("[rtsp]", `Unexpected response for CSeq ${cseq}`);
-			}
-		} catch (err) {
-			this.context.logger.error("[rtsp]", "#onData()", err);
-			this.emit("error", err);
-		}
-	}
-	#onError(err) {
-		for (const [cseq, { reject }] of this.#requests) {
-			reject(err);
-			this.#requests.delete(cseq);
-		}
-		this.context.logger.error("[rtsp]", "#onError()", err);
-	}
-	#onTimeout() {
-		const err = /* @__PURE__ */ new Error("Connection timed out");
-		for (const [cseq, { reject }] of this.#requests) {
-			reject(err);
-			this.#requests.delete(cseq);
-		}
-		this.context.logger.net("[rtsp]", "#onTimeout()");
+		await this.exchange("TEARDOWN", this.uri, { headers: { "Session": session } });
 	}
 };
 
@@ -833,7 +737,7 @@ var RaopClient = class RaopClient extends EventEmitter {
 	}
 	static async create(discoveryResult, timingServer) {
 		const context = new Context(discoveryResult.id);
-		const rtsp = new RtspClient(context, discoveryResult.address, discoveryResult.service.port);
+		const rtsp = new RaopRtspClient(context, discoveryResult.address, discoveryResult.service.port);
 		await rtsp.connect();
 		const streamContext = createStreamContext();
 		streamContext.rtspSession = rtsp.rtspSessionId;
@@ -879,7 +783,9 @@ var RaopStreamProtocol = class {
 		this.#feedbackInterval = setInterval(async () => {
 			try {
 				await this.#rtsp.feedback(true);
-			} catch {}
+			} catch (err) {
+				this.#rtsp.context.logger.warn("[raop]", "Feedback failed", err);
+			}
 		}, 2e3);
 	}
 	async sendAudioPacket(transport, header, audio) {
@@ -924,4 +830,4 @@ function createStreamContext() {
 }
 
 //#endregion
-export { AudioPacketHeader, ControlClient, EncryptionType, MetadataType, PacketFifo, RaopClient, RtspClient, Statistics, StreamClient, SyncPacket, decodeRetransmitRequest, getAudioProperties, getEncryptionTypes, getMetadataTypes, pctToDbfs };
+export { AudioPacketHeader, ControlClient, EncryptionType, MetadataType, PacketFifo, RaopClient, RaopRtspClient as RtspClient, Statistics, StreamClient, SyncPacket, decodeRetransmitRequest, getAudioProperties, getEncryptionTypes, getMetadataTypes, pctToDbfs };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-raop",
     "description": "Implementation of Apple's RAOP protocol in Node.js.",
-    "version": "0.9.16",
+    "version": "0.9.18",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -46,9 +46,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": {
         "@types/bun": "^1.3.11",