@basmilius/apple-airplay 0.0.87 → 0.0.89

package/dist/index.js

@@ -1660,8 +1660,7 @@ class AirPlayStream extends EncryptionAwareConnection {
       const aad = data.subarray(offset, offset + 2);
       const ciphertext = data.subarray(offset + 2, offset + 2 + length);
       const authTag = data.subarray(offset + 2 + length, offset + 2 + length + 16);
-      const nonce = Buffer.alloc(12);
-      nonce.writeBigUInt64LE(BigInt(this.#encryption.readCount++), 4);
+      const nonce = this.nonce(this.#encryption.readCount++);
       const plaintext = Chacha20.decrypt(this.#encryption.readKey, nonce, aad, ciphertext, authTag);
       result = Buffer.concat([result, plaintext]);
       offset += totalChunkLength;
@@ -1675,14 +1674,19 @@ class AirPlayStream extends EncryptionAwareConnection {
       const length = Math.min(total - offset, 1024);
       const leLength = Buffer.alloc(2);
       leLength.writeUInt16LE(length, 0);
-      const nonce = Buffer.alloc(12);
-      nonce.writeBigUInt64LE(BigInt(this.#encryption.writeCount++), 4);
+      const nonce = this.nonce(this.#encryption.writeCount++);
       const encrypted = Chacha20.encrypt(this.#encryption.writeKey, nonce, leLength, data.subarray(offset, offset + length));
       offset += length;
       result = Buffer.concat([result, leLength, encrypted.ciphertext, encrypted.authTag]);
     }
     return result;
   }
+  nonce(counter) {
+    const nonceArray = new Uint8Array(12);
+    const view = new DataView(nonceArray.buffer);
+    view.setBigUint64(4, BigInt(counter), true);
+    return Buffer.from(nonceArray);
+  }
 }
 
 // src/dataStream.ts
@@ -1862,7 +1866,8 @@ class AirPlayDataStream extends AirPlayStream {
         }
       }
     } catch (err) {
-      reporter.error("Error in onData", err);
+      reporter.error("Error in data stream onData()", err);
+      this.emit("error", err);
     }
   }
   async#decrypt(data) {
@@ -1876,8 +1881,7 @@ class AirPlayDataStream extends AirPlayStream {
       }
       const frameLength = data.readUInt16LE(offset);
       offset += 2;
-      const nonce = Buffer.alloc(12);
-      nonce.writeBigUInt64LE(BigInt(readCount++), 4);
+      const nonce = this.nonce(readCount++);
       const end = offset + frameLength + 16;
       if (end > data.length) {
         reporter.warn(`Truncated frame end=${end} length=${data.length}`);
@@ -1900,8 +1904,7 @@ class AirPlayDataStream extends AirPlayStream {
       offset += frame.length;
       const leLength = Buffer.alloc(2);
       leLength.writeUInt16LE(frame.length, 0);
-      const nonce = Buffer.alloc(12);
-      nonce.writeBigUInt64LE(BigInt(this.#encryption.writeCount++), 4);
+      const nonce = this.nonce(this.#encryption.writeCount++);
       const encrypted = Chacha202.encrypt(this.#encryption.writeKey, nonce, leLength, frame);
       result.push(leLength, encrypted.ciphertext, encrypted.authTag);
     }

package/dist/stream.d.ts

@@ -9,4 +9,5 @@ export default class AirPlayStream<TEventMap extends Record<string, any>> extend
 	#private;
 	decrypt(data: Buffer): Promise<Buffer>;
 	encrypt(data: Buffer): Promise<Buffer>;
+	nonce(counter: number): Buffer;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-airplay",
     "description": "Implementation of Apple's AirPlay2 in Node.js.",
-    "version": "0.0.87",
+    "version": "0.0.89",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -41,8 +41,8 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-common": "0.0.87",
-        "@basmilius/apple-encoding": "0.0.87",
+        "@basmilius/apple-common": "0.0.89",
+        "@basmilius/apple-encoding": "0.0.89",
         "@bufbuild/protobuf": "^2.10.2"
     },
     "devDependencies": {