@dbcube/core 4.1.12 → 4.1.14

package/dist/index.d.mts

@@ -47,10 +47,10 @@ declare class QueryEngine {
     private sleep;
     private getCachedDML;
     private startTcpServer;
-    private sendTcpRequest;
     private sendTcpRequestFast;
-    private sendOnExistingConnection;
-    private createPersistentConnection;
+    private processQueue;
+    private createNewConnection;
+    private executeOnConnection;
     private createProcess;
     disconnect(): Promise<ResponseEngine>;
 }

package/dist/index.d.ts

@@ -47,10 +47,10 @@ declare class QueryEngine {
     private sleep;
     private getCachedDML;
     private startTcpServer;
-    private sendTcpRequest;
     private sendTcpRequestFast;
-    private sendOnExistingConnection;
-    private createPersistentConnection;
+    private processQueue;
+    private createNewConnection;
+    private executeOnConnection;
     private createProcess;
     disconnect(): Promise<ResponseEngine>;
 }

package/dist/index.js

@@ -869,6 +869,8 @@ import * as net from "net";
 import { spawn as spawn2 } from "child_process";
 var globalTcpServers = /* @__PURE__ */ new Map();
 var globalTcpConnections = /* @__PURE__ */ new Map();
+var connectionQueues = /* @__PURE__ */ new Map();
+var connectionProcessing = /* @__PURE__ */ new Map();
 var queryCache = /* @__PURE__ */ new Map();
 var cacheSize = 0;
 var MAX_CACHE_SIZE = 500;
