@intuitionrobotics/thunderstorm 0.43.4 → 0.44.1

package/app-backend/core/BaseStorm.d.ts

@@ -1,4 +1,4 @@
-import { ModuleManager } from "@intuitionrobotics/ts-common";
+import { ModuleManager } from "@intuitionrobotics/ts-common/core/module-manager";
 export declare abstract class BaseStorm extends ModuleManager {
     private envKey;
     setEnvironment(envKey: string): this;

package/app-backend/core/BaseStorm.js

@@ -21,8 +21,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseStorm = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-class BaseStorm extends ts_common_1.ModuleManager {
+const module_manager_1 = require("@intuitionrobotics/ts-common/core/module-manager");
+class BaseStorm extends module_manager_1.ModuleManager {
     constructor() {
         super(...arguments);
         this.envKey = "dev";

package/app-backend/core/BaseStorm.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseStorm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/BaseStorm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,4DAA2D;AAE3D,MAAsB,SAClB,SAAQ,yBAAa;IADzB;;QAEY,WAAM,GAAW,KAAK,CAAC;IASnC,CAAC;IARG,cAAc,CAAC,MAAc;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CACJ;AAXD,8BAWC"}
+{"version":3,"file":"BaseStorm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/BaseStorm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,qFAA+E;AAE/E,MAAsB,SAClB,SAAQ,8BAAa;IADzB;;QAEY,WAAM,GAAW,KAAK,CAAC;IASnC,CAAC;IARG,cAAc,CAAC,MAAc;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CACJ;AAXD,8BAWC"}

package/app-backend/core/Storm.js

@@ -21,9 +21,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Storm = void 0;
-const backend_1 = require("@intuitionrobotics/firebase/backend");
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-const backend_functions_1 = require("@intuitionrobotics/firebase/backend-functions");
+const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-backend/FirebaseModule");
+const LogClient_Function_1 = require("@intuitionrobotics/ts-common/core/logger/LogClient_Function");
+const BeLogged_1 = require("@intuitionrobotics/ts-common/core/logger/BeLogged");
+const LogClient_Terminal_1 = require("@intuitionrobotics/ts-common/core/logger/LogClient_Terminal");
+const firebase_function_1 = require("@intuitionrobotics/firebase/app-backend/functions/firebase-function");
 const HttpServer_1 = require("../modules/server/HttpServer");
 const server_api_1 = require("../modules/server/server-api");
 const BaseStorm_1 = require("./BaseStorm");
@@ -35,7 +37,7 @@ class Storm extends BaseStorm_1.BaseStorm {
         this.apis = [];
         this.express = _express || express();
         this.httpServer = new HttpServer_1.HttpServer_Class(this.express);
-        this.addModules(this.httpServer, backend_1.FirebaseModule);
+        this.addModules(this.httpServer, FirebaseModule_1.FirebaseModule);
     }
     static getInstance() {
         return Storm.instance;
@@ -45,7 +47,7 @@ class Storm extends BaseStorm_1.BaseStorm {
     }
     init() {
         var _a;
-        ts_common_1.BeLogged.addClient(process.env.GCLOUD_PROJECT && process.env.FUNCTIONS_EMULATOR ? ts_common_1.LogClient_Terminal : ts_common_1.LogClient_Function);
+        BeLogged_1.BeLogged.addClient(process.env.GCLOUD_PROJECT && process.env.FUNCTIONS_EMULATOR ? LogClient_Terminal_1.LogClient_Terminal : LogClient_Function_1.LogClient_Function);
         server_api_1.ServerApi.isDebug = !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.isDebug);
         super.init();
         const urlPrefix = !process.env.GCLOUD_PROJECT ? this.initialPath : "";
@@ -66,8 +68,8 @@ class Storm extends BaseStorm_1.BaseStorm {
         return this;
     }
     startServer(onStarted) {
-        const modulesAsFunction = this.modules.filter((module) => module instanceof backend_functions_1.FirebaseFunction);
-        this.functions = [new backend_functions_1.Firebase_ExpressFunction(this.httpServer.express),
+        const modulesAsFunction = this.modules.filter((module) => module instanceof firebase_function_1.FirebaseFunction);
+        this.functions = [new firebase_function_1.Firebase_ExpressFunction(this.httpServer.express),
             ...modulesAsFunction];
         this.init();
         onStarted && onStarted().catch(e => this.logError(e));

package/app-backend/core/Storm.js.map

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

package/app-backend/exceptions.d.ts

@@ -1,5 +1,5 @@
-import { CustomException } from "@intuitionrobotics/ts-common";
-import { ErrorBody, ErrorResponse } from "../index";
+import { CustomException } from "@intuitionrobotics/ts-common/core/exceptions";
+import { ErrorBody, ErrorResponse } from "../shared/types";
 export declare class ApiException<E extends object | void = void> extends CustomException {
     readonly responseBody: ErrorResponse<E>;
     readonly responseCode: number;

package/app-backend/exceptions.js

@@ -21,8 +21,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiException = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-class ApiException extends ts_common_1.CustomException {
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+class ApiException extends exceptions_1.CustomException {
     constructor(responseCode, debugMessage, cause) {
         super(ApiException, `${responseCode}-${JSON.stringify(debugMessage)}`, cause);
         this.responseBody = {};

package/app-backend/exceptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/main/app-backend/exceptions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,4DAA8D;AAM9D,MAAa,YACZ,SAAQ,2BAAe;IAUvB,YAAY,YAAoB,EAAE,YAAqB,EAAE,KAAa;QACrE,KAAK,CAAC,YAAY,EAAE,GAAG,YAAY,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAT/D,iBAAY,GAAqB,EAAE,CAAC;QAGpC,iBAAY,GAAG,CAAC,SAAuB,EAAE,EAAE;YAC1D,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,SAAS,CAAC;YACpC,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;QAKD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;CAED;AAlBD,oCAkBC"}
+{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/main/app-backend/exceptions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,6EAA6E;AAI7E,MAAa,YACT,SAAQ,4BAAe;IAUvB,YAAY,YAAoB,EAAE,YAAqB,EAAE,KAAa;QAClE,KAAK,CAAC,YAAY,EAAE,GAAG,YAAY,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QATlE,iBAAY,GAAqB,EAAE,CAAC;QAGpC,iBAAY,GAAG,CAAC,SAAuB,EAAE,EAAE;YACvD,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,SAAS,CAAC;YACpC,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;QAKE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC;CAEJ;AAlBD,oCAkBC"}

package/app-backend/modules/CleanupScheduler.js

@@ -10,10 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CleanupScheduler = exports.CleanupScheduler_Class = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
 const firebase_function_1 = require("@intuitionrobotics/firebase/app-backend/functions/firebase-function");
 const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-backend/FirebaseModule");
-const dispatch_onCleanupSchedulerAct = new ts_common_1.Dispatcher("__onCleanupSchedulerAct");
+const dispatcher_1 = require("@intuitionrobotics/ts-common/core/dispatcher");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const dispatch_onCleanupSchedulerAct = new dispatcher_1.Dispatcher("__onCleanupSchedulerAct");
 class CleanupScheduler_Class extends firebase_function_1.FirebaseScheduledFunction {
     constructor() {
         super("CleanupScheduler");
@@ -22,11 +23,11 @@ class CleanupScheduler_Class extends firebase_function_1.FirebaseScheduledFuncti
             const cleanups = dispatch_onCleanupSchedulerAct.dispatchModule([]);
             yield Promise.all(cleanups.map((cleanupItem) => __awaiter(this, void 0, void 0, function* () {
                 const doc = yield cleanupStatusCollection.queryUnique({ where: { moduleKey: cleanupItem.moduleKey } });
-                if (doc && doc.timestamp + cleanupItem.interval > ts_common_1.currentTimeMillies())
+                if (doc && doc.timestamp + cleanupItem.interval > date_time_tools_1.currentTimeMillies())
                     return;
                 try {
                     yield cleanupItem.cleanup();
-                    yield cleanupStatusCollection.upsert({ timestamp: ts_common_1.currentTimeMillies(), moduleKey: cleanupItem.moduleKey });
+                    yield cleanupStatusCollection.upsert({ timestamp: date_time_tools_1.currentTimeMillies(), moduleKey: cleanupItem.moduleKey });
                 }
                 catch (e) {
                     this.logWarning(`cleanup of ${cleanupItem.moduleKey} has failed with error '${e}'`);

package/app-backend/modules/CleanupScheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"CleanupScheduler.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/CleanupScheduler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAGsC;AACtC,2GAA8G;AAC9G,2FAAsF;AAiBtF,MAAM,8BAA8B,GAAG,IAAI,sBAAU,CAAmD,yBAAyB,CAAC,CAAC;AAEnI,MAAa,sBACZ,SAAQ,6CAAyB;IAEjC;QACC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAI3B,qBAAgB,GAAG,GAAuB,EAAE;YAC3C,MAAM,uBAAuB,GAAG,+BAAc,CAAC,kBAAkB,EAAE,CAAC,YAAY,EAAE,CAAC,aAAa,CAAgB,gBAAgB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;YACjJ,MAAM,QAAQ,GAAG,8BAA8B,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YACnE,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAM,WAAW,EAAC,EAAE;gBAClD,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,WAAW,CAAC,EAAC,KAAK,EAAE,EAAC,SAAS,EAAE,WAAW,CAAC,SAAS,EAAC,EAAC,CAAC,CAAC;gBACnG,IAAI,GAAG,IAAI,GAAG,CAAC,SAAS,GAAG,WAAW,CAAC,QAAQ,GAAG,8BAAkB,EAAE;oBACrE,OAAO;gBAER,IAAI;oBACH,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;oBAC5B,MAAM,uBAAuB,CAAC,MAAM,CAAC,EAAC,SAAS,EAAE,8BAAkB,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAC,CAAC,CAAC;iBAC1G;gBAAC,OAAO,CAAC,EAAE;oBACX,IAAI,CAAC,UAAU,CAAC,cAAc,WAAW,CAAC,SAAS,2BAA2B,CAAC,GAAG,CAAC,CAAC;iBACpF;YACF,CAAC,CAAA,CAAC,CAAC,CAAC;QACL,CAAC,CAAA,CAAC;QAlBD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;CAkBD;AAxBD,wDAwBC;AAEY,QAAA,gBAAgB,GAAG,IAAI,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"CleanupScheduler.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/CleanupScheduler.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2GAA8G;AAC9G,2FAAsF;AACtF,6EAA0E;AAC1E,wFAAwF;AAiBxF,MAAM,8BAA8B,GAAG,IAAI,uBAAU,CAAmD,yBAAyB,CAAC,CAAC;AAEnI,MAAa,sBACZ,SAAQ,6CAAyB;IAEjC;QACC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAI3B,qBAAgB,GAAG,GAAuB,EAAE;YAC3C,MAAM,uBAAuB,GAAG,+BAAc,CAAC,kBAAkB,EAAE,CAAC,YAAY,EAAE,CAAC,aAAa,CAAgB,gBAAgB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;YACjJ,MAAM,QAAQ,GAAG,8BAA8B,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YACnE,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAM,WAAW,EAAC,EAAE;gBAClD,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,WAAW,CAAC,EAAC,KAAK,EAAE,EAAC,SAAS,EAAE,WAAW,CAAC,SAAS,EAAC,EAAC,CAAC,CAAC;gBACnG,IAAI,GAAG,IAAI,GAAG,CAAC,SAAS,GAAG,WAAW,CAAC,QAAQ,GAAG,oCAAkB,EAAE;oBACrE,OAAO;gBAER,IAAI;oBACH,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;oBAC5B,MAAM,uBAAuB,CAAC,MAAM,CAAC,EAAC,SAAS,EAAE,oCAAkB,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAC,CAAC,CAAC;iBAC1G;gBAAC,OAAO,CAAC,EAAE;oBACX,IAAI,CAAC,UAAU,CAAC,cAAc,WAAW,CAAC,SAAS,2BAA2B,CAAC,GAAG,CAAC,CAAC;iBACpF;YACF,CAAC,CAAA,CAAC,CAAC,CAAC;QACL,CAAC,CAAA,CAAC;QAlBD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;CAkBD;AAxBD,wDAwBC;AAEY,QAAA,gBAAgB,GAAG,IAAI,sBAAsB,EAAE,CAAC"}

package/app-backend/modules/FirestoreBackupScheduler.d.ts

@@ -1,7 +1,7 @@
 import { FirebaseScheduledFunction } from "@intuitionrobotics/firebase/app-backend/functions/firebase-function";
 import { ActDetailsDoc } from "./CleanupScheduler";
 import { FirestoreCollection } from "@intuitionrobotics/firebase/app-backend/firestore/FirestoreCollection";
-import { FirestoreQuery } from "@intuitionrobotics/firebase";
+import { FirestoreQuery } from "@intuitionrobotics/firebase/shared/types";
 export declare type BackupDoc = ActDetailsDoc & {
     backupPath: string;
 };

package/app-backend/modules/FirestoreBackupScheduler.js

@@ -10,17 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreBackupScheduler = exports.FirestoreBackupScheduler_Class = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
 const firebase_function_1 = require("@intuitionrobotics/firebase/app-backend/functions/firebase-function");
 const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-backend/FirebaseModule");
-const dispatch_onFirestoreBackupSchedulerAct = new ts_common_1.Dispatcher("__onFirestoreBackupSchedulerAct");
+const dispatcher_1 = require("@intuitionrobotics/ts-common/core/dispatcher");
+const array_tools_1 = require("@intuitionrobotics/ts-common/utils/array-tools");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
+const utils_1 = require("@intuitionrobotics/ts-common/core/logger/utils");
+const error_handling_1 = require("@intuitionrobotics/ts-common/core/error-handling");
+const dispatch_onFirestoreBackupSchedulerAct = new dispatcher_1.Dispatcher("__onFirestoreBackupSchedulerAct");
 class FirestoreBackupScheduler_Class extends firebase_function_1.FirebaseScheduledFunction {
     constructor() {
         super("FirestoreBackupScheduler");
         this.onScheduledEvent = () => __awaiter(this, void 0, void 0, function* () {
             const backupStatusCollection = FirebaseModule_1.FirebaseModule.createAdminSession().getFirestore().getCollection('firestore-backup-status', ["moduleKey", "timestamp"]);
             const backups = [];
-            ts_common_1.filterInstances(dispatch_onFirestoreBackupSchedulerAct.dispatchModule([])).forEach(backupArray => {
+            array_tools_1.filterInstances(dispatch_onFirestoreBackupSchedulerAct.dispatchModule([])).forEach(backupArray => {
                 backups.push(...backupArray);
             });
             const bucket = yield FirebaseModule_1.FirebaseModule.createAdminSession().getStorage().getOrCreateBucket();
@@ -32,16 +37,25 @@ class FirestoreBackupScheduler_Class extends firebase_function_1.FirebaseSchedul
                 };
                 const docs = yield backupStatusCollection.query(query);
                 const latestDoc = docs[0];
-                if (latestDoc && latestDoc.timestamp + backupItem.interval > ts_common_1.currentTimeMillies())
+                if (latestDoc && latestDoc.timestamp + backupItem.interval > date_time_tools_1.currentTimeMillies())
                     return;
-                const backupPath = `backup/firestore/${backupItem.moduleKey}/${ts_common_1.currentTimeMillies()}.json`;
+                const backupPath = `backup/firestore/${backupItem.moduleKey}/${date_time_tools_1.currentTimeMillies()}.json`;
                 try {
                     const toBackupData = yield backupItem.collection.query(backupItem.backupQuery);
                     yield (yield bucket.getFile(backupPath)).write(toBackupData);
-                    yield backupStatusCollection.upsert({ timestamp: ts_common_1.currentTimeMillies(), moduleKey: backupItem.moduleKey, backupPath });
+                    yield backupStatusCollection.upsert({
+                        timestamp: date_time_tools_1.currentTimeMillies(),
+                        moduleKey: backupItem.moduleKey,
+                        backupPath
+                    });
                     const keepInterval = backupItem.keepInterval;
                     if (keepInterval) {
-                        const queryOld = { where: { moduleKey: backupItem.moduleKey, timestamp: { $lt: ts_common_1.currentTimeMillies() - keepInterval } } };
+                        const queryOld = {
+                            where: {
+                                moduleKey: backupItem.moduleKey,
+                                timestamp: { $lt: date_time_tools_1.currentTimeMillies() - keepInterval }
+                            }
+                        };
                         const oldDocs = yield backupStatusCollection.query(queryOld);
                         yield Promise.all(oldDocs.map((oldDoc) => __awaiter(this, void 0, void 0, function* () {
                             yield (yield bucket.getFile(oldDoc.backupPath)).delete();
@@ -51,8 +65,8 @@ class FirestoreBackupScheduler_Class extends firebase_function_1.FirebaseSchedul
                 }
                 catch (e) {
                     this.logWarning(`backup of ${backupItem.moduleKey} has failed with error`, e);
-                    const errorMessage = `Error backing up firestore collection config:\n ${ts_common_1.__stringify(backupItem, true)}\nError: ${ts_common_1._logger_logException(e)}`;
-                    yield ts_common_1.dispatch_onServerError.dispatchModuleAsync([ts_common_1.ServerErrorSeverity.Critical, this, errorMessage]);
+                    const errorMessage = `Error backing up firestore collection config:\n ${tools_1.__stringify(backupItem, true)}\nError: ${utils_1._logger_logException(e)}`;
+                    yield error_handling_1.dispatch_onServerError.dispatchModuleAsync([error_handling_1.ServerErrorSeverity.Critical, this, errorMessage]);
                 }
             })));
         });

package/app-backend/modules/FirestoreBackupScheduler.js.map

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

package/app-backend/modules/ForceUpgrade.d.ts

@@ -1,8 +1,8 @@
-import { Module } from "@intuitionrobotics/ts-common";
 import { ServerApi_Middleware } from "./server/HttpServer";
 import { UpgradeRequired } from "../../shared/force-upgrade";
 import { PlatformName } from "../../shared/consts";
 import { ExpressRequest } from "../utils/types";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
 declare type VersionConfig = {
     [K in PlatformName]: {
         regexp: string;

package/app-backend/modules/ForceUpgrade.js

@@ -30,16 +30,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForceUpgrade = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
 const HttpServer_1 = require("./server/HttpServer");
 const exceptions_1 = require("../exceptions");
 const force_upgrade_1 = require("../../shared/force-upgrade");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const exceptions_2 = require("@intuitionrobotics/ts-common/core/exceptions");
+const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
 const Header_PlatformVersion = new HttpServer_1.HeaderKey(force_upgrade_1.HeaderKey_PlatformVersion);
 const Header_PlatformName = new HttpServer_1.HeaderKey(force_upgrade_1.HeaderKey_PlatformName);
 // const DefaultRegexps: { [k in PlatformName]: string } = {
 // 	chrome: "Chrome/([0-9\.]+)"
 // };
-class ForceUpgrade_Class extends ts_common_1.Module {
+class ForceUpgrade_Class extends module_1.Module {
     constructor() {
         super("ForceUpgrade");
     }
@@ -56,7 +58,7 @@ class ForceUpgrade_Class extends ts_common_1.Module {
         const regex = new RegExp(platformNameConfig.regexp);
         const match = platformVersion.match(regex);
         if (!match)
-            throw new ts_common_1.BadImplementationException(`Error extracting version.. \nVersion: '${platformVersion}'\n config: '${ts_common_1.__stringify(this.config)}'`);
+            throw new exceptions_2.BadImplementationException(`Error extracting version.. \nVersion: '${platformVersion}'\n config: '${tools_1.__stringify(this.config)}'`);
         const minimumValidVersion = platformNameConfig.minimumValidVersion;
         if (!minimumValidVersion)
             return {
@@ -64,13 +66,13 @@ class ForceUpgrade_Class extends ts_common_1.Module {
             };
         const matchGroups = match.groups;
         if (!matchGroups)
-            throw new ts_common_1.BadImplementationException(`If minimumValidVersion is provided ${platformNameConfig.minimumValidVersion}, then groups in regex have to be defined ${ts_common_1.__stringify(match)}. i.e. "(?<first>[0-9]+).(?<second>[0-9]+).(?<third>[0-9]+)"`);
+            throw new exceptions_2.BadImplementationException(`If minimumValidVersion is provided ${platformNameConfig.minimumValidVersion}, then groups in regex have to be defined ${tools_1.__stringify(match)}. i.e. "(?<first>[0-9]+).(?<second>[0-9]+).(?<third>[0-9]+)"`);
         const minimumVersionMatch = minimumValidVersion.match(regex);
         if (!minimumVersionMatch)
-            throw new ts_common_1.BadImplementationException(`Error extracting minimum valid version. \nVersion: '${minimumValidVersion}'\n config: '${ts_common_1.__stringify(this.config)}'`);
+            throw new exceptions_2.BadImplementationException(`Error extracting minimum valid version. \nVersion: '${minimumValidVersion}'\n config: '${tools_1.__stringify(this.config)}'`);
         const versionsGroups = minimumVersionMatch.groups;
         if (!versionsGroups)
-            throw new ts_common_1.BadImplementationException(`If minimumValidVersion is provided ${platformNameConfig.minimumValidVersion}, then groups in regex have to be defined ${ts_common_1.__stringify(minimumVersionMatch)}. i.e. "(?<first>[0-9]+).(?<second>[0-9]+).(?<third>[0-9]+)"`);
+            throw new exceptions_2.BadImplementationException(`If minimumValidVersion is provided ${platformNameConfig.minimumValidVersion}, then groups in regex have to be defined ${tools_1.__stringify(minimumVersionMatch)}. i.e. "(?<first>[0-9]+).(?<second>[0-9]+).(?<third>[0-9]+)"`);
         const versions = Object.values(matchGroups);
         const minimumVersions = Object.values(versionsGroups);
         for (let i = 0; i < versions.length; i++) {

package/app-backend/modules/ForceUpgrade.js.map

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

package/app-backend/modules/SlackModule.d.ts

@@ -1,7 +1,5 @@
-/**
- * Created by AlanBen on 29/08/2019.
- */
-import { Module, OnApplicationError, ServerErrorSeverity } from "@intuitionrobotics/ts-common";
+import { OnApplicationError, ServerErrorSeverity } from "@intuitionrobotics/ts-common/core/error-handling";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
 import { WebClientOptions } from "@slack/web-api";
 declare type ConfigType = {
     token: string;

package/app-backend/modules/SlackModule.js

@@ -1,24 +1,4 @@
 "use strict";
-/*
- * Thunderstorm is a full web app framework!
- *
- * Typescript & Express backend infrastructure that natively runs on firebase function
- * Typescript & React frontend infrastructure
- *
- * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 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) {
@@ -30,12 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Slack_ServerApiError = exports.Slack_ServerApiError_Class = exports.SlackModule = exports.SlackModule_Class = void 0;
-/**
- * Created by AlanBen on 29/08/2019.
- */
-const ts_common_1 = require("@intuitionrobotics/ts-common");
+const error_handling_1 = require("@intuitionrobotics/ts-common/core/error-handling");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
 const web_api_1 = require("@slack/web-api");
-class SlackModule_Class extends ts_common_1.Module {
+class SlackModule_Class extends module_1.Module {
     constructor() {
         super("SlackModule");
         this.messageMap = {};
@@ -53,7 +32,7 @@ class SlackModule_Class extends ts_common_1.Module {
                 channel: this.config.defaultChannel
             } : slackMessage;
             const time = this.messageMap[parameters.text];
-            if (time && ts_common_1.currentTimeMillies() - time < (this.config.throttlingTime || ts_common_1.Minute))
+            if (time && date_time_tools_1.currentTimeMillies() - time < (this.config.throttlingTime || date_time_tools_1.Minute))
                 return;
             try {
                 return yield this.postMessageImpl(parameters);
@@ -66,23 +45,23 @@ class SlackModule_Class extends ts_common_1.Module {
     postMessageImpl(message) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield this.web.chat.postMessage(message);
-            this.messageMap[message.text] = ts_common_1.currentTimeMillies();
+            this.messageMap[message.text] = date_time_tools_1.currentTimeMillies();
             this.logDebug(`A message was posted to channel: ${message.channel} with message id ${res.ts} which contains the message ${message.text}`);
         });
     }
 }
 exports.SlackModule_Class = SlackModule_Class;
 exports.SlackModule = new SlackModule_Class();
-class Slack_ServerApiError_Class extends ts_common_1.Module {
+class Slack_ServerApiError_Class extends module_1.Module {
     constructor() {
         super("Slack_ServerApiError");
-        this.setDefaultConfig({ exclude: [], minLevel: ts_common_1.ServerErrorSeverity.Info });
+        this.setDefaultConfig({ exclude: [], minLevel: error_handling_1.ServerErrorSeverity.Info });
     }
     init() {
     }
     __processApplicationError(errorLevel, module, message) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (ts_common_1.ServerErrorSeverity_Ordinal.indexOf(errorLevel) < ts_common_1.ServerErrorSeverity_Ordinal.indexOf(this.config.minLevel))
+            if (error_handling_1.ServerErrorSeverity_Ordinal.indexOf(errorLevel) < error_handling_1.ServerErrorSeverity_Ordinal.indexOf(this.config.minLevel))
                 return;
             for (const key of this.config.exclude || []) {
                 if (message.includes(key))

package/app-backend/modules/SlackModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"SlackModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/SlackModule.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH;;GAEG;AAEH,4DAOsC;AACtC,4CAA6E;AA6B7E,MAAa,iBACT,SAAQ,kBAAkB;IAI1B;QACI,KAAK,CAAC,aAAa,CAAC,CAAC;QAHjB,eAAU,GAAe,EAAE,CAAC;IAIpC,CAAC;IAES,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;YAClB,OAAM;QACV,mGAAmG;QAEnG,IAAI,CAAC,GAAG,GAAG,IAAI,mBAAS,CACpB,IAAI,CAAC,MAAM,CAAC,KAAK,kBAEb,sBAAsB,EAAE,IAAI,IACzB,IAAI,CAAC,MAAM,CAAC,WAAW,EAC5B,CAAC;IACX,CAAC;IAEY,WAAW,CAAC,YAA0B;;YAC/C,MAAM,UAAU,GAAiB,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC;gBAChE,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;aACtC,CAAC,CAAC,CAAC,YAAY,CAAC;YAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,IAAI,IAAI,8BAAkB,EAAE,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,kBAAM,CAAC;gBAC5E,OAAO;YAEX,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;aACjD;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,QAAQ,CAAC,6CAA6C,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;aACvF;QACL,CAAC;KAAA;IAEa,eAAe,CAAC,OAAsB;;YAChD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAA0B,CAAC;YAC9E,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,8BAAkB,EAAE,CAAC;YAErD,IAAI,CAAC,QAAQ,CACT,oCAAoC,OAAO,CAAC,OAAO,oBAAoB,GAAG,CAAC,EAAE,+BAA+B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpI,CAAC;KAAA;CACJ;AA/CD,8CA+CC;AAEY,QAAA,WAAW,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAOnD,MAAa,0BACT,SAAQ,kBAAsB;IAE9B;QACI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC9B,IAAI,CAAC,gBAAgB,CAAC,EAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,+BAAmB,CAAC,IAAI,EAAC,CAAC,CAAA;IAC5E,CAAC;IAES,IAAI;IACd,CAAC;IAEK,yBAAyB,CAAC,UAA+B,EAAE,MAAc,EAAE,OAAe;;YAC5F,IAAI,uCAA2B,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,uCAA2B,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC3G,OAAO;YAEX,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE;gBACzC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACrB,OAAM;aACb;YAED,MAAM,mBAAW,CAAC,WAAW,CAAC,SAAS,OAAO,QAAQ,CAAC,CAAC;QAC5D,CAAC;KAAA;CACJ;AAtBD,gEAsBC;AAEY,QAAA,oBAAoB,GAAG,IAAI,0BAA0B,EAAE,CAAC"}
+{"version":3,"file":"SlackModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/SlackModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qFAAuI;AACvI,qEAAkE;AAClE,wFAAgG;AAChG,4CAA6E;AA6B7E,MAAa,iBACT,SAAQ,eAAkB;IAI1B;QACI,KAAK,CAAC,aAAa,CAAC,CAAC;QAHjB,eAAU,GAAe,EAAE,CAAC;IAIpC,CAAC;IAES,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;YAClB,OAAM;QACV,mGAAmG;QAEnG,IAAI,CAAC,GAAG,GAAG,IAAI,mBAAS,CACpB,IAAI,CAAC,MAAM,CAAC,KAAK,kBAEb,sBAAsB,EAAE,IAAI,IACzB,IAAI,CAAC,MAAM,CAAC,WAAW,EAC5B,CAAC;IACX,CAAC;IAEY,WAAW,CAAC,YAA0B;;YAC/C,MAAM,UAAU,GAAiB,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC;gBAChE,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;aACtC,CAAC,CAAC,CAAC,YAAY,CAAC;YAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,IAAI,IAAI,oCAAkB,EAAE,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,wBAAM,CAAC;gBAC5E,OAAO;YAEX,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;aACjD;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,QAAQ,CAAC,6CAA6C,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;aACvF;QACL,CAAC;KAAA;IAEa,eAAe,CAAC,OAAsB;;YAChD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAA0B,CAAC;YAC9E,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,oCAAkB,EAAE,CAAC;YAErD,IAAI,CAAC,QAAQ,CACT,oCAAoC,OAAO,CAAC,OAAO,oBAAoB,GAAG,CAAC,EAAE,+BAA+B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpI,CAAC;KAAA;CACJ;AA/CD,8CA+CC;AAEY,QAAA,WAAW,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAOnD,MAAa,0BACT,SAAQ,eAAsB;IAE9B;QACI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC9B,IAAI,CAAC,gBAAgB,CAAC,EAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,oCAAmB,CAAC,IAAI,EAAC,CAAC,CAAA;IAC5E,CAAC;IAES,IAAI;IACd,CAAC;IAEK,yBAAyB,CAAC,UAA+B,EAAE,MAAc,EAAE,OAAe;;YAC5F,IAAI,4CAA2B,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,4CAA2B,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC3G,OAAO;YAEX,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE;gBACzC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACrB,OAAM;aACb;YAED,MAAM,mBAAW,CAAC,WAAW,CAAC,SAAS,OAAO,QAAQ,CAAC,CAAC;QAC5D,CAAC;KAAA;CACJ;AAtBD,gEAsBC;AAEY,QAAA,oBAAoB,GAAG,IAAI,0BAA0B,EAAE,CAAC"}

package/app-backend/modules/http/AxiosHttpModule.js

@@ -33,7 +33,7 @@ exports.AxiosHttpModule = exports.AxiosHttpModule_Class = void 0;
 // noinspection TypeScriptPreferShortImport
 const axios_1 = require("axios");
 const types_1 = require("../../../shared/types");
-const ts_common_1 = require("@intuitionrobotics/ts-common");
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
 const BaseHttpRequest_1 = require("../../../shared/BaseHttpRequest");
 const BaseHttpModule_1 = require("../../../shared/BaseHttpModule");
 const fs = require("fs");
@@ -88,7 +88,7 @@ class AxiosHttpRequest extends BaseHttpRequest_1.BaseHttpRequest {
     }
     getStatus() {
         if (!this.status)
-            throw new ts_common_1.BadImplementationException('Missing status..');
+            throw new exceptions_1.BadImplementationException('Missing status..');
         return this.status;
     }
     getResponse() {
@@ -176,7 +176,7 @@ class AxiosHttpRequest extends BaseHttpRequest_1.BaseHttpRequest {
     }
     getResponseHeader(headerKey) {
         if (!this.response)
-            throw new ts_common_1.BadImplementationException(`axios didn't return yet`);
+            throw new exceptions_1.BadImplementationException(`axios didn't return yet`);
         return this.response.headers[headerKey];
     }
 }

package/app-backend/modules/http/AxiosHttpModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AxiosHttpModule.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/http/AxiosHttpModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AxiosHttpModule.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/http/AxiosHttpModule.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/proxy/RemoteProxy.d.ts

@@ -1,4 +1,5 @@
-import { Module, ObjectTS } from "@intuitionrobotics/ts-common";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
+import { ObjectTS } from "@intuitionrobotics/ts-common/utils/types";
 import { ServerApi_Middleware } from "../server/HttpServer";
 import { HttpRequestData } from "../server/server-api";
 import { ExpressRequest, QueryRequestInfo } from "../../utils/types";

package/app-backend/modules/proxy/RemoteProxy.js

@@ -30,10 +30,11 @@ exports.RemoteProxy = exports.RemoteProxy_Class = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const ts_common_1 = require("@intuitionrobotics/ts-common");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
 const HttpServer_1 = require("../server/HttpServer");
-const exceptions_1 = require("../../exceptions");
-class RemoteProxy_Class extends ts_common_1.Module {
+const exceptions_2 = require("../../exceptions");
+class RemoteProxy_Class extends module_1.Module {
     constructor() {
         super("RemoteProxy");
         this.Middleware = (request) => __awaiter(this, void 0, void 0, function* () {
@@ -63,7 +64,7 @@ class RemoteProxy_Class extends ts_common_1.Module {
     }
     init() {
         if (!this.config)
-            throw new ts_common_1.ImplementationMissingException("MUST specify config for this module!!");
+            throw new exceptions_1.ImplementationMissingException("MUST specify config for this module!!");
         if (!this.config.secretHeaderName)
             this.config.secretHeaderName = 'x-secret';
         if (!this.config.proxyHeaderName)
@@ -73,21 +74,21 @@ class RemoteProxy_Class extends ts_common_1.Module {
     }
     assertSecret(request) {
         if (!this.secretHeader || !this.proxyHeader)
-            throw new ts_common_1.ImplementationMissingException("MUST add RemoteProxy to your module list!!!");
+            throw new exceptions_1.ImplementationMissingException("MUST add RemoteProxy to your module list!!!");
         const secret = this.getSecretHeader(request);
         const proxyId = this.getProxyHeader(request);
         const expectedSecret = this.config.remotes[proxyId];
         if (!proxyId)
-            throw new exceptions_1.ApiException(403, `Missing proxy declaration in config for ${proxyId} !!`);
+            throw new exceptions_2.ApiException(403, `Missing proxy declaration in config for ${proxyId} !!`);
         if (!secret)
-            throw new exceptions_1.ApiException(403, `Missing secret !!`);
+            throw new exceptions_2.ApiException(403, `Missing secret !!`);
         if (!expectedSecret)
-            throw new exceptions_1.ApiException(403, `ProxyId '${proxyId}' is not registered for remote access !!`);
+            throw new exceptions_2.ApiException(403, `ProxyId '${proxyId}' is not registered for remote access !!`);
         if (expectedSecret.secret !== secret)
-            throw new exceptions_1.ApiException(403, `Secret does not match for proxyId: ${proxyId}`);
+            throw new exceptions_2.ApiException(403, `Secret does not match for proxyId: ${proxyId}`);
         const requestUrl = request.path;
         if (!expectedSecret.urls || !expectedSecret.urls.includes(requestUrl))
-            throw new exceptions_1.ApiException(403, `Requested url '${requestUrl}' is not allowed from proxyId: ${proxyId}`);
+            throw new exceptions_2.ApiException(403, `Requested url '${requestUrl}' is not allowed from proxyId: ${proxyId}`);
         return expectedSecret.extras;
     }
     processApi(request, requestData) {

package/app-backend/modules/proxy/RemoteProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"RemoteProxy.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/proxy/RemoteProxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RemoteProxy.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/proxy/RemoteProxy.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/proxy/RemoteProxyCaller.d.ts

@@ -1,4 +1,4 @@
-import { Module } from "@intuitionrobotics/ts-common";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
 import { DeriveBodyType, DeriveQueryType, DeriveResponseType, DeriveUrlType, QueryParams } from "../../../shared/types";
 import { AxiosResponse } from "axios";
 export declare type RemoteServerConfig = {