@tdengine/websocket 3.1.3 → 3.1.5

package/lib/src/client/wsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../src/client/wsClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAEH,eAAe,EAClB,MAAM,cAAc,CAAC;AAKtB,qBAAa,QAAQ;IACjB,OAAO,CAAC,YAAY,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAK;gBAEd,GAAG,EAAE,GAAG,EAAE,OAAQ,CAAC,EAAC,MAAM,GAAG,SAAS,GAAG,IAAI;IAOnD,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC5D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAC,OAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAuB9D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,GAAC,OAAc,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,GAAG,CAAC;IA0B/I,QAAQ;IAQF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,OAAO,CAAC,GAAG,EAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAajC,UAAU,CAAC,GAAG,EAAE,eAAe;IAqB/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IA4B1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAS3B,QAAQ,CAAC,GAAG,EAAE,GAAG;CASpB"}
+{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../src/client/wsClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAEH,eAAe,EAClB,MAAM,cAAc,CAAC;AAMtB,qBAAa,QAAQ;IACjB,OAAO,CAAC,YAAY,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAK;gBAEd,GAAG,EAAE,GAAG,EAAE,OAAQ,CAAC,EAAC,MAAM,GAAG,SAAS,GAAG,IAAI;IAOnD,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC5D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAC,OAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAuB9D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,GAAC,OAAc,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,GAAG,CAAC;IA0B/I,QAAQ;IAQF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,OAAO,CAAC,GAAG,EAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAajC,UAAU,CAAC,GAAG,EAAE,eAAe;IAqB/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IA4B1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAS3B,QAAQ,CAAC,GAAG,EAAE,GAAG;CASpB"}

package/lib/src/client/wsClient.js

@@ -10,6 +10,7 @@ const wsError_1 = require("../common/wsError");
 const wsResponse_1 = require("./wsResponse");
 const reqid_1 = require("../common/reqid");
 const log_1 = __importDefault(require("../common/log"));
+const utils_1 = require("../common/utils");
 class WsClient {
     constructor(url, timeout) {
         this.checkURL(url);
@@ -25,8 +26,8 @@ class WsClient {
             action: 'conn',
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
-                user: this._url.username,
-                password: this._url.password,
+                user: (0, utils_1.safeDecodeURIComponent)(this._url.username),
+                password: (0, utils_1.safeDecodeURIComponent)(this._url.password),
                 db: _db,
             },
         };

package/lib/src/client/wsConnectorPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsConnectorPool.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnectorPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKnD,qBAAa,uBAAuB;IAChC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAyB;IAClD,OAAO,CAAC,IAAI,CAAgD;IAC5D,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO;WAKO,QAAQ,CAAC,cAAc,GAAE,MAAW,GAAE,uBAAuB;IAOrE,aAAa,CAAC,GAAG,EAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA6BvF,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAE,OAAO,CAAC,IAAI,CAAC;IA0BpE,SAAS;CAYZ"}
+{"version":3,"file":"wsConnectorPool.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnectorPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKnD,qBAAa,uBAAuB;IAChC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAyB;IAClD,OAAO,CAAC,IAAI,CAAgD;IAC5D,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO;WAKO,QAAQ,CAAC,cAAc,GAAE,MAAW,GAAE,uBAAuB;IAOrE,aAAa,CAAC,GAAG,EAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BvF,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAE,OAAO,CAAC,IAAI,CAAC;IA0BpE,SAAS;CAYZ"}

package/lib/src/client/wsConnectorPool.js

@@ -23,6 +23,7 @@ class WebSocketConnectionPool {
     }
     async getConnection(url, timeout) {
         let connectAddr = url.origin.concat(url.pathname).concat(url.search);
+        log_1.default.info("url:" + url);
         let connector;
         const unlock = await mutex.acquire();
         try {
@@ -35,7 +36,7 @@ class WebSocketConnectionPool {
                 }
             }
             if (connector) {
-                log_1.default.debug("get connection success:", this._connectionCount);
+                log_1.default.debug("get connection success:" + this._connectionCount);
                 return connector;
             }
             if (this._maxConnections != -1 && this._connectionCount > this._maxConnections) {

package/lib/src/common/log.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setLevel = void 0;
+exports.setLevel = setLevel;
 const winston_1 = __importDefault(require("winston"));
 const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
 const customFormat = winston_1.default.format.printf(({ level, message, label, timestamp }) => {
@@ -30,5 +30,4 @@ const logger = winston_1.default.createLogger({
 function setLevel(level) {
     transport.level = level;
 }
-exports.setLevel = setLevel;
 exports.default = logger;

package/lib/src/common/taosResult.js

@@ -3,7 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bitmapLen = exports.setBitmapNull = exports.getCharOffset = exports.getString = exports.readNchar = exports.readVarchar = exports.readBinary = exports.readSolidData = exports.readSolidDataToArray = exports._isVarType = exports.parseBlock = exports.TaosResult = void 0;
+exports.TaosResult = void 0;
+exports.parseBlock = parseBlock;
+exports._isVarType = _isVarType;
+exports.readSolidDataToArray = readSolidDataToArray;
+exports.readSolidData = readSolidData;
+exports.readBinary = readBinary;
+exports.readVarchar = readVarchar;
+exports.readNchar = readNchar;
+exports.getString = getString;
+exports.getCharOffset = getCharOffset;
+exports.setBitmapNull = setBitmapNull;
+exports.bitmapLen = bitmapLen;
 const constant_1 = require("./constant");
 const wsError_1 = require("./wsError");
 const ut8Helper_1 = require("./ut8Helper");
@@ -199,7 +210,6 @@ function parseBlock(blocks, taosResult) {
         throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_FETCH_MESSAGE_DATA, "cannot fetch block for an update query.");
     }
 }
-exports.parseBlock = parseBlock;
 function _isVarType(metaType) {
     switch (metaType) {
         case constant_1.TDengineTypeCode.NCHAR: {
@@ -225,7 +235,6 @@ function _isVarType(metaType) {
         }
     }
 }
-exports._isVarType = _isVarType;
 function readSolidDataToArray(dataBuffer, colBlockHead, rows, metaType, bitMapArr) {
     let result = [];
     switch (metaType) {
@@ -347,7 +356,6 @@ function readSolidDataToArray(dataBuffer, colBlockHead, rows, metaType, bitMapAr
     }
     return result;
 }
-exports.readSolidDataToArray = readSolidDataToArray;
 function readSolidData(dataBuffer, colDataHead, meta) {
     switch (meta.type) {
         case constant_1.TDengineTypeCode.BOOL: {
@@ -392,18 +400,15 @@ function readSolidData(dataBuffer, colDataHead, meta) {
         }
     }
 }
-exports.readSolidData = readSolidData;
 function readBinary(dataBuffer, colDataHead, length) {
     let buff = dataBuffer.slice(colDataHead, colDataHead + length);
     return buff;
 }
-exports.readBinary = readBinary;
 function readVarchar(dataBuffer, colDataHead, length, textDecoder) {
     // let buff = dataBuffer.slice(colDataHead, colDataHead + length)
     let dataView = new DataView(dataBuffer, colDataHead, length);
     return textDecoder.decode(dataView);
 }
-exports.readVarchar = readVarchar;
 function readNchar(dataBuffer, colDataHead, length) {
     let data = [];
     // let buff: ArrayBuffer = dataBuffer.slice(colDataHead, colDataHead + length);
@@ -413,13 +418,11 @@ function readNchar(dataBuffer, colDataHead, length) {
     }
     return data.join('');
 }
-exports.readNchar = readNchar;
 function getString(dataBuffer, colDataHead, length, textDecoder) {
     // let buff = dataBuffer.slice(colDataHead, colDataHead + length - 1)
     let dataView = new Uint8Array(dataBuffer.buffer, dataBuffer.byteOffset + colDataHead, length - 1);
     return textDecoder.decode(dataView);
 }
-exports.getString = getString;
 function iteratorBuff(arr) {
     let buf = Buffer.from(arr);
     for (const value of buf) {
@@ -435,15 +438,12 @@ function isNull(bitMapArr, n) {
 function getCharOffset(n) {
     return n >> 3;
 }
-exports.getCharOffset = getCharOffset;
 function setBitmapNull(c, n) {
     return c + (1 << (7 - bitPos(n)));
 }
-exports.setBitmapNull = setBitmapNull;
 function bitPos(n) {
     return n & ((1 << 3) - 1);
 }
 function bitmapLen(n) {
     return ((n) + ((1 << 3) - 1)) >> 3;
 }
-exports.bitmapLen = bitmapLen;

package/lib/src/common/ut8Helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appendRune = void 0;
+exports.appendRune = appendRune;
 // Numbers fundamental to the encoding.
 // the "error" Rune or "Unicode replacement character"
 const RuneError = '\uFFFD';
@@ -40,4 +40,3 @@ function appendRune(r) {
     }
     return Buffer.from(p).toString();
 }
-exports.appendRune = appendRune;

package/lib/src/common/utils.d.ts

@@ -1,7 +1,7 @@
 import { WSConfig } from "./config";
 export declare function getUrl(wsConfig: WSConfig): URL;
-export declare function sleep(ms: number): Promise<void>;
 export declare function isEmpty(value: any): boolean;
 export declare function getBinarySql(action: bigint, reqId: bigint, resultId: bigint, sql?: string): ArrayBuffer;
 export declare function zigzagDecode(n: number): number;
+export declare function safeDecodeURIComponent(str: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/lib/src/common/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,MAAM,CAAC,QAAQ,EAAC,QAAQ,GAAE,GAAG,CAe5C;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAGD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAM3C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAC,MAAM,GAAG,WAAW,CA6BnG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,wBAAgB,MAAM,CAAC,QAAQ,EAAC,QAAQ,GAAE,GAAG,CAe5C;AAGD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAM3C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAC,MAAM,GAAG,WAAW,CA6BnG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,UAQjD"}

package/lib/src/common/utils.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zigzagDecode = exports.getBinarySql = exports.isEmpty = exports.sleep = exports.getUrl = void 0;
+exports.getUrl = getUrl;
+exports.isEmpty = isEmpty;
+exports.getBinarySql = getBinarySql;
+exports.zigzagDecode = zigzagDecode;
+exports.safeDecodeURIComponent = safeDecodeURIComponent;
+const wsError_1 = require("./wsError");
 function getUrl(wsConfig) {
     let url = new URL(wsConfig.getUrl());
     if (wsConfig.getUser()) {
@@ -16,11 +21,6 @@ function getUrl(wsConfig) {
     url.pathname = '/ws';
     return url;
 }
-exports.getUrl = getUrl;
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-exports.sleep = sleep;
 function isEmpty(value) {
     if (value === null || value === undefined)
         return true;
@@ -30,7 +30,6 @@ function isEmpty(value) {
     // if (typeof value === 'object' && Object.keys(value).length === 0) return true;  
     return false;
 }
-exports.isEmpty = isEmpty;
 function getBinarySql(action, reqId, resultId, sql) {
     // construct msg
     if (sql) {
@@ -59,8 +58,16 @@ function getBinarySql(action, reqId, resultId, sql) {
     sqlView.setInt16(24, 1, true);
     return sqlBuffer;
 }
-exports.getBinarySql = getBinarySql;
 function zigzagDecode(n) {
     return (n >> 1) ^ (-(n & 1));
 }
-exports.zigzagDecode = zigzagDecode;
+function safeDecodeURIComponent(str) {
+    // Replace invalid "%" not followed by two hex characters with "%25"
+    const cleaned = str.replace(/%(?![0-9A-Fa-f]{2})/g, '%25');
+    try {
+        return decodeURIComponent(cleaned);
+    }
+    catch (e) {
+        throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Decoding ${str} error: ${e}`));
+    }
+}

package/lib/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,QAAA,IAAI,UAAU,SAAgB,QAAQ,mBAQrC,CAAC;AAEF,QAAA,IAAI,UAAU,cAAqB,IAAI,MAAM,EAAE,MAAM,CAAC,wBAOrD,CAAC;AAEF,QAAA,IAAI,WAAW,UAAW,MAAM,SAE/B,CAAC;AAEF,QAAA,IAAI,OAAO,YAEV,CAAC;AACF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,QAAA,IAAI,UAAU,SAAgB,QAAQ,mBAQrC,CAAC;AAEF,QAAA,IAAI,UAAU,cAAqB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,wBAOrD,CAAC;AAEF,QAAA,IAAI,WAAW,UAAW,MAAM,SAE/B,CAAC;AAEF,QAAA,IAAI,OAAO,YAEV,CAAC;AACF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC"}

package/lib/src/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroy = exports.setLogLevel = exports.tmqConnect = exports.sqlConnect = void 0;
 const wsSql_1 = require("./sql/wsSql");

package/lib/src/stmt/wsProto.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.binaryBlockEncode = exports.WsStmtQueryResponse = void 0;
+exports.WsStmtQueryResponse = void 0;
+exports.binaryBlockEncode = binaryBlockEncode;
 const wsResponse_1 = require("../client/wsResponse");
 const constant_1 = require("../common/constant");
 class WsStmtQueryResponse extends wsResponse_1.WSQueryResponse {
@@ -64,4 +65,3 @@ function binaryBlockEncode(bindParams, bindType, stmtId, reqId, row) {
     }
     return arrayBuffer;
 }
-exports.binaryBlockEncode = binaryBlockEncode;

package/lib/test/bulkPulling/log.test.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const log_1 = __importStar(require("../../src/common/log"));
 describe('log level print', () => {

package/lib/test/bulkPulling/queryTables.test.js

@@ -292,6 +292,9 @@ describe('ws.query(jsonTable)', () => {
     });
 });
 afterAll(async () => {
+    let ws = await wsSql_1.WsSql.open(conf);
+    await ws.exec(dropDB);
+    await ws.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });
 //--detectOpenHandles --maxConcurrency=1 --forceExit

package/lib/test/bulkPulling/schemaless.test.js

@@ -91,5 +91,11 @@ describe('TDWebSocket.WsSchemaless()', () => {
     });
 });
 afterAll(async () => {
+    let conf = new config_1.WSConfig(dns);
+    conf.setUser('root');
+    conf.setPwd('taosdata');
+    let wsSql = await wsSql_1.WsSql.open(conf);
+    await wsSql.exec('drop database if exists power_schemaless;');
+    await wsSql.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

package/lib/test/bulkPulling/sql.test.js

@@ -3,15 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
 const config_1 = require("../../src/common/config");
 const wsSql_1 = require("../../src/sql/wsSql");
+const utils_1 = require("../utils");
 let dns = 'ws://localhost:6041';
+let password1 = 'Ab1!@#$%,.:?<>;~';
+let password2 = 'Bc%^&*()-_+=[]{}';
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dns);
     conf.setUser('root');
     conf.setPwd('taosdata');
     let wsSql = await wsSql_1.WsSql.open(conf);
+    await wsSql.exec(`CREATE USER user1 PASS '${password1}'`);
+    await wsSql.exec(`CREATE USER user2 PASS '${password2}'`);
     await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+    await (0, utils_1.Sleep)(100);
     await wsSql.exec('use power');
-    await wsSql.exec('CREATE STABLE if not exists power.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
+    await wsSql.exec('CREATE STABLE if not exists meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
     await wsSql.close();
 });
 describe('TDWebSocket.WsSql()', () => {
@@ -26,6 +32,30 @@ describe('TDWebSocket.WsSql()', () => {
         expect(wsSql.state()).toBeGreaterThan(0);
         await wsSql.close();
     });
+    test('special characters connect1', async () => {
+        let wsSql = null;
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('user1');
+        conf.setPwd(password1);
+        wsSql = await wsSql_1.WsSql.open(conf);
+        expect(wsSql.state()).toBeGreaterThan(0);
+        let version = await wsSql.version();
+        expect(version).not.toBeNull();
+        expect(version).not.toBeUndefined();
+        await wsSql.close();
+    });
+    test('special characters connect2', async () => {
+        let wsSql = null;
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('user2');
+        conf.setPwd(password2);
+        wsSql = await wsSql_1.WsSql.open(conf);
+        expect(wsSql.state()).toBeGreaterThan(0);
+        let version = await wsSql.version();
+        expect(version).not.toBeNull();
+        expect(version).not.toBeUndefined();
+        await wsSql.close();
+    });
     test('connect db with error', async () => {
         expect.assertions(1);
         let wsSql = null;
@@ -140,5 +170,13 @@ describe('TDWebSocket.WsSql()', () => {
     });
 });
 afterAll(async () => {
+    let conf = new config_1.WSConfig(dns);
+    conf.setUser('root');
+    conf.setPwd('taosdata');
+    let wsSql = await wsSql_1.WsSql.open(conf);
+    await wsSql.exec('drop database power');
+    await wsSql.exec('DROP USER user1;');
+    await wsSql.exec('DROP USER user2;');
+    await wsSql.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

package/lib/test/bulkPulling/stmt.func.test.js

@@ -9,8 +9,8 @@ beforeAll(async () => {
     conf.setUser('root');
     conf.setPwd('taosdata');
     let wsSql = await wsSql_1.WsSql.open(conf);
-    await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
-    await wsSql.exec('CREATE STABLE if not exists power.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
+    await wsSql.exec('create database if not exists power_stmt KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+    await wsSql.exec('CREATE STABLE if not exists power_stmt.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
     await wsSql.close();
 });
 describe('TDWebSocket.Stmt()', () => {
@@ -30,7 +30,7 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
@@ -64,12 +64,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         let params = stmt.newStmtParam();
         params.setVarchar([tags[0]]);
@@ -82,12 +82,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         let params = stmt.newStmtParam();
         params.setVarchar([tags[0]]);
@@ -104,18 +104,18 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
         try {
-            await stmt.prepare('INSERT ? INTO ? USING powr.meters TAGS (?, ?) VALUES (?, ?, ?, ?)');
+            await stmt.prepare('INSERT ? INTO ? USING meters TAGS (?, ?) VALUES (?, ?, ?, ?)');
             await stmt.setTableName('d1001');
         }
         catch (e) {
             let err = e;
-            expect(err.message).toMatch("syntax error near '? into ? using powr.meters tags (?, ?) values (?, ?, ?, ?)' (keyword INTO is expected)");
+            expect(err.message).toMatch("syntax error near '? into ? using meters tags (?, ?) values (?, ?, ?, ?)' (keyword INTO is expected)");
         }
         await stmt.close();
         await connector.close();
@@ -124,18 +124,18 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
         try {
-            await stmt.prepare('INSERT INTO ? USING powr.meters TAGS (?, ?, ?) VALUES (?, ?, ?, ?)');
+            await stmt.prepare('INSERT INTO ? USING meters TAGS (?, ?, ?) VALUES (?, ?, ?, ?)');
             await stmt.setTableName('d1001');
         }
         catch (e) {
             let err = e;
-            expect(err.message).toMatch("Database not exist");
+            expect(err.message).toMatch("Tags number not matched");
         }
         await stmt.close();
         await connector.close();
@@ -144,11 +144,11 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         let params = stmt.newStmtParam();
         params.setVarchar(['SanFrancisco']);
@@ -180,12 +180,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         let params = stmt.newStmtParam();
         params.setVarchar(['SanFrancisco']);
@@ -218,12 +218,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         let params = stmt.newStmtParam();
         params.setVarchar(['SanFrancisco']);
@@ -255,12 +255,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         let params = stmt.newStmtParam();
         params.setVarchar(['SanFrancisco']);
@@ -306,12 +306,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         // await stmt.SetTags(tags)
         try {
@@ -335,12 +335,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1002');
         let params = stmt.newStmtParam();
         params.setVarchar(['SanFrancisco']);
@@ -354,7 +354,7 @@ describe('TDWebSocket.Stmt()', () => {
         await stmt.bind(dataParams);
         await stmt.batch();
         await stmt.exec();
-        let result = await connector.exec("select * from power.meters");
+        let result = await connector.exec("select * from power_stmt.meters");
         console.log(result);
         await stmt.close();
         await connector.close();
@@ -363,12 +363,12 @@ describe('TDWebSocket.Stmt()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_stmt');
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
-        await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
         await stmt.setTableName('d1001');
         let params = stmt.newStmtParam();
         params.setVarchar(['SanFrancisco']);
@@ -393,5 +393,11 @@ describe('TDWebSocket.Stmt()', () => {
     });
 });
 afterAll(async () => {
+    let conf = new config_1.WSConfig(dns);
+    conf.setUser('root');
+    conf.setPwd('taosdata');
+    let wsSql = await wsSql_1.WsSql.open(conf);
+    await wsSql.exec('drop database power_stmt');
+    await wsSql.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

package/lib/test/bulkPulling/stmt.type.test.js

@@ -265,5 +265,9 @@ describe('TDWebSocket.Stmt()', () => {
     });
 });
 afterAll(async () => {
+    let conf = new config_1.WSConfig(dsn);
+    let ws = await wsSql_1.WsSql.open(conf);
+    await ws.exec(dropDB);
+    await ws.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

package/lib/test/bulkPulling/tmq.test.js

@@ -180,5 +180,11 @@ describe('TDWebSocket.Tmq()', () => {
     });
 });
 afterAll(async () => {
+    const dropDB = `drop database if exists ${db}`;
+    let conf = new config_1.WSConfig(dsn);
+    let ws = await wsSql_1.WsSql.open(conf);
+    await ws.exec(dropTopic);
+    await ws.exec(dropDB);
+    await ws.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });