alphatheta-connect 0.28.0 → 0.28.2

package/lib/cli.js

@@ -8915,6 +8915,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 +9054,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 +9100,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);
             }