fix: add freeResult asynchronous waiting and modify version (#86)

* fix: clear invalid connections from the connection pool

* fix: fix connection pool allocation with unavailable connections

* fix: modify cloud tmq case for insert data

* fix: delete invalid code

* fix: add config params test

* fix: add config url params test

* fix: Delete invalid connection classes

* fix: use w3cwebsocket.OPEN for status judgment

* fix: add freeResult asynchronous waiting

* fix: modify version

* fix: modify freeResult request send

Author: menshibin

nodejs/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdengine/websocket",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "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",

nodejs/package.json

@@ -169,7 +169,7 @@ export class WsClient {
             let jsonStr = JSONBig.stringify(freeResultMsg);
             logger.debug("[wsQueryInterface.freeResult.freeResultMsg]===>" + jsonStr)
             if (this._wsConnector && this._wsConnector.readyState() === w3cwebsocket.OPEN) {
-                this._wsConnector.sendMsg(jsonStr, false)
+                this._wsConnector.sendMsgNoResp(jsonStr)
                 .then((e: any) => {resolve(e);})
                 .catch((e) => reject(e));
             } else {

nodejs/src/client/wsClient.ts

@@ -116,7 +116,7 @@ export class WebSocketConnector {
                         timeout:this._timeout, id: msg.args.id === undefined ? msg.args.id : BigInt(msg.args.id) }, 
                         resolve, reject);
                 }
-                logger.debug("[wsClient.sendMessage.msg]===>\n", message)
+                logger.debug(`[wsClient.sendMessage.msg]===> ${message}`)
                 this._wsConn.send(message)
             } else {
                 reject(new WebSocketQueryError(ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, 

nodejs/src/client/wsConnector.ts

@@ -22,7 +22,7 @@ export class WSRows {
 
     async next(): Promise<boolean> {
         if (this._wsQueryResponse.is_update || this._isClose) {
-            logger.debug("WSRows::Next::End=>", this._taosResult, this._isClose)
+            logger.debug(`WSRows::Next::End=> ${this._taosResult}, ${this._isClose}`);
             return false;
         }
 
@@ -50,7 +50,8 @@ export class WSRows {
                 this._taosResult.addTotalTime(resp.totalTime)
                 let wsResponse = new WSFetchBlockResponse(resp.msg);
                 if (wsResponse.code != 0) {
-                    logger.error("Executing SQL statement returns error: ", wsResponse.code, wsResponse.message);
+                    await this.close();
+                    logger.error(`Executing SQL statement returns error: ${wsResponse.code}, ${wsResponse.message}`);
                     throw new TaosResultError(wsResponse.code, wsResponse.message);
                 }
 
@@ -62,8 +63,12 @@ export class WSRows {
                 }
             }
             return this._taosResult;
-        }catch(err:any){
-            await this.close();
+        } catch (err:any){
+            try {
+                await this.close();
+            } catch (closeErr:any) {
+                logger.error(`GetBlockData encountered an exception while calling the close method, reason: ${closeErr.message}`);
+            }
             throw new TaosResultError(err.code, err.message);
         } 
     }
@@ -91,7 +96,7 @@ export class WSRows {
             return
         }
         this._isClose = true
-        this._wsClient.freeResult(this._wsQueryResponse)
+        await this._wsClient.freeResult(this._wsQueryResponse)
     }
 
 }

nodejs/src/sql/wsRows.ts

@@ -126,7 +126,7 @@ export class WsSql{
                             taosResult.addTotalTime(resp.totalTime)
                             let wsResponse = new WSFetchBlockResponse(resp.msg);
                             if (wsResponse.code != 0) {
-                                logger.error("Executing SQL statement returns error: ", wsResponse.code, wsResponse.message);
+                                logger.error(`Executing SQL statement returns error: ${wsResponse.code}, ${wsResponse.message}`);
                                 throw new TaosResultError(wsResponse.code, wsResponse.message);
                             }
 
@@ -140,7 +140,7 @@ export class WsSql{
                     } catch(err: any){
                         throw new TaosResultError(err.code, err.message);
                     } finally {
-                        this._wsClient.freeResult(wsQueryResponse)
+                        await this._wsClient.freeResult(wsQueryResponse)
                     }                        
                 }
                 throw new TaosResultError(ErrorCode.ERR_INVALID_FETCH_MESSAGE_DATA, "The result data of the query is incorrect");

nodejs/src/sql/wsSql.ts

@@ -1,10 +1,11 @@
 import { WebSocketConnectionPool } from "../../src/client/wsConnectorPool";
 import { WSConfig } from "../../src/common/config";
+import { setLevel } from "../../src/common/log";
 import { WsSql } from "../../src/sql/wsSql";
 import { Sleep } from "../utils";
 
 let dns = 'ws://localhost:6041'
-
+setLevel("debug")
 beforeAll(async () => {
     let conf :WSConfig = new WSConfig(dns);
     conf.setUser('root');
@@ -337,7 +338,7 @@ describe('TDWebSocket.Stmt()', () => {
             await stmt.exec()
         }catch(e) {
             let err:any = e
-            expect(err.message).toMatch("Retry needed")
+            expect(err.message).toMatch("Retry needed");
         }
         await stmt.close()
         await connector.close();