@tdengine/websocket 3.1.8 → 3.2.0

package/lib/src/stmt/wsStmt2.js

@@ -0,0 +1,280 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WsStmt2 = void 0;
+const json_bigint_1 = __importDefault(require("json-bigint"));
+const constant_1 = require("../common/constant");
+const log_1 = __importDefault(require("../common/log"));
+const reqid_1 = require("../common/reqid");
+const wsError_1 = require("../common/wsError");
+const wsProto_1 = require("./wsProto");
+const wsParams2_1 = require("./wsParams2");
+const wsTableInfo_1 = require("./wsTableInfo");
+const wsRows_1 = require("../sql/wsRows");
+const FieldBindParams_1 = require("./FieldBindParams");
+class WsStmt2 {
+    constructor(wsClient, precision) {
+        this._precision = constant_1.PrecisionLength['ms'];
+        this._isInsert = false;
+        this._wsClient = wsClient;
+        if (precision) {
+            this._precision = precision;
+        }
+        this._stmtTableInfo = new Map();
+        this._currentTableInfo = new wsTableInfo_1.TableInfo();
+        this._stmtTableInfoList = [];
+        this._toBeBindColCount = 0;
+        this._toBeBindTagCount = 0;
+    }
+    static async newStmt(wsClient, precision, reqId) {
+        try {
+            let wsStmt = new WsStmt2(wsClient, precision);
+            return await wsStmt.init(reqId);
+        }
+        catch (e) {
+            log_1.default.error(`WsStmt init is failed, ${e.code}, ${e.message}`);
+            throw (e);
+        }
+    }
+    async init(reqId) {
+        if (this._wsClient) {
+            try {
+                if (this._wsClient.getState() <= 0) {
+                    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);
+                return this;
+            }
+            catch (e) {
+                log_1.default.error(`stmt init filed, ${e.code}, ${e.message}`);
+                throw (e);
+            }
+        }
+        throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "stmt connect closed"));
+    }
+    getStmtId() {
+        return this._stmt_id;
+    }
+    async prepare(sql) {
+        let queryMsg = {
+            action: 'stmt2_prepare',
+            args: {
+                req_id: reqid_1.ReqId.getReqID(),
+                sql: sql,
+                stmt_id: this._stmt_id,
+                get_fields: true,
+            },
+        };
+        let resp = await this.execute(queryMsg);
+        if (this._isInsert && this.fields) {
+            this._precision = this.fields[0].precision ? this.fields[0].precision : 0;
+            this._toBeBindColCount = 0;
+            this._toBeBindTagCount = 0;
+            this.fields?.forEach((field, index) => {
+                if (field.bind_type == constant_1.FieldBindType.TAOS_FIELD_TBNAME) {
+                    this._toBeBindTableNameIndex = index;
+                }
+                else if (field.bind_type == constant_1.FieldBindType.TAOS_FIELD_TAG) {
+                    this._toBeBindTagCount++;
+                }
+                else if (field.bind_type == constant_1.FieldBindType.TAOS_FIELD_COL) {
+                    this._toBeBindColCount++;
+                }
+            });
+        }
+        else {
+            if (resp && resp.fields_count && resp.fields_count > 0) {
+                this._stmtTableInfoList = [this._currentTableInfo];
+                this._toBeBindColCount = resp.fields_count;
+            }
+            else {
+                throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "prepare No columns to bind!");
+            }
+        }
+    }
+    async setTableName(tableName) {
+        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);
+        if (!tableInfo) {
+            this._currentTableInfo = new wsTableInfo_1.TableInfo(tableName);
+            this._stmtTableInfo.set(tableName, this._currentTableInfo);
+            this._stmtTableInfoList.push(this._currentTableInfo);
+        }
+        else {
+            this._currentTableInfo = tableInfo;
+        }
+        return Promise.resolve();
+    }
+    async setTags(paramsArray) {
+        if (!paramsArray || !this._stmt_id) {
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "SetBinaryTags paramArray is invalid!");
+        }
+        if (!this._currentTableInfo) {
+            this._currentTableInfo = new wsTableInfo_1.TableInfo();
+            this._stmtTableInfoList.push(this._currentTableInfo);
+        }
+        await this._currentTableInfo.setTags(paramsArray);
+        return Promise.resolve();
+    }
+    newStmtParam() {
+        if (this._isInsert) {
+            if (!this.fields || this.fields.length === 0) {
+                throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "No columns to bind!");
+            }
+            return new wsParams2_1.Stmt2BindParams(this.fields.length, this._precision, this.fields);
+        }
+        return new wsParams2_1.Stmt2BindParams();
+    }
+    async bind(paramsArray) {
+        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) {
+            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];
+                await this.setTableName(tableName);
+                for (let j = 0; j < paramsArray._fieldParams.length; j++) {
+                    if (j == tableNameIndex) {
+                        continue;
+                    }
+                    let 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);
+                        }
+                        this._currentTableInfo.tags.addBindFieldParams(new FieldBindParams_1.FieldBindParams([fieldParam.params[i]], fieldParam.dataType, fieldParam.typeLen, fieldParam.columnType, fieldParam.bindType));
+                    }
+                    else if (this.fields[j].bind_type == constant_1.FieldBindType.TAOS_FIELD_COL) {
+                        if (!this._currentTableInfo.params) {
+                            this._currentTableInfo.params = new wsParams2_1.Stmt2BindParams(this._toBeBindColCount, this._precision, this.fields);
+                        }
+                        this._currentTableInfo.params.addBindFieldParams(new FieldBindParams_1.FieldBindParams([fieldParam.params[i]], fieldParam.dataType, fieldParam.typeLen, fieldParam.columnType, fieldParam.bindType));
+                    }
+                }
+            }
+        }
+        else {
+            await this._currentTableInfo.setParams(paramsArray);
+        }
+        return Promise.resolve();
+    }
+    async batch() {
+        Promise.resolve();
+    }
+    async exec() {
+        if (!this._currentTableInfo) {
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "table info is empty!");
+        }
+        let 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 = {
+            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;
+    }
+    async resultSet() {
+        let execMsg = {
+            action: 'stmt2_result',
+            args: {
+                req_id: reqid_1.ReqId.getReqID(),
+                stmt_id: this._stmt_id,
+            },
+        };
+        let resp = await this.execute(execMsg);
+        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 = {
+            action: 'stmt2_close',
+            args: {
+                req_id: reqid_1.ReqId.getReqID(),
+                stmt_id: this._stmt_id,
+            },
+        };
+        await this.execute(queryMsg);
+    }
+    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);
+            if (register) {
+                let result = await this._wsClient.exec(reqMsg, false);
+                let resp = new wsProto_1.WsStmtQueryResponse(result);
+                if (resp.stmt_id) {
+                    this._stmt_id = resp.stmt_id;
+                }
+                if (resp.affected) {
+                    this.lastAffected = resp.affected;
+                }
+                if (resp.fields) {
+                    this.fields = resp.fields;
+                }
+                if (resp.is_insert) {
+                    this._isInsert = resp.is_insert;
+                }
+                return resp;
+            }
+            await this._wsClient.execNoResp(reqMsg);
+            this._stmt_id = null;
+            this.lastAffected = null;
+        }
+        catch (e) {
+            throw new wsError_1.TaosResultError(e.code, e.message);
+        }
+    }
+    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) {
+            this._stmt_id = resp.stmt_id;
+        }
+        if (resp.affected) {
+            this.lastAffected = resp.affected;
+        }
+    }
+}
+exports.WsStmt2 = WsStmt2;

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

