@lox-audioserver/node-airplay-sender 0.4.4 → 0.4.5

package/dist/esm/core/deviceAirtunes.js

@@ -108,12 +108,10 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
     if (!host) {
         throw new Error('host is mandatory');
     }
-    const resendBufferSize = Number(options?.resendBufferSize ?? config_1.default.resend_buffer_size ?? 1000);
-    this.audioPacketHistory = new BufferWithNames(Number.isFinite(resendBufferSize) && resendBufferSize > 0 ? resendBufferSize : 1000);
+    this.audioPacketHistory = new BufferWithNames(100);
     this.udpServers = new udpServers_1.default();
     this.audioOut = audioOut;
     this.type = 'airtunes';
-    this.deviceMagic = Number(options?.deviceMagic ?? config_1.default.device_magic);
     this.options = options;
     this.log = options?.log;
     this.logLine = (...args) => logLine(this, ...args);
@@ -133,7 +131,6 @@ 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;
     }
@@ -156,8 +153,7 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
     }
     this.needPassword = false;
     this.needPin = false;
-    const transientOption = options?.transient;
-    this.transient = typeof transientOption === 'boolean' ? transientOption : false;
+    this.transient = false;
     let d = this.txt.filter((u) => String(u).startsWith('features='));
     if (d.length === 0)
         d = this.txt.filter((u) => String(u).startsWith('ft='));
