@tdengine/websocket 3.1.4 → 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/common/utils.d.ts

@@ -3,4 +3,5 @@ export declare function getUrl(wsConfig: WSConfig): URL;
 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;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

@@ -4,6 +4,8 @@ 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()) {
@@ -59,3 +61,13 @@ function getBinarySql(action, reqId, resultId, sql) {
 function zigzagDecode(n) {
     return (n >> 1) ^ (-(n & 1));
 }
+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/test/bulkPulling/sql.test.js

@@ -5,11 +5,15 @@ 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');
@@ -28,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;
@@ -147,6 +175,8 @@ afterAll(async () => {
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdengine/websocket",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "The websocket Node.js connector for TDengine. TDengine versions 3.3.2.0 and above are recommended to use this connector.",
   "source": "index.ts",
   "main": "lib/index.js",