@@ -0,0 +1,17 @@
+import { StmtBindParams } from "./wsParamsBase";
+export declare class TableInfo {
+    name: Uint8Array | undefined | null;
+    tags: StmtBindParams | undefined | null;
+    params?: StmtBindParams;
+    length: number;
+    textEncoder: TextEncoder;
+    constructor(name?: string);
+    getTableName(): Uint8Array | undefined | null;
+    getTableNameLength(): number;
+    getTags(): StmtBindParams | undefined | null;
+    getParams(): StmtBindParams | undefined | null;
+    setTableName(name: string): void;
+    setTags(paramsArray: StmtBindParams): Promise<void>;
+    setParams(bindParams: StmtBindParams): Promise<void>;
+}
+//# sourceMappingURL=wsTableInfo.d.ts.map

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

@@ -0,0 +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;IAQjC,OAAO,CAAC,WAAW,EAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlD,SAAS,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAS7D"}

package/lib/src/stmt/wsTableInfo.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TableInfo = void 0;
+const wsError_1 = require("../common/wsError");
+class TableInfo {
+    constructor(name) {
+        this.length = 0;
+        this.textEncoder = new TextEncoder();
+        if (name && name.length > 0) {
+            this.name = this.textEncoder.encode(name);
+            this.length = this.name.length;
+        }
+    }
+    getTableName() {
+        return this.name;
+    }
+    getTableNameLength() {
+        return this.length;
+    }
+    getTags() {
+        return this.tags;
+    }
+    getParams() {
+        return this.params;
+    }
+    setTableName(name) {
+        if (name && name.length > 0) {
+            this.name = this.textEncoder.encode(name);
+            this.length = this.name.length;
+        }
+        else {
+            throw new wsError_1.TaosError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Table name is invalid!");
+        }
+    }
+    async setTags(paramsArray) {
+        if (paramsArray) {
+            this.tags = paramsArray;
+        }
+        else {
+            throw new wsError_1.TaosError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Table tags is invalid!");
+        }
+    }
+    async setParams(bindParams) {
+        if (!this.params) {
+            this.params = bindParams;
+        }
+        else {
+            if (bindParams._fieldParams) {
+                this.params.mergeParams(bindParams);
+            }
+        }
+    }
+}
+exports.TableInfo = TableInfo;

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

