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

package/dist/esm/utils/ntp.js

@@ -3,54 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toNtpTimestamp = toNtpTimestamp;
-exports.parseNtpTimestamp = parseNtpTimestamp;
-exports.ntpFromUnixMs = ntpFromUnixMs;
 const config_1 = __importDefault(require("./config"));
-const NS_PER_SEC = 1000000000n;
-const FRAC_PER_SEC = 0x100000000n; // 2^32
 class NTP {
-    /** Convert monotonic clock to NTP epoch (1900-01-01) seconds + fractional. */
+    timeRef = Date.now() - config_1.default.ntp_epoch * 1000;
     timestamp() {
-        const nowNs = process.hrtime.bigint();
-        const sec = Number(nowNs / NS_PER_SEC) + config_1.default.ntp_epoch;
-        const frac = Number(((nowNs % NS_PER_SEC) * FRAC_PER_SEC) / NS_PER_SEC);
+        const time = Date.now() - this.timeRef;
+        const sec = Math.floor(time / 1000);
+        const msec = time - sec * 1000;
+        const ntp_msec = Math.floor(msec * 4294967.296);
         const ts = Buffer.alloc(8);
-        ts.writeUInt32BE(sec >>> 0, 0);
-        ts.writeUInt32BE(frac >>> 0, 4);
+        ts.writeUInt32BE(sec, 0);
+        ts.writeUInt32BE(ntp_msec, 4);
         return ts;
     }
-    /** Return the current NTP fractional component (for compatibility). */
     getTime() {
-        const nowNs = process.hrtime.bigint();
-        return Number(((nowNs % NS_PER_SEC) * FRAC_PER_SEC) / NS_PER_SEC);
+        const time = Date.now() - this.timeRef;
+        const sec = Math.floor(time / 1000);
+        const msec = time - sec * 1000;
+        const ntp_msec = Math.floor(msec * 4294967.296);
+        return ntp_msec;
     }
 }
 exports.default = new NTP();
-/** Pack various NTP timestamp representations into a uint64 bigint (sec<<32|frac). */
-function toNtpTimestamp(input) {
-    if (typeof input === 'bigint')
-        return input;
-    if (typeof input === 'number')
-        return BigInt(input);
-    const sec = BigInt(input.sec >>> 0);
-    const frac = BigInt(input.frac >>> 0);
-    return (sec << 32n) | frac;
-}
-/** Parse an NTP timestamp (uint64 or sec/frac) into components. */
-function parseNtpTimestamp(input) {
-    if (typeof input === 'bigint' || typeof input === 'number') {
-        const value = typeof input === 'bigint' ? input : BigInt(input);
-        const sec = Number(value >> 32n);
-        const frac = Number(value & 0xffffffffn);
-        return { sec, frac };
-    }
-    return { sec: input.sec, frac: input.frac };
-}
-/** Build an NTP timestamp from a Unix epoch (ms). */
-function ntpFromUnixMs(unixMs) {
-    const sec = Math.floor(unixMs / 1000) + config_1.default.ntp_epoch;
-    const ms = unixMs % 1000;
-    const frac = Math.floor((ms / 1000) * Number(FRAC_PER_SEC));
-    return (BigInt(sec >>> 0) << 32n) | BigInt(frac >>> 0);
-}

package/dist/homekit/credentials.d.ts

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

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

@@ -1,7 +1,6 @@
 import { EventEmitter } from 'node:events';
 import { Readable } from 'node:stream';
 import { type AirplayConfig } from './utils/config';
-import { type NtpTimestampInput } from './utils/ntp';
 /**
  * Configuration for a single AirPlay sender.
  */
@@ -31,18 +30,10 @@ export interface LoxAirplaySenderOptions {
     debug?: boolean;
     /** Optional unix ms start time for synced playback. */
     startTimeMs?: number;
-    /** Optional absolute NTP start time (uint64: sec<<32 | frac). */
-    startTimeNtp?: NtpTimestampInput;
     /** Logger hook for internal messages. */
     log?: (level: 'debug' | 'info' | 'warn' | 'error', message: string, data?: unknown) => void;
     /** Override transport/buffer tuning without patching the module. */
     config?: Partial<AirplayConfig>;
-    /** Optional override for per-session SSRC/device magic. */
-    deviceMagic?: number;
-    /** Optional override for resend buffer size (packets). */
-    resendBufferSize?: number;
-    /** Optional mute window (ms) after underrun to smooth recovery. */
-    underrunMuteMs?: number;
 }
 /**
  * Metadata sent to receivers for UI display.

package/dist/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/utils/circularBuffer.d.ts

@@ -14,7 +14,6 @@ export default class CircularBuffer extends EventEmitter {
     private buffers;
     private currentSize;
     private status;
-    private hadUnderrun;
     constructor(packetsInBuffer: number, packetSize: number);
     /**
      * Write a PCM/ALAC chunk into the buffer.

package/dist/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/utils/config.d.ts

@@ -22,17 +22,7 @@ export interface AirplayConfig {
     rtsp_retry_jitter_ms: number;
     control_sync_base_delay_ms: number;
     control_sync_jitter_ms: number;
-    use_monotonic_clock: boolean;
-    jump_forward_enabled: boolean;
-    jump_forward_threshold_ms: number;
-    jump_forward_lead_ms: number;
     device_magic: number;
-    resend_buffer_size: number;
-    send_rtcp_sr: boolean;
-    send_rtcp_rr: boolean;
-    send_rtcp_xr: boolean;
-    underrun_mute_ms: number;
-    debug_dump: boolean;
     ntp_epoch: number;
     iv_base64: string;
     rsa_aeskey_base64: string;

package/dist/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',

package/dist/utils/ntp.d.ts

@@ -1,21 +1,7 @@
-export type NtpTimestampInput = bigint | number | {
-    sec: number;
-    frac: number;
-};
 declare class NTP {
-    /** Convert monotonic clock to NTP epoch (1900-01-01) seconds + fractional. */
+    private readonly timeRef;
     timestamp(): Buffer;
