tibber-aws 7.2.2 → 7.4.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.
@@ -3,5 +3,6 @@ export { getLambdaFunc } from './lambda';
3
3
  export { Queue, Topic } from './queue';
4
4
  export { QueueSubjectListener } from './queue/QueueSubjectListener';
5
5
  export { QueueSubjectListenerBuilder } from './queue/QueueSubjectListenerBuilder';
6
+ export { decodeSnsMessage } from './queue/snsMessage';
6
7
  export { S3Bucket } from './s3';
7
8
  export { getSecret, getSecretCollection } from './secrets';
package/dist/src/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getSecretCollection = exports.getSecret = exports.S3Bucket = exports.QueueSubjectListenerBuilder = exports.QueueSubjectListener = exports.Topic = exports.Queue = exports.getLambdaFunc = exports.configure = void 0;
3
+ exports.getSecretCollection = exports.getSecret = exports.S3Bucket = exports.decodeSnsMessage = exports.QueueSubjectListenerBuilder = exports.QueueSubjectListener = exports.Topic = exports.Queue = exports.getLambdaFunc = exports.configure = void 0;
4
4
  var configure_1 = require("./configure");
5
5
  Object.defineProperty(exports, "configure", { enumerable: true, get: function () { return configure_1.configure; } });
6
6
  var lambda_1 = require("./lambda");
@@ -12,6 +12,8 @@ var QueueSubjectListener_1 = require("./queue/QueueSubjectListener");
12
12
  Object.defineProperty(exports, "QueueSubjectListener", { enumerable: true, get: function () { return QueueSubjectListener_1.QueueSubjectListener; } });
13
13
  var QueueSubjectListenerBuilder_1 = require("./queue/QueueSubjectListenerBuilder");
14
14
  Object.defineProperty(exports, "QueueSubjectListenerBuilder", { enumerable: true, get: function () { return QueueSubjectListenerBuilder_1.QueueSubjectListenerBuilder; } });
15
+ var snsMessage_1 = require("./queue/snsMessage");
16
+ Object.defineProperty(exports, "decodeSnsMessage", { enumerable: true, get: function () { return snsMessage_1.decodeSnsMessage; } });
15
17
  var s3_1 = require("./s3");
16
18
  Object.defineProperty(exports, "S3Bucket", { enumerable: true, get: function () { return s3_1.S3Bucket; } });
17
19
  var secrets_1 = require("./secrets");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,mCAAuC;AAA/B,uGAAA,aAAa,OAAA;AACrB,iCAAqC;AAA7B,8FAAA,KAAK,OAAA;AAAE,8FAAA,KAAK,OAAA;AACpB,qEAAkE;AAA1D,4HAAA,oBAAoB,OAAA;AAC5B,mFAAgF;AAAxE,0IAAA,2BAA2B,OAAA;AACnC,2BAA8B;AAAtB,8FAAA,QAAQ,OAAA;AAChB,qCAAyD;AAAjD,oGAAA,SAAS,OAAA;AAAE,8GAAA,mBAAmB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,mCAAuC;AAA/B,uGAAA,aAAa,OAAA;AACrB,iCAAqC;AAA7B,8FAAA,KAAK,OAAA;AAAE,8FAAA,KAAK,OAAA;AACpB,qEAAkE;AAA1D,4HAAA,oBAAoB,OAAA;AAC5B,mFAAgF;AAAxE,0IAAA,2BAA2B,OAAA;AACnC,iDAAoD;AAA5C,8GAAA,gBAAgB,OAAA;AACxB,2BAA8B;AAAtB,8FAAA,QAAQ,OAAA;AAChB,qCAAyD;AAAjD,oGAAA,SAAS,OAAA;AAAE,8GAAA,mBAAmB,OAAA"}
@@ -3,17 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.QueueSubjectListener = exports.ExponentialRetryPolicy = exports.LinearRetryPolicy = void 0;
4
4
  const client_sqs_1 = require("@aws-sdk/client-sqs");
5
5
  const LoggerWrapper_1 = require("../LoggerWrapper");
