@ultipa-graph/ultipa-driver 5.1.3-s5.1 → 5.1.4-s5.1

package/dist/connection/connection.final.d.ts

@@ -8,6 +8,7 @@ export declare class ConnectionFinal extends Connection {
     setGraph(graphName: string): void;
 }
 export declare class UltipaDriver extends ConnectionFinal {
-    private hosts;
+    private connectionPool;
     constructor(config: UltipaConfig);
+    setGraph(graphName: string): void;
 }

package/dist/connection/connection.final.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UltipaDriver = exports.ConnectionFinal = void 0;
 const connection_1 = require("./extra/connection");
+const connection_pool_1 = require("./connection.pool");
 const fs_1 = __importDefault(require("fs"));
 /**
  * Extra api
@@ -17,14 +18,20 @@ class ConnectionFinal extends connection_1.Connection {
 }
 exports.ConnectionFinal = ConnectionFinal;
 class UltipaDriver extends ConnectionFinal {
-    hosts;
+    // private hosts: string[]
+    // private connections: Map<string, ConnectionFinal> = new Map();
+    connectionPool;
     constructor(config) {
         let crt;
         if (config.crt && config.crt.length !== 0) {
             crt = fs_1.default.readFileSync(config.crt);
         }
         super(config.hosts[0], config.username, config.password, crt, config);
-        this.hosts = config.hosts;
+        this.connectionPool = new connection_pool_1.ConnectionPool(config.hosts, config.username, config.password, crt, config);
+    }
+    setGraph(graphName) {
+        this.defaultConfig.defaultGraph = graphName;
+        this.connectionPool.setGraph(graphName);
     }
 }
 exports.UltipaDriver = UltipaDriver;

package/dist/connection/connection.final.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.final.js","sourceRoot":"","sources":["../../src/connection/connection.final.ts"],"names":[],"mappings":";;;;;;AACA,mDAA+C;AAI/C,4CAAmB;AAEnB;;GAEG;AACH,MAAa,eAAgB,SAAQ,uBAAU;IAC3C,iBAAiB,CAAS;IAC1B,QAAQ,CAAC,SAAiB;QACtB,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,SAAS,CAAA;IAC/C,CAAC;CACJ;AALD,0CAKC;AAED,MAAa,YAAa,SAAQ,eAAe;IACrC,KAAK,CAAU;IACvB,YAAY,MAAoB;QAC5B,IAAI,GAAW,CAAC;QAChB,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACvC,GAAG,GAAG,YAAE,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SACpC;QACD,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACnD,GAAG,EACH,MAAM,CAAC,CAAC;QACZ,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC9B,CAAC;CACJ;AAZD,oCAYC;AAGD,sDAAsD;AACtD,iDAAiD;AACjD,6DAA6D;AAE7D,0CAA0C;AAC1C,2BAA2B;AAC3B,uDAAuD;AACvD,gDAAgD;AAChD,YAAY;AAEZ,mEAAmE;AACnE,mBAAmB;AACnB,uBAAuB;AAEvB,0GAA0G;AAC1G,mFAAmF;AACnF,uDAAuD;AACvD,+CAA+C;AAC/C,+DAA+D;AAC/D,0BAA0B;AAC1B,kBAAkB;AAClB,8DAA8D;AAC9D,YAAY;AAEZ,mCAAmC;AACnC,6DAA6D;AAC7D,4DAA4D;AAC5D,wDAAwD;AACxD,oBAAoB;AACpB,wCAAwC;AACxC,2CAA2C;AAC3C,oBAAoB;AACpB,qDAAqD;AACrD,kDAAkD;AAClD,+DAA+D;AAC/D,+DAA+D;AAC/D,gDAAgD;AAChD,mDAAmD;AACnD,mDAAmD;AACnD,uCAAuC;AACvC,yCAAyC;AACzC,iCAAiC;AACjC,oEAAoE;AACpE,oDAAoD;AACpD,oFAAoF;AACpF,iCAAiC;AACjC,uDAAuD;AACvD,gCAAgC;AAChC,wBAAwB;AACxB,4BAA4B;AAC5B,qDAAqD;AACrD,kEAAkE;AAClE,wCAAwC;AACxC,sDAAsD;AACtD,mDAAmD;AACnD,uCAAuC;AACvC,wBAAwB;AACxB,qBAAqB;AACrB,gBAAgB;AAChB,cAAc;AACd,QAAQ;AACR,IAAI"}
+{"version":3,"file":"connection.final.js","sourceRoot":"","sources":["../../src/connection/connection.final.ts"],"names":[],"mappings":";;;;;;AACA,mDAA+C;AAE/C,uDAAkD;AAElD,4CAAmB;AAEnB;;GAEG;AACH,MAAa,eAAgB,SAAQ,uBAAU;IAC3C,iBAAiB,CAAS;IAC1B,QAAQ,CAAC,SAAiB;QACtB,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,SAAS,CAAA;IAC/C,CAAC;CACJ;AALD,0CAKC;AAED,MAAa,YAAa,SAAQ,eAAe;IAC7C,0BAA0B;IAC1B,iEAAiE;IACzD,cAAc,CAAiB;IACvC,YAAY,MAAoB;QAC5B,IAAI,GAAW,CAAC;QAChB,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACvC,GAAG,GAAG,YAAE,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SACpC;QACD,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACnD,GAAG,EACH,MAAM,CAAC,CAAC;QACZ,IAAI,CAAC,cAAc,GAAG,IAAI,gCAAc,CACpC,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,QAAQ,EACf,GAAG,EACH,MAAM,CACT,CAAC;IACN,CAAC;IACD,QAAQ,CAAC,SAAiB;QACtB,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,SAAS,CAAA;QAC3C,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;CAEJ;AAzBD,oCAyBC;AAGD,sDAAsD;AACtD,iDAAiD;AACjD,6DAA6D;AAE7D,0CAA0C;AAC1C,2BAA2B;AAC3B,uDAAuD;AACvD,gDAAgD;AAChD,YAAY;AAEZ,mEAAmE;AACnE,mBAAmB;AACnB,uBAAuB;AAEvB,0GAA0G;AAC1G,mFAAmF;AACnF,uDAAuD;AACvD,+CAA+C;AAC/C,+DAA+D;AAC/D,0BAA0B;AAC1B,kBAAkB;AAClB,8DAA8D;AAC9D,YAAY;AAEZ,mCAAmC;AACnC,6DAA6D;AAC7D,4DAA4D;AAC5D,wDAAwD;AACxD,oBAAoB;AACpB,wCAAwC;AACxC,2CAA2C;AAC3C,oBAAoB;AACpB,qDAAqD;AACrD,kDAAkD;AAClD,+DAA+D;AAC/D,+DAA+D;AAC/D,gDAAgD;AAChD,mDAAmD;AACnD,mDAAmD;AACnD,uCAAuC;AACvC,yCAAyC;AACzC,iCAAiC;AACjC,oEAAoE;AACpE,oDAAoD;AACpD,oFAAoF;AACpF,iCAAiC;AACjC,uDAAuD;AACvD,gCAAgC;AAChC,wBAAwB;AACxB,4BAA4B;AAC5B,qDAAqD;AACrD,kEAAkE;AAClE,wCAAwC;AACxC,sDAAsD;AACtD,mDAAmD;AACnD,uCAAuC;AACvC,wBAAwB;AACxB,qBAAqB;AACrB,gBAAgB;AAChB,cAAc;AACd,QAAQ;AACR,IAAI"}

package/dist/connection/connection.pool.d.ts

@@ -9,10 +9,13 @@ export declare class ConnectionPool {
     crt?: Buffer;
     defaultConfig: UltipaConfig;
     currentIndex: number;
+    private connectionCache;
     constructor(hosts: string[], username: string, password: string, crt?: Buffer, defaultConfig?: UltipaConfig);
+    private getOrCreateConnection;
     /** Get active client */
     getActive(hosts?: string[]): Promise<ConnectionFinal>;
     private _getActive;
     _testActiveMaybeSlow(noBalanced?: boolean): Promise<ConnectionFinal>;
     test(): Promise<boolean>;
