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

package/README.md

@@ -1,6 +1,6 @@
-# @lox-audioserver/node-airplay-sender
+# lox-airplay-sender
 
-AirPlay sender for RAOP/AirPlay 1 with AirPlay 2 control/auth support. Best-effort AP2 audio (encryption path not validated against native code). Implements RTSP/UDP pipeline, ALAC encoding, and metadata handling with no native dependencies.
+AirPlay sender (RAOP/AirPlay 1 + AirPlay 2 auth) refactored from node_airtunes2 into a modern, typed TypeScript module. It owns the RTSP/UDP pipeline, ALAC encoding, and metadata handling with no native dependencies.
 
 ## Requirements
 - Node.js 18+
@@ -55,12 +55,6 @@ Creates and starts a sender for one AirPlay device. Returns the instance so you
 - `inputCodec` (`"pcm"` | `"alac"`) Defaults to `"pcm"`.
 - `airplay2` (boolean) Enable AirPlay 2 auth/flags; default false.
 - `startTimeMs` (number) Unix ms to align playback across devices.
-- `startTimeNtp` (bigint | number | `{ sec, frac }`) Absolute NTP start time (sec<<32|frac) for tighter sync.
-- `deviceMagic` (number) Override per-session SSRC/device ID used in RTP/RTCP.
-- `resendBufferSize` (number) Override resend cache size (packets); defaults to 1000.
-- `underrunMuteMs` (number) Mute window in ms after an underrun to smooth recovery; defaults to 50.
-- `sendRtcpXr` (boolean) Emit RTCP Extended Reports (RRT) alongside sync/SSR; default false.
-- `debugDump` (boolean) Log RTSP/RTCP traffic for debugging; default false.
 - `debug` (boolean) Verbose logging from the transport stack.
 - `log` `(level, message, data?) => void` Hook for library logs.
 - `config` (partial) Override buffer/sync/RTSP tuning at runtime (see `src/utils/config.ts` for keys like `packets_in_buffer`, `stream_latency`, `sync_period`, retry/backoff, etc.).

package/dist/core/audioOut.d.ts

@@ -3,7 +3,6 @@ import type CircularBuffer from '../utils/circularBuffer';
 type DevicesEmitter = EventEmitter & {
     on(event: 'airtunes_devices', listener: (hasAirTunes: boolean) => void): DevicesEmitter;
     on(event: 'need_sync', listener: () => void): DevicesEmitter;
-    emit(event: 'underrun'): boolean;
 };
 /**
  * Generates RTP timestamps and sequence, pulling PCM/ALAC packets from a circular buffer.
@@ -11,33 +10,21 @@ type DevicesEmitter = EventEmitter & {
  */
 export default class AudioOut extends EventEmitter {
     private lastSeq;
-    private lastWireSeq;
     private hasAirTunes;
     private rtpTimeRef;
     private startTimeMs?;
-    private startTimeNtp?;
     private latencyFrames;
     private latencyApplied;
-    private seqOffset;
-    private tsOffset;
-    private syncOffsetFrames;
-    private deviceMagic;
-    private packetCount;
-    private octetCount;
-    private readonly frameDurationMs;
-    private muteUntilMs;
     /**
      * Begin pulling from the buffer and emitting packets at the configured cadence.
      * @param devices Device manager for sync events.
      * @param circularBuffer PCM/ALAC buffer.
      * @param startTimeMs Optional unix ms to align playback.
-     * @param startTimeNtp Optional NTP uint64 (sec<<32|frac) to align playback.
      */
-    init(devices: DevicesEmitter, circularBuffer: CircularBuffer, startTimeMs?: number, startTimeNtp?: bigint | number, deviceMagic?: number, underrunMuteMs?: number): void;
+    init(devices: DevicesEmitter, circularBuffer: CircularBuffer, startTimeMs?: number): void;
     /**
      * Apply latency (in audio frames) when aligning start time.
      */
     setLatencyFrames(latencyFrames: number): void;
-    private handleUnderrun;
 }
 export {};

package/dist/core/audioOut.js

@@ -1,194 +1,69 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_events_1 = require("node:events");
-const node_perf_hooks_1 = require("node:perf_hooks");
 const config_1 = __importDefault(require("../utils/config"));
 const numUtil_1 = require("../utils/numUtil");
