@intuned/runtime-dev 1.3.24-pipe.7 → 1.3.24-pipe.8

package/dist/vendor/runtime-interface.js

@@ -418,7 +418,7 @@ var require_interfaceClient = __commonJS({
           yield JSON.parse(data.toString());
         }
       }
-      async close() {
+      async close(mode = "client") {
         console.log(`[${process.pid}] Closing socket client`);
         if (this.dataListener) {
           this.socket.off("data", this.dataListener);
@@ -428,9 +428,33 @@ var require_interfaceClient = __commonJS({
         }
         this.closeAbortController.abort();
         console.log(`[${process.pid}] Called abort on closeAbortController`);
-        console.log(`[${process.pid}] Sending FIN to socket`);
-        await (0, util_1.promisify)((cb) => this.socket.end(cb))();
-        console.log(`[${process.pid}] Socket finished, destroying`);
+        if (mode === "client") {
+          console.log(`[${process.pid}] Sending FIN to socket`);
+          await (0, util_1.promisify)((cb) => this.socket.end(cb))();
+          const closeResult = await Promise.race([
+            new Promise((resolve) => this.socket.once("close", () => resolve("closed"))),
+            new Promise((resolve) => this.socket.once("error", () => resolve("error"))),
+            (0, promises_1.setTimeout)(3e3, "timeout")
+          ]);
+          console.log(`[${process.pid}] Socket close result: ${closeResult}`);
+          if (closeResult === "timeout") {
+            console.warn(`[${process.pid}] Socket did not close within timeout, destroying socket`);
+            this.socket.destroy();
+          }
+          return;
+        }
+        const receiveEndResult = await Promise.race([
+          new Promise((resolve) => this.socket.once("end", () => resolve("end"))),
+          new Promise((resolve) => this.socket.once("error", () => resolve("error"))),
+          (0, promises_1.setTimeout)(3e3, "timeout")
+        ]);
+        console.log(`[${process.pid}] Socket receive end result: ${receiveEndResult}`);
+        if (receiveEndResult === "end") {
+          console.log(`[${process.pid}] Socket ended gracefully`);
+          await (0, util_1.promisify)((cb) => this.socket.end(cb))();
+          return;
+        }
+        console.log(`[${process.pid}] Socket did not end gracefully, destroying socket`);
         this.socket.destroy();
       }
       get closed() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.3.24-pipe.7",
+  "version": "1.3.24-pipe.8",
   "description": "Intuned runtime",
   "packageManager": "yarn@4.12.0",
   "main": "./dist/index.js",