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

package/dist/core/atvAuthenticator.js

@@ -36,10 +36,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const elliptic = require('elliptic');
 const crypto_1 = __importDefault(require("crypto"));
 const ed = __importStar(require("@noble/ed25519"));
 const util_1 = require("../utils/util");
+if (!ed.utils.sha512Sync) {
+    ed.utils.sha512Sync = (...messages) => {
+        const hash = crypto_1.default.createHash('sha512');
+        for (const message of messages) {
+            hash.update(message);
+        }
+        return new Uint8Array(hash.digest());
+    };
+}
 // ...
 // Note: All functions expect parameters to be hex strings.
 function pair_setup_aes_key(K) {
@@ -75,7 +83,8 @@ function pair_verify_aes_iv(shared) {
 // ...
 // Public.
 function a_pub(a) {
-    return elliptic.utils.toHex(new elliptic.eddsa('ed25519').keyFromSecret(a).getPublic());
+    const publicKey = ed.sync.getPublicKey((0, util_1.hexString2ArrayBuffer)(a));
+    return (0, util_1.buf2hex)(publicKey);
 }
 function confirm(a, K) {
     const key = pair_setup_aes_key(K);
@@ -107,8 +116,9 @@ function shared(v_pri, atv_pub) {
     return (0, util_1.buf2hex)(Buffer.from(ed.curve25519.scalarMult((0, util_1.hexString2ArrayBuffer)(v_pri), (0, util_1.hexString2ArrayBuffer)(atv_pub))));
 }
 function signed(a, v_pub, atv_pub) {
-    const key = new elliptic.eddsa('ed25519').keyFromSecret(a);
-    return key.sign(v_pub + atv_pub).toHex();
+    const message = (0, util_1.hexString2ArrayBuffer)(v_pub + atv_pub);
+    const signature = ed.sync.sign(message, (0, util_1.hexString2ArrayBuffer)(a));
+    return (0, util_1.buf2hex)(signature);
 }
 function signature(shared, atv_data, signed) {
     const cipher = crypto_1.default.createCipheriv('aes-128-ctr', (0, util_1.hexString2ArrayBuffer)(pair_verify_aes_key(shared)), (0, util_1.hexString2ArrayBuffer)(pair_verify_aes_iv(shared)));

package/dist/core/deviceAirtunes.js

@@ -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');
@@ -328,6 +327,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 +337,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{

package/dist/esm/core/atvAuthenticator.js

@@ -36,10 +36,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const elliptic = require('elliptic');
 const crypto_1 = __importDefault(require("crypto"));
 const ed = __importStar(require("@noble/ed25519"));
 const util_1 = require("../utils/util");
+if (!ed.utils.sha512Sync) {
+    ed.utils.sha512Sync = (...messages) => {
+        const hash = crypto_1.default.createHash('sha512');
+        for (const message of messages) {
+            hash.update(message);
+        }
+        return new Uint8Array(hash.digest());
+    };
+}
 // ...
 // Note: All functions expect parameters to be hex strings.
 function pair_setup_aes_key(K) {
@@ -75,7 +83,8 @@ function pair_verify_aes_iv(shared) {
 // ...
 // Public.
 function a_pub(a) {
-    return elliptic.utils.toHex(new elliptic.eddsa('ed25519').keyFromSecret(a).getPublic());
+    const publicKey = ed.sync.getPublicKey((0, util_1.hexString2ArrayBuffer)(a));
+    return (0, util_1.buf2hex)(publicKey);
 }
 function confirm(a, K) {
     const key = pair_setup_aes_key(K);
@@ -107,8 +116,9 @@ function shared(v_pri, atv_pub) {
     return (0, util_1.buf2hex)(Buffer.from(ed.curve25519.scalarMult((0, util_1.hexString2ArrayBuffer)(v_pri), (0, util_1.hexString2ArrayBuffer)(atv_pub))));
 }
 function signed(a, v_pub, atv_pub) {
-    const key = new elliptic.eddsa('ed25519').keyFromSecret(a);
-    return key.sign(v_pub + atv_pub).toHex();
+    const message = (0, util_1.hexString2ArrayBuffer)(v_pub + atv_pub);
+    const signature = ed.sync.sign(message, (0, util_1.hexString2ArrayBuffer)(a));
+    return (0, util_1.buf2hex)(signature);
 }
 function signature(shared, atv_data, signed) {
     const cipher = crypto_1.default.createCipheriv('aes-128-ctr', (0, util_1.hexString2ArrayBuffer)(pair_verify_aes_key(shared)), (0, util_1.hexString2ArrayBuffer)(pair_verify_aes_iv(shared)));

package/dist/esm/core/deviceAirtunes.js

@@ -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');
@@ -328,6 +327,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 +337,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{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lox-audioserver/node-airplay-sender",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "AirPlay sender (RAOP/AirPlay 1; AirPlay 2 control/auth, best-effort audio)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -52,11 +52,10 @@
     "bplist-parser": "^0.3.2",
     "crypto-js": "^4.2.0",
     "curve25519-js": "^0.0.4",
-    "elliptic": "^6.5.5",
     "fast-srp-hap": "^2.0.4",
     "js-crypto-aes": "^1.0.6",
     "js-sha1": "^0.7.0",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "parse-raw-http": "0.0.1",
     "python-struct": "^1.1.3",
     "simple-plist": "^1.4.0",