@futdevpro/fsm-dynamo 1.5.35 → 1.5.38
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/_models/control-models/dynamo-error.d.ts +2 -0
- package/lib/_models/control-models/dynamo-error.d.ts.map +1 -1
- package/lib/_models/control-models/dynamo-error.js +28 -7
- package/lib/_models/control-models/dynamo-error.js.map +1 -1
- package/lib/_models/control-models/dynamo-poll.d.ts.map +1 -1
- package/lib/_models/control-models/dynamo-poll.js +57 -28
- package/lib/_models/control-models/dynamo-poll.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +5 -4
- package/package.json +1 -1
- package/src/_models/control-models/dynamo-error.ts +28 -3
- package/src/_models/control-models/dynamo-poll.ts +57 -29
|
@@ -3,6 +3,7 @@ export declare class Dynamo_Error {
|
|
|
3
3
|
handled: boolean;
|
|
4
4
|
status: number;
|
|
5
5
|
errorCode: string;
|
|
6
|
+
errorCodes: string[];
|
|
6
7
|
error: any;
|
|
7
8
|
errors: any[];
|
|
8
9
|
message: string;
|
|
@@ -13,6 +14,7 @@ export declare class Dynamo_Error {
|
|
|
13
14
|
handled?: boolean;
|
|
14
15
|
status?: number;
|
|
15
16
|
errorCode?: string;
|
|
17
|
+
errorCodes?: string[];
|
|
16
18
|
error?: any;
|
|
17
19
|
errors?: any[];
|
|
18
20
|
message?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-error.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-error.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACvB,IAAI,SAAyB;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"dynamo-error.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-error.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACvB,IAAI,SAAyB;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,GAAG,EAAE,CAAM;IAEnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAM;IAExB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAM;gBAG1B,GAAG,CAAC,EAAE;QACJ,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAEtB,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;QAEf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAEpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,cAAc,CAAC,EAAE,OAAO,CAAC;QAEzB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,GAAG,CAAC,EAAE,OAAO,CAAC;KACf;CA8FJ;AA4ID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuOG;AACH,MAAM,WAAW,yBAAyB;CAAG"}
|
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Dynamo_Error = void 0;
|
|
4
4
|
class Dynamo_Error {
|
|
5
5
|
constructor(set) {
|
|
6
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j
|
|
6
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
7
7
|
this.flag = 'DYNAMO ERROR OBJECT';
|
|
8
|
+
this.errorCodes = [];
|
|
8
9
|
this.errors = [];
|
|
9
10
|
this.messages = [];
|
|
10
11
|
this.userMessages = [];
|
|
@@ -12,7 +13,15 @@ class Dynamo_Error {
|
|
|
12
13
|
this.handled = !!set.handled;
|
|
13
14
|
if (set) {
|
|
14
15
|
this.status = (_a = set.status) !== null && _a !== void 0 ? _a : (_b = set === null || set === void 0 ? void 0 : set.error) === null || _b === void 0 ? void 0 : _b.status;
|
|
15
|
-
|
|
16
|
+
if (set.errorCode) {
|
|
17
|
+
this.errorCodes.push(set.errorCode);
|
|
18
|
+
}
|
|
19
|
+
if (set.message) {
|
|
20
|
+
this.messages.push(set.message);
|
|
21
|
+
}
|
|
22
|
+
if (set.userMessage) {
|
|
23
|
+
this.userMessages.push(set.userMessage);
|
|
24
|
+
}
|
|
16
25
|
if (set.error) {
|
|
17
26
|
if (set.error.error) {
|
|
18
27
|
this.errors.push(set.error.error);
|
|
@@ -25,10 +34,21 @@ class Dynamo_Error {
|
|
|
25
34
|
this.errors.push(set.error.errors);
|
|
26
35
|
}
|
|
27
36
|
}
|
|
37
|
+
if (set.error.errorCode) {
|
|
38
|
+
this.errorCodes.push(set.error.errorCode);
|
|
39
|
+
}
|
|
40
|
+
if (set.error.errorCodes) {
|
|
41
|
+
if (Array.isArray(set.error.errorCodes)) {
|
|
42
|
+
this.errorCodes.push(...set.error.errorCodes);
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
this.errorCodes.push(set.error.errorCodes);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
28
48
|
if (set.error.message) {
|
|
29
49
|
this.messages.push(set.error.message);
|
|
30
50
|
}
|
|
31
|
-
if (set.error._message) {
|
|
51
|
+
else if (set.error._message) {
|
|
32
52
|
this.messages.push(set.error._message);
|
|
33
53
|
}
|
|
34
54
|
if (set.error.messages) {
|
|
@@ -58,14 +78,15 @@ class Dynamo_Error {
|
|
|
58
78
|
}
|
|
59
79
|
}
|
|
60
80
|
}
|
|
61
|
-
this.
|
|
62
|
-
this.
|
|
63
|
-
this.
|
|
81
|
+
this.errorCode = (_c = set === null || set === void 0 ? void 0 : set.errorCode) !== null && _c !== void 0 ? _c : this.errorCodes[0];
|
|
82
|
+
this.userMessage = (_d = set === null || set === void 0 ? void 0 : set.userMessage) !== null && _d !== void 0 ? _d : this.userMessages[0];
|
|
83
|
+
this.message = (_e = set === null || set === void 0 ? void 0 : set.message) !== null && _e !== void 0 ? _e : this.messages[0];
|
|
84
|
+
this.error = (_g = (_f = set === null || set === void 0 ? void 0 : set.error) !== null && _f !== void 0 ? _f : this.errors[0]) !== null && _g !== void 0 ? _g : new Error(this.message);
|
|
64
85
|
if (set.addECToUserMsg) {
|
|
65
86
|
this.userMessage += `\nErrorCode: ${this.errorCode}`;
|
|
66
87
|
}
|
|
67
88
|
if (set === null || set === void 0 ? void 0 : set.modestLog) {
|
|
68
|
-
console.error((
|
|
89
|
+
console.error((_j = (_h = this.message) !== null && _h !== void 0 ? _h : this.userMessage) !== null && _j !== void 0 ? _j : this.error);
|
|
69
90
|
}
|
|
70
91
|
if (set === null || set === void 0 ? void 0 : set.log) {
|
|
71
92
|
console.error(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-error.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-error.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"dynamo-error.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-error.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-poll.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-poll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"dynamo-poll.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-poll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,MAAM,CAAC;AAG3C;;;;GAIG;AACH,qBAAa,WAAW,CAAC,CAAC;IACxB,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,IAAI,CAAC,CAAY;IACzB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAU;gBAG3B,GAAG,EAAE;QACH,MAAM,EAAE,CAAC,GAAG,IAAI,OAAA,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;QAChC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;QAC/B,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC;QAE1B,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB;IA0BH,OAAO,CAAC,SAAS;IA2BjB,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI;IAenC,IAAI,IAAI,IAAI;IAKZ,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;CAKrB"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Dynamo_Poll = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const rxjs_1 = require("rxjs");
|
|
6
|
+
const dynamo_error_1 = require("./dynamo-error");
|
|
5
7
|
/**
|
|
6
8
|
* DynamoFSM_Poll is a predefined class is
|
|
7
9
|
* for polling a specific endpoint
|
|
@@ -9,42 +11,69 @@ const rxjs_1 = require("rxjs");
|
|
|
9
11
|
*/
|
|
10
12
|
class Dynamo_Poll {
|
|
11
13
|
constructor(set) {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
try {
|
|
15
|
+
this.pollDo = set.pollDo;
|
|
16
|
+
this.pollWhile = set.pollWhile;
|
|
17
|
+
this.pollEnd = set.pollEnd;
|
|
18
|
+
this.args = set.args;
|
|
19
|
+
this.pollDelay = set.pollDelay ? set.pollDelay : 0;
|
|
20
|
+
if (set.pollPeriod === 0) {
|
|
21
|
+
console.error('DYNAMO ERROR: creating polls with 0ms period is not supported! (it will reset to 1000ms (1s))', new Error());
|
|
22
|
+
}
|
|
23
|
+
this.pollPeriod = set.pollPeriod ? set.pollPeriod : 1000;
|
|
24
|
+
if (this.pollPeriod < 300) {
|
|
25
|
+
console.warn('DYNAMO WARNING: creating polls with less than 300ms period is not recommended!');
|
|
26
|
+
}
|
|
27
|
+
this.stopOnFail = set.stopOnFail;
|
|
28
|
+
this.startPoll(this.args);
|
|
19
29
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
30
|
+
catch (error) {
|
|
31
|
+
throw new dynamo_error_1.Dynamo_Error({
|
|
32
|
+
message: 'Dynamo_Poll construcion failed.'
|
|
33
|
+
});
|
|
23
34
|
}
|
|
24
|
-
this.stopOnFail = set.stopOnFail;
|
|
25
|
-
this.startPoll(this.args);
|
|
26
35
|
}
|
|
27
36
|
startPoll(...args) {
|
|
28
|
-
|
|
29
|
-
this.
|
|
30
|
-
|
|
31
|
-
this.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
try {
|
|
38
|
+
this.poll = rxjs_1.timer(this.pollDelay, this.pollPeriod).subscribe(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
yield this.pollDo(...args).then((res) => {
|
|
40
|
+
if (!this.pollWhile(res)) {
|
|
41
|
+
this.end(res);
|
|
42
|
+
}
|
|
43
|
+
}).catch((error) => {
|
|
44
|
+
if (this.stopOnFail) {
|
|
45
|
+
this.stop();
|
|
46
|
+
}
|
|
47
|
+
throw new dynamo_error_1.Dynamo_Error({
|
|
48
|
+
message: 'DYNAMO ERROR: \nDynamoPoll: pollDo was UNSUCCESSFUL',
|
|
49
|
+
error: new Error(error),
|
|
50
|
+
errors: [error]
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
}));
|
|
54
|
+
this.running = true;
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
throw new dynamo_error_1.Dynamo_Error({
|
|
58
|
+
message: 'DYNAMO ERROR: \nDynamoPoll: startPoll was UNSUCCESSFUL',
|
|
59
|
+
error: error,
|
|
38
60
|
});
|
|
39
|
-
}
|
|
40
|
-
this.running = true;
|
|
61
|
+
}
|
|
41
62
|
}
|
|
42
63
|
restartPoll(args) {
|
|
43
|
-
|
|
44
|
-
|
|
64
|
+
try {
|
|
65
|
+
if (args) {
|
|
66
|
+
this.startPoll(args);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
this.startPoll(this.args);
|
|
70
|
+
}
|
|
45
71
|
}
|
|
46
|
-
|
|
47
|
-
|
|
72
|
+
catch (error) {
|
|
73
|
+
throw new dynamo_error_1.Dynamo_Error({
|
|
74
|
+
message: 'DYNAMO ERROR: \nDynamoPoll: restartPoll was UNSUCCESSFUL',
|
|
75
|
+
error: error,
|
|
76
|
+
});
|
|
48
77
|
}
|
|
49
78
|
}
|
|
50
79
|
stop() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-poll.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-poll.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dynamo-poll.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-poll.ts"],"names":[],"mappings":"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"}
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -202,8 +202,8 @@
|
|
|
202
202
|
"affectsGlobalScope": false
|
|
203
203
|
},
|
|
204
204
|
"../src/_models/control-models/dynamo-error.ts": {
|
|
205
|
-
"version": "
|
|
206
|
-
"signature": "
|
|
205
|
+
"version": "9120d4f3191f5b038eb9e03189e1224d4f5bfea042acae462d6f3e529f968222",
|
|
206
|
+
"signature": "c9452272d22647bca29dc5a2c731717d9c93f39202432a550ca4566a860f3356",
|
|
207
207
|
"affectsGlobalScope": false
|
|
208
208
|
},
|
|
209
209
|
"../src/_models/control-models/location-coordinates.ts": {
|
|
@@ -292,7 +292,7 @@
|
|
|
292
292
|
"affectsGlobalScope": false
|
|
293
293
|
},
|
|
294
294
|
"../src/_models/control-models/dynamo-poll.ts": {
|
|
295
|
-
"version": "
|
|
295
|
+
"version": "a4ca515258e44d24501c21614b7ef3b9d7fdf59a1f9daa8dfa17fca236b5dc02",
|
|
296
296
|
"signature": "894e4fd6a899a6372b36fb53affad0df7aec42e11a1c1f0927f6f98be2ee0435",
|
|
297
297
|
"affectsGlobalScope": false
|
|
298
298
|
},
|
|
@@ -1568,7 +1568,8 @@
|
|
|
1568
1568
|
"../node_modules/@types/node/ts3.2/fs.d.ts",
|
|
1569
1569
|
"../node_modules/@types/node/ts3.2/process.d.ts",
|
|
1570
1570
|
"../node_modules/@types/node/ts3.2/util.d.ts",
|
|
1571
|
-
"../node_modules/@types/node/util.d.ts"
|
|
1571
|
+
"../node_modules/@types/node/util.d.ts",
|
|
1572
|
+
"../src/_models/control-models/dynamo-error.ts"
|
|
1572
1573
|
],
|
|
1573
1574
|
"../src/_models/control-models/dynamo-usage-action.ts": [
|
|
1574
1575
|
"../node_modules/@types/node/fs.d.ts",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/fsm-dynamo",
|
|
3
|
-
"version": "01.05.
|
|
3
|
+
"version": "01.05.38",
|
|
4
4
|
"description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Ltd.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "echo \"Error: no test specified\" && exit 1",
|
|
@@ -4,7 +4,9 @@ export class Dynamo_Error {
|
|
|
4
4
|
flag = 'DYNAMO ERROR OBJECT';
|
|
5
5
|
handled: boolean;
|
|
6
6
|
status: number;
|
|
7
|
+
|
|
7
8
|
errorCode: string;
|
|
9
|
+
errorCodes: string[] = [];
|
|
8
10
|
|
|
9
11
|
error: any;
|
|
10
12
|
errors: any[] = [];
|
|
@@ -19,7 +21,9 @@ export class Dynamo_Error {
|
|
|
19
21
|
set?: {
|
|
20
22
|
handled?: boolean;
|
|
21
23
|
status?: number,
|
|
24
|
+
|
|
22
25
|
errorCode?: string;
|
|
26
|
+
errorCodes?: string[];
|
|
23
27
|
|
|
24
28
|
error?: any,
|
|
25
29
|
errors?: any[],
|
|
@@ -40,12 +44,22 @@ export class Dynamo_Error {
|
|
|
40
44
|
|
|
41
45
|
if (set) {
|
|
42
46
|
this.status = set.status ?? set?.error?.status;
|
|
43
|
-
|
|
47
|
+
|
|
48
|
+
if (set.errorCode) {
|
|
49
|
+
this.errorCodes.push(set.errorCode);
|
|
50
|
+
}
|
|
51
|
+
if (set.message) {
|
|
52
|
+
this.messages.push(set.message);
|
|
53
|
+
}
|
|
54
|
+
if (set.userMessage) {
|
|
55
|
+
this.userMessages.push(set.userMessage);
|
|
56
|
+
}
|
|
44
57
|
|
|
45
58
|
if (set.error) {
|
|
46
59
|
if (set.error.error) {
|
|
47
60
|
this.errors.push(set.error.error);
|
|
48
61
|
}
|
|
62
|
+
|
|
49
63
|
if (set.error.errors) {
|
|
50
64
|
if (Array.isArray(set.error.errors)) {
|
|
51
65
|
this.errors.push(...set.error.errors);
|
|
@@ -54,10 +68,20 @@ export class Dynamo_Error {
|
|
|
54
68
|
}
|
|
55
69
|
}
|
|
56
70
|
|
|
71
|
+
if (set.error.errorCode) {
|
|
72
|
+
this.errorCodes.push(set.error.errorCode);
|
|
73
|
+
}
|
|
74
|
+
if (set.error.errorCodes) {
|
|
75
|
+
if (Array.isArray(set.error.errorCodes)) {
|
|
76
|
+
this.errorCodes.push(...set.error.errorCodes);
|
|
77
|
+
} else {
|
|
78
|
+
this.errorCodes.push(set.error.errorCodes);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
57
82
|
if (set.error.message) {
|
|
58
83
|
this.messages.push(set.error.message);
|
|
59
|
-
}
|
|
60
|
-
if (set.error._message) {
|
|
84
|
+
} else if (set.error._message) {
|
|
61
85
|
this.messages.push(set.error._message);
|
|
62
86
|
}
|
|
63
87
|
if (set.error.messages) {
|
|
@@ -87,6 +111,7 @@ export class Dynamo_Error {
|
|
|
87
111
|
}
|
|
88
112
|
}
|
|
89
113
|
|
|
114
|
+
this.errorCode = set?.errorCode ?? this.errorCodes[0];
|
|
90
115
|
this.userMessage = set?.userMessage ?? this.userMessages[0];
|
|
91
116
|
this.message = set?.message ?? this.messages[0];
|
|
92
117
|
this.error = set?.error ?? this.errors[0] ?? new Error(this.message);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Subscription, timer } from 'rxjs';
|
|
2
|
+
import { Dynamo_Error } from './dynamo-error';
|
|
2
3
|
|
|
3
4
|
/**
|
|
4
5
|
* DynamoFSM_Poll is a predefined class is
|
|
@@ -21,49 +22,76 @@ export class Dynamo_Poll<T> {
|
|
|
21
22
|
pollDo: (...args) => Promise<T>,
|
|
22
23
|
pollWhile: (res: T) => boolean,
|
|
23
24
|
pollEnd: (res: T) => void,
|
|
25
|
+
|
|
24
26
|
args?: unknown[],
|
|
25
27
|
pollDelay?: number,
|
|
26
28
|
pollPeriod?: number,
|
|
27
29
|
stopOnFail?: boolean,
|
|
28
30
|
}
|
|
29
31
|
) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
32
|
+
try {
|
|
33
|
+
this.pollDo = set.pollDo;
|
|
34
|
+
this.pollWhile = set.pollWhile;
|
|
35
|
+
this.pollEnd = set.pollEnd;
|
|
36
|
+
|
|
37
|
+
this.args = set.args;
|
|
38
|
+
this.pollDelay = set.pollDelay ? set.pollDelay : 0;
|
|
39
|
+
|
|
40
|
+
if (set.pollPeriod === 0) {
|
|
41
|
+
console.error('DYNAMO ERROR: creating polls with 0ms period is not supported! (it will reset to 1000ms (1s))', new Error());
|
|
42
|
+
}
|
|
43
|
+
this.pollPeriod = set.pollPeriod ? set.pollPeriod : 1000;
|
|
44
|
+
if (this.pollPeriod < 300) {
|
|
45
|
+
console.warn('DYNAMO WARNING: creating polls with less than 300ms period is not recommended!');
|
|
46
|
+
}
|
|
47
|
+
this.stopOnFail = set.stopOnFail;
|
|
48
|
+
this.startPoll(this.args);
|
|
49
|
+
} catch (error) {
|
|
50
|
+
throw new Dynamo_Error({
|
|
51
|
+
message: 'Dynamo_Poll construcion failed.'
|
|
52
|
+
});
|
|
41
53
|
}
|
|
42
|
-
this.stopOnFail = set.stopOnFail;
|
|
43
|
-
this.startPoll(this.args);
|
|
44
54
|
}
|
|
45
55
|
|
|
46
56
|
private startPoll(...args: unknown[]): void {
|
|
47
|
-
|
|
48
|
-
this.
|
|
49
|
-
|
|
50
|
-
this.
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
+
try {
|
|
58
|
+
this.poll = timer(this.pollDelay, this.pollPeriod).subscribe(async () => {
|
|
59
|
+
await this.pollDo(...args).then((res: T) => {
|
|
60
|
+
if (!this.pollWhile(res)) {
|
|
61
|
+
this.end(res);
|
|
62
|
+
}
|
|
63
|
+
}).catch((error) => {
|
|
64
|
+
if (this.stopOnFail) {
|
|
65
|
+
this.stop();
|
|
66
|
+
}
|
|
67
|
+
throw new Dynamo_Error({
|
|
68
|
+
message: 'DYNAMO ERROR: \nDynamoPoll: pollDo was UNSUCCESSFUL',
|
|
69
|
+
error: new Error(error),
|
|
70
|
+
errors: [ error ]
|
|
71
|
+
});
|
|
72
|
+
});
|
|
57
73
|
});
|
|
58
|
-
|
|
59
|
-
|
|
74
|
+
this.running = true;
|
|
75
|
+
} catch (error) {
|
|
76
|
+
throw new Dynamo_Error({
|
|
77
|
+
message: 'DYNAMO ERROR: \nDynamoPoll: startPoll was UNSUCCESSFUL',
|
|
78
|
+
error: error,
|
|
79
|
+
});
|
|
80
|
+
}
|
|
60
81
|
}
|
|
61
82
|
|
|
62
83
|
restartPoll(args?: unknown[]): void {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
84
|
+
try {
|
|
85
|
+
if (args) {
|
|
86
|
+
this.startPoll(args);
|
|
87
|
+
} else {
|
|
88
|
+
this.startPoll(this.args);
|
|
89
|
+
}
|
|
90
|
+
} catch (error) {
|
|
91
|
+
throw new Dynamo_Error({
|
|
92
|
+
message: 'DYNAMO ERROR: \nDynamoPoll: restartPoll was UNSUCCESSFUL',
|
|
93
|
+
error: error,
|
|
94
|
+
});
|
|
67
95
|
}
|
|
68
96
|
}
|
|
69
97
|
|