npm - @intuitionrobotics/thunderstorm - Versions diffs - 0.43.0 → 0.43.3 - Mend

@intuitionrobotics/thunderstorm 0.43.0 → 0.43.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (103) hide show

package/app-backend/modules/server/HttpServer.js CHANGED Viewed

@@ -29,7 +29,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HeaderKey = exports.HttpServer = exports.RouteResolver = exports.HttpServer_Class = void 0;
+exports.HeaderKey = exports.RouteResolver = exports.HttpServer_Class = void 0;
 /**
  * Module dependencies.
  */
@@ -60,10 +60,10 @@ const ExposedHeaders = [
     _imports_1.HeaderKey_JWT
 ];
 class HttpServer_Class extends ts_common_1.Module {
-    constructor() {
-        super("http-server");
+    constructor(_express) {
+        super("HttpServer");
         this.errorMessageComposer = server_errors_1.DefaultApiErrorMessageComposer();
-        this.express = express();
+        this.express = _express;
     }
     setErrorMessageComposer(errorMessageComposer) {
         this.errorMessageComposer = errorMessageComposer;
@@ -147,10 +147,13 @@ class HttpServer_Class extends ts_common_1.Module {
         this.routes.forEach(route => this.logInfo(`${JSON.stringify(route.methods)} ${prefix}${route.path}`));
         console.timeEnd(label);
     }
-    resolveApi(routeResolver, urlPrefix) {
+    resolveApi(routeResolver, urlPrefix, apis) {
         console.time('Resolving Apis');
-        routeResolver.setExpressInstance(this.express);
-        routeResolver.resolveApi(urlPrefix);
+        const baseUrl = this.getBaseUrl();
+        // Load from those passed by init
+        routeResolver.routeApis(apis, urlPrefix, baseUrl, this.express);
+        // Load from folder structure recursively
+        routeResolver.resolveApi(urlPrefix, baseUrl, this.express);
         const resolveRoutes = (stack) => {
             return stack.map((layer) => {
                 if (layer.route && typeof layer.route.path === "string") {
@@ -181,20 +184,17 @@ class RouteResolver {
         this.rootDir = rootDir;
         this.apiFolder = apiFolder || "";
     }
-    setExpressInstance(_exp) {
-        this.express = _exp;
-    }
     setMiddlewares(...middlewares) {
         this.middlewares = middlewares;
         return this;
     }
-    resolveApi(urlPrefix) {
-        this.resolveApiImpl(urlPrefix, this.rootDir + "/" + this.apiFolder);
+    resolveApi(urlPrefix, baseUrl, _exp) {
+        this.resolveApiImpl(urlPrefix, this.rootDir + "/" + this.apiFolder, baseUrl, _exp);
     }
-    resolveApiImpl(urlPrefix, workingDir) {
+    resolveApiImpl(urlPrefix, workingDir, baseUrl, _exp) {
         fs.readdirSync(workingDir).forEach((file) => {
             if (fs.statSync(`${workingDir}/${file}`).isDirectory()) {
-                this.resolveApiImpl(`${urlPrefix}/${file}`, `${workingDir}/${file}`);
+                this.resolveApiImpl(`${urlPrefix}/${file}`, `${workingDir}/${file}`, baseUrl, _exp);
                 return;
             }
             if (file.endsWith(".d.ts"))
@@ -213,8 +213,7 @@ class RouteResolver {
                     console.log(`could not reference RouteResolver for: ${workingDir}/${relativePathToFile}`, e);
                     throw e;
                 }
-                routeResolver.setExpressInstance(this.express);
-                routeResolver.resolveApi(urlPrefix);
+                routeResolver.resolveApi(urlPrefix, baseUrl, _exp);
                 return;
             }
             let content;
@@ -227,18 +226,17 @@ class RouteResolver {
             }
             if (!Array.isArray(content))
                 content = [content];
-            this.routeApis(content, urlPrefix);
+            this.routeApis(content, urlPrefix, baseUrl, _exp);
         });
     }
-    routeApis(apis, urlPrefix) {
+    routeApis(apis, urlPrefix, baseUrl, _exp) {
         apis.forEach(api => {
             api.addMiddlewares(...this.middlewares);
-            api.route(this.express, urlPrefix);
+            api.route(_exp, urlPrefix, baseUrl);
         });
     }
 }
 exports.RouteResolver = RouteResolver;
-exports.HttpServer = new HttpServer_Class();
 class HeaderKey {
     constructor(key, responseCode = 400) {
         this.key = key;

package/app-backend/modules/server/HttpServer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH;;GAEG;AAEH,2CAA2C;AAC3C,yBAAyB;AACzB,~~4DAAiG~~;~~AACjG~~,6CAAqE;AACrE,iDAA8C;AAC9C,mCAAmC;AAGnC,mDAA+D;AAC/D,0CAAyE;AAEzE,MAAM,WAAW,GAAa;IAC1B,KAAK;IACL,KAAK;IACL,OAAO;IACP,MAAM;IACN,QAAQ;IACR,SAAS;CACZ,CAAC;AAEF,MAAM,cAAc,GAAa;IAC7B,cAAc;IACd,kBAAkB;IAClB,cAAc;IACd,eAAe;CAClB,CAAA;AAED,MAAM,cAAc,GAAa;IAC7B,wCAA6B;IAC7B,wBAAa;CAChB,CAAC;AAuBF,MAAa,gBACT,SAAQ,kBAAkB;IAO1B;~~QACI~~,KAAK,CAAC,~~aAAa~~,CAAC,CAAC;~~QALzB~~,yBAAoB,GAAqB,8CAA8B,EAAE,CAAC;QAMtE,IAAI,CAAC,OAAO,GAAG,~~OAAO~~,~~EAAE,~~CAAC;~~IAC7B~~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~~QAC7D~~,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAE9B,aAAa,CAAC,~~kBAAkB~~,CAAC,IAAI,CAAC,OAAO,CAAC,~~CAAC~~;~~QAC~~/C,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;~~QAEpC~~,MAAM,aAAa,GAAG,CAAC,KAAY,EAAS,EAAE;YAC1C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC5B,IAAI,KAAK,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACrD,IAAI,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC/C,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE;wBACnB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;oBAEtB,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAC,CAAC;iBACrD;gBAED,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;oBACvB,OAAO,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAEjD,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,MAAM,MAAM,GAAgC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAkB,EAAE,KAAK,EAAE,EAAE;YACtD,MAAM,KAAK,GAAgB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAClE,6BAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAChC,OAAO,KAAK,CAAC;QACjB,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACrC,CAAC;;~~AA9IL~~,~~4CA+IC~~;~~AA5I2B~~,kCAAiB,GAA4B,EAAE,CAAC;~~AA8I5E~~,MAAa,aAAa;~~IAOtB~~,YAAY,OAAoB,EAAE,OAAe,EAAE,SAAkB;QAF7D,gBAAW,GAA2B,EAAE,CAAC;QAG7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,EAAE,CAAC;IACrC,CAAC;IAED,~~kBAAkB,CAAC,IAAqB;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,~~cAAc,CAAC,GAAG,WAAmC;QACjD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU,CAAC,SAAiB;QAC/B,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;~~IACvE~~,CAAC;IAEO,cAAc,CAAC,SAAiB,EAAE,UAAkB;~~QACxD~~,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;YAChD,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE;gBACpD,IAAI,CAAC,cAAc,CAAC,GAAG,SAAS,IAAI,IAAI,EAAE,EAAE,GAAG,UAAU,IAAI,IAAI,EAAE,CAAC,CAAC;~~gBACrE~~,OAAO;aACV;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACtB,OAAO;YAEX,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBACrB,OAAO;YAEX,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACpB,OAAO;YAEX,MAAM,kBAAkB,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;YAC9E,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,aAA4B,CAAC;gBACjC,IAAI;oBACA,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;iBACpD;gBAAC,OAAO,CAAC,EAAE;oBACR,OAAO,CAAC,GAAG,CAAC,0CAA0C,UAAU,IAAI,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC7F,MAAM,CAAC,CAAC;iBACX;gBAED,aAAa,CAAC,~~kBAAkB~~,CAAC,~~IAAI~~,~~CAAC~~,OAAO,~~CAAC~~,~~CAAC;gBAC/C~~,~~aAAa,~~CAAC,~~UAAU,~~CAAC~~,SAAS,CAAC,CAAC~~;~~gBACpC~~,OAAO;aACV;YAED,IAAI,OAA8D,CAAC;YACnE,IAAI;gBACA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;aAC9C;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,GAAG,CAAC,sCAAsC,UAAU,IAAI,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC;gBACzF,MAAM,CAAC,CAAC;aACX;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBACvB,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;YAExB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;~~QACtC~~,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,SAAS,CAAC,IAAsB,EAAE,SAAiB;~~QACtD~~,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACf,GAAG,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;YACxC,GAAG,CAAC,KAAK,CAAC,IAAI,~~CAAC~~,~~OAAO~~,EAAE,~~SAAS~~,CAAC,CAAC;~~QACvC~~,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;~~AA9ED~~,~~sCA8EC~~;~~AAEY~~,~~QAAA,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAEjD,~~MAAa,SAAS;IAIlB,YAAY,GAAW,EAAE,eAAuB,GAAG;QAC/C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,OAAuB;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK;YACN,MAAM,IAAI,yBAAY,CAAC,IAAI,CAAC,YAAY,EAAE,4BAA4B,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAEtF,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAhBD,8BAgBC"}
1	+ {"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/server/server-api.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@
 /**
  * Created by tacb0ss on 11/07/2018.
  */
-import { Logger, ValidatorTypeResolver } from "@intuitionrobotics/ts-common";
+import { Logger, ObjectTS, ValidatorTypeResolver } from "@intuitionrobotics/ts-common";
 import { Stream } from "stream";
 import { ServerApi_Middleware } from "./HttpServer";
 import { IncomingHttpHeaders } from "http";
@@ -28,6 +28,7 @@ export declare abstract class ServerApi<Binder extends ApiTypeBinder<string, R,
     private bodyValidator?;
     private queryValidator?;
     private sideEffects;
+    protected baseUrl?: string;
     protected constructor(method: HttpMethod, relativePath: string, tag?: string);
     shouldPrintResponse(): boolean;
     addSideEffect(sideEffect: () => Promise<any>): this;
@@ -40,12 +41,13 @@ export declare abstract class ServerApi<Binder extends ApiTypeBinder<string, R,
     getUrl(): string;
     dontPrintResponse(): void;
     setMaxResponsePrintSize(printResponseMaxSizeBytes: number): void;
-    route(router: ExpressRouter, prefixUrl: string): void;
+    route(router: ExpressRouter, prefixUrl: string, baseUrl: string): void;
     assertProperty: <T extends object, K extends keyof T = keyof T>(instance: T, key: K | K[], statusCode?: number, check?: string | ((propValue: T[K]) => void) | undefined) => void;
     callWrapper: (req: ExpressRequest, res: ExpressResponse) => Promise<void>;
     private releaseSideEffects;
     call: (req: ExpressRequest, res: ExpressResponse) => Promise<void>;
-    protected abstract process(request: ExpressRequest, response: ApiResponse, queryParams: P, body: B): Promise<R>;
+    private applyMiddlewares;
+    protected abstract process(request: ExpressRequest, response: ApiResponse, queryParams: P, body: B, context: ObjectTS): Promise<R>;
 }
 export declare abstract class ServerApi_Get<Binder extends ApiWithQuery<U, R, P>, U extends string = DeriveUrlType<Binder>, R = DeriveResponseType<Binder>, P extends QueryParams | {} = DeriveQueryType<Binder>> extends ServerApi<Binder> {
     protected constructor(apiName: string);
@@ -56,7 +58,7 @@ export declare abstract class ServerApi_Post<Binder extends ApiWithBody<U, R, B>
 export declare class ServerApi_Proxy<Binder extends ApiTypeBinder<string, R, B, P>, R = DeriveResponseType<Binder>, B = DeriveBodyType<Binder>, P extends QueryParams | {} = DeriveQueryType<Binder>> extends ServerApi<Binder> {
     private readonly api;
     constructor(api: ServerApi<any>);
-    protected process(request: ExpressRequest, response: ApiResponse, queryParams: DeriveQueryType<Binder>, body: DeriveBodyType<Binder>): Promise<DeriveResponseType<Binder>>;
+    protected process(request: ExpressRequest, response: ApiResponse, queryParams: DeriveQueryType<Binder>, body: DeriveBodyType<Binder>, context: ObjectTS): Promise<DeriveResponseType<Binder>>;
 }
 export declare class ServerApi_Redirect extends ServerApi<any> {
     private readonly responseCode;

package/app-backend/modules/server/server-api.js CHANGED Viewed

@@ -35,12 +35,12 @@ exports.ApiResponse = exports.ServerApi_Redirect = exports.ServerApi_Proxy = exp
  */
 const ts_common_1 = require("@intuitionrobotics/ts-common");
 const url_1 = require("url");
-const HttpServer_1 = require("./HttpServer");
 // noinspection TypeScriptPreferShortImport
 const types_1 = require("../../../shared/types");
 const to_be_removed_1 = require("../../utils/to-be-removed");
 const exceptions_1 = require("../../exceptions");
 const RemoteProxy_1 = require("../proxy/RemoteProxy");
+const Storm_1 = require("../../core/Storm");
 class ServerApi extends ts_common_1.Logger {
     constructor(method, relativePath, tag) {
         super(tag || relativePath);
@@ -64,6 +64,7 @@ class ServerApi extends ts_common_1.Logger {
             }
         });
         this.call = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const response = new ApiResponse(this, res);
             this.logInfo(`Intercepted Url: ${req.path}`);
             if (this.headersToLog.length > 0) {
@@ -96,9 +97,8 @@ class ServerApi extends ts_common_1.Logger {
             try {
                 this.bodyValidator && ts_common_1.validate(body, this.bodyValidator);
                 this.queryValidator && ts_common_1.validate(reqQuery, this.queryValidator);
-                if (this.middlewares)
-                    yield Promise.all(this.middlewares.map(m => m(req, requestData, response)));
-                const toReturn = yield this.process(req, response, reqQuery, body);
+                const context = yield this.applyMiddlewares(req, requestData, response);
+                const toReturn = yield this.process(req, response, reqQuery, body, context);
                 if (response.isConsumed())
                     return;
                 if (!toReturn)
@@ -153,11 +153,16 @@ class ServerApi extends ts_common_1.Logger {
                         severity = ts_common_1.ServerErrorSeverity.Critical;
                         break;
                 }
-                const message = yield HttpServer_1.HttpServer.errorMessageComposer(requestData, apiException);
                 try {
-                    yield ts_common_1.dispatch_onServerError.dispatchModuleAsync([severity,
-                        HttpServer_1.HttpServer,
-                        message]);
+                    const httpServer = (_a = Storm_1.Storm.getInstance()) === null || _a === void 0 ? void 0 : _a.getHttpServer();
+                    if (httpServer) {
+                        const message = yield httpServer.errorMessageComposer(requestData, apiException);
+                        yield ts_common_1.dispatch_onServerError.dispatchModuleAsync([
+                            severity,
+                            httpServer,
+                            message
+                        ]);
+                    }
                 }
                 catch (e) {
                     this.logError("Error while handing server error", e);
@@ -208,11 +213,20 @@ class ServerApi extends ts_common_1.Logger {
     setMaxResponsePrintSize(printResponseMaxSizeBytes) {
         this.printResponse = printResponseMaxSizeBytes > -1;
     }
-    route(router, prefixUrl) {
+    route(router, prefixUrl, baseUrl) {
+        this.baseUrl = baseUrl;
         const fullPath = `${prefixUrl ? prefixUrl : ""}/${this.relativePath}`;
         this.setTag(fullPath);
         router[this.method](fullPath, this.callWrapper);
-        this.url = `${HttpServer_1.HttpServer.getBaseUrl()}${fullPath}`;
+        this.url = `${baseUrl}${fullPath}`;
+    }
+    applyMiddlewares(req, requestData, response) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.middlewares)
+                return {};
+            const contextList = yield Promise.all(this.middlewares.map((m) => __awaiter(this, void 0, void 0, function* () { return m(req, requestData, response); })));
+            return contextList.reduce((acc, c) => ts_common_1.merge(acc, c || {}), {});
+        });
     }
 }
 exports.ServerApi = ServerApi;
@@ -234,10 +248,10 @@ class ServerApi_Proxy extends ServerApi {
         this.api = api;
         this.setMiddlewares(RemoteProxy_1.RemoteProxy.Middleware);
     }
-    process(request, response, queryParams, body) {
+    process(request, response, queryParams, body, context) {
         return __awaiter(this, void 0, void 0, function* () {
             // @ts-ignore
-            return this.api.process(request, response, queryParams, body);
+            return this.api.process(request, response, queryParams, body, context);
         });
     }
 }
@@ -251,7 +265,7 @@ class ServerApi_Redirect extends ServerApi {
     process(request, response, queryParams, body) {
         return __awaiter(this, void 0, void 0, function* () {
             const query = queryParams ? ts_common_1._keys(queryParams).reduce((c, k) => c + '&' + k + '=' + queryParams[k], '?') : '';
-            response.redirect(this.responseCode, `${HttpServer_1.HttpServer.getBaseUrl()}${this.redirectUrl}${query}`);
+            response.redirect(this.responseCode, `${this.baseUrl}${this.redirectUrl}${query}`);
         });
     }
 }

package/app-backend/modules/server/server-api.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"server-api.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH;;GAEG;AACH,4DAYsC;AAGtC,6BAA0B;AAC1B,6CAA8D;AAE9D,2CAA2C;AAC3C,iDAU+B;AAC/B,6DAAyD;AACzD,iDAA8C;AAE9C,sDAAiD;AAYjD,MAAsB,SACrB,SAAQ,kBAAM;IAcd,YAAsB,MAAkB,EAAE,YAAoB,EAAE,GAAY;QAC3E,KAAK,CAAC,GAAG,IAAI,YAAY,CAAC,CAAC;QAZpB,kBAAa,GAAY,IAAI,CAAC;QAC7B,iBAAY,GAAa,EAAE,CAAC;QAQ7B,gBAAW,GAA2B,EAAE,CAAC;QAgEjD,mBAAc,GAAG,8BAAc,CAAC;QAEhC,gBAAW,GAAG,CAAO,GAAmB,EAAE,GAAoB,EAAE,EAAE;YACjE,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YACzB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACjC,CAAC,CAAA,CAAA;QAEO,uBAAkB,GAAG,GAAS,EAAE;YACvC,IAAI;gBACH,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;aACnE;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,QAAQ,CAAC,wDAAwD,EAAE,CAAC,CAAC,CAAC;aAC3E;oBAAS;gBACT,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;aACtB;QACF,CAAC,CAAA,CAAC;QAEF,SAAI,GAAG,CAAO,GAAmB,EAAE,GAAoB,EAAE,EAAE;YAC1D,MAAM,QAAQ,GAAgB,IAAI,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAEzD,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAE7C,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,MAAM,OAAO,GAAwC,EAAE,CAAC;gBACxD,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,YAAY,EAAE;oBAC3C,OAAO,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;iBAC7C;gBACD,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;aACvC;YAED,MAAM,QAAQ,GAAM,WAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,KAAU,CAAC;YACpD,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAuB,CAAC,CAAC,MAAM;gBAC1F,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;;gBAE7C,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAEjC,MAAM,IAAI,GAA2B,GAAG,CAAC,IAAI,CAAC;YAC9C,IAAI,IAAI,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;gBACvC,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,IAAyB,CAAC,CAAC;iBAC7D,IAAI,IAAI,IAAK,IAAe,CAAC,MAAM;gBACvC,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,IAAyB,CAAC,CAAC;;gBAEjE,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAE/B,MAAM,WAAW,GAAoB;gBACpC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,WAAW,EAAE,GAAG,CAAC,IAAI;gBACrB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,IAAS;aACf,CAAC;YAEF,IAAI;gBACH,IAAI,CAAC,aAAa,IAAI,oBAAQ,CAAI,IAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBACjE,IAAI,CAAC,cAAc,IAAI,oBAAQ,CAAI,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;gBAElE,IAAI,IAAI,CAAC,WAAW;oBACnB,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAE7E,MAAM,QAAQ,GAAY,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAS,CAAC,CAAC;gBACjF,IAAI,QAAQ,CAAC,UAAU,EAAE;oBACxB,OAAO;gBAER,IAAI,CAAC,QAAQ;oBACZ,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAEhC,yCAAyC;gBACzC,iCAAiC;gBACjC,oDAAoD;gBAEpD,MAAM,YAAY,GAAG,OAAO,QAAQ,CAAC;gBACrC,IAAI,YAAY,KAAK,QAAQ;oBAC5B,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAkB,CAAC,CAAC;gBAErD,IAAI,YAAY,KAAK,QAAQ,IAAK,QAAmB,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;oBACtF,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAkB,CAAC,CAAC;gBAErD,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAkB,CAAC,CAAC;aACpD;YAAC,OAAO,GAAG,EAAE;gBACb,IAAI,CAAC,GAAQ,GAAG,CAAC;gBACjB,IAAI,QAAQ,GAAwB,+BAAmB,CAAC,OAAO,CAAC;gBAChE,IAAI,OAAO,CAAC,KAAK,QAAQ;oBACxB,CAAC,GAAG,IAAI,sCAA0B,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;gBAE/D,IAAI,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;oBACjD,CAAC,GAAG,IAAI,sCAA0B,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAExF,IAAI;oBACH,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;iBACrB;gBAAC,OAAO,EAAE,EAAE;oBACZ,IAAI,CAAC,YAAY,CAAC,0CAA0C,EAAE,EAAE,CAAC,CAAC;oBAClE,IAAI,CAAC,YAAY,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACjE,IAAI,CAAC,YAAY,CAAC,uFAAuF,CAAC,CAAC;iBAC3G;gBAED,IAAI,yBAAa,CAAC,CAAC,EAAE,+BAAmB,CAAC;oBACxC,CAAC,GAAG,IAAI,yBAAY,CAAC,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;gBAErD,IAAI,CAAC,yBAAa,CAAC,CAAC,EAAE,yBAAY,CAAC;oBAClC,CAAC,GAAG,IAAI,yBAAY,CAAC,GAAG,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC;gBAEzD,MAAM,YAAY,GAAG,yBAAa,CAAC,CAAC,EAAE,yBAAY,CAAC,CAAC;gBACpD,IAAI,CAAC,YAAY;oBAChB,MAAM,IAAI,oCAAwB,CAAC,0BAA0B,CAAC,CAAC;gBAEhE,IAAI,YAAY,CAAC,YAAY,IAAI,GAAG;oBACnC,QAAQ,GAAG,+BAAmB,CAAC,KAAK,CAAC;qBACjC,IAAI,YAAY,CAAC,YAAY,IAAI,GAAG;oBACxC,QAAQ,GAAG,+BAAmB,CAAC,OAAO,CAAC;gBAExC,QAAQ,YAAY,CAAC,YAAY,EAAE;oBAClC,KAAK,GAAG;wBACP,QAAQ,GAAG,+BAAmB,CAAC,KAAK,CAAC;wBACrC,MAAM;oBAEP,KAAK,GAAG;wBACP,QAAQ,GAAG,+BAAmB,CAAC,IAAI,CAAC;wBACpC,MAAM;oBAEP,KAAK,GAAG;wBACP,QAAQ,GAAG,+BAAmB,CAAC,OAAO,CAAC;wBACvC,MAAM;oBAEP,KAAK,GAAG;wBACP,QAAQ,GAAG,+BAAmB,CAAC,QAAQ,CAAC;wBACxC,MAAM;iBACP;gBAED,MAAM,OAAO,GAAG,MAAM,uBAAU,CAAC,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;gBACjF,IAAI;oBACH,MAAM,kCAAsB,CAAC,mBAAmB,CAAC,CAAC,QAAQ;wBACR,uBAAU;wBACV,OAAO,CAAC,CAAC,CAAC;iBAC5D;gBAAC,OAAO,CAAC,EAAE;oBACX,IAAI,CAAC,QAAQ,CAAC,kCAAkC,EAAE,CAAC,CAAC,CAAC;iBACrD;gBACD,IAAI,YAAY,CAAC,YAAY,KAAK,GAAG;oBACpC,OAAO,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAE3C,OAAO,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;aACxC;QACF,CAAC,CAAA,CAAC;QA1MD,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAQ,CAAC,IAAI,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,GAAG,YAAY,EAAE,CAAC;IACvC,CAAC;IAED,mBAAmB;QAClB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAAA,CAAC;IAEF,aAAa,CAAC,UAA8B;QAC3C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,cAAc,CAAC,GAAG,WAAmC;QACpD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,cAAc,CAAC,GAAG,WAAmC;QACpD,IAAI,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IACb,CAAC;IAED,cAAc,CAAC,GAAG,YAAsB;QACvC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;IACzC,CAAC;IAED,gBAAgB,CAAC,aAAuC;QACvD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACpC,CAAC;IAED,iBAAiB,CAAC,cAAwC;QACzD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACtC,CAAC;IAED,OAAO;QACN,OAAO,IAAI,eAAe,CAAS,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM;QACL,OAAO,IAAI,CAAC,GAAG,CAAC;IACjB,CAAC;IAED,iBAAiB;QAChB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC5B,CAAC;IAED,uBAAuB,CAAC,yBAAiC;QACxD,IAAI,CAAC,aAAa,GAAG,yBAAyB,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,MAAqB,EAAE,SAAiB;QACpD,MAAM,QAAQ,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,GAAG,GAAG,uBAAU,CAAC,UAAU,EAAE,GAAG,QAAQ,EAAE,CAAC;IACpD,CAAC;CAmJD;AA9ND,8BA8NC;AAED,MAAsB,aACrB,SAAQ,SAAiB;IAEzB,YAAsB,OAAe;QACpC,KAAK,CAAC,kBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;CACD;AAND,sCAMC;AAED,MAAsB,cACrB,SAAQ,SAAiB;IAEzB,YAAsB,OAAe;QACpC,KAAK,CAAC,kBAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;CACD;AAND,wCAMC;AAED,MAAa,eACZ,SAAQ,SAAiB;IAGzB,YAAmB,GAAmB;QACrC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,YAAY,QAAQ,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,cAAc,CAAC,yBAAW,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAoC,EAAE,IAA4B;;YACzI,aAAa;YACb,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QAC/D,CAAC;KAAA;CACD;AAdD,0CAcC;AAED,MAAa,kBACZ,SAAQ,SAAc;IAItB,YAAmB,OAAe,EAAE,YAAoB,EAAE,WAAmB;QAC5E,KAAK,CAAC,kBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAwB,EAAE,IAAS;;YAC1G,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,iBAAK,CAAsB,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACnJ,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,uBAAU,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,KAAK,EAAE,CAAC,CAAC;QAC/F,CAAC;KAAA;CACD;AAfD,gDAeC;AAED,MAAa,WAAW;IAKvB,YAAY,GAAmB,EAAE,GAAoB;QAF7C,aAAQ,GAAY,KAAK,CAAC;QAGjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IAChB,CAAC;IAEM,UAAU;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEO,OAAO;QACd,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,kCAAkC,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YACnE,OAAO;SACP;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,YAAoB,EAAE,MAAc,EAAE,OAAa;QACzD,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAC,GAAG,EAAE,KAAK,EAAC,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACrB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,OAAa;QACjC,IAAI,CAAC,OAAO;YACX,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;QAEvD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAEO,aAAa,CAAC,QAA0B;QAC/C,IAAI,CAAC,QAAQ;YACZ,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE;YAClC,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,kCAAkC,CAAC,CAAC;QAEhE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAEM,IAAI,CAAC,YAAoB,EAAE,OAAa;QAC9C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,YAAoB,EAAE,QAAiB,EAAE,QAAc;QAC3D,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC;QAEvC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,YAAoB,EAAE,QAAiB,EAAE,QAAc;QAC3D,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,cAAc,CAAC,GAAG,WAAW,CAAC;QAEtC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,YAAoB,EAAE,QAA0B,EAAE,QAAc;QACpE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAGO,KAAK,CAAC,YAAoB,EAAE,QAA0B,EAAE,QAAc;QAC7E,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;QAE7C,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,GAAG,CAAC,YAAoB,EAAE,QAA0B,EAAE,OAAa;QAClE,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE7B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC3F,CAAC;IAED,UAAU,CAAC,OAAY;QACtB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IAED,SAAS,CAAC,SAAiB,EAAE,KAAwB;QACpD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,QAAQ,CAAC,YAAoB,EAAE,GAAW;QACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,SAAS,CAAC,SAAuB,EAAE,OAAa;QAC/C,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QAC5C,IAAI,CAAC,SAAS,CAAC,OAAO;YACrB,OAAO,YAAY,CAAC,YAAY,CAAC;QAElC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,WAAW,CAAC,KAAgC,EAAE,OAAa;QAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAC5D,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC1E,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;CACD;AAzHD,kCAyHC"}
1	+ {"version":3,"file":"server-api.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/server/server-errors.js CHANGED Viewed

@@ -38,7 +38,6 @@ function DefaultApiErrorMessageComposer(headersToAttach = [], propsResolver = _p
     return (requestData, error) => __awaiter(this, void 0, void 0, function* () {
         const { headers, query, url, body } = requestData;
         const props = yield propsResolver(requestData);
-        console.log("props: ", props);
         let slackMessage = "";
         slackMessage += `${error ? error.responseCode : "000"} - ${url}   \n\n`;
         const propsAsString = ts_common_1._keys(props).reduce((toRet, key) => {

package/app-backend/modules/server/server-errors.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"server-errors.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-errors.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAKH,4DAIsC;AAItC,MAAM,cAAc,GAAqB,GAAS,EAAE;IACnD,OAAO,EAAe,CAAA;AACvB,CAAC,CAAA,CAAC;AAEF,SAAgB,8BAA8B,CAAC,kBAA4B,EAAE,EAAE,gBAAkC,cAAc;IAC9H,OAAO,CAAO,WAA4B,EAAE,KAAmB,EAAE,EAAE;QAClE,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAC,GAAG,WAAW,CAAC;QAEhD,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,CAAC;QAC/C,~~OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC9B,~~IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,YAAY,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;QAExE,MAAM,aAAa,GAAG,iBAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACxD,OAAO,GAAG,KAAK,OAAO,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;QAC9C,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,IAAI,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;YACzC,YAAY,IAAI,cAAc,aAAa,IAAI,CAAC;QAEjD,IAAI,KAAK,EAAE;YACV,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;YACnC,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE;gBACzB,YAAY,IAAI,GAAG,KAAK,CAAC,KAAK;qBACL,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC;qBAC9B,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC;qBACnC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;qBACrB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;qBACpB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;qBACnB,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,IAAI,CAAC;gBAClE,YAAY,IAAI,0FAA0F,CAAC;aAC3G;SACD;QAED,MAAM,QAAQ,GAAG,iBAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACrD,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAa,CAAC;gBAC1C,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAE3B,OAAO,KAAK,CAAC;QACd,CAAC,EAAE,EAAoD,CAAC,CAAC;QAEzD,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC;YAC/C,YAAY,IAAI,YAAY,uBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;;YAEtD,YAAY,IAAI,sCAAsC,CAAC;QAExD,IAAI,KAAK,EAAE;YACV,IAAI,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;gBACzC,YAAY,IAAI,UAAU,uBAAW,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC;;gBAEvD,YAAY,IAAI,yBAAyB,CAAC;SAC3C;QAED,IAAI,IAAI,EAAE;YACT,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;gBACvC,YAAY,IAAI,SAAS,uBAAW,CAAC,IAAI,CAAC,IAAI,CAAC;;gBAE/C,YAAY,IAAI,uBAAuB,CAAC;SACzC;QACD,OAAO,YAAY,CAAA;IACpB,CAAC,CAAA,CAAA;AACF,CAAC;~~AAzDD~~,~~wEAyDC~~;AAAA,CAAC"}
1	+ {"version":3,"file":"server-errors.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-errors.ts"],"names":[],"mappings":"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"}

package/app-frontend/components/ActionButton.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import * as React from "react";
 export declare const ActionButton: (props: {
     action: string | (() => void);
     icon: string;
     classCss?: string | {
         [key: string]: any;
     } | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/app-frontend/components/DropDown.d.ts CHANGED Viewed

@@ -44,7 +44,7 @@ export declare class DropDown<ItemType> extends React.Component<Props_DropDown<I
     private static cloneAdapter;
     toggleList: (e: React.MouseEvent) => void;
     onSelected: (item: ItemType) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private renderHeader;
     private renderTree;
     private keyEventHandler;

package/app-frontend/components/FilterInput.d.ts CHANGED Viewed

@@ -20,6 +20,6 @@ export declare class FilterInput<T> extends React.Component<Props_FilterInput<T>
     shouldComponentUpdate(nextProps: Readonly<Props_FilterInput<T>>, nextState: Readonly<State>, nextContext: any): boolean;
     callOnChange: (list: T[], filter: string) => void;
     filter: (text: string) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};

package/app-frontend/components/GenericSelect.d.ts CHANGED Viewed

@@ -17,7 +17,7 @@ declare type State = {
 };
 export declare class GenericSelect<T> extends React.Component<Props<T>, State> {
     constructor(props: Props<T>);
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     handleSelection(item: SelectItem): void;
 }
 declare class SelectItem {

package/app-frontend/components/TS_Input.d.ts CHANGED Viewed

@@ -38,6 +38,6 @@ export declare class TS_Input<Key extends string = string> extends React.Compone
     private handleKeyEvent;
     private onClick;
     changeValue: (event: React.ChangeEvent<HTMLInputElement>) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};

package/app-frontend/components/TS_Table.d.ts CHANGED Viewed

@@ -27,7 +27,7 @@ export declare type TableProps<T extends ObjectTS, A extends ObjectTS = never> =
 };
 export declare class TS_Table<T extends ObjectTS, A extends ObjectTS = never> extends React.Component<TableProps<T, A>, any> {
     constructor(p: TableProps<T, A>);
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private renderTableHeader;
     private renderTableBody;
     private resolveTDStyleable;

package/app-frontend/components/TS_TextArea.d.ts CHANGED Viewed

@@ -31,6 +31,6 @@ export declare class TS_TextArea<Key extends string> extends React.Component<TS_
     };
     changeValue: (event: React.ChangeEvent<HTMLTextAreaElement>) => void;
     handleKeyPress: (event: KeyboardEvent) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};

package/app-frontend/components/Tabs.d.ts CHANGED Viewed

@@ -15,7 +15,7 @@ declare type State = {
 };
 export declare class Tabs extends React.Component<Props, State> {
     constructor(props: Props);
-    render(): JSX.Element;
-    renderTabHandle: (tab: Tab, key: number) => JSX.Element;
+    render(): React.JSX.Element;
+    renderTabHandle: (tab: Tab, key: number) => React.JSX.Element;
 }
 export {};

package/app-frontend/components/adapter/Adapter.d.ts CHANGED Viewed

@@ -77,7 +77,7 @@ declare type TreeData<I> = NestedTreeData<I>;
 declare class TreeSingleAdapterBuilder<RenderItemType extends any = any> extends BaseAdapterBuilder<RenderItemType, AdapterData<TreeData<RenderItemType>>> {
     readonly renderer: _BaseNodeRenderer<RenderItemType>;
     constructor(renderer: _BaseNodeRenderer<RenderItemType>);
-    treeNodeRenderer: (props: NodeRendererProps<RenderItemType>) => JSX.Element;
+    treeNodeRenderer: (props: NodeRendererProps<RenderItemType>) => React.JSX.Element;
     build(): Adapter<any, NodeRendererProps<any>>;
 }
 declare class ListAdapterBuilder {

package/app-frontend/components/checkbox/TS_Checkbox.d.ts CHANGED Viewed

@@ -15,6 +15,6 @@ export declare type CheckboxProps<T> = {
     innerNode?: (checked: boolean, disabled: boolean) => ReactNode;
 };
 export declare class TS_Checkbox<T> extends React.Component<CheckboxProps<T>> {
-    render(): JSX.Element;
-    renderLabel: () => JSX.Element;
+    render(): React.JSX.Element;
+    renderLabel: () => React.JSX.Element;
 }

package/app-frontend/components/checkbox/TS_CheckboxField.d.ts CHANGED Viewed

@@ -22,6 +22,6 @@ export declare type CheckboxFieldProps<T> = {
 };
 export declare class TS_CheckboxField<T> extends Component<CheckboxFieldProps<T>, {}> {
     gridCss: () => React.CSSProperties;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};

package/app-frontend/components/form/Form.d.ts CHANGED Viewed

@@ -17,7 +17,7 @@ declare type State<T extends object = object> = {
 };
 export declare class Component_Form<T extends ObjectTS = ObjectTS> extends React.Component<Props<T>, State<T>> {
     constructor(p: Props<T>);
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private renderField;
     private onValueChanged;
 }

package/app-frontend/components/playground/Example_NewProps.d.ts CHANGED Viewed

@@ -16,7 +16,7 @@ export declare class Example_NewProps<T, P = InferProps<T>> extends React.Compon
         showToggle: boolean;
     };
     constructor(props: Props<P>);
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private renderToggle;
     private renderList;
 }

package/app-frontend/components/playground/Playground.d.ts CHANGED Viewed

@@ -15,7 +15,7 @@ export declare type PlaygroundScreen<T extends any = any> = {
 };
 export declare class Playground extends React.Component<PlaygroundProps, State> {
     constructor(props: PlaygroundProps);
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private renderPlayground;
 }
 export {};

package/app-frontend/components/tree/MenuComponent.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from "react";
 import { BaseComponent } from "../../core/BaseComponent";
 import { Adapter } from "../adapter/Adapter";
 export declare type MenuComponentProps = {
@@ -11,5 +11,5 @@ export declare type MenuComponentProps = {
 export declare class MenuComponent extends BaseComponent<MenuComponentProps> {
     private readonly id;
     constructor(props: MenuComponentProps);
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/app-frontend/components/tree/SimpleTreeNodeRenderer.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { BaseNodeRenderer, NodeRendererProps } from "../adapter/BaseRenderer";
 export declare class SimpleTreeNodeRenderer extends BaseNodeRenderer<any> {
-    renderCollapse(): JSX.Element;
+    renderCollapse(): React.JSX.Element;
     protected renderItem(item: any): React.ReactNode;
 }
 export declare class SimpleNodeRenderer extends React.Component<NodeRendererProps> {

package/app-frontend/components/tree/Tree.d.ts CHANGED Viewed

@@ -39,7 +39,7 @@ export declare class Tree<P extends BaseTreeProps = BaseTreeProps, S extends Tre
     static getDerivedStateFromProps(props: BaseTreeProps, state: TreeState): TreeState | null;
     componentDidMount(): void;
     renderedElementsInit: () => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private renderNode;
     private nodeResolver;
     private resolveContainer;

package/app-frontend/components/treeicons.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
-/// <reference types="react" />
+import * as React from 'react';
 export declare const Expanded: (props: {
     style: {
         [k: string]: any;
     };
-}) => JSX.Element;
+}) => React.JSX.Element;
 export declare const Collapsed: (props: {
     style: {
         [k: string]: any;
     };
-}) => JSX.Element;
+}) => React.JSX.Element;

package/app-frontend/core/AppWrapper.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 export declare type WrapperProps = {};
-export declare const AppWrapper: (props: WrapperProps) => JSX.Element;
+export declare const AppWrapper: (props: WrapperProps) => React.JSX.Element;
 export declare function renderApp(appId?: string): void;

package/app-frontend/modules/ConnectivityModule.js CHANGED Viewed

@@ -5,7 +5,7 @@ const ts_common_1 = require("@intuitionrobotics/ts-common");
 const thunder_dispatcher_1 = require("../core/thunder-dispatcher");
 class ConnectivityModule_Class extends ts_common_1.Module {
     constructor() {
-        super();
+        super("ConnectivityModule");
         this.dispatch_onConnectivityChange = new thunder_dispatcher_1.ThunderDispatcher('__onConnectivityChange');
         this.isConnected = () => this.connected;
         this.handleConnectionChange = () => {

package/app-frontend/modules/ConnectivityModule.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ConnectivityModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/ConnectivityModule.ts"],"names":[],"mappings":";;;AAAA,4DAAoD;AACpD,mEAA6D;AAM7D,MAAM,wBACL,SAAQ,kBAAM;IAKd;QACC,KAAK,~~EAAE~~,CAAC;~~QAHD~~,kCAA6B,GAAG,IAAI,sCAAiB,CAAiD,wBAAwB,CAAC,CAAC;QAYxI,gBAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;QAEnC,2BAAsB,GAAG,GAAG,EAAE;YAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9C,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,6BAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;QAClD,CAAC,CAAC;QAEM,0BAAqB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC;QAhBtD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/C,CAAC;IAES,IAAI;QACb,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACjE,CAAC;CAWD;AAEY,QAAA,kBAAkB,GAAG,IAAI,wBAAwB,EAAE,CAAC"}
1	+ {"version":3,"file":"ConnectivityModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/ConnectivityModule.ts"],"names":[],"mappings":";;;AAAA,4DAAoD;AACpD,mEAA6D;AAM7D,MAAM,wBACL,SAAQ,kBAAM;IAKd;QACC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAHrB,kCAA6B,GAAG,IAAI,sCAAiB,CAAiD,wBAAwB,CAAC,CAAC;QAYxI,gBAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;QAEnC,2BAAsB,GAAG,GAAG,EAAE;YAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9C,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,6BAA6B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;QAClD,CAAC,CAAC;QAEM,0BAAqB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC;QAhBtD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/C,CAAC;IAES,IAAI;QACb,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACjE,CAAC;CAWD;AAEY,QAAA,kBAAkB,GAAG,IAAI,wBAAwB,EAAE,CAAC"}

package/app-frontend/modules/ForceUpgrade.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export interface OnUpgradeRequired {
     __onUpgradeRequired(response: UpgradeRequired): void;
 }
 declare class ForceUpgrade_Class extends Module<Config> {
+    constructor();
     protected init(): void;
     compareVersion: () => void;
 }

package/app-frontend/modules/ForceUpgrade.js CHANGED Viewed

@@ -30,7 +30,7 @@ exports.RequestKey_AssertAppVersion = "assert-app-version";
 const dispatch_onUpgradeRequired = new ts_common_1.Dispatcher("__onUpgradeRequired");
 class ForceUpgrade_Class extends ts_common_1.Module {
     constructor() {
-        super(...arguments);
+        super("ForceUpgrade");
         this.compareVersion = () => {
             XhrHttpModule_1.XhrHttpModule
                 .createRequest(types_1.HttpMethod.GET, exports.RequestKey_AssertAppVersion)

package/app-frontend/modules/ForceUpgrade.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ForceUpgrade.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/ForceUpgrade.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,4DAGsC;AACtC,wDAAmD;AACnD,8DAKoC;AACpC,8CAA8C;AAC9C,0CAA2C;AAE9B,QAAA,2BAA2B,GAAG,oBAAoB,CAAC;AAShE,MAAM,0BAA0B,GAAG,IAAI,sBAAU,CAA2C,qBAAqB,CAAC,CAAC;AAEnH,MAAM,kBACL,SAAQ,kBAAc;~~IADvB;;QAQC~~,mBAAc,GAAG,GAAG,EAAE;YACrB,6BAAa;iBACX,aAAa,CAA6B,kBAAU,CAAC,GAAG,EAAE,mCAA2B,CAAC;iBACtF,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;iBAC5C,OAAO,CAAC,CAAC,QAAyB,EAAE,EAAE;gBACtC,0BAA0B,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;~~IACH~~,CAAC;~~IAbU~~,IAAI;QACb,6BAAa,CAAC,gBAAgB,CAAC,yCAAyB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,6BAAa,CAAC,gBAAgB,CAAC,sCAAsB,EAAE,GAAG,mBAAW,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;CAUD;AAEY,QAAA,YAAY,GAAG,IAAI,kBAAkB,EAAE,CAAC"}
1	+ {"version":3,"file":"ForceUpgrade.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/ForceUpgrade.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,4DAGsC;AACtC,wDAAmD;AACnD,8DAKoC;AACpC,8CAA8C;AAC9C,0CAA2C;AAE9B,QAAA,2BAA2B,GAAG,oBAAoB,CAAC;AAShE,MAAM,0BAA0B,GAAG,IAAI,sBAAU,CAA2C,qBAAqB,CAAC,CAAC;AAEnH,MAAM,kBACL,SAAQ,kBAAc;IAEtB;QACC,KAAK,CAAC,cAAc,CAAC,CAAC;QAQvB,mBAAc,GAAG,GAAG,EAAE;YACrB,6BAAa;iBACX,aAAa,CAA6B,kBAAU,CAAC,GAAG,EAAE,mCAA2B,CAAC;iBACtF,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;iBAC5C,OAAO,CAAC,CAAC,QAAyB,EAAE,EAAE;gBACtC,0BAA0B,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IAdF,CAAC;IAES,IAAI;QACb,6BAAa,CAAC,gBAAgB,CAAC,yCAAyB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,6BAAa,CAAC,gBAAgB,CAAC,sCAAsB,EAAE,GAAG,mBAAW,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;CAUD;AAEY,QAAA,YAAY,GAAG,IAAI,kBAAkB,EAAE,CAAC"}

package/app-frontend/modules/HistoryModule.js CHANGED Viewed

@@ -28,7 +28,7 @@ const ts_common_1 = require("@intuitionrobotics/ts-common");
 const history_1 = require("history");
 class BrowserHistoryModule_Class extends ts_common_1.Module {
     constructor() {
-        super();
+        super("BrowserHistoryModule");
         this.getEncodedQueryParams = () => {
             const queryParams = {};
             let queryAsString = window.location.search;