@intuitionrobotics/file-upload 0.43.4 → 0.44.1

package/app-backend/api/_upload.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
-module.exports = new backend_1.RouteResolver(require, __dirname);
+const HttpServer_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/HttpServer");
+module.exports = new HttpServer_1.RouteResolver(require, __dirname);
 //# sourceMappingURL=_upload.js.map

package/app-backend/api/_upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"_upload.js","sourceRoot":"","sources":["../../../src/main/app-backend/api/_upload.ts"],"names":[],"mappings":";;AAAA,qEAAsE;AAEtE,MAAM,CAAC,OAAO,GAAG,IAAI,uBAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"_upload.js","sourceRoot":"","sources":["../../../src/main/app-backend/api/_upload.ts"],"names":[],"mappings":";;AAAA,sGAAoG;AAEpG,MAAM,CAAC,OAAO,GAAG,IAAI,0BAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC"}

package/app-backend/api/v1/upload/get-url.js

@@ -1,22 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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) {
@@ -27,9 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
+const server_api_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api");
 const UploaderModule_1 = require("../../../modules/UploaderModule");
-class ServerApi_GetUploadUrl extends backend_1.ServerApi_Post {
+class ServerApi_GetUploadUrl extends server_api_1.ServerApi_Post {
     constructor() {
         super('get-url');
     }

package/app-backend/api/v1/upload/get-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-url.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/upload/get-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;AAEH,qEAIiD;AAMjD,oEAA+D;AAG/D,MAAM,sBACL,SAAQ,wBAAgC;IACxC;QACC,KAAK,CAAC,SAAS,CAAC,CAAA;IACjB,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAwB,EAAE,IAAwB;;YACzH,OAAO,+BAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KAAA;CACD;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,sBAAsB,EAAE,CAAA"}
+{"version":3,"file":"get-url.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/upload/get-url.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sGAAkH;AAIlH,oEAA+D;AAE/D,MAAM,sBACF,SAAQ,2BAAgC;IACxC;QACI,KAAK,CAAC,SAAS,CAAC,CAAA;IACpB,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAwB,EAAE,IAAwB;;YACtH,OAAO,+BAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,sBAAsB,EAAE,CAAA"}

package/app-backend/core/module-pack.d.ts

@@ -1 +1 @@
-export declare const Backend_ModulePack_Uploader: (import("../modules/UploaderTempFileModule").UploaderTempFileModule_Class | import("@intuitionrobotics/push-pub-sub/backend").PushPubSubModule_Class | import("@intuitionrobotics/push-pub-sub/backend").ScheduledCleanup_Class | import("../modules/BucketListener").BucketListener_Class | import("../modules/UploaderModule").UploaderModule_Class | import("../modules/ServerUploaderModule").ServerUploaderModule_Class)[];
+export declare const Backend_ModulePack_Uploader: (import("../modules/UploaderTempFileModule").UploaderTempFileModule_Class | import("../modules/BucketListener").BucketListener_Class | import("@intuitionrobotics/push-pub-sub/app-backend/modules/PushPubSubModule").PushPubSubModule_Class | import("../modules/UploaderModule").UploaderModule_Class | import("@intuitionrobotics/push-pub-sub/app-backend/modules/ScheduledPushCleanup").ScheduledCleanup_Class | import("../modules/ServerUploaderModule").ServerUploaderModule_Class)[];

package/app-backend/core/module-pack.js

@@ -22,10 +22,10 @@ exports.Backend_ModulePack_Uploader = void 0;
 const UploaderModule_1 = require("../modules/UploaderModule");
 const UploaderTempFileModule_1 = require("../modules/UploaderTempFileModule");
 const BucketListener_1 = require("../modules/BucketListener");
-const backend_1 = require("@intuitionrobotics/push-pub-sub/backend");
+const module_pack_1 = require("@intuitionrobotics/push-pub-sub/app-backend/core/module-pack");
 const ServerUploaderModule_1 = require("../modules/ServerUploaderModule");
 exports.Backend_ModulePack_Uploader = [
-    ...backend_1.Backend_ModulePack_PushPubSub,
+    ...module_pack_1.Backend_ModulePack_PushPubSub,
     ServerUploaderModule_1.ServerUploaderModule,
     UploaderModule_1.UploaderModule,
     UploaderTempFileModule_1.UploaderTempFileModule,

package/app-backend/core/module-pack.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/module-pack.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAEH,8DAAyD;AACzD,8EAAyE;AACzE,8DAAyD;AACzD,qEAAsF;AACtF,0EAAqE;AAExD,QAAA,2BAA2B,GAAG;IAC1C,GAAG,uCAA6B;IAChC,2CAAoB;IACpB,+BAAc;IACd,+CAAsB;IACtB,+BAAc;CACd,CAAC"}
+{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/module-pack.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAEH,8DAAyD;AACzD,8EAAyE;AACzE,8DAAyD;AACzD,8FAA2G;AAC3G,0EAAqE;AAExD,QAAA,2BAA2B,GAAG;IACvC,GAAG,2CAA6B;IAChC,2CAAoB;IACpB,+BAAc;IACd,+CAAsB;IACtB,+BAAc;CACjB,CAAC"}

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

@@ -1,4 +1,4 @@
-import { Firebase_StorageFunction } from "@intuitionrobotics/firebase/backend-functions";
+import { Firebase_StorageFunction } from "@intuitionrobotics/firebase/app-backend/functions/firebase-function";
 import { ObjectMetadata } from "firebase-functions/lib/v1/providers/storage";
 import { EventContext } from "firebase-functions";
 export interface OnFileUploaded {

package/app-backend/modules/BucketListener.js

@@ -1,21 +1,4 @@
 "use strict";
-/*
- * A backend boilerplate with example apis
- *
- * 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) {
@@ -27,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BucketListener = exports.BucketListener_Class = void 0;
-const backend_functions_1 = require("@intuitionrobotics/firebase/backend-functions");
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-const dispatcher_onFileUploaded = new ts_common_1.Dispatcher("__onFileUploaded");
-class BucketListener_Class extends backend_functions_1.Firebase_StorageFunction {
+const firebase_function_1 = require("@intuitionrobotics/firebase/app-backend/functions/firebase-function");
+const dispatcher_1 = require("@intuitionrobotics/ts-common/core/dispatcher");
+const dispatcher_onFileUploaded = new dispatcher_1.Dispatcher("__onFileUploaded");
+class BucketListener_Class extends firebase_function_1.Firebase_StorageFunction {
     constructor() {
         super("BucketListener");
     }

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

@@ -1 +1 @@
-{"version":3,"file":"BucketListener.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/BucketListener.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,qFAAuF;AAGvF,4DAAwD;AAMxD,MAAM,yBAAyB,GAAG,IAAI,sBAAU,CAAqC,kBAAkB,CAAC,CAAC;AAGzG,MAAa,oBACZ,SAAQ,4CAAwB;IAChC;QACC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACzB,CAAC;IAGD,IAAI;QACH,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,aAAa;QACb,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;IAEK,UAAU,CAAC,MAAsB,EAAE,OAAqB;;YAC7D,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;YAC7B,MAAM,yBAAyB,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC;KAAA;CAED;AArBD,oDAqBC;AAEY,QAAA,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"BucketListener.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/BucketListener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2GAA6G;AAG7G,6EAAwE;AAMxE,MAAM,yBAAyB,GAAG,IAAI,uBAAU,CAAqC,kBAAkB,CAAC,CAAC;AAGzG,MAAa,oBACT,SAAQ,4CAAwB;IAChC;QACI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC5B,CAAC;IAGD,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,aAAa;QACb,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAEK,UAAU,CAAC,MAAsB,EAAE,OAAqB;;YAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;YAC7B,MAAM,yBAAyB,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACzC,CAAC;KAAA;CAEJ;AArBD,oDAqBC;AAEY,QAAA,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC"}

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

@@ -1,7 +1,8 @@
 /// <reference types="node" />
-import { BaseUploaderFile, TempSecureUrl, Request_Uploader } from "../../shared/types";
+import { BaseUploaderFile, Request_Uploader, TempSecureUrl } from "../../shared/types";
 import { BaseUploaderModule_Class } from "../../shared/modules/BaseUploaderModule";
-import { Axios_RequestConfig, AxiosHttpModule_Class } from "@intuitionrobotics/thunderstorm/backend";
+import { AxiosHttpModule_Class } from "@intuitionrobotics/thunderstorm/app-backend/modules/http/AxiosHttpModule";
+import { Axios_RequestConfig } from "@intuitionrobotics/thunderstorm/app-backend/modules/http/types";
 export declare type ServerFilesToUpload = Request_Uploader & {
     file: Buffer;
 };

package/app-backend/modules/ServerUploaderModule.js

@@ -1,22 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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) {
@@ -29,14 +11,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerUploaderModule = exports.ServerUploaderModule_Class = void 0;
 const BaseUploaderModule_1 = require("../../shared/modules/BaseUploaderModule");
-const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
+const AxiosHttpModule_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/http/AxiosHttpModule");
 class ServerUploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class {
     constructor() {
-        super(backend_1.AxiosHttpModule, "ServerUploaderModule");
+        super(AxiosHttpModule_1.AxiosHttpModule, "ServerUploaderModule");
     }
     init() {
         super.init();
-        backend_1.AxiosHttpModule.setRequestOption(this.config.requestConfig);
+        AxiosHttpModule_1.AxiosHttpModule.setRequestOption(this.config.requestConfig);
     }
     upload(files) {
         return this.uploadImpl(files);

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

@@ -1 +1 @@
-{"version":3,"file":"ServerUploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ServerUploaderModule.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAOH,gFAEiD;AACjD,qEAIiD;AAMjD,MAAa,0BACZ,SAAQ,6CAAuF;IAE/F;QACC,KAAK,CAAC,yBAAe,EAAE,sBAAsB,CAAC,CAAC;IAChD,CAAC;IAED,IAAI;QACH,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,yBAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,KAA4B;QAClC,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEe,eAAe,CAAC,WAA4B;;YAC3D,eAAe;YACf,kBAAkB;QACnB,CAAC;KAAA;CACD;AApBD,gEAoBC;AAEY,QAAA,oBAAoB,GAAG,IAAI,0BAA0B,EAAE,CAAC"}
+{"version":3,"file":"ServerUploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ServerUploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gFAAkF;AAClF,8GAGkF;AAOlF,MAAa,0BACT,SAAQ,6CAAuF;IAE/F;QACI,KAAK,CAAC,iCAAe,EAAE,sBAAsB,CAAC,CAAC;IACnD,CAAC;IAED,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,iCAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,KAA4B;QAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAEe,eAAe,CAAC,WAA4B;;YACxD,eAAe;YACf,kBAAkB;QACtB,CAAC;KAAA;CACJ;AApBD,gEAoBC;AAEY,QAAA,oBAAoB,GAAG,IAAI,0BAA0B,EAAE,CAAC"}

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

@@ -1,7 +1,7 @@
-import { Module } from "@intuitionrobotics/ts-common";
-import { FileWrapper } from "@intuitionrobotics/firebase/backend";
 import { BaseUploaderFile, DB_Temp_File, TempSecureUrl } from "../../shared/types";
 import { OnFileUploaded } from "./BucketListener";
+import { FileWrapper } from "@intuitionrobotics/firebase/app-backend/storage/StorageWrapper";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
 export declare const Temp_Path = "files-temp";
 declare type Config = {
     bucketName?: string;

package/app-backend/modules/UploaderModule.js

@@ -10,31 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploaderModule = exports.UploaderModule_Class = exports.Temp_Path = void 0;
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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 backend_1 = require("@intuitionrobotics/firebase/backend");
 const types_1 = require("../../shared/types");
 const UploaderTempFileModule_1 = require("./UploaderTempFileModule");
-const backend_2 = require("@intuitionrobotics/push-pub-sub/backend");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-backend/FirebaseModule");
+const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const PushPubSubModule_1 = require("@intuitionrobotics/push-pub-sub/app-backend/modules/PushPubSubModule");
 exports.Temp_Path = "files-temp";
-class UploaderModule_Class extends ts_common_1.Module {
+class UploaderModule_Class extends module_1.Module {
     constructor() {
         super("UploaderModule");
         this.setPostProcessor = (validator) => {
@@ -43,12 +28,12 @@ class UploaderModule_Class extends ts_common_1.Module {
         this.getProcessor = (k) => {
             const postProcessorElement = this.postProcessor[k];
             if (!postProcessorElement)
-                throw new ts_common_1.ImplementationMissingException(`Missing validator for type ${k}`);
+                throw new exceptions_1.ImplementationMissingException(`Missing validator for type ${k}`);
             return postProcessorElement;
         };
         this.fileUploaded = (filePath) => __awaiter(this, void 0, void 0, function* () {
             if (!filePath)
-                throw new ts_common_1.ThisShouldNotHappenException("Missing file path");
+                throw new exceptions_1.ThisShouldNotHappenException("Missing file path");
             this.logInfo(`Looking for file with path ${filePath}`);
             // I use collection and not the module directly since I want to handle failure my way
             const tempMeta = yield UploaderTempFileModule_1.UploaderTempFileModule.collection.queryUnique({ where: { path: filePath } });
@@ -81,7 +66,7 @@ class UploaderModule_Class extends ts_common_1.Module {
         this.notifyFrontend = (feId, result, message, cause) => __awaiter(this, void 0, void 0, function* () {
             cause && this.logWarning(cause);
             const data = { message, result, cause };
-            yield backend_2.PushPubSubModule.pushToKey(types_1.fileUploadedKey, { feId }, data);
+            yield PushPubSubModule_1.PushPubSubModule.pushToKey(types_1.fileUploadedKey, { feId }, data);
         });
     }
     __onFileUploaded(filePath) {
@@ -91,8 +76,8 @@ class UploaderModule_Class extends ts_common_1.Module {
     }
     init() {
         if (!this.postProcessor)
-            throw new ts_common_1.ImplementationMissingException("You must set a postProcessor for the UploaderModule");
-        this.storage = backend_1.FirebaseModule.createAdminSession(this.config.uploaderProjectId).getStorage();
+            throw new exceptions_1.ImplementationMissingException("You must set a postProcessor for the UploaderModule");
+        this.storage = FirebaseModule_1.FirebaseModule.createAdminSession(this.config.uploaderProjectId).getStorage();
     }
     getUrl(body, pathPrefix = exports.Temp_Path) {
         var _a;
@@ -102,7 +87,7 @@ class UploaderModule_Class extends ts_common_1.Module {
             return Promise.all(body.map((_file) => __awaiter(this, void 0, void 0, function* () {
                 const key = _file.key || _file.mimeType;
                 this.getProcessor(key);
-                const _id = ts_common_1.generateHex(32);
+                const _id = random_tools_1.generateHex(32);
                 const path = `${pathPrefix}/${_id}`;
                 const instance = {
                     _id,
@@ -111,7 +96,7 @@ class UploaderModule_Class extends ts_common_1.Module {
                     mimeType: _file.mimeType,
                     key,
                     path,
-                    _audit: ts_common_1.auditBy("be-stub"),
+                    _audit: date_time_tools_1.auditBy("be-stub"),
                     bucketName: bucket.bucketName
                 };
                 if (_file.public)
@@ -120,7 +105,7 @@ class UploaderModule_Class extends ts_common_1.Module {
                     instance.metadata = _file.metadata;
                 const temp = yield UploaderTempFileModule_1.UploaderTempFileModule.upsert(instance);
                 const file = yield bucket.getFile(temp.path);
-                const url = yield file.getWriteSecuredUrl(_file.mimeType, ts_common_1.Hour);
+                const url = yield file.getWriteSecuredUrl(_file.mimeType, date_time_tools_1.Hour);
                 return {
                     secureUrl: url.securedUrl,
                     tempDoc: temp

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

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

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

@@ -1,9 +1,9 @@
-import { TypeValidator } from "@intuitionrobotics/ts-common";
-import { ServerApi } from "@intuitionrobotics/thunderstorm/backend";
-import { BaseDB_ApiGenerator } from "@intuitionrobotics/db-api-generator/backend";
+import { TypeValidator } from "@intuitionrobotics/ts-common/validator/validator";
+import { ServerApi } from "@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api";
+import { BaseDB_ApiGenerator } from "@intuitionrobotics/db-api-generator/app-backend/BaseDB_ApiGenerator";
 import { DB_Temp_File } from "../../shared/types";
 export declare const TEMP_COLLECTION = "temp-files-upload";
-export declare const validateName: import("@intuitionrobotics/ts-common").Validator<string>;
+export declare const validateName: import("@intuitionrobotics/ts-common/validator/validator").Validator<string>;
 export declare class UploaderTempFileModule_Class extends BaseDB_ApiGenerator<DB_Temp_File> {
     static _validator: TypeValidator<DB_Temp_File>;
     constructor();

package/app-backend/modules/UploaderTempFileModule.js

@@ -1,29 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploaderTempFileModule = exports.UploaderTempFileModule_Class = exports.validateName = exports.TEMP_COLLECTION = void 0;
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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 backend_1 = require("@intuitionrobotics/db-api-generator/backend");
+const validator_1 = require("@intuitionrobotics/ts-common/validator/validator");
+const BaseDB_ApiGenerator_1 = require("@intuitionrobotics/db-api-generator/app-backend/BaseDB_ApiGenerator");
 exports.TEMP_COLLECTION = "temp-files-upload";
-exports.validateName = ts_common_1.validateRegexp(/^.{3,}$/);
-class UploaderTempFileModule_Class extends backend_1.BaseDB_ApiGenerator {
+exports.validateName = validator_1.validateRegexp(/^.{3,}$/);
+class UploaderTempFileModule_Class extends BaseDB_ApiGenerator_1.BaseDB_ApiGenerator {
     constructor() {
         super(exports.TEMP_COLLECTION, UploaderTempFileModule_Class._validator, "temp-files", "UploaderTempFileModule");
     }
@@ -33,14 +15,14 @@ class UploaderTempFileModule_Class extends backend_1.BaseDB_ApiGenerator {
 }
 exports.UploaderTempFileModule_Class = UploaderTempFileModule_Class;
 UploaderTempFileModule_Class._validator = {
-    _id: backend_1.validateUniqueId,
+    _id: BaseDB_ApiGenerator_1.validateUniqueId,
     name: exports.validateName,
-    feId: ts_common_1.validateExists(true),
-    mimeType: ts_common_1.validateExists(true),
-    key: ts_common_1.validateExists(true),
-    path: ts_common_1.validateExists(true),
-    _audit: ts_common_1.auditValidator(),
-    bucketName: ts_common_1.validateExists(true),
+    feId: validator_1.validateExists(true),
+    mimeType: validator_1.validateExists(true),
+    key: validator_1.validateExists(true),
+    path: validator_1.validateExists(true),
+    _audit: validator_1.auditValidator(),
+    bucketName: validator_1.validateExists(true),
     public: undefined,
     metadata: undefined
 };

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

@@ -1 +1 @@
-{"version":3,"file":"UploaderTempFileModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderTempFileModule.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,4DAKsC;AAEtC,yEAGqD;AAGxC,QAAA,eAAe,GAAG,mBAAmB,CAAC;AAEtC,QAAA,YAAY,GAAG,0BAAc,CAAC,SAAS,CAAC,CAAC;AAEtD,MAAa,4BACZ,SAAQ,6BAAiC;IAczC;QACC,KAAK,CAAC,uBAAe,EAAE,4BAA4B,CAAC,UAAU,EAAE,YAAY,EAAE,wBAAwB,CAAC,CAAC;IACzG,CAAC;IAED,IAAI,CAAC,QAAiB;QACrB,OAAO,EAAE,CAAC;IACX,CAAC;;AArBF,oEAsBC;AApBO,uCAAU,GAAgC;IAChD,GAAG,EAAE,0BAAgB;IACrB,IAAI,EAAE,oBAAY;IAClB,IAAI,EAAE,0BAAc,CAAC,IAAI,CAAC;IAC1B,QAAQ,EAAE,0BAAc,CAAC,IAAI,CAAC;IAC9B,GAAG,EAAE,0BAAc,CAAC,IAAI,CAAC;IACzB,IAAI,EAAE,0BAAc,CAAC,IAAI,CAAC;IAC1B,MAAM,EAAE,0BAAc,EAAE;IACxB,UAAU,EAAE,0BAAc,CAAC,IAAI,CAAC;IAChC,MAAM,EAAE,SAAS;IACjB,QAAQ,EAAE,SAAS;CACnB,CAAC;AAWU,QAAA,sBAAsB,GAAG,IAAI,4BAA4B,EAAE,CAAC"}
+{"version":3,"file":"UploaderTempFileModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderTempFileModule.ts"],"names":[],"mappings":";;;AAAA,gFAK0D;AAE1D,6GAG6E;AAGhE,QAAA,eAAe,GAAG,mBAAmB,CAAC;AAEtC,QAAA,YAAY,GAAG,0BAAc,CAAC,SAAS,CAAC,CAAC;AAEtD,MAAa,4BACT,SAAQ,yCAAiC;IAczC;QACI,KAAK,CAAC,uBAAe,EAAE,4BAA4B,CAAC,UAAU,EAAE,YAAY,EAAE,wBAAwB,CAAC,CAAC;IAC5G,CAAC;IAED,IAAI,CAAC,QAAiB;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;;AArBL,oEAsBC;AApBU,uCAAU,GAAgC;IAC7C,GAAG,EAAE,sCAAgB;IACrB,IAAI,EAAE,oBAAY;IAClB,IAAI,EAAE,0BAAc,CAAC,IAAI,CAAC;IAC1B,QAAQ,EAAE,0BAAc,CAAC,IAAI,CAAC;IAC9B,GAAG,EAAE,0BAAc,CAAC,IAAI,CAAC;IACzB,IAAI,EAAE,0BAAc,CAAC,IAAI,CAAC;IAC1B,MAAM,EAAE,0BAAc,EAAE;IACxB,UAAU,EAAE,0BAAc,CAAC,IAAI,CAAC;IAChC,MAAM,EAAE,SAAS;IACjB,QAAQ,EAAE,SAAS;CACtB,CAAC;AAWO,QAAA,sBAAsB,GAAG,IAAI,4BAA4B,EAAE,CAAC"}

package/app-frontend/core/module-pack.d.ts

@@ -1 +1 @@
-export declare const Frontend_ModulePack_Uploader: (import("@intuitionrobotics/push-pub-sub/frontend").PushPubSubModule_Class | import("@intuitionrobotics/push-pub-sub/frontend").NotificationsModule_Class | import("@intuitionrobotics/firebase/frontend").FirebaseModule_Class | import("../modules/UploaderModule").UploaderModule_Class)[];
+export declare const Frontend_ModulePack_Uploader: (import("@intuitionrobotics/push-pub-sub/app-frontend/modules/PushPubSubModule").PushPubSubModule_Class | import("../modules/UploaderModule").UploaderModule_Class | import("@intuitionrobotics/push-pub-sub/app-frontend/modules/NotificationModule").NotificationsModule_Class | import("@intuitionrobotics/firebase/app-frontend/FirebaseModule").FirebaseModule_Class)[];

package/app-frontend/core/module-pack.js

@@ -1,28 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Frontend_ModulePack_Uploader = void 0;
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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 UploaderModule_1 = require("../modules/UploaderModule");
-const frontend_1 = require("@intuitionrobotics/push-pub-sub/frontend");
+const module_pack_1 = require("@intuitionrobotics/push-pub-sub/app-frontend/core/module-pack");
 exports.Frontend_ModulePack_Uploader = [
-    ...frontend_1.Frontend_ModulePack_PushPubSub,
+    ...module_pack_1.Frontend_ModulePack_PushPubSub,
     UploaderModule_1.UploaderModule
 ];
 //# sourceMappingURL=module-pack.js.map

package/app-frontend/core/module-pack.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,8DAAyD;AACzD,uEAAwF;AAE3E,QAAA,4BAA4B,GAAG;IAC3C,GAAG,yCAA8B;IACjC,+BAAc;CACd,CAAC"}
+{"version":3,"file":"module-pack.js","sourceRoot":"","sources":["../../../src/main/app-frontend/core/module-pack.ts"],"names":[],"mappings":";;;AAAA,8DAAyD;AACzD,+FAA6G;AAEhG,QAAA,4BAA4B,GAAG;IACxC,GAAG,4CAA8B;IACjC,+BAAc;CACjB,CAAC"}

package/app-frontend/modules/UploaderModule.d.ts

@@ -1,8 +1,9 @@
-import { ThunderDispatcher, XhrHttpModule_Class } from "@intuitionrobotics/thunderstorm/frontend";
 import { BaseUploaderFile, Push_FileUploaded, TempSecureUrl } from "../../shared/types";
-import { OnPushMessageReceived } from "@intuitionrobotics/push-pub-sub/frontend";
 import { BaseUploaderModule_Class, OnFileStatusChanged } from "../../shared/modules/BaseUploaderModule";
-import { DB_Notifications } from "@intuitionrobotics/push-pub-sub";
+import { XhrHttpModule_Class } from "@intuitionrobotics/thunderstorm/app-frontend/modules/http/XhrHttpModule";
+import { OnPushMessageReceived } from "@intuitionrobotics/push-pub-sub/app-frontend/modules/PushPubSubModule";
+import { ThunderDispatcher } from "@intuitionrobotics/thunderstorm/app-frontend/core/thunder-dispatcher";
+import { DB_Notifications } from "@intuitionrobotics/push-pub-sub/shared/types";
 export declare class UploaderModule_Class extends BaseUploaderModule_Class<XhrHttpModule_Class> implements OnPushMessageReceived<Push_FileUploaded> {
     protected readonly dispatch_fileStatusChange: ThunderDispatcher<OnFileStatusChanged, "__onFileStatusChanged">;
     constructor();

package/app-frontend/modules/UploaderModule.js

@@ -10,33 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploaderModule = exports.UploaderModule_Class = void 0;
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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 frontend_1 = require("@intuitionrobotics/thunderstorm/frontend");
 const types_1 = require("../../shared/types");
-const frontend_2 = require("@intuitionrobotics/push-pub-sub/frontend");
 const BaseUploaderModule_1 = require("../../shared/modules/BaseUploaderModule");
-const ts_common_1 = require("@intuitionrobotics/ts-common");
+const XhrHttpModule_1 = require("@intuitionrobotics/thunderstorm/app-frontend/modules/http/XhrHttpModule");
+const PushPubSubModule_1 = require("@intuitionrobotics/push-pub-sub/app-frontend/modules/PushPubSubModule");
+const thunder_dispatcher_1 = require("@intuitionrobotics/thunderstorm/app-frontend/core/thunder-dispatcher");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
 class UploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class {
     constructor() {
-        super(frontend_1.XhrHttpModule, 'UploaderModule');
-        this.dispatch_fileStatusChange = new frontend_1.ThunderDispatcher("__onFileStatusChanged");
+        super(XhrHttpModule_1.XhrHttpModule, 'UploaderModule');
+        this.dispatch_fileStatusChange = new thunder_dispatcher_1.ThunderDispatcher("__onFileStatusChanged");
     }
     dispatchFileStatusChange(id) {
         this.dispatch_fileStatusChange.dispatchUI([id]);
@@ -55,8 +38,11 @@ class UploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class
     }
     subscribeToPush(toSubscribe) {
         return __awaiter(this, void 0, void 0, function* () {
-            frontend_2.PushPubSubModule.subscribeMulti(toSubscribe.map(r => ({ pushKey: types_1.fileUploadedKey, props: { feId: r.tempDoc.feId } })));
-            yield ts_common_1.timeout(ts_common_1.Second);
+            PushPubSubModule_1.PushPubSubModule.subscribeMulti(toSubscribe.map(r => ({
+                pushKey: types_1.fileUploadedKey,
+                props: { feId: r.tempDoc.feId }
+            })));
+            yield date_time_tools_1.timeout(date_time_tools_1.Second);
         });
     }
     __onMessageReceived(notification) {
@@ -72,7 +58,7 @@ class UploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class
                 this.setFileInfo((_b = notification.props) === null || _b === void 0 ? void 0 : _b.feId, "status", BaseUploaderModule_1.FileStatus.Error);
                 break;
         }
-        frontend_2.PushPubSubModule.unsubscribe({ pushKey: types_1.fileUploadedKey, props: notification.props });
+        PushPubSubModule_1.PushPubSubModule.unsubscribe({ pushKey: types_1.fileUploadedKey, props: notification.props });
     }
 }
 exports.UploaderModule_Class = UploaderModule_Class;

package/app-frontend/modules/UploaderModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/UploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,uEAIkD;AAClD,8CAM4B;AAC5B,uEAGkD;AAClD,gFAIiD;AAEjD,4DAGsC;AAEtC,MAAa,oBACZ,SAAQ,6CAA6C;IAKrD;QACC,KAAK,CAAC,wBAAa,EAAE,gBAAgB,CAAC,CAAC;QAHrB,8BAAyB,GAAG,IAAI,4BAAiB,CAA+C,uBAAuB,CAAC,CAAC;IAI5I,CAAC;IAES,wBAAwB,CAAC,EAAW;QAC7C,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,GAAY,EAAE,OAAiB;QACpD,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE;YACxC,OAAO;gBACN,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,GAAG;gBACH,IAAI;gBACJ,MAAM,EAAE,OAAO;aACf,CAAC;QACH,CAAC,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAEe,eAAe,CAAC,WAA4B;;YAC3D,2BAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC,OAAO,EAAE,uBAAe,EAAE,KAAK,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAC,EAAC,CAAC,CAAC,CAAC,CAAC;YACnH,MAAM,mBAAO,CAAC,kBAAM,CAAC,CAAC;QACvB,CAAC;KAAA;IAED,mBAAmB,CAAC,YAA8B;;QACjD,IAAI,CAAC,OAAO,CAAC,sCAAsC,EAAE,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAClH,IAAI,YAAY,CAAC,OAAO,KAAK,uBAAe;YAC3C,OAAO;QAER,QAAQ,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE;YACjC,KAAK,oBAAY,CAAC,OAAO;gBACxB,IAAI,CAAC,WAAW,CAAC,MAAA,YAAY,CAAC,KAAK,0CAAE,IAAc,EAAE,QAAQ,EAAE,+BAAU,CAAC,SAAS,CAAC,CAAC;gBACrF,MAAM;YACP,KAAK,oBAAY,CAAC,OAAO;gBACxB,IAAI,CAAC,WAAW,CAAC,MAAA,YAAY,CAAC,KAAK,0CAAE,IAAc,EAAE,QAAQ,EAAE,+BAAU,CAAC,KAAK,CAAC,CAAC;gBACjF,MAAM;SACP;QAED,2BAAgB,CAAC,WAAW,CAAC,EAAC,OAAO,EAAE,uBAAe,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAC,CAAC,CAAC;IACrF,CAAC;CACD;AAhDD,oDAgDC;AAEY,QAAA,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/UploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAqH;AACrH,gFAAkH;AAClH,2GAGiF;AACjF,4GAG+E;AAC/E,6GAAuG;AACvG,wFAAmF;AAGnF,MAAa,oBACT,SAAQ,6CAA6C;IAKrD;QACI,KAAK,CAAC,6BAAa,EAAE,gBAAgB,CAAC,CAAC;QAHxB,8BAAyB,GAAG,IAAI,sCAAiB,CAA+C,uBAAuB,CAAC,CAAC;IAI5I,CAAC;IAES,wBAAwB,CAAC,EAAW;QAC1C,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,GAAY,EAAE,OAAiB;QACjD,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE;YACrC,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,GAAG;gBACH,IAAI;gBACJ,MAAM,EAAE,OAAO;aAClB,CAAC;QACN,CAAC,CAAC,CAAC,CAAC,CAAC;IACT,CAAC;IAEe,eAAe,CAAC,WAA4B;;YACxD,mCAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClD,OAAO,EAAE,uBAAe;gBACxB,KAAK,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAC;aAChC,CAAC,CAAC,CAAC,CAAC;YACL,MAAM,yBAAO,CAAC,wBAAM,CAAC,CAAC;QAC1B,CAAC;KAAA;IAED,mBAAmB,CAAC,YAA8B;;QAC9C,IAAI,CAAC,OAAO,CAAC,sCAAsC,EAAE,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAClH,IAAI,YAAY,CAAC,OAAO,KAAK,uBAAe;YACxC,OAAO;QAEX,QAAQ,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE;YAC9B,KAAK,oBAAY,CAAC,OAAO;gBACrB,IAAI,CAAC,WAAW,CAAC,MAAA,YAAY,CAAC,KAAK,0CAAE,IAAc,EAAE,QAAQ,EAAE,+BAAU,CAAC,SAAS,CAAC,CAAC;gBACrF,MAAM;YACV,KAAK,oBAAY,CAAC,OAAO;gBACrB,IAAI,CAAC,WAAW,CAAC,MAAA,YAAY,CAAC,KAAK,0CAAE,IAAc,EAAE,QAAQ,EAAE,+BAAU,CAAC,KAAK,CAAC,CAAC;gBACjF,MAAM;SACb;QAED,mCAAgB,CAAC,WAAW,CAAC,EAAC,OAAO,EAAE,uBAAe,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAC,CAAC,CAAC;IACxF,CAAC;CACJ;AAnDD,oDAmDC;AAEY,QAAA,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC"}

package/index.d.ts

@@ -1 +0,0 @@
-export * from './shared/types';

package/index.js

@@ -1,32 +1,2 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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("./shared/types"), exports);
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAEH,iDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuitionrobotics/file-upload",
-  "version": "0.43.4",
+  "version": "0.44.1",
   "description": "File Uploader - Express & Typescript based backend framework",
   "keywords": [
     "IR",
@@ -29,15 +29,15 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@intuitionrobotics/ts-common": "~0.43.0",
-    "@intuitionrobotics/thunderstorm": "~0.43.0",
-    "@intuitionrobotics/firebase": "~0.43.0",
-    "@intuitionrobotics/db-api-generator": "~0.43.0",
-    "@intuitionrobotics/push-pub-sub": "~0.43.0",
+    "@intuitionrobotics/ts-common": "~0.44.0",
+    "@intuitionrobotics/thunderstorm": "~0.44.0",
+    "@intuitionrobotics/firebase": "~0.44.0",
+    "@intuitionrobotics/db-api-generator": "~0.44.0",
+    "@intuitionrobotics/push-pub-sub": "~0.44.0",
     "firebase-functions": "^4.4.0"
   },
   "devDependencies": {
-    "@intuitionrobotics/testelot": "~0.43.0",
+    "@intuitionrobotics/testelot": "~0.44.0",
     "@types/node": "^16.0.0",
     "typescript": "~4.1.0"
   }

package/shared/modules/BaseUploaderModule.d.ts

@@ -1,6 +1,8 @@
-import { Dispatcher, Module } from "@intuitionrobotics/ts-common";
-import { BaseHttpModule_Class, BaseHttpRequest } from "@intuitionrobotics/thunderstorm";
-import { BaseUploaderFile, DB_Temp_File, Request_Uploader, TempSecureUrl } from "../../shared/types";
+import { BaseHttpModule_Class } from "@intuitionrobotics/thunderstorm/shared/BaseHttpModule";
+import { BaseHttpRequest } from "@intuitionrobotics/thunderstorm/shared/BaseHttpRequest";
+import { Dispatcher } from "@intuitionrobotics/ts-common/core/dispatcher";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
+import { BaseUploaderFile, DB_Temp_File, Request_Uploader, TempSecureUrl } from "../types";
 export declare enum FileStatus {
     ObtainingUrl = "ObtainingUrl",
     UrlObtained = "UrlObtained",

package/shared/modules/BaseUploaderModule.js

@@ -10,26 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseUploaderModule_Class = exports.FileStatus = void 0;
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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 thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
+const types_1 = require("@intuitionrobotics/thunderstorm/shared/types");
+const dispatcher_1 = require("@intuitionrobotics/ts-common/core/dispatcher");
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const queue_1 = require("@intuitionrobotics/ts-common/utils/queue");
+const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
+const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
 const RequestKey_UploadUrl = 'get-upload-url';
 const RequestKey_UploadFile = 'upload-file';
 var FileStatus;
@@ -43,12 +31,12 @@ var FileStatus;
     FileStatus["Completed"] = "Completed";
     FileStatus["Error"] = "Error";
 })(FileStatus = exports.FileStatus || (exports.FileStatus = {}));
-class BaseUploaderModule_Class extends ts_common_1.Module {
+class BaseUploaderModule_Class extends module_1.Module {
     constructor(httpModule, moduleName) {
         super(moduleName);
         this.files = {};
-        this.uploadQueue = new ts_common_1.Queue("File Uploader").setParallelCount(2);
-        this.dispatch_fileStatusChange = new ts_common_1.Dispatcher('__onFileStatusChanged');
+        this.uploadQueue = new queue_1.Queue("File Uploader").setParallelCount(2);
+        this.dispatch_fileStatusChange = new dispatcher_1.Dispatcher('__onFileStatusChanged');
         this.uploadFiles = (response) => __awaiter(this, void 0, void 0, function* () {
             // Subscribe
             yield this.subscribeToPush(response);
@@ -63,7 +51,7 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
                     this.setFileInfo(feId, "status", FileStatus.PostProcessing);
                 }, error => {
                     this.setFileInfo(feId, "status", FileStatus.Error);
-                    this.setFileInfo(feId, "messageStatus", ts_common_1.__stringify(error));
+                    this.setFileInfo(feId, "messageStatus", tools_1.__stringify(error));
                 });
             });
         });
@@ -73,14 +61,14 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
             this.setFileInfo(feId, "tempDoc", response.tempDoc);
             const fileInfo = this.files[feId];
             if (!fileInfo)
-                throw new ts_common_1.BadImplementationException(`Missing file with id ${feId} and name: ${response.tempDoc.name}`);
+                throw new exceptions_1.BadImplementationException(`Missing file with id ${feId} and name: ${response.tempDoc.name}`);
             const request = this
                 .httpModule
-                .createRequest(thunderstorm_1.HttpMethod.PUT, RequestKey_UploadFile)
+                .createRequest(types_1.HttpMethod.PUT, RequestKey_UploadFile)
                 .setUrl(response.secureUrl)
                 // Don't change this because it replaces the default headers which we dont need
                 .setDefaultHeaders({ 'Content-Type': response.tempDoc.mimeType })
-                .setTimeout(20 * ts_common_1.Minute)
+                .setTimeout(20 * date_time_tools_1.Minute)
                 .setBody(fileInfo.file)
                 .setOnProgressListener((ev) => {
                 this.setFileInfo(feId, "progress", ev.loaded / ev.total);
@@ -102,7 +90,7 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
     }
     setFileInfo(id, key, value) {
         if (!this.files[id])
-            throw new ts_common_1.BadImplementationException(`Trying to set ${key} for non existent file with id: ${id}`);
+            throw new exceptions_1.BadImplementationException(`Trying to set ${key} for non existent file with id: ${id}`);
         this.files[id][key] = value;
         this.dispatchFileStatusChange(id);
     }
@@ -114,7 +102,7 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
             const fileInfo = {
                 name: fileData.name,
                 mimeType: fileData.mimeType,
-                feId: ts_common_1.generateHex(32)
+                feId: random_tools_1.generateHex(32)
             };
             if (fileData.key)
                 fileInfo.key = fileData.key;
@@ -130,12 +118,12 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
         });
         this
             .httpModule
-            .createRequest(thunderstorm_1.HttpMethod.POST, RequestKey_UploadUrl)
+            .createRequest(types_1.HttpMethod.POST, RequestKey_UploadUrl)
             .setRelativeUrl('/v1/upload/get-url')
             .setJsonBody(body)
             .setOnError((request, resError) => {
             body.forEach(f => {
-                this.setFileInfo(f.feId, "messageStatus", ts_common_1.__stringify(resError === null || resError === void 0 ? void 0 : resError.debugMessage));
+                this.setFileInfo(f.feId, "messageStatus", tools_1.__stringify(resError === null || resError === void 0 ? void 0 : resError.debugMessage));
                 this.setFileInfo(f.feId, "status", FileStatus.Error);
             });
         })

package/shared/modules/BaseUploaderModule.js.map

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

package/shared/types.d.ts

@@ -1,7 +1,6 @@
-import { ApiWithBody } from "@intuitionrobotics/thunderstorm";
-import { DB_Object } from "@intuitionrobotics/firebase";
-import { AuditBy, ObjectTS } from "@intuitionrobotics/ts-common";
-import { MessageType } from "@intuitionrobotics/push-pub-sub";
+import { MessageType } from "@intuitionrobotics/push-pub-sub/shared/types";
+import { ApiWithBody } from "@intuitionrobotics/thunderstorm/shared/types";
+import { AuditBy, DB_Object, ObjectTS } from "@intuitionrobotics/ts-common/utils/types";
 export declare const fileUploadedKey = "file-uploaded";
 export declare type Push_FileUploaded = MessageType<"file-uploaded", {
     feId: string;

package/shared/types.js

@@ -1,22 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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 });
 exports.UploadResult = exports.fileUploadedKey = void 0;
 exports.fileUploadedKey = "file-uploaded";

package/shared/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/main/shared/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAUU,QAAA,eAAe,GAAG,eAAe,CAAC;AAG/C,IAAY,YAGX;AAHD,WAAY,YAAY;IACvB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;AACpB,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/main/shared/types.ts"],"names":[],"mappings":";;;AAIa,QAAA,eAAe,GAAG,eAAe,CAAC;AAO/C,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;AACvB,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB"}

package/backend.d.ts

@@ -1,5 +0,0 @@
-export * from "./app-backend/core/module-pack";
-export * from "./app-backend/modules/UploaderModule";
-export * from "./app-backend/modules/BucketListener";
-export * from "./app-backend/modules/UploaderTempFileModule";
-export * from "./app-backend/modules/ServerUploaderModule";

package/backend.js

@@ -1,36 +0,0 @@
-"use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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("./app-backend/core/module-pack"), exports);
-__exportStar(require("./app-backend/modules/UploaderModule"), exports);
-__exportStar(require("./app-backend/modules/BucketListener"), exports);
-__exportStar(require("./app-backend/modules/UploaderTempFileModule"), exports);
-__exportStar(require("./app-backend/modules/ServerUploaderModule"), exports);
-//# sourceMappingURL=backend.js.map

package/backend.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"backend.js","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAEH,iEAA+C;AAE/C,uEAAqD;AACrD,uEAAqD;AACrD,+EAA6D;AAC7D,6EAA2D"}

package/frontend.d.ts

@@ -1,2 +0,0 @@
-export * from "./app-frontend/core/module-pack";
-export * from "./app-frontend/modules/UploaderModule";

package/frontend.js

@@ -1,33 +0,0 @@
-"use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * 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;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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("./app-frontend/core/module-pack"), exports);
-__exportStar(require("./app-frontend/modules/UploaderModule"), exports);
-//# sourceMappingURL=frontend.js.map

package/frontend.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"frontend.js","sourceRoot":"","sources":["../src/main/frontend.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAEH,kEAAgD;AAChD,wEAAsD"}