@@ -95,6 +95,8 @@ export declare class TMQRawDataSchema {
     bytes: bigint;
     colID: number;
     name: string;
+    precision: number;
+    scale: number;
     constructor();
 }
 //# sourceMappingURL=constant.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/tmq/constant.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAY;IACrB,OAAc,QAAQ,EAAE,MAAM,CAAc;IAE5C,OAAc,SAAS,EAAE,MAAM,CAAe;IAE9C;;OAEG;IACH,OAAc,kBAAkB,EAAE,MAAM,CAAwB;IAEhE;;OAEG;IACH,OAAc,uBAAuB,EAAE,MAAM,CAA6B;IAE1E;;OAEG;IACH,OAAc,iBAAiB,EAAE,MAAM,CAAuB;IAE9D;;OAEG;IACH,OAAc,mBAAmB,EAAE,MAAM,CAAyB;IAElE;;OAEG;IACH,OAAc,iBAAiB,EAAE,MAAM,CAAuB;IAE9D;;OAEG;IACH,OAAc,kBAAkB,EAAE,MAAM,CAAwB;IAEhE;;OAEG;IACH,OAAc,2BAA2B,EAAE,MAAM,CAAiC;IAElF;;OAEG;IACH,OAAc,UAAU,EAAE,MAAM,CAAmB;IAEnD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;;;OAIG;IACH,OAAc,MAAM,EAAE,MAAM,CAAY;IAExC;;;;OAIG;IACH,OAAc,eAAe,EAAE,MAAM,CAAwB;IAE7D;;;OAGG;IACH,OAAc,uBAAuB,EAAE,MAAM,CAAwB;CAExE;AAED,qBAAa,cAAc;IACvB,OAAc,SAAS,EAAE,MAAM,CAAe;IAC9C,OAAc,IAAI,EAAE,MAAM,CAAU;IACpC,OAAc,QAAQ,EAAE,MAAM,CAAe;IAC7C,OAAc,aAAa,EAAE,MAAM,CAAqB;IACxD,OAAc,MAAM,EAAE,MAAM,CAAY;IACxC,OAAc,WAAW,EAAE,MAAM,CAAiB;IAClD,OAAc,kBAAkB,EAAE,MAAM,CAAgB;IACxD,OAAc,IAAI,EAAE,MAAM,CAAU;IACpC,OAAc,YAAY,EAAE,MAAM,CAAmB;IACrD,OAAc,SAAS,EAAE,MAAM,CAAe;IAC9C,OAAc,QAAQ,EAAE,MAAM,CAAc;IAC5C,OAAc,UAAU,EAAE,MAAM,CAAiB;IACjD,OAAc,WAAW,EAAE,MAAM,CAAK;CACzC;AAED,qBAAa,YAAY;IACxB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;;CAInB;AAED,qBAAa,gBAAgB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAI,MAAM,CAAC;IACf,KAAK,EAAG,MAAM,CAAC;IACf,KAAK,EAAG,MAAM,CAAA;IACd,IAAI,EAAG,MAAM,CAAC;;CASd"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/tmq/constant.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAY;IACrB,OAAc,QAAQ,EAAE,MAAM,CAAc;IAE5C,OAAc,SAAS,EAAE,MAAM,CAAe;IAE9C;;OAEG;IACH,OAAc,kBAAkB,EAAE,MAAM,CAAwB;IAEhE;;OAEG;IACH,OAAc,uBAAuB,EAAE,MAAM,CAA6B;IAE1E;;OAEG;IACH,OAAc,iBAAiB,EAAE,MAAM,CAAuB;IAE9D;;OAEG;IACH,OAAc,mBAAmB,EAAE,MAAM,CAAyB;IAElE;;OAEG;IACH,OAAc,iBAAiB,EAAE,MAAM,CAAuB;IAE9D;;OAEG;IACH,OAAc,kBAAkB,EAAE,MAAM,CAAwB;IAEhE;;OAEG;IACH,OAAc,2BAA2B,EAAE,MAAM,CAAiC;IAElF;;OAEG;IACH,OAAc,UAAU,EAAE,MAAM,CAAmB;IAEnD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;OAEG;IACH,OAAc,YAAY,EAAE,MAAM,CAAqB;IAEvD;;;;OAIG;IACH,OAAc,MAAM,EAAE,MAAM,CAAY;IAExC;;;;OAIG;IACH,OAAc,eAAe,EAAE,MAAM,CAAwB;IAE7D;;;OAGG;IACH,OAAc,uBAAuB,EAAE,MAAM,CAAwB;CAExE;AAED,qBAAa,cAAc;IACvB,OAAc,SAAS,EAAE,MAAM,CAAe;IAC9C,OAAc,IAAI,EAAE,MAAM,CAAU;IACpC,OAAc,QAAQ,EAAE,MAAM,CAAe;IAC7C,OAAc,aAAa,EAAE,MAAM,CAAqB;IACxD,OAAc,MAAM,EAAE,MAAM,CAAY;IACxC,OAAc,WAAW,EAAE,MAAM,CAAiB;IAClD,OAAc,kBAAkB,EAAE,MAAM,CAAgB;IACxD,OAAc,IAAI,EAAE,MAAM,CAAU;IACpC,OAAc,YAAY,EAAE,MAAM,CAAmB;IACrD,OAAc,SAAS,EAAE,MAAM,CAAe;IAC9C,OAAc,QAAQ,EAAE,MAAM,CAAc;IAC5C,OAAc,UAAU,EAAE,MAAM,CAAiB;IACjD,OAAc,WAAW,EAAE,MAAM,CAAK;CACzC;AAED,qBAAa,YAAY;IACrB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;;CAItB;AAED,qBAAa,gBAAgB;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAI,MAAM,CAAC;IACf,KAAK,EAAG,MAAM,CAAC;IACf,KAAK,EAAG,MAAM,CAAA;IACd,IAAI,EAAG,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;;CAWjB"}