+    setGraph(graphName: string): void;
 }

package/dist/connection/connection.pool.js

@@ -14,6 +14,7 @@ class ConnectionPool {
     crt;
     defaultConfig;
     currentIndex;
+    connectionCache = new Map();
     constructor(hosts, username, password, crt, defaultConfig) {
         this.hosts = hosts;
         this.username = username;
@@ -22,6 +23,14 @@ class ConnectionPool {
         this.defaultConfig = defaultConfig;
         this.currentIndex = 0;
     }
+    getOrCreateConnection(host, crt) {
+        const cacheKey = `${host}-${crt ? 'https' : 'http'}`;
+        if (!this.connectionCache.has(cacheKey)) {
+            const client = new connection_final_1.ConnectionFinal(host, this.username, this.password, crt || this.crt, this.defaultConfig);
+            this.connectionCache.set(cacheKey, client);
+        }
+        return this.connectionCache.get(cacheKey);
+    }
     /** Get active client */
     async getActive(hosts) {
         hosts = hosts || this.hosts;
@@ -42,24 +51,20 @@ class ConnectionPool {
         return client;
     }
     async _getActive(hosts, crt) {
-        let client = await new Promise(async (resolve, reject) => {
-            let clientOne = null;
-            await bluebird_1.default.map(hosts, async (host, i) => {
-                let client = new connection_final_1.ConnectionFinal(host, this.username, this.password, crt || this.crt, this.defaultConfig);
-                clientOne = client;
-                // console.log(i, host)
-                let test = await client.test({
-                    host: host,
-                });
-                client.testConnectResult = test;
-                // console.log(i, host, test)
-                if (test) {
-                    resolve(client);
-                }
-            });
-            resolve(clientOne);
+        const availableClients = [];
+        await bluebird_1.default.map(hosts, async (host) => {
+            const client = this.getOrCreateConnection(host, crt);
+            const test = await client.test();
+            client.testConnectResult = test;
+            if (test) {
+                availableClients.push(client);
+            }
         });
-        return client;
+        if (availableClients.length === 0) {
+            return this.getOrCreateConnection(hosts[hosts.length - 1], crt);
+        }
+        const randomIndex = Math.floor(Math.random() * availableClients.length);
+        return availableClients[randomIndex];
     }
     async _testActiveMaybeSlow(noBalanced = false) {
         let m = noBalanced ? 0 : 1;
@@ -67,10 +72,8 @@ class ConnectionPool {
         for (let index = 0; index < this.hosts.length; index++) {
             let i = (index + this.currentIndex + m) % this.hosts.length;
             let host = this.hosts[i];
-            client = new connection_final_1.ConnectionFinal(host, this.username, this.password, this.crt, this.defaultConfig);
-            let test = await client.test({
-                host: host
-            });
+            client = this.getOrCreateConnection(host);
+            let test = await client.test();
             if (test) {
                 this.currentIndex = i;
                 return client;
@@ -82,7 +85,6 @@ class ConnectionPool {
         let v = false;
         await bluebird_1.default.map(this.hosts, async (host) => {
             let client = await this.getActive([host]);
-            // let client = new ConnectionFinal(host, this.username, this.password, this.crt, this.defaultConfig)
             let test = await client.test_has_message({
                 host: host,
             });
@@ -90,6 +92,12 @@ class ConnectionPool {
         });
         return v;
     }
+    setGraph(graphName) {
+        this.defaultConfig.defaultGraph = graphName;
+        this.connectionCache.forEach((client) => {
+            client.setGraph(graphName);
+        });
+    }
 }
 exports.ConnectionPool = ConnectionPool;
 //# sourceMappingURL=connection.pool.js.map

package/dist/connection/connection.pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.pool.js","sourceRoot":"","sources":["../../src/connection/connection.pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection.pool.js","sourceRoot":"","sources":["../../src/connection/connection.pool.ts"],"names":[],"mappings":"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"}

package/dist/connection/extra/base.extra.js

@@ -24,8 +24,8 @@ class BaseExtra extends connection_base_1.ConnectionBase {
         req.setFileName(fileName);
         let clientInfo = await this.getClientInfo({
             graphSetName: config?.graph,
-            timeZone: config?.timezone,
-            timeZoneOffset: config?.timezoneOffset,
+            timezone: config?.timezone,
+            timezoneOffset: config?.timezoneOffset,
         });
         let stream = clientInfo.client.controlsClient.downloadFile(req, clientInfo.metadata);
         utils_1.streamHelper.commonDeal(stream, config?.stream, (chunkData) => {
@@ -46,8 +46,8 @@ class BaseExtra extends connection_base_1.ConnectionBase {
     async export(exportRequest, listener) {
         let clientInfo = await this.getClientInfo({
             graphSetName: exportRequest.getGraph() || listener?.graph,
-            timeZone: listener?.timezone,
-            timeZoneOffset: listener?.timezoneOffset,
+            timezone: listener?.timezone,
+            timezoneOffset: listener?.timezoneOffset,
         });
         await new Promise((resolve, reject) => {
             const originalCb = listener?.stream;
@@ -96,11 +96,11 @@ class BaseExtra extends connection_base_1.ConnectionBase {
                 }
                 if (exportRequest.getDbType() == ultipa_pb_1.DBType.DBNODE) {
                     let nodes = chunkData.getNodeTable();
-                    return utils_1.FormatType.nodeTable(nodes, { timeZone: listener.timezone });
+                    return utils_1.FormatType.nodeTable(nodes, { timezone: listener.timezone });
                 }
                 else {
                     let edges = chunkData.getEdgeTable();
-                    return utils_1.FormatType.edgeTable(edges, { timeZone: listener.timezone });
+                    return utils_1.FormatType.edgeTable(edges, { timezone: listener.timezone });
                 }
             });
         });

package/dist/connection/extra/batch.insert.extra.js

@@ -19,8 +19,8 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
                 let request = new ultipa_pb_1.InsertNodesRequest();
                 let clientInfo = await this.getClientInfo({
                     graphSetName: config?.graph || this.defaultConfig.defaultGraph,
-                    timeZone: config?.timezone,
-                    timeZoneOffset: config?.timezoneOffset,
+                    timezone: config?.timezone,
+                    timezoneOffset: config?.timezoneOffset,
                 });
                 request.setSilent(config?.silent);
                 request.setNodeTable(table);
@@ -82,7 +82,7 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
      * @returns InsertResponse
      */
     async insertNodesBatchBySchema(schema, nodes, config) {
-        let nodeTable = utils_1.FormatType.toNodeTableWithSchema(schema, nodes, { timeZone: config?.timezone, timeZoneOffset: config?.timezoneOffset });
+        let nodeTable = utils_1.FormatType.toNodeTableWithSchema(schema, nodes, { timezone: config?.timezone, timezoneOffset: config?.timezoneOffset, timestampToString: true });
         return this.insertNodesBatch(nodeTable, config);
     }
     /**
@@ -98,15 +98,13 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
         let row = [];
         nodes.map(n => {
             let res = {};
+            Object.assign(res, n.values);
             if (n.uuid) {
                 res._uuid = n.uuid;
             }
             if (n.id) {
                 res._id = n.id;
             }
-            n.values.forEach((v, k) => {
-                res[k] = v;
-            });
             row.push(res);
         });
         let uqlMaker = new utils_1.UQLMAKER(command, config, [row]);
@@ -130,24 +128,27 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
         let row = [];
         edges.map(n => {
             let res = {};
+            Object.assign(res, n.values);
             if (n.uuid) {
                 res._uuid = n.uuid;
+                delete n.uuid;
             }
             if (n.from) {
                 res._from = n.from;
+                delete n.from;
             }
             if (n.to) {
                 res._to = n.to;
+                delete n.to;
             }
             if (n.fromUuid) {
                 res._fromUuid = n.fromUuid;
+                delete n.fromUuid;
             }
             if (n.toUuid) {
                 res._toUuid = n.toUuid;
+                delete n.toUuid;
             }
-            n.values.forEach((v, k) => {
-                res[k] = v;
-            });
             row.push(res);
         });
         let uqlMaker = new utils_1.UQLMAKER(command, config, [row]);
@@ -166,7 +167,7 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
      */
     async insertNodesBatchAuto(nodes, config) {
         let result = new Map();
-        let schemas = await this.showNodeSchema();
+        let schemas = await this.showNodeSchema(config);
         let schemaMap = {};
         schemas?.forEach(s => {
             schemaMap[s.name] = s;
@@ -192,7 +193,7 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
                 properties: s.properties,
             };
             let insertRows = batchMap[schemaName];
-            let nodeTable = utils_1.FormatType.toNodeTableWithSchema(newS, insertRows, { timeZone: config.timezone, timeZoneOffset: config.timezoneOffset });
+            let nodeTable = utils_1.FormatType.toNodeTableWithSchema(newS, insertRows, { timezone: config.timezone, timezoneOffset: config.timezoneOffset, timestampToString: true });
             config.silent = false;
             let res = await this.insertNodesBatch(nodeTable, config);
             result.set(schemaName, res);
@@ -211,8 +212,8 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
                 let request = new ultipa_pb_1.InsertEdgesRequest();
                 let clientInfo = await this.getClientInfo({
                     graphSetName: config?.graph || this.defaultConfig.defaultGraph,
-                    timeZone: config?.timezone,
-                    timeZoneOffset: config?.timezoneOffset,
+                    timezone: config?.timezone,
+                    timezoneOffset: config?.timezoneOffset,
                 });
                 request.setSilent(config?.silent);
                 request.setEdgeTable(table);
@@ -270,7 +271,7 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
         if (!valid.ok) {
             throw new Error(`row[${valid.failedIndex}] error: ${valid.msg}`);
         }
-        let edgeTable = utils_1.FormatType.toEdgeTableWithSchema(schema, edges, { timeZone: config?.timezone, timeZoneOffset: config?.timezoneOffset });
+        let edgeTable = utils_1.FormatType.toEdgeTableWithSchema(schema, edges, { timezone: config?.timezone, timezoneOffset: config?.timezoneOffset, timestampToString: true });
         return this.insertEdgesBatch(edgeTable, config);
     }
     validEdgeRows(rows) {
@@ -314,7 +315,7 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
             throw new Error(`row[${valid.failedIndex}] error: ${valid.msg}`);
         }
         let result = new Map();
-        let schemas = await this.showEdgeSchema();
+        let schemas = await this.showEdgeSchema(config);
         let schemaMap = {};
         schemas.forEach(s => {
             schemaMap[s.name] = s;
@@ -340,7 +341,7 @@ class BatchInsertExtra extends schema_extra_1.SchemaExra {
                 properties: s.properties,
             };
             let insertRows = batchMap[schemaName];
-            let table = utils_1.FormatType.toEdgeTableWithSchema(newS, insertRows, { timeZone: config.timezone, timeZoneOffset: config.timezoneOffset });
+            let table = utils_1.FormatType.toEdgeTableWithSchema(newS, insertRows, { timezone: config.timezone, timezoneOffset: config.timezoneOffset, timestampToString: true });
             config.silent = false;
             let res = await this.insertEdgesBatch(table, config);
             result.set(schemaName, res);

package/dist/connection/extra/batch.insert.extra.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch.insert.extra.js","sourceRoot":"","sources":["../../../src/connection/extra/batch.insert.extra.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"batch.insert.extra.js","sourceRoot":"","sources":["../../../src/connection/extra/batch.insert.extra.ts"],"names":[],"mappings":"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"}

package/dist/connection/extra/connection.base.d.ts

@@ -3,7 +3,6 @@ import * as grpc from "@grpc/grpc-js";
 import { RequestType } from "../../types";
 import { UQLMAKER } from "../../utils";
 import { AuthenticateType, RequestConfig, Response, UltipaConfig, JobResponse } from "../../types/types";
-import { ResponseTableName } from "../../types/types.extra";
 /**
  * GrpcClientInfo Class
  * Used to manage basic information and metadata required for gRPC client connections
@@ -50,8 +49,8 @@ export declare class ConnectionBase {
         isGlobal?: boolean;
         useHost?: string;
         forceRefresh?: boolean;
-        timeZone: string;
-        timeZoneOffset: string;
+        timezone: string;
+        timezoneOffset: string;
     }): Promise<{
         client: import("../network.manager").UltipaClientAio;
         host: string;
@@ -66,7 +65,7 @@ export declare class ConnectionBase {
     /**
      * Test connect
      */
-    test(config?: RequestConfig): Promise<boolean>;
+    test(): Promise<boolean>;
     /**
      * Test message
      */
@@ -109,6 +108,5 @@ export declare class ConnectionBase {
     protected uqlSingle(uqlMaker: UQLMAKER): Promise<Response>;
     protected uqlResponse(uqlMaker: UQLMAKER, config?: RequestConfig): Promise<Response>;
     protected uqlJobResponse(uqlMaker: UQLMAKER, config?: RequestConfig): Promise<JobResponse>;
-    protected uqlSimpleList<T>(uqlMaker: UQLMAKER, tableName: ResponseTableName, config?: RequestConfig): Promise<T[]>;
 }
 export {};

package/dist/connection/extra/connection.base.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionBase = exports.RAFT_GLOBAL = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const md5_1 = __importDefault(require("md5"));
 const grpc = __importStar(require("@grpc/grpc-js"));
 const ultipa_pb_1 = require("../../proto/ultipa_pb");
@@ -122,7 +121,7 @@ class ConnectionBase {
             this.defaultConfig = {
                 hosts: [this.host],
                 defaultGraph: "default",
-                timeout: 15,
+                timeout: 2147483647,
                 username: this.username,
                 password: this.password,
             };
@@ -159,9 +158,9 @@ class ConnectionBase {
         return timeout || this.defaultConfig.timeout;
     }
     async getClientInfo(params) {
-        let { graphSetName, isGlobal, timeZone, timeZoneOffset, useHost } = params;
+        let { graphSetName, isGlobal, timezone, timezoneOffset, useHost } = params;
         let goGraphName = this.getGraphSetName(graphSetName, params.uql, isGlobal);
-        let metadata = this.grpcClintInfo.getMetadata(goGraphName, timeZone, timeZoneOffset);
+        let metadata = this.grpcClintInfo.getMetadata(goGraphName, timezone, timezoneOffset);
         let clientToUse = this.grpcClintInfo;
         if (useHost) {
             clientToUse = new GrpcClientInfo(useHost, this.username, this.password, this.crt);
@@ -182,8 +181,8 @@ class ConnectionBase {
             }
             let clientInfo = await this.getClientInfo({
                 graphSetName: config?.graph,
-                timeZone: config?.timezone,
-                timeZoneOffset: config?.timezoneOffset,
+                timezone: config?.timezone,
+                timezoneOffset: config?.timezoneOffset,
             });
             clientInfo.client.controlsClient.authenticate(authReq, clientInfo.metadata, (err, resp) => {
                 let response = new types_1.Response();
@@ -215,8 +214,8 @@ class ConnectionBase {
     /**
      * Test connect
      */
-    async test(config) {
-        let v = await this.test_has_message(config);
+    async test() {
+        let v = await this.test_has_message();
         return v.connect;
     }
     /**
@@ -234,15 +233,11 @@ class ConnectionBase {
             return createResult(false, `14 UNAVAILABLE: Name resolution failed for target dns: ${config?.host}`);
         }
         return new Promise(async (resolve, reject) => {
-            // setTimeout(() => {
-            //     resolve(createResult(false, "connect timeout"))
-            //     return
-            // }, config?.timeout || Number.MAX_SAFE_INTEGER)
             let clientInfo = await this.getClientInfo({
                 isGlobal: true,
                 useHost: config?.host,
-                timeZone: config?.timezone,
-                timeZoneOffset: config?.timezoneOffset,
+                timezone: config?.timezone,
+                timezoneOffset: config?.timezoneOffset,
             });
             let name = "test";
             let req = new ultipa_pb_1.HelloUltipaRequest();
@@ -385,6 +380,12 @@ class ConnectionBase {
      * Execute UQL
      */
     async _query_without_catch(queryText, ql, config, cb, forceRefresh) {
+        if (this.constructor.name === 'UltipaDriver' && this.connectionPool?.getActive) {
+            const activeConnection = await this.connectionPool.getActive();
+            if (activeConnection.constructor.name !== 'UltipaDriver') {
+                return await activeConnection._query_without_catch(queryText, ql, config, cb, forceRefresh);
+            }
+        }
         return new Promise(async (resolve, reject) => {
             try {
                 let _TIME_MAP = {
@@ -400,22 +401,24 @@ class ConnectionBase {
                 if (config?.logQueryText) {
                     console.log('qyeryText: ' + queryText);
                 }
+                request.setGraphName(config?.graph || this.defaultConfig.defaultGraph);
                 request.setQueryType(ql);
                 request.setTimeout(this.getTimeout(config?.timeout));
-                request.setThreadNum((config?.thread) || 0);
-                if (config?.timezone !== undefined) {
-                    request.setTz(config?.timezone);
-                }
+                request.setThreadNum(config?.thread || 0);
                 if (config?.timezoneOffset !== undefined) {
-                    request.setTzOffset(config?.timezoneOffset + "");
+                    const offsetSeconds = utils_1.UltipaDatetime.parseTimezoneOffsetToSeconds(String(config.timezoneOffset));
+                    request.setTzOffset(String(offsetSeconds));
+                }
+                else if (config?.timezone !== undefined) {
+                    request.setTz(config?.timezone);
                 }
                 timeRecordManager.start(_TIME_MAP.getClientInfo);
                 let clientInfo = await this.getClientInfo({
-                    graphSetName: config?.graph,
-                    uql: queryText,
                     useHost: config?.host ? config?.host : this.defaultConfig.hosts[0],
-                    timeZone: config?.timezone,
-                    timeZoneOffset: config?.timezoneOffset,
+                    graphSetName: request?.getGraphName(),
+                    uql: request.getQueryText(),
+                    timezone: request?.getTz(),
+                    timezoneOffset: request?.getTzOffset(),
                 });
                 timeRecordManager.stop(_TIME_MAP.getClientInfo);
                 timeRecordManager.start(_TIME_MAP.queryText);
@@ -433,7 +436,6 @@ class ConnectionBase {
                     : clientInfo.client.rpcsClient.query(request, metadata);
                 let dataCustomDeal = utils_1.streamHelper.isUseStream(cb);
                 let addReq = () => {
-                    //TODO
                     if (config?.withRequestInfo) {
                         response.requestInfo = {
                             graphName: goGraphName,
@@ -495,7 +497,7 @@ class ConnectionBase {
                     };
                 utils_1.streamHelper.commonDeal(stream, dealReq, (_res) => {
                     let res = _res;
-                    return utils_1.FormatType.queryResponse(res, { timeZone: config?.timezone, timeZoneOffset: config?.timezoneOffset });
+                    return utils_1.FormatType.queryResponse(res, { timezone: config?.timezone, timezoneOffset: config?.timezoneOffset });
                 });
                 if (dataCustomDeal) {
                     resolve(null);
@@ -518,25 +520,9 @@ class ConnectionBase {
         return {
             status: utils_1.FormatResponse.successStatus(),
             statisics: res.statistics,
-            jobId: res.items.get(types_extra_1.ResponseTableName.JOB_RESULT)?.asTable()?.toKV()?.pop().new_job_id
+            jobId: res.items[types_extra_1.ResponseTableName.JOB_RESULT]?.asTable()?.toKV()?.pop().new_job_id
         };
     }
-    async uqlSimpleList(uqlMaker, tableName, config) {
-        let res = await this.uql(uqlMaker.toString(), config);
-        let result = [];
-        if (res.items.has(tableName)) {
-            if (res.items.has(tableName)) {
-                let t = res.items.get(tableName).asTableWithT();
-                let keys = Object.keys(t);
-                let a = {};
-                keys.forEach((key) => {
-                    a[lodash_1.default.camelCase(key)] = t[key];
-                });
-                result.push(a);
-            }
-        }
-        return result;
-    }
 }
 exports.ConnectionBase = ConnectionBase;
 //# sourceMappingURL=connection.base.js.map