@intuitionrobotics/file-upload 0.42.37 → 0.42.39
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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Module } from "@intuitionrobotics/ts-common";
|
|
2
|
-
import { FileWrapper
|
|
2
|
+
import { FileWrapper } from "@intuitionrobotics/firebase/backend";
|
|
3
3
|
import { BaseUploaderFile, DB_Temp_File, TempSecureUrl } from "../../shared/types";
|
|
4
4
|
import { OnFileUploaded } from "./BucketListener";
|
|
5
5
|
export declare const Temp_Path = "files-temp";
|
|
@@ -7,7 +7,7 @@ declare type Config = {
|
|
|
7
7
|
bucketName?: string;
|
|
8
8
|
uploaderProjectId?: string;
|
|
9
9
|
};
|
|
10
|
-
export declare type PostProcessor = (
|
|
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
12
|
private storage;
|
|
13
13
|
private postProcessor;
|
|
@@ -50,35 +50,33 @@ class UploaderModule_Class extends ts_common_1.Module {
|
|
|
50
50
|
if (!filePath)
|
|
51
51
|
throw new ts_common_1.ThisShouldNotHappenException("Missing file path");
|
|
52
52
|
this.logInfo(`Looking for file with path ${filePath}`);
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
if (tempMeta.public) {
|
|
66
|
-
try {
|
|
67
|
-
yield file.makePublic();
|
|
68
|
-
}
|
|
69
|
-
catch (e) {
|
|
70
|
-
yield this.notifyFrontend(tempMeta.feId, types_1.UploadResult.Failure, `Failed to make the file public: ${tempMeta.name}`, e);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
53
|
+
// I use collection and not the module directly since I want to handle failure my way
|
|
54
|
+
const tempMeta = yield UploaderTempFileModule_1.UploaderTempFileModule.collection.queryUnique({ where: { path: filePath } });
|
|
55
|
+
if (!tempMeta)
|
|
56
|
+
return this.logInfo(`File with path: ${filePath}, not found in temp collection db`);
|
|
57
|
+
this.logInfo(`Found temp meta with _id: ${tempMeta._id}`, tempMeta);
|
|
58
|
+
const val = this.postProcessor[tempMeta.key];
|
|
59
|
+
this.logInfo(`Found a validator ${!!val}`);
|
|
60
|
+
if (!val)
|
|
61
|
+
return this.notifyFrontend(tempMeta.feId, types_1.UploadResult.Failure, `Missing a validator for ${tempMeta.key} for file: ${tempMeta.name}`);
|
|
62
|
+
const bucket = yield this.storage.getOrCreateBucket(tempMeta.bucketName);
|
|
63
|
+
const file = yield bucket.getFile(tempMeta.path);
|
|
64
|
+
if (tempMeta.public) {
|
|
73
65
|
try {
|
|
74
|
-
yield
|
|
66
|
+
yield file.makePublic();
|
|
75
67
|
}
|
|
76
68
|
catch (e) {
|
|
77
|
-
|
|
78
|
-
return yield this.notifyFrontend(tempMeta.feId, types_1.UploadResult.Failure, `Post-processing failed for file: ${tempMeta.name}`, e);
|
|
69
|
+
yield this.notifyFrontend(tempMeta.feId, types_1.UploadResult.Failure, `Failed to make the file public: ${tempMeta.name}`, e);
|
|
79
70
|
}
|
|
80
|
-
|
|
81
|
-
|
|
71
|
+
}
|
|
72
|
+
try {
|
|
73
|
+
yield val(file, tempMeta);
|
|
74
|
+
}
|
|
75
|
+
catch (e) {
|
|
76
|
+
//TODO delete the file and the temp doc
|
|
77
|
+
return yield this.notifyFrontend(tempMeta.feId, types_1.UploadResult.Failure, `Post-processing failed for file: ${tempMeta.name}`, e);
|
|
78
|
+
}
|
|
79
|
+
return this.notifyFrontend(tempMeta.feId, types_1.UploadResult.Success, `Successfully parsed and processed file ${tempMeta.name}`);
|
|
82
80
|
});
|
|
83
81
|
this.notifyFrontend = (feId, result, message, cause) => __awaiter(this, void 0, void 0, function* () {
|
|
84
82
|
cause && this.logWarning(cause);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,4DAOsC;AACtC,
|
|
1
|
+
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"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"}
|