@webda/core 1.2.1 → 1.6.0-beta.0

package/lib/queues/memoryqueue.spec.js

@@ -14,68 +14,145 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var MemoryQueueTest_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert = require("assert");
 const mocha_1 = require("@testdeck/mocha");
 const memoryqueue_1 = require("./memoryqueue");
 const queue_spec_1 = require("./queue.spec");
-let MemoryQueueTest = class MemoryQueueTest extends queue_spec_1.QueueTest {
+class Title {
+    constructor(title) {
+        this.title = title;
+    }
+}
+let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends queue_spec_1.QueueTest {
+    receiveMessage(proto) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log("receiveMessage", MemoryQueueTest_1.seq);
+            MemoryQueueTest_1.seq++;
+            switch (MemoryQueueTest_1.seq) {
+                case 1:
+                    // Test the resume if no messages available
+                    return [];
+                case 2:
+                    return [
+                        {
+                            ReceiptHandle: "msg1",
+                            Message: MemoryQueueTest_1.queue.unserialize(JSON.stringify({ title: "plop" }), proto)
+                        }
+                    ];
+                case 3:
+                    throw Error();
+                case 4:
+                    // An error occured it should double the pause
+                    // @ts-ignore
+                    MemoryQueueTest_1.failedIterations.push(MemoryQueueTest_1.queue.failedIterations);
+                    return Promise.resolve([
+                        {
+                            ReceiptHandle: "msg2",
+                            Message: MemoryQueueTest_1.queue.unserialize(JSON.stringify({ title: "plop2" }), proto)
+                        }
+                    ]);
+                case 5:
+                    // Error on callback dont generate a double delay
+                    // @ts-ignore
+                    MemoryQueueTest_1.failedIterations.push(MemoryQueueTest_1.queue.failedIterations);
+                    MemoryQueueTest_1.resolve(MemoryQueueTest_1.workerPromise.cancel());
+                    return [];
+            }
+        });
+    }
+    receiveMessageParallelism(proto) {
+        return __awaiter(this, void 0, void 0, function* () {
+            MemoryQueueTest_1.seq++;
+            switch (MemoryQueueTest_1.seq) {
+                case 1:
+                    return [
+                        {
+                            ReceiptHandle: "msg1",
+                            Message: { title: "plop" }
+                        },
+                        {
+                            ReceiptHandle: "msg2",
+                            Message: { title: "plop2" }
+                        }
+                    ];
+                case 2:
+                    MemoryQueueTest_1.resolve(MemoryQueueTest_1.workerPromise.cancel());
+                    return [];
+            }
+        });
+    }
     worker() {
         return __awaiter(this, void 0, void 0, function* () {
+            MemoryQueueTest_1.failedIterations = [];
             yield new Promise(resolve => {
-                let queue = new memoryqueue_1.MemoryQueue(undefined, undefined, undefined);
-                let seq = 0;
+                MemoryQueueTest_1.resolve = resolve;
+                let queue = new memoryqueue_1.MemoryQueue(this.webda, "q", {
+                    workerParallelism: false
+                });
+                MemoryQueueTest_1.queue = queue;
+                // @ts-ignore
+                queue.delayer = () => 1;
+                MemoryQueueTest_1.seq = 0;
                 // @ts-ignore
                 queue._webda = {
                     log: () => { }
                 };
-                queue.receiveMessage = () => {
-                    seq++;
-                    switch (seq) {
-                        case 1:
-                            // Test the resume if no messages available
-                            return Promise.resolve([]);
-                        case 2:
-                            return Promise.resolve([
-                                {
-                                    ReceiptHandle: "msg1",
-                                    Body: '{"title":"plop"}'
-                                }
-                            ]);
-                        case 3:
-                            throw Error();
-                        case 4:
-                            // An error occured it should double the pause
-                            assert.strictEqual(queue.pause, 2);
-                            return Promise.resolve([
-                                {
-                                    ReceiptHandle: "msg2",
-                                    Body: '{"title":"plop2"}'
-                                }
-                            ]);
-                        case 5:
-                            // Error on callback dont generate a double delay
-                            assert.strictEqual(queue.pause, 2);
-                            resolve(queue.stop());
-                    }
-                };
+                queue.receiveMessage = this.receiveMessage.bind(queue);
                 queue.deleteMessage = (handle) => __awaiter(this, void 0, void 0, function* () {
                     // Should only have the msg1 handle in deleteMessage as msg2 is fake error
                     assert.strictEqual(handle, "msg1");
                 });
-                let callback = event => {
-                    switch (seq) {
+                let callback = (event) => __awaiter(this, void 0, void 0, function* () {
+                    switch (MemoryQueueTest_1.seq) {
                         case 2:
                             assert.strictEqual(event.title, "plop");
                             return;
                         case 4:
                             // Simulate error in callback
                             throw Error();
-                            return;
                     }
-                };
-                queue.worker(callback);
+                });
+                MemoryQueueTest_1.workerPromise = queue.consume(callback, Title);
+            });
+            assert.deepStrictEqual(MemoryQueueTest_1.failedIterations, [1, 0]);
+        });
+    }
+    parallelized() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let op = 0;
+            const run = (parallel) => __awaiter(this, void 0, void 0, function* () {
+                yield new Promise(resolve => {
+                    let queue = new memoryqueue_1.MemoryQueue(this.webda, "q", { workerParallelism: parallel });
+                    MemoryQueueTest_1.queue = queue;
+                    MemoryQueueTest_1.resolve = resolve;
+                    // @ts-ignore
+                    queue.delayer = () => 1;
+                    MemoryQueueTest_1.seq = 0;
+                    // @ts-ignore
+                    queue._webda = {
+                        log: () => { }
+                    };
+                    queue.receiveMessage = this.receiveMessageParallelism.bind(queue);
+                    queue.deleteMessage = (handle) => __awaiter(this, void 0, void 0, function* () { });
+                    let callback = (event) => __awaiter(this, void 0, void 0, function* () {
+                        if (event.title === "plop") {
+                            yield this.sleep(300);
+                            op = 1;
+                        }
+                        else {
+                            yield this.sleep(100);
+                            op *= 2;
+                        }
+                    });
+                    MemoryQueueTest_1.workerPromise = queue.consume(callback, undefined);
+                });
             });
+            yield run(true);
+            assert.strictEqual(op, 1, 'It should have been run in parallel so op=0 as *2 will happen before =1"');
+            yield run(false);
+            assert.strictEqual(op, 2, 'It should have been run in parallel so op=2 as *2 will happen after =1"');
         });
     }
     basic() {
@@ -88,18 +165,44 @@ let MemoryQueueTest = class MemoryQueueTest extends queue_spec_1.QueueTest {
             assert.strictEqual(queue.getParameters().expire, 30000, "default should be 30s");
             queue.getParameters().expire = 1000;
             queue.__clean();
+            // Should not have issue with unknown receipt
+            queue.deleteMessage("bouzouf");
             assert.strictEqual((yield queue.receiveMessage()).length, 0);
             return this.simple(queue);
         });
     }
