@webda/core 4.0.0-beta.2 → 4.0.0-beta.4

package/lib/models/user.model.js

@@ -0,0 +1,164 @@
+import { WEBDA_STORAGE } from "@webda/models";
+import { Password, V3_PASSWORD_MAPPED } from "./password.model.js";
+import { UuidModel, WEBDA_EVENTS } from "@webda/models";
+/**
+ * First basic model for User
+ * @class
+ * @WebdaModel
+ */
+export class User extends UuidModel {
+    [WEBDA_EVENTS];
+    /** Create a new User
+     * @param data - initial data
+     */
+    constructor(data) {
+        super();
+        const mapped = User.mapV3(data);
+        Object.assign(this, mapped);
+        if (mapped !== data)
+            User.flagV3(this);
+        // Raw password data (v3 mapping or plain JSON) must become a Password behavior
+        if (!(this.password instanceof Password)) {
+            this.__hydrateBehaviors?.({ password: mapped?.password ?? {} });
+        }
+    }
+    /**
+     * Password credential
+     */
+    password;
+    /**
+     * Map v3 records (`__password` string) onto the Password behavior shape
+     * @param data - raw data
+     * @returns the mapped data
+     */
+    static mapV3(data) {
+        if (data && typeof data.__password === "string") {
+            data = { ...data, password: data.password ?? { __hash: data.__password } };
+            delete data.__password;
+            delete data._lastPasswordRecovery;
+        }
+        return data;
+    }
+    /**
+     * Flag an instance whose data went through the v3 mapping (see {@link V3_PASSWORD_MAPPED})
+     * @param instance - the user
+     */
+    static flagV3(instance) {
+        Object.defineProperty(instance, V3_PASSWORD_MAPPED, {
+            value: true,
+            enumerable: false,
+            configurable: true,
+            writable: true
+        });
+    }
+    /**
+     * Map v3 records onto the Password behavior before hydration
+     * @param data - raw data
+     * @param instance - instance to populate
+     * @returns the populated instance
+     */
+    static deserialize(data, instance) {
+        const mapped = User.mapV3(data);
+        const result = super.deserialize.call(this, mapped, instance);
+        if (mapped !== data)
+            User.flagV3(result);
+        return result;
+    }
+    /**
+     * Display name for this user
+     * @optional
+     * @Frontend
+     */
+    displayName;
+    /**
+     * Define the user avatar if exists
+     */
+    _avatar;
+    /**
+     * Contains the locale of the user if known
+     */
+    locale;
+    /**
+     * Contain main user email if exists
+     */
+    email;
+    /**
+     * Return displayable public entry
+     * @returns the result
+     * @Frontend
+     */
+    toPublicEntry() {
+        return {
+            displayName: this.displayName,
+            uuid: this.getUUID(),
+            avatar: this._avatar,
+            email: this.getEmail()
+        };
+    }
+    /**
+     * Get email
+     * @returns the result
+     */
+    getEmail() {
+        return this.email;
+    }
+    /**
+     * Get user groups
+     * @returns the list of results
+     */
+    getGroups() {
+        return [];
+    }
+    /**
+     * Get roles
+     * @returns the list of results
+     */
+    getRoles() {
+        return [];
+    }
+    /**
+     * Get display name
+     * @returns the result string
+     */
+    getDisplayName() {
+        return this.displayName;
+    }
+    /**
+     * Only the user themselves can act on their own object
+     * @param ctx - the operation context
+     * @param action - the action to check
+     * @returns the result
+     */
+    async canAct(ctx, action) {
+        if (!ctx.getCurrentUserId() || ctx.getCurrentUserId() !== this.getUUID()) {
+            return "You can't act on this user";
+        }
+        return true;
+    }
+    /**
+     * String representation of the user
+     * @returns the result
+     */
+    toString() {
+        return `User[${this.getUUID()}]`;
+    }
+    __hydrateBehaviors(rawData) {
+        {
+            let v = this.password;
+            if (rawData !== undefined && rawData !== null && rawData["password"] !== undefined) {
+                v = rawData["password"];
+            }
+            if (!(v instanceof Password)) {
+                const inst = new Password();
+                if (v !== undefined && v !== null) {
+                    Object.assign(inst, v);
+                }
+                v = inst;
+            }
+            v[WEBDA_STORAGE] = v[WEBDA_STORAGE] || {};
+            v[WEBDA_STORAGE]["__parent__"] = { instance: this, attribute: "password" };
+            this.password = v;
+        }
+    }
+}
+//# sourceMappingURL=user.model.js.map

