@tdengine/websocket 3.2.0 → 3.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/example/all_type_query.js +26 -22
- package/lib/example/all_type_stmt.js +22 -20
- package/lib/example/basicBatchTmq.js +14 -14
- package/lib/example/basicSchemaless.js +11 -11
- package/lib/example/basicSql.js +10 -10
- package/lib/example/basicStmt.js +3 -3
- package/lib/example/basicTmq.js +8 -9
- package/lib/index.d.ts +0 -7
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +0 -7
- package/lib/src/client/wsClient.d.ts +2 -2
- package/lib/src/client/wsClient.d.ts.map +1 -1
- package/lib/src/client/wsClient.js +60 -37
- package/lib/src/client/wsConnector.d.ts.map +1 -1
- package/lib/src/client/wsConnector.js +40 -14
- package/lib/src/client/wsConnectorPool.d.ts.map +1 -1
- package/lib/src/client/wsConnectorPool.js +29 -14
- package/lib/src/client/wsEventCallback.d.ts.map +1 -1
- package/lib/src/client/wsEventCallback.js +6 -4
- package/lib/src/client/wsResponse.d.ts.map +1 -1
- package/lib/src/client/wsResponse.js +6 -2
- package/lib/src/common/config.d.ts +2 -2
- package/lib/src/common/config.d.ts.map +1 -1
- package/lib/src/common/config.js +5 -5
- package/lib/src/common/constant.d.ts.map +1 -1
- package/lib/src/common/constant.js +27 -27
- package/lib/src/common/log.d.ts +1 -1
- package/lib/src/common/log.d.ts.map +1 -1
- package/lib/src/common/log.js +9 -7
- package/lib/src/common/reqid.d.ts.map +1 -1
- package/lib/src/common/reqid.js +7 -7
- package/lib/src/common/taosResult.d.ts.map +1 -1
- package/lib/src/common/taosResult.js +46 -27
- package/lib/src/common/ut8Helper.d.ts.map +1 -1
- package/lib/src/common/ut8Helper.js +8 -8
- package/lib/src/common/utils.d.ts.map +1 -1
- package/lib/src/common/utils.js +17 -16
- package/lib/src/common/wsError.d.ts.map +1 -1
- package/lib/src/common/wsError.js +3 -3
- package/lib/src/common/wsOptions.d.ts +1 -1
- package/lib/src/index.d.ts +3 -3
- package/lib/src/index.d.ts.map +1 -1
- package/lib/src/sql/wsProto.d.ts.map +1 -1
- package/lib/src/sql/wsRows.d.ts +3 -3
- package/lib/src/sql/wsRows.d.ts.map +1 -1
- package/lib/src/sql/wsRows.js +4 -2
- package/lib/src/sql/wsSql.d.ts +5 -5
- package/lib/src/sql/wsSql.d.ts.map +1 -1
- package/lib/src/sql/wsSql.js +15 -16
- package/lib/src/stmt/FieldBindParams.d.ts.map +1 -1
- package/lib/src/stmt/wsColumnInfo.d.ts.map +1 -1
- package/lib/src/stmt/wsParams1.d.ts.map +1 -1
- package/lib/src/stmt/wsParams1.js +50 -24
- package/lib/src/stmt/wsParams2.d.ts.map +1 -1
- package/lib/src/stmt/wsParams2.js +30 -15
- package/lib/src/stmt/wsParamsBase.d.ts.map +1 -1
- package/lib/src/stmt/wsParamsBase.js +5 -3
- package/lib/src/stmt/wsProto.d.ts.map +1 -1
- package/lib/src/stmt/wsProto.js +22 -11
- package/lib/src/stmt/wsStmt.d.ts.map +1 -1
- package/lib/src/stmt/wsStmt1.d.ts +5 -5
- package/lib/src/stmt/wsStmt1.d.ts.map +1 -1
- package/lib/src/stmt/wsStmt1.js +14 -14
- package/lib/src/stmt/wsStmt2.d.ts +1 -1
- package/lib/src/stmt/wsStmt2.d.ts.map +1 -1
- package/lib/src/stmt/wsStmt2.js +18 -14
- package/lib/src/stmt/wsTableInfo.d.ts.map +1 -1
- package/lib/src/tmq/config.d.ts.map +1 -1
- package/lib/src/tmq/config.js +2 -2
- package/lib/src/tmq/constant.d.ts.map +1 -1
- package/lib/src/tmq/constant.js +28 -28
- package/lib/src/tmq/tmqResponse.d.ts.map +1 -1
- package/lib/src/tmq/tmqResponse.js +30 -16
- package/lib/src/tmq/wsTmq.d.ts +2 -2
- package/lib/src/tmq/wsTmq.d.ts.map +1 -1
- package/lib/src/tmq/wsTmq.js +32 -30
- package/lib/test/bulkPulling/cloud.tmq.test.js +11 -11
- package/lib/test/bulkPulling/decimal.test.js +50 -26
- package/lib/test/bulkPulling/log.test.js +8 -8
- package/lib/test/bulkPulling/queryTables.test.js +255 -49
- package/lib/test/bulkPulling/schemaless.test.js +34 -34
- package/lib/test/bulkPulling/sql.test.js +108 -69
- package/lib/test/bulkPulling/stmt1.func.test.js +96 -96
- package/lib/test/bulkPulling/stmt1.type.test.js +124 -48
- package/lib/test/bulkPulling/stmt2.func.test.js +116 -112
- package/lib/test/bulkPulling/stmt2.type.test.js +124 -48
- package/lib/test/bulkPulling/tmq.test.js +225 -31
- package/lib/test/bulkPulling/utils.test.js +2 -2
- package/lib/test/bulkPulling/wsConnectPool.test.js +18 -18
- package/lib/test/utils.d.ts.map +1 -1
- package/lib/test/utils.js +129 -129
- package/package.json +1 -1
- package/readme.md +1 -0
- package/lib/src/stmt/wsParams.d.ts +0 -41
- package/lib/src/stmt/wsParams.d.ts.map +0 -1
- package/lib/src/stmt/wsParams.js +0 -428
- package/lib/test/bulkPulling/stmt.func.test.d.ts +0 -2
- package/lib/test/bulkPulling/stmt.func.test.d.ts.map +0 -1
- package/lib/test/bulkPulling/stmt.func.test.js +0 -493
- package/lib/test/bulkPulling/stmt.type.test.d.ts +0 -2
- package/lib/test/bulkPulling/stmt.type.test.d.ts.map +0 -1
- package/lib/test/bulkPulling/stmt.type.test.js +0 -316
package/lib/src/stmt/wsStmt1.js
CHANGED
|
@@ -13,7 +13,7 @@ const log_1 = __importDefault(require("../common/log"));
|
|
|
13
13
|
const wsParams1_1 = require("./wsParams1");
|
|
14
14
|
class WsStmt1 {
|
|
15
15
|
constructor(wsClient, precision) {
|
|
16
|
-
this._precision = constant_1.PrecisionLength[
|
|
16
|
+
this._precision = constant_1.PrecisionLength["ms"];
|
|
17
17
|
this._wsClient = wsClient;
|
|
18
18
|
if (precision) {
|
|
19
19
|
this._precision = precision;
|
|
@@ -26,12 +26,12 @@ class WsStmt1 {
|
|
|
26
26
|
}
|
|
27
27
|
catch (e) {
|
|
28
28
|
log_1.default.error(`WsStmt init is failed, ${e.code}, ${e.message}`);
|
|
29
|
-
throw
|
|
29
|
+
throw e;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
async prepare(sql) {
|
|
33
33
|
let queryMsg = {
|
|
34
|
-
action:
|
|
34
|
+
action: "prepare",
|
|
35
35
|
args: {
|
|
36
36
|
req_id: reqid_1.ReqId.getReqID(),
|
|
37
37
|
sql: sql,
|
|
@@ -42,7 +42,7 @@ class WsStmt1 {
|
|
|
42
42
|
}
|
|
43
43
|
async setTableName(tableName) {
|
|
44
44
|
let queryMsg = {
|
|
45
|
-
action:
|
|
45
|
+
action: "set_table_name",
|
|
46
46
|
args: {
|
|
47
47
|
req_id: reqid_1.ReqId.getReqID(),
|
|
48
48
|
name: tableName,
|
|
@@ -53,7 +53,7 @@ class WsStmt1 {
|
|
|
53
53
|
}
|
|
54
54
|
async setJsonTags(tags) {
|
|
55
55
|
let queryMsg = {
|
|
56
|
-
action:
|
|
56
|
+
action: "set_tags",
|
|
57
57
|
args: {
|
|
58
58
|
req_id: reqid_1.ReqId.getReqID(),
|
|
59
59
|
tags: tags,
|
|
@@ -75,7 +75,7 @@ class WsStmt1 {
|
|
|
75
75
|
}
|
|
76
76
|
let reqId = BigInt(reqid_1.ReqId.getReqID());
|
|
77
77
|
let dataBlock = (0, wsProto_1.binaryBlockEncode)(paramsArray, 1 /* StmtBindType.STMT_TYPE_TAG */, this._stmt_id, reqId, paramsArray.getDataRows());
|
|
78
|
-
return await this.sendBinaryMsg(reqId,
|
|
78
|
+
return await this.sendBinaryMsg(reqId, "set_tags", dataBlock);
|
|
79
79
|
}
|
|
80
80
|
async bind(paramsArray) {
|
|
81
81
|
if (!paramsArray || !this._stmt_id) {
|
|
@@ -87,11 +87,11 @@ class WsStmt1 {
|
|
|
87
87
|
}
|
|
88
88
|
let reqId = BigInt(reqid_1.ReqId.getReqID());
|
|
89
89
|
let dataBlock = (0, wsProto_1.binaryBlockEncode)(paramsArray, 2 /* StmtBindType.STMT_TYPE_BIND */, this._stmt_id, reqId, paramsArray.getDataRows());
|
|
90
|
-
return await this.sendBinaryMsg(reqId,
|
|
90
|
+
return await this.sendBinaryMsg(reqId, "bind", dataBlock);
|
|
91
91
|
}
|
|
92
92
|
async jsonBind(paramArray) {
|
|
93
93
|
let queryMsg = {
|
|
94
|
-
action:
|
|
94
|
+
action: "bind",
|
|
95
95
|
args: {
|
|
96
96
|
req_id: reqid_1.ReqId.getReqID(),
|
|
97
97
|
columns: paramArray,
|
|
@@ -102,7 +102,7 @@ class WsStmt1 {
|
|
|
102
102
|
}
|
|
103
103
|
async batch() {
|
|
104
104
|
let queryMsg = {
|
|
105
|
-
action:
|
|
105
|
+
action: "add_batch",
|
|
106
106
|
args: {
|
|
107
107
|
req_id: reqid_1.ReqId.getReqID(),
|
|
108
108
|
stmt_id: this._stmt_id,
|
|
@@ -112,7 +112,7 @@ class WsStmt1 {
|
|
|
112
112
|
}
|
|
113
113
|
async exec() {
|
|
114
114
|
let queryMsg = {
|
|
115
|
-
action:
|
|
115
|
+
action: "exec",
|
|
116
116
|
args: {
|
|
117
117
|
req_id: reqid_1.ReqId.getReqID(),
|
|
118
118
|
stmt_id: this._stmt_id,
|
|
@@ -128,7 +128,7 @@ class WsStmt1 {
|
|
|
128
128
|
}
|
|
129
129
|
async close() {
|
|
130
130
|
let queryMsg = {
|
|
131
|
-
action:
|
|
131
|
+
action: "close",
|
|
132
132
|
args: {
|
|
133
133
|
req_id: reqid_1.ReqId.getReqID(),
|
|
134
134
|
stmt_id: this._stmt_id,
|
|
@@ -187,7 +187,7 @@ class WsStmt1 {
|
|
|
187
187
|
await this._wsClient.checkVersion();
|
|
188
188
|
}
|
|
189
189
|
let queryMsg = {
|
|
190
|
-
action:
|
|
190
|
+
action: "init",
|
|
191
191
|
args: {
|
|
192
192
|
req_id: reqid_1.ReqId.getReqID(reqId),
|
|
193
193
|
},
|
|
@@ -197,10 +197,10 @@ class WsStmt1 {
|
|
|
197
197
|
}
|
|
198
198
|
catch (e) {
|
|
199
199
|
log_1.default.error(`stmt init filed, ${e.code}, ${e.message}`);
|
|
200
|
-
throw
|
|
200
|
+
throw e;
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
|
-
throw
|
|
203
|
+
throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "stmt connect closed");
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
206
|
exports.WsStmt1 = WsStmt1;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { WsClient } from "../client/wsClient";
|
|
2
2
|
import { StmtBindParams } from "./wsParamsBase";
|
|
3
3
|
import { WsStmt } from "./wsStmt";
|
|
4
|
-
import { WSRows } from
|
|
4
|
+
import { WSRows } from "../sql/wsRows";
|
|
5
5
|
export declare class WsStmt2 implements WsStmt {
|
|
6
6
|
private _wsClient;
|
|
7
7
|
private _stmt_id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsStmt2.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsStmt2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
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"}
|
package/lib/src/stmt/wsStmt2.js
CHANGED
|
@@ -16,7 +16,7 @@ const wsRows_1 = require("../sql/wsRows");
|
|
|
16
16
|
const FieldBindParams_1 = require("./FieldBindParams");
|
|
17
17
|
class WsStmt2 {
|
|
18
18
|
constructor(wsClient, precision) {
|
|
19
|
-
this._precision = constant_1.PrecisionLength[
|
|
19
|
+
this._precision = constant_1.PrecisionLength["ms"];
|
|
20
20
|
this._isInsert = false;
|
|
21
21
|
this._wsClient = wsClient;
|
|
22
22
|
if (precision) {
|
|
@@ -35,7 +35,7 @@ class WsStmt2 {
|
|
|
35
35
|
}
|
|
36
36
|
catch (e) {
|
|
37
37
|
log_1.default.error(`WsStmt init is failed, ${e.code}, ${e.message}`);
|
|
38
|
-
throw
|
|
38
|
+
throw e;
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
async init(reqId) {
|
|
@@ -46,11 +46,11 @@ class WsStmt2 {
|
|
|
46
46
|
await this._wsClient.checkVersion();
|
|
47
47
|
}
|
|
48
48
|
let queryMsg = {
|
|
49
|
-
action:
|
|
49
|
+
action: "stmt2_init",
|
|
50
50
|
args: {
|
|
51
51
|
req_id: reqid_1.ReqId.getReqID(reqId),
|
|
52
52
|
single_stb_insert: true,
|
|
53
|
-
single_table_bind_once: true
|
|
53
|
+
single_table_bind_once: true,
|
|
54
54
|
},
|
|
55
55
|
};
|
|
56
56
|
await this.execute(queryMsg);
|
|
@@ -58,17 +58,17 @@ class WsStmt2 {
|
|
|
58
58
|
}
|
|
59
59
|
catch (e) {
|
|
60
60
|
log_1.default.error(`stmt init filed, ${e.code}, ${e.message}`);
|
|
61
|
-
throw
|
|
61
|
+
throw e;
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
throw
|
|
64
|
+
throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "stmt connect closed");
|
|
65
65
|
}
|
|
66
66
|
getStmtId() {
|
|
67
67
|
return this._stmt_id;
|
|
68
68
|
}
|
|
69
69
|
async prepare(sql) {
|
|
70
70
|
let queryMsg = {
|
|
71
|
-
action:
|
|
71
|
+
action: "stmt2_prepare",
|
|
72
72
|
args: {
|
|
73
73
|
req_id: reqid_1.ReqId.getReqID(),
|
|
74
74
|
sql: sql,
|
|
@@ -78,7 +78,9 @@ class WsStmt2 {
|
|
|
78
78
|
};
|
|
79
79
|
let resp = await this.execute(queryMsg);
|
|
80
80
|
if (this._isInsert && this.fields) {
|
|
81
|
-
this._precision = this.fields[0].precision
|
|
81
|
+
this._precision = this.fields[0].precision
|
|
82
|
+
? this.fields[0].precision
|
|
83
|
+
: 0;
|
|
82
84
|
this._toBeBindColCount = 0;
|
|
83
85
|
this._toBeBindTagCount = 0;
|
|
84
86
|
this.fields?.forEach((field, index) => {
|
|
@@ -105,7 +107,7 @@ class WsStmt2 {
|
|
|
105
107
|
}
|
|
106
108
|
async setTableName(tableName) {
|
|
107
109
|
if (!tableName || tableName.length === 0) {
|
|
108
|
-
throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS,
|
|
110
|
+
throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Table name cannot be empty");
|
|
109
111
|
}
|
|
110
112
|
let tableInfo = this._stmtTableInfo.get(tableName);
|
|
111
113
|
if (!tableInfo) {
|
|
@@ -142,7 +144,9 @@ class WsStmt2 {
|
|
|
142
144
|
if (!paramsArray || !this._stmt_id || !paramsArray._fieldParams) {
|
|
143
145
|
throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Bind paramArray is invalid!");
|
|
144
146
|
}
|
|
145
|
-
if (this._isInsert &&
|
|
147
|
+
if (this._isInsert &&
|
|
148
|
+
this.fields &&
|
|
149
|
+
paramsArray.getBindCount() == this.fields.length) {
|
|
146
150
|
const tableNameIndex = this._toBeBindTableNameIndex;
|
|
147
151
|
if (tableNameIndex === null || tableNameIndex === undefined) {
|
|
148
152
|
throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "Table name index is null or undefined!");
|
|
@@ -189,9 +193,9 @@ class WsStmt2 {
|
|
|
189
193
|
}
|
|
190
194
|
let reqId = BigInt(reqid_1.ReqId.getReqID());
|
|
191
195
|
let bytes = (0, wsProto_1.stmt2BinaryBlockEncode)(reqId, this._stmtTableInfoList, this._stmt_id, this._toBeBindTableNameIndex, this._toBeBindTagCount, this._toBeBindColCount);
|
|
192
|
-
await this.sendBinaryMsg(reqId,
|
|
196
|
+
await this.sendBinaryMsg(reqId, "stmt2_bind", new Uint8Array(bytes));
|
|
193
197
|
let execMsg = {
|
|
194
|
-
action:
|
|
198
|
+
action: "stmt2_exec",
|
|
195
199
|
args: {
|
|
196
200
|
req_id: reqid_1.ReqId.getReqID(),
|
|
197
201
|
stmt_id: this._stmt_id,
|
|
@@ -210,7 +214,7 @@ class WsStmt2 {
|
|
|
210
214
|
}
|
|
211
215
|
async resultSet() {
|
|
212
216
|
let execMsg = {
|
|
213
|
-
action:
|
|
217
|
+
action: "stmt2_result",
|
|
214
218
|
args: {
|
|
215
219
|
req_id: reqid_1.ReqId.getReqID(),
|
|
216
220
|
stmt_id: this._stmt_id,
|
|
@@ -224,7 +228,7 @@ class WsStmt2 {
|
|
|
224
228
|
}
|
|
225
229
|
async close() {
|
|
226
230
|
let queryMsg = {
|
|
227
|
-
action:
|
|
231
|
+
action: "stmt2_close",
|
|
228
232
|
args: {
|
|
229
233
|
req_id: reqid_1.ReqId.getReqID(),
|
|
230
234
|
stmt_id: this._stmt_id,
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/tmq/config.ts"],"names":[],"mappings":"AAEA,qBAAa,SAAS;IAElB,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,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;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/tmq/config.ts"],"names":[],"mappings":"AAEA,qBAAa,SAAS;IAElB,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,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;CAqDzC"}
|
package/lib/src/tmq/config.js
CHANGED
|
@@ -1 +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,
|
|
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,CACf;IAElC;;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;CACxE;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,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;;CAItB;AAED,qBAAa,gBAAgB;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;;CAUjB"}
|
package/lib/src/tmq/constant.js
CHANGED
|
@@ -4,87 +4,87 @@ exports.TMQRawDataSchema = exports.TMQBlockInfo = exports.TMQMessageType = expor
|
|
|
4
4
|
class TMQConstants {
|
|
5
5
|
}
|
|
6
6
|
exports.TMQConstants = TMQConstants;
|
|
7
|
-
TMQConstants.GROUP_ID =
|
|
8
|
-
TMQConstants.CLIENT_ID =
|
|
7
|
+
TMQConstants.GROUP_ID = "group.id";
|
|
8
|
+
TMQConstants.CLIENT_ID = "client.id";
|
|
9
9
|
/**
|
|
10
10
|
* auto commit default is true then the commitCallback function will be called after 5 seconds
|
|
11
11
|
*/
|
|
12
|
-
TMQConstants.ENABLE_AUTO_COMMIT =
|
|
12
|
+
TMQConstants.ENABLE_AUTO_COMMIT = "enable.auto.commit";
|
|
13
13
|
/**
|
|
14
14
|
* commit interval. unit milliseconds
|
|
15
15
|
*/
|
|
16
|
-
TMQConstants.AUTO_COMMIT_INTERVAL_MS =
|
|
16
|
+
TMQConstants.AUTO_COMMIT_INTERVAL_MS = "auto.commit.interval.ms";
|
|
17
17
|
/**
|
|
18
18
|
* only valid in first group id create.
|
|
19
19
|
*/
|
|
20
|
-
TMQConstants.AUTO_OFFSET_RESET =
|
|
20
|
+
TMQConstants.AUTO_OFFSET_RESET = "auto.offset.reset";
|
|
21
21
|
/**
|
|
22
22
|
* whether poll result include table name. suggest always true
|
|
23
23
|
*/
|
|
24
|
-
TMQConstants.MSG_WITH_TABLE_NAME =
|
|
24
|
+
TMQConstants.MSG_WITH_TABLE_NAME = "msg.with.table.name";
|
|
25
25
|
/**
|
|
26
26
|
* indicate host and port of connection
|
|
27
27
|
*/
|
|
28
|
-
TMQConstants.BOOTSTRAP_SERVERS =
|
|
28
|
+
TMQConstants.BOOTSTRAP_SERVERS = "bootstrap.servers";
|
|
29
29
|
/**
|
|
30
30
|
* deserializer Bean
|
|
31
31
|
*/
|
|
32
|
-
TMQConstants.VALUE_DESERIALIZER =
|
|
32
|
+
TMQConstants.VALUE_DESERIALIZER = "value.deserializer";
|
|
33
33
|
/**
|
|
34
34
|
* encode for deserializer String value
|
|
35
35
|
*/
|
|
36
|
-
TMQConstants.VALUE_DESERIALIZER_ENCODING =
|
|
36
|
+
TMQConstants.VALUE_DESERIALIZER_ENCODING = "value.deserializer.encoding";
|
|
37
37
|
/**
|
|
38
38
|
* connection ip
|
|
39
39
|
*/
|
|
40
|
-
TMQConstants.CONNECT_IP =
|
|
40
|
+
TMQConstants.CONNECT_IP = "td.connect.ip";
|
|
41
41
|
/**
|
|
42
42
|
* connection port
|
|
43
43
|
*/
|
|
44
|
-
TMQConstants.CONNECT_PORT =
|
|
44
|
+
TMQConstants.CONNECT_PORT = "td.connect.port";
|
|
45
45
|
/**
|
|
46
46
|
* connection username
|
|
47
47
|
*/
|
|
48
|
-
TMQConstants.CONNECT_USER =
|
|
48
|
+
TMQConstants.CONNECT_USER = "td.connect.user";
|
|
49
49
|
/**
|
|
50
50
|
* connection password
|
|
51
51
|
*/
|
|
52
|
-
TMQConstants.CONNECT_PASS =
|
|
52
|
+
TMQConstants.CONNECT_PASS = "td.connect.pass";
|
|
53
53
|
/**
|
|
54
54
|
* connect type websocket or jni, default is jni
|
|
55
55
|
*/
|
|
56
|
-
TMQConstants.CONNECT_TYPE =
|
|
56
|
+
TMQConstants.CONNECT_TYPE = "td.connect.type";
|
|
57
57
|
/**
|
|
58
58
|
* Key used to retrieve the token value from the properties instance passed to
|
|
59
59
|
* the driver.
|
|
60
60
|
* Just for Cloud Service
|
|
61
61
|
*/
|
|
62
|
-
TMQConstants.WS_URL =
|
|
62
|
+
TMQConstants.WS_URL = "ws.url";
|
|
63
63
|
/**
|
|
64
64
|
* the timeout in milliseconds until a connection is established.
|
|
65
65
|
* zero is interpreted as an infinite timeout.
|
|
66
66
|
* only valid in websocket
|
|
67
67
|
*/
|
|
68
|
-
TMQConstants.CONNECT_TIMEOUT =
|
|
68
|
+
TMQConstants.CONNECT_TIMEOUT = "httpConnectTimeout";
|
|
69
69
|
/**
|
|
70
70
|
* message receive from server timeout. ms.
|
|
71
71
|
* only valid in websocket
|
|
72
72
|
*/
|
|
73
|
-
TMQConstants.CONNECT_MESSAGE_TIMEOUT =
|
|
73
|
+
TMQConstants.CONNECT_MESSAGE_TIMEOUT = "messageWaitTimeout";
|
|
74
74
|
class TMQMessageType {
|
|
75
75
|
}
|
|
76
76
|
exports.TMQMessageType = TMQMessageType;
|
|
77
|
-
TMQMessageType.Subscribe =
|
|
78
|
-
TMQMessageType.Poll =
|
|
79
|
-
TMQMessageType.FetchRaw =
|
|
80
|
-
TMQMessageType.FetchJsonMeta =
|
|
81
|
-
TMQMessageType.Commit =
|
|
82
|
-
TMQMessageType.Unsubscribe =
|
|
83
|
-
TMQMessageType.GetTopicAssignment =
|
|
84
|
-
TMQMessageType.Seek =
|
|
85
|
-
TMQMessageType.CommitOffset =
|
|
86
|
-
TMQMessageType.Committed =
|
|
87
|
-
TMQMessageType.Position =
|
|
77
|
+
TMQMessageType.Subscribe = "subscribe";
|
|
78
|
+
TMQMessageType.Poll = "poll";
|
|
79
|
+
TMQMessageType.FetchRaw = "fetch_raw";
|
|
80
|
+
TMQMessageType.FetchJsonMeta = "fetch_json_meta";
|
|
81
|
+
TMQMessageType.Commit = "commit";
|
|
82
|
+
TMQMessageType.Unsubscribe = "unsubscribe";
|
|
83
|
+
TMQMessageType.GetTopicAssignment = "assignment";
|
|
84
|
+
TMQMessageType.Seek = "seek";
|
|
85
|
+
TMQMessageType.CommitOffset = "commit_offset";
|
|
86
|
+
TMQMessageType.Committed = "committed";
|
|
87
|
+
TMQMessageType.Position = "position";
|
|
88
88
|
TMQMessageType.ListTopics = "list_topics";
|
|
89
89
|
TMQMessageType.ResDataType = 1;
|
|
90
90
|
class TMQBlockInfo {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmqResponse.d.ts","sourceRoot":"","sources":["../../../src/tmq/tmqResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"tmqResponse.d.ts","sourceRoot":"","sources":["../../../src/tmq/tmqResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,7 @@ class WSTmqFetchBlockInfo {
|
|
|
86
86
|
case 3:
|
|
87
87
|
return 16;
|
|
88
88
|
default:
|
|
89
|
-
throw
|
|
89
|
+
throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_FETCH_MESSAGE_DATA, `FetchBlockRawResp getTypeSkip error, type: ${v}`);
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
parseBlockInfos(dataView) {
|
|
@@ -109,9 +109,14 @@ class WSTmqFetchBlockInfo {
|
|
|
109
109
|
dataBuffer = this.parseSchemaInfo(dataView, offset);
|
|
110
110
|
rows += this.parseTmqBlock(dataView, 1);
|
|
111
111
|
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
112
|
+
log_1.default.info("parseBlockInfos blockNum=" +
|
|
113
|
+
blockNum +
|
|
114
|
+
", withTableName=" +
|
|
115
|
+
this.withTableName +
|
|
116
|
+
", withSchema=" +
|
|
117
|
+
this.withSchema +
|
|
118
|
+
", rows=" +
|
|
119
|
+
rows);
|
|
115
120
|
return rows;
|
|
116
121
|
}
|
|
117
122
|
parseSchemaInfo(dataBuffer, offset) {
|
|
@@ -142,7 +147,7 @@ class WSTmqFetchBlockInfo {
|
|
|
142
147
|
this.taosResult.setMeta({
|
|
143
148
|
name: schema.name,
|
|
144
149
|
type: schema.colType,
|
|
145
|
-
length: Number(schema.bytes)
|
|
150
|
+
length: Number(schema.bytes),
|
|
146
151
|
});
|
|
147
152
|
this.schema.push(schema);
|
|
148
153
|
}
|
|
@@ -177,7 +182,11 @@ class WSTmqFetchBlockInfo {
|
|
|
177
182
|
multiplier *= 128;
|
|
178
183
|
count++;
|
|
179
184
|
}
|
|
180
|
-
return [
|
|
185
|
+
return [
|
|
186
|
+
value,
|
|
187
|
+
new DataView(dataView.buffer, dataView.byteOffset + count + 1 + offset),
|
|
188
|
+
count + 1,
|
|
189
|
+
];
|
|
181
190
|
}
|
|
182
191
|
parseTmqBlock(dataView, startOffset) {
|
|
183
192
|
// let dataView = new DataView(dataBuffer)
|
|
@@ -201,9 +210,9 @@ class WSTmqFetchBlockInfo {
|
|
|
201
210
|
bufferOffset += this.schema.length * 4;
|
|
202
211
|
for (let i = 0; i < this.schema.length; i++) {
|
|
203
212
|
let data = [];
|
|
204
|
-
//get type code
|
|
213
|
+
//get type code
|
|
205
214
|
let isVarType = (0, taosResult_1._isVarType)(this.schema[i].colType);
|
|
206
|
-
//fixed length type
|
|
215
|
+
//fixed length type
|
|
207
216
|
if (isVarType == constant_1.ColumnsBlockType.SOLID) {
|
|
208
217
|
// let bitMapArr = dataBuffer.slice(bufferOffset, bufferOffset + bitMapOffset);
|
|
209
218
|
let bitMapArr = new Uint8Array(dataView.buffer, dataView.byteOffset + bufferOffset, bitMapOffset);
|
|
@@ -212,7 +221,7 @@ class WSTmqFetchBlockInfo {
|
|
|
212
221
|
data = (0, taosResult_1.readSolidDataToArray)(dataView, bufferOffset, rows, this.schema[i].colType, bitMapArr, startOffset, i);
|
|
213
222
|
}
|
|
214
223
|
else {
|
|
215
|
-
//Variable length type
|
|
224
|
+
//Variable length type
|
|
216
225
|
let start = bufferOffset;
|
|
217
226
|
let offsets = [];
|
|
218
227
|
for (let i = 0; i < rows; i++, start += constant_1.TDengineTypeLength[constant_1.TDengineTypeCode.INT]) {
|
|
@@ -220,18 +229,19 @@ class WSTmqFetchBlockInfo {
|
|
|
220
229
|
offsets.push(dataView.getInt32(start, true));
|
|
221
230
|
}
|
|
222
231
|
for (let i = 0; i < rows; i++) {
|
|
223
|
-
let value =
|
|
232
|
+
let value = "";
|
|
224
233
|
if (-1 == offsets[i]) {
|
|
225
234
|
value = null;
|
|
226
235
|
}
|
|
227
236
|
else {
|
|
228
237
|
let header = start + offsets[i];
|
|
229
|
-
let dataLength = dataView.getInt16(header, true) &
|
|
238
|
+
let dataLength = dataView.getInt16(header, true) & 0xffff;
|
|
230
239
|
if (isVarType == constant_1.ColumnsBlockType.VARCHAR) {
|
|
231
240
|
//decode var char
|
|
232
241
|
value = (0, taosResult_1.readVarchar)(dataView.buffer, dataView.byteOffset + header + 2, dataLength, this.textDecoder);
|
|
233
242
|
}
|
|
234
|
-
else if (isVarType == constant_1.ColumnsBlockType.GEOMETRY ||
|
|
243
|
+
else if (isVarType == constant_1.ColumnsBlockType.GEOMETRY ||
|
|
244
|
+
isVarType == constant_1.ColumnsBlockType.VARBINARY) {
|
|
235
245
|
//decode binary
|
|
236
246
|
value = (0, taosResult_1.readBinary)(dataView.buffer, dataView.byteOffset + header + 2, dataLength);
|
|
237
247
|
}
|
|
@@ -294,11 +304,13 @@ class PartitionsResp {
|
|
|
294
304
|
this.req_id = resp.msg.req_id;
|
|
295
305
|
this.action = resp.msg.action;
|
|
296
306
|
this.totalTime = resp.totalTime;
|
|
297
|
-
this.positions = resp.msg.position
|
|
307
|
+
this.positions = resp.msg.position
|
|
308
|
+
? resp.msg.position.map((pos) => BigInt(pos))
|
|
309
|
+
: [];
|
|
298
310
|
}
|
|
299
311
|
setTopicPartitions(topicPartitions) {
|
|
300
312
|
if (topicPartitions.length != this.positions.length) {
|
|
301
|
-
throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_PARTITIONS_TOPIC_VGROUP_LENGTH_NOT_EQUAL,
|
|
313
|
+
throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_PARTITIONS_TOPIC_VGROUP_LENGTH_NOT_EQUAL, "TopicPartitions and positions are not equal in length");
|
|
302
314
|
}
|
|
303
315
|
for (let i in this.positions) {
|
|
304
316
|
topicPartitions[i].offset = this.positions[i];
|
|
@@ -310,7 +322,9 @@ exports.PartitionsResp = PartitionsResp;
|
|
|
310
322
|
class CommittedResp extends PartitionsResp {
|
|
311
323
|
constructor(resp) {
|
|
312
324
|
super(resp);
|
|
313
|
-
this.positions = resp.msg.committed
|
|
325
|
+
this.positions = resp.msg.committed
|
|
326
|
+
? resp.msg.committed.map((pos) => BigInt(pos))
|
|
327
|
+
: [];
|
|
314
328
|
}
|
|
315
329
|
}
|
|
316
330
|
exports.CommittedResp = CommittedResp;
|
|
@@ -320,7 +334,7 @@ class TopicPartition {
|
|
|
320
334
|
this.offset = BigInt(msg.offset);
|
|
321
335
|
this.begin = BigInt(msg.begin);
|
|
322
336
|
this.end = BigInt(msg.end);
|
|
323
|
-
this.topic =
|
|
337
|
+
this.topic = "";
|
|
324
338
|
}
|
|
325
339
|
}
|
|
326
340
|
exports.TopicPartition = TopicPartition;
|
package/lib/src/tmq/wsTmq.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { TaosResult } from
|
|
2
|
-
import { TopicPartition } from
|
|
1
|
+
import { TaosResult } from "../common/taosResult";
|
|
2
|
+
import { TopicPartition } from "./tmqResponse";
|
|
3
3
|
export declare class WsConsumer {
|
|
4
4
|
private _wsClient;
|
|
5
5
|
private _wsConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
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,EAIjB,MAAM,eAAe,CAAC;AAKvB,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;IAChC,OAAO;YAgBO,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;IA2B/D,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU1C,IAAI,CACN,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgB7B,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYpD,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK9C,QAAQ;IAYhB,SAAS,CACX,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAgC3B,aAAa,CACf,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,GAClC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAe3B,YAAY,CACd,SAAS,EAAE,cAAc,EACzB,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAoBV,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;IAW3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAId,cAAc;YAgCd,QAAQ;YAsCR,iBAAiB;IAgBzB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBrD,gBAAgB;CAmCjC"}
|