@webda/core 2.0.0-beta.1 → 2.0.0

package/lib/queues/queue.spec.js

@@ -1,17 +1,5 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueueTest = void 0;
-const assert = require("assert");
-const test_1 = require("../test");
+import * as assert from "assert";
+import { WebdaTest } from "../test.js";
 class QueueItemTest {
     constructor(type) {
         this.type = type;
@@ -20,48 +8,46 @@ class QueueItemTest {
         return this.type * 2;
     }
 }
-class QueueTest extends test_1.WebdaTest {
-    simple(queue, inconsistentSize = false, ackDelayMs = 1000) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var msg;
-            this.log("DEBUG", "Send test message 1");
-            yield queue.sendMessage(new QueueItemTest(1));
-            let size = yield queue.size();
-            if (!inconsistentSize) {
-                assert.strictEqual(size, 1);
-            }
-            this.log("DEBUG", "Send test message 2");
-            yield queue.sendMessage(new QueueItemTest(2));
-            // Pause for 1s - to verify the repopulation
-            yield this.sleep(ackDelayMs);
-            size = yield queue.size();
-            if (!inconsistentSize) {
-                assert.strictEqual(size, 2);
-            }
-            this.log("DEBUG", "Receive a message");
-            msg = yield queue.receiveMessage();
-            assert.strictEqual(msg[0].Message.getDouble, undefined);
-            size = yield queue.size();
-            if (!inconsistentSize) {
-                assert.strictEqual(size, 2);
-            }
-            this.log("DEBUG", "Delete message");
-            yield queue.deleteMessage(msg[0].ReceiptHandle);
-            // Pause for 1s - to verify the repopulation
-            yield this.sleep(ackDelayMs);
-            this.log("DEBUG", "Receive a message with prototype");
-            msg = yield queue.receiveMessage(QueueItemTest);
-            assert.notStrictEqual(msg[0].Message.getDouble, undefined);
-            if (!inconsistentSize) {
-                assert.strictEqual(msg.length, 1);
-            }
-            this.log("DEBUG", "Delete message");
-            yield queue.deleteMessage(msg[0].ReceiptHandle);
-            if (!inconsistentSize) {
-                assert.strictEqual(yield queue.size(), 0);
-            }
-        });
+class QueueTest extends WebdaTest {
+    async simple(queue, inconsistentSize = false, ackDelayMs = 1000) {
+        var msg;
+        this.log("DEBUG", "Send test message 1");
+        await queue.sendMessage(new QueueItemTest(1));
+        let size = await queue.size();
+        if (!inconsistentSize) {
+            assert.strictEqual(size, 1);
+        }
+        this.log("DEBUG", "Send test message 2");
+        await queue.sendMessage(new QueueItemTest(2));
+        // Pause for 1s - to verify the repopulation
+        await this.sleep(ackDelayMs);
+        size = await queue.size();
+        if (!inconsistentSize) {
+            assert.strictEqual(size, 2);
+        }
+        this.log("DEBUG", "Receive a message");
+        msg = await queue.receiveMessage();
+        assert.strictEqual(msg[0].Message.getDouble, undefined);
+        size = await queue.size();
+        if (!inconsistentSize) {
+            assert.strictEqual(size, 2);
+        }
+        this.log("DEBUG", "Delete message");
+        await queue.deleteMessage(msg[0].ReceiptHandle);
+        // Pause for 1s - to verify the repopulation
+        await this.sleep(ackDelayMs);
+        this.log("DEBUG", "Receive a message with prototype");
+        msg = await queue.receiveMessage(QueueItemTest);
+        assert.notStrictEqual(msg[0].Message.getDouble, undefined);
+        if (!inconsistentSize) {
+            assert.strictEqual(msg.length, 1);
+        }
+        this.log("DEBUG", "Delete message");
+        await queue.deleteMessage(msg[0].ReceiptHandle);
+        if (!inconsistentSize) {
+            assert.strictEqual(await queue.size(), 0);
+        }
     }
 }
