alphatheta-connect 0.28.1 → 0.28.4

package/lib/cli.js

@@ -2238,7 +2238,16 @@ class DeviceManager {
         this.off = __classPrivateFieldGet(this, _DeviceManager_emitter, "f").removeListener.bind(__classPrivateFieldGet(this, _DeviceManager_emitter, "f"));
         this.once = __classPrivateFieldGet(this, _DeviceManager_emitter, "f").once.bind(__classPrivateFieldGet(this, _DeviceManager_emitter, "f"));
         _DeviceManager_handleAnnounce.set(this, (message) => {
-            const device = (0, utils_1.deviceFromPacket)(message);
+            // This runs on every UDP datagram the announce socket receives, so a parse
+            // failure here would surface as an uncaught exception on the socket and
+            // crash the process. Foreign or truncated packets are ignored instead.
+            let device;
+            try {
+                device = (0, utils_1.deviceFromPacket)(message);
+            }
+            catch {
+                return;
+            }
             if (device === null) {
                 return;
             }
@@ -2354,10 +2363,15 @@ const ip = __importStar(__webpack_require__(/*! ip-address */ "ip-address"));
 const constants_1 = __webpack_require__(/*! src/constants */ "./src/constants.ts");
 /**
  * Converts a announce packet to a device object.
+ *
+ * Returns null for any packet that is not a stage-3 Pro DJ Link announce. The
+ * announce socket receives every UDP broadcast on its port, so foreign traffic
+ * (other apps, other protocols) is normal and must be ignored, not treated as
+ * an error.
  */
 function deviceFromPacket(packet) {
     if (packet.indexOf(constants_1.PROLINK_HEADER) !== 0) {
-        throw new Error('Announce packet does not start with expected header');
+        return null;
     }
     if (packet[0x0a] !== 0x06) {
         return null;
@@ -8915,6 +8929,14 @@ class Connection {
     readMessage(expect, span) {
         return __classPrivateFieldGet(this, _Connection_lock, "f").runExclusive(() => message_1.Message.fromStream(__classPrivateFieldGet(this, _Connection_socket, "f"), expect, span));
     }
+    /**
+     * False once the device has closed its end of the connection or the socket
+     * has failed. Every write after that fails with "write after end".
+     */
+    get isOpen() {
+        const { stream } = __classPrivateFieldGet(this, _Connection_socket, "f");
+        return stream.writable && !stream.closed && !stream.destroyed;
+    }
     close() {
         __classPrivateFieldGet(this, _Connection_socket, "f").destroy();
     }
@@ -9046,7 +9068,14 @@ class RemoteDatabase {
                 type: types_2.MessageType.Disconnect,
                 args: [],
             });
-            await conn.writeMessage(goodbye, tx);
+            // The goodbye is a courtesy. A device that has already closed the
+            // connection can't receive it, and its socket still has to be released.
+            try {
+                await conn.writeMessage(goodbye, tx);
+            }
+            catch {
+                // Ignore errors during disconnect
+            }
             conn.close();
             __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").delete(device.id);
             __classPrivateFieldGet(this, _RemoteDatabase_queryIds, "f").delete(device.id);
@@ -9085,6 +9114,15 @@ class RemoteDatabase {
         const releaseLock = await lock.acquire();
         try {
             let conn = __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").get(deviceId);
+            // A device that closed its end of the connection (it restarted, or it
+            // dropped off the network and came back) would fail every query on it
+            // with "write after end". Open a new one instead.
+            if (conn !== undefined && !conn.isOpen) {
+                conn.close();
+                __classPrivateFieldGet(this, _RemoteDatabase_connections, "f").delete(deviceId);
+                __classPrivateFieldGet(this, _RemoteDatabase_queryIds, "f").delete(deviceId);
+                conn = undefined;
+            }
             if (conn === undefined) {
                 await this.connectToDevice(device);
             }