@data-loom/storage-js 0.4.1 → 0.4.2-alpha.1
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/README.md +423 -109
- package/dist/main/StorageClient.d.ts +1 -1
- package/dist/main/StorageClient.d.ts.map +1 -1
- package/dist/main/lib/types.d.ts +27 -1
- package/dist/main/lib/types.d.ts.map +1 -1
- package/dist/main/packages/StorageBucketApi.js +1 -1
- package/dist/main/packages/StorageBucketApi.js.map +1 -1
- package/dist/main/packages/StorageFileApi.d.ts +20 -1
- package/dist/main/packages/StorageFileApi.d.ts.map +1 -1
- package/dist/main/packages/StorageFileApi.js +60 -10
- package/dist/main/packages/StorageFileApi.js.map +1 -1
- package/dist/main/utils/logger.d.ts.map +1 -1
- package/dist/main/utils/logger.js +7 -1
- package/dist/main/utils/logger.js.map +1 -1
- package/dist/module/StorageClient.d.ts +1 -1
- package/dist/module/StorageClient.d.ts.map +1 -1
- package/dist/module/lib/types.d.ts +27 -1
- package/dist/module/lib/types.d.ts.map +1 -1
- package/dist/module/packages/StorageBucketApi.js +1 -1
- package/dist/module/packages/StorageBucketApi.js.map +1 -1
- package/dist/module/packages/StorageFileApi.d.ts +20 -1
- package/dist/module/packages/StorageFileApi.d.ts.map +1 -1
- package/dist/module/packages/StorageFileApi.js +60 -10
- package/dist/module/packages/StorageFileApi.js.map +1 -1
- package/dist/module/utils/logger.d.ts.map +1 -1
- package/dist/module/utils/logger.js +7 -1
- package/dist/module/utils/logger.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageBucketApi.js","sourceRoot":"","sources":["../../../src/packages/StorageBucketApi.ts"],"names":[],"mappings":";;AAAA,gDAAmD;AACnD,0CAA6D;AAC7D,wCAA6D;AAC7D,4CAA8C;AAI9C,MAAqB,gBAAgB;IAQnC,YACE,GAAW,EACX,UAAqC,EAAE,EACvC,KAAa,EACb,IAA2B;QAE3B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAE7B,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,mCAAQ,2BAAe,GAAK,OAAO,CAAE,CAAC;QAClD,IAAI,CAAC,KAAK,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC;QAEzB,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,
|
|
1
|
+
{"version":3,"file":"StorageBucketApi.js","sourceRoot":"","sources":["../../../src/packages/StorageBucketApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
/// <reference types="node" />
|
|
4
4
|
import { StorageError } from '../lib/errors';
|
|
5
5
|
import { Fetch } from '../lib/fetch';
|
|
6
|
-
import { FileObject, FileOptions, FetchParameters, SearchOptions, FileBody, TransformOptions, OnRequestErrorType, UploadFileData } from '../lib/types';
|
|
6
|
+
import { FileObject, FileOptions, FileOptionsV2, FetchParameters, SearchOptions, FileBody, TransformOptions, OnRequestErrorType, UploadFileData } from '../lib/types';
|
|
7
7
|
export default class StorageFileApi {
|
|
8
8
|
protected url: string;
|
|
9
9
|
protected headers: {
|
|
@@ -38,6 +38,19 @@ export default class StorageFileApi {
|
|
|
38
38
|
data: null;
|
|
39
39
|
error: StorageError;
|
|
40
40
|
}>;
|
|
41
|
+
/**
|
|
42
|
+
* Uploads a file to an existing bucket.
|
|
43
|
+
*
|
|
44
|
+
* @param path The file path, including the file name. Should be of the format `folder/subfolder/filename.png`. The bucket must already exist before attempting to upload.
|
|
45
|
+
* @param fileBody The body of the file to be stored in the bucket.
|
|
46
|
+
*/
|
|
47
|
+
uploadFile(fileBody: FileBody, fileOptions?: FileOptionsV2): Promise<{
|
|
48
|
+
data: UploadFileData;
|
|
49
|
+
error: null;
|
|
50
|
+
} | {
|
|
51
|
+
data: null;
|
|
52
|
+
error: StorageError;
|
|
53
|
+
}>;
|
|
41
54
|
/**
|
|
42
55
|
* Replaces an existing file at the specified path with a new one.
|
|
43
56
|
*
|
|
@@ -138,5 +151,11 @@ export default class StorageFileApi {
|
|
|
138
151
|
toBase64(data: string): string;
|
|
139
152
|
private _getFinalPath;
|
|
140
153
|
private _removeEmptyFolders;
|
|
154
|
+
private _isValidDownloadUrl;
|
|
155
|
+
/**
|
|
156
|
+
* Get the filePath from download url with format like
|
|
157
|
+
* /spark/app/app_xxxx/runtime/api/v1/storage/object/bucket_xxx/123%2Fimage.png
|
|
158
|
+
*/
|
|
159
|
+
private _retrieveFilePathFromDownloadUrl;
|
|
141
160
|
}
|
|
142
161
|
//# sourceMappingURL=StorageFileApi.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAkB,YAAY,EAAsC,MAAM,eAAe,CAAC;AACjG,OAAO,EAAE,KAAK,EAA0B,MAAM,cAAc,CAAC;AAO7D,OAAO,EACL,UAAU,EACV,WAAW,EACX,eAAe,EACf,aAAa,EAEb,QAAQ,EACR,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACf,MAAM,cAAc,CAAC;AAetB,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAG7D,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EACvC,QAAQ,CAAC,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK,EACb,aAAa,CAAC,EAAE,OAAO,EACvB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI;IAWtD;;;;;;OAMG;YACW,cAAc;
|
|
1
|
+
{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,24 +32,35 @@ class StorageFileApi {
|
|
|
32
32
|
* @param fileBody The body of the file to be stored in the bucket.
|
|
33
33
|
*/
|
|
34
34
|
async uploadOrUpdate(path, fileBody, fileOptions) {
|
|
35
|
-
var _a, _b, _c, _d, _e;
|
|
35
|
+
var _a, _b, _c, _d, _e, _f;
|
|
36
36
|
try {
|
|
37
37
|
const options = Object.assign(Object.assign({}, DEFAULT_FILE_OPTIONS), fileOptions);
|
|
38
|
+
const cleanPath = this._removeEmptyFolders(path);
|
|
39
|
+
let contentDisposition = null;
|
|
40
|
+
if (options === null || options === void 0 ? void 0 : options.contentDisposition) {
|
|
41
|
+
contentDisposition = options === null || options === void 0 ? void 0 : options.contentDisposition;
|
|
42
|
+
}
|
|
43
|
+
else if (fileBody instanceof File) {
|
|
44
|
+
contentDisposition = fileBody === null || fileBody === void 0 ? void 0 : fileBody.name;
|
|
45
|
+
}
|
|
38
46
|
// pre-upload
|
|
39
47
|
const preUploadBody = {
|
|
48
|
+
bucket_id: (_a = this.bucketId) !== null && _a !== void 0 ? _a : '',
|
|
40
49
|
file_size: (0, helpers_1.getUpdateFileSize)(fileBody),
|
|
41
|
-
upsert: (
|
|
50
|
+
upsert: (_b = options.upsert) !== null && _b !== void 0 ? _b : false,
|
|
51
|
+
file_path: cleanPath,
|
|
42
52
|
};
|
|
43
|
-
const
|
|
44
|
-
const _path = this._getFinalPath(cleanPath);
|
|
45
|
-
const res = await (0, fetch_1.post)(this.fetch, `${this.url}/object/${_path}`, preUploadBody, {
|
|
53
|
+
const res = await (0, fetch_1.post)(this.fetch, `${this.url}/object/${this.bucketId}/pre_upload`, preUploadBody, {
|
|
46
54
|
headers: this.headers,
|
|
47
55
|
logFetch: this.loggerEnabled,
|
|
48
56
|
onRequestError: this.onRequestError,
|
|
49
57
|
}, undefined, { psmName: 'Storage.Upload.PreUpload' });
|
|
50
|
-
const { upload_id, upload_url } = (
|
|
58
|
+
const { upload_id, upload_url } = (_c = res === null || res === void 0 ? void 0 : res.data) !== null && _c !== void 0 ? _c : {};
|
|
51
59
|
if (upload_url && upload_id) {
|
|
52
60
|
const tosHeaders = {};
|
|
61
|
+
if (contentDisposition) {
|
|
62
|
+
tosHeaders['content-disposition'] = `attachment; filename="${contentDisposition}"`;
|
|
63
|
+
}
|
|
53
64
|
if (options.cacheControl || options.cacheControl === 0) {
|
|
54
65
|
tosHeaders['cache-control'] = `max-age=${options.cacheControl}`;
|
|
55
66
|
}
|
|
@@ -62,7 +73,7 @@ class StorageFileApi {
|
|
|
62
73
|
logFetch: this.loggerEnabled,
|
|
63
74
|
onRequestError: this.onRequestError,
|
|
64
75
|
}, undefined, { psmName: 'Storage.Upload.TosUpload' });
|
|
65
|
-
const etag = (
|
|
76
|
+
const etag = (_e = (_d = tosRes === null || tosRes === void 0 ? void 0 : tosRes.headers) === null || _d === void 0 ? void 0 : _d.get('Etag')) !== null && _e !== void 0 ? _e : '';
|
|
66
77
|
const callbackRes = await (0, fetch_1.post)(this.fetch, `${this.url}/object/callback`, {
|
|
67
78
|
upload_id,
|
|
68
79
|
etag,
|
|
@@ -73,7 +84,7 @@ class StorageFileApi {
|
|
|
73
84
|
onRequestError: this.onRequestError,
|
|
74
85
|
}, undefined, { psmName: 'Storage.Upload.Callback' });
|
|
75
86
|
return {
|
|
76
|
-
data: (
|
|
87
|
+
data: (_f = callbackRes === null || callbackRes === void 0 ? void 0 : callbackRes.data) !== null && _f !== void 0 ? _f : {},
|
|
77
88
|
error: null,
|
|
78
89
|
};
|
|
79
90
|
}
|
|
@@ -100,6 +111,16 @@ class StorageFileApi {
|
|
|
100
111
|
async upload(path, fileBody, fileOptions) {
|
|
101
112
|
return this.uploadOrUpdate(path, fileBody, fileOptions);
|
|
102
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
* Uploads a file to an existing bucket.
|
|
116
|
+
*
|
|
117
|
+
* @param path The file path, including the file name. Should be of the format `folder/subfolder/filename.png`. The bucket must already exist before attempting to upload.
|
|
118
|
+
* @param fileBody The body of the file to be stored in the bucket.
|
|
119
|
+
*/
|
|
120
|
+
async uploadFile(fileBody, fileOptions) {
|
|
121
|
+
var _a;
|
|
122
|
+
return this.uploadOrUpdate((_a = fileOptions === null || fileOptions === void 0 ? void 0 : fileOptions.filePath) !== null && _a !== void 0 ? _a : '', fileBody, fileOptions);
|
|
123
|
+
}
|
|
103
124
|
/**
|
|
104
125
|
* Replaces an existing file at the specified path with a new one.
|
|
105
126
|
*
|
|
@@ -147,7 +168,8 @@ class StorageFileApi {
|
|
|
147
168
|
*/
|
|
148
169
|
async createSignedUrls(paths, expiresIn, options) {
|
|
149
170
|
try {
|
|
150
|
-
const
|
|
171
|
+
const _paths = paths.map((path) => this._retrieveFilePathFromDownloadUrl(path));
|
|
172
|
+
const res = await (0, fetch_1.post)(this.fetch, `${this.url}/object/sign/${this.bucketId}`, { expires_in: (0, helpers_1.toValidExpiresIn)(expiresIn), paths: _paths }, {
|
|
151
173
|
headers: this.headers,
|
|
152
174
|
logFetch: this.loggerEnabled,
|
|
153
175
|
onRequestError: this.onRequestError,
|
|
@@ -254,11 +276,39 @@ class StorageFileApi {
|
|
|
254
276
|
return btoa(data);
|
|
255
277
|
}
|
|
256
278
|
_getFinalPath(path) {
|
|
257
|
-
|
|
279
|
+
let _path = this._retrieveFilePathFromDownloadUrl(path);
|
|
280
|
+
return `${this.bucketId}/${_path.replace(/^\/+/, '')}`;
|
|
258
281
|
}
|
|
259
282
|
_removeEmptyFolders(path) {
|
|
283
|
+
if (!path) {
|
|
284
|
+
return path;
|
|
285
|
+
}
|
|
260
286
|
return path.replace(/^\/|\/$/g, '').replace(/\/+/g, '/');
|
|
261
287
|
}
|
|
288
|
+
_isValidDownloadUrl(url) {
|
|
289
|
+
return /^\/spark\/app\/app_[\w]+\/runtime\/api\/v1\/storage/.test(url);
|
|
290
|
+
}
|
|
291
|
+
/**
|
|
292
|
+
* Get the filePath from download url with format like
|
|
293
|
+
* /spark/app/app_xxxx/runtime/api/v1/storage/object/bucket_xxx/123%2Fimage.png
|
|
294
|
+
*/
|
|
295
|
+
_retrieveFilePathFromDownloadUrl(url) {
|
|
296
|
+
if (!this._isValidDownloadUrl(url)) {
|
|
297
|
+
return url;
|
|
298
|
+
}
|
|
299
|
+
const objectPath = '/object/';
|
|
300
|
+
const objectIndex = url.indexOf(objectPath);
|
|
301
|
+
if (objectIndex === -1) {
|
|
302
|
+
return '';
|
|
303
|
+
}
|
|
304
|
+
const afterObject = url.slice(objectIndex + objectPath.length);
|
|
305
|
+
const bucketEndIndex = afterObject.indexOf('/');
|
|
306
|
+
if (bucketEndIndex !== -1) {
|
|
307
|
+
const result = afterObject.slice(bucketEndIndex + 1);
|
|
308
|
+
return decodeURIComponent(result);
|
|
309
|
+
}
|
|
310
|
+
return '';
|
|
311
|
+
}
|
|
262
312
|
}
|
|
263
313
|
exports.default = StorageFileApi;
|
|
264
314
|
//# sourceMappingURL=StorageFileApi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageFileApi.js","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":";;AAAA,0CAAiG;AACjG,wCAA6D;AAC7D,4CAKwB;
|
|
1
|
+
{"version":3,"file":"StorageFileApi.js","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE9D,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,SAAS,2BAiB3C,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,MAAM,YACL;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE9D,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,SAAS,2BAiB3C,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,MAAM,YACL;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,MAAM,CAAA;CAAE,2BA2BpD,CAAC"}
|
|
@@ -11,7 +11,13 @@ const logRequest = (params, psmName = 'Storage') => {
|
|
|
11
11
|
exports.logRequest = logRequest;
|
|
12
12
|
const logResponse = (traceId, response, psmName = 'Storage') => {
|
|
13
13
|
const { data, error, status } = response;
|
|
14
|
-
|
|
14
|
+
const hasError = !!error;
|
|
15
|
+
if (hasError) {
|
|
16
|
+
console.error(`[Dataloom][${psmName}][Response Failed]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
console.log(`[Dataloom][${psmName}][Response Success]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
20
|
+
}
|
|
15
21
|
};
|
|
16
22
|
exports.logResponse = logResponse;
|
|
17
23
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":";;;AASO,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,OAAO,GAAG,SAAS,EAAE,EAAE;IACnE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;IAE5C,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,YAAY,EACjC,WAAW,EACX,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EACvB,OAAO,EACP,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB;AAEK,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,QAAmD,EACnD,OAAO,GAAG,SAAS,EACnB,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":";;;AASO,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,OAAO,GAAG,SAAS,EAAE,EAAE;IACnE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SAClE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;IAE5C,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,YAAY,EACjC,WAAW,EACX,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EACvB,OAAO,EACP,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB;AAEK,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,QAAmD,EACnD,OAAO,GAAG,SAAS,EACnB,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC;IAEzB,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,KAAK,CACX,cAAc,OAAO,oBAAoB,EACzC,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,QAAQ,EACR,KAAK,CACN,CAAC;KACH;SAAM;QACL,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,qBAAqB,EAC1C,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,OAAO,EACP,IAAI,CACL,CAAC;KACH;AACH,CAAC,CAAC;AA7BW,QAAA,WAAW,eA6BtB"}
|
|
@@ -4,7 +4,7 @@ import { Fetch } from './lib/fetch';
|
|
|
4
4
|
import { type OnRequestErrorType } from './lib/types';
|
|
5
5
|
export interface StorageClientOptions {
|
|
6
6
|
useNewHostname?: boolean;
|
|
7
|
-
|
|
7
|
+
enableLogger?: boolean;
|
|
8
8
|
appId?: string;
|
|
9
9
|
onRequestError: (error: OnRequestErrorType) => void;
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageClient.d.ts","sourceRoot":"","sources":["../../src/StorageClient.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,
|
|
1
|
+
{"version":3,"file":"StorageClient.d.ts","sourceRoot":"","sources":["../../src/StorageClient.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACrD;AAED,qBAAa,aAAc,SAAQ,gBAAgB;gBAE/C,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EACvC,KAAK,CAAC,EAAE,KAAK,EACb,IAAI,CAAC,EAAE,oBAAoB;IAK7B;;;;OAIG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc;CAWjC"}
|
|
@@ -94,9 +94,35 @@ export interface FileOptions {
|
|
|
94
94
|
*/
|
|
95
95
|
headers?: Record<string, string>;
|
|
96
96
|
}
|
|
97
|
+
export interface FileOptionsV2 {
|
|
98
|
+
/**
|
|
99
|
+
*
|
|
100
|
+
*/
|
|
101
|
+
filePath?: string;
|
|
102
|
+
/**
|
|
103
|
+
* The number of seconds the asset is cached in the browser and in the Supabase CDN. This is set in the `Cache-Control: max-age=<seconds>` header.
|
|
104
|
+
*/
|
|
105
|
+
cacheControl?: string | number;
|
|
106
|
+
/**
|
|
107
|
+
* the `Content-Type` header value.
|
|
108
|
+
*/
|
|
109
|
+
contentType?: string;
|
|
110
|
+
/**
|
|
111
|
+
* When upsert is set to true, the file is overwritten if it exists. When set to false, an error is thrown if the object already exists. Defaults to false.
|
|
112
|
+
*/
|
|
113
|
+
upsert?: boolean;
|
|
114
|
+
/**
|
|
115
|
+
* The `Content-Disposition` resposne header value when downloading the file.
|
|
116
|
+
*/
|
|
117
|
+
contentDisposition?: string;
|
|
118
|
+
}
|
|
97
119
|
export interface PreUploadBody {
|
|
120
|
+
bucket_id: string;
|
|
98
121
|
file_size: string;
|
|
99
|
-
upsert
|
|
122
|
+
upsert?: boolean;
|
|
123
|
+
file_path?: string;
|
|
124
|
+
content_disposition?: string;
|
|
125
|
+
content_type?: string;
|
|
100
126
|
}
|
|
101
127
|
export interface DestinationOptions {
|
|
102
128
|
destinationBucket?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export default class StorageBucketApi {
|
|
|
10
10
|
this.fetch = resolveFetch(fetch);
|
|
11
11
|
this.onRequestError = opts === null || opts === void 0 ? void 0 : opts.onRequestError;
|
|
12
12
|
this.appId = opts === null || opts === void 0 ? void 0 : opts.appId;
|
|
13
|
-
if (opts === null || opts === void 0 ? void 0 : opts.
|
|
13
|
+
if (opts === null || opts === void 0 ? void 0 : opts.enableLogger) {
|
|
14
14
|
this.loggerEnabled = true;
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageBucketApi.js","sourceRoot":"","sources":["../../../src/packages/StorageBucketApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAgB,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAS,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAQnC,YACE,GAAW,EACX,UAAqC,EAAE,EACvC,KAAa,EACb,IAA2B;QAE3B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAE7B,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,mCAAQ,eAAe,GAAK,OAAO,CAAE,CAAC;QAClD,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC;QAEzB,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,
|
|
1
|
+
{"version":3,"file":"StorageBucketApi.js","sourceRoot":"","sources":["../../../src/packages/StorageBucketApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
/// <reference types="node" />
|
|
4
4
|
import { StorageError } from '../lib/errors';
|
|
5
5
|
import { Fetch } from '../lib/fetch';
|
|
6
|
-
import { FileObject, FileOptions, FetchParameters, SearchOptions, FileBody, TransformOptions, OnRequestErrorType, UploadFileData } from '../lib/types';
|
|
6
|
+
import { FileObject, FileOptions, FileOptionsV2, FetchParameters, SearchOptions, FileBody, TransformOptions, OnRequestErrorType, UploadFileData } from '../lib/types';
|
|
7
7
|
export default class StorageFileApi {
|
|
8
8
|
protected url: string;
|
|
9
9
|
protected headers: {
|
|
@@ -38,6 +38,19 @@ export default class StorageFileApi {
|
|
|
38
38
|
data: null;
|
|
39
39
|
error: StorageError;
|
|
40
40
|
}>;
|
|
41
|
+
/**
|
|
42
|
+
* Uploads a file to an existing bucket.
|
|
43
|
+
*
|
|
44
|
+
* @param path The file path, including the file name. Should be of the format `folder/subfolder/filename.png`. The bucket must already exist before attempting to upload.
|
|
45
|
+
* @param fileBody The body of the file to be stored in the bucket.
|
|
46
|
+
*/
|
|
47
|
+
uploadFile(fileBody: FileBody, fileOptions?: FileOptionsV2): Promise<{
|
|
48
|
+
data: UploadFileData;
|
|
49
|
+
error: null;
|
|
50
|
+
} | {
|
|
51
|
+
data: null;
|
|
52
|
+
error: StorageError;
|
|
53
|
+
}>;
|
|
41
54
|
/**
|
|
42
55
|
* Replaces an existing file at the specified path with a new one.
|
|
43
56
|
*
|
|
@@ -138,5 +151,11 @@ export default class StorageFileApi {
|
|
|
138
151
|
toBase64(data: string): string;
|
|
139
152
|
private _getFinalPath;
|
|
140
153
|
private _removeEmptyFolders;
|
|
154
|
+
private _isValidDownloadUrl;
|
|
155
|
+
/**
|
|
156
|
+
* Get the filePath from download url with format like
|
|
157
|
+
* /spark/app/app_xxxx/runtime/api/v1/storage/object/bucket_xxx/123%2Fimage.png
|
|
158
|
+
*/
|
|
159
|
+
private _retrieveFilePathFromDownloadUrl;
|
|
141
160
|
}
|
|
142
161
|
//# sourceMappingURL=StorageFileApi.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAkB,YAAY,EAAsC,MAAM,eAAe,CAAC;AACjG,OAAO,EAAE,KAAK,EAA0B,MAAM,cAAc,CAAC;AAO7D,OAAO,EACL,UAAU,EACV,WAAW,EACX,eAAe,EACf,aAAa,EAEb,QAAQ,EACR,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACf,MAAM,cAAc,CAAC;AAetB,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAG7D,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EACvC,QAAQ,CAAC,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK,EACb,aAAa,CAAC,EAAE,OAAO,EACvB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI;IAWtD;;;;;;OAMG;YACW,cAAc;
|
|
1
|
+
{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,24 +30,35 @@ export default class StorageFileApi {
|
|
|
30
30
|
* @param fileBody The body of the file to be stored in the bucket.
|
|
31
31
|
*/
|
|
32
32
|
async uploadOrUpdate(path, fileBody, fileOptions) {
|
|
33
|
-
var _a, _b, _c, _d, _e;
|
|
33
|
+
var _a, _b, _c, _d, _e, _f;
|
|
34
34
|
try {
|
|
35
35
|
const options = Object.assign(Object.assign({}, DEFAULT_FILE_OPTIONS), fileOptions);
|
|
36
|
+
const cleanPath = this._removeEmptyFolders(path);
|
|
37
|
+
let contentDisposition = null;
|
|
38
|
+
if (options === null || options === void 0 ? void 0 : options.contentDisposition) {
|
|
39
|
+
contentDisposition = options === null || options === void 0 ? void 0 : options.contentDisposition;
|
|
40
|
+
}
|
|
41
|
+
else if (fileBody instanceof File) {
|
|
42
|
+
contentDisposition = fileBody === null || fileBody === void 0 ? void 0 : fileBody.name;
|
|
43
|
+
}
|
|
36
44
|
// pre-upload
|
|
37
45
|
const preUploadBody = {
|
|
46
|
+
bucket_id: (_a = this.bucketId) !== null && _a !== void 0 ? _a : '',
|
|
38
47
|
file_size: getUpdateFileSize(fileBody),
|
|
39
|
-
upsert: (
|
|
48
|
+
upsert: (_b = options.upsert) !== null && _b !== void 0 ? _b : false,
|
|
49
|
+
file_path: cleanPath,
|
|
40
50
|
};
|
|
41
|
-
const
|
|
42
|
-
const _path = this._getFinalPath(cleanPath);
|
|
43
|
-
const res = await post(this.fetch, `${this.url}/object/${_path}`, preUploadBody, {
|
|
51
|
+
const res = await post(this.fetch, `${this.url}/object/${this.bucketId}/pre_upload`, preUploadBody, {
|
|
44
52
|
headers: this.headers,
|
|
45
53
|
logFetch: this.loggerEnabled,
|
|
46
54
|
onRequestError: this.onRequestError,
|
|
47
55
|
}, undefined, { psmName: 'Storage.Upload.PreUpload' });
|
|
48
|
-
const { upload_id, upload_url } = (
|
|
56
|
+
const { upload_id, upload_url } = (_c = res === null || res === void 0 ? void 0 : res.data) !== null && _c !== void 0 ? _c : {};
|
|
49
57
|
if (upload_url && upload_id) {
|
|
50
58
|
const tosHeaders = {};
|
|
59
|
+
if (contentDisposition) {
|
|
60
|
+
tosHeaders['content-disposition'] = `attachment; filename="${contentDisposition}"`;
|
|
61
|
+
}
|
|
51
62
|
if (options.cacheControl || options.cacheControl === 0) {
|
|
52
63
|
tosHeaders['cache-control'] = `max-age=${options.cacheControl}`;
|
|
53
64
|
}
|
|
@@ -60,7 +71,7 @@ export default class StorageFileApi {
|
|
|
60
71
|
logFetch: this.loggerEnabled,
|
|
61
72
|
onRequestError: this.onRequestError,
|
|
62
73
|
}, undefined, { psmName: 'Storage.Upload.TosUpload' });
|
|
63
|
-
const etag = (
|
|
74
|
+
const etag = (_e = (_d = tosRes === null || tosRes === void 0 ? void 0 : tosRes.headers) === null || _d === void 0 ? void 0 : _d.get('Etag')) !== null && _e !== void 0 ? _e : '';
|
|
64
75
|
const callbackRes = await post(this.fetch, `${this.url}/object/callback`, {
|
|
65
76
|
upload_id,
|
|
66
77
|
etag,
|
|
@@ -71,7 +82,7 @@ export default class StorageFileApi {
|
|
|
71
82
|
onRequestError: this.onRequestError,
|
|
72
83
|
}, undefined, { psmName: 'Storage.Upload.Callback' });
|
|
73
84
|
return {
|
|
74
|
-
data: (
|
|
85
|
+
data: (_f = callbackRes === null || callbackRes === void 0 ? void 0 : callbackRes.data) !== null && _f !== void 0 ? _f : {},
|
|
75
86
|
error: null,
|
|
76
87
|
};
|
|
77
88
|
}
|
|
@@ -98,6 +109,16 @@ export default class StorageFileApi {
|
|
|
98
109
|
async upload(path, fileBody, fileOptions) {
|
|
99
110
|
return this.uploadOrUpdate(path, fileBody, fileOptions);
|
|
100
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Uploads a file to an existing bucket.
|
|
114
|
+
*
|
|
115
|
+
* @param path The file path, including the file name. Should be of the format `folder/subfolder/filename.png`. The bucket must already exist before attempting to upload.
|
|
116
|
+
* @param fileBody The body of the file to be stored in the bucket.
|
|
117
|
+
*/
|
|
118
|
+
async uploadFile(fileBody, fileOptions) {
|
|
119
|
+
var _a;
|
|
120
|
+
return this.uploadOrUpdate((_a = fileOptions === null || fileOptions === void 0 ? void 0 : fileOptions.filePath) !== null && _a !== void 0 ? _a : '', fileBody, fileOptions);
|
|
121
|
+
}
|
|
101
122
|
/**
|
|
102
123
|
* Replaces an existing file at the specified path with a new one.
|
|
103
124
|
*
|
|
@@ -145,7 +166,8 @@ export default class StorageFileApi {
|
|
|
145
166
|
*/
|
|
146
167
|
async createSignedUrls(paths, expiresIn, options) {
|
|
147
168
|
try {
|
|
148
|
-
const
|
|
169
|
+
const _paths = paths.map((path) => this._retrieveFilePathFromDownloadUrl(path));
|
|
170
|
+
const res = await post(this.fetch, `${this.url}/object/sign/${this.bucketId}`, { expires_in: toValidExpiresIn(expiresIn), paths: _paths }, {
|
|
149
171
|
headers: this.headers,
|
|
150
172
|
logFetch: this.loggerEnabled,
|
|
151
173
|
onRequestError: this.onRequestError,
|
|
@@ -252,10 +274,38 @@ export default class StorageFileApi {
|
|
|
252
274
|
return btoa(data);
|
|
253
275
|
}
|
|
254
276
|
_getFinalPath(path) {
|
|
255
|
-
|
|
277
|
+
let _path = this._retrieveFilePathFromDownloadUrl(path);
|
|
278
|
+
return `${this.bucketId}/${_path.replace(/^\/+/, '')}`;
|
|
256
279
|
}
|
|
257
280
|
_removeEmptyFolders(path) {
|
|
281
|
+
if (!path) {
|
|
282
|
+
return path;
|
|
283
|
+
}
|
|
258
284
|
return path.replace(/^\/|\/$/g, '').replace(/\/+/g, '/');
|
|
259
285
|
}
|
|
286
|
+
_isValidDownloadUrl(url) {
|
|
287
|
+
return /^\/spark\/app\/app_[\w]+\/runtime\/api\/v1\/storage/.test(url);
|
|
288
|
+
}
|
|
289
|
+
/**
|
|
290
|
+
* Get the filePath from download url with format like
|
|
291
|
+
* /spark/app/app_xxxx/runtime/api/v1/storage/object/bucket_xxx/123%2Fimage.png
|
|
292
|
+
*/
|
|
293
|
+
_retrieveFilePathFromDownloadUrl(url) {
|
|
294
|
+
if (!this._isValidDownloadUrl(url)) {
|
|
295
|
+
return url;
|
|
296
|
+
}
|
|
297
|
+
const objectPath = '/object/';
|
|
298
|
+
const objectIndex = url.indexOf(objectPath);
|
|
299
|
+
if (objectIndex === -1) {
|
|
300
|
+
return '';
|
|
301
|
+
}
|
|
302
|
+
const afterObject = url.slice(objectIndex + objectPath.length);
|
|
303
|
+
const bucketEndIndex = afterObject.indexOf('/');
|
|
304
|
+
if (bucketEndIndex !== -1) {
|
|
305
|
+
const result = afterObject.slice(bucketEndIndex + 1);
|
|
306
|
+
return decodeURIComponent(result);
|
|
307
|
+
}
|
|
308
|
+
return '';
|
|
309
|
+
}
|
|
260
310
|
}
|
|
261
311
|
//# sourceMappingURL=StorageFileApi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageFileApi.js","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACjG,OAAO,EAAS,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"StorageFileApi.js","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}
|