@basmilius/apple-airplay 0.13.2 → 0.13.4

package/dist/index.mjs

@@ -12926,21 +12926,26 @@ 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;
-		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);
-		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);
+	try {
+		while (offset < data.length) {
+			if (offset + 2 > data.length) return false;
+			const frameLength = data.readUInt16LE(offset);
+			offset += 2;
+			if (frameLength === 0) throw new Error("Corrupt encrypted frame: zero-length frame");
+			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);
+	} catch (err) {
+		state.readCount = readCount;
+		throw err;
+	}
 }
 /**
 * Encrypts data using AirPlay's ChaCha20-Poly1305 frame format.
@@ -13790,6 +13795,8 @@ var DataStream = class extends BaseStream {
 				if (command === "sync") this.reply(parseHeaderSeqno(header));
 			}
 		} catch (err) {
+			this.#encryptedBuffer = Buffer.alloc(0);
+			this.#buffer = Buffer.alloc(0);
 			this.context.logger.error("[data]", "onStreamData()", err);
 			this.emit("error", err);
 		}
@@ -14203,6 +14210,8 @@ var EventStream = class extends BaseStream {
 				await this.#handle(result.method, result.path, result.headers, result.body);
 			}
 		} catch (err) {
+			this.#encryptedBuffer = Buffer.alloc(0);
+			this.#buffer = Buffer.alloc(0);
 			this.context.logger.error("[event]", "onStreamData()", err);
 			this.emit("error", err);
 		}
@@ -14872,6 +14881,7 @@ var Protocol = class {
 				timescale: 0
 			} });
 		} catch (err) {
+			this.#stopPlayUrlFeedback();
 			try {
 				await this.#controlStream.teardown(`/${this.#controlStream.sessionId}`);
 			} catch (teardownErr) {

package/package.json

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