@tdengine/websocket 3.2.3 → 3.3.0

package/lib/src/stmt/wsProto.js

@@ -17,7 +17,7 @@ class WsStmtQueryResponse extends wsResponse_1.WSQueryResponse {
 }
 exports.WsStmtQueryResponse = WsStmtQueryResponse;
 function binaryBlockEncode(bindParams, bindType, stmtId, reqId, row) {
-    //Computing the length of data
+    // Computing the length of data
     let columns = bindParams.getParams().length;
     let length = constant_1.TDengineTypeLength[constant_1.TDengineTypeCode.BIGINT] * 4;
     length += constant_1.TDengineTypeLength[constant_1.TDengineTypeCode.INT] * 5;
@@ -28,40 +28,40 @@ function binaryBlockEncode(bindParams, bindType, stmtId, reqId, row) {
     arrayView.setBigUint64(0, reqId, true);
     arrayView.setBigUint64(8, stmtId, true);
     arrayView.setBigUint64(16, BigInt(bindType), true);
-    //version int32
+    // version int32
     arrayView.setUint32(24, 1, true);
-    //data length int32
+    // data length int32
     arrayView.setUint32(28, arrayBuffer.byteLength, true);
-    //rows int32
+    // rows int32
     arrayView.setUint32(32, row, true);
-    //columns int32
+    // columns int32
     arrayView.setUint32(36, columns, true);
-    //flagSegment int32
+    // flagSegment int32
     arrayView.setUint32(40, 0, true);
-    //groupID uint64
+    // groupID uint64
     arrayView.setBigUint64(44, BigInt(0), true);
-    //head length
+    // head length
     let offset = 52;
-    //type data range
+    // type data range
     let typeView = new DataView(arrayBuffer, offset);
-    //length data range
+    // length data range
     let lenView = new DataView(arrayBuffer, offset + columns * 5);
-    //data range offset
+    // data range offset
     let dataOffset = offset + columns * 5 + columns * 4;
     let headOffset = 0;
     let columnsData = bindParams.getParams();
     for (let i = 0; i < columnsData.length; i++) {
-        //set column data type
+        // set column data type
         typeView.setUint8(headOffset, columnsData[i].type);
-        //set column type length
+        // set column type length
         typeView.setUint32(headOffset + 1, columnsData[i].typeLen, true);
-        //set column data length
+        // set column data length
         lenView.setUint32(i * 4, columnsData[i].length, true);
         if (columnsData[i].data) {
-            //get encode column data
+            // get encode column data
             const sourceView = new Uint8Array(columnsData[i].data);
             const destView = new Uint8Array(arrayBuffer, dataOffset, columnsData[i].data.byteLength);
-            //splicing data
+            // splicing data
             destView.set(sourceView);
             dataOffset += columnsData[i].data.byteLength;
         }

package/lib/src/stmt/wsStmt1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsStmt1.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsStmt1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAe9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,qBAAa,OAAQ,YAAW,MAAM;IAClC,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,UAAU,CAAiC;IAEnD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO;WAOM,OAAO,CAChB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC;IAUZ,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9C,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,YAAY,IAAI,eAAe;IAIzB,OAAO,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnD,IAAI,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BhD,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlC,eAAe;IAIT,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,SAAS,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;YAI/B,OAAO;YAiCP,aAAa;YA2Bb,IAAI;CAyBrB"}
+{"version":3,"file":"wsStmt1.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsStmt1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAe9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,qBAAa,OAAQ,YAAW,MAAM;IAClC,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,YAAY,CAA4B;IAEhD,OAAO;WAOM,OAAO,CAChB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC;IAUZ,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9C,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,YAAY,IAAI,eAAe;IAIzB,OAAO,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnD,IAAI,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BhD,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlC,eAAe;IAIT,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,SAAS,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;YAI/B,OAAO;YAiCP,aAAa;YA2Bb,IAAI;CAyBrB"}

package/lib/src/stmt/wsStmt2.d.ts

@@ -5,7 +5,6 @@ import { WSRows } from "../sql/wsRows";
 export declare class WsStmt2 implements WsStmt {
     private _wsClient;
     private _stmt_id;
-    private _query_id;
     private _precision;
     private fields?;
     private lastAffected;
@@ -16,21 +15,30 @@ export declare class WsStmt2 implements WsStmt {
     private _toBeBindColCount;
     private _toBeBindTableNameIndex;
     private _isInsert;
+    private _savedSql;
+    private _savedBindBytes;
     private constructor();
     static newStmt(wsClient: WsClient, precision?: number, reqId?: number): Promise<WsStmt>;
     private init;
-    getStmtId(): bigint | undefined | null;
+    private doInit;
     prepare(sql: string): Promise<void>;
+    private doPrepare;
     setTableName(tableName: string): Promise<void>;
     setTags(paramsArray: StmtBindParams): Promise<void>;
     newStmtParam(): StmtBindParams;
     bind(paramsArray: StmtBindParams): Promise<void>;
     batch(): Promise<void>;
     exec(): Promise<void>;
-    private cleanup;
-    getLastAffected(): number | null | undefined;
+    private doSendBindBytes;
+    private doExec;
     resultSet(): Promise<WSRows>;
+    private doResult;
     close(): Promise<void>;
+    private cleanup;
+    private buildBindBytes;
+    private recover;
+    getStmtId(): bigint | undefined | null;
+    getLastAffected(): number | null | undefined;
     private execute;
     private sendBinaryMsg;
 }

package/lib/src/stmt/wsStmt2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsStmt2.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsStmt2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAS9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAOhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,qBAAa,OAAQ,YAAW,MAAM;IAClC,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,MAAM,CAAC,CAA0C;IACzD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,kBAAkB,CAAc;IACxC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,uBAAuB,CAA4B;IAC3D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO;WAYM,OAAO,CAChB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC;YAUJ,IAAI;IA4BlB,SAAS,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIhC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCnC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB9C,OAAO,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBzD,YAAY,IAAI,cAAc;IAiBxB,IAAI,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA+EhD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC3B,OAAO,CAAC,OAAO;IAMf,eAAe,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS;IAItC,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAkB5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAWd,OAAO;YA4CP,aAAa;CA0B9B"}
+{"version":3,"file":"wsStmt2.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsStmt2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAS9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAOhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAWvC,qBAAa,OAAQ,YAAW,MAAM;IAClC,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,MAAM,CAAC,CAA0C;IACzD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,kBAAkB,CAAc;IACxC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,uBAAuB,CAA4B;IAC3D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,eAAe,CAA0B;IAEjD,OAAO;WAYM,OAAO,CAChB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC;YAUJ,IAAI;YAwBJ,MAAM;IAYd,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAY3B,SAAS;IA4CjB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB9C,OAAO,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAezD,YAAY,IAAI,cAAc;IAiBxB,IAAI,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAsEhD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAyCb,eAAe;YAKf,MAAM;IAWd,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;YAapB,QAAQ;IAkBhB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB5B,OAAO,CAAC,OAAO;IAUf,OAAO,CAAC,cAAc;YAqBR,OAAO;IAwDrB,SAAS,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAItC,eAAe,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS;YAI9B,OAAO;YAiCP,aAAa;CAmB9B"}

package/lib/src/stmt/wsStmt2.js

@@ -14,6 +14,14 @@ const wsParams2_1 = require("./wsParams2");
 const wsTableInfo_1 = require("./wsTableInfo");
 const wsRows_1 = require("../sql/wsRows");
 const FieldBindParams_1 = require("./FieldBindParams");
+var StmtStep;
+(function (StmtStep) {
+    StmtStep[StmtStep["INIT"] = 0] = "INIT";
+    StmtStep[StmtStep["PREPARE"] = 1] = "PREPARE";
+    StmtStep[StmtStep["BIND"] = 2] = "BIND";
+    StmtStep[StmtStep["EXEC"] = 3] = "EXEC";
+    StmtStep[StmtStep["RESULT"] = 4] = "RESULT";
+})(StmtStep || (StmtStep = {}));
 class WsStmt2 {
     constructor(wsClient, precision) {
         this._precision = constant_1.PrecisionLength["ms"];
@@ -30,11 +38,11 @@ class WsStmt2 {
     }
     static async newStmt(wsClient, precision, reqId) {
         try {
-            let wsStmt = new WsStmt2(wsClient, precision);
+            const wsStmt = new WsStmt2(wsClient, precision);
             return await wsStmt.init(reqId);
         }
         catch (e) {
-            log_1.default.error(`WsStmt init is failed, ${e.code}, ${e.message}`);
+            log_1.default.error(`WsStmt2 init failed, ${e.code}, ${e.message}`);
             throw e;
         }
     }
@@ -45,29 +53,45 @@ class WsStmt2 {
                     await this._wsClient.connect();
                     await this._wsClient.checkVersion();
                 }
-                let queryMsg = {
-                    action: "stmt2_init",
-                    args: {
-                        req_id: reqid_1.ReqId.getReqID(reqId),
-                        single_stb_insert: true,
-                        single_table_bind_once: true,
-                    },
-                };
-                await this.execute(queryMsg);
+                await this.doInit(reqId);
                 return this;
             }
             catch (e) {
-                log_1.default.error(`stmt init filed, ${e.code}, ${e.message}`);
+                if (this._wsClient.isNetworkError(e)) {
+                    await this.recover(StmtStep.INIT);
+                    return this;
+                }
+                log_1.default.error(`stmt2 init failed, ${e.code}, ${e.message}`);
                 throw e;
             }
         }
-        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "stmt connect closed");
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "stmt2 connect closed");
     }
-    getStmtId() {
-        return this._stmt_id;
+    async doInit(reqId) {
+        const msg = {
+            action: "stmt2_init",
+            args: {
+                req_id: reqid_1.ReqId.getReqID(reqId),
+                single_stb_insert: true,
+                single_table_bind_once: true,
+            },
+        };
+        await this.execute(msg);
     }
     async prepare(sql) {
-        let queryMsg = {
+        this._savedSql = sql;
+        try {
+            await this.doPrepare(sql);
+        }
+        catch (err) {
+            if (!this._wsClient.isNetworkError(err)) {
+                throw err;
+            }
+            await this.recover(StmtStep.PREPARE);
+        }
+    }
+    async doPrepare(sql) {
+        const msg = {
             action: "stmt2_prepare",
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
@@ -76,14 +100,15 @@ class WsStmt2 {
                 get_fields: true,
             },
         };
-        let resp = await this.execute(queryMsg);
+        const resp = await this.execute(msg);
+        if (!resp) {
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "stmt2_prepare response is empty");
+        }
         if (this._isInsert && this.fields) {
-            this._precision = this.fields[0].precision
-                ? this.fields[0].precision
-                : 0;
+            this._precision = this.fields[0].precision ? this.fields[0].precision : 0;
             this._toBeBindColCount = 0;
             this._toBeBindTagCount = 0;
-            this.fields?.forEach((field, index) => {
+            this.fields.forEach((field, index) => {
                 if (field.bind_type == constant_1.FieldBindType.TAOS_FIELD_TBNAME) {
                     this._toBeBindTableNameIndex = index;
                 }
@@ -96,7 +121,7 @@ class WsStmt2 {
             });
         }
         else {
-            if (resp && resp.fields_count && resp.fields_count > 0) {
+            if (resp.fields_count && resp.fields_count > 0) {
                 this._stmtTableInfoList = [this._currentTableInfo];
                 this._toBeBindColCount = resp.fields_count;
             }
@@ -109,7 +134,7 @@ class WsStmt2 {
         if (!tableName || tableName.length === 0) {
             throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Table name cannot be empty");
         }
-        let tableInfo = this._stmtTableInfo.get(tableName);
+        const tableInfo = this._stmtTableInfo.get(tableName);
         if (!tableInfo) {
             this._currentTableInfo = new wsTableInfo_1.TableInfo(tableName);
             this._stmtTableInfo.set(tableName, this._currentTableInfo);
@@ -144,22 +169,20 @@ class WsStmt2 {
         if (!paramsArray || !this._stmt_id || !paramsArray._fieldParams) {
             throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Bind paramArray is invalid!");
         }
-        if (this._isInsert &&
-            this.fields &&
-            paramsArray.getBindCount() == this.fields.length) {
+        if (this._isInsert && this.fields && paramsArray.getBindCount() == this.fields.length) {
             const tableNameIndex = this._toBeBindTableNameIndex;
             if (tableNameIndex === null || tableNameIndex === undefined) {
                 throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Table name index is null or undefined!");
             }
             const paramsCount = paramsArray._fieldParams[0].params.length;
             for (let i = 0; i < paramsCount; i++) {
-                let tableName = paramsArray._fieldParams[tableNameIndex].params[i];
+                const tableName = paramsArray._fieldParams[tableNameIndex].params[i];
                 await this.setTableName(tableName);
                 for (let j = 0; j < paramsArray._fieldParams.length; j++) {
                     if (j == tableNameIndex) {
                         continue;
                     }
-                    let fieldParam = paramsArray._fieldParams[j];
+                    const fieldParam = paramsArray._fieldParams[j];
                     if (this.fields[j].bind_type == constant_1.FieldBindType.TAOS_FIELD_TAG) {
                         if (!this._currentTableInfo.tags) {
                             this._currentTableInfo.tags = new wsParams2_1.Stmt2BindParams(this._toBeBindTagCount, this._precision, this.fields);
@@ -187,74 +210,172 @@ class WsStmt2 {
         if (!this._currentTableInfo) {
             throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "table info is empty!");
         }
-        let params = this._currentTableInfo.getParams();
+        const params = this._currentTableInfo.getParams();
         if (!params) {
             throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Bind params is empty!");
         }
-        let reqId = BigInt(reqid_1.ReqId.getReqID());
-        let bytes = (0, wsProto_1.stmt2BinaryBlockEncode)(reqId, this._stmtTableInfoList, this._stmt_id, this._toBeBindTableNameIndex, this._toBeBindTagCount, this._toBeBindColCount);
-        await this.sendBinaryMsg(reqId, "stmt2_bind", new Uint8Array(bytes));
-        let execMsg = {
+        const bytes = (0, wsProto_1.stmt2BinaryBlockEncode)(BigInt(reqid_1.ReqId.getReqID()), this._stmtTableInfoList, this._stmt_id, this._toBeBindTableNameIndex, this._toBeBindTagCount, this._toBeBindColCount);
+        this._savedBindBytes = bytes;
+        try {
+            await this.doSendBindBytes(bytes);
+            await this.doExec();
+        }
+        catch (err) {
+            if (!this._wsClient.isNetworkError(err)) {
+                throw err;
+            }
+            await this.recover(StmtStep.EXEC);
+        }
+        finally {
+            if (this._isInsert) {
+                this.cleanup({ keepSavedSql: true });
+            }
+        }
+    }
+    async doSendBindBytes(bytes) {
+        const reqId = new DataView(bytes).getBigUint64(0, true);
+        await this.sendBinaryMsg(reqId, "stmt2_bind", bytes);
+    }
+    async doExec() {
+        const msg = {
             action: "stmt2_exec",
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
                 stmt_id: this._stmt_id,
             },
         };
-        await this.execute(execMsg);
-        this.cleanup();
-    }
-    cleanup() {
-        this._stmtTableInfo.clear();
-        this._stmtTableInfoList = [];
-        this._currentTableInfo = new wsTableInfo_1.TableInfo();
-    }
-    getLastAffected() {
-        return this.lastAffected;
+        await this.execute(msg);
     }
     async resultSet() {
-        let execMsg = {
+        try {
+            return await this.doResult();
+        }
+        catch (err) {
+            if (!this._wsClient.isNetworkError(err)) {
+                throw err;
+            }
+            return await this.recover(StmtStep.RESULT);
+        }
+        finally {
+            this.cleanup({ keepSavedSql: true });
+        }
+    }
+    async doResult() {
+        const msg = {
             action: "stmt2_result",
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
                 stmt_id: this._stmt_id,
             },
         };
-        let resp = await this.execute(execMsg);
+        const resp = await this.execute(msg);
         if (!resp) {
             throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "ResultSet response is empty!");
         }
         return new wsRows_1.WSRows(this._wsClient, resp);
     }
     async close() {
-        let queryMsg = {
+        const msg = {
             action: "stmt2_close",
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
                 stmt_id: this._stmt_id,
             },
         };
-        await this.execute(queryMsg);
+        try {
+            await this.execute(msg);
+        }
+        catch (err) {
+            log_1.default.warn("stmt2 close failed: " + err.message);
+        }
+        finally {
+            this.cleanup();
+        }
+    }
+    cleanup(opts) {
+        this._stmtTableInfo.clear();
+        this._stmtTableInfoList = [];
+        this._currentTableInfo = new wsTableInfo_1.TableInfo();
+        if (!opts?.keepSavedSql) {
+            this._savedSql = undefined;
+        }
+        this._savedBindBytes = undefined;
+    }
+    buildBindBytes() {
+        if (this._savedBindBytes === undefined) {
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "bind bytes are missing for stmt2 rebuild");
+        }
+        if (this._stmt_id === undefined || this._stmt_id === null) {
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "stmt_id is missing for stmt2 rebuild");
+        }
+        const bytes = this._savedBindBytes.slice(0);
+        const view = new DataView(bytes);
+        view.setBigUint64(0, BigInt(reqid_1.ReqId.getReqID()), true);
+        view.setBigUint64(8, this._stmt_id, true);
+        return bytes;
+    }
+    async recover(failedStep) {
+        const retries = this._wsClient.getReconnectRetries();
+        const maxAttempts = retries > 0 ? retries : 5;
+        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            try {
+                await this._wsClient.waitForReady();
+                await this.doInit();
+                if (failedStep === StmtStep.INIT) {
+                    return;
+                }
+                if (this._savedSql === undefined) {
+                    throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "prepare SQL is missing for stmt2 rebuild");
+                }
+                await this.doPrepare(this._savedSql);
+                if (failedStep === StmtStep.PREPARE) {
+                    return;
+                }
+                await this.doSendBindBytes(this.buildBindBytes());
+                if (failedStep === StmtStep.BIND) {
+                    return;
+                }
+                await this.doExec();
+                if (failedStep === StmtStep.EXEC) {
+                    return;
+                }
+                return await this.doResult();
+            }
+            catch (err) {
+                if (!this._wsClient.isNetworkError(err)) {
+                    throw err;
+                }
+                if (attempt === maxAttempts) {
+                    const recoverError = new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `stmt2 recover exceeded max attempts (${maxAttempts}) at step ${StmtStep[failedStep]}: ${err?.message || err}`);
+                    recoverError.cause = err;
+                    throw recoverError;
+                }
+            }
+        }
+        throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `stmt2 recover exited unexpectedly at step ${StmtStep[failedStep]}`);
+    }
+    getStmtId() {
+        return this._stmt_id;
+    }
+    getLastAffected() {
+        return this.lastAffected;
     }
     async execute(stmtMsg, register = true) {
         try {
-            if (this._wsClient.getState() <= 0) {
-                throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "websocket connect has closed!");
-            }
-            let reqMsg = json_bigint_1.default.stringify(stmtMsg);
+            const reqMsg = json_bigint_1.default.stringify(stmtMsg);
             if (register) {
-                let result = await this._wsClient.exec(reqMsg, false);
-                let resp = new wsProto_1.WsStmtQueryResponse(result);
-                if (resp.stmt_id) {
+                const result = await this._wsClient.exec(reqMsg, false);
+                const resp = new wsProto_1.WsStmtQueryResponse(result);
+                if (resp.stmt_id !== undefined && resp.stmt_id !== null) {
                     this._stmt_id = resp.stmt_id;
                 }
-                if (resp.affected) {
+                if (resp.affected !== undefined && resp.affected !== null) {
                     this.lastAffected = resp.affected;
                 }
-                if (resp.fields) {
+                if (resp.fields !== undefined && resp.fields !== null) {
                     this.fields = resp.fields;
                 }
-                if (resp.is_insert) {
+                if (resp.is_insert !== undefined && resp.is_insert !== null) {
                     this._isInsert = resp.is_insert;
                 }
                 return resp;
@@ -268,15 +389,12 @@ class WsStmt2 {
         }
     }
     async sendBinaryMsg(reqId, action, message) {
-        if (this._wsClient.getState() <= 0) {
-            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "websocket connect has closed!");
-        }
-        let result = await this._wsClient.sendBinaryMsg(reqId, action, message, false);
-        let resp = new wsProto_1.WsStmtQueryResponse(result);
-        if (resp.stmt_id) {
+        const result = await this._wsClient.sendBinaryMsg(reqId, action, message, false);
+        const resp = new wsProto_1.WsStmtQueryResponse(result);
+        if (resp.stmt_id !== undefined && resp.stmt_id !== null) {
             this._stmt_id = resp.stmt_id;
         }
-        if (resp.affected) {
+        if (resp.affected !== undefined && resp.affected !== null) {
             this.lastAffected = resp.affected;
         }
     }

package/lib/src/stmt/wsTableInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsTableInfo.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsTableInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,qBAAa,SAAS;IAClB,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;IACpC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,MAAM,CAAK;IACnB,WAAW,cAAqB;gBACpB,IAAI,CAAC,EAAE,MAAM;IAOlB,YAAY,IAAI,UAAU,GAAG,SAAS,GAAG,IAAI;IAI7C,kBAAkB,IAAI,MAAM;IAI5B,OAAO,IAAI,cAAc,GAAG,SAAS,GAAG,IAAI;IAI5C,SAAS,IAAI,cAAc,GAAG,SAAS,GAAG,IAAI;IAI9C,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAWjC,OAAO,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnD,SAAS,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAS7D"}
+{"version":3,"file":"wsTableInfo.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsTableInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,qBAAa,SAAS;IAClB,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC;IACpC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,MAAM,CAAK;IACnB,WAAW,cAAqB;gBAEpB,IAAI,CAAC,EAAE,MAAM;IAOlB,YAAY,IAAI,UAAU,GAAG,SAAS,GAAG,IAAI;IAI7C,kBAAkB,IAAI,MAAM;IAI5B,OAAO,IAAI,cAAc,GAAG,SAAS,GAAG,IAAI;IAI5C,SAAS,IAAI,cAAc,GAAG,SAAS,GAAG,IAAI;IAI9C,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAYjC,OAAO,CAAC,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnD,SAAS,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAS7D"}

package/lib/src/tmq/config.d.ts

@@ -1,6 +1,7 @@
+import { Dsn } from "../common/dsn";
 export declare class TmqConfig {
-    url: URL | null;
-    sql_url: URL | null;
+    dsn: Dsn | null;
+    sqlDsn: Dsn | null;
     user: string | null;
     password: string | null;
     token: string | null;

package/lib/src/tmq/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/tmq/config.ts"],"names":[],"mappings":"AAEA,qBAAa,SAAS;IAClB,GAAG,EAAE,GAAG,GAAG,IAAI,CAAQ;IACvB,OAAO,EAAE,GAAG,GAAG,IAAI,CAAQ;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAChC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,EAAE,OAAO,CAAQ;IAC5B,uBAAuB,EAAE,MAAM,CAAY;IAC3C,OAAO,EAAE,MAAM,CAAQ;IACvB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEnB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;CAqEzC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/tmq/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAA0B,MAAM,eAAe,CAAC;AAG5D,qBAAa,SAAS;IAClB,GAAG,EAAE,GAAG,GAAG,IAAI,CAAQ;IACvB,MAAM,EAAE,GAAG,GAAG,IAAI,CAAQ;IAC1B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAChC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,EAAE,OAAO,CAAQ;IAC5B,uBAAuB,EAAE,MAAM,CAAY;IAC3C,OAAO,EAAE,MAAM,CAAS;IACxB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEnB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;CA4EzC"}

package/lib/src/tmq/config.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TmqConfig = void 0;
+const dsn_1 = require("../common/dsn");
 const constant_1 = require("./constant");
 class TmqConfig {
     constructor(wsConfig) {
-        this.url = null;
-        this.sql_url = null;
+        this.dsn = null;
+        this.sqlDsn = null;
         this.user = null;
         this.password = null;
         this.token = null;
@@ -14,12 +15,13 @@ class TmqConfig {
         this.offset_rest = null;
         this.auto_commit = true;
         this.auto_commit_interval_ms = 5 * 1000;
-        this.timeout = 5000;
+        this.timeout = 60000;
         this.otherConfigs = new Map();
         for (const [key, value] of wsConfig) {
             switch (key) {
                 case constant_1.TMQConstants.WS_URL:
-                    this.url = new URL(value);
+                    this.dsn = (0, dsn_1.parse)(value);
+                    this.dsn.endpoint = dsn_1.WS_TMQ_ENDPOINT;
                     break;
                 case constant_1.TMQConstants.CONNECT_USER:
                     this.user = value;
@@ -53,35 +55,33 @@ class TmqConfig {
                     this.otherConfigs.set(key, value);
             }
         }
-        if (this.url) {
+        if (this.dsn) {
             if (this.user) {
-                this.url.username = this.user;
+                this.dsn.username = this.user;
             }
             else {
-                this.user = this.url.username;
+                this.user = this.dsn.username;
             }
             if (this.password) {
-                this.url.password = this.password;
+                this.dsn.password = this.password;
             }
             else {
-                this.password = this.url.password;
+                this.password = this.dsn.password;
             }
             if (this.token) {
-                this.url.searchParams.set("bearer_token", this.token);
+                this.dsn.params.set("bearer_token", this.token);
             }
             else {
-                const bearerToken = this.url.searchParams.get("bearer_token");
+                const bearerToken = this.dsn.params.get("bearer_token");
                 if (bearerToken) {
                     this.token = bearerToken;
                     this.otherConfigs.set(constant_1.TMQConstants.CONNECT_TOKEN, bearerToken);
                 }
                 else {
-                    this.url.searchParams.delete("bearer_token");
+                    this.dsn.params.delete("bearer_token");
                 }
             }
-            this.sql_url = new URL(this.url);
-            this.sql_url.pathname = "/ws";
-            this.url.pathname = "/rest/tmq";
+            this.sqlDsn = new dsn_1.Dsn(this.dsn.scheme, this.dsn.username, this.dsn.password, this.dsn.addresses, this.dsn.database, this.dsn.params);
         }
     }
 }

package/lib/src/tmq/wsTmq.d.ts

@@ -2,13 +2,16 @@ import { TaosResult } from "../common/taosResult";
 import { TopicPartition } from "./tmqResponse";
 export declare class WsConsumer {
     private _wsClient;
-    private _wsConfig;
+    private _config;
     private _topics?;
     private _commitTime?;
     private _lastMessageID?;
     private constructor();
     private init;
     static newConsumer(wsConfig: Map<string, any>): Promise<WsConsumer>;
+    private bindSessionRecoveryHook;
+    private buildSubscribeMessage;
+    private recoverSessionContext;
     subscribe(topics: Array<string>, reqId?: number): Promise<void>;
     unsubscribe(reqId?: number): Promise<void>;
     poll(timeoutMs: number, reqId?: number): Promise<Map<string, TaosResult>>;

package/lib/src/tmq/wsTmq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAOlD,OAAO,EAMH,cAAc,EAGjB,MAAM,eAAe,CAAC;AAOvB,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,OAAO,CAAC,CAAW;IAC3B,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,cAAc,CAAC,CAAS;IAEhC,OAAO;YAkBO,IAAI;WA4BL,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAWnE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B/D,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU1C,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBzE,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAWpD,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK9C,QAAQ;IAWhB,SAAS,CACX,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAgC3B,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAehF,YAAY,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBtE,SAAS,CACX,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA4B3B,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB9D,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjE,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAId,cAAc;YA+Bd,QAAQ;YAsCR,iBAAiB;IAgBzB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBrD,gBAAgB;CAmCjC"}
+{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAOlD,OAAO,EAMH,cAAc,EAGjB,MAAM,eAAe,CAAC;AAOvB,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,OAAO,CAAC,CAAW;IAC3B,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,cAAc,CAAC,CAAS;IAEhC,OAAO;YAgBO,IAAI;WAyBL,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAWzE,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,qBAAqB;YA0Bf,qBAAqB;IAa7B,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1C,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBzE,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAWpD,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK9C,QAAQ;IAWhB,SAAS,CACX,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAgC3B,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAehF,YAAY,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBtE,SAAS,CACX,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA4B3B,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB9D,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjE,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAId,cAAc;YA+Bd,QAAQ;YAsCR,iBAAiB;IAgBzB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBrD,gBAAgB;CAmCjC"}