-const ntp_1 = __importStar(require("../utils/ntp"));
 const SEQ_NUM_WRAP = Math.pow(2, 16);
-const FRAC_PER_SEC = 0x1_0000_0000;
 /**
  * Generates RTP timestamps and sequence, pulling PCM/ALAC packets from a circular buffer.
  * Emits `packet` events for devices and sync requests (`need_sync`) at intervals.
  */
 class AudioOut extends node_events_1.EventEmitter {
     lastSeq = -1;
-    lastWireSeq = 0;
     hasAirTunes = false;
-    rtpTimeRef = 0;
+    rtpTimeRef = Date.now();
     startTimeMs;
-    startTimeNtp;
     latencyFrames = 0;
     latencyApplied = false;
-    seqOffset = 0;
-    tsOffset = 0;
-    syncOffsetFrames = 0;
-    deviceMagic = 0;
-    packetCount = 0;
-    octetCount = 0;
-    frameDurationMs = (config_1.default.frames_per_packet / config_1.default.sampling_rate) * 1000;
-    muteUntilMs = 0;
     /**
      * Begin pulling from the buffer and emitting packets at the configured cadence.
      * @param devices Device manager for sync events.
      * @param circularBuffer PCM/ALAC buffer.
      * @param startTimeMs Optional unix ms to align playback.
-     * @param startTimeNtp Optional NTP uint64 (sec<<32|frac) to align playback.
      */
-    init(devices, circularBuffer, startTimeMs, startTimeNtp, deviceMagic, underrunMuteMs) {
+    init(devices, circularBuffer, startTimeMs) {
         this.startTimeMs =
             typeof startTimeMs === 'number' && Number.isFinite(startTimeMs)
                 ? startTimeMs
                 : undefined;
-        this.startTimeNtp = startTimeNtp;
-        this.seqOffset = Math.floor(Math.random() * SEQ_NUM_WRAP);
-        this.tsOffset = Math.floor(Math.random() * 0xffffffff);
-        this.syncOffsetFrames = this.tsOffset / config_1.default.frames_per_packet;
-        this.deviceMagic = typeof deviceMagic === 'number' ? deviceMagic : config_1.default.device_magic;
-        if (typeof underrunMuteMs === 'number') {
-            config_1.default.underrun_mute_ms = underrunMuteMs;
-        }
-        circularBuffer.on('underrun', () => this.handleUnderrun());
-        const monoNow = node_perf_hooks_1.performance.now();
-        const wallToMonoOffset = Date.now() - monoNow;
-        if (typeof this.startTimeNtp === 'bigint' || typeof this.startTimeNtp === 'number') {
-            const { sec, frac } = (0, ntp_1.parseNtpTimestamp)(this.startTimeNtp);
-            const unixMs = (sec - config_1.default.ntp_epoch) * 1000 + Math.floor((frac * 1000) / FRAC_PER_SEC);
-            const nowMs = config_1.default.use_monotonic_clock ? monoNow : Date.now();
-            const delta = unixMs - nowMs;
-            // If target is too close/past, clamp to now.
-            this.rtpTimeRef = delta > -config_1.default.stream_latency ? unixMs - wallToMonoOffset : nowMs;
-        }
-        else if (this.startTimeMs !== undefined) {
-            const nowMs = config_1.default.use_monotonic_clock ? monoNow : Date.now();
-            const delta = this.startTimeMs - nowMs;
-            this.rtpTimeRef = delta > -config_1.default.stream_latency ? this.startTimeMs - wallToMonoOffset : nowMs;
-        }
-        else if (config_1.default.use_monotonic_clock) {
-            this.rtpTimeRef = monoNow;
-        }
-        else {
-            this.rtpTimeRef = Date.now();
-        }
+        this.rtpTimeRef = this.startTimeMs ?? Date.now();
         devices.on('airtunes_devices', (hasAirTunes) => {
             this.hasAirTunes = hasAirTunes;
         });
         devices.on('need_sync', () => {
-            this.emit('need_sync', { seq: this.lastWireSeq, tsOffsetFrames: this.syncOffsetFrames });
+            this.emit('need_sync', this.lastSeq);
         });
-        const syncEvery = config_1.default.sync_period && config_1.default.sync_period > 0
-            ? config_1.default.sync_period
-            : Math.max(1, Math.round(config_1.default.sampling_rate / config_1.default.frames_per_packet));
         const sendPacket = (seq) => {
-            const wireSeq = (this.seqOffset + seq) % SEQ_NUM_WRAP;
             const packet = circularBuffer.readPacket();
-            packet.seq = wireSeq;
-            packet.timestamp = (0, numUtil_1.low32)(this.tsOffset + wireSeq * config_1.default.frames_per_packet + 2 * config_1.default.sampling_rate);
-            this.packetCount += 1;
-            this.octetCount += packet.pcm.length;
-            if (this.hasAirTunes && seq % syncEvery === 0) {
-                this.emit('need_sync', {
-                    seq: wireSeq,
-                    tsOffsetFrames: this.syncOffsetFrames,
-                    rtcp: {
-                        rtpTimestamp: packet.timestamp,
-                        ntp: ntp_1.default.timestamp(),
-                        packetCount: this.packetCount,
-                        octetCount: this.octetCount,
-                        xr: { ntp: ntp_1.default.timestamp() },
-                    },
-                });
-                const nowMs = config_1.default.use_monotonic_clock ? node_perf_hooks_1.performance.now() : Date.now();
+            packet.seq = seq % SEQ_NUM_WRAP;
+            packet.timestamp = (0, numUtil_1.low32)(seq * config_1.default.frames_per_packet + 2 * config_1.default.sampling_rate);
+            if (this.hasAirTunes && seq % config_1.default.sync_period === 0) {
+                this.emit('need_sync', seq);
                 const expectedTimeMs = this.rtpTimeRef +
-                    (((seq + this.syncOffsetFrames) * config_1.default.frames_per_packet) / config_1.default.sampling_rate) * 1000;
-                const deltaMs = nowMs - expectedTimeMs;
-                this.emit('metrics', { type: 'sync', seq: wireSeq, deltaMs, latencyFrames: this.latencyFrames });
+                    ((seq * config_1.default.frames_per_packet) / config_1.default.sampling_rate) * 1000;
+                const deltaMs = Date.now() - expectedTimeMs;
+                this.emit('metrics', { type: 'sync', seq, deltaMs, latencyFrames: this.latencyFrames });
             }
             this.emit('packet', packet);
-            if (this.muteUntilMs > 0) {
-                const nowMsSend = config_1.default.use_monotonic_clock ? node_perf_hooks_1.performance.now() : Date.now();
-                if (nowMsSend < this.muteUntilMs) {
-                    packet.pcm.fill(0);
-                }
-                else {
-                    this.muteUntilMs = 0;
-                }
-            }
             packet.release();
-            this.lastWireSeq = wireSeq;
         };
         const syncAudio = () => {
-            const nowMs = config_1.default.use_monotonic_clock ? node_perf_hooks_1.performance.now() : Date.now();
-            const elapsed = nowMs - this.rtpTimeRef;
+            const elapsed = Date.now() - this.rtpTimeRef;
             if (elapsed < 0) {
                 setTimeout(syncAudio, Math.min(config_1.default.stream_latency, Math.abs(elapsed)));
                 return;
             }
-            let currentSeq = Math.floor((elapsed * config_1.default.sampling_rate) / (config_1.default.frames_per_packet * 1000));
-            // If we're lagging behind significantly, jump forward to avoid long hitches.
-            if (config_1.default.jump_forward_enabled) {
-                const expectedTimeMs = this.rtpTimeRef + currentSeq * this.frameDurationMs;
-                const deltaMs = nowMs - expectedTimeMs;
-                if (deltaMs > config_1.default.jump_forward_threshold_ms) {
-                    const jumpSeq = Math.ceil((config_1.default.jump_forward_lead_ms * config_1.default.sampling_rate) /
-                        (config_1.default.frames_per_packet * 1000));
-                    const newSeq = currentSeq + jumpSeq;
-                    this.rtpTimeRef = nowMs - newSeq * this.frameDurationMs;
-                    this.lastSeq = newSeq - 1;
-                    currentSeq = newSeq;
-                }
-            }
+            const currentSeq = Math.floor((elapsed * config_1.default.sampling_rate) / (config_1.default.frames_per_packet * 1000));
             for (let i = this.lastSeq + 1; i <= currentSeq; i += 1) {
                 sendPacket(i);
             }
             this.lastSeq = currentSeq;
             setTimeout(syncAudio, config_1.default.stream_latency);
         };
-        // If a future start is scheduled, defer until then; otherwise start immediately.
-        const nowMs = config_1.default.use_monotonic_clock ? node_perf_hooks_1.performance.now() : Date.now();
-        const delayMs = Math.max(0, this.rtpTimeRef - nowMs);
-        if (delayMs > 0) {
-            setTimeout(syncAudio, delayMs);
-        }
-        else {
-            syncAudio();
-        }
+        syncAudio();
     }
     /**
      * Apply latency (in audio frames) when aligning start time.
@@ -198,23 +73,12 @@ class AudioOut extends node_events_1.EventEmitter {
             return;
         }
         this.latencyFrames = latencyFrames;
-        if ((this.startTimeMs === undefined && this.startTimeNtp === undefined) || this.latencyApplied) {
+        if (this.startTimeMs === undefined || this.latencyApplied) {
             return;
         }
         const latencyMs = (this.latencyFrames / config_1.default.sampling_rate) * 1000;
-        this.rtpTimeRef -= latencyMs;
+        this.rtpTimeRef = this.startTimeMs - latencyMs;
         this.latencyApplied = true;
     }
-    handleUnderrun() {
-        const nowMs = config_1.default.use_monotonic_clock ? node_perf_hooks_1.performance.now() : Date.now();
-        const currentSeq = Math.max(0, this.lastSeq);
-        const currentFrames = currentSeq * config_1.default.frames_per_packet;
-        const offsetMs = (currentFrames / config_1.default.sampling_rate) * 1000;
-        this.rtpTimeRef = nowMs - offsetMs;
-        if (config_1.default.underrun_mute_ms > 0) {
-            this.muteUntilMs = nowMs + config_1.default.underrun_mute_ms;
-        }
-        this.emit('underrun');
-    }
 }
 exports.default = AudioOut;

package/dist/core/deviceAirtunes.d.ts

@@ -23,15 +23,14 @@ declare class BufferWithNames {
     private readonly size;
     private readonly buffer;
     constructor(size: number);
-    add(name: string | number, item: any): void;
-    getLatestNamed(name: string | number): any;
+    add(name: string, item: any): void;
+    getLatestNamed(name: string): any;
 }
 type AirTunesDeviceInstance = EventEmitter & {
     audioPacketHistory: BufferWithNames | null;
     udpServers: UDPServers;
     audioOut: EventEmitter;
     type: string;
-    deviceMagic: number;
     options: AnyObject;
     host: string;
     port: number;
@@ -64,7 +63,6 @@ type AirTunesDeviceInstance = EventEmitter & {
     doHandshake: () => void;
     relayAudio: () => void;
     cleanup: () => void;
-    onUnderrun?: () => void;
 };
 /**
  * Construct a RAOP/AirPlay device handler.

package/dist/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/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/core/index.d.ts

@@ -1,7 +1,6 @@
 import { Duplex } from 'node:stream';
 import Devices from './devices';
 import { type AirplayConfig } from '../utils/config';
-import { type NtpTimestampInput } from '../utils/ntp';
 /**
  * High-level RAOP/AirPlay sender that wires together devices, buffering, and output.
  * Acts as a Duplex stream: write PCM/ALAC chunks, listen to status events.
@@ -9,20 +8,14 @@ import { type NtpTimestampInput } from '../utils/ntp';
 declare class AirTunes extends Duplex {
     readonly devices: Devices;
     private readonly circularBuffer;
-    private readonly 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?: {
         packetSize?: number;
         startTimeMs?: number;
-        startTimeNtp?: NtpTimestampInput;
         config?: Partial<AirplayConfig>;
-        deviceMagic?: number;
-        resendBufferSize?: number;
-        underrunMuteMs?: number;
     });
     /** Register an AirTunes (RAOP) device and start streaming to it. */
     add(host: string, options: Record<string, unknown>, mode?: number, txt?: string[] | string): any;

package/dist/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) {