tibber-aws 5.4.1 → 5.4.2

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.
@@ -22,8 +22,11 @@ class QueueSubjectListener {
22
22
  this.handlers[subjectName].push(handler);
23
23
  }
24
24
  listen(params) {
25
- const { MaxNumberOfMessages, VisibilityTimeout, WaitTimeSeconds, receiveTimeout, } = Object.assign({}, this.options, params);
26
- // const self = this;
25
+ var _a, _b, _c;
26
+ const MaxNumberOfMessages = (_a = params === null || params === void 0 ? void 0 : params.MaxNumberOfMessages) !== null && _a !== void 0 ? _a : this.options.maxConcurrentMessage;
27
+ const VisibilityTimeout = (_b = params === null || params === void 0 ? void 0 : params.VisibilityTimeout) !== null && _b !== void 0 ? _b : this.options.visibilityTimeout;
28
+ const WaitTimeSeconds = (_c = params === null || params === void 0 ? void 0 : params.WaitTimeSeconds) !== null && _c !== void 0 ? _c : this.options.waitTimeSeconds;
29
+ const receiveTimeout = this.options.receiveTimeout;
27
30
  let cntInFlight = 0;
28
31
  const handlerFunc = async () => {
29
32
  try {
@@ -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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"}
@@ -1,5 +1,6 @@
1
1
  import { ILogger } from '../ILogger';
2
2
  import { QueueSubjectListener } from './QueueSubjectListener';
3
+ import { Topic } from './Topic';
3
4
  interface ITopic {
4
5
  name: string;
5
6
  subject: string;
@@ -7,8 +8,8 @@ interface ITopic {
7
8
  export declare class QueueSubjectListenerBuilder {
8
9
  queueName: string;
9
10
  logger?: ILogger | null | undefined;
10
- topics: Array<ITopic>;
11
- constructor(queueName: string, logger?: ILogger | null | undefined, ...topics: Array<ITopic>);
11
+ topics: Array<ITopic | Topic>;
12
+ constructor(queueName: string, logger?: ILogger | null | undefined, ...topics: Array<ITopic | Topic>);
12
13
  build(): Promise<QueueSubjectListener>;
13
14
  }
14
15
  export {};
@@ -15,7 +15,15 @@ class QueueSubjectListenerBuilder {
15
15
  throw new Error('"queueName" must be specified');
16
16
  const queue = await Queue_1.Queue.createQueue(this.queueName);
17
17
  for (const t of this.topics) {
18
- const topic = await Topic_1.Topic.createTopic(t.name, t.subject);
18
+ let topic;
19
+ if (!(t instanceof Topic_1.Topic)) {
20
+ topic = await Topic_1.Topic.createTopic(t.name, t.subject);
21
+ }
22
+ else {
23
+ topic = t;
24
+ }
25
+ if (topic.topicArn === undefined)
26
+ throw new Error('"topicArn" must be specified');
19
27
  await queue.subscribeTopic(topic);
20
28
  }
21
29
  return new QueueSubjectListener_1.QueueSubjectListener(queue, this.logger);
@@ -1 +1 @@
1
- {"version":3,"file":"QueueSubjectListenerBuilder.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListenerBuilder.ts"],"names":[],"mappings":";;;AACA,mCAA8B;AAC9B,iEAA4D;AAC5D,mCAA8B;AAO9B,MAAa,2BAA2B;IAGtC,YACS,SAAiB,EACjB,MAAmC,EAC1C,GAAG,MAAqB;QAFjB,cAAS,GAAT,SAAS,CAAQ;QACjB,WAAM,GAAN,MAAM,CAA6B;QAG1C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,MAAM,aAAK,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,MAAM,KAAK,GAAG,MAAM,aAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;SACnC;QAED,OAAO,IAAI,2CAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;CACF;AAvBD,kEAuBC"}
1
+ {"version":3,"file":"QueueSubjectListenerBuilder.js","sourceRoot":"","sources":["../../../src/queue/QueueSubjectListenerBuilder.ts"],"names":[],"mappings":";;;AACA,mCAA8B;AAC9B,iEAA4D;AAC5D,mCAA8B;AAO9B,MAAa,2BAA2B;IAGtC,YACS,SAAiB,EACjB,MAAmC,EAC1C,GAAG,MAA6B;QAFzB,cAAS,GAAT,SAAS,CAAQ;QACjB,WAAM,GAAN,MAAM,CAA6B;QAG1C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,MAAM,aAAK,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,IAAI,KAAK,CAAC;YACV,IAAI,CAAC,CAAC,CAAC,YAAY,aAAK,CAAC,EAAE;gBACzB,KAAK,GAAG,MAAM,aAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;aACpD;iBAAM;gBACL,KAAK,GAAG,CAAC,CAAC;aACX;YAED,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS;gBAC9B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAElD,MAAM,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;SACnC;QAED,OAAO,IAAI,2CAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;CACF;AAhCD,kEAgCC"}
@@ -3,13 +3,14 @@ import AWS from 'aws-sdk';
3
3
  import { CreationDate } from 'aws-sdk/clients/s3';
4
4
  export declare class S3Bucket {
5
5
  private bucket;
6
+ endpoint?: string | undefined;
6
7
  name: string;
7
8
  creationDate: CreationDate;
8
9
  private s3;
9
- constructor(bucket: AWS.S3.Bucket);
10
- static getBucket(bucketName: string): Promise<S3Bucket>;
11
- static getBuckets(): Promise<S3Bucket[]>;
12
- static deleteIfExsists(bucketName: string): Promise<boolean>;
10
+ constructor(bucket: AWS.S3.Bucket, endpoint?: string | undefined);
11
+ static getBucket(bucketName: string, endpoint?: string): Promise<S3Bucket>;
12
+ static getBuckets(endpoint?: string): Promise<S3Bucket[]>;
13
+ static deleteIfExsists(bucketName: string, endpoint?: string): Promise<boolean>;
13
14
  putObject(key: string, body: AWS.S3.PutObjectRequest['Body'], contentType?: AWS.S3.PutObjectRequest['ContentType']): Promise<import("aws-sdk/lib/request").PromiseResult<AWS.S3.PutObjectOutput, AWS.AWSError>>;
14
15
  getObject(key: string): Promise<import("aws-sdk/lib/request").PromiseResult<AWS.S3.GetObjectOutput, AWS.AWSError>>;
15
16
  getObjectAsStream(key: string): AWS.Request<AWS.S3.GetObjectOutput, AWS.AWSError>;
@@ -6,36 +6,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.S3Bucket = void 0;
7
7
  const aws_sdk_1 = __importDefault(require("aws-sdk"));
8
8
  class S3Bucket {
9
- constructor(bucket) {
9
+ constructor(bucket, endpoint) {
10
10
  this.bucket = bucket;
11
+ this.endpoint = endpoint;
11
12
  if (bucket.Name === undefined)
12
13
  throw Error("Property 'Name' on 'bucket' was undefined.");
13
14
  if (bucket.CreationDate === undefined)
14
15
  throw Error("Property 'CreationDate' on 'bucket' was undefined.");
15
16
  this.name = bucket.Name;
16
17
  this.creationDate = bucket.CreationDate;
17
- this.s3 = new aws_sdk_1.default.S3({ apiVersion: '2006-03-01' });
18
+ this.s3 = new aws_sdk_1.default.S3({
19
+ apiVersion: '2006-03-01',
20
+ endpoint: this.endpoint,
21
+ s3ForcePathStyle: !!endpoint,
22
+ });
18
23
  }
19
- static async getBucket(bucketName) {
24
+ static async getBucket(bucketName, endpoint) {
20
25
  try {
21
- const s3 = new aws_sdk_1.default.S3({ apiVersion: '2006-03-01' });
26
+ const s3 = new aws_sdk_1.default.S3({
27
+ apiVersion: '2006-03-01',
28
+ endpoint,
29
+ s3ForcePathStyle: !!endpoint,
30
+ });
22
31
  await s3.createBucket({ Bucket: bucketName }).promise();
23
32
  return new S3Bucket({
24
33
  CreationDate: new Date(Date.now()),
25
34
  Name: bucketName,
26
- });
35
+ }, endpoint);
27
36
  }
28
37
  catch (err) {
29
38
  if (err.code === 'BucketAlreadyOwnedByYou') {
30
- return (await S3Bucket.getBuckets()).filter(b => b.name === bucketName)[0];
39
+ return (await S3Bucket.getBuckets(endpoint)).filter(b => b.name === bucketName)[0];
31
40
  }
32
41
  console.log(err);
33
42
  throw err;
34
43
  }
35
44
  }
36
- static async getBuckets() {
45
+ static async getBuckets(endpoint) {
37
46
  try {
38
- const result = await new aws_sdk_1.default.S3({ apiVersion: '2006-03-01' })
47
+ const result = await new aws_sdk_1.default.S3({
48
+ apiVersion: '2006-03-01',
49
+ endpoint,
50
+ s3ForcePathStyle: !!endpoint,
51
+ })
39
52
  .listBuckets()
40
53
  .promise();
41
54
  if (!result.Buckets)
@@ -46,9 +59,13 @@ class S3Bucket {
46
59
  return [];
47
60
  }
48
61
  }
49
- static async deleteIfExsists(bucketName) {
62
+ static async deleteIfExsists(bucketName, endpoint) {
50
63
  try {
51
- await new aws_sdk_1.default.S3({ apiVersion: '2006-03-01' })
64
+ await new aws_sdk_1.default.S3({
65
+ apiVersion: '2006-03-01',
66
+ endpoint,
67
+ s3ForcePathStyle: !!endpoint,
68
+ })
52
69
  .deleteBucket({ Bucket: bucketName })
53
70
  .promise();
54
71
  return true;
@@ -1 +1 @@
1
- {"version":3,"file":"S3Bucket.js","sourceRoot":"","sources":["../../../src/s3/S3Bucket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"S3Bucket.js","sourceRoot":"","sources":["../../../src/s3/S3Bucket.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tibber-aws",
3
- "version": "5.4.1",
3
+ "version": "5.4.2",
4
4
  "description": "",
5
5
  "main": "./dist/src/index.js",
6
6
  "scripts": {