@dbcube/core 3.0.5 → 3.0.7

package/dist/index.cjs

@@ -784,13 +784,27 @@ var QueryEngine = class {
     this.tcpPort = this.generatePort();
   }
   generatePort() {
-    let hash = 0;
-    for (let i = 0; i < this.connectionId.length; i++) {
-      const char = this.connectionId.charCodeAt(i);
-      hash = (hash << 5) - hash + char;
-      hash = hash & hash;
+    return 9944;
+  }
+  async findAvailablePort(startPort) {
+    for (let port = startPort; port >= 9900; port--) {
+      if (await this.isPortAvailable(port)) {
+        return port;
+      }
     }
-    return 8100 + Math.abs(hash % 900);
+    throw new Error("No available ports found in range 9900-9944");
+  }
+  isPortAvailable(port) {
+    return new Promise((resolve5) => {
+      const net2 = require("net");
+      const tester = net2.createServer();
+      tester.once("error", () => resolve5(false));
+      tester.once("listening", () => {
+        tester.close();
+        resolve5(true);
+      });
+      tester.listen(port, "127.0.0.1");
+    });
   }
   async initializeBinary() {
     if (!this.binary) {
@@ -872,14 +886,50 @@ var QueryEngine = class {
       console.log("\u{1F680} Starting TCP server for ultra-fast queries...");
       await this.startTcpServer();
     }
+    await this.waitForServerReady();
     console.log("\u26A1 Using TCP server (ultra-fast)");
     return this.sendTcpRequest(args);
   }
+  async waitForServerReady() {
+    const maxRetries = 10;
+    const retryDelay = 500;
+    for (let i = 0; i < maxRetries; i++) {
+      if (await this.isServerResponding()) {
+        return;
+      }
+      console.log(`\u23F3 Waiting for TCP server to be ready... (${i + 1}/${maxRetries})`);
+      await this.sleep(retryDelay);
+    }
+    throw new Error("TCP server failed to become ready within timeout");
+  }
+  async isServerResponding() {
+    return new Promise((resolve5) => {
+      const client = new net.Socket();
+      const timeout = setTimeout(() => {
+        client.destroy();
+        resolve5(false);
+      }, 1e3);
+      client.connect(this.tcpPort, "127.0.0.1", () => {
+        clearTimeout(timeout);
+        client.destroy();
+        resolve5(true);
+      });
+      client.on("error", () => {
+        clearTimeout(timeout);
+        resolve5(false);
+      });
+    });
+  }
+  sleep(ms) {
+    return new Promise((resolve5) => setTimeout(resolve5, ms));
+  }
   async startTcpServer() {
     await this.initializeBinary();
     if (!this.binary) {
       throw new Error("Binary not initialized");
     }
+    this.tcpPort = await this.findAvailablePort(this.tcpPort);
+    console.log(`\u{1F310} Using port ${this.tcpPort} for TCP server`);
     return new Promise((resolve5, reject) => {
       const serverArgs = [...this.arguments, "--action", "server", "--port", this.tcpPort.toString()];
       const serverProcess = (0, import_child_process2.spawn)(this.binary["query_engine"], serverArgs);
@@ -889,7 +939,7 @@ var QueryEngine = class {
           serverProcess.kill();
           reject(new Error("TCP server startup timeout"));
         }
-      }, 1e4);
+      }, 15e3);
       serverProcess.stdout.on("data", (data) => {
         const output = data.toString();
         console.log(`[TCP Server] ${output.trim()}`);
@@ -924,27 +974,44 @@ var QueryEngine = class {
     return new Promise((resolve5, reject) => {
       const client = new net.Socket();
       let responseBuffer = "";
+      let isResolved = false;
       const timeout = setTimeout(() => {
-        client.destroy();
-        reject(new Error("TCP request timeout"));
-      }, this.timeout);
+        if (!isResolved) {
+          isResolved = true;
+          client.destroy();
+          reject(new Error("TCP request timeout"));
+        }
+      }, this.timeout * 2);
       client.connect(this.tcpPort, "127.0.0.1", () => {
+        const dmlIndex = args.findIndex((arg) => arg === "--dml");
+        const dmlJson = dmlIndex !== -1 ? args[dmlIndex + 1] : null;
+        if (!dmlJson) {
+          if (!isResolved) {
+            isResolved = true;
+            clearTimeout(timeout);
+            client.destroy();
+            reject(new Error("No DML found in arguments"));
+          }
+          return;
+        }
         const command = {
           action: "execute",
-          args
+          dml: dmlJson
         };
-        client.write(JSON.stringify(command) + "\n");
+        client.write(JSON.stringify(command));
       });
       client.on("data", (data) => {
         responseBuffer += data.toString();
-        if (responseBuffer.includes("\n")) {
+        const match = responseBuffer.match(/PROCESS_RESPONSE:(\{.*\})/);
+        if (match && !isResolved) {
+          isResolved = true;
           clearTimeout(timeout);
           client.destroy();
           try {
-            const response = JSON.parse(responseBuffer.trim());
+            const response = JSON.parse(match[1]);
             resolve5({
-              status: response.status || 200,
-              message: response.message || "Success",
+              status: response.status,
+              message: response.message,
               data: response.data
             });
           } catch (error) {
@@ -953,13 +1020,18 @@ var QueryEngine = class {
         }
       });
       client.on("error", (error) => {
-        clearTimeout(timeout);
-        reject(error);
+        if (!isResolved) {
+          isResolved = true;
+          clearTimeout(timeout);
+          reject(error);
+        }
       });
       client.on("close", () => {
-        clearTimeout(timeout);
-        if (responseBuffer && !responseBuffer.includes("\n")) {
-          reject(new Error("Incomplete TCP response"));
+        if (!isResolved) {
+          clearTimeout(timeout);
+          if (!responseBuffer.includes("PROCESS_RESPONSE:")) {
+            reject(new Error("Connection closed without valid response"));
+          }
         }
       });
     });