itrm-tools 1.3.31 → 1.3.32
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/api/queue/QueueManager.d.ts +2 -0
- package/dist/api/queue/QueueManager.js +25 -19
- package/dist/api/queue/QueueManager.js.map +1 -1
- package/dist/api/request/crud/common/WebhookManager.d.ts +3 -0
- package/dist/api/request/crud/common/WebhookManager.js +1 -1
- package/dist/api/request/crud/common/WebhookManager.js.map +1 -1
- package/package.json +3 -3
|
@@ -11,6 +11,8 @@ export declare abstract class QueueManager<T extends IQueueItem> {
|
|
|
11
11
|
constructor(maxAttempts?: number, retryDelayMs?: number);
|
|
12
12
|
push(item: T): void;
|
|
13
13
|
private run;
|
|
14
|
+
private calculateRemainingWaitTime;
|
|
15
|
+
private processItem;
|
|
14
16
|
protected abstract apply(item: T): Promise<void>;
|
|
15
17
|
protected abstract onMaxRetriesReached(item: T, error: any): Promise<void>;
|
|
16
18
|
}
|
|
@@ -26,30 +26,36 @@ class QueueManager {
|
|
|
26
26
|
this.running = true;
|
|
27
27
|
while (this.queue.length > 0) {
|
|
28
28
|
const item = this.queue.shift();
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
if (waitTime > 0) {
|
|
33
|
-
this.queue.unshift(item);
|
|
34
|
-
await new Promise(resolve => setTimeout(resolve, waitTime));
|
|
35
|
-
continue;
|
|
36
|
-
}
|
|
29
|
+
const remainingWaitTime = this.calculateRemainingWaitTime(item);
|
|
30
|
+
if (remainingWaitTime <= 0) {
|
|
31
|
+
await this.processItem(item);
|
|
37
32
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
catch (error) {
|
|
42
|
-
console.error(`[Queue] Error processing item: ${error.message}`);
|
|
43
|
-
if (item.attempt < this.maxAttempts) {
|
|
44
|
-
this.queue.push({ ...item, attempt: item.attempt + 1, timestamp: Date.now() });
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
await this.onMaxRetriesReached(item, error);
|
|
48
|
-
}
|
|
33
|
+
else {
|
|
34
|
+
this.queue.unshift(item);
|
|
35
|
+
await new Promise(resolve => setTimeout(resolve, remainingWaitTime));
|
|
49
36
|
}
|
|
50
37
|
}
|
|
51
38
|
this.running = false;
|
|
52
39
|
}
|
|
40
|
+
calculateRemainingWaitTime(item) {
|
|
41
|
+
const elapsedTime = Date.now() - item.timestamp;
|
|
42
|
+
const waitTime = this.retryDelayMs * item.attempt;
|
|
43
|
+
return waitTime - elapsedTime;
|
|
44
|
+
}
|
|
45
|
+
async processItem(item) {
|
|
46
|
+
try {
|
|
47
|
+
await this.apply(item);
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
console.error(`[Queue] Error processing item: ${error.message}`);
|
|
51
|
+
if (item.attempt < this.maxAttempts) {
|
|
52
|
+
this.queue.push({ ...item, attempt: item.attempt + 1, timestamp: Date.now() });
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
await this.onMaxRetriesReached(item, error);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
53
59
|
}
|
|
54
60
|
exports.QueueManager = QueueManager;
|
|
55
61
|
//# sourceMappingURL=QueueManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../../../src/api/queue/QueueManager.ts"],"names":[],"mappings":";;;AAMA,MAAsB,YAAY;IACf,KAAK,CAAM;IACX,WAAW,CAAS;IACpB,YAAY,CAAS;IAC9B,OAAO,CAAU;IAEzB,YAAY,WAAoB,EAAE,YAAqB;QACrD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC;IAC3C,CAAC;IAEM,IAAI,CAAC,IAAO;QACjB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;YAAE,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;YAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE9D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,GAAG;QACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../../../src/api/queue/QueueManager.ts"],"names":[],"mappings":";;;AAMA,MAAsB,YAAY;IACf,KAAK,CAAM;IACX,WAAW,CAAS;IACpB,YAAY,CAAS;IAC9B,OAAO,CAAU;IAEzB,YAAY,WAAoB,EAAE,YAAqB;QACrD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC;IAC3C,CAAC;IAEM,IAAI,CAAC,IAAO;QACjB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;YAAE,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;YAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE9D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,GAAG;QACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAO,CAAC;YACrC,MAAM,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;YAEhE,IAAI,iBAAiB,IAAI,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IAEO,0BAA0B,CAAC,IAAO;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAU,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAQ,CAAC;QACnD,OAAO,QAAQ,GAAG,WAAW,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,IAAO;QAC/B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,kCAAkC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjE,IAAI,IAAI,CAAC,OAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAQ,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAClF,CAAC;iBACI,CAAC;gBACJ,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;IACH,CAAC;CAKF;AAlED,oCAkEC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { CrudServiceManager, StandardIdRequestDefinition } from "../CrudServiceManager";
|
|
2
2
|
import { AxiosRequestConfig } from "axios";
|
|
3
|
+
import { IApplication } from "./ApplicationManager";
|
|
3
4
|
export interface IWebhook {
|
|
4
5
|
webhookId?: number;
|
|
5
6
|
applicationId?: number;
|
|
6
7
|
eventName?: string;
|
|
7
8
|
eventTypes?: string[];
|
|
8
9
|
details?: any;
|
|
10
|
+
application?: IApplication;
|
|
9
11
|
updatedAt?: string;
|
|
10
12
|
createdAt?: string;
|
|
11
13
|
config?: AxiosRequestConfig;
|
|
@@ -16,6 +18,7 @@ export interface IWebhookSearchDetails {
|
|
|
16
18
|
eventName?: string;
|
|
17
19
|
eventTypes?: string[];
|
|
18
20
|
details?: any;
|
|
21
|
+
application?: boolean;
|
|
19
22
|
limit?: number;
|
|
20
23
|
offset?: number;
|
|
21
24
|
values?: IWebhook[];
|
|
@@ -36,7 +36,7 @@ class WebhookManager extends CrudServiceManager_1.CrudServiceManager {
|
|
|
36
36
|
return webhooks;
|
|
37
37
|
}
|
|
38
38
|
buildRequestUrl(url, details) {
|
|
39
|
-
let suffix = `${details.id ? `&id=${details.id}` : ""}${details.eventName ? `&eventName=${details.eventName}` : ""}${details.applicationId ? `&applicationId=${details.applicationId}` : ""}`;
|
|
39
|
+
let suffix = `${details.id ? `&id=${details.id}` : ""}${details.eventName ? `&eventName=${details.eventName}` : ""}${details.applicationId ? `&applicationId=${details.applicationId}` : ""}${details.application ? `&application=${details.application}` : ""}`;
|
|
40
40
|
return `${url}?${suffix.substring(1)}`;
|
|
41
41
|
}
|
|
42
42
|
async count(details) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebhookManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/WebhookManager.ts"],"names":[],"mappings":";;;AAAA,8DAAwF;
|
|
1
|
+
{"version":3,"file":"WebhookManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/WebhookManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "itrm-tools",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.32",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -48,8 +48,8 @@
|
|
|
48
48
|
"axios-mock-adapter": "^2.1.0",
|
|
49
49
|
"jest": "^30.2.0",
|
|
50
50
|
"jest-puppeteer": "^11.0.0",
|
|
51
|
-
"mongodb-memory-server": "^10.
|
|
52
|
-
"puppeteer": "^24.
|
|
51
|
+
"mongodb-memory-server": "^10.4.0",
|
|
52
|
+
"puppeteer": "^24.32.0",
|
|
53
53
|
"redis": "^5.10.0",
|
|
54
54
|
"rimraf": "^6.1.2",
|
|
55
55
|
"sqlite3": "^5.1.7",
|