-    /** Return the current NTP fractional component (for compatibility). */
     getTime(): number;
 }
 declare const _default: NTP;
 export default _default;
-/** Pack various NTP timestamp representations into a uint64 bigint (sec<<32|frac). */
-export declare function toNtpTimestamp(input: NtpTimestampInput): bigint;
-/** Parse an NTP timestamp (uint64 or sec/frac) into components. */
-export declare function parseNtpTimestamp(input: NtpTimestampInput): {
-    sec: number;
-    frac: number;
-};
-/** Build an NTP timestamp from a Unix epoch (ms). */
-export declare function ntpFromUnixMs(unixMs: number): bigint;

package/dist/utils/ntp.js

@@ -3,54 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toNtpTimestamp = toNtpTimestamp;
-exports.parseNtpTimestamp = parseNtpTimestamp;
-exports.ntpFromUnixMs = ntpFromUnixMs;
 const config_1 = __importDefault(require("./config"));
-const NS_PER_SEC = 1000000000n;
-const FRAC_PER_SEC = 0x100000000n; // 2^32
 class NTP {
-    /** Convert monotonic clock to NTP epoch (1900-01-01) seconds + fractional. */
+    timeRef = Date.now() - config_1.default.ntp_epoch * 1000;
     timestamp() {
-        const nowNs = process.hrtime.bigint();
-        const sec = Number(nowNs / NS_PER_SEC) + config_1.default.ntp_epoch;
-        const frac = Number(((nowNs % NS_PER_SEC) * FRAC_PER_SEC) / NS_PER_SEC);
+        const time = Date.now() - this.timeRef;
+        const sec = Math.floor(time / 1000);
+        const msec = time - sec * 1000;
+        const ntp_msec = Math.floor(msec * 4294967.296);
         const ts = Buffer.alloc(8);
-        ts.writeUInt32BE(sec >>> 0, 0);
-        ts.writeUInt32BE(frac >>> 0, 4);
+        ts.writeUInt32BE(sec, 0);
+        ts.writeUInt32BE(ntp_msec, 4);
         return ts;
     }
-    /** Return the current NTP fractional component (for compatibility). */
     getTime() {
-        const nowNs = process.hrtime.bigint();
-        return Number(((nowNs % NS_PER_SEC) * FRAC_PER_SEC) / NS_PER_SEC);
+        const time = Date.now() - this.timeRef;
+        const sec = Math.floor(time / 1000);
+        const msec = time - sec * 1000;
+        const ntp_msec = Math.floor(msec * 4294967.296);
+        return ntp_msec;
     }
 }
 exports.default = new NTP();
-/** Pack various NTP timestamp representations into a uint64 bigint (sec<<32|frac). */
-function toNtpTimestamp(input) {
-    if (typeof input === 'bigint')
-        return input;
-    if (typeof input === 'number')
-        return BigInt(input);
-    const sec = BigInt(input.sec >>> 0);
-    const frac = BigInt(input.frac >>> 0);
-    return (sec << 32n) | frac;
-}
-/** Parse an NTP timestamp (uint64 or sec/frac) into components. */
-function parseNtpTimestamp(input) {
-    if (typeof input === 'bigint' || typeof input === 'number') {
-        const value = typeof input === 'bigint' ? input : BigInt(input);
-        const sec = Number(value >> 32n);
-        const frac = Number(value & 0xffffffffn);
-        return { sec, frac };
-    }
-    return { sec: input.sec, frac: input.frac };
-}
-/** Build an NTP timestamp from a Unix epoch (ms). */
-function ntpFromUnixMs(unixMs) {
-    const sec = Math.floor(unixMs / 1000) + config_1.default.ntp_epoch;
-    const ms = unixMs % 1000;
-    const frac = Math.floor((ms / 1000) * Number(FRAC_PER_SEC));
-    return (BigInt(sec >>> 0) << 32n) | BigInt(frac >>> 0);
-}

package/package.json

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