lox-airplay-sender 0.1.0 → 0.2.0

package/dist/core/deviceAirtunes.js

@@ -241,24 +241,22 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
 }
 Object.setPrototypeOf(AirTunesDevice.prototype, node_events_1.EventEmitter.prototype);
 AirTunesDevice.prototype.start = function () {
-    var self = this;
     this.audioSocket = node_dgram_1.default.createSocket('udp4');
     // Wait until timing and control ports are chosen. We need them in RTSP handshake.
-    this.udpServers.on('ports', function (err) {
+    this.udpServers.on('ports', (err) => {
         if (err) {
-            self.logLine?.(err.code);
-            self.status = 'stopped';
-            self.emit('status', 'stopped');
-            self.logLine?.('port issues');
-            self.emit('error', 'udp_ports', err.code);
+            this.logLine?.(err.code);
+            this.status = 'stopped';
+            this.emit('status', 'stopped');
+            this.logLine?.('port issues');
+            this.emit('error', 'udp_ports', err.code);
             return;
         }
-        self.doHandshake();
+        this.doHandshake();
     });
     this.udpServers.bind(this.host);
 };
 AirTunesDevice.prototype.doHandshake = function () {
-    var self = this;
     try {
         if (this.rtsp == null) {
             try {
@@ -276,47 +274,50 @@ AirTunesDevice.prototype.doHandshake = function () {
                 });
             }
             catch (e) {
-                self.logLine?.(e);
+                this.logLine?.(e);
             }
         }
         if (!this.rtsp) {
             return;
         }
-        this.rtsp.on('config', function (setup) {
-            self.audioLatency = setup.audioLatency;
-            self.requireEncryption = setup.requireEncryption;
-            self.serverPort = setup.server_port;
-            self.controlPort = setup.control_port;
-            self.timingPort = setup.timing_port;
-            self.credentials = setup.credentials;
+        this.rtsp.on('config', (setup) => {
+            this.audioLatency = setup.audioLatency;
+            this.requireEncryption = setup.requireEncryption;
+            this.serverPort = setup.server_port;
+            this.controlPort = setup.control_port;
+            this.timingPort = setup.timing_port;
+            this.credentials = setup.credentials;
             try {
-                self.audioOut?.setLatencyFrames?.(self.audioLatency);
+                this.audioOut?.setLatencyFrames?.(this.audioLatency);
             }
             catch {
                 /* ignore */
             }
         });
-        this.rtsp.on('ready', function () {
-            self.relayAudio();
+        this.rtsp.on('ready', () => {
+            this.status = 'playing';
+            this.emit('status', 'playing');
+            if (this.airplay2)
+                this.relayAudio();
         });
-        this.rtsp.on('need_password', function () {
-            self.emit('status', 'need_password');
+        this.rtsp.on('need_password', () => {
+            this.emit('status', 'need_password');
         });
-        this.rtsp.on('pair_failed', function () {
-            self.emit('status', 'pair_failed');
+        this.rtsp.on('pair_failed', () => {
+            this.emit('status', 'pair_failed');
         });
-        this.rtsp.on('pair_success', function () {
-            self.emit('status', 'pair_success');
+        this.rtsp.on('pair_success', () => {
+            this.emit('status', 'pair_success');
         });
-        this.rtsp.on('end', function (err) {
-            self.logLine?.(err);
-            self.cleanup();
+        this.rtsp.on('end', (err) => {
+            this.logLine?.(err);
+            this.cleanup();
             if (err !== 'stopped')
-                self.emit(err);
+                this.emit(err);
         });
     }
     catch (e) {
-        self.logLine?.(e);
+        this.logLine?.(e);
     }
     // console.log(this.udpServers, this.host,this.port)
     if (!this.rtsp) {
@@ -325,18 +326,17 @@ AirTunesDevice.prototype.doHandshake = function () {
     this.rtsp.startHandshake(this.udpServers, this.host, this.port);
 };
 AirTunesDevice.prototype.relayAudio = function () {
-    var self = this;
     this.status = 'ready';
     this.emit('status', 'ready');
-    this.audioCallback = function (packet) {
-        var airTunes = makeAirTunesPacket(packet, self.encoder, self.requireEncryption, self.alacEncoding, self.credentials, self.inputCodec);
+    this.audioCallback = (packet) => {
+        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec);
         // if (self.credentials) {
         //   airTunes = self.credentials.encrypt(airTunes)
         // }
-        if (self.audioSocket == null) {
-            self.audioSocket = node_dgram_1.default.createSocket('udp4');
+        if (this.audioSocket == null) {
+            this.audioSocket = node_dgram_1.default.createSocket('udp4');
         }
-        self.audioSocket.send(airTunes, 0, airTunes.length, self.serverPort, self.host);
+        this.audioSocket.send(airTunes, 0, airTunes.length, this.serverPort, this.host);
     };
     //   this.sendAirTunesPacket = function(airTunes) {
     //     try{

package/dist/core/rtsp.js

@@ -150,86 +150,107 @@ function Client(volume, password, audioOut, options) {
     this.hostip = null;
     this.homekitver = this.transient ? "4" : "3";
     this.metadataReady = false;
+    this.connectAttempts = 0;
 }
 util.inherits(Client, events.EventEmitter);
 exports.default = { Client };
 Client.prototype.startHandshake = function (udpServers, host, port) {
-    var self = this;
     this.startTimeout();
     this.hostip = host;
     this.controlPort = udpServers.control.port;
     this.timingPort = udpServers.timing.port;
-    this.socket = net.connect(port, host, async function () {
-        self.clearTimeout();
-        if (self.needPassword || self.needPin) {
-            self.status = PAIR_PIN_START;
-            self.sendNextRequest();
-            self.startHeartBeat();
-        }
-        else {
-            if (self.mode != 2) {
-                if (self.debug)
-                    self.logLine?.("AUTH_SETUP", "nah");
-                self.status = OPTIONS;
-                self.sendNextRequest();
-                self.startHeartBeat();
+    this.connectAttempts = 0;
+    const connect = () => {
+        const attempt = this.connectAttempts ?? 0;
+        this.socket = net.connect(port, host, async () => {
+            this.clearTimeout();
+            this.connectAttempts = 0;
+            if (this.needPassword || this.needPin) {
+                this.status = PAIR_PIN_START;
+                this.sendNextRequest();
+                this.startHeartBeat();
             }
             else {
-                self.status = AUTH_SETUP;
-                if (self.debug)
-                    self.logLine?.("AUTH_SETUP", "yah");
-                self.sendNextRequest();
-                self.startHeartBeat();
+                if (this.mode != 2) {
+                    if (this.debug)
+                        this.logLine?.("AUTH_SETUP", "nah");
+                    this.status = OPTIONS;
+                    this.sendNextRequest();
+                    this.startHeartBeat();
+                }
+                else {
+                    this.status = AUTH_SETUP;
+                    if (this.debug)
+                        this.logLine?.("AUTH_SETUP", "yah");
+                    this.sendNextRequest();
+                    this.startHeartBeat();
+                }
             }
-        }
-    });
-    var blob = '';
-    this.socket.on('data', function (data) {
-        if (self.encryptedChannel && self.credentials) {
-            // if (self.debug != false) self.logLine?.("incoming", data)
-            data = self.credentials.decrypt(data);
-        }
-        self.clearTimeout();
-        /*
-         * I wish I could use node's HTTP parser for this...
-         * I assume that all responses have empty bodies.
-         */
-        var rawData = data;
-        const dataStr = data.toString();
-        blob += dataStr;
-        var endIndex = blob.indexOf('\r\n\r\n');
-        if (endIndex < 0) {
-            return;
-        }
-        endIndex += 4;
-        blob = blob.substring(0, endIndex);
-        self.processData(blob, rawData);
-        blob = dataStr.substring(endIndex);
-    });
-    this.socket.on('error', function (err) {
-        self.socket = null;
-        if (self.debug)
-            self.logLine?.(err.code);
-        if (err.code === 'ECONNREFUSED') {
-            if (self.debug)
-                self.logLine?.('block');
-            self.cleanup('connection_refused');
-        }
-        else
-            self.cleanup('rtsp_socket', err.code);
-    });
-    this.socket.on('end', function () {
-        if (self.debug)
-            self.logLine?.('block2');
-        self.cleanup('disconnected');
-    });
+        });
+        let blob = '';
+        this.socket.on('data', (data) => {
+            if (this.encryptedChannel && this.credentials) {
+                // if (this.debug != false) this.logLine?.("incoming", data)
+                data = this.credentials.decrypt(data);
+            }
+            this.clearTimeout();
+            /*
+             * I wish I could use node's HTTP parser for this...
+             * I assume that all responses have empty bodies.
+             */
+            const rawData = data;
+            const dataStr = data.toString();
+            blob += dataStr;
+            let endIndex = blob.indexOf('\r\n\r\n');
+            if (endIndex < 0) {
+                return;
+            }
+            endIndex += 4;
+            blob = blob.substring(0, endIndex);
+            this.processData(blob, rawData);
+            blob = dataStr.substring(endIndex);
+        });
+        this.socket.on('error', (err) => {
+            this.socket = null;
+            this.clearTimeout();
+            const nextAttempt = (this.connectAttempts ?? 0) + 1;
+            this.connectAttempts = nextAttempt;
+            const shouldRetry = nextAttempt <= config.rtsp_retry_attempts;
+            if (shouldRetry) {
+                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;
+                if (this.debug)
+                    this.logLine?.('rtsp_retry', { attempt: nextAttempt, backOff, code: err?.code });
+                setTimeout(() => {
+                    this.startTimeout();
+                    connect();
+                }, backOff);
+                return;
+            }
+            if (this.debug)
+                this.logLine?.(err?.code);
+            if (err?.code === 'ECONNREFUSED') {
+                if (this.debug)
+                    this.logLine?.('block');
+                this.cleanup('connection_refused');
+            }
+            else
+                this.cleanup('rtsp_socket', err?.code);
+        });
+        this.socket.on('end', () => {
+            if (this.debug)
+                this.logLine?.('block2');
+            this.cleanup('disconnected');
+        });
+    };
+    connect();
 };
 Client.prototype.startTimeout = function () {
-    var self = this;
-    this.timeout = setTimeout(function () {
-        if (self.debug)
-            self.logLine?.('timeout');
-        self.cleanup('timeout');
+    this.timeout = setTimeout(() => {
+        if (this.debug)
+            this.logLine?.('timeout');
+        this.cleanup('timeout');
     }, config.rtsp_timeout);
 };
 Client.prototype.clearTimeout = function () {
@@ -280,10 +301,13 @@ Client.prototype.setPasscode = async function (passcode) {
     this.sendNextRequest();
 };
 Client.prototype.startHeartBeat = function () {
-    var self = this;
+    if (this.heartBeat) {
+        clearInterval(this.heartBeat);
+        this.heartBeat = null;
+    }
     if (config.rtsp_heartbeat > 0) {
-        this.heartBeat = setInterval(function () {
-            self.sendHeartBeat(function () {
+        this.heartBeat = setInterval(() => {
+            this.sendHeartBeat(() => {
                 //this.logLine?.('HeartBeat sent!');
             });
         }, config.rtsp_heartbeat);
@@ -319,7 +343,6 @@ Client.prototype.setArtwork = function (art, contentType, callback) {
         contentType = null;
     }
     if (typeof art == 'string') {
-        var self = this;
         if (contentType === null) {
             var ext = art.slice(-4);
             if (ext == ".jpg" || ext == "jpeg") {
@@ -332,14 +355,14 @@ Client.prototype.setArtwork = function (art, contentType, callback) {
                 contentType = "image/gif";
             }
             else {
-                return self.cleanup('unknown_art_file_ext');
+                return this.cleanup('unknown_art_file_ext');
             }
         }
-        return fs.readFile(art, function (err, data) {
+        return fs.readFile(art, (err, data) => {
             if (err !== null) {
-                return self.cleanup('invalid_art_file');
+                return this.cleanup('invalid_art_file');
             }
-            self.setArtwork(data, contentType, callback);
+            this.setArtwork(data, contentType, callback);
         });
     }
     if (contentType === null)
@@ -388,6 +411,44 @@ Client.prototype.cleanup = function (type, msg) {
         this.socket.destroy();
         this.socket = null;
     }
+    if (this.eventsocket) {
+        try {
+            this.eventsocket.destroy?.();
+            this.eventsocket = null;
+        }
+        catch {
+            /* ignore */
+        }
+    }
+    if (this.controlsocket) {
+        try {
+            this.controlsocket.close();
+        }
+        catch {
+            /* ignore */
+        }
+        this.controlsocket = null;
+    }
+    if (this.timingsocket) {
+        try {
+            this.timingsocket.close();
+        }
+        catch {
+            /* ignore */
+        }
+        this.timingsocket = null;
+    }
+    const audioSocket = this.audioSocket;
+    if (audioSocket) {
+        try {
+            audioSocket.close?.();
+            audioSocket.destroy?.();
+        }
+        catch {
+            /* ignore */
+        }
+        this.audioSocket = null;
+    }
 };
 function parseResponse(blob) {
     var response = {}, lines = blob.split('\r\n');
@@ -531,10 +592,8 @@ Client.prototype.sendNextRequest = async function (di) {
                 this.socket.write(Buffer.from(request, 'utf-8'));
             }
             else {
-                this.logLine?.("pass", this.password);
                 if (this.password) {
                     this.status = this.airplay2 ? PAIR_SETUP_1 : PAIR_PIN_SETUP_1;
-                    this.logLine?.("pass2", this.password);
                     this.sendNextRequest();
                 }
                 else {
@@ -591,8 +650,6 @@ Client.prototype.sendNextRequest = async function (di) {
             request += this.makeHead("POST", "/pair-verify", "", true);
             request += 'Content-Type: application/octet-stream\r\n';
             this.pair_verify_1_verifier = ATVAuthenticator.verifier(this.authSecret);
-            if (this.debug)
-                this.logLine?.(this.authSecret);
             request += 'Content-Length:' + Buffer.byteLength(this.pair_verify_1_verifier.verifierBody) + '\r\n\r\n';
             this.socket.write(Buffer.concat([Buffer.from(request, 'utf-8'), this.pair_verify_1_verifier.verifierBody]));
             request = '';
@@ -846,8 +903,7 @@ Client.prototype.sendNextRequest = async function (di) {
             catch (e) { }
             try {
                 this.timingsocket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
-                var self = this;
-                this.timingsocket.on('message', function (msg, rinfo) {
+                this.timingsocket.on('message', (msg, rinfo) => {
                     // only listen and respond on own hosts
                     // if (this.hosts.indexOf(rinfo.address) < 0) return;
                     var ts1 = msg.readUInt32BE(24);
@@ -861,8 +917,8 @@ Client.prototype.sendNextRequest = async function (di) {
                     var ntpTime = ntp.timestamp();
                     ntpTime.copy(reply, 16);
                     ntpTime.copy(reply, 24);
-                    self.timingsocket.send(reply, 0, reply.length, rinfo.port, rinfo.address);
-                    self.logLine?.('timing socket pinged', rinfo.port, rinfo.address);
+                    this.timingsocket.send(reply, 0, reply.length, rinfo.port, rinfo.address);
+                    this.logLine?.('timing socket pinged', rinfo.port, rinfo.address);
                 });
                 this.timingsocket.bind(this.timingPort, this.socket.address().address);
             }
@@ -916,9 +972,8 @@ Client.prototype.sendNextRequest = async function (di) {
                     }] });
             request += 'Content-Length: ' + Buffer.byteLength(setap2) + '\r\n\r\n';
             this.controlsocket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
-            var self = this;
-            this.controlsocket.on('message', function (msg, rinfo) {
-                self.logLine?.('controlsocket.data', msg);
+            this.controlsocket.on('message', (msg) => {
+                this.logLine?.('controlsocket.data', msg);
             });
             this.controlsocket.bind(this.controlPort, this.socket.address().address);
             let s2ct = this.credentials.encrypt(Buffer.concat([Buffer.from(request, 'utf-8'), setap2]));
@@ -928,18 +983,29 @@ Client.prototype.sendNextRequest = async function (di) {
         case RECORD:
             //this.logLine?.(request);
             if (this.airplay2) {
-                this.eventsocket = net.connect(this.eventPort, this.hostip, async function () {
-                });
-                this.eventsocket.on('data', function (data) {
-                    self.logLine?.('eventsocket.data', data);
-                    self.logLine?.('eventsocket.data2', self.event_credentials.decrypt(data).toString());
-                });
-                this.eventsocket.on('error', function (err) {
-                    self.logLine?.('eventsocket.error', err);
-                });
                 this.event_credentials = new Credentials("sdsds", "", "", "", this.seed);
                 this.event_credentials.writeKey = enc.HKDF("sha512", Buffer.from("Events-Salt"), this.srp.computeK(), Buffer.from("Events-Read-Encryption-Key"), 32);
                 this.event_credentials.readKey = enc.HKDF("sha512", Buffer.from("Events-Salt"), this.srp.computeK(), Buffer.from("Events-Write-Encryption-Key"), 32);
+                this.eventsocket = net.connect(this.eventPort, this.hostip, async () => {
+                });
+                this.eventsocket.on('data', (data) => {
+                    if (this.debug) {
+                        this.logLine?.('eventsocket.data', data);
+                        try {
+                            const decrypted = this.event_credentials?.decrypt(data);
+                            if (decrypted) {
+                                this.logLine?.('eventsocket.data2', decrypted.toString());
+                            }
+                        }
+                        catch (err) {
+                            this.logLine?.('eventsocket.decrypt.error', err);
+                        }
+                    }
+                });
+                this.eventsocket.on('error', (err) => {
+                    if (this.debug)
+                        this.logLine?.('eventsocket.error', err);
+                });
             }
             if (this.airplay2 != null && this.credentials != null) {
                 //  this.controlsocket.close();
@@ -1117,19 +1183,19 @@ 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 (this.debug != false) {
-        if ((rawData.toString()).includes("bplist00")) {
-            try {
-                let buf = Buffer.from(rawData).slice(rawData.length - parseInt(headers['Content-Length']), rawData.length);
-                let bplist = bplistParser.parseBuffer(buf);
-                this.logLine?.("incoming-res: \r\n", JSON.stringify(bplist));
+    if (this.debug) {
+        try {
+            if ((rawData.toString()).includes("bplist00")) {
+                const buf = Buffer.from(rawData).slice(rawData.length - parseInt(headers['Content-Length']), rawData.length);
+                const bplist = bplistParser.parseBuffer(buf);
+                this.logLine?.("incoming-res:", JSON.stringify(bplist));
             }
-            catch (_) {
-                this.logLine?.("incoming-res: \r\n", rawData.toString());
+            else {
+                this.logLine?.("incoming-res:", { code: response.code, length: rawData.length });
             }
         }
-        else {
-            this.logLine?.("incoming-res: \r\n", rawData.toString());
+        catch {
+            this.logLine?.("incoming-res:", { code: response.code, length: rawData.length });
         }
     }
     if (this.status != OPTIONS && this.status != OPTIONS2 && this.mode == 0) {
@@ -1363,7 +1429,6 @@ Client.prototype.processData = function (blob, rawData) {
                 this.credentials.writeKey = enc.HKDF("sha512", Buffer.from("Control-Salt"), this.srp.computeK(), Buffer.from("Control-Write-Encryption-Key"), 32);
                 this.credentials.readKey = enc.HKDF("sha512", Buffer.from("Control-Salt"), this.srp.computeK(), Buffer.from("Control-Read-Encryption-Key"), 32);
                 this.encryptedChannel = true;
-                this.logLine?.(this.srp.computeK());
                 this.status = SETUP_AP2_1;
             }
             else {

package/dist/core/udpServers.js

@@ -143,7 +143,11 @@ class UDPServers extends node_events_1.EventEmitter {
         const ntpTime = ntp_1.default.timestamp();
         ntpTime.copy(packet, 8);
         packet.writeUInt32BE((0, numUtil_1.low32)(seq * config_1.default.frames_per_packet + config_1.default.sampling_rate * 2), 16);
-        this.control.socket.send(packet, 0, packet.length, dev.controlPort, dev.host);
+        const delay = Math.max(0, config_1.default.control_sync_base_delay_ms +
+            Math.random() * config_1.default.control_sync_jitter_ms);
+        setTimeout(() => {
+            this.control.socket?.send(packet, 0, packet.length, dev.controlPort, dev.host);
+        }, delay);
     }
 }
 exports.default = UDPServers;

package/dist/esm/core/deviceAirtunes.js

@@ -241,24 +241,22 @@ function AirTunesDevice(host, audioOut, options, mode = 0, txt = '') {
 }
 Object.setPrototypeOf(AirTunesDevice.prototype, node_events_1.EventEmitter.prototype);
 AirTunesDevice.prototype.start = function () {
-    var self = this;
     this.audioSocket = node_dgram_1.default.createSocket('udp4');
     // Wait until timing and control ports are chosen. We need them in RTSP handshake.
-    this.udpServers.on('ports', function (err) {
+    this.udpServers.on('ports', (err) => {
         if (err) {
-            self.logLine?.(err.code);
-            self.status = 'stopped';
-            self.emit('status', 'stopped');
-            self.logLine?.('port issues');
-            self.emit('error', 'udp_ports', err.code);
+            this.logLine?.(err.code);
+            this.status = 'stopped';
+            this.emit('status', 'stopped');
+            this.logLine?.('port issues');
+            this.emit('error', 'udp_ports', err.code);
             return;
         }
-        self.doHandshake();
+        this.doHandshake();
     });
     this.udpServers.bind(this.host);
 };
 AirTunesDevice.prototype.doHandshake = function () {
-    var self = this;
     try {
         if (this.rtsp == null) {
             try {
@@ -276,47 +274,50 @@ AirTunesDevice.prototype.doHandshake = function () {
                 });
             }
             catch (e) {
-                self.logLine?.(e);
+                this.logLine?.(e);
             }
         }
         if (!this.rtsp) {
             return;
         }
-        this.rtsp.on('config', function (setup) {
-            self.audioLatency = setup.audioLatency;
-            self.requireEncryption = setup.requireEncryption;
-            self.serverPort = setup.server_port;
-            self.controlPort = setup.control_port;
-            self.timingPort = setup.timing_port;
-            self.credentials = setup.credentials;
+        this.rtsp.on('config', (setup) => {
+            this.audioLatency = setup.audioLatency;
+            this.requireEncryption = setup.requireEncryption;
+            this.serverPort = setup.server_port;
+            this.controlPort = setup.control_port;
+            this.timingPort = setup.timing_port;
+            this.credentials = setup.credentials;
             try {
-                self.audioOut?.setLatencyFrames?.(self.audioLatency);
+                this.audioOut?.setLatencyFrames?.(this.audioLatency);
             }
             catch {
                 /* ignore */
             }
         });
-        this.rtsp.on('ready', function () {
-            self.relayAudio();
+        this.rtsp.on('ready', () => {
+            this.status = 'playing';
+            this.emit('status', 'playing');
+            if (this.airplay2)
+                this.relayAudio();
         });
-        this.rtsp.on('need_password', function () {
-            self.emit('status', 'need_password');
+        this.rtsp.on('need_password', () => {
+            this.emit('status', 'need_password');
         });
-        this.rtsp.on('pair_failed', function () {
-            self.emit('status', 'pair_failed');
+        this.rtsp.on('pair_failed', () => {
+            this.emit('status', 'pair_failed');
         });
-        this.rtsp.on('pair_success', function () {
-            self.emit('status', 'pair_success');
+        this.rtsp.on('pair_success', () => {
+            this.emit('status', 'pair_success');
         });
-        this.rtsp.on('end', function (err) {
-            self.logLine?.(err);
-            self.cleanup();
+        this.rtsp.on('end', (err) => {
+            this.logLine?.(err);
+            this.cleanup();
             if (err !== 'stopped')
-                self.emit(err);
+                this.emit(err);
         });
     }
     catch (e) {
-        self.logLine?.(e);
+        this.logLine?.(e);
     }
     // console.log(this.udpServers, this.host,this.port)
     if (!this.rtsp) {
@@ -325,18 +326,17 @@ AirTunesDevice.prototype.doHandshake = function () {
     this.rtsp.startHandshake(this.udpServers, this.host, this.port);
 };
 AirTunesDevice.prototype.relayAudio = function () {
-    var self = this;
     this.status = 'ready';
     this.emit('status', 'ready');
-    this.audioCallback = function (packet) {
-        var airTunes = makeAirTunesPacket(packet, self.encoder, self.requireEncryption, self.alacEncoding, self.credentials, self.inputCodec);
+    this.audioCallback = (packet) => {
+        const airTunes = makeAirTunesPacket(packet, this.encoder, this.requireEncryption, this.alacEncoding, this.credentials, this.inputCodec);
         // if (self.credentials) {
         //   airTunes = self.credentials.encrypt(airTunes)
         // }
-        if (self.audioSocket == null) {
-            self.audioSocket = node_dgram_1.default.createSocket('udp4');
+        if (this.audioSocket == null) {
+            this.audioSocket = node_dgram_1.default.createSocket('udp4');
         }
-        self.audioSocket.send(airTunes, 0, airTunes.length, self.serverPort, self.host);
+        this.audioSocket.send(airTunes, 0, airTunes.length, this.serverPort, this.host);
     };
     //   this.sendAirTunesPacket = function(airTunes) {
     //     try{

package/dist/esm/core/rtsp.js

@@ -150,86 +150,107 @@ function Client(volume, password, audioOut, options) {
     this.hostip = null;
     this.homekitver = this.transient ? "4" : "3";
     this.metadataReady = false;
+    this.connectAttempts = 0;
 }
 util.inherits(Client, events.EventEmitter);
 exports.default = { Client };
 Client.prototype.startHandshake = function (udpServers, host, port) {
-    var self = this;
     this.startTimeout();
     this.hostip = host;
     this.controlPort = udpServers.control.port;
     this.timingPort = udpServers.timing.port;
-    this.socket = net.connect(port, host, async function () {
-        self.clearTimeout();
-        if (self.needPassword || self.needPin) {
-            self.status = PAIR_PIN_START;
-            self.sendNextRequest();
-            self.startHeartBeat();
-        }
-        else {
-            if (self.mode != 2) {
-                if (self.debug)
-                    self.logLine?.("AUTH_SETUP", "nah");
-                self.status = OPTIONS;
-                self.sendNextRequest();
-                self.startHeartBeat();
+    this.connectAttempts = 0;
+    const connect = () => {
+        const attempt = this.connectAttempts ?? 0;
+        this.socket = net.connect(port, host, async () => {
+            this.clearTimeout();
+            this.connectAttempts = 0;
+            if (this.needPassword || this.needPin) {
+                this.status = PAIR_PIN_START;
+                this.sendNextRequest();
+                this.startHeartBeat();
             }
             else {
-                self.status = AUTH_SETUP;
-                if (self.debug)
-                    self.logLine?.("AUTH_SETUP", "yah");
-                self.sendNextRequest();
-                self.startHeartBeat();
+                if (this.mode != 2) {
+                    if (this.debug)
+                        this.logLine?.("AUTH_SETUP", "nah");
+                    this.status = OPTIONS;
+                    this.sendNextRequest();
+                    this.startHeartBeat();
+                }
+                else {
+                    this.status = AUTH_SETUP;
+                    if (this.debug)
+                        this.logLine?.("AUTH_SETUP", "yah");
+                    this.sendNextRequest();
+                    this.startHeartBeat();
+                }
             }
-        }
-    });
-    var blob = '';
-    this.socket.on('data', function (data) {
-        if (self.encryptedChannel && self.credentials) {
-            // if (self.debug != false) self.logLine?.("incoming", data)
-            data = self.credentials.decrypt(data);
-        }
-        self.clearTimeout();
-        /*
-         * I wish I could use node's HTTP parser for this...
-         * I assume that all responses have empty bodies.
-         */
-        var rawData = data;
-        const dataStr = data.toString();
-        blob += dataStr;
-        var endIndex = blob.indexOf('\r\n\r\n');
-        if (endIndex < 0) {
-            return;
-        }
-        endIndex += 4;
-        blob = blob.substring(0, endIndex);
-        self.processData(blob, rawData);
-        blob = dataStr.substring(endIndex);
-    });
-    this.socket.on('error', function (err) {
-        self.socket = null;
-        if (self.debug)
-            self.logLine?.(err.code);
-        if (err.code === 'ECONNREFUSED') {
-            if (self.debug)
-                self.logLine?.('block');
-            self.cleanup('connection_refused');
-        }
-        else
-            self.cleanup('rtsp_socket', err.code);
-    });
-    this.socket.on('end', function () {
-        if (self.debug)
-            self.logLine?.('block2');
-        self.cleanup('disconnected');
-    });
+        });
+        let blob = '';
+        this.socket.on('data', (data) => {
+            if (this.encryptedChannel && this.credentials) {
+                // if (this.debug != false) this.logLine?.("incoming", data)
+                data = this.credentials.decrypt(data);
+            }
+            this.clearTimeout();
+            /*
+             * I wish I could use node's HTTP parser for this...
+             * I assume that all responses have empty bodies.
+             */
+            const rawData = data;
+            const dataStr = data.toString();
+            blob += dataStr;
+            let endIndex = blob.indexOf('\r\n\r\n');
+            if (endIndex < 0) {
+                return;
+            }
+            endIndex += 4;
+            blob = blob.substring(0, endIndex);
+            this.processData(blob, rawData);
+            blob = dataStr.substring(endIndex);
+        });
+        this.socket.on('error', (err) => {
+            this.socket = null;
+            this.clearTimeout();
+            const nextAttempt = (this.connectAttempts ?? 0) + 1;
+            this.connectAttempts = nextAttempt;
+            const shouldRetry = nextAttempt <= config.rtsp_retry_attempts;
+            if (shouldRetry) {
+                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;
+                if (this.debug)
+                    this.logLine?.('rtsp_retry', { attempt: nextAttempt, backOff, code: err?.code });
+                setTimeout(() => {
+                    this.startTimeout();
+                    connect();
+                }, backOff);
+                return;
+            }
+            if (this.debug)
+                this.logLine?.(err?.code);
+            if (err?.code === 'ECONNREFUSED') {
+                if (this.debug)
+                    this.logLine?.('block');
+                this.cleanup('connection_refused');
+            }
+            else
+                this.cleanup('rtsp_socket', err?.code);
+        });
+        this.socket.on('end', () => {
+            if (this.debug)
+                this.logLine?.('block2');
+            this.cleanup('disconnected');
+        });
+    };
+    connect();
 };
 Client.prototype.startTimeout = function () {
-    var self = this;
-    this.timeout = setTimeout(function () {
-        if (self.debug)
-            self.logLine?.('timeout');
-        self.cleanup('timeout');
+    this.timeout = setTimeout(() => {
+        if (this.debug)
+            this.logLine?.('timeout');
+        this.cleanup('timeout');
     }, config.rtsp_timeout);
 };
 Client.prototype.clearTimeout = function () {
@@ -280,10 +301,13 @@ Client.prototype.setPasscode = async function (passcode) {
     this.sendNextRequest();
 };
 Client.prototype.startHeartBeat = function () {
-    var self = this;
+    if (this.heartBeat) {
+        clearInterval(this.heartBeat);
+        this.heartBeat = null;
+    }
     if (config.rtsp_heartbeat > 0) {
-        this.heartBeat = setInterval(function () {
-            self.sendHeartBeat(function () {
+        this.heartBeat = setInterval(() => {
+            this.sendHeartBeat(() => {
                 //this.logLine?.('HeartBeat sent!');
             });
         }, config.rtsp_heartbeat);
@@ -319,7 +343,6 @@ Client.prototype.setArtwork = function (art, contentType, callback) {
         contentType = null;
     }
     if (typeof art == 'string') {
-        var self = this;
         if (contentType === null) {
             var ext = art.slice(-4);
             if (ext == ".jpg" || ext == "jpeg") {
@@ -332,14 +355,14 @@ Client.prototype.setArtwork = function (art, contentType, callback) {
                 contentType = "image/gif";
             }
             else {
-                return self.cleanup('unknown_art_file_ext');
+                return this.cleanup('unknown_art_file_ext');
             }
         }
-        return fs.readFile(art, function (err, data) {
+        return fs.readFile(art, (err, data) => {
             if (err !== null) {
-                return self.cleanup('invalid_art_file');
+                return this.cleanup('invalid_art_file');
             }
-            self.setArtwork(data, contentType, callback);
+            this.setArtwork(data, contentType, callback);
         });
     }
     if (contentType === null)
@@ -388,6 +411,44 @@ Client.prototype.cleanup = function (type, msg) {
         this.socket.destroy();
         this.socket = null;
     }
+    if (this.eventsocket) {
+        try {
+            this.eventsocket.destroy?.();
+            this.eventsocket = null;
+        }
+        catch {
+            /* ignore */
+        }
+    }
+    if (this.controlsocket) {
+        try {
+            this.controlsocket.close();
+        }
+        catch {
+            /* ignore */
+        }
+        this.controlsocket = null;
+    }
+    if (this.timingsocket) {
+        try {
+            this.timingsocket.close();
+        }
+        catch {
+            /* ignore */
+        }
+        this.timingsocket = null;
+    }
+    const audioSocket = this.audioSocket;
+    if (audioSocket) {
+        try {
+            audioSocket.close?.();
+            audioSocket.destroy?.();
+        }
+        catch {
+            /* ignore */
+        }
+        this.audioSocket = null;
+    }
 };
 function parseResponse(blob) {
     var response = {}, lines = blob.split('\r\n');
@@ -531,10 +592,8 @@ Client.prototype.sendNextRequest = async function (di) {
                 this.socket.write(Buffer.from(request, 'utf-8'));
             }
             else {
-                this.logLine?.("pass", this.password);
                 if (this.password) {
                     this.status = this.airplay2 ? PAIR_SETUP_1 : PAIR_PIN_SETUP_1;
-                    this.logLine?.("pass2", this.password);
                     this.sendNextRequest();
                 }
                 else {
@@ -591,8 +650,6 @@ Client.prototype.sendNextRequest = async function (di) {
             request += this.makeHead("POST", "/pair-verify", "", true);
             request += 'Content-Type: application/octet-stream\r\n';
             this.pair_verify_1_verifier = ATVAuthenticator.verifier(this.authSecret);
-            if (this.debug)
-                this.logLine?.(this.authSecret);
             request += 'Content-Length:' + Buffer.byteLength(this.pair_verify_1_verifier.verifierBody) + '\r\n\r\n';
             this.socket.write(Buffer.concat([Buffer.from(request, 'utf-8'), this.pair_verify_1_verifier.verifierBody]));
             request = '';
@@ -846,8 +903,7 @@ Client.prototype.sendNextRequest = async function (di) {
             catch (e) { }
             try {
                 this.timingsocket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
-                var self = this;
-                this.timingsocket.on('message', function (msg, rinfo) {
+                this.timingsocket.on('message', (msg, rinfo) => {
                     // only listen and respond on own hosts
                     // if (this.hosts.indexOf(rinfo.address) < 0) return;
                     var ts1 = msg.readUInt32BE(24);
@@ -861,8 +917,8 @@ Client.prototype.sendNextRequest = async function (di) {
                     var ntpTime = ntp.timestamp();
                     ntpTime.copy(reply, 16);
                     ntpTime.copy(reply, 24);
-                    self.timingsocket.send(reply, 0, reply.length, rinfo.port, rinfo.address);
-                    self.logLine?.('timing socket pinged', rinfo.port, rinfo.address);
+                    this.timingsocket.send(reply, 0, reply.length, rinfo.port, rinfo.address);
+                    this.logLine?.('timing socket pinged', rinfo.port, rinfo.address);
                 });
                 this.timingsocket.bind(this.timingPort, this.socket.address().address);
             }
@@ -916,9 +972,8 @@ Client.prototype.sendNextRequest = async function (di) {
                     }] });
             request += 'Content-Length: ' + Buffer.byteLength(setap2) + '\r\n\r\n';
             this.controlsocket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
-            var self = this;
-            this.controlsocket.on('message', function (msg, rinfo) {
-                self.logLine?.('controlsocket.data', msg);
+            this.controlsocket.on('message', (msg) => {
+                this.logLine?.('controlsocket.data', msg);
             });
             this.controlsocket.bind(this.controlPort, this.socket.address().address);
             let s2ct = this.credentials.encrypt(Buffer.concat([Buffer.from(request, 'utf-8'), setap2]));
@@ -928,18 +983,29 @@ Client.prototype.sendNextRequest = async function (di) {
         case RECORD:
             //this.logLine?.(request);
             if (this.airplay2) {
-                this.eventsocket = net.connect(this.eventPort, this.hostip, async function () {
-                });
-                this.eventsocket.on('data', function (data) {
-                    self.logLine?.('eventsocket.data', data);
-                    self.logLine?.('eventsocket.data2', self.event_credentials.decrypt(data).toString());
-                });
-                this.eventsocket.on('error', function (err) {
-                    self.logLine?.('eventsocket.error', err);
-                });
                 this.event_credentials = new Credentials("sdsds", "", "", "", this.seed);
                 this.event_credentials.writeKey = enc.HKDF("sha512", Buffer.from("Events-Salt"), this.srp.computeK(), Buffer.from("Events-Read-Encryption-Key"), 32);
                 this.event_credentials.readKey = enc.HKDF("sha512", Buffer.from("Events-Salt"), this.srp.computeK(), Buffer.from("Events-Write-Encryption-Key"), 32);
+                this.eventsocket = net.connect(this.eventPort, this.hostip, async () => {
+                });
+                this.eventsocket.on('data', (data) => {
+                    if (this.debug) {
+                        this.logLine?.('eventsocket.data', data);
+                        try {
+                            const decrypted = this.event_credentials?.decrypt(data);
+                            if (decrypted) {
+                                this.logLine?.('eventsocket.data2', decrypted.toString());
+                            }
+                        }
+                        catch (err) {
+                            this.logLine?.('eventsocket.decrypt.error', err);
+                        }
+                    }
+                });
+                this.eventsocket.on('error', (err) => {
+                    if (this.debug)
+                        this.logLine?.('eventsocket.error', err);
+                });
             }
             if (this.airplay2 != null && this.credentials != null) {
                 //  this.controlsocket.close();
@@ -1117,19 +1183,19 @@ 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 (this.debug != false) {
-        if ((rawData.toString()).includes("bplist00")) {
-            try {
-                let buf = Buffer.from(rawData).slice(rawData.length - parseInt(headers['Content-Length']), rawData.length);
-                let bplist = bplistParser.parseBuffer(buf);
-                this.logLine?.("incoming-res: \r\n", JSON.stringify(bplist));
+    if (this.debug) {
+        try {
+            if ((rawData.toString()).includes("bplist00")) {
+                const buf = Buffer.from(rawData).slice(rawData.length - parseInt(headers['Content-Length']), rawData.length);
+                const bplist = bplistParser.parseBuffer(buf);
+                this.logLine?.("incoming-res:", JSON.stringify(bplist));
             }
-            catch (_) {
-                this.logLine?.("incoming-res: \r\n", rawData.toString());
+            else {
+                this.logLine?.("incoming-res:", { code: response.code, length: rawData.length });
             }
         }
-        else {
-            this.logLine?.("incoming-res: \r\n", rawData.toString());
+        catch {
+            this.logLine?.("incoming-res:", { code: response.code, length: rawData.length });
         }
     }
     if (this.status != OPTIONS && this.status != OPTIONS2 && this.mode == 0) {
@@ -1363,7 +1429,6 @@ Client.prototype.processData = function (blob, rawData) {
                 this.credentials.writeKey = enc.HKDF("sha512", Buffer.from("Control-Salt"), this.srp.computeK(), Buffer.from("Control-Write-Encryption-Key"), 32);
                 this.credentials.readKey = enc.HKDF("sha512", Buffer.from("Control-Salt"), this.srp.computeK(), Buffer.from("Control-Read-Encryption-Key"), 32);
                 this.encryptedChannel = true;
-                this.logLine?.(this.srp.computeK());
                 this.status = SETUP_AP2_1;
             }
             else {

package/dist/esm/core/udpServers.js

@@ -143,7 +143,11 @@ class UDPServers extends node_events_1.EventEmitter {
         const ntpTime = ntp_1.default.timestamp();
         ntpTime.copy(packet, 8);
         packet.writeUInt32BE((0, numUtil_1.low32)(seq * config_1.default.frames_per_packet + config_1.default.sampling_rate * 2), 16);
-        this.control.socket.send(packet, 0, packet.length, dev.controlPort, dev.host);
+        const delay = Math.max(0, config_1.default.control_sync_base_delay_ms +
+            Math.random() * config_1.default.control_sync_jitter_ms);
+        setTimeout(() => {
+            this.control.socket?.send(packet, 0, packet.length, dev.controlPort, dev.host);
+        }, delay);
     }
 }
 exports.default = UDPServers;

package/dist/esm/utils/config.js

@@ -18,8 +18,14 @@ exports.config = {
     sampling_rate: 44100, // fixed by AirTunes v2
     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
+    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,
+    rtsp_retry_max_ms: 4000,
+    rtsp_retry_jitter_ms: 150,
+    control_sync_base_delay_ms: 2,
+    control_sync_jitter_ms: 3,
     device_magic: (0, numUtil_1.randomInt)(9),
     ntp_epoch: 0x83aa7e80,
     iv_base64: 'ePRBLI0XN5ArFaaz7ncNZw',

package/dist/utils/config.d.ts

@@ -16,6 +16,12 @@ export interface AirplayConfig {
     stream_latency: number;
     rtsp_timeout: number;
     rtsp_heartbeat: number;
+    rtsp_retry_attempts: number;
+    rtsp_retry_base_ms: number;
+    rtsp_retry_max_ms: number;
+    rtsp_retry_jitter_ms: number;
+    control_sync_base_delay_ms: number;
+    control_sync_jitter_ms: number;
     device_magic: number;
     ntp_epoch: number;
     iv_base64: string;

package/dist/utils/config.js

@@ -18,8 +18,14 @@ exports.config = {
     sampling_rate: 44100, // fixed by AirTunes v2
     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
+    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,
+    rtsp_retry_max_ms: 4000,
+    rtsp_retry_jitter_ms: 150,
+    control_sync_base_delay_ms: 2,
+    control_sync_jitter_ms: 3,
     device_magic: (0, numUtil_1.randomInt)(9),
     ntp_epoch: 0x83aa7e80,
     iv_base64: 'ePRBLI0XN5ArFaaz7ncNZw',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lox-airplay-sender",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "AirPlay sender (RAOP/AirPlay 1 + AirPlay 2 auth flows) ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",