package/lib/models/user.model.js.map

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

package/lib/queues/{memoryqueue.d.ts → memoryqueue.service.d.ts}

@@ -1,5 +1,5 @@
-import { ServiceParameters } from "../services/service.js";
-import { MessageReceipt, Queue, QueueParameters } from "./queueservice.js";
+import { type MessageReceipt, Queue, QueueParameters } from "./queueservice.js";
+/** Parameters for the in-memory FIFO queue, including message expiration and receive timeout */
 export declare class MemoryQueueParameters extends QueueParameters {
     /**
      * Number of seconds before droping message
@@ -7,7 +7,26 @@ export declare class MemoryQueueParameters extends QueueParameters {
      * @default 30
      */
     expire?: number;
-    constructor(params: any);
+    /**
+     * Number of seconds to wait for receiving new message
+     */
+    timeout?: number;
+    /**
+     * Load parameters with defaults for expiration and timeout
+     * @param params - the service parameters
+     * @returns this for chaining
+     */
+    load(params?: any): this;
+    /**
+     * Get the expiration delay in milliseconds
+     * @returns the result number
+     */
+    get expireMs(): number;
+    /**
+     * Get the receive timeout in milliseconds
+     * @returns the result number
+     */
+    get timeoutMs(): number;
 }
 /**
  * FIFO Queue in Memory
@@ -20,15 +39,9 @@ export declare class MemoryQueue<T = any, K extends MemoryQueueParameters = Memo
      * Allow to cancel timeout
      */
     private pendingReads;
-    /**
-     * Load parameters
-     *
-     * @param params
-     * @ignore
-     */
-    loadParameters(params: any): ServiceParameters;
     /**
      * Return queue size
+     * @returns the result number
      */
     size(): Promise<number>;
     /**
@@ -42,13 +55,13 @@ export declare class MemoryQueue<T = any, K extends MemoryQueueParameters = Memo
         new (): L;
     }): MessageReceipt<L>[];
     /**
-     * @inheritdoc
+     * @override
      */
     receiveMessage<L>(proto?: {
         new (): L;
     }): Promise<MessageReceipt<L>[]>;
     /**
-     * @inheritdoc
+     * @override
      */
     deleteMessage(receipt: any): Promise<void>;
     /**
@@ -56,4 +69,4 @@ export declare class MemoryQueue<T = any, K extends MemoryQueueParameters = Memo
      */
     __clean(): Promise<void>;
 }
-//# sourceMappingURL=memoryqueue.d.ts.map
+//# sourceMappingURL=memoryqueue.service.d.ts.map

package/lib/queues/memoryqueue.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memoryqueue.service.d.ts","sourceRoot":"","sources":["../../src/queues/memoryqueue.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAMhF,gGAAgG;AAChG,qBAAa,qBAAsB,SAAQ,eAAe;IACxD;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAI3B;IAED;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED;;;OAGG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;CACF;AAED;;;;GAIG;AACH,qBAAa,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAAE,SAAQ,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5G,OAAO,CAAC,MAAM,CAAgB;IAC9B;;OAEG;IACH,OAAO,CAAC,YAAY,CAAsB;IAE1C;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAE5B;IAED;;OAEG;IACG,WAAW,CAAC,MAAM,KAAA,iBAevB;IAED;;OAEG;IACH,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,CAcrD;IAED;;OAEG;IACG,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAqB3E;IAED;;OAEG;IACG,aAAa,CAAC,OAAO,KAAA,iBAI1B;IAED;;OAEG;IACG,OAAO,kBAEZ;CACF"}

