@intuitionrobotics/file-upload 2.0.12 → 2.1.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/dist/app-backend/modules/BucketListener.d.ts +0 -1
- package/dist/app-backend/modules/BucketListener.d.ts.map +1 -1
- package/dist/app-backend/modules/BucketListener.js +0 -5
- package/dist/app-backend/modules/BucketListener.js.map +1 -1
- package/dist/app-backend/modules/ServerUploaderModule.d.ts +1 -1
- package/dist/app-backend/modules/ServerUploaderModule.d.ts.map +1 -1
- package/dist/app-backend/modules/ServerUploaderModule.js +7 -4
- package/dist/app-backend/modules/ServerUploaderModule.js.map +1 -1
- package/dist/app-backend/modules/UploaderModule.d.ts +3 -2
- package/dist/app-backend/modules/UploaderModule.d.ts.map +1 -1
- package/dist/app-backend/modules/UploaderModule.js +9 -3
- package/dist/app-backend/modules/UploaderModule.js.map +1 -1
- package/dist/shared/modules/BaseUploaderModule.d.ts +2 -1
- package/dist/shared/modules/BaseUploaderModule.d.ts.map +1 -1
- package/dist/shared/modules/BaseUploaderModule.js +11 -4
- package/dist/shared/modules/BaseUploaderModule.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
|
@@ -4,7 +4,6 @@ export interface OnFileUploaded {
|
|
|
4
4
|
}
|
|
5
5
|
export declare class BucketListener_Class extends Firebase_StorageFunction {
|
|
6
6
|
constructor();
|
|
7
|
-
init(): void;
|
|
8
7
|
onFinalize(object: any, context: any): Promise<any>;
|
|
9
8
|
}
|
|
10
9
|
export declare const BucketListener: BucketListener_Class;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BucketListener.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/BucketListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAGvF,MAAM,WAAW,cAAc;IAC9B,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAKD,qBAAa,oBACZ,SAAQ,wBAAwB;;
|
|
1
|
+
{"version":3,"file":"BucketListener.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/BucketListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAGvF,MAAM,WAAW,cAAc;IAC9B,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAKD,qBAAa,oBACZ,SAAQ,wBAAwB;;IAK1B,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;CAOzD;AAED,eAAO,MAAM,cAAc,sBAA6B,CAAC"}
|
|
@@ -5,11 +5,6 @@ export class BucketListener_Class extends Firebase_StorageFunction {
|
|
|
5
5
|
constructor() {
|
|
6
6
|
super("BucketListener");
|
|
7
7
|
}
|
|
8
|
-
init() {
|
|
9
|
-
super.init();
|
|
10
|
-
this.logInfo("Bucket Listener config", this.config);
|
|
11
|
-
this.logInfo("bucketName", this.config.bucketName);
|
|
12
|
-
}
|
|
13
8
|
async onFinalize(object, context) {
|
|
14
9
|
const filePath = object.name;
|
|
15
10
|
await dispatcher_onFileUploaded.dispatchModuleAsync(filePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BucketListener.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/BucketListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAMxD,MAAM,yBAAyB,GAAG,IAAI,UAAU,CAAqC,kBAAkB,CAAC,CAAC;AAGzG,MAAM,OAAO,oBACZ,SAAQ,wBAAwB;IAChC;QACC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"BucketListener.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/BucketListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAMxD,MAAM,yBAAyB,GAAG,IAAI,UAAU,CAAqC,kBAAkB,CAAC,CAAC;AAGzG,MAAM,OAAO,oBACZ,SAAQ,wBAAwB;IAChC;QACC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAW,EAAE,OAAY;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;QAC7B,MAAM,yBAAyB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;CAED;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
|
|
@@ -9,7 +9,7 @@ export declare class ServerUploaderModule_Class extends BaseUploaderModule_Class
|
|
|
9
9
|
requestConfig: Axios_RequestConfig;
|
|
10
10
|
}> {
|
|
11
11
|
constructor();
|
|
12
|
-
|
|
12
|
+
private requestOptionsApplied;
|
|
13
13
|
upload(files: ServerFilesToUpload[]): BaseUploaderFile[];
|
|
14
14
|
protected subscribeToPush(_toSubscribe: TempSecureUrl[]): Promise<void>;
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerUploaderModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ServerUploaderModule.ts"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,aAAa,EACf,KAAK,gBAAgB,EACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACN,wBAAwB,EAAE,UAAU,EACpC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACN,KAAK,mBAAmB,EAExB,qBAAqB,EACrB,MAAM,yCAAyC,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAAG;IACpD,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CAC/D,CAAA;AAED,qBAAa,0BACZ,SAAQ,wBAAwB,CAAC,qBAAqB,EAAE;IAAE,aAAa,EAAE,mBAAmB,CAAA;CAAE,CAAC;;IAM/F,
|
|
1
|
+
{"version":3,"file":"ServerUploaderModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ServerUploaderModule.ts"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,aAAa,EACf,KAAK,gBAAgB,EACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACN,wBAAwB,EAAE,UAAU,EACpC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACN,KAAK,mBAAmB,EAExB,qBAAqB,EACrB,MAAM,yCAAyC,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAAG;IACpD,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CAC/D,CAAA;AAED,qBAAa,0BACZ,SAAQ,wBAAwB,CAAC,qBAAqB,EAAE;IAAE,aAAa,EAAE,mBAAmB,CAAA;CAAE,CAAC;;IAM/F,OAAO,CAAC,qBAAqB,CAAS;IAEtC,MAAM,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,gBAAgB,EAAE;cAWxC,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAI7E;AAED,eAAO,MAAM,oBAAoB,4BAAmC,CAAC"}
|
|
@@ -5,11 +5,14 @@ export class ServerUploaderModule_Class extends BaseUploaderModule_Class {
|
|
|
5
5
|
constructor() {
|
|
6
6
|
super(AxiosHttpModule, "ServerUploaderModule");
|
|
7
7
|
}
|
|
8
|
-
|
|
9
|
-
super.init();
|
|
10
|
-
AxiosHttpModule.setRequestOption(this.config.requestConfig);
|
|
11
|
-
}
|
|
8
|
+
requestOptionsApplied = false;
|
|
12
9
|
upload(files) {
|
|
10
|
+
// Was init(): push the configured request options into the http module
|
|
11
|
+
// lazily, on first actual upload.
|
|
12
|
+
if (!this.requestOptionsApplied) {
|
|
13
|
+
this.requestOptionsApplied = true;
|
|
14
|
+
AxiosHttpModule.setRequestOption(this.config.requestConfig);
|
|
15
|
+
}
|
|
13
16
|
return this.uploadImpl(files);
|
|
14
17
|
}
|
|
15
18
|
async subscribeToPush(_toSubscribe) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerUploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ServerUploaderModule.ts"],"names":[],"mappings":"AACA,OAAO,EAIN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACN,wBAAwB,EAAE,UAAU,GACpC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAEN,eAAe,EACf,qBAAqB,EACrB,MAAM,yCAAyC,CAAC;AAOjD,MAAM,OAAO,0BACZ,SAAQ,wBAAuF;IAE/F;QACC,KAAK,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;IAChD,CAAC;
|
|
1
|
+
{"version":3,"file":"ServerUploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/ServerUploaderModule.ts"],"names":[],"mappings":"AACA,OAAO,EAIN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACN,wBAAwB,EAAE,UAAU,GACpC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAEN,eAAe,EACf,qBAAqB,EACrB,MAAM,yCAAyC,CAAC;AAOjD,MAAM,OAAO,0BACZ,SAAQ,wBAAuF;IAE/F;QACC,KAAK,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;IAChD,CAAC;IAEO,qBAAqB,GAAG,KAAK,CAAC;IAEtC,MAAM,CAAC,KAA4B;QAClC,uEAAuE;QACvE,kCAAkC;QAClC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACjC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;YAClC,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,YAA6B;QAC5D,eAAe;QACf,kBAAkB;IACnB,CAAC;CACD;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,0BAA0B,EAAE,CAAC"}
|
|
@@ -10,14 +10,15 @@ type Config = {
|
|
|
10
10
|
export type PostProcessor = (file: FileWrapper, doc: DB_Temp_File) => Promise<void>;
|
|
11
11
|
export declare class UploaderModule_Class extends Module<Config> implements OnFileUploaded {
|
|
12
12
|
constructor();
|
|
13
|
-
private
|
|
13
|
+
private _storage?;
|
|
14
|
+
private get storage();
|
|
14
15
|
private postProcessor;
|
|
15
16
|
__onFileUploaded(filePath?: string): Promise<void>;
|
|
16
17
|
setPostProcessor: (validator: {
|
|
17
18
|
[k: string]: PostProcessor;
|
|
18
19
|
}) => void;
|
|
19
20
|
getProcessor: (k: string) => PostProcessor;
|
|
20
|
-
|
|
21
|
+
validate(): void;
|
|
21
22
|
getUrl(body: BaseUploaderFile[], pathPrefix?: string, _bucketName?: string): Promise<TempSecureUrl[]>;
|
|
22
23
|
fileUploaded: (filePath?: string) => Promise<void>;
|
|
23
24
|
private notifyFrontend;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploaderModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,MAAM,EAEN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACN,WAAW,EAGX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,YAAY,EAGjB,KAAK,aAAa,EAElB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAC,KAAK,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAExD,eAAO,MAAM,SAAS,eAAe,CAAC;AAEtC,KAAK,MAAM,GAAG;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpF,qBAAa,oBACZ,SAAQ,MAAM,CAAC,MAAM,CACrB,YAAW,cAAc;;
|
|
1
|
+
{"version":3,"file":"UploaderModule.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,MAAM,EAEN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACN,WAAW,EAGX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,YAAY,EAGjB,KAAK,aAAa,EAElB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAC,KAAK,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAExD,eAAO,MAAM,SAAS,eAAe,CAAC;AAEtC,KAAK,MAAM,GAAG;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpF,qBAAa,oBACZ,SAAQ,MAAM,CAAC,MAAM,CACrB,YAAW,cAAc;;IAOzB,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAElC,OAAO,KAAK,OAAO,GAElB;IAED,OAAO,CAAC,aAAa,CAAkC;IAEjD,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAIxC,gBAAgB,GAAI,WAAW;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,UAE3D;IAEK,YAAY,GAAI,GAAG,MAAM,mBAM9B;IAIK,QAAQ,IAAI,IAAI;IAMjB,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE,UAAU,GAAE,MAAkB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAoCtH,YAAY,GAAU,WAAW,MAAM,mBAkCrC;IAEF,OAAO,CAAC,cAAc,CAIpB;CAEF;AAED,eAAO,MAAM,cAAc,sBAA6B,CAAC"}
|
|
@@ -9,7 +9,11 @@ export class UploaderModule_Class extends Module {
|
|
|
9
9
|
constructor() {
|
|
10
10
|
super("UploaderModule");
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
// Resolved lazily on first use (was init()).
|
|
13
|
+
_storage;
|
|
14
|
+
get storage() {
|
|
15
|
+
return this._storage ??= FirebaseModule.createAdminSession(this.config.uploaderProjectId).getStorage();
|
|
16
|
+
}
|
|
13
17
|
postProcessor;
|
|
14
18
|
async __onFileUploaded(filePath) {
|
|
15
19
|
await this.fileUploaded(filePath);
|
|
@@ -23,10 +27,12 @@ export class UploaderModule_Class extends Module {
|
|
|
23
27
|
throw new ImplementationMissingException(`Missing validator for type ${k}`);
|
|
24
28
|
return postProcessorElement;
|
|
25
29
|
};
|
|
26
|
-
init()
|
|
30
|
+
// Fail-fast on missing post-processor moved from init() (never called on the
|
|
31
|
+
// backend anymore) to validate(), which Storm still runs at build time.
|
|
32
|
+
validate() {
|
|
33
|
+
super.validate();
|
|
27
34
|
if (!this.postProcessor)
|
|
28
35
|
throw new ImplementationMissingException("You must set a postProcessor for the UploaderModule");
|
|
29
|
-
this.storage = FirebaseModule.createAdminSession(this.config.uploaderProjectId).getStorage();
|
|
30
36
|
}
|
|
31
37
|
async getUrl(body, pathPrefix = Temp_Path, _bucketName) {
|
|
32
38
|
const bucketName = _bucketName || this.config?.bucketName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,OAAO,EACP,WAAW,EACX,IAAI,EACJ,8BAA8B,EAC9B,MAAM,EACN,4BAA4B,EAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACN,WAAW,EACX,cAAc,EACd,cAAc,EACd,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAGN,eAAe,EAGf,YAAY,EACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAqB,MAAM,qBAAqB,CAAC;AAExD,MAAM,CAAC,MAAM,SAAS,GAAG,YAAY,CAAC;AAStC,MAAM,OAAO,oBACZ,SAAQ,MAAc;IAGtB;QACC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,9 +32,10 @@ export declare abstract class BaseUploaderModule_Class<HttpModule extends BaseHt
|
|
|
32
32
|
[id: string]: FileInfo;
|
|
33
33
|
};
|
|
34
34
|
private readonly uploadQueue;
|
|
35
|
+
private uploadQueueConfigured;
|
|
35
36
|
private httpModule;
|
|
36
37
|
protected constructor(httpModule: HttpModule, moduleName: string);
|
|
37
|
-
|
|
38
|
+
private getUploadQueue;
|
|
38
39
|
protected abstract subscribeToPush(toSubscribe: TempSecureUrl[]): Promise<void>;
|
|
39
40
|
getFileInfo<K extends keyof FileInfo>(id: string, key: K): FileInfo[K] | undefined;
|
|
40
41
|
getFullFileInfo(id: string): FileInfo | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseUploaderModule.d.ts","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,MAAM,EAET,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACH,oBAAoB,EACpB,eAAe,EAIlB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAEH,KAAK,gBAAgB,EAErB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EACrB,MAAM,uBAAuB,CAAC;AAK/B,oBAAY,UAAU;IAClB,YAAY,iBAAiB;IAC7B,WAAW,gBAAgB;IAC3B,aAAa,kBAAkB;IAG/B,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,KAAK,UAAU;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,MAAM,EAAE,UAAU,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CAC7D,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAAG;IAE3C,IAAI,EAAE,GAAG,CAAA;IACT,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CAClE,CAAA;AAED,KAAK,MAAM,GAAG;IACV,wBAAwB,CAAC,EAAE,MAAM,CAAA;CACpC,CAAA;AAED,8BAAsB,wBAAwB,CAAC,UAAU,SAAS,oBAAoB,EAAE,YAAY,SAAS,MAAM,GAAG,EAAE,CACpH,SAAQ,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC;IACrC,SAAS,CAAC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAM;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,OAAO,CAAC,UAAU,CAAa;IAE/B,SAAS,aAAa,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"BaseUploaderModule.d.ts","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,MAAM,EAET,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACH,oBAAoB,EACpB,eAAe,EAIlB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAEH,KAAK,gBAAgB,EAErB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EACrB,MAAM,uBAAuB,CAAC;AAK/B,oBAAY,UAAU;IAClB,YAAY,iBAAiB;IAC7B,WAAW,gBAAgB;IAC3B,aAAa,kBAAkB;IAG/B,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,KAAK,UAAU;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,MAAM,EAAE,UAAU,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CAC7D,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAAG;IAE3C,IAAI,EAAE,GAAG,CAAA;IACT,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CAClE,CAAA;AAED,KAAK,MAAM,GAAG;IACV,wBAAwB,CAAC,EAAE,MAAM,CAAA;CACpC,CAAA;AAED,8BAAsB,wBAAwB,CAAC,UAAU,SAAS,oBAAoB,EAAE,YAAY,SAAS,MAAM,GAAG,EAAE,CACpH,SAAQ,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC;IACrC,SAAS,CAAC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAM;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,UAAU,CAAa;IAE/B,SAAS,aAAa,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM;IAOhE,OAAO,CAAC,cAAc;IAUtB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/E,WAAW,CAAC,CAAC,SAAS,MAAM,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS;IAIlF,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAIjD,SAAS,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAQtF,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAiClG,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,4BAA4B;IAsBpC,OAAO,CAAC,WAAW,CAkBjB;IAEF,OAAO,CAAC,UAAU,CAsBhB;CACL"}
|
|
@@ -17,14 +17,21 @@ export var FileStatus;
|
|
|
17
17
|
export class BaseUploaderModule_Class extends Module {
|
|
18
18
|
files = {};
|
|
19
19
|
uploadQueue = new Queue("File Uploader").setParallelCount(2);
|
|
20
|
+
uploadQueueConfigured = false;
|
|
20
21
|
httpModule;
|
|
21
22
|
constructor(httpModule, moduleName) {
|
|
22
23
|
super(moduleName);
|
|
23
24
|
this.httpModule = httpModule;
|
|
24
25
|
}
|
|
25
|
-
init()
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
// Was init(): the configured parallel count is applied lazily, right before
|
|
27
|
+
// the queue is first used (works for both backend and frontend subclasses).
|
|
28
|
+
getUploadQueue() {
|
|
29
|
+
if (!this.uploadQueueConfigured) {
|
|
30
|
+
this.uploadQueueConfigured = true;
|
|
31
|
+
if (this.config.uploadQueueParallelCount)
|
|
32
|
+
this.uploadQueue.setParallelCount(this.config.uploadQueueParallelCount);
|
|
33
|
+
}
|
|
34
|
+
return this.uploadQueue;
|
|
28
35
|
}
|
|
29
36
|
getFileInfo(id, key) {
|
|
30
37
|
return this.files[id] && this.files[id][key];
|
|
@@ -109,7 +116,7 @@ export class BaseUploaderModule_Class extends Module {
|
|
|
109
116
|
await this.subscribeToPush(response);
|
|
110
117
|
response.forEach(r => {
|
|
111
118
|
const feId = r.tempDoc.feId;
|
|
112
|
-
this.
|
|
119
|
+
this.getUploadQueue().addItem(async () => {
|
|
113
120
|
await this.uploadFile(r);
|
|
114
121
|
delete this.files[feId].file;
|
|
115
122
|
this.setFileInfo(feId, "progress", undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseUploaderModule.js","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,0BAA0B,EAC1B,WAAW,EACX,MAAM,EACN,MAAM,EACN,KAAK,EACR,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACH,oBAAoB,EACpB,eAAe,EAEf,UAAU,EAEb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAON,MAAM,uBAAuB,CAAC;AAE/B,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAC9C,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAE5C,MAAM,CAAN,IAAY,UASX;AATD,WAAY,UAAU;IAClB,2CAA6B,CAAA;IAC7B,yCAA2B,CAAA;IAC3B,6CAA+B,CAAA;IAC/B,kDAAkD;IAClD,6CAA6C;IAC7C,+CAAiC,CAAA;IACjC,qCAAuB,CAAA;IACvB,6BAAe,CAAA;AACnB,CAAC,EATW,UAAU,KAAV,UAAU,QASrB;AAwBD,MAAM,OAAgB,wBAClB,SAAQ,MAA6B;IAC3B,KAAK,GAA+B,EAAE,CAAC;IAChC,WAAW,GAAU,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7E,UAAU,CAAa;IAE/B,YAAsB,UAAsB,EAAE,UAAkB;QAC5D,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,IAAI;
|
|
1
|
+
{"version":3,"file":"BaseUploaderModule.js","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":"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"}
|