+    uuid() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let queue = this.getService("memoryqueue");
+            let first = true;
+            let callCount = 0;
+            // @ts-ignore
+            queue._queue = new Proxy(queue._queue, {
+                get: (q, prop) => {
+                    callCount += 1;
+                    if (callCount === 1) {
+                        return "plop";
+                    }
+                }
+            });
+            yield queue.sendMessage({});
+            assert.strictEqual(callCount, 2);
+        });
+    }
 };
 __decorate([
     mocha_1.test
 ], MemoryQueueTest.prototype, "worker", null);
+__decorate([
+    mocha_1.test
+], MemoryQueueTest.prototype, "parallelized", null);
 __decorate([
     mocha_1.test
 ], MemoryQueueTest.prototype, "basic", null);
-MemoryQueueTest = __decorate([
+__decorate([
+    mocha_1.test
+], MemoryQueueTest.prototype, "uuid", null);
+MemoryQueueTest = MemoryQueueTest_1 = __decorate([
     mocha_1.suite
 ], MemoryQueueTest);
 //# sourceMappingURL=memoryqueue.spec.js.map

package/lib/queues/memoryqueue.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"memoryqueue.spec.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memoryqueue.spec.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.spec.ts"],"names":[],"mappings":"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"}

package/lib/queues/pubsubservice.d.ts

@@ -0,0 +1,27 @@
+import { Service, ServiceParameters } from "../services/service";
+import { CancelablePromise } from "../utils/waiter";
+export default abstract class PubSubService<T = any, K extends ServiceParameters = ServiceParameters> extends Service<K> {
+    /**
+     * Send an event to the queue
+     * @param event
+     */
+    abstract sendMessage(event: T): Promise<void>;
+    /**
+     * Unserialize into class
+     * @param data
+     * @param proto
+     * @returns
+     */
+    unserialize<L>(data: string, proto?: {
+        new (): L;
+    }): L;
+    /**
+     * Subscribe to a channel calling the callback with every Event received
+     * @param callback
+     * @param eventPrototype
+     */
+    abstract consume(callback: (event: T) => Promise<void>, eventPrototype?: {
+        new (): T;
+    }, onBind?: () => void): CancelablePromise;
+}
+export { PubSubService };