package/lib/queues/{memoryqueue.js → memoryqueue.service.js}

@@ -1,11 +1,41 @@
 import { randomUUID } from "crypto";
-import { JSONUtils } from "../utils/serializers.js";
+import { JSONUtils } from "@webda/utils";
 import { Queue, QueueParameters } from "./queueservice.js";
+/** Parameters for the in-memory FIFO queue, including message expiration and receive timeout */
 export class MemoryQueueParameters extends QueueParameters {
-    constructor(params) {
-        super(params);
-        this.expire = this.expire ?? 30;
-        this.expire *= 1000;
+    /**
+     * Number of seconds before droping message
+     *
+     * @default 30
+     */
+    expire;
+    /**
+     * Number of seconds to wait for receiving new message
+     */
+    timeout;
+    /**
+     * Load parameters with defaults for expiration and timeout
+     * @param params - the service parameters
+     * @returns this for chaining
+     */
+    load(params = {}) {
+        super.load(params);
+        this.expire ??= 30;
+        return this;
+    }
+    /**
+     * Get the expiration delay in milliseconds
+     * @returns the result number
+     */
+    get expireMs() {
+        return (this.expire || 30) * 1000;
+    }
+    /**
+     * Get the receive timeout in milliseconds
+     * @returns the result number
+     */
+    get timeoutMs() {
+        return (this.timeout || 0) * 1000;
     }
 }
 /**
@@ -14,25 +44,14 @@ export class MemoryQueueParameters extends QueueParameters {
  * @WebdaModda
  */
 export class MemoryQueue extends Queue {
-    constructor() {
-        super(...arguments);
-        this._queue = {};
-        /**
-         * Allow to cancel timeout
-         */
-        this.pendingReads = [];
-    }
+    _queue = {};
     /**
-     * Load parameters
-     *
-     * @param params
-     * @ignore
+     * Allow to cancel timeout
      */
-    loadParameters(params) {
-        return new MemoryQueueParameters(params);
-    }
+    pendingReads = [];
     /**
      * Return queue size
+     * @returns the result number
      */
     async size() {
         return Object.keys(this._queue).length;
@@ -60,9 +79,10 @@ export class MemoryQueue extends Queue {
      * @override
      */
     getItem(proto) {
+        const time = Date.now();
         for (const i in this._queue) {
-            if (this._queue[i].Claimed < new Date().getTime() - this.parameters.expire) {
-                this._queue[i].Claimed = new Date().getTime();
+            if (this._queue[i].Claimed < time - this.parameters.expireMs) {
+                this._queue[i].Claimed = time;
                 return [
                     {
                         ReceiptHandle: this._queue[i].ReceiptHandle,
@@ -74,28 +94,32 @@ export class MemoryQueue extends Queue {
         return [];
     }
     /**
-     * @inheritdoc
+     * @override
      */
     async receiveMessage(proto) {
         const items = this.getItem(proto);
         if (items.length > 0) {
             return items;
         }
-        // We wait for 30s before returning an empty array or a message if interrupted
+        // We wait before returning an empty array or a message if interrupted
         await new Promise(resolve => {
-            const timeout = setTimeout(() => {
-                this.pendingReads = this.pendingReads.filter(r => r !== resolve);
-                resolve();
-            }, 30000);
+            const timeout = this.parameters.timeoutMs
+                ? setTimeout(() => {
+                    this.pendingReads = this.pendingReads.filter(r => r !== resolve);
+                    resolve();
+                }, this.parameters.timeoutMs)
+                : undefined;
             this.pendingReads.push(() => {
-                clearTimeout(timeout);
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
                 resolve();
             });
         });
         return this.getItem();
     }
     /**
-     * @inheritdoc
+     * @override
      */
     async deleteMessage(receipt) {
         if (this._queue[receipt]) {
@@ -109,4 +133,4 @@ export class MemoryQueue extends Queue {
         this._queue = {};
     }
 }
-//# sourceMappingURL=memoryqueue.js.map
+//# sourceMappingURL=memoryqueue.service.js.map

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

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

package/lib/queues/pubsubservice.d.ts

@@ -1,6 +1,8 @@
-import { Counter, Gauge, Histogram } from "../core.js";
-import { Service, ServiceParameters } from "../services/service.js";
-import { CancelablePromise } from "../utils/waiter.js";
+import { Counter, Gauge, Histogram } from "../metrics/metrics.js";
+import { ServiceParameters } from "../services/serviceparameters.js";
+import { Service } from "../services/service.js";
+import { CancelablePromise } from "@webda/utils";
+/** Abstract base for publish/subscribe messaging services with metrics tracking */
 export default abstract class PubSubService<T = any, K extends ServiceParameters = ServiceParameters> extends Service<K> {
     /**
      * @override
@@ -23,9 +25,9 @@ export default abstract class PubSubService<T = any, K extends ServiceParameters
     abstract sendMessage(event: T): Promise<void>;
     /**
      * Unserialize into class
-     * @param data
-     * @param proto
-     * @returns
+     * @param data - the data to process
+     * @param proto - the proto
+     * @returns the result
      */
     unserialize<L>(data: string, proto?: {
         new (): L;

package/lib/queues/pubsubservice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pubsubservice.d.ts","sourceRoot":"","sources":["../../src/queues/pubsubservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,aAAa,CACzC,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAC/C,SAAQ,OAAO,CAAC,CAAC,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE;QACjB,MAAM,EAAE,OAAO,CAAC;QAChB,mBAAmB,EAAE,SAAS,CAAC;QAC/B,aAAa,EAAE,OAAO,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,gBAAgB,EAAE,KAAK,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,WAAW,IAAI,IAAI;IAuBnB;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7C;;;;;OAKG;IACH,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,CAAC;IAOtD;;;OAGG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAEhC;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CACd,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EACrC,cAAc,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,EAC9B,MAAM,CAAC,EAAE,MAAM,IAAI,GAClB,iBAAiB;CACrB;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"pubsubservice.d.ts","sourceRoot":"","sources":["../../src/queues/pubsubservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,mFAAmF;AACnF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,aAAa,CACzC,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAC/C,SAAQ,OAAO,CAAC,CAAC,CAAC;IAClB;;OAEG;IACH,UAAkB,OAAO,EAAE;QACzB,MAAM,EAAE,OAAO,CAAC;QAChB,mBAAmB,EAAE,SAAS,CAAC;QAC/B,aAAa,EAAE,OAAO,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,gBAAgB,EAAE,KAAK,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,WAAW,IAAI,IAAI,CAsBlB;IACD;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C;;;;;OAKG;IACH,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,CAAC,CAKrD;IAED;;;OAGG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjC;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CACd,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EACrC,cAAc,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,EAC9B,MAAM,CAAC,EAAE,MAAM,IAAI,GAClB,iBAAiB,CAAC;CACtB;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/lib/queues/pubsubservice.js

@@ -1,5 +1,6 @@
-import { Counter, Gauge, Histogram } from "../core.js";
+import { Counter, Gauge, Histogram } from "../metrics/metrics.js";
 import { Service } from "../services/service.js";
+/** Abstract base for publish/subscribe messaging services with metrics tracking */
 export default class PubSubService extends Service {
     /**
      * @override
@@ -29,9 +30,9 @@ export default class PubSubService extends Service {
     }
     /**
      * Unserialize into class
-     * @param data
-     * @param proto
-     * @returns
+     * @param data - the data to process
+     * @param proto - the proto
+     * @returns the result
      */
     unserialize(data, proto) {
         if (proto) {

package/lib/queues/pubsubservice.js.map

@@ -1 +1 @@
-{"version":3,"file":"pubsubservice.js","sourceRoot":"","sources":["../../src/queues/pubsubservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,OAAO,EAAqB,MAAM,qBAAqB,CAAC;AAGjE,MAAM,CAAC,OAAO,OAAgB,aAG5B,SAAQ,OAAU;IAWlB;;OAEG;IACH,WAAW;QACT,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACjH,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YACvD,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,6BAA6B;SACpC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YAC3D,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,yBAAyB;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YAC5C,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,yBAAyB;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;YACpD,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,6BAA6B;YACnC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACvD,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAOD;;;;;OAKG;IACH,WAAW,CAAI,IAAY,EAAE,KAAqB;QAChD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAkBF;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"pubsubservice.js","sourceRoot":"","sources":["../../src/queues/pubsubservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,mFAAmF;AACnF,MAAM,CAAC,OAAO,OAAgB,aAG5B,SAAQ,OAAU;IAWlB;;OAEG;IACH,WAAW;QACT,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACjH,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YACvD,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,6BAA6B;SACpC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YAC3D,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,yBAAyB;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YAC5C,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,yBAAyB;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;YACpD,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,6BAA6B;YACnC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACvD,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAOD;;;;;OAKG;IACH,WAAW,CAAI,IAAY,EAAE,KAAqB;QAChD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAkBF;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/lib/queues/queueservice.d.ts

@@ -1,5 +1,5 @@
-import { ServiceParameters } from "../services/service.js";
-import { CancelablePromise, WaitDelayer, WaitDelayerDefinition } from "../utils/waiter.js";
+import { ServiceParameters } from "../services/serviceparameters.js";
+import { CancelablePromise, WaitDelayer, WaitDelayerDefinition } from "@webda/utils";
 import { PubSubService } from "./pubsubservice.js";
 /**
  * Raw message from queue
@@ -26,7 +26,7 @@ export declare class QueueParameters extends ServiceParameters {
      * Define if worker should process multi message received in //
      * @default true
      */
-    workerParallelism?: boolean;
+    workerParallelism: boolean;
     /**
      * Max number of queue consumers
      * Queue will auto increase to this max number if queue is loaded
@@ -35,10 +35,6 @@ export declare class QueueParameters extends ServiceParameters {
      * @default 10
      */
     maxConsumers: number;
-    /**
-     * @inheritdoc
-     */
-    constructor(params: any);
 }
 /**
  * AbstractQueue implements the worker system
@@ -79,12 +75,13 @@ declare abstract class Queue<T = any, K extends QueueParameters = QueueParameter
     abstract deleteMessage(id: string): Promise<void>;
     /**
      * Create the delayer
+     * @returns this for chaining
      */
     resolve(): this;
     /**
      * Receive and process message from the queue
      *
-     * @returns
+     * @returns the result
      */
     protected consumerReceiveMessage(): Promise<{
         speed: number;
@@ -98,14 +95,15 @@ declare abstract class Queue<T = any, K extends QueueParameters = QueueParameter
      *
      * SQS for example will return this.parameters.maxConsumers / 10
      *
-     * @returns
+     * @returns the result number
      */
     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
+     * @param callback - the callback function
+     * @param eventPrototype - the event prototype
+     * @returns the result
      */
     consume(callback: (event: T) => Promise<void>, eventPrototype?: {
         new (): T;

package/lib/queues/queueservice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queueservice.d.ts","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAEL,iBAAiB,EACjB,WAAW,EACX,qBAAqB,EAEtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,GAAG;IACrC;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC;IACX;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD;;OAEG;IACH,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;gBACS,MAAM,EAAE,GAAG;CAKxB;AAED;;;;;;;GAOG;AACH,uBAAe,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC;IACpG;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC;IACnC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAA8B;IAC9C;;OAEG;IACH,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;IAC/B,cAAc,EAAE,UAAU,CAAC,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/E;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjD;;OAEG;IACI,OAAO,IAAI,IAAI;IAMtB;;;;OAIG;cACa,sBAAsB,IAAI,OAAO,CAAC;QAChD,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IAwCF;;;;;;;;;OASG;IACH,eAAe,IAAI,MAAM;IAIzB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,cAAc,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,iBAAiB;CA6BlG;AAED,OAAO,EAAE,KAAK,EAAE,CAAC"}
+{"version":3,"file":"queueservice.d.ts","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAEL,iBAAiB,EACjB,WAAW,EACX,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,GAAG;IACrC;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC;IACX;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD;;OAEG;IACH,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC;;;OAGG;IACH,iBAAiB,EAAE,OAAO,CAAQ;IAClC;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,CAAM;CAC3B;AAED;;;;;;;GAOG;AACH,uBAAe,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC;IACpG;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC;IACnC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAA8B;IAC9C;;OAEG;IACH,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;IAC/B,cAAc,EAAE,UAAU,CAAC,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEhF;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD;;;OAGG;IACI,OAAO,IAAI,IAAI,CAIrB;IAED;;;;OAIG;IACH,UAAgB,sBAAsB,IAAI,OAAO,CAAC;QAChD,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAsCD;IAED;;;;;;;;;OASG;IACH,eAAe,IAAI,MAAM,CAExB;IAED;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,cAAc,CAAC,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,GAAG,iBAAiB,CA4BhG;CACF;AAED,OAAO,EAAE,KAAK,EAAE,CAAC"}

package/lib/queues/queueservice.js

@@ -1,18 +1,27 @@
-import { ServiceParameters } from "../services/service.js";
-import { CancelableLoopPromise, WaitDelayerFactories } from "../utils/waiter.js";
+import { ServiceParameters } from "../services/serviceparameters.js";
+import { CancelableLoopPromise, WaitDelayerFactories } from "@webda/utils";
 import { PubSubService } from "./pubsubservice.js";
 /**
  * @inheritdoc
  */
 export class QueueParameters extends ServiceParameters {
     /**
-     * @inheritdoc
+     * Delayer between two failed attempts to process messages
      */
-    constructor(params) {
-        super(params);
-        this.workerParallelism ?? (this.workerParallelism = true);
-        this.maxConsumers ?? (this.maxConsumers = 10);
-    }
+    workerDelayer;
+    /**
+     * Define if worker should process multi message received in //
+     * @default true
+     */
+    workerParallelism = true;
+    /**
+     * 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 = 10;
 }
 /**
  * AbstractQueue implements the worker system
@@ -23,8 +32,26 @@ export class QueueParameters extends ServiceParameters {
  * @category CoreServices
  */
 class Queue extends PubSubService {
+    /**
+     * Current timeout handler
+     */
+    _timeout;
+    /**
+     * Callback function to call for each message
+     */
+    callback;
+    /**
+     * Current pause instance
+     */
+    failedIterations;
+    /**
+     * Delayer
+     */
+    delayer;
+    eventPrototype;
     /**
      * Create the delayer
+     * @returns this for chaining
      */
     resolve() {
         super.resolve();
@@ -34,7 +61,7 @@ class Queue extends PubSubService {
     /**
      * Receive and process message from the queue
      *
-     * @returns
+     * @returns the result
      */
     async consumerReceiveMessage() {
         try {
@@ -54,7 +81,7 @@ class Queue extends PubSubService {
                 }
                 catch (err) {
                     this.metrics.errors.inc();
-                    this.getWebda().log("ERROR", `Message ${msg.ReceiptHandle}`, err);
+                    this.log("ERROR", `Message ${msg.ReceiptHandle}`, err);
                 }
                 finally {
                     end();
@@ -87,7 +114,7 @@ class Queue extends PubSubService {
      *
      * SQS for example will return this.parameters.maxConsumers / 10
      *
-     * @returns
+     * @returns the result number
      */
     getMaxConsumers() {
         return this.parameters.maxConsumers;
@@ -95,8 +122,9 @@ class Queue extends PubSubService {
     /**
      * 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
+     * @param callback - the callback function
+     * @param eventPrototype - the event prototype
+     * @returns the result
      */
     consume(callback, eventPrototype) {
         this.failedIterations = 0;

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":"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"}

package/lib/rest/hooks.d.ts

@@ -0,0 +1,8 @@
+import { Router } from "./router.service.js";
+/**
+ * Return the Router service
+ *
+ * @returns the result
+ */
+export declare function useRouter(): Router;
+//# sourceMappingURL=hooks.d.ts.map

package/lib/rest/hooks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/rest/hooks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC"}