@intuitionrobotics/thunderstorm 0.46.0 → 0.47.0

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,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,SAAS,CAAC,EAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,oCAAmB,CAAC,IAAI,EAAC,CAAC,CAAA;IACrE,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"}
+{"version":3,"file":"SlackModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/SlackModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,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,IAAA,8BAAkB,GAAE,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,kBAAM,CAAC;gBAC5E,OAAO;YAEX,IAAI,CAAC;gBACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAClD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,QAAQ,CAAC,6CAA6C,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YACxF,CAAC;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,IAAA,8BAAkB,GAAE,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,CAAC;gBAC1C,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACrB,OAAM;YACd,CAAC;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/_imports.d.ts

@@ -0,0 +1,10 @@
+export * from "./server/server-api";
+export * from "./server/HttpServer";
+export * from "./proxy/RemoteProxyCaller";
+export * from "./proxy/RemoteProxy";
+export * from "../exceptions";
+export * from "../utils/promisify-request";
+export * from "../utils/to-be-removed";
+export * from "./CleanupScheduler";
+export * from "./FirestoreBackupScheduler";
+export * from "../../index";

package/app-backend/modules/_imports.js

@@ -0,0 +1,47 @@
+"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 Intuition Robotics
+ *
+ * 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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./server/server-api"), exports);
+__exportStar(require("./server/HttpServer"), exports);
+__exportStar(require("./proxy/RemoteProxyCaller"), exports);
+__exportStar(require("./proxy/RemoteProxy"), exports);
+__exportStar(require("../exceptions"), exports);
+__exportStar(require("../utils/promisify-request"), exports);
+__exportStar(require("../utils/to-be-removed"), exports);
+__exportStar(require("./CleanupScheduler"), exports);
+__exportStar(require("./FirestoreBackupScheduler"), exports);
+__exportStar(require("../../index"), exports);
+//# sourceMappingURL=_imports.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"_imports.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/_imports.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;;;;;AAEH,sDAAoC;AACpC,sDAAoC;AAEpC,4DAA0C;AAC1C,sDAAoC;AAEpC,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AAEvC,qDAAmC;AACnC,6DAA2C;AAE3C,8CAA4B"}

package/app-backend/modules/http/AxiosHttpModule.d.ts

@@ -1,30 +1,20 @@
-import { ApiTypeBinder, DeriveErrorType, ErrorResponse, HttpMethod } from "../../../shared/types";
+import { ApiTypeBinder, HttpMethod, QueryParams } from "../../../shared/types";
 import { BaseHttpRequest } from "../../../shared/BaseHttpRequest";
-import { BaseHttpModule_Class } from "../../../shared/BaseHttpModule";
+import { BaseHttpModule_Class, HttpConfig } from "../../../shared/BaseHttpModule";
 import { Axios_RequestConfig } from "./types";
 export declare class AxiosHttpModule_Class extends BaseHttpModule_Class {
     private requestOption;
     constructor(name?: string);
     init(): void;
-    createRequest<Binder extends ApiTypeBinder<any, any, any, any>>(method: HttpMethod, key: string, data?: string): AxiosHttpRequest<DeriveRealBinder<Binder>>;
+    createRequest<Binder extends ApiTypeBinder<U, R, B, P, E>, U extends string = Binder["url"], R = Binder["response"], B = Binder["body"], P extends QueryParams = Binder["queryParams"], E extends void | object = Binder["error"]>(method: HttpMethod, key: string, data?: string): BaseHttpRequest<Binder>;
     setRequestOption(requestOption: Axios_RequestConfig): this;
     downloadFile(url: string, outputFile: string, key?: string): Promise<string>;
 }
-export declare type DeriveRealBinder<Binder> = Binder extends ApiTypeBinder<infer U, infer R, infer B, infer P> ? ApiTypeBinder<U, R, B, P> : void;
+export type DeriveRealBinder<Binder> = Binder extends ApiTypeBinder<infer U, infer R, infer B, infer P> ? ApiTypeBinder<U, R, B, P> : void;
 export declare const AxiosHttpModule: AxiosHttpModule_Class;
-declare class AxiosHttpRequest<Binder extends ApiTypeBinder<any, any, any, any>> extends BaseHttpRequest<Binder> {
-    private response?;
-    private cancelSignal;
-    protected status?: number;
+export declare class AxiosHttpClient extends BaseHttpModule_Class {
     private requestOption;
-    constructor(requestKey: string, requestData?: string, shouldCompress?: boolean);
-    getStatus(): number;
-    getResponse(): any;
-    protected resolveResponse(): any;
-    protected abortImpl(): void;
-    getErrorResponse(): ErrorResponse<DeriveErrorType<Binder>>;
+    constructor(name: string, config: HttpConfig);
+    createRequest<Binder extends ApiTypeBinder<U, R, B, P, E>, U extends string = Binder["url"], R = Binder["response"], B = Binder["body"], P extends QueryParams = Binder["queryParams"], E extends void | object = Binder["error"]>(method: HttpMethod, key: string, data?: string): BaseHttpRequest<Binder>;
     setRequestOption(requestOption: Axios_RequestConfig): this;
-    protected executeImpl(): Promise<void>;
-    getResponseHeader(headerKey: string): string | undefined;
 }
-export {};

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

@@ -9,11 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AxiosHttpModule = exports.AxiosHttpModule_Class = void 0;
-// noinspection TypeScriptPreferShortImport
+exports.AxiosHttpClient = exports.AxiosHttpModule = exports.AxiosHttpModule_Class = void 0;
 const axios_1 = require("axios");
 const types_1 = require("../../../shared/types");
-const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+const ts_common_1 = require("@intuitionrobotics/ts-common");
 const BaseHttpRequest_1 = require("../../../shared/BaseHttpRequest");
 const BaseHttpModule_1 = require("../../../shared/BaseHttpModule");
 const fs = require("fs");
@@ -68,7 +67,7 @@ class AxiosHttpRequest extends BaseHttpRequest_1.BaseHttpRequest {
     }
     getStatus() {
         if (!this.status)
-            throw new exceptions_1.BadImplementationException('Missing status..');
+            throw new ts_common_1.BadImplementationException('Missing status..');
         return this.status;
     }
     getResponse() {
@@ -95,14 +94,17 @@ class AxiosHttpRequest extends BaseHttpRequest_1.BaseHttpRequest {
             if (this.aborted)
                 return resolve();
             let nextOperator = this.url.indexOf("?") === -1 ? "?" : "&";
-            const fullUrl = Object.keys(this.params).reduce((url, paramKey) => {
-                const param = this.params[paramKey];
-                if (!param)
-                    return url;
-                const toRet = `${url}${nextOperator}${paramKey}=${encodeURIComponent(param)}`;
-                nextOperator = "&";
-                return toRet;
-            }, this.url);
+            let fullUrl = this.url;
+            const params = this.params;
+            if (params)
+                fullUrl = (0, ts_common_1._keys)(params).reduce((url, paramKey) => {
+                    const param = params[paramKey];
+                    if (!param)
+                        return url;
+                    const toRet = `${url}${nextOperator}${String(paramKey)}=${encodeURIComponent(param)}`;
+                    nextOperator = "&";
+                    return toRet;
+                }, this.url);
             // TODO set progress listener
             // this.xhr.upload.onprogress = this.onProgressListener;
             const body = this.body;
@@ -137,18 +139,16 @@ class AxiosHttpRequest extends BaseHttpRequest_1.BaseHttpRequest {
                 return resolve();
             }
             catch (e) {
-                // console.log('In catch');
-                // TODO handle this here
-                // 	if (xhr.readyState === 4 && xhr.status === 0) {
-                // 		reject(new HttpException(404, this.url));
-                // 		return;
-                // 	}
+                if (!(e instanceof axios_1.default.AxiosError)) {
+                    this.status = 500;
+                    return reject(e);
+                }
                 if (axios_1.default.isCancel(e)) {
                     // Should already be set when I abort but just in case its aborted somehow else
                     this.aborted = true;
                     console.log('Api cancelled: ', e.message);
                 }
-                this.response = e.response;
+                this.response = e["response"];
                 this.status = ((_b = this.response) === null || _b === void 0 ? void 0 : _b.status) || 500;
                 return reject(e);
             }
@@ -156,8 +156,35 @@ class AxiosHttpRequest extends BaseHttpRequest_1.BaseHttpRequest {
     }
     getResponseHeader(headerKey) {
         if (!this.response)
-            throw new exceptions_1.BadImplementationException(`axios didn't return yet`);
+            throw new ts_common_1.BadImplementationException(`axios didn't return yet`);
         return this.response.headers[headerKey];
     }
 }
+class AxiosHttpClient extends BaseHttpModule_1.BaseHttpModule_Class {
+    constructor(name, config) {
+        super(name);
+        this.requestOption = {};
+        this.setConfig(config);
+        super.init();
+        const origin = this.config.origin;
+        if (origin)
+            this.origin = origin;
+    }
+    createRequest(method, key, data) {
+        return new AxiosHttpRequest(key, data, this.shouldCompress())
+            .setOrigin(this.origin)
+            .setMethod(method)
+            .setTimeout(this.timeout)
+            .setDefaultHeaders(this.defaultHeaders)
+            .setHandleRequestSuccess(this.handleRequestSuccess)
+            .setHandleRequestFailure(this.handleRequestFailure)
+            .setDefaultRequestHandler(this.processDefaultResponseHandlers)
+            .setRequestOption(this.requestOption);
+    }
+    setRequestOption(requestOption) {
+        this.requestOption = requestOption;
+        return this;
+    }
+}
+exports.AxiosHttpClient = AxiosHttpClient;
 //# sourceMappingURL=AxiosHttpModule.js.map

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/http/types.d.ts

@@ -1,6 +1,6 @@
 import { AxiosRequestConfig, AxiosResponse, CancelTokenSource, Method, ResponseType } from "axios";
-export declare type Axios_RequestConfig = AxiosRequestConfig;
-export declare type Axios_Response<T = any> = AxiosResponse<T>;
-export declare type Axios_CancelTokenSource = CancelTokenSource;
-export declare type Axios_Method = Method;
-export declare type Axios_ResponseType = ResponseType;
+export type Axios_RequestConfig = AxiosRequestConfig;
+export type Axios_Response<T = any> = AxiosResponse<T>;
+export type Axios_CancelTokenSource = CancelTokenSource;
+export type Axios_Method = Method;
+export type Axios_ResponseType = ResponseType;

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

@@ -1,14 +1,13 @@
-import { Module } from "@intuitionrobotics/ts-common/core/module";
-import { ObjectTS } from "@intuitionrobotics/ts-common/utils/types";
+import { Module, ObjectTS } from "@intuitionrobotics/ts-common";
 import { ServerApi_Middleware } from "../server/HttpServer";
 import { HttpRequestData } from "../server/server-api";
 import { ExpressRequest, QueryRequestInfo } from "../../utils/types";
-declare type ProxyConfig = {
+type ProxyConfig = {
     extras?: ObjectTS;
     urls: string[];
     secret: string;
 };
-export declare type RemoteProxyConfig = {
+export type RemoteProxyConfig = {
     remotes: {
         [proxyId: string]: ProxyConfig;
     };

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

@@ -10,11 +10,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoteProxy = exports.RemoteProxy_Class = void 0;
-const module_1 = require("@intuitionrobotics/ts-common/core/module");
-const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+/*
+ * Thunderstorm is a full web app framework!
+ *
+ * Typescript & Express backend infrastructure that natively runs on firebase function
+ * Typescript & React frontend infrastructure
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * 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.
+ */
+const ts_common_1 = require("@intuitionrobotics/ts-common");
 const HttpServer_1 = require("../server/HttpServer");
-const exceptions_2 = require("../../exceptions");
-class RemoteProxy_Class extends module_1.Module {
+const exceptions_1 = require("../../exceptions");
+class RemoteProxy_Class extends ts_common_1.Module {
     constructor() {
         super("RemoteProxy");
         this.Middleware = (request) => __awaiter(this, void 0, void 0, function* () {
@@ -44,7 +63,7 @@ class RemoteProxy_Class extends module_1.Module {
     }
     init() {
         if (!this.config)
-            throw new exceptions_1.ImplementationMissingException("MUST specify config for this module!!");
+            throw new ts_common_1.ImplementationMissingException("MUST specify config for this module!!");
         if (!this.config.secretHeaderName)
             this.config.secretHeaderName = 'x-secret';
         if (!this.config.proxyHeaderName)
@@ -54,21 +73,21 @@ class RemoteProxy_Class extends module_1.Module {
     }
     assertSecret(request) {
         if (!this.secretHeader || !this.proxyHeader)
-            throw new exceptions_1.ImplementationMissingException("MUST add RemoteProxy to your module list!!!");
+            throw new ts_common_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_2.ApiException(403, `Missing proxy declaration in config for ${proxyId} !!`);
+            throw new exceptions_1.ApiException(403, `Missing proxy declaration in config for ${proxyId} !!`);
         if (!secret)
-            throw new exceptions_2.ApiException(403, `Missing secret !!`);
+            throw new exceptions_1.ApiException(403, `Missing secret !!`);
         if (!expectedSecret)
-            throw new exceptions_2.ApiException(403, `ProxyId '${proxyId}' is not registered for remote access !!`);
+            throw new exceptions_1.ApiException(403, `ProxyId '${proxyId}' is not registered for remote access !!`);
         if (expectedSecret.secret !== secret)
-            throw new exceptions_2.ApiException(403, `Secret does not match for proxyId: ${proxyId}`);
+            throw new exceptions_1.ApiException(403, `Secret does not match for proxyId: ${proxyId}`);
         const requestUrl = request.path;
         if (!expectedSecret.urls || !expectedSecret.urls.includes(requestUrl))
-            throw new exceptions_2.ApiException(403, `Requested url '${requestUrl}' is not allowed from proxyId: ${proxyId}`);
+            throw new exceptions_1.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,7 +1,7 @@
-import { Module } from "@intuitionrobotics/ts-common/core/module";
-import { DeriveBodyType, DeriveQueryType, DeriveResponseType, DeriveUrlType, QueryParams } from "../../../shared/types";
+import { Module } from "@intuitionrobotics/ts-common";
+import { ApiWithBody, ApiWithQuery, QueryParams } from "../../../shared/types";
 import { AxiosResponse } from "axios";
-export declare type RemoteServerConfig = {
+export type RemoteServerConfig = {
     secretHeaderName: string;
     proxyHeaderName: string;
     proxyId: string;
@@ -11,16 +11,16 @@ export declare type RemoteServerConfig = {
 export declare abstract class RemoteProxyCaller<Config extends RemoteServerConfig> extends Module<Config> {
     constructor(name: string);
     protected init(): void;
-    protected executeGetRequest: <Binder extends import("../../../shared/types").ApiTypeBinder<U, R, void, P, any>, U extends string = DeriveUrlType<Binder>, R = DeriveResponseType<Binder>, P extends QueryParams = DeriveQueryType<Binder>>(url: U, _params: P, _headers?: {
+    protected executeGetRequest: <Binder extends ApiWithQuery<U, R, P>, U extends string = Binder["url"], R = Binder["response"], P extends QueryParams = Binder["queryParams"]>(url: U, _params: P, _headers?: {
         [key: string]: string;
     } | undefined) => Promise<R>;
-    protected executeGetRequestImpl: <Binder extends import("../../../shared/types").ApiTypeBinder<U, R, void, P, any>, U extends string = DeriveUrlType<Binder>, R = DeriveResponseType<Binder>, P extends QueryParams = DeriveQueryType<Binder>>(url: U, _params: P, _headers?: {
+    protected executeGetRequestImpl: <Binder extends ApiWithQuery<U, R, P>, U extends string = Binder["url"], R = Binder["response"], P extends QueryParams = Binder["queryParams"]>(url: U, _params: P, _headers?: {
         [key: string]: string;
     } | undefined) => Promise<AxiosResponse<R, any>>;
-    protected executePostRequest: <Binder extends import("../../../shared/types").ApiTypeBinder<U, B, R, {}, any>, U extends string = DeriveUrlType<Binder>, R = DeriveResponseType<Binder>, B = DeriveBodyType<Binder>>(url: U, body: B, _headers?: {
+    protected executePostRequest: <Binder extends ApiWithBody<U, R, B>, U extends string = Binder["url"], R = Binder["response"], B = Binder["body"]>(url: U, body: B, _headers?: {
         [key: string]: string;
     } | undefined) => Promise<R>;
-    protected executePostRequestImpl: <Binder extends import("../../../shared/types").ApiTypeBinder<U, B, R, {}, any>, U extends string = DeriveUrlType<Binder>, R = DeriveResponseType<Binder>, B = DeriveBodyType<Binder>>(url: U, body: B, _headers?: {
+    protected executePostRequestImpl: <Binder extends ApiWithBody<U, R, B>, U extends string = Binder["url"], R = Binder["response"], B = Binder["body"]>(url: U, body: B, _headers?: {
         [key: string]: string;
     } | undefined) => Promise<AxiosResponse<R, any>>;
     private executeRequest;

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

@@ -10,12 +10,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoteProxyCaller = void 0;
-const module_1 = require("@intuitionrobotics/ts-common/core/module");
-const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
-const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
+/*
+ * Thunderstorm is a full web app framework!
+ *
+ * Typescript & Express backend infrastructure that natively runs on firebase function
+ * Typescript & React frontend infrastructure
+ *
+ * Copyright (C) 2020 Intuition Robotics
+ *
+ * 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.
+ */
+const ts_common_1 = require("@intuitionrobotics/ts-common");
 const promisify_request_1 = require("../../utils/promisify-request");
-const exceptions_2 = require("../../exceptions");
-class RemoteProxyCaller extends module_1.Module {
+const exceptions_1 = require("../../exceptions");
+class RemoteProxyCaller extends ts_common_1.Module {
     // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
     constructor(name) {
         super(name);
@@ -53,7 +71,7 @@ class RemoteProxyCaller extends module_1.Module {
             return this.executeRequest(proxyRequest);
         });
         this.executeRequest = (proxyRequest) => __awaiter(this, void 0, void 0, function* () {
-            const response = yield promisify_request_1.promisifyRequest(proxyRequest);
+            const response = yield (0, promisify_request_1.promisifyRequest)(proxyRequest);
             if (proxyRequest.headers) {
                 delete proxyRequest.headers[this.config.secretHeaderName];
                 delete proxyRequest.headers["Authorization"];
@@ -63,9 +81,9 @@ class RemoteProxyCaller extends module_1.Module {
             if (statusCode < 200 || statusCode >= 300) {
                 const errorResponse = response.data;
                 if (!errorResponse)
-                    throw new exceptions_2.ApiException(500, `Extraneous error ${tools_1.__stringify(response)}, Proxy Request: ${tools_1.__stringify(proxyRequest, true)}`);
+                    throw new exceptions_1.ApiException(500, `Extraneous error ${(0, ts_common_1.__stringify)(response)}, Proxy Request: ${(0, ts_common_1.__stringify)(proxyRequest, true)}`);
                 const debugMessage = typeof errorResponse === 'object' ? errorResponse['debugMessage'] : errorResponse;
-                const e = new exceptions_2.ApiException(response.status, `Redirect proxy error: ${debugMessage} \n Proxy Request: ${tools_1.__stringify(proxyRequest, true)}`);
+                const e = new exceptions_1.ApiException(response.status, `Redirect proxy error: ${debugMessage} \n Proxy Request: ${(0, ts_common_1.__stringify)(proxyRequest, true)}`);
                 if (errorResponse.error)
                     e.setErrorBody(errorResponse.error);
                 throw e;
@@ -75,13 +93,13 @@ class RemoteProxyCaller extends module_1.Module {
     }
     init() {
         if (!this.config)
-            throw new exceptions_1.ImplementationMissingException("MUST specify config for this module!!");
+            throw new ts_common_1.ImplementationMissingException(`MUST specify config for ${this.getName()}`);
         if (!this.config.proxyId)
-            throw new exceptions_1.ImplementationMissingException("MUST specify the proxyId for the proxy caller!!");
+            throw new ts_common_1.ImplementationMissingException(`MUST specify the proxyId for ${this.getName()}`);
         if (!this.config.url)
-            throw new exceptions_1.ImplementationMissingException("MUST specify the url for the remote server!!");
+            throw new ts_common_1.ImplementationMissingException(`MUST specify the url for the remote server for ${this.getName()}`);
         if (!this.config.secret)
-            throw new exceptions_1.ImplementationMissingException("MUST specify the secret for the remote server!!");
+            throw new ts_common_1.ImplementationMissingException(`MUST specify the secret for the remote server for ${this.getName()}`);
         if (!this.config.secretHeaderName)
             this.config.secretHeaderName = 'x-secret';
         if (!this.config.proxyHeaderName)

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

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

package/app-backend/modules/server/HttpServer.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
+import { Module, ObjectTS } from "@intuitionrobotics/ts-common";
 import { ApiResponse, HttpRequestData, ServerApi } from "./server-api";
 import { ApiException } from "../../exceptions";
 import { Express, ExpressRequest, ExpressRequestHandler } from "../../utils/types";
-import { ObjectTS } from '@intuitionrobotics/ts-common/utils/types';
-import { Module } from '@intuitionrobotics/ts-common/core/module';
-declare type ConfigType = {
+type ConfigType = {
     port: number;
     baseUrl: string;
     cors: {
@@ -19,9 +18,9 @@ declare type ConfigType = {
     };
     bodyParserLimit: number | string;
 };
-export declare type HttpErrorHandler = (requestData: HttpRequestData, error: ApiException) => Promise<string>;
-export declare type ServerApi_Middleware = (request: ExpressRequest, data: HttpRequestData, response: ApiResponse, scopes: string[]) => Promise<ObjectTS | void>;
-declare type HttpRoute = {
+export type HttpErrorHandler = (requestData: HttpRequestData, error: ApiException) => Promise<string>;
+export type ServerApi_Middleware = (request: ExpressRequest, data: HttpRequestData, response: ApiResponse, scopes: string[]) => Promise<ObjectTS | void>;
+type HttpRoute = {
     methods: string[];
     path: string;
 };

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

@@ -1,4 +1,24 @@
 "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 Intuition Robotics
+ *
+ * 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) {
@@ -10,15 +30,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeaderKey = exports.RouteResolver = exports.HttpServer_Class = void 0;
+/**
+ * Module dependencies.
+ */
 const compression = require("compression");
 const fs = require("fs");
+const ts_common_1 = require("@intuitionrobotics/ts-common");
 const server_api_1 = require("./server-api");
 const exceptions_1 = require("../../exceptions");
 const express = require("express");
 const server_errors_1 = require("./server-errors");
-const module_1 = require("@intuitionrobotics/ts-common/core/module");
-const types_1 = require("@intuitionrobotics/ts-common/core/logger/types");
-const consts_1 = require("../../../shared/consts");
+const _imports_1 = require("../_imports");
 const ALL_Methods = [
     'GET',
     'PUT',
@@ -34,13 +56,13 @@ const DefaultHeaders = [
     'authorization'
 ];
 const ExposedHeaders = [
-    consts_1.HeaderKey_FunctionExecutionId,
-    consts_1.HeaderKey_JWT
+    _imports_1.HeaderKey_FunctionExecutionId,
+    _imports_1.HeaderKey_JWT
 ];
-class HttpServer_Class extends module_1.Module {
+class HttpServer_Class extends ts_common_1.Module {
     constructor(_express) {
         super("HttpServer");
-        this.errorMessageComposer = server_errors_1.DefaultApiErrorMessageComposer();
+        this.errorMessageComposer = (0, server_errors_1.DefaultApiErrorMessageComposer)();
         this.express = _express;
     }
     setErrorMessageComposer(errorMessageComposer) {
@@ -58,7 +80,7 @@ class HttpServer_Class extends module_1.Module {
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.setMinLevel(server_api_1.ServerApi.isDebug ? types_1.LogLevel.Verbose : types_1.LogLevel.Info);
+            this.setMinLevel(server_api_1.ServerApi.isDebug ? ts_common_1.LogLevel.Verbose : ts_common_1.LogLevel.Info);
             const baseUrl = this.config.baseUrl;
             if (baseUrl) {
                 if (baseUrl.endsWith("/"))
@@ -82,7 +104,7 @@ class HttpServer_Class extends module_1.Module {
                 cors.exposedHeaders = ExposedHeaders;
             cors.headers = DefaultHeaders.reduce((toRet, item) => {
                 if (!toRet.includes(item))
-                    toRet.push(item);
+                    (0, ts_common_1.addItemToArray)(toRet, item);
                 return toRet;
             }, cors.headers || []);
             const resolveCorsOrigin = (origin) => {
@@ -147,7 +169,7 @@ class HttpServer_Class extends module_1.Module {
         const routes = resolveRoutes(this.express._router.stack);
         this.routes = routes.reduce((toRet, route) => {
             const toAdd = Array.isArray(route) ? route : [route];
-            toRet.push(...toAdd);
+            (0, ts_common_1.addAllItemToArray)(toRet, toAdd);
             return toRet;
         }, []);
         console.timeEnd('Resolving Apis');