6
- const zlib_1 = require("zlib");
7
- const util_1 = require("util");
8
- const MESSAGE_ATTRIBUTE_CONTENT_TYPE = 'contentType';
9
- const COMPRESSTION_METHOD_BROTLI = 'brotli';
10
- const COMPRESSTION_METHOD_GZIP = 'gzip';
6
+ const snsMessage_1 = require("./snsMessage");
11
7
  const LinearRetryPolicy = (attempt, backoffDelaySeconds) => backoffDelaySeconds * attempt;
12
8
  exports.LinearRetryPolicy = LinearRetryPolicy;
13
9
  const ExponentialRetryPolicy = (attempt, backoffDelaySeconds) => Math.pow(attempt, backoffDelaySeconds);
14
10
  exports.ExponentialRetryPolicy = ExponentialRetryPolicy;
15
- const brotliDecompressAsync = (0, util_1.promisify)(zlib_1.brotliDecompress);
16
- const gunzipAsync = (0, util_1.promisify)(zlib_1.gunzip);
17
11
  const errorMessage = (error) => {
18
12
  try {
19
13
  return error instanceof Error
@@ -24,16 +18,6 @@ const errorMessage = (error) => {
24
18
  return 'unknown error';
25
19
  }
26
20
  };
27
- const decompressBrotli = async (base64Message) => {
28
- const buffer = Buffer.from(base64Message, 'base64');
29
- const decompressed = await brotliDecompressAsync(Uint8Array.from(buffer));
30
- return JSON.parse(decompressed.toString('utf-8'));
31
- };
32
- const decompressGzip = async (base64Message) => {
33
- const buffer = Buffer.from(base64Message, 'base64');
34
- const decompressed = await gunzipAsync(Uint8Array.from(buffer));
35
- return JSON.parse(decompressed.toString('utf-8'));
36
- };
37
21
  class QueueSubjectListener {
38
22
  queue;
39
23
  options;
@@ -122,24 +106,14 @@ class QueueSubjectListener {
122
106
  };
123
107
  }
124
108
  try {
125
- const compressionMethod = json.MessageAttributes?.[MESSAGE_ATTRIBUTE_CONTENT_TYPE]?.Value;
126
- let jsonMessage;
127
- if (compressionMethod === COMPRESSTION_METHOD_BROTLI) {
128
- this.logger.info(`Message with ID '${m.MessageId}' is compressed with Brotli.`);
129
- jsonMessage = await decompressBrotli(json.Message);
130
- }
131
- else if (compressionMethod === COMPRESSTION_METHOD_GZIP) {
132
- this.logger.info(`Message with ID '${m.MessageId}' is compressed with Gzip.`);
133
- jsonMessage = await decompressGzip(json.Message);
134
- }
135
- else {
136
- jsonMessage = JSON.parse(json.Message);
137
- }
109
+ const compression = (0, snsMessage_1.compressionOf)(json);
110
+ if (compression)
111
+ this.logger.info(`Message with ID '${m.MessageId}' is compressed with ${compression}.`);
138
112
  return {
139
113
  handle: m.ReceiptHandle,
140
114
  shouldBeHandled: true,
141
115
  message: {
142
- message: jsonMessage,
116
+ message: await (0, snsMessage_1.decodeSnsMessage)(json),
143
117
  subject: json.Subject,
144
118
  attributes: m.Attributes
145
119
  }
@@ -1 +1 @@
1
- {"version":3,"file":"QueueSubjectListener.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListener.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueueSubjectListener.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListener.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Topic = void 0;
4
4
  const client_sns_1 = require("@aws-sdk/client-sns");
5
5
  const client_sts_1 = require("@aws-sdk/client-sts");
6
+ const snsMessage_1 = require("./snsMessage");
7
+ const isMessageTooLong = (error) => error instanceof client_sns_1.InvalidParameterException &&
8
+ /message too long/i.test(error.message);
6
9
  let account;
7
10
  const callerAccount = (endpoint) => (account ??= new client_sts_1.STS({ endpoint })
8
11
  .getCallerIdentity({})
@@ -50,13 +53,28 @@ class Topic {
50
53
  await this.sns.getTopicAttributes({ TopicArn: this.topicArn });
51
54
  }
52
55
  async push(evt, subject, messageAttributes) {
56
+ subject ||= this.subject;
53
57
  const payload = {
54
58
  Message: JSON.stringify(evt),
55
- MessageAttributes: messageAttributes,
56
- Subject: subject || this.subject,
59
+ MessageAttributes: subject
60
+ ? {
61
+ subject: { DataType: 'String', StringValue: subject },
62
+ ...messageAttributes,
63
+ }
64
+ : messageAttributes,
65
+ Subject: subject,
57
66
  TopicArn: this.topicArn,
58
67
  };
59
- return await this.sns.publish(payload);
68
+ try {
69
+ return await this.sns.publish(payload);
70
+ }
71
+ catch (error) {
72
+ if (!isMessageTooLong(error) || messageAttributes?.contentType)
73
+ throw error;
74
+ const gzipped = await (0, snsMessage_1.gzipSnsMessage)(payload.Message, payload.MessageAttributes);
75
+ console.warn(`SNS message to ${this.name} exceeded the size limit, retrying gzip-compressed (${payload.Message.length} -> ${gzipped.Message.length} chars)`);
76
+ return await this.sns.publish({ ...payload, ...gzipped });
77
+ }
60
78
  }
61
79
  }
62
80
  exports.Topic = Topic;
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"Topic.js","sourceRoot":"","sources":["../../../src/queue/Topic.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,25 @@
1
+ import { MessageAttributeValue } from '@aws-sdk/client-sns';
2
+ /**
3
+ * Publishers send to SNS, which delivers to the queue without raw message
4
+ * delivery, so the SQS message body is the SNS envelope and the message
5
+ * attributes sit inside it rather than on the SQS message itself.
6
+ */
7
+ export type SnsEnvelope = {
8
+ Subject: string;
9
+ Message: string;
10
+ MessageAttributes?: Record<string, {
11
+ Type?: string;
12
+ Value?: string;
13
+ }>;
14
+ };
15
+ export declare const gzipSnsMessage: (message: string, attributes?: Record<string, MessageAttributeValue>) => Promise<{
16
+ Message: string;
17
+ MessageAttributes: {
18
+ contentType: {
19
+ DataType: string;
20
+ StringValue: string;
21
+ };
22
+ };
23
+ }>;
24
+ export declare const compressionOf: ({ MessageAttributes }: SnsEnvelope) => string | undefined;
25
+ export declare const decodeSnsMessage: (envelope: SnsEnvelope) => Promise<any>;
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.decodeSnsMessage = exports.compressionOf = exports.gzipSnsMessage = void 0;
4
+ const util_1 = require("util");
5
+ const zlib_1 = require("zlib");
6
+ const decompressors = new Map([
7
+ ['brotli', (0, util_1.promisify)(zlib_1.brotliDecompress)],
8
+ ['gzip', (0, util_1.promisify)(zlib_1.gunzip)],
9
+ ]);
10
+ const gzipAsync = (0, util_1.promisify)(zlib_1.gzip);
11
+ const gzipSnsMessage = async (message, attributes) => ({
12
+ Message: (await gzipAsync(message)).toString('base64'),
13
+ MessageAttributes: {
14
+ ...attributes,
15
+ contentType: { DataType: 'String', StringValue: 'gzip' },
16
+ },
17
+ });
18
+ exports.gzipSnsMessage = gzipSnsMessage;
19
+ const compressionOf = ({ MessageAttributes }) => {
20
+ const contentType = MessageAttributes?.contentType?.Value ?? '';
21
+ return decompressors.has(contentType) ? contentType : undefined;
22
+ };
23
+ exports.compressionOf = compressionOf;
24
+ const decodeSnsMessage = async (envelope) => {
25
+ const decompress = decompressors.get((0, exports.compressionOf)(envelope) ?? '');
26
+ const message = decompress
27
+ ? (await decompress(Buffer.from(envelope.Message, 'base64'))).toString()
28
+ : envelope.Message;
29
+ return JSON.parse(message);
30
+ };
31
+ exports.decodeSnsMessage = decodeSnsMessage;
32
+ //# sourceMappingURL=snsMessage.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"snsMessage.js","sourceRoot":"","sources":["../../../src/queue/snsMessage.ts"],"names":[],"mappings":";;;AACA,+BAA+B;AAC/B,+BAAoD;AAapD,MAAM,aAAa,GAAG,IAAI,GAAG,CAA8C;IACzE,CAAC,QAAQ,EAAE,IAAA,gBAAS,EAAC,uBAAgB,CAAC,CAAC;IACvC,CAAC,MAAM,EAAE,IAAA,gBAAS,EAAC,aAAM,CAAC,CAAC;CAC5B,CAAC,CAAC;AACH,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,WAAI,CAAC,CAAC;AAE3B,MAAM,cAAc,GAAG,KAAK,EACjC,OAAe,EACf,UAAkD,EAClD,EAAE,CAAC,CAAC;IACJ,OAAO,EAAE,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACtD,iBAAiB,EAAE;QACjB,GAAG,UAAU;QACb,WAAW,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAC;KACvD;CACF,CAAC,CAAC;AATU,QAAA,cAAc,kBASxB;AAEI,MAAM,aAAa,GAAG,CAAC,EAAC,iBAAiB,EAAc,EAAE,EAAE;IAChE,MAAM,WAAW,GAAG,iBAAiB,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC;IAChE,OAAO,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB;AAEK,MAAM,gBAAgB,GAAG,KAAK,EAAE,QAAqB,EAAE,EAAE;IAC9D,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,IAAA,qBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,UAAU;QACxB,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;IACrB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tibber-aws",
3
- "version": "7.2.2",
3
+ "version": "7.4.0",
4
4
  "description": "",
5
5
  "main": "./dist/src/index.js",
6
6
  "scripts": {
@@ -51,7 +51,7 @@
51
51
  "resolutions": {
52
52
  "undici": "^7.24.4",
53
53
  "flatted": "^3.4.0",
54
- "fast-xml-parser": "~5.11.0",
54
+ "fast-xml-parser": "~5.12.0",
55
55
  "picomatch": "4.0.7",
56
56
  "yaml": "2.9.1",
57
57
  "**/libnpmdiff/diff": "8.0.4",
package/readme.md CHANGED
@@ -46,7 +46,9 @@ created, then rerun the `deploy` job. A merge with no pending release logs
46
46
  ## Features
47
47
 
48
48
  ### Queue Message Compression Support
49
- The library now supports automatic decompression of SQS messages compressed with Brotli or GZip. Messages with a `contentType` message attribute set to `brotli` or `gzip` will be automatically decompressed.
49
+ If `Topic.push` rejects a message as too long it will retry with gzip-compression (base64, `contentType: gzip`). The same format `Tibber.Services.Utilities` uses. Messages that fit are never compressed. If you set `contentType` the size error is rethrown.
50
+
51
+ The library supports automatic decompression of SQS messages compressed with Brotli or GZip. Messages with a `contentType` message attribute set to `brotli` or `gzip` will be automatically decompressed. Consumers that don't use `QueueSubjectListener` can call `decodeSnsMessage(JSON.parse(sqsMessage.Body))` directly.
50
52
 
51
53
  ```typescript
52
54
  import {QueueSubjectListener, Queue} from 'tibber-aws';
@@ -64,7 +66,7 @@ listener.listen();
64
66
 
65
67
  ## Usage — application owns the queue/topic
66
68
 
67
- ```
69
+ ```ts
68
70
  import {Topic, Queue} from 'tibber-aws';
69
71
 
70
72
  const topic = await Topic.createTopic('test-topic', 'test subject');
@@ -110,6 +112,7 @@ listener.listen();
110
112
 
111
113
  // Publisher
112
114
  const topic = await Topic.attach('test-topic', 'test subject');
115
+ await topic.verify() //optional - verifies the topic exists
113
116
  await topic.push({test: 'test'});
114
117
  ```
115
118