@lox-audioserver/node-airplay-sender 0.4.6 → 0.4.8

package/README.md

@@ -61,6 +61,7 @@ Creates and starts a sender for one AirPlay device. Returns the instance so you
 
 **Events** (sent to `onEvent` callback)
 - `device`: `{ event: "device", message: status, detail: { key, desc } }`
+- `session-ended`: `{ event: "session-ended", message: reason, detail: { key, reason } }`
 - `buffer`: `{ event: "buffer", message: status }` where status is `buffering|playing|drain|end`
 - `error`: `{ event: "error", message }`
 - `metrics`: `{ event: "metrics", detail }` sync drift snapshots emitted on each sync tick when enabled.

package/dist/core/deviceAirtunes.d.ts

@@ -62,7 +62,7 @@ type AirTunesDeviceInstance = EventEmitter & {
     logLine?: (...args: any[]) => void;
     doHandshake: () => void;
     relayAudio: () => void;
-    cleanup: () => void;
+    cleanup: (reason?: string) => void;
 };
 /**
  * Construct a RAOP/AirPlay device handler.

package/dist/core/deviceAirtunes.js

@@ -247,7 +247,7 @@ AirTunesDevice.prototype.start = function () {
         if (err) {
             this.logLine?.(err.code);
             this.status = 'stopped';
-            this.emit('status', 'stopped');
+            this.emit('status', 'stopped', 'udp_ports');
             this.logLine?.('port issues');
             this.emit('error', 'udp_ports', err.code);
             return;
@@ -297,8 +297,7 @@ AirTunesDevice.prototype.doHandshake = function () {
         this.rtsp.on('ready', () => {
             this.status = 'playing';
             this.emit('status', 'playing');
-            if (this.airplay2)
-                this.relayAudio();
+            this.relayAudio();
         });
         this.rtsp.on('need_password', () => {
             this.emit('status', 'need_password');
@@ -310,10 +309,11 @@ AirTunesDevice.prototype.doHandshake = function () {
             this.emit('status', 'pair_success');
         });
         this.rtsp.on('end', (err) => {
-            this.logLine?.(err);
-            this.cleanup();
-            if (err !== 'stopped')
-                this.emit(err);
+            const reason = err == null ? 'unknown' : String(err);
+            this.logLine?.(reason);
+            this.cleanup(reason);
+            if (reason !== 'stopped')
+                this.emit(reason);
         });
     }
     catch (e) {
@@ -328,6 +328,9 @@ AirTunesDevice.prototype.doHandshake = function () {
 AirTunesDevice.prototype.relayAudio = function () {
     this.status = 'ready';
     this.emit('status', 'ready');
+    let packetCount = 0;
+    let byteCount = 0;
+    let lastLogAt = 0;
     this.audioCallback = (packet) => {
         const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec);
         // if (self.credentials) {
@@ -335,8 +338,37 @@ AirTunesDevice.prototype.relayAudio = function () {
         // }
         if (this.audioSocket == null) {
             this.audioSocket = node_dgram_1.default.createSocket('udp4');
+            this.audioSocket.on('error', (err) => {
+                this.logLine?.('audio socket error', {
+                    host: this.host,
+                    port: this.serverPort,
+                    message: err instanceof Error ? err.message : String(err),
+                });
+            });
+        }
+        this.audioSocket.send(airTunes, 0, airTunes.length, this.serverPort, this.host, (err) => {
+            if (err) {
+                this.logLine?.('audio packet send failed', {
+                    host: this.host,
+                    port: this.serverPort,
+                    message: err instanceof Error ? err.message : String(err),
+                });
+            }
+        });
+        packetCount += 1;
+        byteCount += airTunes.length;
+        const now = Date.now();
+        if (now - lastLogAt > 5000) {
+            lastLogAt = now;
+            if (this.options?.debug) {
+                this.logLine?.('audio packet send stats', {
+                    host: this.host,
+                    port: this.serverPort,
+                    packets: packetCount,
+                    bytes: byteCount,
+                });
+            }
         }
-        this.audioSocket.send(airTunes, 0, airTunes.length, this.serverPort, this.host);
     };
     //   this.sendAirTunesPacket = function(airTunes) {
     //     try{
@@ -371,11 +403,11 @@ AirTunesDevice.prototype.onSyncNeeded = function (seq) {
     this.udpServers.sendControlSync(seq, this);
     //if ( this.airplay2)this.rtsp.sendControlSync(seq, this, this.rtsp);
 };
-AirTunesDevice.prototype.cleanup = function () {
+AirTunesDevice.prototype.cleanup = function (reason = 'stopped') {
     this.audioSocket = null;
     this.audioPacketHistory = null;
     this.status = 'stopped';
-    this.emit('status', 'stopped');
+    this.emit('status', 'stopped', reason);
     // console.debug('stop');
     if (this.audioCallback) {
         this.audioOut.removeListener('packet', this.audioCallback);

package/dist/core/devices.js

@@ -56,7 +56,7 @@ class Devices extends node_events_1.EventEmitter {
             return previousDev;
         }
         this.devices[dev.key] = dev;
-        dev.on('status', (status) => {
+        dev.on('status', (status, desc = '') => {
             if (status === 'error' || status === 'stopped') {
                 delete this.devices[dev.key];
                 this.checkAirTunesDevices();
@@ -64,7 +64,7 @@ class Devices extends node_events_1.EventEmitter {
             if (this.hasAirTunes && status === 'playing') {
                 this.emit('need_sync');
             }
-            this.emit('status', dev.key, status, '');
+            this.emit('status', dev.key, status, desc);
         });
         dev.start();
         this.checkAirTunesDevices();

package/dist/esm/core/deviceAirtunes.js

@@ -247,7 +247,7 @@ AirTunesDevice.prototype.start = function () {
         if (err) {
             this.logLine?.(err.code);
             this.status = 'stopped';
-            this.emit('status', 'stopped');
+            this.emit('status', 'stopped', 'udp_ports');
             this.logLine?.('port issues');
             this.emit('error', 'udp_ports', err.code);
             return;
@@ -297,8 +297,7 @@ AirTunesDevice.prototype.doHandshake = function () {
         this.rtsp.on('ready', () => {
             this.status = 'playing';
             this.emit('status', 'playing');
-            if (this.airplay2)
-                this.relayAudio();
+            this.relayAudio();
         });
         this.rtsp.on('need_password', () => {
             this.emit('status', 'need_password');
@@ -310,10 +309,11 @@ AirTunesDevice.prototype.doHandshake = function () {
             this.emit('status', 'pair_success');
         });
         this.rtsp.on('end', (err) => {
-            this.logLine?.(err);
-            this.cleanup();
-            if (err !== 'stopped')
-                this.emit(err);
+            const reason = err == null ? 'unknown' : String(err);
+            this.logLine?.(reason);
+            this.cleanup(reason);
+            if (reason !== 'stopped')
+                this.emit(reason);
         });
     }
     catch (e) {
@@ -328,6 +328,9 @@ AirTunesDevice.prototype.doHandshake = function () {
 AirTunesDevice.prototype.relayAudio = function () {
     this.status = 'ready';
     this.emit('status', 'ready');
+    let packetCount = 0;
+    let byteCount = 0;
+    let lastLogAt = 0;
     this.audioCallback = (packet) => {
         const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec);
         // if (self.credentials) {
@@ -335,8 +338,37 @@ AirTunesDevice.prototype.relayAudio = function () {
         // }
         if (this.audioSocket == null) {
             this.audioSocket = node_dgram_1.default.createSocket('udp4');
+            this.audioSocket.on('error', (err) => {
+                this.logLine?.('audio socket error', {
+                    host: this.host,
+                    port: this.serverPort,
+                    message: err instanceof Error ? err.message : String(err),
+                });
+            });
+        }
+        this.audioSocket.send(airTunes, 0, airTunes.length, this.serverPort, this.host, (err) => {
+            if (err) {
+                this.logLine?.('audio packet send failed', {
+                    host: this.host,
+                    port: this.serverPort,
+                    message: err instanceof Error ? err.message : String(err),
+                });
+            }
+        });
+        packetCount += 1;
+        byteCount += airTunes.length;
+        const now = Date.now();
+        if (now - lastLogAt > 5000) {
+            lastLogAt = now;
+            if (this.options?.debug) {
+                this.logLine?.('audio packet send stats', {
+                    host: this.host,
+                    port: this.serverPort,
+                    packets: packetCount,
+                    bytes: byteCount,
+                });
+            }
         }
-        this.audioSocket.send(airTunes, 0, airTunes.length, this.serverPort, this.host);
     };
     //   this.sendAirTunesPacket = function(airTunes) {
     //     try{
@@ -371,11 +403,11 @@ AirTunesDevice.prototype.onSyncNeeded = function (seq) {
     this.udpServers.sendControlSync(seq, this);
     //if ( this.airplay2)this.rtsp.sendControlSync(seq, this, this.rtsp);
 };
-AirTunesDevice.prototype.cleanup = function () {
+AirTunesDevice.prototype.cleanup = function (reason = 'stopped') {
     this.audioSocket = null;
     this.audioPacketHistory = null;
     this.status = 'stopped';
-    this.emit('status', 'stopped');
+    this.emit('status', 'stopped', reason);
     // console.debug('stop');
     if (this.audioCallback) {
         this.audioOut.removeListener('packet', this.audioCallback);

package/dist/esm/core/devices.js

@@ -56,7 +56,7 @@ class Devices extends node_events_1.EventEmitter {
             return previousDev;
         }
         this.devices[dev.key] = dev;
-        dev.on('status', (status) => {
+        dev.on('status', (status, desc = '') => {
             if (status === 'error' || status === 'stopped') {
                 delete this.devices[dev.key];
                 this.checkAirTunesDevices();
@@ -64,7 +64,7 @@ class Devices extends node_events_1.EventEmitter {
             if (this.hasAirTunes && status === 'playing') {
                 this.emit('need_sync');
             }
-            this.emit('status', dev.key, status, '');
+            this.emit('status', dev.key, status, desc);
         });
         dev.start();
         this.checkAirTunesDevices();

package/dist/esm/index.js

@@ -77,6 +77,9 @@ class LoxAirplaySender extends node_events_1.EventEmitter {
         });
         this.airtunes.on('device', (key, status, desc) => {
             onEvent?.({ event: 'device', message: status, detail: { key, desc } });
+            if (status === 'stopped') {
+                onEvent?.({ event: 'session-ended', message: desc || 'stopped', detail: { key, reason: desc || 'stopped' } });
+            }
         });
         this.airtunes.on('buffer', (status) => {
             onEvent?.({ event: 'buffer', message: status });

package/dist/esm/utils/http.js

@@ -98,15 +98,16 @@ class HttpClient {
                 port
             }, resolve);
             this.socket.on('data', data => {
+                const chunk = Buffer.isBuffer(data) ? data : Buffer.from(data);
                 if (!this.pendingResponse) {
                     // there is no response pending, parse the data.
-                    this.parseResponse(data);
+                    this.parseResponse(chunk);
                 }
                 else {
                     // incoming data for the pending response.
                     const existing = this.pendingResponse.res.body ?? Buffer.alloc(0);
-                    this.pendingResponse.res.body = Buffer.concat([existing, data], data.byteLength + existing.byteLength);
-                    this.pendingResponse.remaining -= data.byteLength;
+                    this.pendingResponse.res.body = Buffer.concat([existing, chunk], chunk.byteLength + existing.byteLength);
+                    this.pendingResponse.remaining -= chunk.byteLength;
                     if (this.pendingResponse.remaining === 0) {
                         // all remaining data for the pending response has been read; resolve the promise for the 
                         // corresponding request.

package/dist/index.d.ts

@@ -51,7 +51,7 @@ export interface AirplayMetadata {
     durationMs?: number;
 }
 export interface LoxAirplayEvent {
-    event: string;
+    event: 'device' | 'buffer' | 'error' | 'metrics' | 'session-ended' | string;
     message?: string;
     detail?: any;
 }

package/dist/index.js

@@ -77,6 +77,9 @@ class LoxAirplaySender extends node_events_1.EventEmitter {
         });
         this.airtunes.on('device', (key, status, desc) => {
             onEvent?.({ event: 'device', message: status, detail: { key, desc } });
+            if (status === 'stopped') {
+                onEvent?.({ event: 'session-ended', message: desc || 'stopped', detail: { key, reason: desc || 'stopped' } });
+            }
         });
         this.airtunes.on('buffer', (status) => {
             onEvent?.({ event: 'buffer', message: status });

package/dist/utils/http.js

@@ -98,15 +98,16 @@ class HttpClient {
                 port
             }, resolve);
             this.socket.on('data', data => {
+                const chunk = Buffer.isBuffer(data) ? data : Buffer.from(data);
                 if (!this.pendingResponse) {
                     // there is no response pending, parse the data.
-                    this.parseResponse(data);
+                    this.parseResponse(chunk);
                 }
                 else {
                     // incoming data for the pending response.
                     const existing = this.pendingResponse.res.body ?? Buffer.alloc(0);
-                    this.pendingResponse.res.body = Buffer.concat([existing, data], data.byteLength + existing.byteLength);
-                    this.pendingResponse.remaining -= data.byteLength;
+                    this.pendingResponse.res.body = Buffer.concat([existing, chunk], chunk.byteLength + existing.byteLength);
+                    this.pendingResponse.remaining -= chunk.byteLength;
                     if (this.pendingResponse.remaining === 0) {
                         // all remaining data for the pending response has been read; resolve the promise for the 
                         // corresponding request.

package/package.json

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