@data-loom/storage-js 0.4.1 → 0.4.2-alpha.2
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/helpers.d.ts +1 -0
- package/dist/main/lib/helpers.d.ts.map +1 -1
- package/dist/main/lib/helpers.js +6 -1
- package/dist/main/lib/helpers.js.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 +63 -13
- 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/helpers.d.ts +1 -0
- package/dist/module/lib/helpers.d.ts.map +1 -1
- package/dist/module/lib/helpers.js +4 -0
- package/dist/module/lib/helpers.js.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 +64 -14
- 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,6 +1,6 @@
|
|
|
1
1
|
import { isStorageError, StorageError, StorageUnknownError, isCustomError } from '../lib/errors';
|
|
2
2
|
import { get, post, put, remove } from '../lib/fetch';
|
|
3
|
-
import { resolveFetch, getUpdateFileSize, toValidExpiresIn, transformFilePayload, } from '../lib/helpers';
|
|
3
|
+
import { resolveFetch, getUpdateFileSize, toValidExpiresIn, transformFilePayload, sanitizeFileName, } from '../lib/helpers';
|
|
4
4
|
const DEFAULT_SEARCH_OPTIONS = {
|
|
5
5
|
limit: 100,
|
|
6
6
|
offset: 0,
|
|
@@ -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="${sanitizeFileName(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,
|
|
@@ -170,8 +192,7 @@ export default class StorageFileApi {
|
|
|
170
192
|
*/
|
|
171
193
|
async download(path, options) {
|
|
172
194
|
try {
|
|
173
|
-
const
|
|
174
|
-
const res = await get(this.fetch, `${this.url}/object/${_path}`, {
|
|
195
|
+
const res = await get(this.fetch, `${this.url}/object/${path}`, {
|
|
175
196
|
headers: this.headers,
|
|
176
197
|
noResolveJson: true,
|
|
177
198
|
logFetch: this.loggerEnabled,
|
|
@@ -202,7 +223,8 @@ export default class StorageFileApi {
|
|
|
202
223
|
*/
|
|
203
224
|
async remove(paths) {
|
|
204
225
|
try {
|
|
205
|
-
const
|
|
226
|
+
const _paths = paths.map((path) => this._retrieveFilePathFromDownloadUrl(path));
|
|
227
|
+
const res = await remove(this.fetch, `${this.url}/object/${this.bucketId}`, { prefixes: _paths }, {
|
|
206
228
|
headers: this.headers,
|
|
207
229
|
logFetch: this.loggerEnabled,
|
|
208
230
|
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,
|
|
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,EACpB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAcxB,MAAM,sBAAsB,GAAG;IAC7B,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,CAAC;IACT,MAAM,EAAE;QACN,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;CACF,CAAC;AAEF,MAAM,oBAAoB,GAAgB;IACxC,MAAM,EAAE,KAAK;CACd,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc;IASjC,YACE,GAAW,EACX,UAAqC,EAAE,EACvC,QAAiB,EACjB,KAAc,EACd,KAAa,EACb,aAAuB,EACvB,cAAoD;QAEpD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,cAAc,CAC1B,IAAY,EACZ,QAAkB,EAClB,WAAyC;;QAWzC,IAAI;YACF,MAAM,OAAO,mCAAQ,oBAAoB,GAAK,WAAW,CAAE,CAAC;YAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,kBAAkB,GAAG,IAAI,CAAC;YAC9B,IAAK,OAAyB,aAAzB,OAAO,uBAAP,OAAO,CAAoB,kBAAkB,EAAE;gBAClD,kBAAkB,GAAI,OAAyB,aAAzB,OAAO,uBAAP,OAAO,CAAoB,kBAAkB,CAAC;aACrE;iBAAM,IAAI,QAAQ,YAAY,IAAI,EAAE;gBACnC,kBAAkB,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC;aACrC;YAED,aAAa;YACb,MAAM,aAAa,GAAkB;gBACnC,SAAS,EAAE,MAAA,IAAI,CAAC,QAAQ,mCAAI,EAAE;gBAC9B,SAAS,EAAE,iBAAiB,CAAC,QAAQ,CAAC;gBACtC,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK;gBAC/B,SAAS,EAAE,SAAS;aACrB,CAAC;YAEF,MAAM,GAAG,GAAG,MAAM,IAAI,CACpB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,WAAW,IAAI,CAAC,QAAQ,aAAa,EAChD,aAAuB,EACvB;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,aAAa;gBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,EACD,SAAS,EACT,EAAE,OAAO,EAAE,0BAA0B,EAAE,CACxC,CAAC;YACF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,EAAE,CAAC;YAElD,IAAI,UAAU,IAAI,SAAS,EAAE;gBAC3B,MAAM,UAAU,GAA2B,EAAE,CAAC;gBAE9C,IAAI,kBAAkB,EAAE;oBACtB,UAAU,CAAC,qBAAqB,CAAC,GAAG,yBAAyB,gBAAgB,CAC3E,kBAAkB,CACnB,GAAG,CAAC;iBACN;gBACD,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,KAAK,CAAC,EAAE;oBACtD,UAAU,CAAC,eAAe,CAAC,GAAG,WAAW,OAAO,CAAC,YAAY,EAAE,CAAC;iBACjE;gBACD,IAAI,OAAO,CAAC,WAAW,EAAE;oBACvB,UAAU,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC;iBAClD;gBACD,MAAM,MAAM,GAAG,MAAM,GAAG,CACtB,IAAI,CAAC,KAAK,EACV,UAAU,EACV,QAAkB,EAClB;oBACE,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE,UAAU;oBACnB,QAAQ,EAAE,IAAI,CAAC,aAAa;oBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;iBACpC,EACD,SAAS,EACT,EAAE,OAAO,EAAE,0BAA0B,EAAE,CACxC,CAAC;gBAEF,MAAM,IAAI,GAAG,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,GAAG,CAAC,MAAM,CAAC,mCAAI,EAAE,CAAC;gBAEhD,MAAM,WAAW,GAAG,MAAM,IAAI,CAC5B,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,kBAAkB,EAC7B;oBACE,SAAS;oBACT,IAAI;oBACJ,MAAM,EAAE,IAAI,CAAC,KAAK;iBACnB,EACD;oBACE,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,QAAQ,EAAE,IAAI,CAAC,aAAa;oBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;iBACpC,EACD,SAAS,EACT,EAAE,OAAO,EAAE,yBAAyB,EAAE,CACvC,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,mCAAI,EAAE;oBAC7B,KAAK,EAAE,IAAI;iBACZ,CAAC;aACH;iBAAM;gBACL,OAAO;oBACL,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,IAAI,YAAY,CAAC,kCAAkC,CAAC;iBAC5D,CAAC;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;gBACjD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAqB,EAAE,CAAC;aACrD;YAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,mBAAmB,CAAC,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;SACnF;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,QAAkB,EAClB,WAAyB;QAWzB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CACd,QAAkB,EAClB,WAA2B;;QAW3B,OAAO,IAAI,CAAC,cAAc,CAAC,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,mCAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjF,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,QAUU,EACV,WAAyB;QAWzB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,eAAe,CACnB,IAAY,EACZ,SAAiB,EACjB,OAAuE;QAWvE,IAAI;YACF,IAAI,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAErC,MAAM,GAAG,GAAG,MAAM,IAAI,CACpB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,gBAAgB,KAAK,EAAE,EAClC,EAAE,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAAE,EAC3C;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,aAAa;gBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,EACD,SAAS,EACT,EAAE,OAAO,EAAE,yBAAyB,EAAE,CACvC,CAAC;YAEF,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACxC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;gBACjD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAqB,EAAE,CAAC;aACrD;YAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,mBAAmB,CAAC,yBAAyB,EAAE,KAAK,CAAC,EAAE,CAAC;SACzF;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,gBAAgB,CACpB,KAAe,EACf,SAAiB,EACjB,OAAwC;QAWxC,IAAI;YACF,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,CAAC,CAAC;YAEhF,MAAM,GAAG,GAAG,MAAM,IAAI,CACpB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,gBAAgB,IAAI,CAAC,QAAQ,EAAE,EAC1C,EAAE,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAC1D;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,aAAa;gBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,EACD,SAAS,EACT,EAAE,OAAO,EAAE,0BAA0B,EAAE,CACxC,CAAC;YAEF,OAAO;gBACL,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,KAAK,EAAE,IAAI;aACZ,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;gBACjD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAqB,EAAE,CAAC;aACrD;YAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,mBAAmB,CAAC,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC;SAC1F;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,OAA0C;QAW1C,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,GAAG,CACnB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,WAAW,IAAI,EAAE,EAC5B;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,IAAI,CAAC,aAAa;gBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,EACD,SAAS,EACT,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAChC,CAAC;YAEF,IAAI,OAAO,CAAC;YAEZ,yGAAyG;YACzG,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,WAAW,EAAE;gBAC/D,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aAC5B;iBAAM;gBACL,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC3B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;aACvC;YAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACvC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;gBACjD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAqB,EAAE,CAAC;aACrD;YAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,mBAAmB,CAAC,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC;SACrF;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,KAAe;QAU1B,IAAI;YACF,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,CAAC,CAAC;YAEhF,MAAM,GAAG,GAAG,MAAM,MAAM,CACtB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,WAAW,IAAI,CAAC,QAAQ,EAAE,EACrC,EAAE,QAAQ,EAAE,MAAM,EAAE,EACpB;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,aAAa;gBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,EACD,SAAS,EACT,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAC9B,CAAC;YACF,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACvF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;gBACjD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAqB,EAAE,CAAC;aACrD;YAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,mBAAmB,CAAC,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC;SACnF;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CACR,IAAa,EACb,OAAuB,EACvB,UAA4B;QAW5B,IAAI;YACF,MAAM,IAAI,iDAAQ,sBAAsB,GAAK,OAAO,KAAE,MAAM,EAAE,IAAI,IAAI,EAAE,GAAE,CAAC;YAC3E,MAAM,GAAG,GAAG,MAAM,IAAI,CACpB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,gBAAgB,IAAI,CAAC,QAAQ,EAAE,EAC1C,IAAI,EACJ;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,aAAa;gBAC5B,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,EACD,UAAU,EACV,EAAE,OAAO,EAAE,cAAc,EAAE,CAC5B,CAAC;YAEF,MAAM,eAAe,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;YAEhF,OAAO;gBACL,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,IAAI;aACZ,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;gBACjD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAqB,EAAE,CAAC;aACrD;YAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;SACjF;IACH,CAAC;IAES,cAAc,CAAC,QAA6B;QACpD,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACjC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SAC7C;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAEO,aAAa,CAAC,IAAY;QAChC,IAAI,KAAK,GAAG,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,CAAC;QAExD,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;IACzD,CAAC;IAEO,mBAAmB,CAAC,IAAY;QACtC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3D,CAAC;IAEO,mBAAmB,CAAC,GAAW;QACrC,OAAO,qDAAqD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC;IAED;;;OAGG;IACK,gCAAgC,CAAC,GAAW;QAClD,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE;YAClC,OAAO,GAAG,CAAC;SACZ;QAED,MAAM,UAAU,GAAG,UAAU,CAAC;QAC9B,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE;YACtB,OAAO,EAAE,CAAC;SACX;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEhD,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE;YACzB,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;YACrD,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;SACnC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF"}
|
|
@@ -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"}
|
|
@@ -7,6 +7,12 @@ export const logRequest = (params, psmName = 'Storage') => {
|
|
|
7
7
|
};
|
|
8
8
|
export const logResponse = (traceId, response, psmName = 'Storage') => {
|
|
9
9
|
const { data, error, status } = response;
|
|
10
|
-
|
|
10
|
+
const hasError = !!error;
|
|
11
|
+
if (hasError) {
|
|
12
|
+
console.error(`[Dataloom][${psmName}][Response Failed]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
console.log(`[Dataloom][${psmName}][Response Success]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
16
|
+
}
|
|
11
17
|
};
|
|
12
18
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,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;AAEF,MAAM,CAAC,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":"AASA,MAAM,CAAC,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;AAEF,MAAM,CAAC,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@data-loom/storage-js",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.2-alpha.2",
|
|
4
4
|
"description": "Dataloom service, modified from supabase/storage-js",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"service",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"test:types:watch": "run-s build && tsd --files 'test/**/*.test-d.ts' --watch"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@data-loom/node-fetch": "0.4.
|
|
36
|
+
"@data-loom/node-fetch": "0.4.2-alpha.2"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/jest": "^26.0.13",
|