@@ -167,7 +163,7 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
         ...(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';
+        this.transient = (this.features[this.features.length - 1 - 48] == '1');
     }
     if (this.statusflags.length) {
         let PasswordRequired = (this.statusflags[this.statusflags.length - 1 - 7] == '1');
@@ -228,14 +224,6 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
     this.audioCallback = null;
     this.encoder = [];
     this.credentials = null;
-    this.onUnderrun = () => {
-        this.encoder = [];
-        this.logLine?.('underrun_encoder_reset');
-        if (this.credentials) {
-            this.credentials.encryptCount = 0;
-            this.credentials.decryptCount = 0;
-        }
-    };
     // this.func = `
     // const {Worker, isMainThread, parentPort, workerData} = require('node:worker_threads');
     // var { WebSocketServer } = require('ws');
@@ -309,7 +297,8 @@ AirTunesDevice.prototype.doHandshake = function () {
         this.rtsp.on('ready', () => {
             this.status = 'playing';
             this.emit('status', 'playing');
-            this.relayAudio();
+            if (this.airplay2)
+                this.relayAudio();
         });
         this.rtsp.on('need_password', () => {
             this.emit('status', 'need_password');
@@ -337,17 +326,10 @@ AirTunesDevice.prototype.doHandshake = function () {
     this.rtsp.startHandshake(this.udpServers, this.host, this.port);
 };
 AirTunesDevice.prototype.relayAudio = function () {
-    if (this.audioCallback) {
-        return;
-    }
+    this.status = 'ready';
+    this.emit('status', 'ready');
     this.audioCallback = (packet) => {
-        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec, this.deviceMagic);
-        try {
-            this.audioPacketHistory?.add(packet.seq, airTunes);
-        }
-        catch {
-            /* ignore history errors */
-        }
+        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec);
         // if (self.credentials) {
         //   airTunes = self.credentials.encrypt(airTunes)
         // }
@@ -383,24 +365,10 @@ AirTunesDevice.prototype.relayAudio = function () {
     //     self.sendAirTunesPacket(airTunes);}}
     //     catch (_){}
     //   });
-    this.udpServers.on('resendRequested', (missedSeq, count) => {
-        for (let i = 0; i < count; i += 1) {
-            const seq = missedSeq + i;
-            try {
-                const pkt = this.audioPacketHistory?.getLatestNamed(seq);
-                if (pkt && this.audioSocket) {
-                    this.audioSocket.send(pkt, 0, pkt.length, this.serverPort, this.host);
-                }
-            }
-            catch {
-                // ignore resend errors
-            }
-        }
-    });
     this.audioOut.on('packet', this.audioCallback);
 };
-AirTunesDevice.prototype.onSyncNeeded = function (seq, tsOffsetFrames = 0, rtcp) {
-    this.udpServers.sendControlSync(seq, this, tsOffsetFrames, rtcp, { ssrc: this.deviceMagic }, { ntp: rtcp?.xr?.ntp, ssrc: this.deviceMagic });
+AirTunesDevice.prototype.onSyncNeeded = function (seq) {
+    this.udpServers.sendControlSync(seq, this);
     //if ( this.airplay2)this.rtsp.sendControlSync(seq, this, this.rtsp);
 };
 AirTunesDevice.prototype.cleanup = function () {
@@ -413,7 +381,6 @@ AirTunesDevice.prototype.cleanup = function () {
         this.audioOut.removeListener('packet', this.audioCallback);
         this.audioCallback = null;
     }
-    this.encoder = [];
     this.udpServers.close();
     this.removeAllListeners();
     this.rtsp = null;
@@ -423,11 +390,8 @@ AirTunesDevice.prototype.reportStatus = function () {
 };
 AirTunesDevice.prototype.stop = function (cb) {
     try {
-        if (!this.rtsp) {
-            if (cb)
-                cb();
+        if (!this.rtsp)
             return;
-        }
         this.rtsp.once('end', function () {
             if (cb)
                 cb();
@@ -462,8 +426,11 @@ AirTunesDevice.prototype.setPasscode = function (password) {
         return;
     this.rtsp.setPasscode(password);
 };
+AirTunesDevice.prototype.requireEncryption = function () {
+    return Boolean(this.requireEncryption);
+};
 exports.default = AirTunesDevice;
-function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = true, credentials = null, inputCodec = 'pcm', deviceMagic = config_1.default.device_magic) {
+function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = true, credentials = null, inputCodec = 'pcm') {
     const useAlacInput = inputCodec === 'alac';
     var alac = useAlacInput
         ? packet.pcm
@@ -471,7 +438,7 @@ function makeAirTunesPacket(packet, encoder, requireEncryption, alacEncoding = t
             ? (0, alac_1.encodePcmToAlac)(packet.pcm)
             : pcmParse(packet.pcm);
     var airTunes = Buffer.alloc(alac.length + RTP_HEADER_SIZE);
-    var header = makeRTPHeader(packet, deviceMagic);
+    var header = makeRTPHeader(packet);
     if (requireEncryption) {
         alac = encryptAES(alac, alac.length);
     }
@@ -521,7 +488,7 @@ function encryptAES(alacData, alacSize) {
     }
     return Buffer.concat([result, alacData.slice(end_of_encoded_data)]);
 }
-function makeRTPHeader(packet, deviceMagic) {
+function makeRTPHeader(packet) {
     var header = Buffer.alloc(RTP_HEADER_SIZE);
     if (packet.seq === 0)
         header.writeUInt16BE(0x80e0, 0);
@@ -529,6 +496,6 @@ function makeRTPHeader(packet, deviceMagic) {
         header.writeUInt16BE(0x8060, 0);
     header.writeUInt16BE(nu.low16(packet.seq), 2);
     header.writeUInt32BE(packet.timestamp, 4);
-    header.writeUInt32BE(deviceMagic, 8);
+    header.writeUInt32BE(config_1.default.device_magic, 8);
     return header;
 }

package/dist/esm/core/devices.js

@@ -20,11 +20,11 @@ class Devices extends node_events_1.EventEmitter {
     }
     /** Wire device sync events from AudioOut into individual devices. */
     init() {
-        this.audioOut.on('need_sync', (payload) => {
+        this.audioOut.on('need_sync', (seq) => {
             this.forEach((dev) => {
                 try {
                     if (dev.onSyncNeeded && dev.controlPort) {
-                        dev.onSyncNeeded(payload.seq, payload.tsOffsetFrames ?? 0, payload.rtcp);
+                        dev.onSyncNeeded(seq);
                     }
                 }
                 catch {
@@ -32,18 +32,6 @@ class Devices extends node_events_1.EventEmitter {
                 }
             });
         });
-        this.audioOut.on('underrun', () => {
-            this.forEach((dev) => {
-                try {
-                    if (dev.onUnderrun) {
-                        dev.onUnderrun();
-                    }
-                }
-                catch {
-                    /* ignore */
-                }
-            });
-        });
     }
     /** Iterate over live devices. */
     forEach(it) {

package/dist/esm/core/index.js

@@ -40,8 +40,6 @@ const node_stream_1 = require("node:stream");
 const devices_1 = __importDefault(require("./devices"));
 const config_1 = __importStar(require("../utils/config"));
 const circularBuffer_1 = __importDefault(require("../utils/circularBuffer"));
-const ntp_1 = require("../utils/ntp");
-const numUtil_1 = require("../utils/numUtil");
 const audioOut_1 = __importDefault(require("./audioOut"));
 /**
  * High-level RAOP/AirPlay sender that wires together devices, buffering, and output.
@@ -50,33 +48,27 @@ const audioOut_1 = __importDefault(require("./audioOut"));
 class AirTunes extends node_stream_1.Duplex {
     devices;
     circularBuffer;
-    deviceMagic;
     /**
-   * @param options.packetSize Override packet size; defaults to config.
-   * @param options.startTimeMs Optional unix ms to align playback start.
-   * @param options.startTimeNtp Optional NTP timestamp (uint64) to align playback start.
-   */
+     * @param options.packetSize Override packet size; defaults to config.
+     * @param options.startTimeMs Optional unix ms to align playback start.
+     */
     constructor(options = {}) {
         super({ readableObjectMode: false, writableObjectMode: false });
         if (options.config) {
             (0, config_1.applyConfig)(options.config);
         }
-        // Randomize per-session device magic (SSRC equivalent) to align with reference behavior.
-        const deviceMagic = typeof options.deviceMagic === 'number' ? options.deviceMagic : (0, numUtil_1.randomInt)(9);
         const audioOut = new audioOut_1.default();
-        this.deviceMagic = deviceMagic;
         this.devices = new devices_1.default(audioOut);
         this.devices.init();
         this.devices.on('status', (key, status, desc) => {
             this.emit('device', key, status, desc);
         });
         const packetSize = options.packetSize ?? config_1.default.packet_size;
-        const startTimeNtp = options.startTimeNtp ? (0, ntp_1.toNtpTimestamp)(options.startTimeNtp) : undefined;
         this.circularBuffer = new circularBuffer_1.default(config_1.default.packets_in_buffer, packetSize);
         this.circularBuffer.on('status', (status) => {
             this.emit('buffer', status);
         });
-        audioOut.init(this.devices, this.circularBuffer, options.startTimeMs, startTimeNtp, deviceMagic, options.underrunMuteMs);
+        audioOut.init(this.devices, this.circularBuffer, options.startTimeMs);
         audioOut.on('metrics', (metrics) => {
             this.emit('metrics', metrics);
         });
@@ -89,7 +81,7 @@ class AirTunes extends node_stream_1.Duplex {
     }
     /** Register an AirTunes (RAOP) device and start streaming to it. */
     add(host, options, mode = 0, txt = '') {
-        return this.devices.add('airtunes', host, { ...options, deviceMagic: this.deviceMagic, resendBufferSize: options.resendBufferSize }, mode, txt);
+        return this.devices.add('airtunes', host, options, mode, txt);
     }
     /** Register a CoreAudio output (legacy shim). */
     addCoreAudio(options) {

package/dist/esm/core/rtsp.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = Client;
-// @ts-nocheck
 var net = require('net'), nodeCrypto = require('crypto'), events = require('events'), util = require('util'), fs = require('fs'), dgram = require('dgram');
 const ntp = require('../utils/ntp').default ?? require('../utils/ntp');
 const config = require('../utils/config').default ?? require('../utils/config');
@@ -93,6 +92,7 @@ function Client(volume, password, audioOut, options) {
     this.activeRemote = nu.randomInt(9).toString().toUpperCase();
     this.dacpId = "04F8191D99BEC6E9";
     this.session = null;
+    this.readySent = false;
     this.timeout = null;
     this.volume = volume;
     this.progress = 0;
@@ -152,7 +152,6 @@ function Client(volume, password, audioOut, options) {
     this.homekitver = this.transient ? "4" : "3";
     this.metadataReady = false;
     this.connectAttempts = 0;
-    this.lastBackoff = 0;
 }
 util.inherits(Client, events.EventEmitter);
 exports.default = { Client };
@@ -222,8 +221,7 @@ Client.prototype.startHandshake = function (udpServers, host, port) {
                 const baseBackOff = Math.min(config.rtsp_retry_base_ms * Math.pow(2, nextAttempt - 1), config.rtsp_retry_max_ms);
                 const jitter = Math.random() * config.rtsp_retry_jitter_ms;
                 const backOff = baseBackOff + jitter;
-                this.lastBackoff = backOff;
-                if (this.debug || config.debug_dump)
+                if (this.debug)
                     this.logLine?.('rtsp_retry', { attempt: nextAttempt, backOff, code: err?.code });
                 setTimeout(() => {
                     this.startTimeout();
@@ -242,14 +240,8 @@ Client.prototype.startHandshake = function (udpServers, host, port) {
                 this.cleanup('rtsp_socket', err?.code);
         });
         this.socket.on('end', () => {
-            if (this.debug) {
-                this.logLine?.('rtsp_end', {
-                    lastStatus: rtsp_methods[this.status + 1] ?? this.status,
-                    cseq: this.cseq,
-                });
-            }
-            this.connectAttempts = 0;
-            this.lastBackoff = 0;
+            if (this.debug)
+                this.logLine?.('block2');
             this.cleanup('disconnected');
         });
     };
@@ -289,13 +281,6 @@ Client.prototype.setVolume = function (volume, callback) {
     this.sendNextRequest();
 };
 Client.prototype.setProgress = function (progress, duration, callback) {
-    if (this.airplay2) {
-        this.progress = progress;
-        this.duration = duration;
-        if (typeof callback === 'function')
-            callback();
-        return;
-    }
     if (this.status !== PLAYING)
         return;
     let normProgress = progress;
@@ -341,12 +326,6 @@ Client.prototype.sendHeartBeat = function (callback) {
     this.sendNextRequest();
 };
 Client.prototype.setTrackInfo = function (name, artist, album, callback) {
-    if (this.airplay2) {
-        this.trackInfo = { name, artist, album };
-        if (typeof callback === 'function')
-            callback();
-        return;
-    }
     if (this.status !== PLAYING)
         return;
     if (name != this.trackInfo?.name || artist != this.trackInfo?.artist || album != this.trackInfo?.album) {
@@ -424,7 +403,6 @@ Client.prototype.cleanup = function (type, msg) {
     this.seed = null;
     this.credentials = null;
     // this.password = null;
-    this.connectAttempts = 0;
     this.removeAllListeners();
     if (this.timeout) {
         clearTimeout(this.timeout);
@@ -840,9 +818,6 @@ Client.prototype.sendNextRequest = async function (di) {
                 request += 'Connection: keep-alive\r\n';
             }
             request += 'Apple-Challenge: SdX9kFJVxgKVMFof/Znj4Q\r\n\r\n';
-            this.socket.write(Buffer.from(request, 'utf-8'));
-            request = '';
-            this.status = PLAYING;
             break;
         case OPTIONS2:
             request = '';
@@ -1089,10 +1064,6 @@ Client.prototype.sendNextRequest = async function (di) {
             //this.logLine?.(request);
             break;
         case SETPROGRESS:
-            if (this.airplay2) {
-                this.status = PLAYING;
-                break;
-            }
             function hms(seconds) {
                 const h = Math.floor(seconds / 3600);
                 const m = Math.floor((seconds % 3600) / 60);
@@ -1113,10 +1084,6 @@ Client.prototype.sendNextRequest = async function (di) {
             //this.logLine?.(request);
             break;
         case SETDAAP:
-            if (this.airplay2) {
-                this.status = PLAYING;
-                break;
-            }
             let daapenc = true;
             //daapenc = true
             var name = this.daapEncode('minm', this.trackInfo.name, daapenc);
@@ -1165,10 +1132,6 @@ Client.prototype.sendNextRequest = async function (di) {
             return;
     }
     this.startTimeout();
-    if (config.debug_dump) {
-        // eslint-disable-next-line no-console
-        console.debug('rtsp_req', { status: rtsp_methods[this.status] ?? this.status, len: request.length });
-    }
     if (this.encryptedChannel && this.credentials) {
         this.socket.write(this.credentials.encrypt(Buffer.concat([Buffer.from(request, 'utf-8')])));
     }
@@ -1225,10 +1188,6 @@ function parseAuthenticate(auth, field) {
 Client.prototype.processData = function (blob, rawData) {
     this.logLine?.('Receiving request:', this.hostip, rtsp_methods[this.status + 1]);
     var response = parseResponse2(blob, this), headers = response.headers || {};
-    if (config.debug_dump) {
-        // eslint-disable-next-line no-console
-        console.debug('rtsp_res', { code: response.code, status: rtsp_methods[this.status + 1], len: rawData.length });
-    }
     if (this.debug) {
         try {
             if ((rawData.toString()).includes("bplist00")) {
@@ -1469,9 +1428,7 @@ Client.prototype.processData = function (blob, rawData) {
                 return;
             }
             // this.logLine?.("DEBUG: Device Proof=" + this.deviceProof.toString('hex'));
-            if (!this.transient) {
-                this.srp.checkM2(this.deviceProof);
-            }
+            this.srp.checkM2(this.deviceProof);
             if (this.transient == true) {
                 this.credentials = new Credentials("sdsds", "", "", "", this.seed);
                 this.credentials.writeKey = enc.HKDF("sha512", Buffer.from("Control-Salt"), this.srp.computeK(), Buffer.from("Control-Write-Encryption-Key"), 32);
@@ -1660,11 +1617,18 @@ Client.prototype.processData = function (blob, rawData) {
         case RECORD:
             this.metadataReady = true;
             this.emit('pair_success');
-            if (!this.airplay2) {
+            if (this.airplay2) {
+                // AirPlay2 may not send FLUSH after SETPROGRESS; ensure session exists and start relay once.
+                this.session = this.session ?? "1";
+                if (!this.readySent) {
+                    this.readySent = true;
+                    this.emit('ready');
+                }
+            }
+            else {
                 this.session = this.session ?? "1";
                 this.emit('ready');
             }
-            ;
             this.status = SETVOLUME;
             break;
         case SETVOLUME:
@@ -1685,7 +1649,7 @@ Client.prototype.processData = function (blob, rawData) {
             }
             break;
         case SETPROGRESS:
-            // After reporting progress, stay in PLAYING; avoid forcing FLUSH on every update.
+            // Keep PLAYING to avoid forcing FLUSH on every progress update.
             this.status = PLAYING;
             break;
         case SETDAAP:

package/dist/esm/core/udpServers.js

@@ -133,112 +133,21 @@ class UDPServers extends node_events_1.EventEmitter {
     /**
      * Send an RTCP sync packet to a receiver to align playback.
      */
-    sendControlSync(seq, dev, tsOffsetFrames = 0, sr, rr, xr) {
+    sendControlSync(seq, dev) {
         if (this.status !== BOUND || !this.control.socket)
             return;
         const packet = Buffer.alloc(20);
         packet.writeUInt16BE(0x80d4, 0);
         packet.writeUInt16BE(0x0007, 2);
-        packet.writeUInt32BE((0, numUtil_1.low32)((seq + tsOffsetFrames) * config_1.default.frames_per_packet), 4);
+        packet.writeUInt32BE((0, numUtil_1.low32)(seq * config_1.default.frames_per_packet), 4);
         const ntpTime = ntp_1.default.timestamp();
         ntpTime.copy(packet, 8);
-        packet.writeUInt32BE((0, numUtil_1.low32)((seq + tsOffsetFrames) * config_1.default.frames_per_packet + config_1.default.sampling_rate * 2), 16);
+        packet.writeUInt32BE((0, numUtil_1.low32)(seq * config_1.default.frames_per_packet + config_1.default.sampling_rate * 2), 16);
         const delay = Math.max(0, config_1.default.control_sync_base_delay_ms +
             Math.random() * config_1.default.control_sync_jitter_ms);
         setTimeout(() => {
-            if (config_1.default.debug_dump) {
-                // eslint-disable-next-line no-console
-                console.debug('rtcp_sync', { seq, tsOffsetFrames, host: dev.host, port: dev.controlPort });
-            }
             this.control.socket?.send(packet, 0, packet.length, dev.controlPort, dev.host);
-            if (sr && config_1.default.send_rtcp_sr) {
-                const srPacket = this.buildSenderReport(sr);
-                if (config_1.default.debug_dump) {
-                    // eslint-disable-next-line no-console
-                    console.debug('rtcp_sr', { ssrc: config_1.default.device_magic, rtp: sr.rtpTimestamp, packets: sr.packetCount });
-                }
-                this.control.socket?.send(srPacket, 0, srPacket.length, dev.controlPort, dev.host);
-            }
-            if (config_1.default.send_rtcp_rr) {
-                const rrPacket = this.buildReceiverReport(rr);
-                if (config_1.default.debug_dump) {
-                    // eslint-disable-next-line no-console
-                    console.debug('rtcp_rr', { ssrc: config_1.default.device_magic });
-                }
-                this.control.socket?.send(rrPacket, 0, rrPacket.length, dev.controlPort, dev.host);
-            }
-            if (xr && config_1.default.send_rtcp_xr) {
-                const xrPacket = this.buildExtendedReport(xr);
-                if (config_1.default.debug_dump) {
-                    // eslint-disable-next-line no-console
-                    console.debug('rtcp_xr', { ssrc: config_1.default.device_magic });
-                }
-                this.control.socket?.send(xrPacket, 0, xrPacket.length, dev.controlPort, dev.host);
-            }
         }, delay);
     }
-    buildSenderReport(counters) {
-        const sr = Buffer.alloc(28);
-        // V=2, P=0, RC=0
-        sr.writeUInt8(0x80, 0);
-        // PT=200 (SR)
-        sr.writeUInt8(200, 1);
-        // length in 32-bit words minus 1 -> 6 words (28 bytes) => 6
-        sr.writeUInt16BE(6, 2);
-        // SSRC
-        sr.writeUInt32BE(config_1.default.device_magic, 4);
-        // NTP timestamp
-        counters.ntp.copy(sr, 8, 0, 8);
-        // RTP timestamp
-        sr.writeUInt32BE((0, numUtil_1.low32)(counters.rtpTimestamp), 16);
-        // packet count
-        sr.writeUInt32BE((0, numUtil_1.low32)(counters.packetCount), 20);
-        // octet count
-        sr.writeUInt32BE((0, numUtil_1.low32)(counters.octetCount), 24);
-        return sr;
-    }
-    buildReceiverReport(rr) {
-        const packet = Buffer.alloc(8);
-        // V=2, P=0, RC=0
-        packet.writeUInt8(0x80, 0);
-        // PT=201 (RR)
-        packet.writeUInt8(201, 1);
-        // length = 1 (8 bytes / 4 - 1)
-        packet.writeUInt16BE(1, 2);
-        // SSRC
-        packet.writeUInt32BE(rr?.ssrc ?? config_1.default.device_magic, 4);
-        return packet;
-    }
-    buildExtendedReport(xr) {
-        // XR with RRT (Receiver Reference Time) and optional DLRR.
-        const rrtBlock = Buffer.alloc(12);
-        // BT=4 (RRT), reserved+block length=2 (8 octets following header)
-        rrtBlock.writeUInt8(4, 0);
-        rrtBlock.writeUInt8(0, 1);
-        rrtBlock.writeUInt16BE(2, 2);
-        (xr?.ntp ?? ntp_1.default.timestamp()).copy(rrtBlock, 4, 0, 8);
-        let dlrrBlock = null;
-        if (typeof xr?.lastRr === 'number' || typeof xr?.delaySinceLastRr === 'number') {
-            dlrrBlock = Buffer.alloc(12);
-            // BT=5 (DLRR)
-            dlrrBlock.writeUInt8(5, 0);
-            dlrrBlock.writeUInt8(0, 1);
-            dlrrBlock.writeUInt16BE(3, 2); // block length (3 words = 12 bytes following header)
-            dlrrBlock.writeUInt32BE(xr?.lastRr ?? 0, 4);
-            dlrrBlock.writeUInt32BE(xr?.delaySinceLastRr ?? 0, 8);
-        }
-        const blocks = dlrrBlock ? Buffer.concat([rrtBlock, dlrrBlock]) : rrtBlock;
-        const packet = Buffer.alloc(8 + blocks.length);
-        // V=2, P=0, RC=0
-        packet.writeUInt8(0x80, 0);
-        // PT=207 (XR)
-        packet.writeUInt8(207, 1);
-        // length in 32-bit words minus 1
-        packet.writeUInt16BE(packet.length / 4 - 1, 2);
-        // SSRC
-        packet.writeUInt32BE(xr?.ssrc ?? config_1.default.device_magic, 4);
-        blocks.copy(packet, 8);
-        return packet;
-    }
 }
 exports.default = UDPServers;

package/dist/esm/homekit/credentials.js

@@ -90,21 +90,11 @@ class Credentials {
         }
         return result;
     }
-    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
-        const salt = Buffer.alloc(16, 0); // deterministic salt like reference
-        const newKey = encryption_1.default.HKDF('sha256', salt, this.encryptionKey, info, 32);
-        this.writeKey = newKey;
-        this.readKey = newKey;
-        this.encryptCount = 0;
-        this.decryptCount = 0;
+    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)),
+        ]);
     }
 }
 exports.Credentials = Credentials;

package/dist/esm/index.js

@@ -42,7 +42,6 @@ const node_events_1 = require("node:events");
 // Airtunes implementation (node_airtunes2 port) in src/core.
 const index_1 = __importDefault(require("./core/index"));
 const config_1 = __importStar(require("./utils/config"));
-const ntp_1 = require("./utils/ntp");
 class LoxAirplaySender extends node_events_1.EventEmitter {
     airtunes = null;
     deviceKey = null;
@@ -74,10 +73,6 @@ class LoxAirplaySender extends node_events_1.EventEmitter {
         this.airtunes = new index_1.default({
             packetSize: config_1.default.packet_size,
             startTimeMs: options.startTimeMs,
-            startTimeNtp: options.startTimeNtp ? (0, ntp_1.toNtpTimestamp)(options.startTimeNtp) : undefined,
-            deviceMagic: options.deviceMagic,
-            resendBufferSize: options.resendBufferSize,
-            underrunMuteMs: options.underrunMuteMs,
             config: options.config,
         });
         this.airtunes.on('device', (key, status, desc) => {

package/dist/esm/utils/circularBuffer.js

@@ -24,7 +24,6 @@ class CircularBuffer extends node_events_1.EventEmitter {
     buffers = [];
     currentSize = 0;
     status = WAITING;
-    hadUnderrun = false;
     constructor(packetsInBuffer, packetSize) {
         super();
         this.packetPool = new packetPool_1.default(packetSize);
@@ -64,10 +63,6 @@ class CircularBuffer extends node_events_1.EventEmitter {
             this.status !== ENDED &&
             (this.status === FILLING || this.currentSize < this.packetSize)) {
             packet.pcm.fill(0);
-            if (!this.hadUnderrun) {
-                this.hadUnderrun = true;
-                this.emit('underrun');
-            }
             if (this.status !== FILLING && this.status !== WAITING) {
                 this.status = FILLING;
                 this.emit('status', 'buffering');
@@ -97,9 +92,6 @@ class CircularBuffer extends node_events_1.EventEmitter {
                 }
             }
             this.currentSize -= this.packetSize;
-            if (this.hadUnderrun && this.currentSize >= this.packetSize) {
-                this.hadUnderrun = false;
-            }
             if (this.status === ENDING && this.currentSize <= 0) {
                 this.status = ENDED;
                 this.currentSize = 0;

package/dist/esm/utils/config.js

@@ -17,9 +17,9 @@ exports.config = {
     coreaudio_check_period: 2000, // CoreAudio buffer level check period
     coreaudio_preload: 352 * 2 * 2 * 50, // ~0.5s of silence pushed to CoreAudio to avoid draining AudioQueue
     sampling_rate: 44100, // fixed by AirTunes v2
-    sync_period: 0, // UDP sync packets are sent to all AirTunes devices regularly (0 = derive from sample rate)
+    sync_period: 126, // UDP sync packets are sent to all AirTunes devices regularly
     stream_latency: 200, // audio UDP packets are flushed in bursts periodically
-    rtsp_timeout: 2147483647, // RTSP servers are considered gone if no reply is received before the timeout (legacy default)
+    rtsp_timeout: 15000, // RTSP servers are considered gone if no reply is received before the timeout
     rtsp_heartbeat: 15000, // some RTSP (like HomePod) servers requires heartbeat.
     rtsp_retry_attempts: 3,
     rtsp_retry_base_ms: 300,
@@ -27,17 +27,7 @@ exports.config = {
     rtsp_retry_jitter_ms: 150,
     control_sync_base_delay_ms: 2,
     control_sync_jitter_ms: 3,
-    use_monotonic_clock: true,
-    jump_forward_enabled: false,
-    jump_forward_threshold_ms: 180,
-    jump_forward_lead_ms: 220,
     device_magic: (0, numUtil_1.randomInt)(9),
-    resend_buffer_size: 1000,
-    send_rtcp_sr: true,
-    send_rtcp_rr: true,
-    send_rtcp_xr: false,
-    underrun_mute_ms: 50,
-    debug_dump: false,
     ntp_epoch: 0x83aa7e80,
     iv_base64: 'ePRBLI0XN5ArFaaz7ncNZw',
     rsa_aeskey_base64: 'VjVbxWcmYgbBbhwBNlCh3K0CMNtWoB844BuiHGUJT51zQS7SDpMnlbBIobsKbfEJ3SCgWHRXjYWf7VQWRYtEcfx7ejA8xDIk5PSBYTvXP5dU2QoGrSBv0leDS6uxlEWuxBq3lIxCxpWO2YswHYKJBt06Uz9P2Fq2hDUwl3qOQ8oXb0OateTKtfXEwHJMprkhsJsGDrIc5W5NJFMAo6zCiM9bGSDeH2nvTlyW6bfI/Q0v0cDGUNeY3ut6fsoafRkfpCwYId+bg3diJh+uzw5htHDyZ2sN+BFYHzEfo8iv4KDxzeya9llqg6fRNQ8d5YjpvTnoeEQ9ye9ivjkBjcAfVw',