@intuitionrobotics/thunderstorm 0.41.76 → 0.42.2

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

@@ -1,5 +1,6 @@
 import { Module } from "@intuitionrobotics/ts-common";
 import { DeriveBodyType, DeriveQueryType, DeriveResponseType, DeriveUrlType, QueryParams } from "../../../shared/types";
+import { AxiosResponse } from "axios";
 export declare type RemoteServerConfig = {
     secretHeaderName: string;
     proxyHeaderName: string;
@@ -11,9 +12,9 @@ export declare class RemoteProxyCaller<Config extends RemoteServerConfig> extend
     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?: {
         [key: string]: string;
-    } | undefined) => Promise<R>;
+    } | 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?: {
         [key: string]: string;
-    } | undefined) => Promise<R>;
+    } | undefined) => Promise<AxiosResponse<R, any>>;
     private executeRequest;
 }

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

@@ -45,37 +45,38 @@ class RemoteProxyCaller extends ts_common_1.Module {
                 urlParams = `?${params.join("&")}`;
             const proxyRequest = {
                 headers: Object.assign(Object.assign({}, _headers), { [this.config.secretHeaderName]: this.config.secret, [this.config.proxyHeaderName]: this.config.proxyId }),
-                uri: `${this.config.url}${url}${urlParams}`,
+                url: `${this.config.url}${url}${urlParams}`,
                 method: 'GET',
-                json: true
+                responseType: 'json'
             };
             return yield this.executeRequest(proxyRequest);
         });
         this.executePostRequest = (url, body, _headers) => __awaiter(this, void 0, void 0, function* () {
             const proxyRequest = {
                 headers: Object.assign(Object.assign({}, _headers), { 'Content-Type': 'application/json', [this.config.secretHeaderName]: this.config.secret, [this.config.proxyHeaderName]: this.config.proxyId }),
-                json: true,
-                uri: `${this.config.url}${url}`,
-                body: body,
+                responseType: "json",
+                url: `${this.config.url}${url}`,
+                data: body,
                 method: 'POST'
             };
             return this.executeRequest(proxyRequest);
         });
         this.executeRequest = (proxyRequest) => __awaiter(this, void 0, void 0, function* () {
-            const response = yield promisify_request_1.promisifyRequest(proxyRequest, false);
+            const response = yield promisify_request_1.promisifyRequest(proxyRequest);
             if (proxyRequest.headers)
                 delete proxyRequest.headers[this.config.secretHeaderName];
-            if (response.statusCode !== 200) {
-                let errorResponse;
-                errorResponse = response.body;
+            const statusCode = response.status;
+            // TODO: need to handle 1XX and 3XX
+            if (statusCode < 200 || statusCode >= 300) {
+                const errorResponse = response.data;
                 if (!errorResponse)
                     throw new exceptions_1.ApiException(500, `Extraneous error ${ts_common_1.__stringify(response)}, Proxy Request: ${ts_common_1.__stringify(proxyRequest, true)}`);
-                const e = new exceptions_1.ApiException(response.statusCode, `Redirect proxy error: ${errorResponse.debugMessage} \n Proxy Request: ${ts_common_1.__stringify(proxyRequest, true)}`);
+                const e = new exceptions_1.ApiException(response.status, `Redirect proxy error: ${errorResponse.debugMessage} \n Proxy Request: ${ts_common_1.__stringify(proxyRequest, true)}`);
                 if (errorResponse.error)
                     e.setErrorBody(errorResponse.error);
                 throw e;
             }
-            return response.toJSON().body;
+            return response;
         });
     }
     init() {

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/utils/promisify-request.d.ts

@@ -1,3 +1,2 @@
-import { Response } from "request";
-import { RequestOptions } from "../../backend";
-export declare function promisifyRequest(request: RequestOptions, throwException?: boolean): Promise<Response>;
+import { AxiosRequestConfig, AxiosResponse } from "axios";
+export declare function promisifyRequest(_request: AxiosRequestConfig): Promise<AxiosResponse>;

package/app-backend/utils/promisify-request.js

@@ -30,20 +30,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promisifyRequest = void 0;
-const _request = require("request");
 const exceptions_1 = require("../exceptions");
 const ts_common_1 = require("@intuitionrobotics/ts-common");
-function promisifyRequest(request, throwException = true) {
+const axios_1 = require("axios");
+function promisifyRequest(_request) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, rejected) => {
-            _request(request, (error, response) => {
-                if (error)
-                    return rejected(new exceptions_1.ApiException(503, `Error: ${error}\n Request: ${ts_common_1.__stringify(request, true)}`));
-                if (throwException && response.statusCode !== 200)
-                    return rejected(new exceptions_1.ApiException(response.statusCode, `Redirect proxy message, ${ts_common_1.__stringify(response.body)} \n${ts_common_1.__stringify(request, true)}`));
-                resolve(response);
-            });
-        });
+        try {
+            return yield axios_1.default.request(_request);
+        }
+        catch (error) {
+            const resp = error.response;
+            if (resp) {
+                // The request was made and the server responded with a status code
+                // that falls out of the range of 2xx
+                return resp;
+            }
+            // if (error.request)
+            // The request was made but no response was received
+            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+            // http.ClientRequest in node.js
+            throw new exceptions_1.ApiException(503, `Error: ${ts_common_1.__stringify(error)}\n Request: ${ts_common_1.__stringify(_request, true)}`);
+            // Something happened in setting up the request that triggered an Error
+            // console.log('Error', error.message);
+            //
+            // console.log(error.config);
+        }
     });
 }
 exports.promisifyRequest = promisifyRequest;

