tibber-aws 7.0.28 → 7.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/queue/Queue.d.ts +5 -0
- package/dist/src/queue/Queue.js +14 -0
- package/dist/src/queue/Queue.js.map +1 -1
- package/dist/src/queue/QueueSubjectListener.d.ts +2 -1
- package/dist/src/queue/QueueSubjectListener.js +12 -8
- package/dist/src/queue/QueueSubjectListener.js.map +1 -1
- package/dist/src/queue/Topic.d.ts +8 -0
- package/dist/src/queue/Topic.js +24 -0
- package/dist/src/queue/Topic.js.map +1 -1
- package/package.json +2 -1
- package/readme.md +27 -2
|
@@ -12,6 +12,11 @@ export declare class Queue {
|
|
|
12
12
|
subscribeTopic(topic: Topic): Promise<void>;
|
|
13
13
|
send(subject: string, message: unknown, delaySeconds?: number): Promise<import("@aws-sdk/client-sqs").SendMessageCommandOutput>;
|
|
14
14
|
static createQueue(queueName: string, endpoint?: string): Promise<Queue>;
|
|
15
|
+
/**
|
|
16
|
+
* Resolves an existing queue by name. Needs `sqs:GetQueueUrl`.
|
|
17
|
+
* Throws `QueueDoesNotExist` if the queue is not provisioned.
|
|
18
|
+
*/
|
|
19
|
+
static attach(queueName: string, endpoint?: string): Promise<Queue>;
|
|
15
20
|
receiveMessage(params: Omit<ReceiveMessageCommandInput, 'QueueUrl'>): Promise<import("@aws-sdk/client-sqs").ReceiveMessageCommandOutput>;
|
|
16
21
|
deleteMessage(receiptHandle: string): Promise<void>;
|
|
17
22
|
changeMessageVisibility(receiptHandle: string, visibilityTimeout: number): Promise<void>;
|
package/dist/src/queue/Queue.js
CHANGED
|
@@ -97,6 +97,20 @@ class Queue {
|
|
|
97
97
|
throw Error("Expected QueueArn to be set on 'response' instance.");
|
|
98
98
|
return new Queue(queue.QueueUrl, response.Attributes.QueueArn, endpoint);
|
|
99
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* Resolves an existing queue by name. Needs `sqs:GetQueueUrl`.
|
|
102
|
+
* Throws `QueueDoesNotExist` if the queue is not provisioned.
|
|
103
|
+
*/
|
|
104
|
+
static async attach(queueName, endpoint) {
|
|
105
|
+
const sqs = new client_sqs_1.SQS({ endpoint });
|
|
106
|
+
const { QueueUrl } = await sqs.getQueueUrl({ QueueName: queueName });
|
|
107
|
+
if (!QueueUrl)
|
|
108
|
+
throw Error(`Could not resolve URL for queue "${queueName}".`);
|
|
109
|
+
const [, accountId] = new URL(QueueUrl).pathname.split('/');
|
|
110
|
+
const region = await sqs.config.region();
|
|
111
|
+
const queueArn = `arn:aws:sqs:${region}:${accountId}:${queueName}`;
|
|
112
|
+
return new Queue(QueueUrl, queueArn, endpoint);
|
|
113
|
+
}
|
|
100
114
|
async receiveMessage(params) {
|
|
101
115
|
return await this.sqs.receiveMessage({
|
|
102
116
|
...params,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../src/queue/Queue.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../src/queue/Queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,10 @@ export declare class QueueSubjectListener {
|
|
|
25
25
|
retryPolicyOptions?: QueueSubjectListenerRetryPolicyOptions;
|
|
26
26
|
}>>;
|
|
27
27
|
isStopped: boolean;
|
|
28
|
+
private readonly inFlight;
|
|
28
29
|
logger: ILogger;
|
|
29
30
|
constructor(queue: Queue, logger?: undefined | null | ILogger, options?: QueueSubjectListenerOptions);
|
|
30
|
-
stop(): void
|
|
31
|
+
stop(): Promise<void>;
|
|
31
32
|
onSubject(subjectName: string, handler: QueueSubjectListenerMessageHandler, retryPolicyOptions?: QueueSubjectListenerRetryPolicyOptions): void;
|
|
32
33
|
listen(params?: ReceiveMessageCommandInput): void;
|
|
33
34
|
}
|
|
@@ -39,6 +39,7 @@ class QueueSubjectListener {
|
|
|
39
39
|
options;
|
|
40
40
|
handlers = {};
|
|
41
41
|
isStopped = false;
|
|
42
|
+
inFlight = new Set();
|
|
42
43
|
logger;
|
|
43
44
|
constructor(queue, logger, options = {
|
|
44
45
|
maxConcurrentMessage: 1,
|
|
@@ -49,8 +50,9 @@ class QueueSubjectListener {
|
|
|
49
50
|
this.options = options;
|
|
50
51
|
this.logger = new LoggerWrapper_1.LoggerWrapper(logger);
|
|
51
52
|
}
|
|
52
|
-
stop() {
|
|
53
|
+
async stop() {
|
|
53
54
|
this.isStopped = true;
|
|
55
|
+
await Promise.allSettled(this.inFlight);
|
|
54
56
|
}
|
|
55
57
|
onSubject(subjectName, handler, retryPolicyOptions) {
|
|
56
58
|
this.handlers[subjectName] = this.handlers[subjectName] || [];
|
|
@@ -70,7 +72,6 @@ class QueueSubjectListener {
|
|
|
70
72
|
const VisibilityTimeout = params?.VisibilityTimeout ?? this.options.visibilityTimeout;
|
|
71
73
|
const WaitTimeSeconds = params?.WaitTimeSeconds ?? this.options.waitTimeSeconds;
|
|
72
74
|
const receiveTimeout = this.options.receiveTimeout;
|
|
73
|
-
let cntInFlight = 0;
|
|
74
75
|
const hasWildCardHandler = !!this.handlers['*'];
|
|
75
76
|
const rearm = (idleDelay) => {
|
|
76
77
|
if (this.isStopped)
|
|
@@ -96,7 +97,7 @@ class QueueSubjectListener {
|
|
|
96
97
|
return;
|
|
97
98
|
const maxNumberOfMessagesOrUndefined = MaxNumberOfMessages === undefined
|
|
98
99
|
? undefined
|
|
99
|
-
: Math.min(10, MaxNumberOfMessages -
|
|
100
|
+
: Math.min(10, MaxNumberOfMessages - this.inFlight.size);
|
|
100
101
|
const currentParams = {
|
|
101
102
|
MaxNumberOfMessages: maxNumberOfMessagesOrUndefined,
|
|
102
103
|
VisibilityTimeout,
|
|
@@ -153,7 +154,8 @@ class QueueSubjectListener {
|
|
|
153
154
|
};
|
|
154
155
|
}
|
|
155
156
|
}));
|
|
156
|
-
|
|
157
|
+
if (this.isStopped)
|
|
158
|
+
return;
|
|
157
159
|
const promises = messages.map(async (m) => {
|
|
158
160
|
const { message, subject, attributes } = m.message;
|
|
159
161
|
let shouldRetry = false;
|
|
@@ -209,11 +211,13 @@ class QueueSubjectListener {
|
|
|
209
211
|
catch (error) {
|
|
210
212
|
this.logger.error(errorMessage(error));
|
|
211
213
|
}
|
|
212
|
-
finally {
|
|
213
|
-
cntInFlight--;
|
|
214
|
-
}
|
|
215
214
|
});
|
|
216
|
-
|
|
215
|
+
promises.forEach(p => {
|
|
216
|
+
this.inFlight.add(p);
|
|
217
|
+
const untrack = () => this.inFlight.delete(p);
|
|
218
|
+
void p.then(untrack, untrack);
|
|
219
|
+
});
|
|
220
|
+
if (MaxNumberOfMessages === this.inFlight.size) {
|
|
217
221
|
await Promise.race(promises);
|
|
218
222
|
}
|
|
219
223
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueSubjectListener.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListener.ts"],"names":[],"mappings":";;;AAAA,oDAG6B;AAE7B,oDAA+C;AAE/C,+BAA8C;AAC9C,+BAA+B;AAE/B,MAAM,8BAA8B,GAAG,aAAa,CAAC;AACrD,MAAM,0BAA0B,GAAG,QAAQ,CAAC;AAC5C,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAuBjC,MAAM,iBAAiB,GAAG,CAC/B,OAAe,EACf,mBAA2B,EACnB,EAAE,CAAC,mBAAmB,GAAG,OAAO,CAAC;AAH9B,QAAA,iBAAiB,qBAGa;AAEpC,MAAM,sBAAsB,GAAG,CACpC,OAAe,EACf,mBAA2B,EAC3B,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;AAH/B,QAAA,sBAAsB,0BAGS;AAE5C,MAAM,qBAAqB,GAAG,IAAA,gBAAS,EAAC,uBAAgB,CAAC,CAAC;AAC1D,MAAM,WAAW,GAAG,IAAA,gBAAS,EAAC,aAAM,CAAC,CAAC;AAEtC,MAAM,YAAY,GAAG,CAAC,KAAc,EAAU,EAAE;IAC9C,IAAI,CAAC;QACH,OAAO,KAAK,YAAY,KAAK;YAC3B,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,eAAe,CAAC;IACzB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,aAAqB,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,KAAK,EAAE,aAAqB,EAAE,EAAE;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChE,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC;AAaF,MAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"QueueSubjectListener.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListener.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,13 @@ export declare class Topic {
|
|
|
7
7
|
sns: SNS;
|
|
8
8
|
private constructor();
|
|
9
9
|
static createTopic(topicName: string, subjectName?: string, endpoint?: string): Promise<Topic>;
|
|
10
|
+
/**
|
|
11
|
+
* Attaches to an existing topic by name. The account comes from
|
|
12
|
+
* `sts:GetCallerIdentity`, called once per process.
|
|
13
|
+
* Call `verify()` to verify the topic exists.
|
|
14
|
+
*/
|
|
15
|
+
static attach(topicName: string, subject?: string, endpoint?: string): Promise<Topic>;
|
|
16
|
+
/** Throws `NotFoundException` if topic does not exist; needs `sns:GetTopicAttributes`. */
|
|
17
|
+
verify(): Promise<void>;
|
|
10
18
|
push(evt: unknown, subject?: string, messageAttributes?: Record<string, MessageAttributeValue>): Promise<import("@aws-sdk/client-sns").PublishCommandOutput>;
|
|
11
19
|
}
|
package/dist/src/queue/Topic.js
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Topic = void 0;
|
|
4
4
|
const client_sns_1 = require("@aws-sdk/client-sns");
|
|
5
|
+
const client_sts_1 = require("@aws-sdk/client-sts");
|
|
6
|
+
let account;
|
|
7
|
+
const callerAccount = (endpoint) => (account ??= new client_sts_1.STS({ endpoint })
|
|
8
|
+
.getCallerIdentity({})
|
|
9
|
+
.then(({ Account }) => Account)
|
|
10
|
+
.catch(err => {
|
|
11
|
+
account = undefined;
|
|
12
|
+
throw err;
|
|
13
|
+
}));
|
|
5
14
|
class Topic {
|
|
6
15
|
topicArn;
|
|
7
16
|
name;
|
|
@@ -25,6 +34,21 @@ class Topic {
|
|
|
25
34
|
}
|
|
26
35
|
return new Topic(topicResponse.TopicArn, topicName, subjectName, endpoint);
|
|
27
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Attaches to an existing topic by name. The account comes from
|
|
39
|
+
* `sts:GetCallerIdentity`, called once per process.
|
|
40
|
+
* Call `verify()` to verify the topic exists.
|
|
41
|
+
*/
|
|
42
|
+
static async attach(topicName, subject, endpoint) {
|
|
43
|
+
const region = await new client_sns_1.SNS({ endpoint }).config.region();
|
|
44
|
+
const account = await callerAccount(endpoint);
|
|
45
|
+
const topicArn = `arn:aws:sns:${region}:${account}:${topicName}`;
|
|
46
|
+
return new Topic(topicArn, topicName, subject, endpoint);
|
|
47
|
+
}
|
|
48
|
+
/** Throws `NotFoundException` if topic does not exist; needs `sns:GetTopicAttributes`. */
|
|
49
|
+
async verify() {
|
|
50
|
+
await this.sns.getTopicAttributes({ TopicArn: this.topicArn });
|
|
51
|
+
}
|
|
28
52
|
async push(evt, subject, messageAttributes) {
|
|
29
53
|
const payload = {
|
|
30
54
|
Message: JSON.stringify(evt),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Topic.js","sourceRoot":"","sources":["../../../src/queue/Topic.ts"],"names":[],"mappings":";;;AAAA,oDAA+D;
|
|
1
|
+
{"version":3,"file":"Topic.js","sourceRoot":"","sources":["../../../src/queue/Topic.ts"],"names":[],"mappings":";;;AAAA,oDAA+D;AAC/D,oDAAwC;AAExC,IAAI,OAAgD,CAAC;AAErD,MAAM,aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC1C,CAAC,OAAO,KAAK,IAAI,gBAAG,CAAC,EAAC,QAAQ,EAAC,CAAC;KAC7B,iBAAiB,CAAC,EAAE,CAAC;KACrB,IAAI,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE,CAAC,OAAO,CAAC;KAC5B,KAAK,CAAC,GAAG,CAAC,EAAE;IACX,OAAO,GAAG,SAAS,CAAC;IACpB,MAAM,GAAG,CAAC;AACZ,CAAC,CAAC,CAAC,CAAC;AAER,MAAa,KAAK;IAIP;IACA;IACA;IACA;IANF,GAAG,CAAM;IAEhB,YACS,QAAgB,EAChB,IAAY,EACZ,OAAgB,EAChB,QAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAS;QAChB,aAAQ,GAAR,QAAQ,CAAS;QAExB,IAAI,CAAC,GAAG,GAAG,IAAI,gBAAG,CAAC,EAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAC,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CACtB,SAAiB,EACjB,WAAoB,EACpB,QAAiB;QAEjB,MAAM,GAAG,GAAG,IAAI,gBAAG,CAAC;YAClB,QAAQ;SACT,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC,CAAC;QAE/D,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,MAAM,KAAK,CACT,qEAAqE,CACtE,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,OAAgB,EAAE,QAAiB;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAG,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,eAAe,MAAM,IAAI,OAAO,IAAI,SAAS,EAAE,CAAC;QACjE,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,0FAA0F;IAC1F,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAC,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,IAAI,CACR,GAAY,EACZ,OAAgB,EAChB,iBAAyD;QAEzD,MAAM,OAAO,GAAG;YACd,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;YAC5B,iBAAiB,EAAE,iBAAiB;YACpC,OAAO,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO;YAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACF;AA9DD,sBA8DC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tibber-aws",
|
|
3
|
-
"version": "7.0
|
|
3
|
+
"version": "7.2.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./dist/src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -64,6 +64,7 @@
|
|
|
64
64
|
"@aws-sdk/client-secrets-manager": "^3.1013.0",
|
|
65
65
|
"@aws-sdk/client-sns": "^3.1013.0",
|
|
66
66
|
"@aws-sdk/client-sqs": "^3.1013.0",
|
|
67
|
+
"@aws-sdk/client-sts": "^3.1013.0",
|
|
67
68
|
"@aws-sdk/core": "^3.973.15",
|
|
68
69
|
"sync-rpc": "^1.3.6"
|
|
69
70
|
}
|
package/readme.md
CHANGED
|
@@ -62,7 +62,7 @@ listener.onSubject('test', async (message, subject) => {
|
|
|
62
62
|
listener.listen();
|
|
63
63
|
```
|
|
64
64
|
|
|
65
|
-
## Usage
|
|
65
|
+
## Usage — application owns the queue/topic
|
|
66
66
|
|
|
67
67
|
```
|
|
68
68
|
import {Topic, Queue} from 'tibber-aws';
|
|
@@ -86,4 +86,29 @@ const listener = new QueueSubjectListener(queue);
|
|
|
86
86
|
listener.handlers = [handlerFunction];
|
|
87
87
|
listener.listen();
|
|
88
88
|
|
|
89
|
-
```
|
|
89
|
+
```
|
|
90
|
+
|
|
91
|
+
## Usage — Terraform owns the queue/topic
|
|
92
|
+
|
|
93
|
+
For services where the queue, topic, and subscription are provisioned by
|
|
94
|
+
Terraform. The application attaches to existing resources.
|
|
95
|
+
|
|
96
|
+
Required IAM (consumer): `sqs:GetQueueUrl`, `sqs:ReceiveMessage`,
|
|
97
|
+
`sqs:DeleteMessage`, `sqs:ChangeMessageVisibility`.
|
|
98
|
+
Required IAM (publisher): `sns:Publish`, plus `sns:GetTopicAttributes` for
|
|
99
|
+
`topic.verify()`.
|
|
100
|
+
|
|
101
|
+
```ts
|
|
102
|
+
import {Queue, QueueSubjectListener, Topic} from 'tibber-aws';
|
|
103
|
+
|
|
104
|
+
// Consumer
|
|
105
|
+
const listener = new QueueSubjectListener(await Queue.attach('test-queue'));
|
|
106
|
+
listener.onSubject('test subject', async (message, subject) => {
|
|
107
|
+
// handle message
|
|
108
|
+
});
|
|
109
|
+
listener.listen();
|
|
110
|
+
|
|
111
|
+
// Publisher
|
|
112
|
+
const topic = await Topic.attach('test-topic', 'test subject');
|
|
113
|
+
await topic.push({test: 'test'});
|
|
114
|
+
```
|