@nsshunt/stsappframework 3.0.143 → 3.0.145
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/dist/authutilsnode.js +23 -10
- package/dist/authutilsnode.js.map +1 -1
- package/dist/influxdb/influxDBManager.js +10 -2
- package/dist/influxdb/influxDBManager.js.map +1 -1
- package/dist/kafka/kafkaconsumer.js +19 -10
- package/dist/kafka/kafkaconsumer.js.map +1 -1
- package/dist/testing/app.js +12 -0
- package/dist/testing/app.js.map +1 -1
- package/package.json +1 -1
- package/src/authutilsnode.ts +23 -10
- package/src/influxdb/influxDBManager.ts +10 -2
- package/src/kafka/kafkaconsumer.ts +19 -10
- package/src/testing/app.ts +12 -0
- package/types/authutilsnode.d.ts +1 -1
- package/types/authutilsnode.d.ts.map +1 -1
- package/types/influxdb/influxDBManager.d.ts.map +1 -1
- package/types/kafka/kafkaconsumer.d.ts.map +1 -1
package/dist/authutilsnode.js
CHANGED
|
@@ -180,29 +180,38 @@ class AuthUtilsNode {
|
|
|
180
180
|
* @param endPoint
|
|
181
181
|
* @returns
|
|
182
182
|
*/
|
|
183
|
-
GetAPITokenFromAuthServerUsingScope = async (clientId, authClientSecret, scope, endPoint) => {
|
|
183
|
+
GetAPITokenFromAuthServerUsingScope = async (clientId, authClientSecret, scope, endPoint, errorCb) => {
|
|
184
184
|
try {
|
|
185
185
|
const scopes = scope.split(' ');
|
|
186
186
|
let origin = null;
|
|
187
|
-
|
|
187
|
+
let error = null;
|
|
188
|
+
for (let i = 0; i < scopes.length; i++) {
|
|
189
|
+
const s = scopes[i];
|
|
188
190
|
if (!origin) {
|
|
189
191
|
origin = this.ExtractOrigin(s);
|
|
190
192
|
if (!origin) {
|
|
191
|
-
|
|
193
|
+
error = new Error(`Scope: [${scope}] not in required format. Must use (space seperated) api://<client id>[/<resource>.<permission>].`);
|
|
194
|
+
break;
|
|
192
195
|
}
|
|
193
196
|
}
|
|
194
197
|
else {
|
|
195
198
|
const nextOrigin = this.ExtractOrigin(s);
|
|
196
199
|
if (!nextOrigin) {
|
|
197
|
-
|
|
200
|
+
error = new Error(`Scope: [${scope}] not in required format. Must use (space seperated) api://<client id>[/<resource>.<permission>].`);
|
|
201
|
+
break;
|
|
198
202
|
}
|
|
199
203
|
else {
|
|
200
204
|
if (origin.localeCompare(nextOrigin) !== 0) {
|
|
201
|
-
|
|
205
|
+
error = new Error(`Scope: [${scope}] not all from the same client API. All scopes must come from the same client API.`);
|
|
206
|
+
break;
|
|
202
207
|
}
|
|
203
208
|
}
|
|
204
209
|
}
|
|
205
|
-
}
|
|
210
|
+
}
|
|
211
|
+
if (error) {
|
|
212
|
+
errorCb(error);
|
|
213
|
+
return "";
|
|
214
|
+
}
|
|
206
215
|
const headers = { 'Content-Type': 'application/json' };
|
|
207
216
|
const payload = {
|
|
208
217
|
client_id: clientId, // The service calling this method
|
|
@@ -232,7 +241,8 @@ class AuthUtilsNode {
|
|
|
232
241
|
else {
|
|
233
242
|
const msg = chalk_1.default.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`);
|
|
234
243
|
this.#debug(msg);
|
|
235
|
-
|
|
244
|
+
errorCb(new Error(msg));
|
|
245
|
+
return "";
|
|
236
246
|
}
|
|
237
247
|
if (retVal.data) {
|
|
238
248
|
if (retVal.data.access_token) {
|
|
@@ -241,13 +251,15 @@ class AuthUtilsNode {
|
|
|
241
251
|
else {
|
|
242
252
|
const msg = chalk_1.default.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data.access_token)`);
|
|
243
253
|
this.#debug(msg);
|
|
244
|
-
|
|
254
|
+
errorCb(new Error(msg));
|
|
255
|
+
return "";
|
|
245
256
|
}
|
|
246
257
|
}
|
|
247
258
|
else {
|
|
248
259
|
const msg = chalk_1.default.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data)`);
|
|
249
260
|
this.#debug(msg);
|
|
250
|
-
|
|
261
|
+
errorCb(new Error(msg));
|
|
262
|
+
return "";
|
|
251
263
|
}
|
|
252
264
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
253
265
|
}
|
|
@@ -256,7 +268,8 @@ class AuthUtilsNode {
|
|
|
256
268
|
if (error.response && error.response.data) {
|
|
257
269
|
this.#debug(chalk_1.default.red(`Details: [${JSON.stringify(error.response.data)}]`));
|
|
258
270
|
}
|
|
259
|
-
|
|
271
|
+
errorCb(error);
|
|
272
|
+
return "";
|
|
260
273
|
}
|
|
261
274
|
};
|
|
262
275
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,11 +28,19 @@ docker run -d -p 8086:8086 --name influxdb \
|
|
|
28
28
|
-e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
|
|
29
29
|
-e DOCKER_INFLUXDB_INIT_ORG=my-org \
|
|
30
30
|
-e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
|
|
31
|
-
-e DOCKER_INFLUXDB_INIT_RETENTION=
|
|
32
|
-
-e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=
|
|
31
|
+
-e DOCKER_INFLUXDB_INIT_RETENTION=24h \
|
|
32
|
+
-e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sts12345 \
|
|
33
33
|
--restart unless-stopped \
|
|
34
34
|
influxdb:latest
|
|
35
35
|
|
|
36
|
+
DOCKER_INFLUXDB_INIT_MODE: "setup"
|
|
37
|
+
DOCKER_INFLUXDB_INIT_USERNAME: "my-user"
|
|
38
|
+
DOCKER_INFLUXDB_INIT_PASSWORD: "my-password"
|
|
39
|
+
DOCKER_INFLUXDB_INIT_ORG: "my-org"
|
|
40
|
+
DOCKER_INFLUXDB_INIT_BUCKET: "my-bucket"
|
|
41
|
+
DOCKER_INFLUXDB_INIT_RETENTION: "24h"
|
|
42
|
+
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: "sts12345"
|
|
43
|
+
|
|
36
44
|
Then access admin portal via;
|
|
37
45
|
http://192.168.14.92:8086
|
|
38
46
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManager.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,iEAA8G;AAC9G,gEAAgE;AAChE,+BAA+B;AAC/B,+BAA4B;AAE5B,kDAA0B;AAE1B,kDAA6C;AAE7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAG3B,qEAAgE;AAChE,iEAA6D;AAG7D,2EAAwE;AAExE,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAEjD
|
|
1
|
+
{"version":3,"file":"influxDBManager.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,15 @@ class KafkaConsumer {
|
|
|
15
15
|
this.#id = id;
|
|
16
16
|
this.#groupId = groupId;
|
|
17
17
|
this.#kafka = kafka;
|
|
18
|
-
this.#consumer = this.#kafka.consumer({
|
|
18
|
+
this.#consumer = this.#kafka.consumer({
|
|
19
|
+
groupId: this.#groupId,
|
|
20
|
+
retry: {
|
|
21
|
+
restartOnFailure: async (error) => {
|
|
22
|
+
console.error(chalk_1.default.magenta(`${process.pid}:KafkaConsumer:constructor:restartOnFailure(): Error: [${error}]`));
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
});
|
|
19
27
|
}
|
|
20
28
|
get consumer() {
|
|
21
29
|
return this.#consumer;
|
|
@@ -24,8 +32,9 @@ class KafkaConsumer {
|
|
|
24
32
|
return this.#id;
|
|
25
33
|
}
|
|
26
34
|
#RaiseError = (msg, errorCb) => {
|
|
27
|
-
|
|
28
|
-
|
|
35
|
+
const errorMessage = `${process.pid}:KafkaConsumer:${msg}`;
|
|
36
|
+
console.error(chalk_1.default.red(errorMessage));
|
|
37
|
+
errorCb(errorMessage);
|
|
29
38
|
};
|
|
30
39
|
async Connect(errorCb) {
|
|
31
40
|
if (!this.#connected) {
|
|
@@ -34,7 +43,7 @@ class KafkaConsumer {
|
|
|
34
43
|
this.#connected = true;
|
|
35
44
|
}
|
|
36
45
|
catch (error) {
|
|
37
|
-
this.#RaiseError(
|
|
46
|
+
this.#RaiseError(`Connect(): Error: [${error}]`, errorCb);
|
|
38
47
|
}
|
|
39
48
|
}
|
|
40
49
|
}
|
|
@@ -45,7 +54,7 @@ class KafkaConsumer {
|
|
|
45
54
|
this.#connected = false;
|
|
46
55
|
}
|
|
47
56
|
catch (error) {
|
|
48
|
-
this.#RaiseError(
|
|
57
|
+
this.#RaiseError(`Disconnect(): Error: [${error}]`, errorCb);
|
|
49
58
|
}
|
|
50
59
|
}
|
|
51
60
|
}
|
|
@@ -55,12 +64,12 @@ class KafkaConsumer {
|
|
|
55
64
|
await this.#consumer.subscribe({ topics, fromBeginning });
|
|
56
65
|
}
|
|
57
66
|
catch (error) {
|
|
58
|
-
this.#RaiseError(
|
|
67
|
+
this.#RaiseError(`Subscribe(): Error: [${error}]`, errorCb);
|
|
59
68
|
}
|
|
60
69
|
}
|
|
61
70
|
else {
|
|
62
71
|
await this.Connect((error) => {
|
|
63
|
-
this.#RaiseError(
|
|
72
|
+
this.#RaiseError(`Subscribe(): Could not consumer.connect, Error: [${error}]`, errorCb);
|
|
64
73
|
});
|
|
65
74
|
}
|
|
66
75
|
};
|
|
@@ -70,7 +79,7 @@ class KafkaConsumer {
|
|
|
70
79
|
await this.#consumer.stop();
|
|
71
80
|
}
|
|
72
81
|
catch (error) {
|
|
73
|
-
this.#RaiseError(
|
|
82
|
+
this.#RaiseError(`Stop(): Error: [${error}]`, errorCb);
|
|
74
83
|
}
|
|
75
84
|
}
|
|
76
85
|
};
|
|
@@ -98,14 +107,14 @@ class KafkaConsumer {
|
|
|
98
107
|
}
|
|
99
108
|
}
|
|
100
109
|
catch (error) {
|
|
101
|
-
this.#RaiseError(
|
|
110
|
+
this.#RaiseError(`StartConsumingMessages(): Error: [${error}]`, errorCb);
|
|
102
111
|
}
|
|
103
112
|
}
|
|
104
113
|
});
|
|
105
114
|
}
|
|
106
115
|
else {
|
|
107
116
|
await this.Connect((error) => {
|
|
108
|
-
this.#RaiseError(
|
|
117
|
+
this.#RaiseError(`StartConsumingMessages(): Could not consumer.connect, Error: [${error}]`, errorCb);
|
|
109
118
|
});
|
|
110
119
|
}
|
|
111
120
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kafkaconsumer.js","sourceRoot":"","sources":["../../src/kafka/kafkaconsumer.ts"],"names":[],"mappings":";;;;;;AAIA,kDAA0B;AAE1B,MAAa,aAAa;IACtB,GAAG,CAAQ;IACX,QAAQ,CAAQ;IAChB,SAAS,CAAW;IACpB,MAAM,CAAQ;IACd,UAAU,GAAY,KAAK,CAAC;IAE5B,YAAY,KAAY,EAAE,EAAU,EAAE,OAAe;QACjD,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"kafkaconsumer.js","sourceRoot":"","sources":["../../src/kafka/kafkaconsumer.ts"],"names":[],"mappings":"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"}
|
package/dist/testing/app.js
CHANGED
|
@@ -28,6 +28,18 @@ async function testtheerror() {
|
|
|
28
28
|
(async () => {
|
|
29
29
|
testtheerror();
|
|
30
30
|
await Sleep(1000);
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
let array = [ 1,2,3,4,5,6,7,8,9,10];
|
|
34
|
+
array.forEach((v) => {
|
|
35
|
+
console.log(v);
|
|
36
|
+
if (v>5) return;
|
|
37
|
+
});
|
|
38
|
+
for (let i=0; i < array.length; i++) {
|
|
39
|
+
console.log(array[i]);
|
|
40
|
+
if (array[i]>5) break;
|
|
41
|
+
}
|
|
42
|
+
|
|
31
43
|
process.exit(0);
|
|
32
44
|
})();
|
|
33
45
|
*/
|
package/dist/testing/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":";AAAA,wFAAwF,CAAE,UAAU;;;;;AAEpG,2CAAkD;AAClD,4BAAwC;AACxC,iDAA8C;AAE9C,sDAA8B;AAM9B,sDAAwB;AAMxB,0BAA0B;AAC1B,MAAM,GAAG,GAAG,MAAM,CAAA;AAElB,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAExC
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":";AAAA,wFAAwF,CAAE,UAAU;;;;;AAEpG,2CAAkD;AAClD,4BAAwC;AACxC,iDAA8C;AAE9C,sDAA8B;AAM9B,sDAAwB;AAMxB,0BAA0B;AAC1B,MAAM,GAAG,GAAG,MAAM,CAAA;AAElB,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BE;AAEF,SAAS,eAAe;IACpB,IAAI,CAAC;QACD,oDAAoD;QACpD,MAAM,OAAO,GAAG,iBAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAElD,sDAAsD;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAElB,2FAA2F;QAC3F,6CAA6C;QAC7C,8CAA8C;QAE9C,oCAAoC;QACpC;;;;QAIA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;AACL,CAAC;AAED,IAAI,iBAAO,CAAC,SAAS,EAAE,CAAC;IACpB,IAAI,qBAAiB,CAAC,IAAA,gCAAoB,EAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAEnF,WAAW,CAAC;QACR;;;;UAIE;QAEF,eAAe,EAAE,CAAA;QAEjB,0BAA0B;QAE1B,mBAAmB;IAEvB,CAAC,EAAE,IAAI,CAAC,CAAA;AAEZ,CAAC;KAAM,CAAC;IACJ,IAAI,4BAAa,CAAC,IAAA,gCAAoB,EAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AACnF,CAAC"}
|
package/package.json
CHANGED
package/src/authutilsnode.ts
CHANGED
|
@@ -206,27 +206,36 @@ export class AuthUtilsNode
|
|
|
206
206
|
* @param endPoint
|
|
207
207
|
* @returns
|
|
208
208
|
*/
|
|
209
|
-
GetAPITokenFromAuthServerUsingScope = async (clientId: string, authClientSecret: string, scope: string, endPoint
|
|
209
|
+
GetAPITokenFromAuthServerUsingScope = async (clientId: string, authClientSecret: string, scope: string, endPoint: string, errorCb: (error: Error) => void): Promise<string> => {
|
|
210
210
|
try {
|
|
211
211
|
const scopes = scope.split(' ');
|
|
212
212
|
let origin: string | null = null;
|
|
213
|
-
|
|
213
|
+
let error: Error | null = null;
|
|
214
|
+
for (let i=0; i < scopes.length; i++) {
|
|
215
|
+
const s = scopes[i];
|
|
214
216
|
if (!origin) {
|
|
215
217
|
origin = this.ExtractOrigin(s);
|
|
216
218
|
if (!origin) {
|
|
217
|
-
|
|
219
|
+
error = new Error(`Scope: [${scope}] not in required format. Must use (space seperated) api://<client id>[/<resource>.<permission>].`);
|
|
220
|
+
break;
|
|
218
221
|
}
|
|
219
222
|
} else {
|
|
220
223
|
const nextOrigin: string | null = this.ExtractOrigin(s);
|
|
221
224
|
if (!nextOrigin) {
|
|
222
|
-
|
|
225
|
+
error = new Error(`Scope: [${scope}] not in required format. Must use (space seperated) api://<client id>[/<resource>.<permission>].`);
|
|
226
|
+
break;
|
|
223
227
|
} else {
|
|
224
228
|
if (origin.localeCompare(nextOrigin) !== 0) {
|
|
225
|
-
|
|
229
|
+
error = new Error(`Scope: [${scope}] not all from the same client API. All scopes must come from the same client API.`);
|
|
230
|
+
break;
|
|
226
231
|
}
|
|
227
232
|
}
|
|
228
233
|
}
|
|
229
|
-
}
|
|
234
|
+
}
|
|
235
|
+
if (error) {
|
|
236
|
+
errorCb(error);
|
|
237
|
+
return "";
|
|
238
|
+
}
|
|
230
239
|
|
|
231
240
|
const headers = { 'Content-Type': 'application/json'};
|
|
232
241
|
const payload = { //@@ make a type
|
|
@@ -257,7 +266,8 @@ export class AuthUtilsNode
|
|
|
257
266
|
} else {
|
|
258
267
|
const msg = chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`);
|
|
259
268
|
this.#debug(msg);
|
|
260
|
-
|
|
269
|
+
errorCb(new Error(msg));
|
|
270
|
+
return "";
|
|
261
271
|
}
|
|
262
272
|
if (retVal.data) {
|
|
263
273
|
if (retVal.data.access_token) {
|
|
@@ -265,12 +275,14 @@ export class AuthUtilsNode
|
|
|
265
275
|
} else {
|
|
266
276
|
const msg = chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data.access_token)`);
|
|
267
277
|
this.#debug(msg);
|
|
268
|
-
|
|
278
|
+
errorCb(new Error(msg));
|
|
279
|
+
return "";
|
|
269
280
|
}
|
|
270
281
|
} else {
|
|
271
282
|
const msg = chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data)`);
|
|
272
283
|
this.#debug(msg);
|
|
273
|
-
|
|
284
|
+
errorCb(new Error(msg));
|
|
285
|
+
return "";
|
|
274
286
|
}
|
|
275
287
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
276
288
|
} catch (error: any) {
|
|
@@ -278,7 +290,8 @@ export class AuthUtilsNode
|
|
|
278
290
|
if (error.response && error.response.data) {
|
|
279
291
|
this.#debug(chalk.red(`Details: [${JSON.stringify(error.response.data)}]`));
|
|
280
292
|
}
|
|
281
|
-
|
|
293
|
+
errorCb(error);
|
|
294
|
+
return "";
|
|
282
295
|
}
|
|
283
296
|
}
|
|
284
297
|
|
|
@@ -31,11 +31,19 @@ docker run -d -p 8086:8086 --name influxdb \
|
|
|
31
31
|
-e DOCKER_INFLUXDB_INIT_PASSWORD=my-password \
|
|
32
32
|
-e DOCKER_INFLUXDB_INIT_ORG=my-org \
|
|
33
33
|
-e DOCKER_INFLUXDB_INIT_BUCKET=my-bucket \
|
|
34
|
-
-e DOCKER_INFLUXDB_INIT_RETENTION=
|
|
35
|
-
-e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=
|
|
34
|
+
-e DOCKER_INFLUXDB_INIT_RETENTION=24h \
|
|
35
|
+
-e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sts12345 \
|
|
36
36
|
--restart unless-stopped \
|
|
37
37
|
influxdb:latest
|
|
38
38
|
|
|
39
|
+
DOCKER_INFLUXDB_INIT_MODE: "setup"
|
|
40
|
+
DOCKER_INFLUXDB_INIT_USERNAME: "my-user"
|
|
41
|
+
DOCKER_INFLUXDB_INIT_PASSWORD: "my-password"
|
|
42
|
+
DOCKER_INFLUXDB_INIT_ORG: "my-org"
|
|
43
|
+
DOCKER_INFLUXDB_INIT_BUCKET: "my-bucket"
|
|
44
|
+
DOCKER_INFLUXDB_INIT_RETENTION: "24h"
|
|
45
|
+
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: "sts12345"
|
|
46
|
+
|
|
39
47
|
Then access admin portal via;
|
|
40
48
|
http://192.168.14.92:8086
|
|
41
49
|
|
|
@@ -15,7 +15,15 @@ export class KafkaConsumer implements IKafkaConsumer {
|
|
|
15
15
|
this.#id = id;
|
|
16
16
|
this.#groupId = groupId;
|
|
17
17
|
this.#kafka = kafka;
|
|
18
|
-
this.#consumer = this.#kafka.consumer({
|
|
18
|
+
this.#consumer = this.#kafka.consumer({
|
|
19
|
+
groupId: this.#groupId,
|
|
20
|
+
retry: {
|
|
21
|
+
restartOnFailure: async (error: Error): Promise<boolean> => {
|
|
22
|
+
console.error(chalk.magenta(`${process.pid}:KafkaConsumer:constructor:restartOnFailure(): Error: [${error}]`))
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
})
|
|
19
27
|
}
|
|
20
28
|
|
|
21
29
|
get consumer() {
|
|
@@ -27,8 +35,9 @@ export class KafkaConsumer implements IKafkaConsumer {
|
|
|
27
35
|
}
|
|
28
36
|
|
|
29
37
|
#RaiseError = (msg: string, errorCb: (error: any) => void) => {
|
|
30
|
-
|
|
31
|
-
|
|
38
|
+
const errorMessage = `${process.pid}:KafkaConsumer:${msg}`;
|
|
39
|
+
console.error(chalk.red(errorMessage));
|
|
40
|
+
errorCb(errorMessage);
|
|
32
41
|
}
|
|
33
42
|
|
|
34
43
|
async Connect(errorCb: (error: any) => void): Promise<void> {
|
|
@@ -37,7 +46,7 @@ export class KafkaConsumer implements IKafkaConsumer {
|
|
|
37
46
|
await this.#consumer.connect()
|
|
38
47
|
this.#connected = true;
|
|
39
48
|
} catch (error) {
|
|
40
|
-
this.#RaiseError(
|
|
49
|
+
this.#RaiseError(`Connect(): Error: [${error}]`, errorCb);
|
|
41
50
|
}
|
|
42
51
|
}
|
|
43
52
|
}
|
|
@@ -48,7 +57,7 @@ export class KafkaConsumer implements IKafkaConsumer {
|
|
|
48
57
|
await this.#consumer.disconnect()
|
|
49
58
|
this.#connected = false;
|
|
50
59
|
} catch (error) {
|
|
51
|
-
this.#RaiseError(
|
|
60
|
+
this.#RaiseError(`Disconnect(): Error: [${error}]`, errorCb);
|
|
52
61
|
}
|
|
53
62
|
}
|
|
54
63
|
}
|
|
@@ -58,11 +67,11 @@ export class KafkaConsumer implements IKafkaConsumer {
|
|
|
58
67
|
try {
|
|
59
68
|
await this.#consumer.subscribe({ topics, fromBeginning })
|
|
60
69
|
} catch (error) {
|
|
61
|
-
this.#RaiseError(
|
|
70
|
+
this.#RaiseError(`Subscribe(): Error: [${error}]`, errorCb);
|
|
62
71
|
}
|
|
63
72
|
} else {
|
|
64
73
|
await this.Connect((error) => {
|
|
65
|
-
this.#RaiseError(
|
|
74
|
+
this.#RaiseError(`Subscribe(): Could not consumer.connect, Error: [${error}]`, errorCb);
|
|
66
75
|
});
|
|
67
76
|
}
|
|
68
77
|
}
|
|
@@ -72,7 +81,7 @@ export class KafkaConsumer implements IKafkaConsumer {
|
|
|
72
81
|
try {
|
|
73
82
|
await this.#consumer.stop();
|
|
74
83
|
} catch (error) {
|
|
75
|
-
this.#RaiseError(
|
|
84
|
+
this.#RaiseError(`Stop(): Error: [${error}]`, errorCb);
|
|
76
85
|
}
|
|
77
86
|
}
|
|
78
87
|
}
|
|
@@ -97,13 +106,13 @@ export class KafkaConsumer implements IKafkaConsumer {
|
|
|
97
106
|
}
|
|
98
107
|
}
|
|
99
108
|
} catch (error) {
|
|
100
|
-
this.#RaiseError(
|
|
109
|
+
this.#RaiseError(`StartConsumingMessages(): Error: [${error}]`, errorCb);
|
|
101
110
|
}
|
|
102
111
|
}
|
|
103
112
|
})
|
|
104
113
|
} else {
|
|
105
114
|
await this.Connect((error) => {
|
|
106
|
-
this.#RaiseError(
|
|
115
|
+
this.#RaiseError(`StartConsumingMessages(): Could not consumer.connect, Error: [${error}]`, errorCb);
|
|
107
116
|
});
|
|
108
117
|
}
|
|
109
118
|
}
|
package/src/testing/app.ts
CHANGED
|
@@ -37,6 +37,18 @@ async function testtheerror() {
|
|
|
37
37
|
(async () => {
|
|
38
38
|
testtheerror();
|
|
39
39
|
await Sleep(1000);
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
let array = [ 1,2,3,4,5,6,7,8,9,10];
|
|
43
|
+
array.forEach((v) => {
|
|
44
|
+
console.log(v);
|
|
45
|
+
if (v>5) return;
|
|
46
|
+
});
|
|
47
|
+
for (let i=0; i < array.length; i++) {
|
|
48
|
+
console.log(array[i]);
|
|
49
|
+
if (array[i]>5) break;
|
|
50
|
+
}
|
|
51
|
+
|
|
40
52
|
process.exit(0);
|
|
41
53
|
})();
|
|
42
54
|
*/
|
package/types/authutilsnode.d.ts
CHANGED
|
@@ -19,6 +19,6 @@ export declare class AuthUtilsNode {
|
|
|
19
19
|
* @param endPoint
|
|
20
20
|
* @returns
|
|
21
21
|
*/
|
|
22
|
-
GetAPITokenFromAuthServerUsingScope: (clientId: string, authClientSecret: string, scope: string, endPoint
|
|
22
|
+
GetAPITokenFromAuthServerUsingScope: (clientId: string, authClientSecret: string, scope: string, endPoint: string, errorCb: (error: Error) => void) => Promise<string>;
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=authutilsnode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAqBjC,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAsBD,qBAAa,aAAa;;;IA4BtB,8BAA8B,CAAC,OAAO,EAAE,qBAAqB,SAE9B,GAAG,OAAO,GAAG,QAAQ,GAAG;IAqCjD,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAyB3D,eAAe,YAAmB,OAAO,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAgB/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAGnE;IAEF,WAAW,UAAiB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,QAAQ,MAAM,CAAC,CAgCxF;IAGD,aAAa,QAAS,MAAM,mBAG3B;IAED;;;;;;;OAOG;IACH,mCAAmC,aAAoB,MAAM,oBAAoB,MAAM,SAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAqBjC,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAsBD,qBAAa,aAAa;;;IA4BtB,8BAA8B,CAAC,OAAO,EAAE,qBAAqB,SAE9B,GAAG,OAAO,GAAG,QAAQ,GAAG;IAqCjD,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAyB3D,eAAe,YAAmB,OAAO,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAgB/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAGnE;IAEF,WAAW,UAAiB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,QAAQ,MAAM,CAAC,CAgCxF;IAGD,aAAa,QAAS,MAAM,mBAG3B;IAED;;;;;;;OAOG;IACH,mCAAmC,aAAoB,MAAM,oBAAoB,MAAM,SAAS,MAAM,YAAY,MAAM,mBAAmB,KAAK,KAAK,IAAI,KAAG,QAAQ,MAAM,CAAC,CAuF1K;CA4FJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManager.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,QAAQ,EAAgD,MAAM,6BAA6B,CAAA;AAQ9G,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAA2B,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"influxDBManager.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,QAAQ,EAAgD,MAAM,6BAA6B,CAAA;AAQ9G,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAA2B,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAkM7E,qBAAa,eAAe;;;IAyFxB,2BAA2B,CAAC,SAAS,EAAE,MAAM;IAa7C,IAAI,cAAc,IAAI,sBAAsB,CAE3C;IAED,IAAI,YAAY,IAAI,oBAAoB,CAEvC;IAED,KAAK,sBAEJ;IAED,SAAS,sBA2BR;IAQD,sBAAsB,aAAc,GAAG,EAAE,SAUxC;IAGD,kBAAkB,CAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU;IAW9E,IAAI,WAAW,IAAI,QAAQ,CAwG1B;IAIK,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAe/E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kafkaconsumer.d.ts","sourceRoot":"","sources":["../../src/kafka/kafkaconsumer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAIjD,qBAAa,aAAc,YAAW,cAAc;;gBAOpC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"kafkaconsumer.d.ts","sourceRoot":"","sources":["../../src/kafka/kafkaconsumer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAIjD,qBAAa,aAAc,YAAW,cAAc;;gBAOpC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAerD,IAAI,QAAQ,aAEX;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAQK,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrD,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9D,SAAS,WAAiB,MAAM,EAAE,iBAAiB,OAAO,mBAAmB,GAAG,KAAK,IAAI,KAAG,QAAQ,IAAI,CAAC,CAYxG;IAED,IAAI,oBAA0B,GAAG,KAAK,IAAI,KAAG,QAAQ,IAAI,CAAC,CAQzD;IAED,sBAAsB,eAAsB,MAAM,OAAO,MAAM,aAAa,MAAM,SAAS,MAAM,WAAW,QAAQ,GAAG,SAAS,KAAK,IAAI,mBAAmB,GAAG,KAAK,IAAI,KAAG,QAAQ,IAAI,CAAC,CA6BvL;CACJ"}
|