package/lib/queues/pubsubservice.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PubSubService = void 0;
+const service_1 = require("../services/service");
+class PubSubService extends service_1.Service {
+    /**
+     * Unserialize into class
+     * @param data
+     * @param proto
+     * @returns
+     */
+    unserialize(data, proto) {
+        if (proto) {
+            return Object.assign(new proto(), JSON.parse(data));
+        }
+        return JSON.parse(data);
+    }
+}
+exports.default = PubSubService;
+exports.PubSubService = PubSubService;
+//# sourceMappingURL=pubsubservice.js.map

package/lib/queues/pubsubservice.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pubsubservice.js","sourceRoot":"","sources":["../../src/queues/pubsubservice.ts"],"names":[],"mappings":";;;AAAA,iDAAiE;AAGjE,MAA8B,aAG5B,SAAQ,iBAAU;IAOlB;;;;;OAKG;IACH,WAAW,CAAI,IAAY,EAAE,KAAqB;QAChD,IAAI,KAAK,EAAE;YACT,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACrD;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAYF;AAjCD,gCAiCC;AAEQ,sCAAa"}

package/lib/queues/queue.spec.js

@@ -12,20 +12,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueueTest = void 0;
 const test_1 = require("../test");
 const assert = require("assert");
+class QueueItemTest {
+    constructor(type) {
+        this.type = type;
+    }
+    getDouble() {
+        return this.type * 2;
+    }
+}
 class QueueTest extends test_1.WebdaTest {
     simple(queue, inconsistentSize = false) {
         return __awaiter(this, void 0, void 0, function* () {
             var msg;
-            yield queue.sendMessage({
-                type: 1
-            });
+            yield queue.sendMessage(new QueueItemTest(1));
             let size = yield queue.size();
             if (!inconsistentSize) {
                 assert.strictEqual(size, 1);
             }
-            yield queue.sendMessage({
-                type: 2
-            });
+            yield queue.sendMessage(new QueueItemTest(2));
             // Pause for 1s - to verify the repopulation
             yield this.sleep(1000);
             size = yield queue.size();
@@ -33,6 +37,7 @@ class QueueTest extends test_1.WebdaTest {
                 assert.strictEqual(size, 2);
             }
             msg = yield queue.receiveMessage();
+            assert.strictEqual(msg[0].Message.getDouble, undefined);
             size = yield queue.size();
             if (!inconsistentSize) {
                 assert.strictEqual(size, 2);
@@ -42,13 +47,17 @@ class QueueTest extends test_1.WebdaTest {
             }
             // Pause for 1s - to verify the repopulation
             yield this.sleep(1000);
-            msg = yield queue.receiveMessage();
+            msg = yield queue.receiveMessage(QueueItemTest);
+            assert.notStrictEqual(msg[0].Message.getDouble, undefined);
             if (!inconsistentSize) {
                 assert.strictEqual(msg.length, 1);
             }
             if (msg.length > 0) {
                 yield queue.deleteMessage(msg[0].ReceiptHandle);
             }
+            if (!inconsistentSize) {
+                assert.strictEqual(yield queue.size(), 0);
+            }
         });
     }
 }

package/lib/queues/queue.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue.spec.js","sourceRoot":"","sources":["../../src/queues/queue.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kCAAoC;AACpC,iCAAiC;AAEjC,MAAM,SAAU,SAAQ,gBAAS;IACzB,MAAM,CAAC,KAAK,EAAE,mBAA4B,KAAK;;YACnD,IAAI,GAAG,CAAC;YACR,MAAM,KAAK,CAAC,WAAW,CAAC;gBACtB,IAAI,EAAE,CAAC;aACR,CAAC,CAAC;YACH,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,MAAM,KAAK,CAAC,WAAW,CAAC;gBACtB,IAAI,EAAE,CAAC;aACR,CAAC,CAAC;YACH,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACnC,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;aACjD;YACD,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACnC,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aACnC;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;aACjD;QACH,CAAC;KAAA;CACF;AAEQ,8BAAS"}
+{"version":3,"file":"queue.spec.js","sourceRoot":"","sources":["../../src/queues/queue.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kCAAoC;AACpC,iCAAiC;AAEjC,MAAM,aAAa;IAGjB,YAAY,IAAa;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,SAAU,SAAQ,gBAAS;IACzB,MAAM,CAAC,KAAK,EAAE,mBAA4B,KAAK;;YACnD,IAAI,GAAG,CAAC;YACR,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACnC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACxD,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;aACjD;YACD,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAC3D,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aACnC;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;aACjD;YACD,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC;KAAA;CACF;AAEQ,8BAAS"}

package/lib/queues/queueservice.d.ts

@@ -1,24 +1,119 @@
-import { Service, ServiceParameters } from "../services/service";
+/// <reference types="node" />
+import { ServiceParameters } from "../services/service";
+import { WaitDelayerDefinition, WaitDelayer, CancelablePromise } from "../utils/waiter";
+import { PubSubService } from "./pubsubservice";
+/**
+ * Raw message from queue
+ */
+export interface MessageReceipt<T = any> {
+    /**
+     * Message
+     */
+    Message: T;
+    /**
+     * Id of message to acknowledge
+     */
+    ReceiptHandle: string;
+}
+/**
+ * @inheritdoc
+ */
+export declare class QueueParameters extends ServiceParameters {
+    /**
+     * Delayer between two failed attempts to process messages
+     */
+    workerDelayer?: WaitDelayerDefinition;
+    /**
+     * Define if worker should process multi message received in //
+     * @default true
+     */
+    workerParallelism?: boolean;
+    /**
+     * Max number of queue consumers
+     * Queue will auto increase to this max number if queue is loaded
+     * and it will decrease to just one consumer if no messages are available
+     *
+     * @default 10
+     */
+    maxConsumers: number;
+    /**
+     * @inheritdoc
+     */
+    constructor(params: any);
+}
 /**
  * AbstractQueue implements the worker system
  *
- * A Worker allows you to define how to process message from
+ * A Consumer allows you to define how to process message from
  * the queue, implementing the retries policy
  *
  * @category CoreServices
  */
-declare abstract class Queue<T extends ServiceParameters = ServiceParameters> extends Service<T> {
-    _timeout: any;
-    _interrupt: boolean;
-    callback: Function;
-    pause: number;
-    abstract sendMessage(params: any): Promise<void>;
-    abstract receiveMessage(): Promise<any>;
+declare abstract class Queue<T = any, K extends QueueParameters = QueueParameters> extends PubSubService<T, K> {
+    /**
+     * Current timeout handler
+     */
+    protected _timeout: NodeJS.Timeout;
+    /**
+     * Callback function to call for each message
+     */
+    private callback;
+    /**
+     * Current pause instance
+     */
+    protected failedIterations: number;
+    /**
+     * Delayer
+     */
+    protected delayer: WaitDelayer;
+    eventPrototype: new () => T;
+    /**
+     * Receive one or several messages
+     */
+    abstract receiveMessage<L>(proto?: {
+        new (): L;
+    }): Promise<MessageReceipt<L>[]>;
+    /**
+     * Delete one message based on its receipt
+     * @param id
+     */
     abstract deleteMessage(id: string): Promise<void>;
+    /**
+     * Return the size of the current queue
+     */
     abstract size(): Promise<number>;
-    _workerResume(): Promise<void>;
-    _workerReceiveMessage(): Promise<void>;
-    worker(callback: any): Promise<void>;
-    stop(): void;
+    /**
+     * Create the delayer
+     */
+    resolve(): void;
+    /**
+     * Receive and process message from the queue
+     *
+     * @returns
+     */
+    protected consumerReceiveMessage(): Promise<{
+        speed: number;
+        items: number;
+    }>;
+    /**
+     * Return the max consumers for the queue
+     *
+     * It is overridable so if a queue can retrieve several message at once
+     * it can just use the worker // and several messages at once
+     *
+     * SQS for example will return this.parameters.maxConsumers / 10
+     *
+     * @returns
+     */
+    getMaxConsumers(): number;
+    /**
+     * Work a queue calling the callback with every Event received
+     * If the callback is called without exception the `deleteMessage` is called
+     * @param callback
+     * @param eventPrototype
+     */
+    consume(callback: (event: T) => Promise<void>, eventPrototype?: {
+        new (): T;
+    }): CancelablePromise;
 }
 export { Queue };