package/app-backend/utils/promisify-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"promisify-request.js","sourceRoot":"","sources":["../../../src/main/app-backend/utils/promisify-request.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH,oCAAoC;AAEpC,8CAA2C;AAC3C,4DAAyD;AAGzD,SAAsB,gBAAgB,CAAC,OAAuB,EAAE,iBAA0B,IAAI;;QAC7F,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;YAClD,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,QAAkB,EAAE,EAAE;gBAC/C,IAAI,KAAK;oBACR,OAAO,QAAQ,CAAC,IAAI,yBAAY,CAAC,GAAG,EAAE,UAAU,KAAK,eAAe,uBAAW,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEpG,IAAI,cAAc,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG;oBAChD,OAAO,QAAQ,CAAC,IAAI,yBAAY,CAAC,QAAQ,CAAC,UAAU,EAAE,2BAA2B,uBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,uBAAW,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEjJ,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;CAAA;AAZD,4CAYC"}
+{"version":3,"file":"promisify-request.js","sourceRoot":"","sources":["../../../src/main/app-backend/utils/promisify-request.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAGH,8CAA2C;AAC3C,4DAAyD;AACzD,iCAGe;AAEf,SAAsB,gBAAgB,CAAC,QAA4B;;QAClE,IAAI;YACH,OAAO,MAAM,eAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACf,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC5B,IAAI,IAAI,EAAE;gBACT,mEAAmE;gBACnE,qCAAqC;gBACrC,OAAO,IAAI,CAAC;aACZ;YAED,qBAAqB;YACrB,oDAAoD;YACpD,qFAAqF;YACrF,gCAAgC;YAEhC,MAAM,IAAI,yBAAY,CAAC,GAAG,EAAE,UAAU,uBAAW,CAAC,KAAK,CAAC,eAAe,uBAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;YAErG,uEAAuE;YACvE,uCAAuC;YACvC,EAAE;YACF,6BAA6B;SAC7B;IACF,CAAC;CAAA;AAvBD,4CAuBC"}

package/app-frontend/modules/http/HttpClient.d.ts

@@ -1,21 +0,0 @@
-/// <reference types="node" />
-import { StringMap } from "@intuitionrobotics/ts-common";
-export declare const createFormData: (filename: string, buffer: Buffer) => {
-    file: {
-        value: Buffer;
-        options: {
-            filename: string;
-        };
-    };
-};
-export declare class HttpClient {
-    private defaultHeaders;
-    private readonly baseUrl;
-    constructor(baseUrl: string);
-    setDefaultHeaders(defaultHeaders: Headers): void;
-    form(path: string, buffer: Buffer, headers?: Headers): Promise<any>;
-    get(path: string, _params?: StringMap, headers?: Headers): Promise<any>;
-    post(path: string, body: any, headers?: Headers): Promise<any>;
-    put(path: string, body: any, headers?: Headers): Promise<any>;
-    private executeRequest;
-}

package/app-frontend/modules/http/HttpClient.js

@@ -1,108 +1,125 @@
 "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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpClient = exports.createFormData = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-const __1 = require("../../..");
-const backend_1 = require("../../../backend");
-const createFormData = (filename, buffer) => ({ file: { value: buffer, options: { filename } } });
-exports.createFormData = createFormData;
-class HttpClient {
-    constructor(baseUrl) {
-        this.executeRequest = (body) => __awaiter(this, void 0, void 0, function* () {
-            const response = yield backend_1.promisifyRequest(body, false);
-            const statusCode = response.statusCode;
-            if (statusCode >= 200 && statusCode < 300)
-                return response.toJSON().body;
-            const errorResponse = response.body;
-            if (!errorResponse)
-                throw new backend_1.ApiException(statusCode, `Http request failed without error message: ${ts_common_1.__stringify(body, true)}`);
-            throw new backend_1.ApiException(statusCode, `Http request failed: ${errorResponse} \n For Request: ${ts_common_1.__stringify(body, true)}`);
-        });
-        this.baseUrl = baseUrl;
-    }
-    setDefaultHeaders(defaultHeaders) {
-        this.defaultHeaders = defaultHeaders;
-    }
-    form(path, buffer, headers) {
-        const request = {
-            headers: Object.assign(Object.assign({}, this.defaultHeaders), { headers }),
-            uri: `${this.baseUrl}${path}`,
-            formData: exports.createFormData('logs.zip', buffer),
-            method: __1.HttpMethod.POST,
-        };
-        return this.executeRequest(request);
-    }
-    get(path, _params, headers) {
-        let url = `${this.baseUrl}${path}`;
-        let nextOperator = "?";
-        if (url.indexOf("?") !== -1)
-            nextOperator = "&";
-        if (_params)
-            url = Object.keys(_params).reduce((fullUrl, paramKey) => {
-                const param = _params[paramKey];
-                if (!param)
-                    return url;
-                const temp = `${fullUrl}${nextOperator}${paramKey}=${encodeURIComponent(param)}`;
-                nextOperator = "&";
-                return temp;
-            }, url);
-        const request = {
-            headers: Object.assign(Object.assign({}, this.defaultHeaders), { headers }),
-            uri: `${url}`,
-            method: __1.HttpMethod.GET,
-            json: true
-        };
-        return this.executeRequest(request);
-    }
-    post(path, body, headers) {
-        const request = {
-            headers: Object.assign(Object.assign({}, this.defaultHeaders), { headers }),
-            uri: `${this.baseUrl}${path}`,
-            body,
-            method: __1.HttpMethod.POST,
-            json: true
-        };
-        return this.executeRequest(request);
-    }
-    put(path, body, headers) {
-        const request = {
-            headers: Object.assign(Object.assign({}, this.defaultHeaders), { headers }),
-            uri: `${this.baseUrl}${path}`,
-            body,
-            method: __1.HttpMethod.PUT,
-            json: true
-        };
-        return this.executeRequest(request);
-    }
-}
-exports.HttpClient = HttpClient;
+// /*
+//  * 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.
+//  */
+//
+// import {
+// 	__stringify,
+// 	StringMap
+// } from "@intuitionrobotics/ts-common";
+// import {
+// 	ErrorResponse,
+// 	HttpMethod
+// } from "../../..";
+// import {
+// 	ApiException,
+// 	promisifyRequest,
+// 	RequestOptions
+// } from "../../../backend";
+//
+// export const createFormData = (filename: string, buffer: Buffer) => ({file: {value: buffer, options: {filename}}});
+//
+// export class HttpClient {
+//
+// 	private defaultHeaders!: Headers;
+// 	private readonly baseUrl: string;
+//
+// 	constructor(baseUrl: string) {
+// 		this.baseUrl = baseUrl;
+// 	}
+//
+// 	setDefaultHeaders(defaultHeaders: Headers) {
+// 		this.defaultHeaders = defaultHeaders
+// 	}
+//
+// 	form(path: string, buffer: Buffer, headers?: Headers) {
+// 		const request: RequestOptions = {
+// 			headers: {...this.defaultHeaders, headers},
+// 			uri: `${this.baseUrl}${path}`,
+// 			formData: createFormData('logs.zip', buffer),
+// 			method: HttpMethod.POST,
+// 		};
+// 		return this.executeRequest(request);
+// 	}
+//
+// 	get(path: string, _params?: StringMap, headers?: Headers) {
+// 		let url = `${this.baseUrl}${path}`;
+//
+// 		let nextOperator = "?";
+// 		if (url.indexOf("?") !== -1)
+// 			nextOperator = "&";
+//
+// 		if (_params)
+// 			url = Object.keys(_params).reduce((fullUrl: string, paramKey: string) => {
+// 				const param: string | undefined = _params[paramKey];
+// 				if (!param)
+// 					return url;
+//
+// 				const temp = `${fullUrl}${nextOperator}${paramKey}=${encodeURIComponent(param)}`;
+// 				nextOperator = "&";
+// 				return temp;
+// 			}, url);
+//
+// 		const request: RequestOptions = {
+// 			headers: {...this.defaultHeaders, headers},
+// 			uri: `${url}`,
+// 			method: HttpMethod.GET,
+// 			json: true
+// 		};
+// 		return this.executeRequest(request);
+// 	}
+//
+// 	post(path: string, body: any, headers?: Headers) {
+// 		const request: RequestOptions = {
+// 			headers: {...this.defaultHeaders, ...headers},
+// 			uri: `${this.baseUrl}${path}`,
+// 			body,
+// 			method: HttpMethod.POST,
+// 			json: true
+// 		};
+// 		return this.executeRequest(request);
+//
+// 	}
+//
+// 	put(path: string, body: any, headers?: Headers) {
+// 		const request: RequestOptions = {
+// 			headers: {...this.defaultHeaders, headers},
+// 			uri: `${this.baseUrl}${path}`,
+// 			body,
+// 			method: HttpMethod.PUT,
+// 			json: true
+// 		};
+// 		return this.executeRequest(request);
+// 	}
+//
+// 	private executeRequest = async (body: RequestOptions) => {
+// 		const response = await promisifyRequest(body);
+// 		const statusCode = response.status;
+// 		if (statusCode >= 200 && statusCode < 300)
+// 			return response.data;
+//
+// 		const errorResponse: ErrorResponse<any> = response.data;
+// 		if (!errorResponse)
+// 			throw new ApiException(statusCode, `Http request failed without error message: ${__stringify(body, true)}`);
+//
+// 		throw new ApiException<any>(statusCode, `Http request failed: ${errorResponse} \n For Request: ${__stringify(body, true)}`);
+// 	};
+// }
 //# sourceMappingURL=HttpClient.js.map

package/app-frontend/modules/http/HttpClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../../../src/main/app-frontend/modules/http/HttpClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../../../src/main/app-frontend/modules/http/HttpClient.ts"],"names":[],"mappings":";AAAA,KAAK;AACL,+CAA+C;AAC/C,KAAK;AACL,yFAAyF;AACzF,gDAAgD;AAChD,KAAK;AACL,2CAA2C;AAC3C,KAAK;AACL,qEAAqE;AACrE,sEAAsE;AACtE,6CAA6C;AAC7C,KAAK;AACL,oDAAoD;AACpD,KAAK;AACL,yEAAyE;AACzE,uEAAuE;AACvE,8EAA8E;AAC9E,yEAAyE;AACzE,oCAAoC;AACpC,MAAM;AACN,EAAE;AACF,WAAW;AACX,gBAAgB;AAChB,aAAa;AACb,yCAAyC;AACzC,WAAW;AACX,kBAAkB;AAClB,cAAc;AACd,qBAAqB;AACrB,WAAW;AACX,iBAAiB;AACjB,qBAAqB;AACrB,kBAAkB;AAClB,6BAA6B;AAC7B,EAAE;AACF,sHAAsH;AACtH,EAAE;AACF,4BAA4B;AAC5B,EAAE;AACF,qCAAqC;AACrC,qCAAqC;AACrC,EAAE;AACF,kCAAkC;AAClC,4BAA4B;AAC5B,KAAK;AACL,EAAE;AACF,gDAAgD;AAChD,yCAAyC;AACzC,KAAK;AACL,EAAE;AACF,2DAA2D;AAC3D,sCAAsC;AACtC,iDAAiD;AACjD,oCAAoC;AACpC,mDAAmD;AACnD,8BAA8B;AAC9B,OAAO;AACP,yCAAyC;AACzC,KAAK;AACL,EAAE;AACF,+DAA+D;AAC/D,wCAAwC;AACxC,EAAE;AACF,4BAA4B;AAC5B,iCAAiC;AACjC,yBAAyB;AACzB,EAAE;AACF,iBAAiB;AACjB,gFAAgF;AAChF,2DAA2D;AAC3D,kBAAkB;AAClB,mBAAmB;AACnB,EAAE;AACF,wFAAwF;AACxF,0BAA0B;AAC1B,mBAAmB;AACnB,cAAc;AACd,EAAE;AACF,sCAAsC;AACtC,iDAAiD;AACjD,oBAAoB;AACpB,6BAA6B;AAC7B,gBAAgB;AAChB,OAAO;AACP,yCAAyC;AACzC,KAAK;AACL,EAAE;AACF,sDAAsD;AACtD,sCAAsC;AACtC,oDAAoD;AACpD,oCAAoC;AACpC,WAAW;AACX,8BAA8B;AAC9B,gBAAgB;AAChB,OAAO;AACP,yCAAyC;AACzC,EAAE;AACF,KAAK;AACL,EAAE;AACF,qDAAqD;AACrD,sCAAsC;AACtC,iDAAiD;AACjD,oCAAoC;AACpC,WAAW;AACX,6BAA6B;AAC7B,gBAAgB;AAChB,OAAO;AACP,yCAAyC;AACzC,KAAK;AACL,EAAE;AACF,8DAA8D;AAC9D,mDAAmD;AACnD,wCAAwC;AACxC,+CAA+C;AAC/C,2BAA2B;AAC3B,EAAE;AACF,6DAA6D;AAC7D,wBAAwB;AACxB,kHAAkH;AAClH,EAAE;AACF,iIAAiI;AACjI,MAAM;AACN,IAAI"}

package/backend.d.ts

@@ -15,4 +15,3 @@ export * from "./app-backend/utils/LogClient_File";
 export * from "./app-backend/utils/file";
 export * from "./app-backend/exceptions";
 export * from "./app-backend/core/Storm";
-export * from "./app-frontend/types/request";

package/backend.js

@@ -47,5 +47,4 @@ __exportStar(require("./app-backend/utils/LogClient_File"), exports);
 __exportStar(require("./app-backend/utils/file"), exports);
 __exportStar(require("./app-backend/exceptions"), exports);
 __exportStar(require("./app-backend/core/Storm"), exports);
-__exportStar(require("./app-frontend/types/request"), exports);
 //# sourceMappingURL=backend.js.map

package/backend.js.map

@@ -1 +1 @@
-{"version":3,"file":"backend.js","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH,gFAA8D;AAC9D,0EAAwD;AACxD,yEAAuD;AACvD,iFAA+D;AAC/D,6EAA2D;AAC3D,0EAAwD;AACxD,0EAAwD;AACxD,6EAA2D;AAC3D,mEAAiD;AACjD,qEAAmD;AACnD,wEAAsD;AACtD,oEAAkD;AAClD,4DAA0C;AAC1C,qEAAmD;AACnD,2DAAyC;AACzC,2DAAyC;AACzC,2DAAyC;AACzC,+DAA6C"}
+{"version":3,"file":"backend.js","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH,gFAA8D;AAC9D,0EAAwD;AACxD,yEAAuD;AACvD,iFAA+D;AAC/D,6EAA2D;AAC3D,0EAAwD;AACxD,0EAAwD;AACxD,6EAA2D;AAC3D,mEAAiD;AACjD,qEAAmD;AACnD,wEAAsD;AACtD,oEAAkD;AAClD,4DAA0C;AAC1C,qEAAmD;AACnD,2DAAyC;AACzC,2DAAyC;AACzC,2DAAyC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuitionrobotics/thunderstorm",
-  "version": "0.41.76",
+  "version": "0.42.2",
   "description": "Thunderstorm",
   "keywords": [
     "IR",
@@ -27,11 +27,11 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@intuitionrobotics/firebase": "~0.41.0",
-    "@intuitionrobotics/testelot": "~0.41.0",
-    "@intuitionrobotics/ts-common": "~0.41.0",
+    "@intuitionrobotics/firebase": "~0.42.0",
+    "@intuitionrobotics/testelot": "~0.42.0",
+    "@intuitionrobotics/ts-common": "~0.42.0",
     "abort-controller": "^3.0.0",
-    "axios": "^0.21.0",
+    "axios": "^0.27.2",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
@@ -45,7 +45,6 @@
     "react-router": "^5.1.2",
     "react-router-dom": "^5.1.2",
     "react-select": "^4.0.0",
-    "request": "^2.88.0",
     "stream-browserify": "^3.0.0"
   },
   "devDependencies": {
@@ -60,7 +59,6 @@
     "@types/react-router": "^5.1.4",
     "@types/react-router-dom": "^5.1.3",
     "@types/react-select": "^4.0.0",
-    "@types/request": "^2.48.1",
     "body-parser": "^1.19.0",
     "compression": "^1.7.4",
     "csstype": "^3.0.0",

package/app-frontend/types/request.d.ts

@@ -1,2 +0,0 @@
-import { CoreOptions, UriOptions } from "request";
-export declare type RequestOptions = CoreOptions & UriOptions;

package/app-frontend/types/request.js

@@ -1,23 +0,0 @@
-"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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=request.js.map

package/app-frontend/types/request.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/main/app-frontend/types/request.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG"}