@intuitionrobotics/file-upload 0.43.0 → 0.43.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/app-backend/modules/BucketListener.d.ts +1 -1
- package/app-backend/modules/BucketListener.js +1 -1
- package/app-backend/modules/BucketListener.js.map +1 -1
- package/app-backend/modules/ServerUploaderModule.js +1 -1
- package/app-backend/modules/ServerUploaderModule.js.map +1 -1
- package/app-backend/modules/UploaderModule.d.ts +1 -0
- package/app-backend/modules/UploaderModule.js +1 -1
- package/app-backend/modules/UploaderModule.js.map +1 -1
- package/app-backend/modules/UploaderTempFileModule.js +1 -1
- package/app-backend/modules/UploaderTempFileModule.js.map +1 -1
- package/app-frontend/modules/UploaderModule.js +1 -1
- package/app-frontend/modules/UploaderModule.js.map +1 -1
- package/package.json +3 -16
- package/shared/modules/BaseUploaderModule.d.ts +2 -1
- package/shared/modules/BaseUploaderModule.js +5 -3
- package/shared/modules/BaseUploaderModule.js.map +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Firebase_StorageFunction } from "@intuitionrobotics/firebase/backend-functions";
|
|
2
|
-
import { ObjectMetadata } from "firebase-functions/lib/providers/storage";
|
|
2
|
+
import { ObjectMetadata } from "firebase-functions/lib/v1/providers/storage";
|
|
3
3
|
import { EventContext } from "firebase-functions";
|
|
4
4
|
export interface OnFileUploaded {
|
|
5
5
|
__onFileUploaded(filePath?: string): void;
|
|
@@ -32,7 +32,7 @@ const ts_common_1 = require("@intuitionrobotics/ts-common");
|
|
|
32
32
|
const dispatcher_onFileUploaded = new ts_common_1.Dispatcher("__onFileUploaded");
|
|
33
33
|
class BucketListener_Class extends backend_functions_1.Firebase_StorageFunction {
|
|
34
34
|
constructor() {
|
|
35
|
-
super();
|
|
35
|
+
super("BucketListener");
|
|
36
36
|
}
|
|
37
37
|
init() {
|
|
38
38
|
super.init();
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -32,7 +32,7 @@ const BaseUploaderModule_1 = require("../../shared/modules/BaseUploaderModule");
|
|
|
32
32
|
const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
|
|
33
33
|
class ServerUploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class {
|
|
34
34
|
constructor() {
|
|
35
|
-
super(backend_1.AxiosHttpModule);
|
|
35
|
+
super(backend_1.AxiosHttpModule, "ServerUploaderModule");
|
|
36
36
|
}
|
|
37
37
|
init() {
|
|
38
38
|
super.init();
|
|
@@ -1 +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,CAAC,CAAC;
|
|
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"}
|
|
@@ -9,6 +9,7 @@ declare type Config = {
|
|
|
9
9
|
};
|
|
10
10
|
export declare type PostProcessor = (file: FileWrapper, doc: DB_Temp_File) => Promise<void>;
|
|
11
11
|
export declare class UploaderModule_Class extends Module<Config> implements OnFileUploaded {
|
|
12
|
+
constructor();
|
|
12
13
|
private storage;
|
|
13
14
|
private postProcessor;
|
|
14
15
|
__onFileUploaded(filePath?: string): Promise<void>;
|
|
@@ -36,7 +36,7 @@ const backend_2 = require("@intuitionrobotics/push-pub-sub/backend");
|
|
|
36
36
|
exports.Temp_Path = "files-temp";
|
|
37
37
|
class UploaderModule_Class extends ts_common_1.Module {
|
|
38
38
|
constructor() {
|
|
39
|
-
super(
|
|
39
|
+
super("UploaderModule");
|
|
40
40
|
this.setPostProcessor = (validator) => {
|
|
41
41
|
this.postProcessor = validator;
|
|
42
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,4DAOsC;AACtC,iEAI6C;AAC7C,8CAO4B;AAC5B,qEAAgE;AAChE,qEAAyE;AAG5D,QAAA,SAAS,GAAG,YAAY,CAAC;AAStC,MAAa,oBACZ,SAAQ,kBAAc;
|
|
1
|
+
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ exports.TEMP_COLLECTION = "temp-files-upload";
|
|
|
25
25
|
exports.validateName = ts_common_1.validateRegexp(/^.{3,}$/);
|
|
26
26
|
class UploaderTempFileModule_Class extends backend_1.BaseDB_ApiGenerator {
|
|
27
27
|
constructor() {
|
|
28
|
-
super(exports.TEMP_COLLECTION, UploaderTempFileModule_Class._validator, "temp-files");
|
|
28
|
+
super(exports.TEMP_COLLECTION, UploaderTempFileModule_Class._validator, "temp-files", "UploaderTempFileModule");
|
|
29
29
|
}
|
|
30
30
|
apis(pathPart) {
|
|
31
31
|
return [];
|
|
@@ -1 +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,CAAC,CAAC;
|
|
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"}
|
|
@@ -35,7 +35,7 @@ const BaseUploaderModule_1 = require("../../shared/modules/BaseUploaderModule");
|
|
|
35
35
|
const ts_common_1 = require("@intuitionrobotics/ts-common");
|
|
36
36
|
class UploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class {
|
|
37
37
|
constructor() {
|
|
38
|
-
super(frontend_1.XhrHttpModule);
|
|
38
|
+
super(frontend_1.XhrHttpModule, 'UploaderModule');
|
|
39
39
|
this.dispatch_fileStatusChange = new frontend_1.ThunderDispatcher("__onFileStatusChanged");
|
|
40
40
|
}
|
|
41
41
|
dispatchFileStatusChange(id) {
|
|
@@ -1 +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,CAAC,CAAC;
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@intuitionrobotics/file-upload",
|
|
3
|
-
"version": "0.43.
|
|
3
|
+
"version": "0.43.3",
|
|
4
4
|
"description": "File Uploader - Express & Typescript based backend framework",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"IR",
|
|
@@ -33,25 +33,12 @@
|
|
|
33
33
|
"@intuitionrobotics/thunderstorm": "~0.43.0",
|
|
34
34
|
"@intuitionrobotics/firebase": "~0.43.0",
|
|
35
35
|
"@intuitionrobotics/db-api-generator": "~0.43.0",
|
|
36
|
-
"@intuitionrobotics/push-pub-sub": "~0.43.0"
|
|
36
|
+
"@intuitionrobotics/push-pub-sub": "~0.43.0",
|
|
37
|
+
"firebase-functions": "^4.4.0"
|
|
37
38
|
},
|
|
38
39
|
"devDependencies": {
|
|
39
|
-
"@google-cloud/common": "^3.0.0",
|
|
40
|
-
"@google-cloud/firestore": "^5.0.0",
|
|
41
|
-
"@google-cloud/storage": "^5.0.0",
|
|
42
40
|
"@intuitionrobotics/testelot": "~0.43.0",
|
|
43
|
-
"@types/compression": "^1.0.1",
|
|
44
|
-
"@types/express": "^4.17.2",
|
|
45
41
|
"@types/node": "^16.0.0",
|
|
46
|
-
"isomorphic-apk-reader": "^1.1.24",
|
|
47
|
-
"jszip": "^3.2.2",
|
|
48
|
-
"express": "^4.17.1",
|
|
49
|
-
"firebase": "^9.9.1",
|
|
50
|
-
"firebase-admin": "^11.0.0",
|
|
51
|
-
"firebase-functions": "^3.22.0",
|
|
52
|
-
"fs": "0.0.1-security",
|
|
53
|
-
"google-auth-library": "7.12.0",
|
|
54
|
-
"ts-node": "^8.6.2",
|
|
55
42
|
"typescript": "~4.1.0"
|
|
56
43
|
}
|
|
57
44
|
}
|
|
@@ -16,6 +16,7 @@ export declare type FileInfo = {
|
|
|
16
16
|
name: string;
|
|
17
17
|
request?: BaseHttpRequest<any>;
|
|
18
18
|
file?: any;
|
|
19
|
+
fileName?: string;
|
|
19
20
|
tempDoc?: DB_Temp_File;
|
|
20
21
|
};
|
|
21
22
|
export interface OnFileStatusChanged {
|
|
@@ -34,7 +35,7 @@ export declare abstract class BaseUploaderModule_Class<HttpModule extends BaseHt
|
|
|
34
35
|
private readonly uploadQueue;
|
|
35
36
|
protected readonly dispatch_fileStatusChange: Dispatcher<OnFileStatusChanged, "__onFileStatusChanged">;
|
|
36
37
|
private httpModule;
|
|
37
|
-
protected constructor(httpModule: HttpModule);
|
|
38
|
+
protected constructor(httpModule: HttpModule, moduleName: string);
|
|
38
39
|
init(): void;
|
|
39
40
|
protected abstract subscribeToPush(toSubscribe: TempSecureUrl[]): Promise<void>;
|
|
40
41
|
getFileInfo<K extends keyof FileInfo>(id: string, key: K): FileInfo[K] | undefined;
|
|
@@ -44,8 +44,8 @@ var FileStatus;
|
|
|
44
44
|
FileStatus["Error"] = "Error";
|
|
45
45
|
})(FileStatus = exports.FileStatus || (exports.FileStatus = {}));
|
|
46
46
|
class BaseUploaderModule_Class extends ts_common_1.Module {
|
|
47
|
-
constructor(httpModule) {
|
|
48
|
-
super();
|
|
47
|
+
constructor(httpModule, moduleName) {
|
|
48
|
+
super(moduleName);
|
|
49
49
|
this.files = {};
|
|
50
50
|
this.uploadQueue = new ts_common_1.Queue("File Uploader").setParallelCount(2);
|
|
51
51
|
this.dispatch_fileStatusChange = new ts_common_1.Dispatcher('__onFileStatusChanged');
|
|
@@ -78,7 +78,8 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
|
|
|
78
78
|
.httpModule
|
|
79
79
|
.createRequest(thunderstorm_1.HttpMethod.PUT, RequestKey_UploadFile)
|
|
80
80
|
.setUrl(response.secureUrl)
|
|
81
|
-
|
|
81
|
+
// Don't change this because it replaces the default headers which we dont need
|
|
82
|
+
.setDefaultHeaders({ 'Content-Type': response.tempDoc.mimeType })
|
|
82
83
|
.setTimeout(20 * ts_common_1.Minute)
|
|
83
84
|
.setBody(fileInfo.file)
|
|
84
85
|
.setOnProgressListener((ev) => {
|
|
@@ -121,6 +122,7 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
|
|
|
121
122
|
fileInfo.public = fileData.public;
|
|
122
123
|
this.files[fileInfo.feId] = {
|
|
123
124
|
file: fileData.file,
|
|
125
|
+
fileName: fileData.file.name,
|
|
124
126
|
status: FileStatus.ObtainingUrl,
|
|
125
127
|
name: fileData.name
|
|
126
128
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseUploaderModule.js","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,4DAQsC;AACtC,kEAMyC;AAUzC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAC9C,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAE5C,IAAY,UASX;AATD,WAAY,UAAU;IACrB,2CAA+B,CAAA;IAC/B,yCAA8B,CAAA;IAC9B,6CAAgC,CAAA;IAChC,kDAAkD;IAClD,6CAA6C;IAC7C,+CAAiC,CAAA;IACjC,qCAA4B,CAAA;IAC5B,6BAAwB,CAAA;AACzB,CAAC,EATW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QASrB;
|
|
1
|
+
{"version":3,"file":"BaseUploaderModule.js","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":"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"}
|