@webda/core 2.0.0-beta.3 → 2.1.0

package/lib/utils/session.js

@@ -1,38 +1,23 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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.UnknownSession = exports.Session = exports.CookieSessionManager = exports.CookieSessionParameters = exports.SessionManager = void 0;
-const coremodel_1 = require("../models/coremodel");
-const service_1 = require("../services/service");
-const cookie_1 = require("./cookie");
+import { NotEnumerable } from "../models/coremodel.js";
+import { Inject, Service, ServiceParameters } from "../services/service.js";
+import { CookieOptions, SecureCookie } from "./cookie.js";
 /**
  * Manage load and save of sessions
  */
-class SessionManager extends service_1.Service {
+export class SessionManager extends Service {
 }
-exports.SessionManager = SessionManager;
-class CookieSessionParameters extends service_1.ServiceParameters {
+export class CookieSessionParameters extends ServiceParameters {
     constructor(params) {
-        var _a;
         super(params);
-        (_a = this.cookie) !== null && _a !== void 0 ? _a : (this.cookie = new cookie_1.CookieOptions({}));
+        this.cookie ?? (this.cookie = new CookieOptions({}));
     }
 }
-exports.CookieSessionParameters = CookieSessionParameters;
 /**
  * SessionManager that store info in a cookie
  *
@@ -41,7 +26,7 @@ exports.CookieSessionParameters = CookieSessionParameters;
  *
  * @WebdaModda
  */
-class CookieSessionManager extends SessionManager {
+export class CookieSessionManager extends SessionManager {
     /**
      * @override
      */
@@ -61,55 +46,50 @@ class CookieSessionManager extends SessionManager {
     /**
      * @override
      */
-    load(context) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const session = new Session();
-            let cookie = yield cookie_1.SecureCookie.load(this.parameters.cookie.name, context, this.parameters.jwt);
-            if (this.sessionStore) {
-                if (cookie.sub) {
-                    Object.assign(session, (_a = (yield this.sessionStore.get(cookie.sub))) === null || _a === void 0 ? void 0 : _a.session);
-                }
-                (_b = session.uuid) !== null && _b !== void 0 ? _b : (session.uuid = context.getWebda().getUuid("base64"));
+    async load(context) {
+        const session = new Session();
+        let cookie = await SecureCookie.load(this.parameters.cookie.name, context, this.parameters.jwt);
+        if (this.sessionStore) {
+            if (cookie.sub) {
+                Object.assign(session, (await this.sessionStore.get(cookie.sub))?.session);
+                session.uuid = cookie.sub;
             }
-            else {
-                Object.assign(session, cookie);
-            }
-            return session;
-        });
+            session.uuid ?? (session.uuid = context.getWebda().getUuid("base64"));
+        }
+        else {
+            Object.assign(session, cookie);
+        }
+        return session;
     }
     /**
      * @override
      */
-    save(context, session) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // If store is found session info are stored in db
-            if (this.sessionStore) {
-                yield this.sessionStore.save({
-                    uuid: session.uuid,
-                    session,
-                    ttl: Date.now() + this.parameters.cookie.maxAge * 1000
-                });
-                cookie_1.SecureCookie.save(this.parameters.cookie.name, context, {}, Object.assign(Object.assign({}, this.parameters.jwt), { subject: session.uuid }));
-                return;
-            }
-            cookie_1.SecureCookie.save(this.parameters.cookie.name, context, session, this.parameters.jwt);
-        });
+    async save(context, session) {
+        // If store is found session info are stored in db
+        if (this.sessionStore) {
+            await this.sessionStore.save({
+                uuid: session.uuid,
+                session,
+                ttl: Date.now() + this.parameters.cookie.maxAge * 1000
+            });
+            SecureCookie.save(this.parameters.cookie.name, context, {}, { ...this.parameters.jwt, subject: session.uuid.toString() });
+            return;
+        }
+        SecureCookie.save(this.parameters.cookie.name, context, session, this.parameters.jwt);
     }
 }
 __decorate([
-    (0, service_1.Inject)("CryptoService")
+    Inject("CryptoService")
 ], CookieSessionManager.prototype, "cryptoService", void 0);
 __decorate([
-    (0, service_1.Inject)("SessionStore", true)
+    Inject("SessionStore", true)
 ], CookieSessionManager.prototype, "sessionStore", void 0);
-exports.CookieSessionManager = CookieSessionManager;
 /**
  * Session model
  *
  * @WebdaModel
  */
-class Session {
+export class Session {
     constructor() {
         this.changed = false;
     }
@@ -165,13 +145,11 @@ class Session {
     }
 }
 __decorate([
-    coremodel_1.NotEnumerable
+    NotEnumerable
 ], Session.prototype, "changed", void 0);
-exports.Session = Session;
 /**
  * Unknown session that allows all keys
  */
-class UnknownSession extends Session {
+export class UnknownSession extends Session {
 }
-exports.UnknownSession = UnknownSession;
 //# sourceMappingURL=session.js.map

package/lib/utils/session.js.map

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

package/lib/utils/session.spec.js

@@ -1,28 +1,17 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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 });
-const mocha_1 = require("@testdeck/mocha");
-const assert = require("assert");
-const memory_1 = require("../stores/memory");
-const test_1 = require("../test");
-const session_1 = require("./session");
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import { MemoryStore } from "../stores/memory.js";
+import { WebdaTest } from "../test.js";
+import { UnknownSession } from "./session.js";
 let SessionTest = class SessionTest {
     basic() {
-        let session = new session_1.UnknownSession().getProxy();
+        let session = new UnknownSession().getProxy();
         session.plop = "test";
         assert.ok(session.isDirty());
         assert.ok(!session.isLogged());
@@ -33,47 +22,45 @@ let SessionTest = class SessionTest {
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], SessionTest.prototype, "basic", null);
 SessionTest = __decorate([
-    mocha_1.suite
+    suite
 ], SessionTest);
-let SessionStoreTest = class SessionStoreTest extends test_1.WebdaTest {
-    sessionStore() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Test MemoryStore
-            const store = (this.webda.getServices()["sessionstore"] = yield new memory_1.MemoryStore(this.webda, "SessionStore", {})
-                .resolve()
-                .init());
-            store.getParameters().expose = { url: "url" };
-            assert.throws(() => this.getService("SessionManager").resolve(), /SessionStore should not be exposed/);
-            store.getParameters().expose = undefined;
-            this.getService("SessionManager").resolve();
-            let ctx = yield this.newContext();
-            ctx.getSession().identUsed = "bouzouf";
-            yield ctx.end();
-            let sessions = yield store.getAll();
-            assert.strictEqual(sessions.length, 1);
-            let cookie = yield this.webda.getCrypto().jwtVerify(ctx.getResponseCookies()["test"].value);
-            assert.strictEqual(cookie.uuid, undefined);
-            assert.strictEqual(cookie.identUsed, undefined);
-            assert.strictEqual(cookie.sub, sessions[0].getUuid());
-            let ctx2 = yield this.newContext();
-            ctx2.getHttpContext().cookies = {
-                test: ctx.getResponseCookies()["test"].value
-            };
-            yield ctx2.init();
-            let session = ctx2.getSession();
-            assert.strictEqual(session.uuid, sessions[0].getUuid());
-            assert.strictEqual(session.identUsed, "bouzouf");
-            assert.strictEqual(session.sub, undefined);
-        });
+let SessionStoreTest = class SessionStoreTest extends WebdaTest {
+    async sessionStore() {
+        // Test MemoryStore
+        const store = (this.webda.getServices()["sessionstore"] = await new MemoryStore(this.webda, "SessionStore", {})
+            .resolve()
+            .init());
+        store.getParameters().expose = { url: "url" };
+        assert.throws(() => this.getService("SessionManager").resolve(), /SessionStore should not be exposed/);
+        store.getParameters().expose = undefined;
+        this.getService("SessionManager").resolve();
+        let ctx = await this.newContext();
+        ctx.getSession().identUsed = "bouzouf";
+        await ctx.end();
+        let sessions = await store.getAll();
+        assert.strictEqual(sessions.length, 1);
+        let cookie = await this.webda.getCrypto().jwtVerify(ctx.getResponseCookies()["test"].value);
+        assert.strictEqual(cookie.uuid, undefined);
+        assert.strictEqual(cookie.identUsed, undefined);
+        assert.strictEqual(cookie.sub, sessions[0].getUuid());
+        let ctx2 = await this.newContext();
+        ctx2.getHttpContext().cookies = {
+            test: ctx.getResponseCookies()["test"].value
+        };
+        await ctx2.init();
+        let session = ctx2.getSession();
+        assert.strictEqual(session.uuid, sessions[0].getUuid());
+        assert.strictEqual(session.identUsed, "bouzouf");
+        assert.strictEqual(session.sub, undefined);
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], SessionStoreTest.prototype, "sessionStore", null);
 SessionStoreTest = __decorate([
-    mocha_1.suite
+    suite
 ], SessionStoreTest);
 //# sourceMappingURL=session.spec.js.map

package/lib/utils/session.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../src/utils/session.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../src/utils/session.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAwB,cAAc,EAAE,MAAM,WAAW,CAAC;AAGjE,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEf,KAAK;QACH,IAAI,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9C,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;QACtB,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACjC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9B,OAAO,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;AAVC;IADC,IAAI;wCAUJ;AAXG,WAAW;IADhB,KAAK;GACA,WAAW,CAYhB;AAGD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,SAAS;IAEtC,KAAK,CAAC,YAAY;QAChB,mBAAmB;QACnB,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,GAAG,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC;aAC5G,OAAO,EAAE;aACT,IAAI,EAAE,CAAC,CAAC;QACX,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;QAC9C,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAuB,gBAAgB,CAAC,CAAC,OAAO,EAAE,EACvE,oCAAoC,CACrC,CAAC;QACF,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC;QACzC,IAAI,CAAC,UAAU,CAAuB,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC;QAClE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC;QACvC,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC;QAChB,IAAI,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACvC,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5F,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAEtD,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,EAAE,CAAC,OAAO,GAAG;YAC9B,IAAI,EAAE,GAAG,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK;SAC7C,CAAC;QACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAkB,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACjD,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC;CACF,CAAA;AAhCC;IADC,IAAI;oDAgCJ;AAjCG,gBAAgB;IADrB,KAAK;GACA,gBAAgB,CAkCrB"}

package/lib/utils/waiter.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from "..";
+import { Logger } from "../index.js";
 /**
  * Function that define the amount of time between calls
  */

package/lib/utils/waiter.js

@@ -1,38 +1,24 @@
-"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.CancelableLoopPromise = exports.CancelablePromise = exports.WaitFor = exports.WaitDelayerFactories = exports.WaitExponentialDelay = exports.WaitLinearDelay = void 0;
-const uuid_1 = require("uuid");
+import { v4 as uuidv4 } from "uuid";
 /**
  * Return a delayer that always wait for the same amount of time
  * @param pause amount of time to wait
  * @returns
  */
-function WaitLinearDelay(pause) {
+export function WaitLinearDelay(pause) {
     return () => pause;
 }
-exports.WaitLinearDelay = WaitLinearDelay;
 /**
  * Return a delayer that always wait for the same amount of time
  * @param pause amount of time to wait
  * @returns
  */
-function WaitExponentialDelay(pause) {
+export function WaitExponentialDelay(pause) {
     return (retries) => Math.pow(2, retries - 1) * pause;
 }
-exports.WaitExponentialDelay = WaitExponentialDelay;
 /**
  * Registry for DelayerFactory
  */
-class WaitDelayerFactories {
+export class WaitDelayerFactories {
     /**
      * Add a delayer
      * @param type
@@ -58,7 +44,6 @@ class WaitDelayerFactories {
         return WaitDelayerFactories.getFactory(definition.type)(definition.interval);
     }
 }
-exports.WaitDelayerFactories = WaitDelayerFactories;
 WaitDelayerFactories.registry = {
     linear: WaitLinearDelay,
     exponential: WaitExponentialDelay
@@ -80,72 +65,68 @@ WaitDelayerFactories.registry = {
  * @param logger logger to use to report
  * @param delayer function that return pause between each call default to WaitExponential(1000)
  */
-function WaitFor(callback, retries, title, logger, delayer) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!delayer) {
-            delayer = WaitDelayerFactories.get();
+export async function WaitFor(callback, retries, title, logger, delayer) {
+    if (!delayer) {
+        delayer = WaitDelayerFactories.get();
+    }
+    return new Promise(async (mainResolve, mainReject) => {
+        let tries = 0;
+        let uuid = uuidv4();
+        if (logger) {
+            logger.logProgressStart(uuid, retries, title);
         }
-        return new Promise((mainResolve, mainReject) => __awaiter(this, void 0, void 0, function* () {
-            let tries = 0;
-            let uuid = (0, uuid_1.v4)();
+        while (retries > tries++) {
+            if (title && logger) {
+                logger.log("DEBUG", "[" + tries + "/" + retries + "]", title);
+            }
             if (logger) {
-                logger.logProgressStart(uuid, retries, title);
+                logger.logProgressUpdate(tries, uuid);
             }
-            while (retries > tries++) {
-                if (title && logger) {
-                    logger.log("DEBUG", "[" + tries + "/" + retries + "]", title);
-                }
+            if (await callback(mainResolve, mainReject)) {
                 if (logger) {
-                    logger.logProgressUpdate(tries, uuid);
+                    logger.logProgressUpdate(retries);
                 }
-                if (yield callback(mainResolve, mainReject)) {
-                    if (logger) {
-                        logger.logProgressUpdate(retries);
-                    }
-                    return;
-                }
-                yield new Promise(resolve => setTimeout(resolve, delayer(tries)));
+                return;
             }
-            mainReject("Timeout while waiting for " + title);
-        }));
+            await new Promise(resolve => setTimeout(resolve, delayer(tries)));
+        }
+        mainReject("Timeout while waiting for " + title);
     });
 }
-exports.WaitFor = WaitFor;
 /**
  * Return a promise that can be cancelled
  */
-class CancelablePromise extends Promise {
+export class CancelablePromise extends Promise {
     constructor(callback = () => {
         // noop
     }, onCancel = undefined) {
         let localReject;
         super((resolve, reject) => {
-            localReject = () => __awaiter(this, void 0, void 0, function* () {
+            localReject = async () => {
                 if (onCancel) {
-                    yield onCancel();
+                    await onCancel();
                 }
                 reject("Cancelled");
-            });
+            };
             callback(resolve, reject);
         });
         this.cancel = localReject;
     }
 }
-exports.CancelablePromise = CancelablePromise;
 /**
  * Create a promise that will loop on the same callback until cancelled
  */
-class CancelableLoopPromise extends Promise {
+export class CancelableLoopPromise extends Promise {
     constructor(callback, onCancel = undefined) {
         let localReject;
         let shouldRun = true;
         super(resolve => {
-            localReject = () => __awaiter(this, void 0, void 0, function* () {
+            localReject = async () => {
                 if (onCancel) {
-                    yield onCancel();
+                    await onCancel();
                 }
                 shouldRun = false;
-            });
+            };
             let loop = () => {
                 if (shouldRun) {
                     return callback(localReject).then(loop);
@@ -159,5 +140,4 @@ class CancelableLoopPromise extends Promise {
         return Promise;
     }
 }
-exports.CancelableLoopPromise = CancelableLoopPromise;
 //# sourceMappingURL=waiter.js.map

package/lib/utils/waiter.js.map

@@ -1 +1 @@
-{"version":3,"file":"waiter.js","sourceRoot":"","sources":["../../src/utils/waiter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"waiter.js","sourceRoot":"","sources":["../../src/utils/waiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAQpC;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,OAAO,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;AAC/D,CAAC;AAqBD;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAM/B;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,IAAY,EAAE,OAA2B;QAC9D,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,IAAY;QAC5B,OAAO,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,GAAG,CAAC,aAAoC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE;QACpF,OAAO,oBAAoB,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC/E,CAAC;;AA9BM,6BAAQ,GAA0C;IACvD,MAAM,EAAE,eAAe;IACvB,WAAW,EAAE,oBAAoB;CAClC,CAAC;AA8BJ;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,QAA6F,EAC7F,OAAe,EACf,KAAc,EACd,MAAe,EACf,OAAqB;IAErB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG,oBAAoB,CAAC,GAAG,EAAE,CAAC;KACtC;IACD,OAAO,IAAI,OAAO,CAAI,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE;QACtD,IAAI,KAAK,GAAW,CAAC,CAAC;QACtB,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC;QACpB,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;SAC/C;QACD,OAAO,OAAO,GAAG,KAAK,EAAE,EAAE;YACxB,IAAI,KAAK,IAAI,MAAM,EAAE;gBACnB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,KAAK,GAAG,GAAG,GAAG,OAAO,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;aAC/D;YACD,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aACvC;YACD,IAAI,MAAM,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE;gBAC3C,IAAI,MAAM,EAAE;oBACV,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;iBACnC;gBACD,OAAO;aACR;YACD,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACzE;QACD,UAAU,CAAC,4BAA4B,GAAG,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,iBAA4B,SAAQ,OAAU;IAEzD,YACE,WAA4E,GAAG,EAAE;QAC/E,OAAO;IACT,CAAC,EACD,WAAgC,SAAS;QAEzC,IAAI,WAAW,CAAC;QAChB,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxB,WAAW,GAAG,KAAK,IAAI,EAAE;gBACvB,IAAI,QAAQ,EAAE;oBACZ,MAAM,QAAQ,EAAE,CAAC;iBAClB;gBACD,MAAM,CAAC,WAAW,CAAC,CAAC;YACtB,CAAC,CAAC;YACF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;IAC5B,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,OAAa;IAEtD,YAAY,QAA2D,EAAE,WAAgC,SAAS;QAChH,IAAI,WAAW,CAAC;QAChB,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,KAAK,CAAC,OAAO,CAAC,EAAE;YACd,WAAW,GAAG,KAAK,IAAI,EAAE;gBACvB,IAAI,QAAQ,EAAE;oBACZ,MAAM,QAAQ,EAAE,CAAC;iBAClB;gBACD,SAAS,GAAG,KAAK,CAAC;YACpB,CAAC,CAAC;YACF,IAAI,IAAI,GAAG,GAAG,EAAE;gBACd,IAAI,SAAS,EAAE;oBACb,OAAO,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACzC;YACH,CAAC,CAAC;YACF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;IAC5B,CAAC;IAED,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;QACzB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}