@prosopo/provider 2.9.7 → 3.0.5

package/dist/tasks/captchaManager.js

@@ -1,30 +1,36 @@
-import { getLoggerDefault } from "@prosopo/common";
+import { getLogger } from "@prosopo/common";
 import { ApiParams, CaptchaType, Tier } from "@prosopo/types";
+import { ScopeMatch, createAccessPolicyResolver, userScopeInputSchema, } from "@prosopo/user-access-policy";
+import { uniqueSubsets } from "@prosopo/util";
 export class CaptchaManager {
     constructor(db, pair, logger) {
         this.pair = pair;
         this.db = db;
-        this.logger = logger || getLoggerDefault();
+        this.logger = logger || getLogger("info", import.meta.url);
     }
     async getFrictionlessTokenIdFromSession(sessionRecord) {
         const tokenRecord = await this.db.getFrictionlessTokenRecordByTokenId(sessionRecord.tokenId);
         return tokenRecord ? tokenRecord._id : undefined;
     }
     async isValidRequest(clientSettings, captchaType, sessionId) {
-        this.logger.debug({
-            message: "Validating request",
-            captchaType,
-            sessionId,
-        });
+        this.logger.debug(() => ({
+            msg: "Validating request",
+            data: {
+                captchaType,
+                sessionId,
+            },
+        }));
         if (sessionId) {
             if (clientSettings?.settings?.captchaType === CaptchaType.frictionless) {
                 const sessionRecord = await this.db.checkAndRemoveSession(sessionId);
                 if (!sessionRecord) {
-                    this.logger.warn({
-                        message: "No frictionless session found",
-                        account: clientSettings.account,
-                        sessionId: sessionId,
-                    });
+                    this.logger.warn(() => ({
+                        msg: "No frictionless session found",
+                        data: {
+                            account: clientSettings.account,
+                            sessionId: sessionId,
+                        },
+                    }));
                     return {
                         valid: false,
                         reason: "CAPTCHA.NO_SESSION_FOUND",
@@ -38,12 +44,14 @@ export class CaptchaManager {
                     type: captchaType,
                 };
             }
-            this.logger.warn({
-                message: "Invalid frictionless request",
-                account: clientSettings.account,
-                sessionId: sessionId,
-                settingsCaptchaType: clientSettings?.settings?.captchaType,
-            });
+            this.logger.warn(() => ({
+                msg: "Invalid frictionless request",
+                data: {
+                    account: clientSettings.account,
+                    sessionId: sessionId,
+                    settingsCaptchaType: clientSettings?.settings?.captchaType,
+                },
+            }));
             return {
                 valid: false,
                 reason: "API.INCORRECT_CAPTCHA_TYPE",
@@ -51,12 +59,14 @@ export class CaptchaManager {
             };
         }
         if (clientSettings?.settings?.captchaType !== captchaType) {
-            this.logger.warn({
-                message: `Invalid ${captchaType} request`,
-                account: clientSettings.account,
-                requestedCaptchaType: captchaType,
-                settingsCaptchaType: clientSettings?.settings?.captchaType,
-            });
+            this.logger.warn(() => ({
+                msg: `Invalid ${captchaType} request`,
+                data: {
+                    account: clientSettings.account,
+                    requestedCaptchaType: captchaType,
+                    settingsCaptchaType: clientSettings?.settings?.captchaType,
+                },
+            }));
             return {
                 valid: false,
                 reason: "API.INCORRECT_CAPTCHA_TYPE",
@@ -74,6 +84,39 @@ export class CaptchaManager {
             }),
         };
     }
+    async getPrioritisedAccessPolicies(userAccessRulesStorage, clientId, userScope) {
+        const resolver = createAccessPolicyResolver(userAccessRulesStorage, this.logger);
+        const userScopeKeys = Object.keys(userScope).filter((key) => userScope[key] !== undefined);
+        const prioritisedUserScopes = uniqueSubsets(userScopeKeys).map((subset) => subset.reduce((acc, key) => {
+            acc[key] = userScope[key];
+            return acc;
+        }, {}));
+        for (const clientOrUndefined of [clientId, undefined]) {
+            for (const scope of prioritisedUserScopes) {
+                const accessPolicy = await resolver({
+                    ...(clientOrUndefined && {
+                        policyScope: {
+                            clientId: clientOrUndefined,
+                        },
+                        policyScopeMatch: ScopeMatch.Exact,
+                    }),
+                    userScope: userScopeInputSchema.parse(scope),
+                    userScopeMatch: ScopeMatch.Exact,
+                });
+                if (accessPolicy) {
+                    this.logger.debug(() => ({
+                        msg: "Access policy found",
+                        data: {
+                            accessPolicy,
+                            scope,
+                        },
+                    }));
+                    return accessPolicy;
+                }
+            }
+        }
+        return undefined;
+    }
     async getDetectorKeys() {
         return await this.db.getDetectorKeys();
     }

package/dist/tasks/captchaManager.js.map

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

package/dist/tasks/client/clientTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAkB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAGxB,KAAK,IAAI,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGN,KAAK,iBAAiB,EAMtB,MAAM,yBAAyB,CAAC;AAoBjC,qBAAa,iBAAiB;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;gBAEtC,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,iBAAiB;IAWtB,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAmBhD,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqJzC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE9B,eAAe,CACpB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC;IAWV,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3D,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAoBxE,OAAO,CAAC,eAAe;YAWT,wBAAwB;CAatC"}
+{"version":3,"file":"clientTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAkB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAGxB,KAAK,IAAI,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGN,KAAK,iBAAiB,EAMtB,MAAM,yBAAyB,CAAC;AAoBjC,qBAAa,iBAAiB;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,eAAe,GAAG,SAAS,CAAC;gBAEtC,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,iBAAiB;IAWtB,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAmBhD,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwJzC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAmE9B,eAAe,CACpB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC;IAWV,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3D,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAoBxE,OAAO,CAAC,eAAe;YAWT,wBAAwB;CAatC"}

package/dist/tasks/client/clientTasks.js

@@ -3,7 +3,7 @@ import { ProsopoApiError } from "@prosopo/common";
 import { CaptchaDatabase, ClientDatabase } from "@prosopo/database";
 import { ScheduledTaskNames, ScheduledTaskStatus, } from "@prosopo/types";
 import { parseUrl } from "@prosopo/util";
-import { validiateSiteKey } from "../../api/validateAddress.js";
+import { validateSiteKey } from "../../api/validateAddress.js";
 const isValidPrivateKey = (privateKeyString) => {
     const privateKey = Buffer.from(privateKeyString, "base64").toString("ascii");
     try {
@@ -35,7 +35,7 @@ export class ClientTaskManager {
     }
     async storeCommitmentsExternal() {
         if (!this.config.mongoCaptchaUri) {
-            this.logger.info("Mongo env not set");
+            this.logger.info(() => ({ msg: "Mongo env not set" }));
             return;
         }
         const lastTask = await this.providerDB.getLastScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Completed);
@@ -71,14 +71,16 @@ export class ClientTaskManager {
                     ? batch.filter((record) => this.isRecordUpdated(record))
                     : batch;
                 const frictionlessTokenRecords = await this.providerDB.getFrictionlessTokenRecordsByTokenIds(filteredBatch.map((record) => record.tokenId));
-                this.logger.info(`Frictionless token records: ${frictionlessTokenRecords.length}`);
+                this.logger.info(() => ({
+                    msg: `Frictionless token records: ${frictionlessTokenRecords.length}`,
+                }));
                 const filteredBatchWithScores = filteredBatch.map((record) => {
                     const tokenRecord = frictionlessTokenRecords.find((tokenRecord) => tokenRecord._id?.toString() === record.tokenId.toString());
                     if (!tokenRecord) {
-                        this.logger.error({
-                            message: "No token record found",
-                            context: { tokenId: record.tokenId },
-                        });
+                        this.logger.error(() => ({
+                            msg: "No token record found",
+                            data: { tokenId: record.tokenId },
+                        }));
                         return {
                             ...record,
                             score: 0,
@@ -111,14 +113,17 @@ export class ClientTaskManager {
             this.captchaDB?.close();
         }
         catch (e) {
-            this.logger.error(e);
+            this.logger.error(() => ({
+                err: e,
+                msg: "Error processing client tasks",
+            }));
             this.captchaDB?.close();
             await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Failed, { error: String(e) });
         }
     }
     async getClientList() {
         if (!this.config.mongoClientUri) {
-            this.logger.info("Mongo env not set");
+            this.logger.info(() => ({ msg: "Mongo env not set" }));
             return;
         }
         const lastTask = await this.providerDB.getLastScheduledTaskStatus(ScheduledTaskNames.GetClientList, ScheduledTaskStatus.Completed);
@@ -129,9 +134,9 @@ export class ClientTaskManager {
             const updatedAtTimestamp = lastTask?.updated
                 ? lastTask.updated - tenMinuteWindow || 0
                 : 0;
-            this.logger.info({
-                message: `Getting updated client records since ${new Date(updatedAtTimestamp).toDateString()}`,
-            });
+            this.logger.info(() => ({
+                msg: `Getting updated client records since ${new Date(updatedAtTimestamp).toDateString()}`,
+            }));
             const newClientRecords = await clientDB.getUpdatedClients(updatedAtTimestamp);
             if (newClientRecords) {
                 await this.providerDB.updateClientRecords(newClientRecords);
@@ -147,12 +152,15 @@ export class ClientTaskManager {
                 context: { error: e },
                 logger: this.logger,
             });
-            this.logger.error(getClientListError, { context: { error: e } });
+            this.logger.error(() => ({
+                err: getClientListError,
+                msg: "Error getting client list",
+            }));
             await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Failed, { error: String(e) });
         }
     }
     async registerSiteKey(siteKey, tier, settings) {
-        validiateSiteKey(siteKey);
+        validateSiteKey(siteKey);
         await this.providerDB.updateClientRecords([
             {
                 account: siteKey,
@@ -191,10 +199,10 @@ export class ClientTaskManager {
                 referrerDomain.endsWith(`.${allowedDomain}`));
         }
         catch {
-            this.logger.error({
-                message: "Error in isSubdomainOrExactMatch",
-                context: { referrer, clientDomain },
-            });
+            this.logger.error(() => ({
+                msg: "Error in isSubdomainOrExactMatch",
+                data: { referrer, clientDomain },
+            }));
             return false;
         }
     }

package/dist/tasks/client/clientTasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"clientTasks.js","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAe,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAGN,kBAAkB,EAClB,mBAAmB,GAEnB,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,MAAM,iBAAiB,GAAG,CAAC,gBAAwB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC;QACJ,gBAAgB,CAAC;YAChB,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,OAAO;SACb,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,OAAO,iBAAiB;IAK7B,YACC,MAA2B,EAC3B,MAAc,EACd,EAAqB;QAErB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACtB,CAAC;IAMD,YAAY,CAAC,eAAuB;QACnC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CACnC,eAAe,EACf,SAAS,EACT,SAAS,EACT,IAAI,CAAC,MAAM,CACX,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAMD,KAAK,CAAC,wBAAwB;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtC,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAChE,kBAAkB,CAAC,wBAAwB,EAC3C,mBAAmB,CAAC,SAAS,CAC7B,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC7D,kBAAkB,CAAC,wBAAwB,EAC3C,mBAAmB,CAAC,OAAO,CAC3B,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,IAAI,CAAC;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAGjE,IAAI,oBAAoB,GAAG,CAAC,CAAC;YAE7B,MAAM,IAAI,CAAC,wBAAwB,CAClC,KAAK,EAAE,IAAY,EAAE,EAAE,CACtB,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CACnD,UAAU,EACV,IAAI,CACJ,EACF,KAAK,EAAE,KAAK,EAAE,EAAE;gBACf,MAAM,aAAa,GAAG,QAAQ,EAAE,OAAO;oBACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;oBAChE,CAAC,CAAC,KAAK,CAAC;gBAET,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;oBACpD,MAAM,IAAI,CAAC,UAAU,CAAC,6BAA6B,CAClD,aAAa,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAChD,CAAC;gBACH,CAAC;gBACD,oBAAoB,IAAI,aAAa,CAAC,MAAM,CAAC;YAC9C,CAAC,CACD,CAAC;YAGF,IAAI,mBAAmB,GAAG,CAAC,CAAC;YAC5B,MAAM,IAAI,CAAC,wBAAwB,CAClC,KAAK,EAAE,IAAY,EAAE,EAAE,CACtB,MAAM,IAAI,CAAC,UAAU,CAAC,iCAAiC,CACtD,UAAU,EACV,IAAI,CACJ,EACF,KAAK,EAAE,KAAK,EAAE,EAAE;gBACf,MAAM,aAAa,GAAG,QAAQ,EAAE,OAAO;oBACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,CAAC,CAAC,KAAK,CAAC;gBAET,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;oBACpD,MAAM,IAAI,CAAC,UAAU,CAAC,gCAAgC,CACrD,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAC/C,CAAC;gBACH,CAAC;gBACD,mBAAmB,IAAI,aAAa,CAAC,MAAM,CAAC;YAC7C,CAAC,CACD,CAAC;YAGF,IAAI,uBAAuB,GAAG,CAAC,CAAC;YAChC,MAAM,IAAI,CAAC,wBAAwB,CAClC,KAAK,EAAE,IAAY,EAAE,EAAE,CACtB,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,EAClE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACf,MAAM,aAAa,GAAG,QAAQ,EAAE,OAAO;oBACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,CAAC,CAAC,KAAK,CAAC;gBAET,MAAM,wBAAwB,GAC7B,MAAM,IAAI,CAAC,UAAU,CAAC,qCAAqC,CAC1D,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAC7C,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,+BAA+B,wBAAwB,CAAC,MAAM,EAAE,CAChE,CAAC;gBAEF,MAAM,uBAAuB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC5D,MAAM,WAAW,GAAG,wBAAwB,CAAC,IAAI,CAChD,CAAC,WAAW,EAAE,EAAE,CACf,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAC1D,CAAC;oBACF,IAAI,CAAC,WAAW,EAAE,CAAC;wBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;4BACjB,OAAO,EAAE,uBAAuB;4BAChC,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;yBACpC,CAAC,CAAC;wBACH,OAAO;4BACN,GAAG,MAAM;4BACT,KAAK,EAAE,CAAC;4BACR,eAAe,EAAE;gCAChB,SAAS,EAAE,CAAC;6BACZ;4BACD,SAAS,EAAE,CAAC;yBACK,CAAC;oBACpB,CAAC;oBACD,OAAO;wBACN,GAAG,MAAM;wBACT,KAAK,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;wBAC9B,eAAe,EAAE,WAAW,EAAE,eAAe;wBAC7C,SAAS,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC;qBACrB,CAAC;gBACpB,CAAC,CAAC,CAAC;gBAEH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,SAAS,CAAC,YAAY,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC9D,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAC7C,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAC/C,CAAC;gBACH,CAAC;gBACD,uBAAuB,IAAI,aAAa,CAAC,MAAM,CAAC;YACjD,CAAC,CACD,CAAC;YAEF,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,SAAS,EAC7B;gBACC,IAAI,EAAE;oBACL,uBAAuB;oBACvB,oBAAoB;oBACpB,mBAAmB;iBACnB;aACD,CACD,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,MAAM,EAC1B,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CACpB,CAAC;QACH,CAAC;IACF,CAAC;IAMD,KAAK,CAAC,aAAa;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtC,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAChE,kBAAkB,CAAC,aAAa,EAChC,mBAAmB,CAAC,SAAS,CAC7B,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC7D,kBAAkB,CAAC,aAAa,EAChC,mBAAmB,CAAC,OAAO,CAC3B,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,IAAI,cAAc,CAClC,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,SAAS,EACT,SAAS,EACT,IAAI,CAAC,MAAM,CACX,CAAC;YAGF,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YACvC,MAAM,kBAAkB,GAAG,QAAQ,EAAE,OAAO;gBAC3C,CAAC,CAAC,QAAQ,CAAC,OAAO,GAAG,eAAe,IAAI,CAAC;gBACzC,CAAC,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBAChB,OAAO,EAAE,wCAAwC,IAAI,IAAI,CAAC,kBAAkB,CAAC,CAAC,YAAY,EAAE,EAAE;aAC9F,CAAC,CAAC;YAEH,MAAM,gBAAgB,GACrB,MAAM,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;YAEtD,IAAI,gBAAgB,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,SAAS,EAC7B;gBACC,IAAI,EAAE;oBACL,aAAa,EAAE,gBAAgB,CAAC,MAAM;iBACtC;aACD,CACD,CAAC;QACH,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,MAAM,kBAAkB,GAAG,IAAI,eAAe,CAAC,kBAAkB,EAAE;gBAClE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,MAAM,EAC1B,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CACpB,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,OAAe,EACf,IAAU,EACV,QAAuB;QAEvB,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC;YACzC;gBACC,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,QAAQ;aACF;SACjB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QAC1C,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,eAAe,CAAC,sBAAsB,EAAE;gBACjD,OAAO,EAAE,EAAE,WAAW,EAAE;gBACxB,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QAC1C,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,eAAe,CAAC,sBAAsB,EAAE;gBACjD,OAAO,EAAE,EAAE,WAAW,EAAE;gBACxB,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IAED,uBAAuB,CAAC,QAAgB,EAAE,YAAoB;QAC7D,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY;YAAE,OAAO,KAAK,CAAC;QAC7C,IAAI,YAAY,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QACtC,IAAI,CAAC;YACJ,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM,aAAa,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAEzE,OAAO,CACN,cAAc,KAAK,aAAa;gBAChC,cAAc,CAAC,QAAQ,CAAC,IAAI,aAAa,EAAE,CAAC,CAC5C,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBACjB,OAAO,EAAE,kCAAkC;gBAC3C,OAAO,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE;aACnC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAEO,eAAe,CACtB,MAAyD;QAEzD,MAAM,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;QAC3D,OAAO,CACN,CAAC,oBAAoB;YACrB,CAAC,iBAAiB;YAClB,oBAAoB,GAAG,iBAAiB,CACxC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACrC,UAA0C,EAC1C,YAA2C;QAE3C,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,MAAM;gBAAE,MAAM;YAEzB,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;IACF,CAAC;CACD"}
+{"version":3,"file":"clientTasks.js","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAe,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAGN,kBAAkB,EAClB,mBAAmB,GAEnB,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,iBAAiB,GAAG,CAAC,gBAAwB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC;QACJ,gBAAgB,CAAC;YAChB,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,OAAO;SACb,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,OAAO,iBAAiB;IAK7B,YACC,MAA2B,EAC3B,MAAc,EACd,EAAqB;QAErB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACtB,CAAC;IAMD,YAAY,CAAC,eAAuB;QACnC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CACnC,eAAe,EACf,SAAS,EACT,SAAS,EACT,IAAI,CAAC,MAAM,CACX,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAMD,KAAK,CAAC,wBAAwB;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;YACvD,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAChE,kBAAkB,CAAC,wBAAwB,EAC3C,mBAAmB,CAAC,SAAS,CAC7B,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC7D,kBAAkB,CAAC,wBAAwB,EAC3C,mBAAmB,CAAC,OAAO,CAC3B,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,IAAI,CAAC;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAGjE,IAAI,oBAAoB,GAAG,CAAC,CAAC;YAE7B,MAAM,IAAI,CAAC,wBAAwB,CAClC,KAAK,EAAE,IAAY,EAAE,EAAE,CACtB,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CACnD,UAAU,EACV,IAAI,CACJ,EACF,KAAK,EAAE,KAAK,EAAE,EAAE;gBACf,MAAM,aAAa,GAAG,QAAQ,EAAE,OAAO;oBACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;oBAChE,CAAC,CAAC,KAAK,CAAC;gBAET,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;oBACpD,MAAM,IAAI,CAAC,UAAU,CAAC,6BAA6B,CAClD,aAAa,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAChD,CAAC;gBACH,CAAC;gBACD,oBAAoB,IAAI,aAAa,CAAC,MAAM,CAAC;YAC9C,CAAC,CACD,CAAC;YAGF,IAAI,mBAAmB,GAAG,CAAC,CAAC;YAC5B,MAAM,IAAI,CAAC,wBAAwB,CAClC,KAAK,EAAE,IAAY,EAAE,EAAE,CACtB,MAAM,IAAI,CAAC,UAAU,CAAC,iCAAiC,CACtD,UAAU,EACV,IAAI,CACJ,EACF,KAAK,EAAE,KAAK,EAAE,EAAE;gBACf,MAAM,aAAa,GAAG,QAAQ,EAAE,OAAO;oBACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,CAAC,CAAC,KAAK,CAAC;gBAET,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;oBACpD,MAAM,IAAI,CAAC,UAAU,CAAC,gCAAgC,CACrD,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAC/C,CAAC;gBACH,CAAC;gBACD,mBAAmB,IAAI,aAAa,CAAC,MAAM,CAAC;YAC7C,CAAC,CACD,CAAC;YAGF,IAAI,uBAAuB,GAAG,CAAC,CAAC;YAChC,MAAM,IAAI,CAAC,wBAAwB,CAClC,KAAK,EAAE,IAAY,EAAE,EAAE,CACtB,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,EAClE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACf,MAAM,aAAa,GAAG,QAAQ,EAAE,OAAO;oBACtC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,CAAC,CAAC,KAAK,CAAC;gBAET,MAAM,wBAAwB,GAC7B,MAAM,IAAI,CAAC,UAAU,CAAC,qCAAqC,CAC1D,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAC7C,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;oBACvB,GAAG,EAAE,+BAA+B,wBAAwB,CAAC,MAAM,EAAE;iBACrE,CAAC,CAAC,CAAC;gBAEJ,MAAM,uBAAuB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC5D,MAAM,WAAW,GAAG,wBAAwB,CAAC,IAAI,CAChD,CAAC,WAAW,EAAE,EAAE,CACf,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAC1D,CAAC;oBACF,IAAI,CAAC,WAAW,EAAE,CAAC;wBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;4BACxB,GAAG,EAAE,uBAAuB;4BAC5B,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;yBACjC,CAAC,CAAC,CAAC;wBACJ,OAAO;4BACN,GAAG,MAAM;4BACT,KAAK,EAAE,CAAC;4BACR,eAAe,EAAE;gCAChB,SAAS,EAAE,CAAC;6BACZ;4BACD,SAAS,EAAE,CAAC;yBACK,CAAC;oBACpB,CAAC;oBACD,OAAO;wBACN,GAAG,MAAM;wBACT,KAAK,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;wBAC9B,eAAe,EAAE,WAAW,EAAE,eAAe;wBAC7C,SAAS,EAAE,WAAW,EAAE,SAAS,IAAI,CAAC;qBACrB,CAAC;gBACpB,CAAC,CAAC,CAAC;gBAEH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,SAAS,CAAC,YAAY,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC9D,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAC7C,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAC/C,CAAC;gBACH,CAAC;gBACD,uBAAuB,IAAI,aAAa,CAAC,MAAM,CAAC;YACjD,CAAC,CACD,CAAC;YAEF,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,SAAS,EAC7B;gBACC,IAAI,EAAE;oBACL,uBAAuB;oBACvB,oBAAoB;oBACpB,mBAAmB;iBACnB;aACD,CACD,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACxB,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,+BAA+B;aACpC,CAAC,CAAC,CAAC;YACJ,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,MAAM,EAC1B,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CACpB,CAAC;QACH,CAAC;IACF,CAAC;IAMD,KAAK,CAAC,aAAa;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;YACvD,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAChE,kBAAkB,CAAC,aAAa,EAChC,mBAAmB,CAAC,SAAS,CAC7B,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC7D,kBAAkB,CAAC,aAAa,EAChC,mBAAmB,CAAC,OAAO,CAC3B,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,IAAI,cAAc,CAClC,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,SAAS,EACT,SAAS,EACT,IAAI,CAAC,MAAM,CACX,CAAC;YAGF,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YACvC,MAAM,kBAAkB,GAAG,QAAQ,EAAE,OAAO;gBAC3C,CAAC,CAAC,QAAQ,CAAC,OAAO,GAAG,eAAe,IAAI,CAAC;gBACzC,CAAC,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvB,GAAG,EAAE,wCAAwC,IAAI,IAAI,CAAC,kBAAkB,CAAC,CAAC,YAAY,EAAE,EAAE;aAC1F,CAAC,CAAC,CAAC;YAEJ,MAAM,gBAAgB,GACrB,MAAM,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;YAEtD,IAAI,gBAAgB,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,SAAS,EAC7B;gBACC,IAAI,EAAE;oBACL,aAAa,EAAE,gBAAgB,CAAC,MAAM;iBACtC;aACD,CACD,CAAC;QACH,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,MAAM,kBAAkB,GAAG,IAAI,eAAe,CAAC,kBAAkB,EAAE;gBAClE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACxB,GAAG,EAAE,kBAAkB;gBACvB,GAAG,EAAE,2BAA2B;aAChC,CAAC,CAAC,CAAC;YACJ,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAC9C,MAAM,EACN,mBAAmB,CAAC,MAAM,EAC1B,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CACpB,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,OAAe,EACf,IAAU,EACV,QAAuB;QAEvB,eAAe,CAAC,OAAO,CAAC,CAAC;QACzB,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC;YACzC;gBACC,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,QAAQ;aACF;SACjB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QAC1C,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,eAAe,CAAC,sBAAsB,EAAE;gBACjD,OAAO,EAAE,EAAE,WAAW,EAAE;gBACxB,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QAC1C,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,eAAe,CAAC,sBAAsB,EAAE;gBACjD,OAAO,EAAE,EAAE,WAAW,EAAE;gBACxB,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IAED,uBAAuB,CAAC,QAAgB,EAAE,YAAoB;QAC7D,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY;YAAE,OAAO,KAAK,CAAC;QAC7C,IAAI,YAAY,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QACtC,IAAI,CAAC;YACJ,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM,aAAa,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAEzE,OAAO,CACN,cAAc,KAAK,aAAa;gBAChC,cAAc,CAAC,QAAQ,CAAC,IAAI,aAAa,EAAE,CAAC,CAC5C,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACxB,GAAG,EAAE,kCAAkC;gBACvC,IAAI,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE;aAChC,CAAC,CAAC,CAAC;YACJ,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAEO,eAAe,CACtB,MAAyD;QAEzD,MAAM,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;QAC3D,OAAO,CACN,CAAC,oBAAoB;YACrB,CAAC,iBAAiB;YAClB,oBAAoB,GAAG,iBAAiB,CACxC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACrC,UAA0C,EAC1C,YAA2C;QAE3C,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,MAAM;gBAAE,MAAM;YAEzB,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;IACF,CAAC;CACD"}

package/dist/tasks/detection/decodePayload.d.ts

@@ -1,5 +1,5 @@
-export { Ia0dxt8 as default };
-declare function Ia0dxt8(EFjSSPZ: any, lI1dBIg: any): Promise<{
+export { uTahDN as default };
+declare function uTahDN(kdTIwD: any, q8qlP2G: any): Promise<{
     [x: number]: any;
 }>;
 //# sourceMappingURL=decodePayload.d.ts.map

package/dist/tasks/detection/decodePayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decodePayload.d.ts","sourceRoot":"","sources":["../../../src/tasks/detection/decodePayload.js"],"names":[],"mappings":";AAc6ohB;;GAAirE"}
+{"version":3,"file":"decodePayload.d.ts","sourceRoot":"","sources":["../../../src/tasks/detection/decodePayload.js"],"names":[],"mappings":";AAc6ia;;GAAklE"}