@@ -885,7 +887,7 @@ var QueryEngine = class {
     this.config = this.setConfig(name);
     this.arguments = this.setArguments();
     this.timeout = timeout;
-    this.connectionId = `${name}_${this.config.type}_${this.config.config.DATABASE}_${this.config.config.HOST || "localhost"}`;
+    this.connectionId = `${name}_query_engine_${this.config.type}_${this.config.config.DATABASE}_${this.config.config.HOST || "localhost"}`;
     this.tcpPort = this.generatePort();
   }
   generatePort() {
@@ -983,7 +985,8 @@ var QueryEngine = class {
   async run(binary, args) {
     const actionIndex = args.findIndex((arg) => arg === "--action");
     const isExecuteAction = actionIndex !== -1 && args[actionIndex + 1] === "execute";
-    if (isExecuteAction) {
+    const isQueryEngine = binary === "query_engine";
+    if (isQueryEngine && isExecuteAction) {
       return this.executeWithTcpServer(args);
     } else {
       return this.createProcess(binary, args);
@@ -1000,22 +1003,26 @@ var QueryEngine = class {
   async waitForServerReady() {
     const maxRetries = 10;
     const retryDelay = 500;
+    const serverInfo = globalTcpServers.get(this.connectionId);
+    if (!serverInfo) {
+      throw new Error("Server not found");
+    }
     for (let i = 0; i < maxRetries; i++) {
-      if (await this.isServerResponding()) {
+      if (await this.isServerResponding(serverInfo.port)) {
         return;
       }
       await this.sleep(retryDelay);
     }
     throw new Error("TCP server failed to become ready within timeout");
   }
-  async isServerResponding() {
+  async isServerResponding(port) {
     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", () => {
+      client.connect(port, "127.0.0.1", () => {
         clearTimeout(timeout);
         client.destroy();
         resolve5(true);
@@ -1071,7 +1078,7 @@ var QueryEngine = class {
         }
       });
       serverProcess.stderr.on("data", (data) => {
-        console.error(`[TCP Server Error] ${data.toString().trim()}`);
+        console.error(`[query_engine TCP Server Error] ${data.toString().trim()}`);
       });
       serverProcess.on("close", (code) => {
         globalTcpServers.delete(this.connectionId);
@@ -1084,92 +1091,88 @@ var QueryEngine = class {
       });
     });
   }
-  async sendTcpRequest(args) {
+  async sendTcpRequestFast(args) {
     return new Promise((resolve5, reject) => {
-      const client = new net.Socket();
-      let responseBuffer = "";
-      let isResolved = false;
-      const timeout = setTimeout(() => {
-        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",
-          dml: dmlJson
-        };
-        client.write(JSON.stringify(command));
-      });
-      client.on("data", (data) => {
-        responseBuffer += data.toString();
-        const match = responseBuffer.match(/PROCESS_RESPONSE:(\{.*\})/);
-        if (match && !isResolved) {
-          isResolved = true;
-          clearTimeout(timeout);
-          client.destroy();
-          try {
-            const response = JSON.parse(match[1]);
-            resolve5({
-              status: response.status,
-              message: response.message,
-              data: response.data
-            });
-          } catch (error) {
-            reject(new Error("Failed to parse TCP response"));
+      let queue = connectionQueues.get(this.connectionId);
+      if (!queue) {
+        queue = [];
+        connectionQueues.set(this.connectionId, queue);
+      }
+      queue.push({ args, resolve: resolve5, reject });
+      this.processQueue();
+    });
+  }
+  async processQueue() {
+    if (connectionProcessing.get(this.connectionId)) {
+      return;
+    }
+    const queue = connectionQueues.get(this.connectionId);
+    if (!queue || queue.length === 0) {
+      return;
+    }
+    connectionProcessing.set(this.connectionId, true);
+    try {
+      const serverInfo = globalTcpServers.get(this.connectionId);
+      if (!serverInfo) {
+        throw new Error("Server not initialized");
+      }
+      while (queue.length > 0) {
+        const request = queue.shift();
+        if (!request) break;
+        try {
+          let connection = globalTcpConnections.get(this.connectionId);
+          if (!connection || connection.destroyed || connection.readyState !== "open") {
+            connection = await this.createNewConnection(serverInfo.port);
+            globalTcpConnections.set(this.connectionId, connection);
           }
+          const result = await this.executeOnConnection(connection, request.args);
+          request.resolve(result);
+        } catch (error) {
+          globalTcpConnections.delete(this.connectionId);
+          request.reject(error);
         }
+      }
+    } finally {
+      connectionProcessing.set(this.connectionId, false);
+    }
+  }
+  async createNewConnection(port) {
+    return new Promise((resolve5, reject) => {
+      const client = new net.Socket();
+      client.setNoDelay(true);
+      client.setKeepAlive(true, 6e4);
+      const timeout = setTimeout(() => {
+        client.destroy();
+        reject(new Error("Connection timeout"));
+      }, 5e3);
+      client.connect(port, "127.0.0.1", () => {
+        clearTimeout(timeout);
+        resolve5(client);
       });
       client.on("error", (error) => {
-        if (!isResolved) {
-          isResolved = true;
-          clearTimeout(timeout);
-          reject(error);
-        }
-      });
-      client.on("close", () => {
-        if (!isResolved) {
-          clearTimeout(timeout);
-          if (!responseBuffer.includes("PROCESS_RESPONSE:")) {
-            reject(new Error("Connection closed without valid response"));
-          }
-        }
+        clearTimeout(timeout);
+        reject(error);
       });
     });
   }
-  async sendTcpRequestFast(args) {
-    return await this.sendTcpRequest(args);
-  }
-  async sendOnExistingConnection(connection, args) {
+  async executeOnConnection(connection, args) {
     return new Promise((resolve5, reject) => {
-      const dmlIndex = args.findIndex((arg) => arg === "--dml");
-      const dmlJson = dmlIndex !== -1 ? args[dmlIndex + 1] : null;
-      if (!dmlJson) {
-        reject(new Error("No DML found in arguments"));
-        return;
+      const command = {};
+      for (let i = 0; i < args.length; i += 2) {
+        if (args[i].startsWith("--")) {
+          const key = args[i].substring(2);
+          const value = args[i + 1];
+          command[key] = value;
+        }
       }
       let responseBuffer = "";
       let isResolved = false;
       const timeout = setTimeout(() => {
         if (!isResolved) {
           isResolved = true;
-          connection.off("data", onData);
-          connection.off("error", onError);
-          globalTcpConnections.delete(this.connectionId);
-          reject(new Error("TCP request timeout"));
+          connection.removeListener("data", onData);
+          connection.removeListener("error", onError);
+          reject(new Error("Request timeout"));
         }
       }, this.timeout);
       const onData = (data) => {
@@ -1178,8 +1181,8 @@ var QueryEngine = class {
         if (match && !isResolved) {
           isResolved = true;
           clearTimeout(timeout);
-          connection.off("data", onData);
-          connection.off("error", onError);
+          connection.removeListener("data", onData);
+          connection.removeListener("error", onError);
           try {
             const response = JSON.parse(match[1]);
             resolve5({
@@ -1188,7 +1191,7 @@ var QueryEngine = class {
               data: response.data
             });
           } catch (error) {
-            reject(new Error("Failed to parse TCP response"));
+            reject(new Error("Failed to parse response"));
           }
         }
       };
@@ -1196,118 +1199,16 @@ var QueryEngine = class {
         if (!isResolved) {
           isResolved = true;
           clearTimeout(timeout);
-          connection.off("data", onData);
-          connection.off("error", onError);
+          connection.removeListener("data", onData);
+          connection.removeListener("error", onError);
           reject(error);
         }
       };
       connection.on("data", onData);
       connection.on("error", onError);
-      const command = {
-        action: "execute",
-        dml: dmlJson
-      };
       connection.write(JSON.stringify(command));
     });
   }
-  async createPersistentConnection(args) {
-    return new Promise((resolve5, reject) => {
-      let client = globalTcpConnections.get(this.connectionId);
-      let isNewConnection = false;
-      if (!client || client.destroyed) {
-        client = new net.Socket();
-        isNewConnection = true;
-        client.setNoDelay(true);
-        client.setKeepAlive(true, 6e4);
-        client.setMaxListeners(20);
-      }
-      let responseBuffer = "";
-      let isResolved = false;
-      const timeout = setTimeout(() => {
-        if (!isResolved) {
-          isResolved = true;
-          client.removeListener("data", dataHandler);
-          globalTcpConnections.delete(this.connectionId);
-          reject(new Error("TCP connection timeout"));
-        }
-      }, this.timeout);
-      const executeQuery = () => {
-        const dmlIndex = args.findIndex((arg) => arg === "--dml");
-        const dmlJson = dmlIndex !== -1 ? args[dmlIndex + 1] : null;
-        if (!dmlJson) {
-          clearTimeout(timeout);
-          if (!isResolved) {
-            isResolved = true;
-            reject(new Error("No DML found in arguments"));
-          }
-          return;
-        }
-        const command = {
-          action: "execute",
-          dml: dmlJson
-        };
-        const commandStr = JSON.stringify(command);
-        const canWrite = client.write(commandStr);
-        if (!canWrite) {
-          client.once("drain", () => {
-          });
-        }
-      };
-      const dataHandler = (data) => {
-        responseBuffer += data.toString();
-        const match = responseBuffer.match(/PROCESS_RESPONSE:(\{.*\})/);
-        if (match && !isResolved) {
-          isResolved = true;
-          clearTimeout(timeout);
-          try {
-            const response = JSON.parse(match[1]);
-            responseBuffer = "";
-            client.removeListener("data", dataHandler);
-            resolve5({
-              status: response.status,
-              message: response.message,
-              data: response.data
-            });
-          } catch (error) {
-            client.removeListener("data", dataHandler);
-            reject(new Error("Failed to parse TCP response"));
-          }
-        }
-      };
-      const errorHandler = (error) => {
-        if (!isResolved) {
-          isResolved = true;
-          clearTimeout(timeout);
-          globalTcpConnections.delete(this.connectionId);
-          client.removeListener("data", dataHandler);
-          reject(error);
-        }
-      };
-      const closeHandler = () => {
-        globalTcpConnections.delete(this.connectionId);
-        if (!isResolved) {
-          isResolved = true;
-          clearTimeout(timeout);
-          client.removeListener("data", dataHandler);
-          reject(new Error("Connection closed unexpectedly"));
-        }
-      };
-      if (isNewConnection) {
-        client.connect(this.tcpPort, "127.0.0.1", () => {
-          clearTimeout(timeout);
-          globalTcpConnections.set(this.connectionId, client);
-          client.on("error", errorHandler);
-          client.on("close", closeHandler);
-          client.on("data", dataHandler);
-          executeQuery();
-        });
-      } else {
-        clearTimeout(timeout);
-        client.on("data", dataHandler);
-        executeQuery();
-      }
-    });
-  }
   async createProcess(binary, args) {
     await this.initializeBinary();
     if (!this.binary) {