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

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

@@ -3,21 +3,6 @@ type ControlSyncTarget = {
     host: string;
     controlPort: number;
 };
-type SenderReportCounters = {
-    rtpTimestamp: number;
-    ntp: Buffer;
-    packetCount: number;
-    octetCount: number;
-};
-type ReceiverReport = {
-    ssrc?: number;
-};
-type ExtendedReport = {
-    ntp?: Buffer;
-    ssrc?: number;
-    lastRr?: number;
-    delaySinceLastRr?: number;
-};
 /**
  * Manages control/timing UDP sockets used by RAOP for resend requests and clock sync.
  * Binds ports for both endpoints and emits events with socket info.
@@ -36,9 +21,6 @@ export default class UDPServers extends EventEmitter {
     /**
      * Send an RTCP sync packet to a receiver to align playback.
      */
-    sendControlSync(seq: number, dev: ControlSyncTarget, tsOffsetFrames?: number, sr?: SenderReportCounters, rr?: ReceiverReport, xr?: ExtendedReport): void;
-    private buildSenderReport;
-    private buildReceiverReport;
-    private buildExtendedReport;
+    sendControlSync(seq: number, dev: ControlSyncTarget): void;
 }
 export {};

package/dist/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/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;