@eyevinn/player-analytics-shared 0.7.0 → 0.7.1
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.
|
@@ -7,6 +7,8 @@ import {
|
|
|
7
7
|
DeleteMessageCommandInput,
|
|
8
8
|
Message,
|
|
9
9
|
DeleteMessageCommand,
|
|
10
|
+
paginateListQueues,
|
|
11
|
+
CreateQueueCommand,
|
|
10
12
|
} from '@aws-sdk/client-sqs';
|
|
11
13
|
import { AbstractQueueAdapter } from '../../types/interfaces';
|
|
12
14
|
import winston from 'winston';
|
|
@@ -14,6 +16,8 @@ import winston from 'winston';
|
|
|
14
16
|
export class SqsQueueAdapter implements AbstractQueueAdapter {
|
|
15
17
|
logger: winston.Logger;
|
|
16
18
|
client: SQSClient;
|
|
19
|
+
queueUrl: string;
|
|
20
|
+
queueExists: boolean = false;
|
|
17
21
|
|
|
18
22
|
constructor(logger: winston.Logger) {
|
|
19
23
|
this.logger = logger;
|
|
@@ -23,14 +27,45 @@ export class SqsQueueAdapter implements AbstractQueueAdapter {
|
|
|
23
27
|
} else {
|
|
24
28
|
region = process.env.AWS_REGION;
|
|
25
29
|
}
|
|
30
|
+
this.queueUrl = process.env.SQS_QUEUE_URL!;
|
|
26
31
|
this.logger.info(`SQS Region: ${region}`);
|
|
27
32
|
this.client = new SQSClient({ region: region, endpoint: process.env.SQS_ENDPOINT });
|
|
28
33
|
}
|
|
29
34
|
|
|
35
|
+
private async checkQueueExists(): Promise<boolean> {
|
|
36
|
+
const paginatedQueues = paginateListQueues({ client: this.client }, {});
|
|
37
|
+
const queues: string[] = [];
|
|
38
|
+
|
|
39
|
+
for await (const page of paginatedQueues) {
|
|
40
|
+
if (page.QueueUrls?.length) {
|
|
41
|
+
queues.push(...page.QueueUrls);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return queues.find((queue) => queue === this.queueUrl) ? true : false;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
private async createQueue() {
|
|
48
|
+
const command = new CreateQueueCommand({
|
|
49
|
+
QueueName: new URL(this.queueUrl).pathname.split('/').pop()
|
|
50
|
+
});
|
|
51
|
+
const response = await this.client.send(command);
|
|
52
|
+
this.logger.info(`Queue created: ${response.QueueUrl} (expected ${this.queueUrl})`);
|
|
53
|
+
}
|
|
54
|
+
|
|
30
55
|
async pushToQueue(event: Object): Promise<any> {
|
|
31
|
-
if (
|
|
56
|
+
if (this.queueUrl === 'undefined') {
|
|
32
57
|
return { message: 'SQS_QUEUE_URL is undefined' };
|
|
33
58
|
}
|
|
59
|
+
if (!this.queueExists) {
|
|
60
|
+
this.logger.info('Checking if queue exists');
|
|
61
|
+
if (!(await this.checkQueueExists())) {
|
|
62
|
+
this.logger.error('Queue does not exist, creating queue');
|
|
63
|
+
await this.createQueue();
|
|
64
|
+
this.queueExists = true;
|
|
65
|
+
} else {
|
|
66
|
+
this.queueExists = true;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
34
69
|
const params: SendMessageCommandInput = {
|
|
35
70
|
MessageAttributes: {
|
|
36
71
|
Event: {
|
|
@@ -4,7 +4,11 @@ import winston from 'winston';
|
|
|
4
4
|
export declare class SqsQueueAdapter implements AbstractQueueAdapter {
|
|
5
5
|
logger: winston.Logger;
|
|
6
6
|
client: SQSClient;
|
|
7
|
+
queueUrl: string;
|
|
8
|
+
queueExists: boolean;
|
|
7
9
|
constructor(logger: winston.Logger);
|
|
10
|
+
private checkQueueExists;
|
|
11
|
+
private createQueue;
|
|
8
12
|
pushToQueue(event: Object): Promise<any>;
|
|
9
13
|
pullFromQueue(): Promise<any>;
|
|
10
14
|
removeFromQueue(queueMsg: Message): Promise<any>;
|
|
@@ -8,11 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
12
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
13
|
+
var m = o[Symbol.asyncIterator], i;
|
|
14
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
15
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
16
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
17
|
+
};
|
|
11
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
19
|
exports.SqsQueueAdapter = void 0;
|
|
13
20
|
const client_sqs_1 = require("@aws-sdk/client-sqs");
|
|
14
21
|
class SqsQueueAdapter {
|
|
15
22
|
constructor(logger) {
|
|
23
|
+
this.queueExists = false;
|
|
16
24
|
this.logger = logger;
|
|
17
25
|
let region;
|
|
18
26
|
if ('QUEUE_REGION' in process.env) {
|
|
@@ -21,14 +29,59 @@ class SqsQueueAdapter {
|
|
|
21
29
|
else {
|
|
22
30
|
region = process.env.AWS_REGION;
|
|
23
31
|
}
|
|
32
|
+
this.queueUrl = process.env.SQS_QUEUE_URL;
|
|
24
33
|
this.logger.info(`SQS Region: ${region}`);
|
|
25
34
|
this.client = new client_sqs_1.SQSClient({ region: region, endpoint: process.env.SQS_ENDPOINT });
|
|
26
35
|
}
|
|
36
|
+
checkQueueExists() {
|
|
37
|
+
var e_1, _a;
|
|
38
|
+
var _b;
|
|
39
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
const paginatedQueues = (0, client_sqs_1.paginateListQueues)({ client: this.client }, {});
|
|
41
|
+
const queues = [];
|
|
42
|
+
try {
|
|
43
|
+
for (var paginatedQueues_1 = __asyncValues(paginatedQueues), paginatedQueues_1_1; paginatedQueues_1_1 = yield paginatedQueues_1.next(), !paginatedQueues_1_1.done;) {
|
|
44
|
+
const page = paginatedQueues_1_1.value;
|
|
45
|
+
if ((_b = page.QueueUrls) === null || _b === void 0 ? void 0 : _b.length) {
|
|
46
|
+
queues.push(...page.QueueUrls);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
51
|
+
finally {
|
|
52
|
+
try {
|
|
53
|
+
if (paginatedQueues_1_1 && !paginatedQueues_1_1.done && (_a = paginatedQueues_1.return)) yield _a.call(paginatedQueues_1);
|
|
54
|
+
}
|
|
55
|
+
finally { if (e_1) throw e_1.error; }
|
|
56
|
+
}
|
|
57
|
+
return queues.find((queue) => queue === this.queueUrl) ? true : false;
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
createQueue() {
|
|
61
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
62
|
+
const command = new client_sqs_1.CreateQueueCommand({
|
|
63
|
+
QueueName: new URL(this.queueUrl).pathname.split('/').pop()
|
|
64
|
+
});
|
|
65
|
+
const response = yield this.client.send(command);
|
|
66
|
+
this.logger.info(`Queue created: ${response.QueueUrl} (expected ${this.queueUrl})`);
|
|
67
|
+
});
|
|
68
|
+
}
|
|
27
69
|
pushToQueue(event) {
|
|
28
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
if (
|
|
71
|
+
if (this.queueUrl === 'undefined') {
|
|
30
72
|
return { message: 'SQS_QUEUE_URL is undefined' };
|
|
31
73
|
}
|
|
74
|
+
if (!this.queueExists) {
|
|
75
|
+
this.logger.info('Checking if queue exists');
|
|
76
|
+
if (!(yield this.checkQueueExists())) {
|
|
77
|
+
this.logger.error('Queue does not exist, creating queue');
|
|
78
|
+
yield this.createQueue();
|
|
79
|
+
this.queueExists = true;
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
this.queueExists = true;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
32
85
|
const params = {
|
|
33
86
|
MessageAttributes: {
|
|
34
87
|
Event: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqsQueueAdapter.js","sourceRoot":"","sources":["../../../adapters/queue/SqsQueueAdapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SqsQueueAdapter.js","sourceRoot":"","sources":["../../../adapters/queue/SqsQueueAdapter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -36,6 +36,8 @@ describe('SQS Queue Adapter', () => {
|
|
|
36
36
|
playhead: 0,
|
|
37
37
|
duration: 0,
|
|
38
38
|
};
|
|
39
|
+
// Using any type assertion to bypass TypeScript's type checking on spyOn
|
|
40
|
+
spyOn(adapter as any, 'checkQueueExists').and.returnValue(true);
|
|
39
41
|
sqsMock.on(SendMessageCommand).resolves(sqsResp);
|
|
40
42
|
const result = await adapter.pushToQueue(event);
|
|
41
43
|
expect(result).toEqual(sqsResp);
|
|
@@ -52,6 +54,8 @@ describe('SQS Queue Adapter', () => {
|
|
|
52
54
|
playhead: 0,
|
|
53
55
|
duration: 0,
|
|
54
56
|
};
|
|
57
|
+
// Using any type assertion to bypass TypeScript's type checking on spyOn
|
|
58
|
+
spyOn(adapter as any, 'checkQueueExists').and.returnValue(true);
|
|
55
59
|
sqsMock.on(SendMessageCommand).resolves(sqsResp);
|
|
56
60
|
const result = await adapter.pushToQueue(event);
|
|
57
61
|
expect(result).toEqual(sqsResp);
|
|
@@ -139,6 +143,10 @@ describe('SQS Queue Adapter', () => {
|
|
|
139
143
|
sqsMock.on(ReceiveMessageCommand).rejects(errMsg);
|
|
140
144
|
sqsMock.on(DeleteMessageCommand).rejects(errMsg);
|
|
141
145
|
const queueAdapter = new SqsQueueAdapter(Logger);
|
|
146
|
+
|
|
147
|
+
// Using any type assertion to bypass TypeScript's type checking on spyOn
|
|
148
|
+
spyOn(queueAdapter as any, 'checkQueueExists').and.returnValue(true);
|
|
149
|
+
|
|
142
150
|
let pushResult = await queueAdapter.pushToQueue(mockEvent);
|
|
143
151
|
let readResult = await queueAdapter.pullFromQueue();
|
|
144
152
|
let removeResult = await queueAdapter.removeFromQueue(mockSQSMessage);
|