@lox-audioserver/node-airplay-sender 0.4.0 → 0.4.1

package/dist/core/deviceAirtunes.d.ts

@@ -65,8 +65,6 @@ type AirTunesDeviceInstance = EventEmitter & {
     relayAudio: () => void;
     cleanup: () => void;
     onUnderrun?: () => void;
-    audioNonce: number;
-    packetsSent: number;
 };
 /**
  * Construct a RAOP/AirPlay device handler.

package/dist/core/deviceAirtunes.js

@@ -133,6 +133,7 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
     this.airplay2 = options?.airplay2 ?? false;
     this.txt = Array.isArray(txt) ? txt : txt ? [String(txt)] : [];
     this.borkedshp = false;
+    this.transient = false;
     if (this.airplay2 && this.mode === 0) {
         this.mode = 2;
     }
@@ -165,6 +166,9 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
         ...(features_set.length > 0 ? parseInt(features_set[0], 10).toString(2).split('') : []),
         ...(features_set.length > 1 ? parseInt(features_set[1], 10).toString(2).split('') : []),
     ];
+    if (this.features.length > 0) {
+        this.transient = this.features[this.features.length - 1 - 48] === '1';
+    }
     if (this.statusflags.length) {
         let PasswordRequired = (this.statusflags[this.statusflags.length - 1 - 7] == '1');
         let PinRequired = (this.statusflags[this.statusflags.length - 1 - 3] == '1');
@@ -172,6 +176,10 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
         // console.debug('needPss', PasswordRequired, PinRequired, OneTimePairingRequired);
         this.needPassword = PasswordRequired;
         this.needPin = (PinRequired || OneTimePairingRequired);
+        this.transient = !(PasswordRequired || PinRequired || OneTimePairingRequired);
+    }
+    if (this.airplay2 && this.statusflags.length === 0 && !this.needPassword && !this.needPin) {
+        this.transient = true;
     }
     // console.debug('transient', this.transient);
     // detect old shairports with broken text
@@ -220,17 +228,14 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
     this.audioCallback = null;
     this.encoder = [];
     this.credentials = null;
-    this.audioNonce = Math.floor(Math.random() * 0xffffffff);
     this.onUnderrun = () => {
         this.encoder = [];
         this.logLine?.('underrun_encoder_reset');
-        this.audioNonce = Math.floor(Math.random() * 0xffffffff);
         if (this.credentials) {
             this.credentials.encryptCount = 0;
             this.credentials.decryptCount = 0;
         }
     };
-    this.packetsSent = 0;
     // this.func = `
     // const {Worker, isMainThread, parentPort, workerData} = require('node:worker_threads');
     // var { WebSocketServer } = require('ws');
@@ -336,9 +341,7 @@ AirTunesDevice.prototype.relayAudio = function () {
         return;
     }
     this.audioCallback = (packet) => {
-        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec, this.deviceMagic, this.audioNonce);
-        this.packetsSent += 1;
-        this.audioNonce = (this.audioNonce + 1) >>> 0;
+        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec, this.deviceMagic);
         try {
             this.audioPacketHistory?.add(packet.seq, airTunes);
         }
@@ -411,11 +414,6 @@ AirTunesDevice.prototype.cleanup = function () {
         this.audioCallback = null;
     }
     this.encoder = [];
-    this.audioNonce = Math.floor(Math.random() * 0xffffffff);
-    if (this.credentials) {
-        this.credentials.rotateKeys?.();
-    }
-    this.packetsSent = 0;
     this.udpServers.close();
     this.removeAllListeners();
     this.rtsp = null;
@@ -465,7 +463,7 @@ AirTunesDevice.prototype.setPasscode = function (password) {
     this.rtsp.setPasscode(password);
 };
 exports.default = AirTunesDevice;
-function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = true, credentials = null, inputCodec = 'pcm', deviceMagic = config_1.default.device_magic, audioNonce = packet.seq) {
+function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = true, credentials = null, inputCodec = 'pcm', deviceMagic = config_1.default.device_magic) {
     const useAlacInput = inputCodec === 'alac';
     var alac = useAlacInput
         ? packet.pcm
@@ -478,7 +476,7 @@ function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = t
         alac = encryptAES(alac, alac.length);
     }
     if (credentials) {
-        let pcm = credentials.encryptAudio(alac, header.slice(4, 12), audioNonce);
+        let pcm = credentials.encryptAudio(alac, header.slice(4, 12), packet.seq);
         let airplay = Buffer.alloc(RTP_HEADER_SIZE + pcm.length);
         header.copy(airplay);
         pcm.copy(airplay, RTP_HEADER_SIZE);

package/dist/esm/core/deviceAirtunes.js

@@ -133,6 +133,7 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
     this.airplay2 = options?.airplay2 ?? false;
     this.txt = Array.isArray(txt) ? txt : txt ? [String(txt)] : [];
     this.borkedshp = false;
+    this.transient = false;
     if (this.airplay2 && this.mode === 0) {
         this.mode = 2;
     }
@@ -165,6 +166,9 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
         ...(features_set.length > 0 ? parseInt(features_set[0], 10).toString(2).split('') : []),
         ...(features_set.length > 1 ? parseInt(features_set[1], 10).toString(2).split('') : []),
     ];
+    if (this.features.length > 0) {
+        this.transient = this.features[this.features.length - 1 - 48] === '1';
+    }
     if (this.statusflags.length) {
         let PasswordRequired = (this.statusflags[this.statusflags.length - 1 - 7] == '1');
         let PinRequired = (this.statusflags[this.statusflags.length - 1 - 3] == '1');
@@ -172,6 +176,10 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
         // console.debug('needPss', PasswordRequired, PinRequired, OneTimePairingRequired);
         this.needPassword = PasswordRequired;
         this.needPin = (PinRequired || OneTimePairingRequired);
+        this.transient = !(PasswordRequired || PinRequired || OneTimePairingRequired);
+    }
+    if (this.airplay2 && this.statusflags.length === 0 && !this.needPassword && !this.needPin) {
+        this.transient = true;
     }
     // console.debug('transient', this.transient);
     // detect old shairports with broken text
@@ -220,17 +228,14 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
     this.audioCallback = null;
     this.encoder = [];
     this.credentials = null;
-    this.audioNonce = Math.floor(Math.random() * 0xffffffff);
     this.onUnderrun = () => {
         this.encoder = [];
         this.logLine?.('underrun_encoder_reset');
-        this.audioNonce = Math.floor(Math.random() * 0xffffffff);
         if (this.credentials) {
             this.credentials.encryptCount = 0;
             this.credentials.decryptCount = 0;
         }
     };
-    this.packetsSent = 0;
     // this.func = `
     // const {Worker, isMainThread, parentPort, workerData} = require('node:worker_threads');
     // var { WebSocketServer } = require('ws');
@@ -336,9 +341,7 @@ AirTunesDevice.prototype.relayAudio = function () {
         return;
     }
     this.audioCallback = (packet) => {
-        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec, this.deviceMagic, this.audioNonce);
-        this.packetsSent += 1;
-        this.audioNonce = (this.audioNonce + 1) >>> 0;
+        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec, this.deviceMagic);
         try {
             this.audioPacketHistory?.add(packet.seq, airTunes);
         }
@@ -411,11 +414,6 @@ AirTunesDevice.prototype.cleanup = function () {
         this.audioCallback = null;
     }
     this.encoder = [];
-    this.audioNonce = Math.floor(Math.random() * 0xffffffff);
-    if (this.credentials) {
-        this.credentials.rotateKeys?.();
-    }
-    this.packetsSent = 0;
     this.udpServers.close();
     this.removeAllListeners();
     this.rtsp = null;
@@ -465,7 +463,7 @@ AirTunesDevice.prototype.setPasscode = function (password) {
     this.rtsp.setPasscode(password);
 };
 exports.default = AirTunesDevice;
-function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = true, credentials = null, inputCodec = 'pcm', deviceMagic = config_1.default.device_magic, audioNonce = packet.seq) {
+function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = true, credentials = null, inputCodec = 'pcm', deviceMagic = config_1.default.device_magic) {
     const useAlacInput = inputCodec === 'alac';
     var alac = useAlacInput
         ? packet.pcm
@@ -478,7 +476,7 @@ function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = t
         alac = encryptAES(alac, alac.length);
     }
     if (credentials) {
-        let pcm = credentials.encryptAudio(alac, header.slice(4, 12), audioNonce);
+        let pcm = credentials.encryptAudio(alac, header.slice(4, 12), packet.seq);
         let airplay = Buffer.alloc(RTP_HEADER_SIZE + pcm.length);
         header.copy(airplay);
         pcm.copy(airplay, RTP_HEADER_SIZE);

package/dist/esm/homekit/credentials.js

@@ -90,11 +90,12 @@ class Credentials {
         }
         return result;
     }
-    encryptAudio(message, aad, nonce) {
-        return Buffer.concat([
-            Buffer.concat(encryption_1.default.encryptAndSeal(message, aad, struct.pack("Q", nonce), this.writeKey)),
-            Buffer.from(struct.pack("Q", nonce)),
-        ]);
+    encryptAudio(message, aad, seq) {
+        const nonce = Buffer.alloc(12, 0);
+        nonce.writeUInt16BE(seq & 0xffff, 4);
+        const [cipher, tag] = encryption_1.default.encryptAndSeal(message, aad, nonce, this.writeKey);
+        // Reference appends auth tag and nonce (without leading zeros)
+        return Buffer.concat([cipher, tag, nonce.slice(4)]);
     }
     rotateKeys() {
         const info = Buffer.from('AirPlay:Audio', 'utf-8'); // reference-style info

package/dist/homekit/credentials.d.ts

@@ -25,7 +25,7 @@ declare class Credentials {
     toString(): string;
     encrypt(message: Buffer): Buffer;
     decrypt(message: Buffer): Buffer;
-    encryptAudio(message: Buffer, aad: Buffer | null, nonce: number): Buffer;
+    encryptAudio(message: Buffer, aad: Buffer | null, seq: number): Buffer;
     rotateKeys(): void;
 }
 export { Credentials };

package/dist/homekit/credentials.js

@@ -90,11 +90,12 @@ class Credentials {
         }
         return result;
     }
-    encryptAudio(message, aad, nonce) {
-        return Buffer.concat([
-            Buffer.concat(encryption_1.default.encryptAndSeal(message, aad, struct.pack("Q", nonce), this.writeKey)),
-            Buffer.from(struct.pack("Q", nonce)),
-        ]);
+    encryptAudio(message, aad, seq) {
+        const nonce = Buffer.alloc(12, 0);
+        nonce.writeUInt16BE(seq & 0xffff, 4);
+        const [cipher, tag] = encryption_1.default.encryptAndSeal(message, aad, nonce, this.writeKey);
+        // Reference appends auth tag and nonce (without leading zeros)
+        return Buffer.concat([cipher, tag, nonce.slice(4)]);
     }
     rotateKeys() {
         const info = Buffer.from('AirPlay:Audio', 'utf-8'); // reference-style info

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lox-audioserver/node-airplay-sender",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "AirPlay sender (RAOP/AirPlay 1; AirPlay 2 control/auth, best-effort audio)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",