-exports.QueueTest = QueueTest;
+export { QueueTest };
 //# sourceMappingURL=queue.spec.js.map

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,iCAAiC;AACjC,kCAAoC;AAEpC,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,EAAE,aAAqB,IAAI;;YAC9E,IAAI,GAAG,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;YACzC,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,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;YACzC,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC7B,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,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YACvC,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,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YACpC,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAEhD,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;YACtD,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,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YACpC,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAEhD,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"}
+{"version":3,"file":"queue.spec.js","sourceRoot":"","sources":["../../src/queues/queue.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,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,SAAS;IAC/B,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,mBAA4B,KAAK,EAAE,aAAqB,IAAI;QAC9E,IAAI,GAAG,CAAC;QACR,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QACzC,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC7B;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QACzC,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,4CAA4C;QAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7B,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC7B;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;QACvC,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QACnC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACxD,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC7B;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACpC,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAEhD,4CAA4C;QAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;QACtD,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAChD,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;SACnC;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACpC,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAEhD,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;SAC3C;IACH,CAAC;CACF;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/lib/queues/queueservice.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { ServiceParameters } from "../services/service";
-import { CancelablePromise, WaitDelayer, WaitDelayerDefinition } from "../utils/waiter";
-import { PubSubService } from "./pubsubservice";
+import { ServiceParameters } from "../services/service.js";
+import { CancelablePromise, WaitDelayer, WaitDelayerDefinition } from "../utils/waiter.js";
+import { PubSubService } from "./pubsubservice.js";
 /**
  * Raw message from queue
  */
@@ -85,7 +85,7 @@ declare abstract class Queue<T = any, K extends QueueParameters = QueueParameter
     /**
      * Create the delayer
      */
-    resolve(): void;
+    resolve(): this;
     /**
      * Receive and process message from the queue
      *

package/lib/queues/queueservice.js

@@ -1,33 +1,19 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Queue = exports.QueueParameters = void 0;
-const service_1 = require("../services/service");
-const waiter_1 = require("../utils/waiter");
-const pubsubservice_1 = require("./pubsubservice");
+import { ServiceParameters } from "../services/service.js";
+import { CancelableLoopPromise, WaitDelayerFactories } from "../utils/waiter.js";
+import { PubSubService } from "./pubsubservice.js";
 /**
  * @inheritdoc
  */
-class QueueParameters extends service_1.ServiceParameters {
+export class QueueParameters extends ServiceParameters {
     /**
      * @inheritdoc
      */
     constructor(params) {
-        var _a, _b;
         super(params);
-        (_a = this.workerParallelism) !== null && _a !== void 0 ? _a : (this.workerParallelism = true);
-        (_b = this.maxConsumers) !== null && _b !== void 0 ? _b : (this.maxConsumers = 10);
+        this.workerParallelism ?? (this.workerParallelism = true);
+        this.maxConsumers ?? (this.maxConsumers = 10);
     }
 }
-exports.QueueParameters = QueueParameters;
 /**
  * AbstractQueue implements the worker system
  *
@@ -36,57 +22,56 @@ exports.QueueParameters = QueueParameters;
  *
  * @category CoreServices
  */
-class Queue extends pubsubservice_1.PubSubService {
+class Queue extends PubSubService {
     /**
      * Create the delayer
      */
     resolve() {
         super.resolve();
-        this.delayer = waiter_1.WaitDelayerFactories.get(this.parameters.workerDelayer);
+        this.delayer = WaitDelayerFactories.get(this.parameters.workerDelayer);
+        return this;
     }
     /**
      * Receive and process message from the queue
      *
      * @returns
      */
-    consumerReceiveMessage() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let speed = Date.now();
-                let items = yield this.receiveMessage(this.eventPrototype);
-                speed = Date.now() - speed;
-                this.failedIterations = 0;
-                if (items.length === 0) {
-                    return { speed, items: items.length };
-                }
-                const msgWorker = (msg) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        yield this.callback(msg.Message);
-                        yield this.deleteMessage(msg.ReceiptHandle);
-                    }
-                    catch (err) {
-                        this.getWebda().log("ERROR", `Message ${msg.ReceiptHandle}`, err);
-                    }
-                });
-                if (this.parameters.workerParallelism) {
-                    // Parallelized processing
-                    yield Promise.all(items.map(msgWorker));
+    async consumerReceiveMessage() {
+        try {
+            let speed = Date.now();
+            let items = await this.receiveMessage(this.eventPrototype);
+            speed = Date.now() - speed;
+            this.failedIterations = 0;
+            if (items.length === 0) {
+                return { speed, items: items.length };
+            }
+            const msgWorker = async (msg) => {
+                try {
+                    await this.callback(msg.Message);
+                    await this.deleteMessage(msg.ReceiptHandle);
                 }
-                else {
-                    // Serialized processing
-                    for (const item of items) {
-                        yield msgWorker(item);
-                    }
+                catch (err) {
+                    this.getWebda().log("ERROR", `Message ${msg.ReceiptHandle}`, err);
                 }
-                return { speed, items: items.length };
+            };
+            if (this.parameters.workerParallelism) {
+                // Parallelized processing
+                await Promise.all(items.map(msgWorker));
             }
-            catch (err) {
-                this.failedIterations += 1;
-                this.log("ERROR", err);
-                yield new Promise(resolve => setTimeout(resolve, this.delayer(this.failedIterations)));
-                return { speed: 0, items: -1 };
+            else {
+                // Serialized processing
+                for (const item of items) {
+                    await msgWorker(item);
+                }
             }
-        });
+            return { speed, items: items.length };
+        }
+        catch (err) {
+            this.failedIterations += 1;
+            this.log("ERROR", err);
+            await new Promise(resolve => setTimeout(resolve, this.delayer(this.failedIterations)));
+            return { speed: 0, items: -1 };
+        }
     }
     /**
      * Return the max consumers for the queue
@@ -112,18 +97,18 @@ class Queue extends pubsubservice_1.PubSubService {
         this.callback = callback;
         this.eventPrototype = eventPrototype;
         let consumers = new Set();
-        let childQueueCallback = (canceller) => __awaiter(this, void 0, void 0, function* () {
-            let res = yield this.consumerReceiveMessage();
+        let childQueueCallback = async (canceller) => {
+            let res = await this.consumerReceiveMessage();
             // If an error occured or no results found, stop the child
             if (res.items <= 0) {
-                yield canceller();
+                await canceller();
             }
-        });
-        let parentQueueCallback = (_canceller) => __awaiter(this, void 0, void 0, function* () {
-            let res = yield this.consumerReceiveMessage();
+        };
+        let parentQueueCallback = async (_canceller) => {
+            let res = await this.consumerReceiveMessage();
             if (res.items > 0 && res.speed < 3000 && consumers.size < this.getMaxConsumers() - 1) {
                 this.log("TRACE", `Launching a new queue consumer for ${this.getName()}`);
-                let consumer = new waiter_1.CancelableLoopPromise(childQueueCallback);
+                let consumer = new CancelableLoopPromise(childQueueCallback);
                 // Add consumer to our list
                 consumers.add(consumer);
                 // Remove consumer once finished
@@ -131,11 +116,11 @@ class Queue extends pubsubservice_1.PubSubService {
                     consumers.delete(consumer);
                 });
             }
+        };
+        return new CancelableLoopPromise(parentQueueCallback, async () => {
+            await Promise.all(Array.from(consumers).map(c => c.cancel()));
         });
-        return new waiter_1.CancelableLoopPromise(parentQueueCallback, () => __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all(Array.from(consumers).map(c => c.cancel()));
-        }));
     }
 }
-exports.Queue = Queue;
+export { Queue };
 //# sourceMappingURL=queueservice.js.map

package/lib/queues/queueservice.js.map

@@ -1 +1 @@
-{"version":3,"file":"queueservice.js","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queueservice.js","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,qBAAqB,EAIrB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAgBhD;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,iBAAiB;IAmBpD;;OAEG;IACH,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,iBAAiB,KAAtB,IAAI,CAAC,iBAAiB,GAAK,IAAI,EAAC;QAChC,IAAI,CAAC,YAAY,KAAjB,IAAI,CAAC,YAAY,GAAK,EAAE,EAAC;IAC3B,CAAC;CACF;AAED;;;;;;;GAOG;AACH,MAAe,KAA4D,SAAQ,aAAmB;IAmCpG;;OAEG;IACI,OAAO;QACZ,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,sBAAsB;QACpC,IAAI;YACF,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC3D,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YAC3B,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;YAC1B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;aACvC;YACD,MAAM,SAAS,GAAG,KAAK,EAAC,GAAG,EAAC,EAAE;gBAC5B,IAAI;oBACF,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oBACjC,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;iBAC7C;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,CAAC;iBACnE;YACH,CAAC,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE;gBACrC,0BAA0B;gBAC1B,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;aACzC;iBAAM;gBACL,wBAAwB;gBACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACxB,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;iBACvB;aACF;YACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;SACvC;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACvB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;YACvF,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;SAChC;IACH,CAAC;IAED;;;;;;;;;OASG;IACH,eAAe;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;IACtC,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,QAAqC,EAAE,cAA8B;QAC3E,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,SAAS,GAAG,IAAI,GAAG,EAAyB,CAAC;QACjD,IAAI,kBAAkB,GAAG,KAAK,EAAE,SAA8B,EAAE,EAAE;YAChE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9C,0DAA0D;YAC1D,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC,EAAE;gBAClB,MAAM,SAAS,EAAE,CAAC;aACnB;QACH,CAAC,CAAC;QACF,IAAI,mBAAmB,GAAG,KAAK,EAAE,UAA+B,EAAE,EAAE;YAClE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9C,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,GAAG,IAAI,IAAI,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,EAAE;gBACpF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,sCAAsC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC1E,IAAI,QAAQ,GAAG,IAAI,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;gBAC7D,2BAA2B;gBAC3B,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACxB,gCAAgC;gBAChC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;oBACpB,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QACF,OAAO,IAAI,qBAAqB,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,OAAO,EAAE,KAAK,EAAE,CAAC"}

package/lib/router.d.ts

@@ -1,8 +1,8 @@
 import { JSONSchema7 } from "json-schema";
 import { OpenAPIV3 } from "openapi-types";
-import { Core } from "./core";
-import { Context } from "./utils/context";
-import { HttpMethodType } from "./utils/httpcontext";
+import { Core } from "./core.js";
+import { Context } from "./utils/context.js";
+import { HttpMethodType } from "./utils/httpcontext.js";
 declare type RecursivePartial<T> = {
     [P in keyof T]?: RecursivePartial<T[P]>;
 };
@@ -71,6 +71,10 @@ export interface RouteInfo {
      * Hash
      */
     hash?: string;
+    /**
+     * Intend to override existing
+     */
+    override?: boolean;
 }
 /**
  * Manage Route resolution

package/lib/router.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Router = void 0;
-const uriTemplates = require("uri-templates");
+import uriTemplates from "uri-templates";
 /**
  * Manage Route resolution
  * @category CoreFeatures
  */
-class Router {
+export class Router {
     constructor(webda) {
         this.routes = new Map();
         this.initiated = false;
@@ -31,10 +28,9 @@ class Router {
      * @param {Object} info the type of executor
      */
     addRoute(url, info) {
-        var _a;
         const finalUrl = this.getFinalUrl(url);
         this.webda.log("TRACE", `Add route ${info.methods.join(",")} ${finalUrl}`);
-        (_a = info.openapi) !== null && _a !== void 0 ? _a : (info.openapi = {});
+        info.openapi ?? (info.openapi = {});
         if (this.routes[finalUrl]) {
             // If route is already added do not do anything
             if (this.routes[finalUrl].includes(info)) {
@@ -44,7 +40,9 @@ class Router {
             let methods = this.routes[finalUrl].map((r) => r.methods).flat();
             info.methods.forEach(m => {
                 if (methods.indexOf(m) >= 0) {
-                    this.webda.log("WARN", `${m} ${finalUrl} overlap with another defined route`);
+                    if (!info.override) {
+                        this.webda.log("WARN", `${m} ${finalUrl} overlap with another defined route`);
+                    }
                 }
             });
             // Last added need to be overriding
@@ -92,7 +90,7 @@ class Router {
         this.initURITemplates(this.routes);
         // Order path desc
         this.pathMap = [];
-        for (var i in this.routes) {
+        for (let i in this.routes) {
             // Might need to trail the query string
             this.routes[i].forEach((config) => {
                 this.pathMap.push({
@@ -127,7 +125,7 @@ class Router {
      */
     initURITemplates(config) {
         // Prepare tbe URI parser
-        for (var map in config) {
+        for (let map in config) {
             if (map.indexOf("{") !== -1) {
                 config[map].forEach((e) => (e._uriTemplateParse = uriTemplates(map)));
             }
@@ -143,8 +141,8 @@ class Router {
         const finalUrl = this.getFinalUrl(url);
         let methods = new Set();
         for (let i in this.pathMap) {
-            var routeUrl = this.pathMap[i].url;
-            var map = this.pathMap[i].config;
+            const routeUrl = this.pathMap[i].url;
+            const map = this.pathMap[i].config;
             if (routeUrl !== finalUrl &&
                 (map._uriTemplateParse === undefined || map._uriTemplateParse.fromUri(finalUrl) === undefined)) {
                 continue;
@@ -160,8 +158,8 @@ class Router {
         const finalUrl = this.getFinalUrl(url);
         let parameters = this.webda.getConfiguration().parameters;
         for (let i in this.pathMap) {
-            var routeUrl = this.pathMap[i].url;
-            var map = this.pathMap[i].config;
+            const routeUrl = this.pathMap[i].url;
+            const map = this.pathMap[i].config;
             // Check method
             if (map.methods.indexOf(method) === -1) {
                 continue;
@@ -173,7 +171,7 @@ class Router {
             if (map._uriTemplateParse === undefined) {
                 continue;
             }
-            var parse_result = map._uriTemplateParse.fromUri(finalUrl);
+            const parse_result = map._uriTemplateParse.fromUri(finalUrl);
             if (parse_result !== undefined) {
                 ctx.setServiceParameters(parameters);
                 ctx.setPathParameters(parse_result);
@@ -184,12 +182,12 @@ class Router {
     getOpenAPISchema(schema) {
         if (!schema) {
             return {
-                $ref: "#/definitions/Object"
+                $ref: "#/components/schemas/Object"
             };
         }
         else if (typeof schema === "string") {
             return {
-                $ref: "#/definitions/" + schema
+                $ref: "#/components/schemas/" + schema
             };
         }
         return schema;
@@ -201,16 +199,12 @@ class Router {
      * @param skipHidden add hidden routes or not
      */
     completeOpenAPI(openapi, skipHidden = true) {
-        let hasTag = (tag) => {
-            for (let t in openapi.tags) {
-                if (openapi.tags[t].name === tag) {
-                    return true;
-                }
-            }
-            return false;
-        };
+        let hasTag = tag => openapi.tags.find(t => t.name === tag) !== undefined;
         for (let i in this.routes) {
             this.routes[i].forEach((route) => {
+                route.openapi = this.webda
+                    .getApplication()
+                    .replaceVariables(route.openapi || {}, this.webda.getService(route.executor).getOpenApiReplacements());
                 if (route.openapi.hidden && skipHidden) {
                     return;
                 }
@@ -233,7 +227,10 @@ class Router {
                             openapi.paths[path].parameters.push({
                                 name,
                                 in: "query",
-                                required: !varName.startsWith("*")
+                                required: !varName.startsWith("*"),
+                                schema: {
+                                    type: "string"
+                                }
                             });
                             return;
                         }
@@ -241,26 +238,31 @@ class Router {
                             // ^[a-zA-Z0-9._$-]+$] is the official regex of AWS
                             name: varName.replace(/[^a-zA-Z0-9._$-]/g, ""),
                             in: "path",
-                            required: true
+                            required: true,
+                            schema: {
+                                type: "string"
+                            }
                         });
                     });
                 }
                 route.methods.forEach(method => {
-                    var _a, _b, _c, _d, _e, _f, _g;
-                    var _h;
+                    var _a;
                     let responses;
                     let schema;
                     let description;
                     let summary;
                     let operationId;
-                    let tags = (_a = route.openapi.tags) !== null && _a !== void 0 ? _a : [];
+                    let requestBody;
+                    let tags = route.openapi.tags ?? [];
+                    // Refactor here
                     if (route.openapi[method.toLowerCase()]) {
                         responses = route.openapi[method.toLowerCase()].responses;
-                        schema = this.getOpenAPISchema((_b = route.openapi[method.toLowerCase()].schemas) === null || _b === void 0 ? void 0 : _b.output);
+                        schema = this.getOpenAPISchema(route.openapi[method.toLowerCase()].schemas?.output);
                         description = route.openapi[method.toLowerCase()].description;
                         summary = route.openapi[method.toLowerCase()].summary;
                         operationId = route.openapi[method.toLowerCase()].operationId;
                         tags.push(...(route.openapi[method.toLowerCase()].tags || []));
+                        requestBody = route.openapi[method.toLowerCase()].requestBody;
                     }
                     responses = responses || {
                         200: {
@@ -268,16 +270,17 @@ class Router {
                         }
                     };
                     for (let j in responses) {
-                        (_c = (_h = responses[j]).content) !== null && _c !== void 0 ? _c : (_h.content = {});
-                        responses[j].content["application/json"] = {
-                            schema
-                        };
                         // Add default answer
                         let code = parseInt(j);
                         if (code < 300 && code >= 200 && !responses[j].description) {
                             responses[j].description = "Operation success";
+                            (_a = responses[j]).content ?? (_a.content = {});
+                            responses[j].content["application/json"] = {
+                                schema
+                            };
                         }
                     }
+                    // Add the service name if no tags are defined
                     if (tags.length === 0) {
                         tags.push(route.executor);
                     }
@@ -286,30 +289,28 @@ class Router {
                         responses: responses,
                         description,
                         summary,
-                        operationId
+                        operationId,
+                        requestBody
                     };
-                    if (method.toLowerCase().startsWith("p") && ((_e = (_d = route.openapi[method.toLowerCase()]) === null || _d === void 0 ? void 0 : _d.schemas) === null || _e === void 0 ? void 0 : _e.input)) {
+                    if (method.toLowerCase().startsWith("p") && route.openapi[method.toLowerCase()]?.schemas?.input) {
                         // Add request schema if exist
-                        desc.requestBody = {
+                        desc.requestBody ?? (desc.requestBody = {
                             content: {
                                 "application/json": {
-                                    schema: this.getOpenAPISchema((_g = (_f = route.openapi[method.toLowerCase()]) === null || _f === void 0 ? void 0 : _f.schemas) === null || _g === void 0 ? void 0 : _g.input)
+                                    schema: this.getOpenAPISchema(route.openapi[method.toLowerCase()]?.schemas?.input)
                                 }
                             }
-                        };
+                        });
                     }
                     openapi.paths[path][method.toLowerCase()] = desc;
-                    tags.forEach(tag => {
-                        if (!hasTag(tag)) {
-                            openapi.tags.push({
-                                name: tag
-                            });
-                        }
-                    });
+                    tags
+                        .filter(tag => !hasTag(tag))
+                        .forEach(tag => openapi.tags.push({
+                        name: tag
+                    }));
                 });
             });
         }
     }
 }
-exports.Router = Router;
 //# sourceMappingURL=router.js.map