package/lib/src/tmq/constant.js

@@ -100,6 +100,8 @@ class TMQRawDataSchema {
         this.colType = -1;
         this.flag = -1;
         this.name = "";
+        this.scale = 0;
+        this.precision = 0;
     }
 }
 exports.TMQRawDataSchema = TMQRawDataSchema;

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

@@ -10,7 +10,7 @@ export declare class WsPollResponse {
     topic: string;
     database: string;
     vgroup_id: number;
-    message_id: number;
+    message_id: bigint;
     id: bigint;
     message_type: number;
     totalTime: number;
@@ -74,7 +74,7 @@ export declare class PartitionsResp {
     action: string;
     totalTime: number;
     timing: bigint;
-    positions: number[];
+    positions: bigint[];
     constructor(resp: MessageResp);
     setTopicPartitions(topicPartitions: TopicPartition[]): TopicPartition[];
 }
@@ -84,9 +84,9 @@ export declare class CommittedResp extends PartitionsResp {
 export declare class TopicPartition {
     topic: string;
     vgroup_id: number;
-    offset?: number;
-    begin?: number;
-    end?: number;
+    offset?: bigint;
+    begin?: bigint;
+    end?: bigint;
     constructor(msg: any);
 }
 //# sourceMappingURL=tmqResponse.d.ts.map

package/lib/src/tmq/tmqResponse.js

@@ -22,7 +22,7 @@ class WsPollResponse {
         this.topic = resp.msg.topic;
         this.database = resp.msg.database;
         this.vgroup_id = resp.msg.vgroup_id;
-        this.message_id = resp.msg.message_id;
+        this.message_id = BigInt(resp.msg.message_id);
         this.message_type = resp.msg.message_type;
         if (resp.msg.id) {
             this.id = BigInt(resp.msg.id);
@@ -209,13 +209,13 @@ class WSTmqFetchBlockInfo {
                     let bitMapArr = new Uint8Array(dataView.buffer, dataView.byteOffset + bufferOffset, bitMapOffset);
                     bufferOffset += bitMapOffset;
                     //decode column data, data is array
-                    data = (0, taosResult_1.readSolidDataToArray)(dataView, bufferOffset, rows, this.schema[i].colType, bitMapArr);
+                    data = (0, taosResult_1.readSolidDataToArray)(dataView, bufferOffset, rows, this.schema[i].colType, bitMapArr, startOffset, i);
                 }
                 else {
                     //Variable length type   
                     let start = bufferOffset;
                     let offsets = [];
-                    for (let i = 0; i < rows; i++, start += constant_1.TDengineTypeLength['INT']) {
+                    for (let i = 0; i < rows; i++, start += constant_1.TDengineTypeLength[constant_1.TDengineTypeCode.INT]) {
                         //get data length, -1 is null
                         offsets.push(dataView.getInt32(start, true));
                     }
@@ -294,7 +294,7 @@ class PartitionsResp {
         this.req_id = resp.msg.req_id;
         this.action = resp.msg.action;
         this.totalTime = resp.totalTime;
-        this.positions = resp.msg.position;
+        this.positions = resp.msg.position ? resp.msg.position.map((pos) => BigInt(pos)) : [];
     }
     setTopicPartitions(topicPartitions) {
         if (topicPartitions.length != this.positions.length) {
@@ -310,16 +310,16 @@ exports.PartitionsResp = PartitionsResp;
 class CommittedResp extends PartitionsResp {
     constructor(resp) {
         super(resp);
-        this.positions = resp.msg.committed;
+        this.positions = resp.msg.committed ? resp.msg.committed.map((pos) => BigInt(pos)) : [];
     }
 }
 exports.CommittedResp = CommittedResp;
 class TopicPartition {
     constructor(msg) {
         this.vgroup_id = msg.vgroup_id;
-        this.offset = msg.offset;
-        this.begin = msg.begin;
-        this.end = msg.end;
+        this.offset = BigInt(msg.offset);
+        this.begin = BigInt(msg.begin);
+        this.end = BigInt(msg.end);
         this.topic = '';
     }
 }

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

@@ -5,6 +5,7 @@ export declare class WsConsumer {
     private _wsConfig;
     private _topics?;
     private _commitTime?;
+    private _lastMessageID?;
     private constructor();
     private init;
     static newConsumer(wsConfig: Map<string, any>): Promise<WsConsumer>;

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

@@ -1 +1 @@
-{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA0D,MAAM,eAAe,CAAC;AAKvL,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO;YAWO,IAAI;WAuBL,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,cAAc;YAwBd,QAAQ;YA4BR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}
+{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA0D,MAAM,eAAe,CAAC;AAKvL,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,cAAc,CAAC,CAAQ;IAC/B,OAAO;YAWO,IAAI;WAuBL,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,cAAc;YAuBd,QAAQ;YA6BR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}

package/lib/src/tmq/wsTmq.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsConsumer = void 0;
+const json_bigint_1 = __importDefault(require("json-bigint"));
 const config_1 = require("./config");
 const constant_1 = require("./constant");
 const wsClient_1 = require("../client/wsClient");
@@ -20,6 +21,7 @@ class WsConsumer {
             throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_INVALID_URL, 'invalid url, password or username needed.');
         }
         this._wsClient = new wsClient_1.WsClient(this._wsConfig.url, this._wsConfig.timeout);
+        this._lastMessageID = BigInt(0);
     }
     async init() {
         let wsSql = null;
@@ -142,7 +144,7 @@ class WsConsumer {
                 topic_vgroup_ids: offsets
             },
         };
-        let resp = await this._wsClient.exec(JSON.stringify(queryMsg), false);
+        let resp = await this._wsClient.exec(json_bigint_1.default.stringify(queryMsg), false);
         return new tmqResponse_1.CommittedResp(resp).setTopicPartitions(offsets);
     }
     async commitOffsets(partitions) {
@@ -169,7 +171,7 @@ class WsConsumer {
                 offset: partition.offset,
             },
         };
-        return await this._wsClient.exec(JSON.stringify(queryMsg));
+        return await this._wsClient.exec(json_bigint_1.default.stringify(queryMsg));
     }
     async positions(partitions, reqId) {
         if (!partitions || partitions.length == 0) {
@@ -231,7 +233,7 @@ class WsConsumer {
                 message_id: pollResp.message_id,
             },
         };
-        let jsonStr = JSON.stringify(fetchMsg);
+        let jsonStr = json_bigint_1.default.stringify(fetchMsg);
         log_1.default.debug('[wsQueryInterface.fetch.fetchMsg]===>' + jsonStr);
         let result = await this._wsClient.sendMsg(jsonStr);
         let wsResponse = new wsResponse_1.WSFetchBlockResponse(result.msg);
@@ -249,10 +251,11 @@ class WsConsumer {
             action: constant_1.TMQMessageType.Poll,
             args: {
                 req_id: reqid_1.ReqId.getReqID(reqId),
-                blocking_time: timeoutMs
+                blocking_time: timeoutMs,
+                message_id: this._lastMessageID,
             },
         };
-        let resp = await this._wsClient.exec(JSON.stringify(queryMsg), false);
+        let resp = await this._wsClient.exec(json_bigint_1.default.stringify(queryMsg), false);
         let pollResp = new tmqResponse_1.WsPollResponse(resp);
         let taosResult = new tmqResponse_1.TaosTmqResult(pollResp);
         var taosResults = new Map();
@@ -260,6 +263,7 @@ class WsConsumer {
         if (!pollResp.have_message || pollResp.message_type != constant_1.TMQMessageType.ResDataType) {
             return taosResults;
         }
+        this._lastMessageID = pollResp.message_id;
         let finish = false;
         while (!finish) {
             finish = await this.fetchBlockData(pollResp, taosResult);

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

@@ -35,7 +35,6 @@ describe('TDWebSocket.Tmq()', () => {
     jest.setTimeout(20 * 1000);
     test('normal connect', async () => {
         const url = `wss://${process.env.TDENGINE_CLOUD_URL}?token=${process.env.TDENGINE_CLOUD_TOKEN}`;
-        // const TDENGINE_CLOUD_URL = 'wss://gw.cloud.taosdata.com?token=1eb78307be0681ac2fc07c2817ba8a9719641fb9';
         const topic = 'topic_meters';
         const topics = [topic];
         const groupId = 'group1';

package/lib/test/bulkPulling/decimal.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=decimal.test.d.ts.map

package/lib/test/bulkPulling/decimal.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"decimal.test.d.ts","sourceRoot":"","sources":["../../../test/bulkPulling/decimal.test.ts"],"names":[],"mappings":""}