@intuitionrobotics/file-upload 0.47.46 → 0.47.48
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/api/v1/upload/get-url-with-bucket-name.d.ts +1 -0
- package/app-backend/api/v1/upload/get-url-with-bucket-name.js +25 -0
- package/app-backend/api/v1/upload/get-url-with-bucket-name.js.map +1 -0
- package/app-backend/modules/UploaderModule.d.ts +1 -1
- package/app-backend/modules/UploaderModule.js +2 -2
- package/app-backend/modules/UploaderModule.js.map +1 -1
- package/app-frontend/modules/UploaderModule.d.ts +1 -1
- package/app-frontend/modules/UploaderModule.js +2 -2
- package/app-frontend/modules/UploaderModule.js.map +1 -1
- package/package.json +1 -1
- package/shared/modules/BaseUploaderModule.d.ts +3 -1
- package/shared/modules/BaseUploaderModule.js +28 -2
- package/shared/modules/BaseUploaderModule.js.map +1 -1
- package/shared/types.d.ts +5 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
|
|
13
|
+
const UploaderModule_1 = require("../../../modules/UploaderModule");
|
|
14
|
+
class ServerApi_GetUploadUrl extends backend_1.ServerApi_Post {
|
|
15
|
+
constructor() {
|
|
16
|
+
super('get-url-with-bucket-name');
|
|
17
|
+
}
|
|
18
|
+
process(request, response, queryParams, body) {
|
|
19
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
return UploaderModule_1.UploaderModule.getUrl(body.files, body.bucketName);
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
module.exports = new ServerApi_GetUploadUrl();
|
|
25
|
+
//# sourceMappingURL=get-url-with-bucket-name.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-url-with-bucket-name.js","sourceRoot":"","sources":["../../../../../src/main/app-backend/api/v1/upload/get-url-with-bucket-name.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qEAAoG;AAGpG,oEAA+D;AAG/D,MAAM,sBACL,SAAQ,wBAA8C;IACtD;QACC,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAClC,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAwB,EAAE,IAAqC;;YACtI,OAAO,+BAAc,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3D,CAAC;KAAA;CACD;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,sBAAsB,EAAE,CAAA"}
|
|
@@ -18,7 +18,7 @@ export declare class UploaderModule_Class extends Module<Config> implements OnFi
|
|
|
18
18
|
}) => void;
|
|
19
19
|
getProcessor: (k: string) => PostProcessor;
|
|
20
20
|
init(): void;
|
|
21
|
-
getUrl(body: BaseUploaderFile[], pathPrefix?: string): Promise<TempSecureUrl[]>;
|
|
21
|
+
getUrl(body: BaseUploaderFile[], pathPrefix?: string, _bucketName?: string): Promise<TempSecureUrl[]>;
|
|
22
22
|
fileUploaded: (filePath?: string) => Promise<void>;
|
|
23
23
|
private notifyFrontend;
|
|
24
24
|
}
|
|
@@ -77,9 +77,9 @@ class UploaderModule_Class extends ts_common_1.Module {
|
|
|
77
77
|
this.storage = backend_1.FirebaseModule.createAdminSession(this.config.uploaderProjectId).getStorage();
|
|
78
78
|
}
|
|
79
79
|
getUrl(body_1) {
|
|
80
|
-
return __awaiter(this, arguments, void 0, function* (body, pathPrefix = exports.Temp_Path) {
|
|
80
|
+
return __awaiter(this, arguments, void 0, function* (body, pathPrefix = exports.Temp_Path, _bucketName) {
|
|
81
81
|
var _a;
|
|
82
|
-
const bucketName = (_a = this.config) === null || _a === void 0 ? void 0 : _a.bucketName;
|
|
82
|
+
const bucketName = _bucketName || ((_a = this.config) === null || _a === void 0 ? void 0 : _a.bucketName);
|
|
83
83
|
const bucket = yield this.storage.getOrCreateBucket(bucketName);
|
|
84
84
|
return Promise.all(body.map((_file) => __awaiter(this, void 0, void 0, function* () {
|
|
85
85
|
const key = _file.key || _file.mimeType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/UploaderModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { BaseUploaderFile, TempSecureUrl } from "../../shared/types";
|
|
|
3
3
|
import { BaseUploaderModule_Class, FileStatus } from "../../shared/modules/BaseUploaderModule";
|
|
4
4
|
export declare class UploaderModule_Class extends BaseUploaderModule_Class<XhrHttpModule_Class> {
|
|
5
5
|
constructor();
|
|
6
|
-
upload(files: File[], onFileStatusChanged: (feId: string, status: FileStatus) => void, key?: string, _public?: boolean): BaseUploaderFile[];
|
|
6
|
+
upload(files: File[], onFileStatusChanged: (feId: string, status: FileStatus) => void, key?: string, _public?: boolean, _bucketName?: string): BaseUploaderFile[];
|
|
7
7
|
protected subscribeToPush(toSubscribe: TempSecureUrl[]): Promise<void>;
|
|
8
8
|
}
|
|
9
9
|
export declare const UploaderModule: UploaderModule_Class;
|
|
@@ -19,7 +19,7 @@ class UploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class
|
|
|
19
19
|
constructor() {
|
|
20
20
|
super(frontend_1.XhrHttpModule, 'UploaderModule');
|
|
21
21
|
}
|
|
22
|
-
upload(files, onFileStatusChanged, key, _public) {
|
|
22
|
+
upload(files, onFileStatusChanged, key, _public, _bucketName) {
|
|
23
23
|
return this.uploadImpl(files.map((file => {
|
|
24
24
|
return {
|
|
25
25
|
name: file.name,
|
|
@@ -29,7 +29,7 @@ class UploaderModule_Class extends BaseUploaderModule_1.BaseUploaderModule_Class
|
|
|
29
29
|
public: _public,
|
|
30
30
|
onFileStatusChanged
|
|
31
31
|
};
|
|
32
|
-
})));
|
|
32
|
+
})), _bucketName);
|
|
33
33
|
}
|
|
34
34
|
subscribeToPush(toSubscribe) {
|
|
35
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/UploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4F;AAC5F,8CAAwH;AACxH,uEAA0E;AAC1E,gFAA6F;AAC7F,4DAA6D;AAE7D,MAAa,oBACT,SAAQ,6CAA6C;IAErD;QACI,KAAK,CAAC,wBAAa,EAAE,gBAAgB,CAAC,CAAC;IAC3C,CAAC;
|
|
1
|
+
{"version":3,"file":"UploaderModule.js","sourceRoot":"","sources":["../../../src/main/app-frontend/modules/UploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4F;AAC5F,8CAAwH;AACxH,uEAA0E;AAC1E,gFAA6F;AAC7F,4DAA6D;AAE7D,MAAa,oBACT,SAAQ,6CAA6C;IAErD;QACI,KAAK,CAAC,wBAAa,EAAE,gBAAgB,CAAC,CAAC;IAC3C,CAAC;IACD,MAAM,CAAC,KAAa,EAAE,mBAA+D,EAAE,GAAY,EAAE,OAAiB,EAAE,WAAoB;QACxI,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;gBACf,mBAAmB;aACtB,CAAC;QACN,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACtB,CAAC;IAEe,eAAe,CAAC,WAA4B;;YACxD,2BAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAChD,MAAM,KAAK,GAAG,EAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAC,CAAC;gBACrC,MAAM,QAAQ,GAAG,CAAC,IAA0B,EAAE,EAAE;oBAC5C,IAAI,CAAC,OAAO,CAAC,sCAAsC,EAAE,uBAAe,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;oBACnF,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;wBAClB,KAAK,oBAAY,CAAC,OAAO;4BACrB,IAAI,CAAC,WAAW,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,QAAQ,EAAE,+BAAU,CAAC,SAAS,CAAC,CAAC;4BAC9D,MAAM;wBACV,KAAK,oBAAY,CAAC,OAAO;4BACrB,IAAI,CAAC,WAAW,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,QAAQ,EAAE,+BAAU,CAAC,KAAK,CAAC,CAAC;4BAC1D,MAAM;oBACd,CAAC;oBACD,2BAAgB,CAAC,WAAW,CAAC,EAAC,OAAO,EAAE,uBAAe,EAAE,KAAK,EAAC,CAAC,CAAC;gBACpE,CAAC,CAAC;gBACF,OAAO,CAAC,EAAC,OAAO,EAAE,uBAAe,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC,CAAC;YACJ,MAAM,IAAA,mBAAO,EAAC,kBAAM,CAAC,CAAC;QAC1B,CAAC;KAAA;CACJ;AAtCD,oDAsCC;AAEY,QAAA,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -39,7 +39,9 @@ export declare abstract class BaseUploaderModule_Class<HttpModule extends BaseHt
|
|
|
39
39
|
getFileInfo<K extends keyof FileInfo>(id: string, key: K): FileInfo[K] | undefined;
|
|
40
40
|
getFullFileInfo(id: string): FileInfo | undefined;
|
|
41
41
|
protected setFileInfo<K extends keyof FileInfo>(id: string, key: K, value: FileInfo[K]): void;
|
|
42
|
-
uploadImpl(files: FilesToUpload[]): BaseUploaderFile[];
|
|
42
|
+
uploadImpl(files: FilesToUpload[], _bucketName?: string): BaseUploaderFile[];
|
|
43
|
+
private getUrlEndpoint;
|
|
44
|
+
private getUrlEndpointWithBucketName;
|
|
43
45
|
private uploadFiles;
|
|
44
46
|
private uploadFile;
|
|
45
47
|
}
|
|
@@ -87,7 +87,7 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
|
|
|
87
87
|
this.files[id][key] = value;
|
|
88
88
|
this.files[id].statusCallBack(id, this.files[id].status);
|
|
89
89
|
}
|
|
90
|
-
uploadImpl(files) {
|
|
90
|
+
uploadImpl(files, _bucketName) {
|
|
91
91
|
const body = files.map(fileData => {
|
|
92
92
|
const fileInfo = {
|
|
93
93
|
name: fileData.name,
|
|
@@ -107,6 +107,13 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
|
|
|
107
107
|
};
|
|
108
108
|
return fileInfo;
|
|
109
109
|
});
|
|
110
|
+
if (_bucketName)
|
|
111
|
+
this.getUrlEndpointWithBucketName({ files: body, bucketName: _bucketName });
|
|
112
|
+
else
|
|
113
|
+
this.getUrlEndpoint(body);
|
|
114
|
+
return body;
|
|
115
|
+
}
|
|
116
|
+
getUrlEndpoint(body) {
|
|
110
117
|
this
|
|
111
118
|
.httpModule
|
|
112
119
|
.createRequest(thunderstorm_1.HttpMethod.POST, RequestKey_UploadUrl)
|
|
@@ -125,7 +132,26 @@ class BaseUploaderModule_Class extends ts_common_1.Module {
|
|
|
125
132
|
// Not a relevant await but still...
|
|
126
133
|
yield this.uploadFiles(response);
|
|
127
134
|
}));
|
|
128
|
-
|
|
135
|
+
}
|
|
136
|
+
getUrlEndpointWithBucketName(body) {
|
|
137
|
+
this
|
|
138
|
+
.httpModule
|
|
139
|
+
.createRequest(thunderstorm_1.HttpMethod.POST, RequestKey_UploadUrl)
|
|
140
|
+
.setRelativeUrl('/v1/upload/get-url-with-bucket-name')
|
|
141
|
+
.setJsonBody(body)
|
|
142
|
+
.setOnError((request, resError) => {
|
|
143
|
+
body.files.forEach(f => {
|
|
144
|
+
this.setFileInfo(f.feId, "messageStatus", (0, ts_common_1.__stringify)(resError === null || resError === void 0 ? void 0 : resError.debugMessage));
|
|
145
|
+
this.setFileInfo(f.feId, "status", FileStatus.Error);
|
|
146
|
+
});
|
|
147
|
+
})
|
|
148
|
+
.execute((response) => __awaiter(this, void 0, void 0, function* () {
|
|
149
|
+
body.files.forEach(f => this.setFileInfo(f.feId, "status", FileStatus.UrlObtained));
|
|
150
|
+
if (!response)
|
|
151
|
+
return;
|
|
152
|
+
// Not a relevant await but still...
|
|
153
|
+
yield this.uploadFiles(response);
|
|
154
|
+
}));
|
|
129
155
|
}
|
|
130
156
|
}
|
|
131
157
|
exports.BaseUploaderModule_Class = BaseUploaderModule_Class;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseUploaderModule.js","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAOsC;AACtC,kEAMyC;
|
|
1
|
+
{"version":3,"file":"BaseUploaderModule.js","sourceRoot":"","sources":["../../../src/main/shared/modules/BaseUploaderModule.ts"],"names":[],"mappings":"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"}
|
package/shared/types.d.ts
CHANGED
|
@@ -35,4 +35,9 @@ export type TempSecureUrl = {
|
|
|
35
35
|
secureUrl: string;
|
|
36
36
|
tempDoc: DB_Temp_File;
|
|
37
37
|
};
|
|
38
|
+
export type Body_GetUploadUrlWithBucketName = {
|
|
39
|
+
files: BaseUploaderFile[];
|
|
40
|
+
bucketName: string;
|
|
41
|
+
};
|
|
38
42
|
export type Api_GetUploadUrl = ApiWithBody<"/v1/upload/get-url", BaseUploaderFile[], TempSecureUrl[]>;
|
|
43
|
+
export type Api_GetUploadUrlWithBucketName = ApiWithBody<"/v1/upload/get-url-with-bucket-name", Body_GetUploadUrlWithBucketName, TempSecureUrl[]>;
|