@intuned/runtime-dev 1.3.24-pipe.8 → 1.3.24-socket.0

package/dist/vendor/runtime-interface.js

@@ -357,14 +357,9 @@ var require_interfaceClient = __commonJS({
     var util_1 = require("util");
     var SocketClient = class _SocketClient {
       constructor(socket) {
-        this.dataListener = null;
         this.socket = socket;
-        this.closeAbortController = new AbortController();
       }
       async sendJSON(data) {
-        if (this.socket.closed) {
-          return;
-        }
         const dataToSend = JSON.stringify(data);
         const length = Buffer.byteLength(dataToSend);
         const buffer = Buffer.alloc(_SocketClient.LENGTH_HEADER_LENGTH + length);
@@ -374,30 +369,21 @@ var require_interfaceClient = __commonJS({
       }
       async *receiveJSON() {
         let buffer = Buffer.alloc(0);
-        let endListener;
-        let rejectListener;
         const endPromise = new Promise((resolve, reject) => {
-          endListener = () => resolve();
-          this.socket.once("end", endListener);
-          rejectListener = (e) => reject(e);
-          this.socket.once("error", rejectListener);
-        });
-        const closePromise = new Promise((resolve) => {
-          this.closeAbortController.signal.addEventListener("abort", () => resolve());
+          this.socket.once("end", () => {
+            resolve();
+          });
+          this.socket.once("error", reject);
         });
         while (true) {
           const chunk = await Promise.race([
-            new Promise((resolve) => {
-              this.dataListener = (data2) => {
-                if (typeof data2 === "string") {
-                  return resolve(Buffer.from(data2));
-                }
-                resolve(data2);
-              };
-              this.socket.once("data", this.dataListener);
-            }),
-            endPromise,
-            closePromise
+            new Promise((resolve) => this.socket.once("data", (data2) => {
+              if (typeof data2 === "string") {
+                return resolve(Buffer.from(data2));
+              }
+              resolve(data2);
+            })),
+            endPromise
           ]);
           if (!(chunk instanceof Buffer)) {
             break;
@@ -418,43 +404,8 @@ var require_interfaceClient = __commonJS({
           yield JSON.parse(data.toString());
         }
       }
-      async close(mode = "client") {
-        console.log(`[${process.pid}] Closing socket client`);
-        if (this.dataListener) {
-          this.socket.off("data", this.dataListener);
-          console.log(`[${process.pid}] Removed data listener`);
-        } else {
-          console.log(`[${process.pid}] No data listener to remove`);
-        }
-        this.closeAbortController.abort();
-        console.log(`[${process.pid}] Called abort on closeAbortController`);
-        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`);
+      async close() {
+        this.socket.end();
         this.socket.destroy();
       }
       get closed() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.3.24-pipe.8",
+  "version": "1.3.24-socket.0",
   "description": "Intuned runtime",
   "packageManager": "yarn@4.12.0",
   "main": "./dist/index.js",
@@ -80,7 +80,7 @@
     "image-size": "^1.1.1",
     "jsonc-parser": "^3.3.1",
     "jsonwebtoken": "9.0.2",
-    "lodash": "4.17.21",
+    "lodash": "4.18.1",
     "milliparsec": "2.3.0",
     "nanoid": "3",
     "neverthrow": "6.1.0",