tibber-aws 6.1.3 → 6.2.0
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/src/ILogger.d.ts +1 -0
- package/dist/src/LoggerWrapper.d.ts +1 -0
- package/dist/src/LoggerWrapper.js +3 -0
- package/dist/src/LoggerWrapper.js.map +1 -1
- package/dist/src/queue/Queue.d.ts +1 -0
- package/dist/src/queue/Queue.js +8 -0
- package/dist/src/queue/Queue.js.map +1 -1
- package/dist/src/queue/QueueSubjectListener.d.ts +13 -3
- package/dist/src/queue/QueueSubjectListener.js +55 -10
- package/dist/src/queue/QueueSubjectListener.js.map +1 -1
- package/package.json +6 -6
package/dist/src/ILogger.d.ts
CHANGED
|
@@ -15,6 +15,9 @@ class LoggerWrapper {
|
|
|
15
15
|
info(message) {
|
|
16
16
|
this._logger?.info && this._logger.info(message);
|
|
17
17
|
}
|
|
18
|
+
warn(message) {
|
|
19
|
+
this._logger?.warn && this._logger.warn(message);
|
|
20
|
+
}
|
|
18
21
|
error(message) {
|
|
19
22
|
this._logger?.error ? this._logger.error(message) : console.log(message);
|
|
20
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggerWrapper.js","sourceRoot":"","sources":["../../src/LoggerWrapper.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IAChB,OAAO,CAAmB;IAElC,YAAY,MAAmC;QAC7C,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,OAAe;QAChC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3E,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"LoggerWrapper.js","sourceRoot":"","sources":["../../src/LoggerWrapper.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IAChB,OAAO,CAAmB;IAElC,YAAY,MAAmC;QAC7C,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,OAAe;QAChC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3E,CAAC;CACF;AA1BD,sCA0BC"}
|
|
@@ -14,4 +14,5 @@ export declare class Queue {
|
|
|
14
14
|
static createQueue(queueName: string, endpoint?: string): Promise<Queue>;
|
|
15
15
|
receiveMessage(params: Omit<ReceiveMessageCommandInput, 'QueueUrl'>): Promise<import("@aws-sdk/client-sqs").ReceiveMessageCommandOutput>;
|
|
16
16
|
deleteMessage(receiptHandle: string): Promise<void>;
|
|
17
|
+
changeMessageVisibility(receiptHandle: string, visibilityTimeout: number): Promise<void>;
|
|
17
18
|
}
|
package/dist/src/queue/Queue.js
CHANGED
|
@@ -110,6 +110,14 @@ class Queue {
|
|
|
110
110
|
};
|
|
111
111
|
await this.sqs.deleteMessage(request);
|
|
112
112
|
}
|
|
113
|
+
async changeMessageVisibility(receiptHandle, visibilityTimeout) {
|
|
114
|
+
const request = {
|
|
115
|
+
QueueUrl: this.queueUrl,
|
|
116
|
+
ReceiptHandle: receiptHandle,
|
|
117
|
+
VisibilityTimeout: visibilityTimeout,
|
|
118
|
+
};
|
|
119
|
+
await this.sqs.changeMessageVisibility(request);
|
|
120
|
+
}
|
|
113
121
|
}
|
|
114
122
|
exports.Queue = Queue;
|
|
115
123
|
//# sourceMappingURL=Queue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../src/queue/Queue.ts"],"names":[],"mappings":";;;AAAA,oDAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../src/queue/Queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,26 @@ export type QueueSubjectListenerOptions = {
|
|
|
8
8
|
receiveTimeout?: () => number;
|
|
9
9
|
};
|
|
10
10
|
export type QueueSubjectListenerMessageHandler = {
|
|
11
|
-
(message: unknown, subject: string): void
|
|
11
|
+
(message: unknown, subject: string): Promise<void>;
|
|
12
12
|
};
|
|
13
|
+
export type QueueSubjectListenerRetryPolicyOptions = {
|
|
14
|
+
maxAttempts: number;
|
|
15
|
+
backoffDelaySeconds: number;
|
|
16
|
+
retryPolicy?: (attempt: number, backoffDelaySeconds: number, error: unknown) => number;
|
|
17
|
+
};
|
|
18
|
+
export declare const LinearRetryPolicy: (attempt: number, backoffDelaySeconds: number) => number;
|
|
19
|
+
export declare const ExponentialRetryPolicy: (attempt: number, backoffDelaySeconds: number) => number;
|
|
13
20
|
export declare class QueueSubjectListener {
|
|
14
21
|
queue: Queue;
|
|
15
22
|
options: QueueSubjectListenerOptions;
|
|
16
|
-
handlers: Record<string, Array<
|
|
23
|
+
handlers: Record<string, Array<{
|
|
24
|
+
handler: QueueSubjectListenerMessageHandler;
|
|
25
|
+
retryPolicyOptions?: QueueSubjectListenerRetryPolicyOptions;
|
|
26
|
+
}>>;
|
|
17
27
|
isStopped: boolean;
|
|
18
28
|
logger: ILogger;
|
|
19
29
|
constructor(queue: Queue, logger?: undefined | null | ILogger, options?: QueueSubjectListenerOptions);
|
|
20
30
|
stop(): void;
|
|
21
|
-
onSubject(subjectName: string, handler: QueueSubjectListenerMessageHandler): void;
|
|
31
|
+
onSubject(subjectName: string, handler: QueueSubjectListenerMessageHandler, retryPolicyOptions?: QueueSubjectListenerRetryPolicyOptions): void;
|
|
22
32
|
listen(params?: ReceiveMessageCommandInput): void;
|
|
23
33
|
}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.QueueSubjectListener = void 0;
|
|
3
|
+
exports.QueueSubjectListener = exports.ExponentialRetryPolicy = exports.LinearRetryPolicy = void 0;
|
|
4
|
+
const client_sqs_1 = require("@aws-sdk/client-sqs");
|
|
4
5
|
const LoggerWrapper_1 = require("../LoggerWrapper");
|
|
6
|
+
const LinearRetryPolicy = (attempt, backoffDelaySeconds) => backoffDelaySeconds * attempt;
|
|
7
|
+
exports.LinearRetryPolicy = LinearRetryPolicy;
|
|
8
|
+
const ExponentialRetryPolicy = (attempt, backoffDelaySeconds) => Math.pow(attempt, backoffDelaySeconds);
|
|
9
|
+
exports.ExponentialRetryPolicy = ExponentialRetryPolicy;
|
|
5
10
|
class QueueSubjectListener {
|
|
6
11
|
queue;
|
|
7
12
|
options;
|
|
@@ -20,9 +25,18 @@ class QueueSubjectListener {
|
|
|
20
25
|
stop() {
|
|
21
26
|
this.isStopped = true;
|
|
22
27
|
}
|
|
23
|
-
onSubject(subjectName, handler) {
|
|
28
|
+
onSubject(subjectName, handler, retryPolicyOptions) {
|
|
24
29
|
this.handlers[subjectName] = this.handlers[subjectName] || [];
|
|
25
|
-
this.handlers[subjectName].push(
|
|
30
|
+
this.handlers[subjectName].push({
|
|
31
|
+
handler,
|
|
32
|
+
retryPolicyOptions: retryPolicyOptions
|
|
33
|
+
? {
|
|
34
|
+
maxAttempts: retryPolicyOptions.maxAttempts || 3,
|
|
35
|
+
backoffDelaySeconds: retryPolicyOptions.backoffDelaySeconds || 10,
|
|
36
|
+
retryPolicy: retryPolicyOptions.retryPolicy || exports.LinearRetryPolicy,
|
|
37
|
+
}
|
|
38
|
+
: undefined,
|
|
39
|
+
});
|
|
26
40
|
}
|
|
27
41
|
listen(params) {
|
|
28
42
|
const MaxNumberOfMessages = params?.MaxNumberOfMessages ?? this.options.maxConcurrentMessage;
|
|
@@ -41,6 +55,7 @@ class QueueSubjectListener {
|
|
|
41
55
|
MaxNumberOfMessages: maxNumberOfMessagesOrUndefined,
|
|
42
56
|
VisibilityTimeout,
|
|
43
57
|
WaitTimeSeconds,
|
|
58
|
+
AttributeNames: [client_sqs_1.QueueAttributeName.All],
|
|
44
59
|
};
|
|
45
60
|
const response = await this.queue.receiveMessage(currentParams);
|
|
46
61
|
if (!response.Messages || response.Messages.length === 0) {
|
|
@@ -57,6 +72,7 @@ class QueueSubjectListener {
|
|
|
57
72
|
message: {
|
|
58
73
|
message: JSON.parse(json.Message),
|
|
59
74
|
subject: json.Subject,
|
|
75
|
+
attributes: m.Attributes,
|
|
60
76
|
},
|
|
61
77
|
};
|
|
62
78
|
}
|
|
@@ -67,24 +83,53 @@ class QueueSubjectListener {
|
|
|
67
83
|
});
|
|
68
84
|
cntInFlight += messages.length;
|
|
69
85
|
const promises = messages.map(async (m) => {
|
|
70
|
-
const { message, subject } = m.message;
|
|
86
|
+
const { message, subject, attributes } = m.message;
|
|
87
|
+
let shouldRetry = false;
|
|
88
|
+
let visibilityTimeout;
|
|
71
89
|
try {
|
|
72
90
|
if (this.handlers[subject] || this.handlers['*']) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
.map(async (h) => {
|
|
91
|
+
const subjectHandlers = (this.handlers[subject] || []).concat(this.handlers['*'] || []);
|
|
92
|
+
await Promise.all(subjectHandlers.map(async (h) => {
|
|
76
93
|
try {
|
|
77
|
-
|
|
94
|
+
shouldRetry = false;
|
|
95
|
+
await h.handler(message, subject);
|
|
78
96
|
}
|
|
79
97
|
catch (error) {
|
|
80
98
|
typeof error === 'string' && this.logger.error(error);
|
|
99
|
+
if (!h.retryPolicyOptions)
|
|
100
|
+
return;
|
|
101
|
+
if (Object.keys(subjectHandlers).length > 1) {
|
|
102
|
+
this.logger.info(`Multiple handlers for message with subject "${m.message.subject}"`);
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
const { maxAttempts, backoffDelaySeconds, retryPolicy } = h.retryPolicyOptions;
|
|
106
|
+
const attempt = parseInt(attributes?.ApproximateReceiveCount || '1');
|
|
107
|
+
if (attempt < maxAttempts) {
|
|
108
|
+
shouldRetry = true;
|
|
109
|
+
visibilityTimeout = retryPolicy?.(attempt, backoffDelaySeconds, error);
|
|
110
|
+
this.logger.debug(`Message with subject "${m.message.subject}" will be retried`);
|
|
111
|
+
}
|
|
81
112
|
}
|
|
82
113
|
}));
|
|
83
114
|
}
|
|
84
115
|
if (!m.handle)
|
|
85
116
|
throw Error("'handle' property on message was undefined.");
|
|
86
|
-
|
|
87
|
-
|
|
117
|
+
if (!shouldRetry) {
|
|
118
|
+
await this.queue.deleteMessage(m.handle);
|
|
119
|
+
this.logger.debug(`Message with subject "${m.message.subject}" deleted`);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
if (typeof visibilityTimeout === 'number' &&
|
|
123
|
+
visibilityTimeout >= 0 &&
|
|
124
|
+
visibilityTimeout !== currentParams.VisibilityTimeout) {
|
|
125
|
+
if (visibilityTimeout >= 0 && visibilityTimeout <= 43200) {
|
|
126
|
+
await this.queue.changeMessageVisibility(m.handle, visibilityTimeout);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
this.logger.warn(`Invalid visibilityTimeout value: ${visibilityTimeout}`);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
this.logger.debug(`Message with subject "${m.message.subject}" kept, visibilityTimeout: ${visibilityTimeout}`);
|
|
88
133
|
}
|
|
89
134
|
catch (error) {
|
|
90
135
|
typeof error === 'string' && this.logger.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueSubjectListener.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListener.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"QueueSubjectListener.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListener.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tibber-aws",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./dist/src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -54,11 +54,11 @@
|
|
|
54
54
|
"node": ">=18.0.0"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@aws-sdk/client-lambda": "^3.
|
|
58
|
-
"@aws-sdk/client-s3": "^3.
|
|
59
|
-
"@aws-sdk/client-secrets-manager": "^3.
|
|
60
|
-
"@aws-sdk/client-sns": "^3.
|
|
61
|
-
"@aws-sdk/client-sqs": "^3.
|
|
57
|
+
"@aws-sdk/client-lambda": "^3.621.0",
|
|
58
|
+
"@aws-sdk/client-s3": "^3.621.0",
|
|
59
|
+
"@aws-sdk/client-secrets-manager": "^3.621.0",
|
|
60
|
+
"@aws-sdk/client-sns": "^3.621.0",
|
|
61
|
+
"@aws-sdk/client-sqs": "^3.621.0",
|
|
62
62
|
"make-synchronous": "^1.0.0",
|
|
63
63
|
"sync-rpc": "^1.3.6"
|
|
64
64
|
},
|