@data-loom/storage-js 0.4.1-alpha.1 → 0.4.1-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/dist/main/lib/fetch.d.ts +11 -5
- package/dist/main/lib/fetch.d.ts.map +1 -1
- package/dist/main/lib/fetch.js +40 -17
- package/dist/main/lib/fetch.js.map +1 -1
- package/dist/main/packages/StorageFileApi.d.ts.map +1 -1
- package/dist/main/packages/StorageFileApi.js +20 -8
- package/dist/main/packages/StorageFileApi.js.map +1 -1
- package/dist/main/utils/logger.d.ts +2 -2
- package/dist/main/utils/logger.d.ts.map +1 -1
- package/dist/main/utils/logger.js +4 -4
- package/dist/main/utils/logger.js.map +1 -1
- package/dist/module/lib/fetch.d.ts +11 -5
- package/dist/module/lib/fetch.d.ts.map +1 -1
- package/dist/module/lib/fetch.js +40 -17
- package/dist/module/lib/fetch.js.map +1 -1
- package/dist/module/packages/StorageFileApi.d.ts.map +1 -1
- package/dist/module/packages/StorageFileApi.js +20 -8
- package/dist/module/packages/StorageFileApi.js.map +1 -1
- package/dist/module/utils/logger.d.ts +2 -2
- package/dist/module/utils/logger.d.ts.map +1 -1
- package/dist/module/utils/logger.js +4 -4
- package/dist/module/utils/logger.js.map +1 -1
- package/package.json +2 -2
package/dist/main/lib/fetch.d.ts
CHANGED
|
@@ -9,10 +9,16 @@ export interface FetchOptions {
|
|
|
9
9
|
logFetch?: boolean;
|
|
10
10
|
onRequestError?: (error: OnRequestErrorType) => void;
|
|
11
11
|
}
|
|
12
|
+
export interface ExtraInfo {
|
|
13
|
+
/**
|
|
14
|
+
* dataloom PSM name for logging.
|
|
15
|
+
*/
|
|
16
|
+
psmName?: string;
|
|
17
|
+
}
|
|
12
18
|
export type RequestMethodType = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD';
|
|
13
|
-
export declare function get(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
14
|
-
export declare function post(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
15
|
-
export declare function put(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
16
|
-
export declare function head(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
17
|
-
export declare function remove(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
19
|
+
export declare function get(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
20
|
+
export declare function post(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
21
|
+
export declare function put(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
22
|
+
export declare function head(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
23
|
+
export declare function remove(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
18
24
|
//# sourceMappingURL=fetch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI9D,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI9D,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAiM3E,wBAAsB,GAAG,CACvB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,IAAI,CACxB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,GAAG,CACvB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,IAAI,CACxB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAYd;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd"}
|
package/dist/main/lib/fetch.js
CHANGED
|
@@ -61,9 +61,10 @@ const _getRequestParams = (method, options, parameters, body) => {
|
|
|
61
61
|
}
|
|
62
62
|
return Object.assign(Object.assign({}, params), parameters);
|
|
63
63
|
};
|
|
64
|
-
async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
64
|
+
async function _handleRequest(fetcher, method, url, options, parameters, body, extras) {
|
|
65
65
|
let traceId = -1;
|
|
66
66
|
let res_status = 200;
|
|
67
|
+
const psmName = extras === null || extras === void 0 ? void 0 : extras.psmName;
|
|
67
68
|
if (options === null || options === void 0 ? void 0 : options.logFetch) {
|
|
68
69
|
traceId = trace_id_1.traceIdGenerator.next();
|
|
69
70
|
(0, logger_1.logRequest)({
|
|
@@ -71,7 +72,7 @@ async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
|
71
72
|
url,
|
|
72
73
|
method,
|
|
73
74
|
body,
|
|
74
|
-
});
|
|
75
|
+
}, psmName);
|
|
75
76
|
}
|
|
76
77
|
return new Promise((resolve, reject) => {
|
|
77
78
|
fetcher(url, _getRequestParams(method, options, parameters, body))
|
|
@@ -99,16 +100,38 @@ async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
|
99
100
|
data: null,
|
|
100
101
|
error: data,
|
|
101
102
|
status: res_status,
|
|
102
|
-
});
|
|
103
|
+
}, psmName);
|
|
103
104
|
}
|
|
104
105
|
return reject(data);
|
|
105
106
|
}
|
|
106
107
|
if (options === null || options === void 0 ? void 0 : options.logFetch) {
|
|
108
|
+
let parsedData = null;
|
|
109
|
+
let error = null;
|
|
110
|
+
// tos request
|
|
111
|
+
if (options === null || options === void 0 ? void 0 : options.noResolveJson) {
|
|
112
|
+
try {
|
|
113
|
+
// tos response
|
|
114
|
+
if (data.headers.get('server') === 'TosServer' || data.headers.get('etag')) {
|
|
115
|
+
parsedData = data;
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
// dataloom response
|
|
119
|
+
error = await data.clone().json();
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
catch (e) {
|
|
123
|
+
error = _getErrorMessage(e);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
// non-tos request
|
|
128
|
+
parsedData = data;
|
|
129
|
+
}
|
|
107
130
|
(0, logger_1.logResponse)(traceId, {
|
|
108
|
-
data:
|
|
109
|
-
error
|
|
131
|
+
data: parsedData,
|
|
132
|
+
error,
|
|
110
133
|
status: res_status,
|
|
111
|
-
});
|
|
134
|
+
}, psmName);
|
|
112
135
|
}
|
|
113
136
|
return resolve(data);
|
|
114
137
|
})
|
|
@@ -118,30 +141,30 @@ async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
|
118
141
|
data: null,
|
|
119
142
|
error: _getErrorMessage(error),
|
|
120
143
|
status: error === null || error === void 0 ? void 0 : error.status,
|
|
121
|
-
});
|
|
144
|
+
}, psmName);
|
|
122
145
|
}
|
|
123
146
|
handleError(error, reject, options);
|
|
124
147
|
});
|
|
125
148
|
});
|
|
126
149
|
}
|
|
127
|
-
async function get(fetcher, url, options, parameters) {
|
|
128
|
-
return _handleRequest(fetcher, 'GET', url, options, parameters);
|
|
150
|
+
async function get(fetcher, url, options, parameters, extras) {
|
|
151
|
+
return _handleRequest(fetcher, 'GET', url, options, parameters, undefined, extras);
|
|
129
152
|
}
|
|
130
153
|
exports.get = get;
|
|
131
|
-
async function post(fetcher, url, body, options, parameters) {
|
|
132
|
-
return _handleRequest(fetcher, 'POST', url, options, parameters, body);
|
|
154
|
+
async function post(fetcher, url, body, options, parameters, extras) {
|
|
155
|
+
return _handleRequest(fetcher, 'POST', url, options, parameters, body, extras);
|
|
133
156
|
}
|
|
134
157
|
exports.post = post;
|
|
135
|
-
async function put(fetcher, url, body, options, parameters) {
|
|
136
|
-
return _handleRequest(fetcher, 'PUT', url, options, parameters, body);
|
|
158
|
+
async function put(fetcher, url, body, options, parameters, extras) {
|
|
159
|
+
return _handleRequest(fetcher, 'PUT', url, options, parameters, body, extras);
|
|
137
160
|
}
|
|
138
161
|
exports.put = put;
|
|
139
|
-
async function head(fetcher, url, options, parameters) {
|
|
140
|
-
return _handleRequest(fetcher, 'HEAD', url, Object.assign(Object.assign({}, options), { noResolveJson: true }), parameters);
|
|
162
|
+
async function head(fetcher, url, options, parameters, extras) {
|
|
163
|
+
return _handleRequest(fetcher, 'HEAD', url, Object.assign(Object.assign({}, options), { noResolveJson: true }), parameters, extras);
|
|
141
164
|
}
|
|
142
165
|
exports.head = head;
|
|
143
|
-
async function remove(fetcher, url, body, options, parameters) {
|
|
144
|
-
return _handleRequest(fetcher, 'DELETE', url, options, parameters, body);
|
|
166
|
+
async function remove(fetcher, url, body, options, parameters, extras) {
|
|
167
|
+
return _handleRequest(fetcher, 'DELETE', url, options, parameters, body, extras);
|
|
145
168
|
}
|
|
146
169
|
exports.remove = remove;
|
|
147
170
|
//# sourceMappingURL=fetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":";;;AAAA,qCAKkB;AAClB,uCAA2D;AAE3D,4CAA0D;AAC1D,gDAAqD;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -46,7 +46,7 @@ class StorageFileApi {
|
|
|
46
46
|
headers: this.headers,
|
|
47
47
|
logFetch: this.loggerEnabled,
|
|
48
48
|
onRequestError: this.onRequestError,
|
|
49
|
-
});
|
|
49
|
+
}, undefined, { psmName: 'Storage.Upload.PreUpload' });
|
|
50
50
|
const { upload_id, upload_url } = (_b = res === null || res === void 0 ? void 0 : res.data) !== null && _b !== void 0 ? _b : {};
|
|
51
51
|
if (upload_url && upload_id) {
|
|
52
52
|
const tosHeaders = {};
|
|
@@ -61,7 +61,7 @@ class StorageFileApi {
|
|
|
61
61
|
headers: tosHeaders,
|
|
62
62
|
logFetch: this.loggerEnabled,
|
|
63
63
|
onRequestError: this.onRequestError,
|
|
64
|
-
});
|
|
64
|
+
}, undefined, { psmName: 'Storage.Upload.TosUpload' });
|
|
65
65
|
const etag = (_d = (_c = tosRes === null || tosRes === void 0 ? void 0 : tosRes.headers) === null || _c === void 0 ? void 0 : _c.get('Etag')) !== null && _d !== void 0 ? _d : '';
|
|
66
66
|
const callbackRes = await (0, fetch_1.post)(this.fetch, `${this.url}/object/callback`, {
|
|
67
67
|
upload_id,
|
|
@@ -71,7 +71,7 @@ class StorageFileApi {
|
|
|
71
71
|
headers: this.headers,
|
|
72
72
|
logFetch: this.loggerEnabled,
|
|
73
73
|
onRequestError: this.onRequestError,
|
|
74
|
-
});
|
|
74
|
+
}, undefined, { psmName: 'Storage.Upload.Callback' });
|
|
75
75
|
return {
|
|
76
76
|
data: (_e = callbackRes === null || callbackRes === void 0 ? void 0 : callbackRes.data) !== null && _e !== void 0 ? _e : {},
|
|
77
77
|
error: null,
|
|
@@ -120,7 +120,11 @@ class StorageFileApi {
|
|
|
120
120
|
async createSignedUrl(path, expiresIn, options) {
|
|
121
121
|
try {
|
|
122
122
|
let _path = this._getFinalPath(path);
|
|
123
|
-
const res = await (0, fetch_1.post)(this.fetch, `${this.url}/object/sign/${_path}`, { expires_in: (0, helpers_1.toValidExpiresIn)(expiresIn) }, {
|
|
123
|
+
const res = await (0, fetch_1.post)(this.fetch, `${this.url}/object/sign/${_path}`, { expires_in: (0, helpers_1.toValidExpiresIn)(expiresIn) }, {
|
|
124
|
+
headers: this.headers,
|
|
125
|
+
logFetch: this.loggerEnabled,
|
|
126
|
+
onRequestError: this.onRequestError,
|
|
127
|
+
}, undefined, { psmName: 'Storage.CreateSignedUrl' });
|
|
124
128
|
return { data: res.data, error: null };
|
|
125
129
|
}
|
|
126
130
|
catch (error) {
|
|
@@ -143,7 +147,11 @@ class StorageFileApi {
|
|
|
143
147
|
*/
|
|
144
148
|
async createSignedUrls(paths, expiresIn, options) {
|
|
145
149
|
try {
|
|
146
|
-
const res = await (0, fetch_1.post)(this.fetch, `${this.url}/object/sign/${this.bucketId}`, { expires_in: (0, helpers_1.toValidExpiresIn)(expiresIn), paths }, {
|
|
150
|
+
const res = await (0, fetch_1.post)(this.fetch, `${this.url}/object/sign/${this.bucketId}`, { expires_in: (0, helpers_1.toValidExpiresIn)(expiresIn), paths }, {
|
|
151
|
+
headers: this.headers,
|
|
152
|
+
logFetch: this.loggerEnabled,
|
|
153
|
+
onRequestError: this.onRequestError,
|
|
154
|
+
}, undefined, { psmName: 'Storage.CreateSignedUrls' });
|
|
147
155
|
return {
|
|
148
156
|
data: res.data,
|
|
149
157
|
error: null,
|
|
@@ -170,7 +178,7 @@ class StorageFileApi {
|
|
|
170
178
|
noResolveJson: true,
|
|
171
179
|
logFetch: this.loggerEnabled,
|
|
172
180
|
onRequestError: this.onRequestError,
|
|
173
|
-
});
|
|
181
|
+
}, undefined, { psmName: 'Storage.Download' });
|
|
174
182
|
let resBody;
|
|
175
183
|
// only parse blob when response is from TOS, server returns 200 with errors if it can't redirect to TOS.
|
|
176
184
|
if (res.redirected && res.headers.get('server') === 'TosServer') {
|
|
@@ -196,7 +204,11 @@ class StorageFileApi {
|
|
|
196
204
|
*/
|
|
197
205
|
async remove(paths) {
|
|
198
206
|
try {
|
|
199
|
-
const res = await (0, fetch_1.remove)(this.fetch, `${this.url}/object/${this.bucketId}`, { prefixes: paths }, {
|
|
207
|
+
const res = await (0, fetch_1.remove)(this.fetch, `${this.url}/object/${this.bucketId}`, { prefixes: paths }, {
|
|
208
|
+
headers: this.headers,
|
|
209
|
+
logFetch: this.loggerEnabled,
|
|
210
|
+
onRequestError: this.onRequestError,
|
|
211
|
+
}, undefined, { psmName: 'Storage.Remove' });
|
|
200
212
|
return { data: res.data.map((file) => (0, helpers_1.transformFilePayload)(file)), error: null };
|
|
201
213
|
}
|
|
202
214
|
catch (error) {
|
|
@@ -218,7 +230,7 @@ class StorageFileApi {
|
|
|
218
230
|
headers: this.headers,
|
|
219
231
|
logFetch: this.loggerEnabled,
|
|
220
232
|
onRequestError: this.onRequestError,
|
|
221
|
-
}, parameters);
|
|
233
|
+
}, parameters, { psmName: 'Storage.List' });
|
|
222
234
|
const transformedData = res.data.map((file) => (0, helpers_1.transformFilePayload)(file));
|
|
223
235
|
return {
|
|
224
236
|
data: transformedData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageFileApi.js","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":";;AAAA,0CAAiG;AACjG,wCAA6D;AAC7D,4CAKwB;AAaxB,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,MAAqB,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,IAAA,sBAAY,EAAC,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,WAAyB;;QAWzB,IAAI;YACF,MAAM,OAAO,mCAAQ,oBAAoB,GAAK,WAAW,CAAE,CAAC;YAE5D,aAAa;YACb,MAAM,aAAa,GAAkB;gBACnC,SAAS,EAAE,IAAA,2BAAiB,EAAC,QAAQ,CAAC;gBACtC,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK;aAChC,CAAC;YAEF,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,MAAM,IAAA,YAAI,
|
|
1
|
+
{"version":3,"file":"StorageFileApi.js","sourceRoot":"","sources":["../../../src/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ type LogParams = {
|
|
|
5
5
|
method: FetchMethod;
|
|
6
6
|
body?: unknown;
|
|
7
7
|
};
|
|
8
|
-
export declare const logRequest: (params: LogParams) => void;
|
|
8
|
+
export declare const logRequest: (params: LogParams, psmName?: string) => void;
|
|
9
9
|
export declare const logResponse: (traceId: number, response: {
|
|
10
10
|
data: any;
|
|
11
11
|
error: any;
|
|
12
12
|
status: number;
|
|
13
|
-
}) => void;
|
|
13
|
+
}, psmName?: string) => void;
|
|
14
14
|
export {};
|
|
15
15
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -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,
|
|
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,2BAgBpD,CAAC"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.logResponse = exports.logRequest = void 0;
|
|
4
|
-
const logRequest = (params) => {
|
|
4
|
+
const logRequest = (params, psmName = 'Storage') => {
|
|
5
5
|
const { traceId, url, method, body } = params;
|
|
6
6
|
const decodedParams = Array.from(new URL(url).searchParams.entries())
|
|
7
7
|
.filter(([key]) => !['count', 'tx', 'missing', 'resolution', 'column'].includes(key))
|
|
8
8
|
.map(([key, value]) => `${key}=${value}`);
|
|
9
|
-
console.log(
|
|
9
|
+
console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
|
|
10
10
|
};
|
|
11
11
|
exports.logRequest = logRequest;
|
|
12
|
-
const logResponse = (traceId, response) => {
|
|
12
|
+
const logResponse = (traceId, response, psmName = 'Storage') => {
|
|
13
13
|
const { data, error, status } = response;
|
|
14
|
-
console[error ? 'error' : 'log'](`[Dataloom][
|
|
14
|
+
console[error ? 'error' : 'log'](`[Dataloom][${psmName}][Response ${error ? 'Failed' : 'Success'}]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data, 'error:', error);
|
|
15
15
|
};
|
|
16
16
|
exports.logResponse = logResponse;
|
|
17
17
|
//# 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,EAAE;
|
|
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;IAEzC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAC9B,cAAc,OAAO,cAAc,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAAG,EAClE,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,KAAK,CACN,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,WAAW,eAkBtB"}
|
|
@@ -9,10 +9,16 @@ export interface FetchOptions {
|
|
|
9
9
|
logFetch?: boolean;
|
|
10
10
|
onRequestError?: (error: OnRequestErrorType) => void;
|
|
11
11
|
}
|
|
12
|
+
export interface ExtraInfo {
|
|
13
|
+
/**
|
|
14
|
+
* dataloom PSM name for logging.
|
|
15
|
+
*/
|
|
16
|
+
psmName?: string;
|
|
17
|
+
}
|
|
12
18
|
export type RequestMethodType = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD';
|
|
13
|
-
export declare function get(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
14
|
-
export declare function post(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
15
|
-
export declare function put(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
16
|
-
export declare function head(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
17
|
-
export declare function remove(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters): Promise<any>;
|
|
19
|
+
export declare function get(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
20
|
+
export declare function post(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
21
|
+
export declare function put(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
22
|
+
export declare function head(fetcher: Fetch, url: string, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
23
|
+
export declare function remove(fetcher: Fetch, url: string, body: object, options?: FetchOptions, parameters?: FetchParameters, extras?: ExtraInfo): Promise<any>;
|
|
18
24
|
//# sourceMappingURL=fetch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI9D,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI9D,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAiM3E,wBAAsB,GAAG,CACvB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,IAAI,CACxB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,GAAG,CACvB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,IAAI,CACxB,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAYd;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,KAAK,EACd,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd"}
|
package/dist/module/lib/fetch.js
CHANGED
|
@@ -58,9 +58,10 @@ const _getRequestParams = (method, options, parameters, body) => {
|
|
|
58
58
|
}
|
|
59
59
|
return Object.assign(Object.assign({}, params), parameters);
|
|
60
60
|
};
|
|
61
|
-
async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
61
|
+
async function _handleRequest(fetcher, method, url, options, parameters, body, extras) {
|
|
62
62
|
let traceId = -1;
|
|
63
63
|
let res_status = 200;
|
|
64
|
+
const psmName = extras === null || extras === void 0 ? void 0 : extras.psmName;
|
|
64
65
|
if (options === null || options === void 0 ? void 0 : options.logFetch) {
|
|
65
66
|
traceId = traceIdGenerator.next();
|
|
66
67
|
logRequest({
|
|
@@ -68,7 +69,7 @@ async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
|
68
69
|
url,
|
|
69
70
|
method,
|
|
70
71
|
body,
|
|
71
|
-
});
|
|
72
|
+
}, psmName);
|
|
72
73
|
}
|
|
73
74
|
return new Promise((resolve, reject) => {
|
|
74
75
|
fetcher(url, _getRequestParams(method, options, parameters, body))
|
|
@@ -96,16 +97,38 @@ async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
|
96
97
|
data: null,
|
|
97
98
|
error: data,
|
|
98
99
|
status: res_status,
|
|
99
|
-
});
|
|
100
|
+
}, psmName);
|
|
100
101
|
}
|
|
101
102
|
return reject(data);
|
|
102
103
|
}
|
|
103
104
|
if (options === null || options === void 0 ? void 0 : options.logFetch) {
|
|
105
|
+
let parsedData = null;
|
|
106
|
+
let error = null;
|
|
107
|
+
// tos request
|
|
108
|
+
if (options === null || options === void 0 ? void 0 : options.noResolveJson) {
|
|
109
|
+
try {
|
|
110
|
+
// tos response
|
|
111
|
+
if (data.headers.get('server') === 'TosServer' || data.headers.get('etag')) {
|
|
112
|
+
parsedData = data;
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
// dataloom response
|
|
116
|
+
error = await data.clone().json();
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
catch (e) {
|
|
120
|
+
error = _getErrorMessage(e);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
// non-tos request
|
|
125
|
+
parsedData = data;
|
|
126
|
+
}
|
|
104
127
|
logResponse(traceId, {
|
|
105
|
-
data:
|
|
106
|
-
error
|
|
128
|
+
data: parsedData,
|
|
129
|
+
error,
|
|
107
130
|
status: res_status,
|
|
108
|
-
});
|
|
131
|
+
}, psmName);
|
|
109
132
|
}
|
|
110
133
|
return resolve(data);
|
|
111
134
|
})
|
|
@@ -115,25 +138,25 @@ async function _handleRequest(fetcher, method, url, options, parameters, body) {
|
|
|
115
138
|
data: null,
|
|
116
139
|
error: _getErrorMessage(error),
|
|
117
140
|
status: error === null || error === void 0 ? void 0 : error.status,
|
|
118
|
-
});
|
|
141
|
+
}, psmName);
|
|
119
142
|
}
|
|
120
143
|
handleError(error, reject, options);
|
|
121
144
|
});
|
|
122
145
|
});
|
|
123
146
|
}
|
|
124
|
-
export async function get(fetcher, url, options, parameters) {
|
|
125
|
-
return _handleRequest(fetcher, 'GET', url, options, parameters);
|
|
147
|
+
export async function get(fetcher, url, options, parameters, extras) {
|
|
148
|
+
return _handleRequest(fetcher, 'GET', url, options, parameters, undefined, extras);
|
|
126
149
|
}
|
|
127
|
-
export async function post(fetcher, url, body, options, parameters) {
|
|
128
|
-
return _handleRequest(fetcher, 'POST', url, options, parameters, body);
|
|
150
|
+
export async function post(fetcher, url, body, options, parameters, extras) {
|
|
151
|
+
return _handleRequest(fetcher, 'POST', url, options, parameters, body, extras);
|
|
129
152
|
}
|
|
130
|
-
export async function put(fetcher, url, body, options, parameters) {
|
|
131
|
-
return _handleRequest(fetcher, 'PUT', url, options, parameters, body);
|
|
153
|
+
export async function put(fetcher, url, body, options, parameters, extras) {
|
|
154
|
+
return _handleRequest(fetcher, 'PUT', url, options, parameters, body, extras);
|
|
132
155
|
}
|
|
133
|
-
export async function head(fetcher, url, options, parameters) {
|
|
134
|
-
return _handleRequest(fetcher, 'HEAD', url, Object.assign(Object.assign({}, options), { noResolveJson: true }), parameters);
|
|
156
|
+
export async function head(fetcher, url, options, parameters, extras) {
|
|
157
|
+
return _handleRequest(fetcher, 'HEAD', url, Object.assign(Object.assign({}, options), { noResolveJson: true }), parameters, extras);
|
|
135
158
|
}
|
|
136
|
-
export async function remove(fetcher, url, body, options, parameters) {
|
|
137
|
-
return _handleRequest(fetcher, 'DELETE', url, options, parameters, body);
|
|
159
|
+
export async function remove(fetcher, url, body, options, parameters, extras) {
|
|
160
|
+
return _handleRequest(fetcher, 'DELETE', url, options, parameters, body, extras);
|
|
138
161
|
}
|
|
139
162
|
//# sourceMappingURL=fetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -44,7 +44,7 @@ export default class StorageFileApi {
|
|
|
44
44
|
headers: this.headers,
|
|
45
45
|
logFetch: this.loggerEnabled,
|
|
46
46
|
onRequestError: this.onRequestError,
|
|
47
|
-
});
|
|
47
|
+
}, undefined, { psmName: 'Storage.Upload.PreUpload' });
|
|
48
48
|
const { upload_id, upload_url } = (_b = res === null || res === void 0 ? void 0 : res.data) !== null && _b !== void 0 ? _b : {};
|
|
49
49
|
if (upload_url && upload_id) {
|
|
50
50
|
const tosHeaders = {};
|
|
@@ -59,7 +59,7 @@ export default class StorageFileApi {
|
|
|
59
59
|
headers: tosHeaders,
|
|
60
60
|
logFetch: this.loggerEnabled,
|
|
61
61
|
onRequestError: this.onRequestError,
|
|
62
|
-
});
|
|
62
|
+
}, undefined, { psmName: 'Storage.Upload.TosUpload' });
|
|
63
63
|
const etag = (_d = (_c = tosRes === null || tosRes === void 0 ? void 0 : tosRes.headers) === null || _c === void 0 ? void 0 : _c.get('Etag')) !== null && _d !== void 0 ? _d : '';
|
|
64
64
|
const callbackRes = await post(this.fetch, `${this.url}/object/callback`, {
|
|
65
65
|
upload_id,
|
|
@@ -69,7 +69,7 @@ export default class StorageFileApi {
|
|
|
69
69
|
headers: this.headers,
|
|
70
70
|
logFetch: this.loggerEnabled,
|
|
71
71
|
onRequestError: this.onRequestError,
|
|
72
|
-
});
|
|
72
|
+
}, undefined, { psmName: 'Storage.Upload.Callback' });
|
|
73
73
|
return {
|
|
74
74
|
data: (_e = callbackRes === null || callbackRes === void 0 ? void 0 : callbackRes.data) !== null && _e !== void 0 ? _e : {},
|
|
75
75
|
error: null,
|
|
@@ -118,7 +118,11 @@ export default class StorageFileApi {
|
|
|
118
118
|
async createSignedUrl(path, expiresIn, options) {
|
|
119
119
|
try {
|
|
120
120
|
let _path = this._getFinalPath(path);
|
|
121
|
-
const res = await post(this.fetch, `${this.url}/object/sign/${_path}`, { expires_in: toValidExpiresIn(expiresIn) }, {
|
|
121
|
+
const res = await post(this.fetch, `${this.url}/object/sign/${_path}`, { expires_in: toValidExpiresIn(expiresIn) }, {
|
|
122
|
+
headers: this.headers,
|
|
123
|
+
logFetch: this.loggerEnabled,
|
|
124
|
+
onRequestError: this.onRequestError,
|
|
125
|
+
}, undefined, { psmName: 'Storage.CreateSignedUrl' });
|
|
122
126
|
return { data: res.data, error: null };
|
|
123
127
|
}
|
|
124
128
|
catch (error) {
|
|
@@ -141,7 +145,11 @@ export default class StorageFileApi {
|
|
|
141
145
|
*/
|
|
142
146
|
async createSignedUrls(paths, expiresIn, options) {
|
|
143
147
|
try {
|
|
144
|
-
const res = await post(this.fetch, `${this.url}/object/sign/${this.bucketId}`, { expires_in: toValidExpiresIn(expiresIn), paths }, {
|
|
148
|
+
const res = await post(this.fetch, `${this.url}/object/sign/${this.bucketId}`, { expires_in: toValidExpiresIn(expiresIn), paths }, {
|
|
149
|
+
headers: this.headers,
|
|
150
|
+
logFetch: this.loggerEnabled,
|
|
151
|
+
onRequestError: this.onRequestError,
|
|
152
|
+
}, undefined, { psmName: 'Storage.CreateSignedUrls' });
|
|
145
153
|
return {
|
|
146
154
|
data: res.data,
|
|
147
155
|
error: null,
|
|
@@ -168,7 +176,7 @@ export default class StorageFileApi {
|
|
|
168
176
|
noResolveJson: true,
|
|
169
177
|
logFetch: this.loggerEnabled,
|
|
170
178
|
onRequestError: this.onRequestError,
|
|
171
|
-
});
|
|
179
|
+
}, undefined, { psmName: 'Storage.Download' });
|
|
172
180
|
let resBody;
|
|
173
181
|
// only parse blob when response is from TOS, server returns 200 with errors if it can't redirect to TOS.
|
|
174
182
|
if (res.redirected && res.headers.get('server') === 'TosServer') {
|
|
@@ -194,7 +202,11 @@ export default class StorageFileApi {
|
|
|
194
202
|
*/
|
|
195
203
|
async remove(paths) {
|
|
196
204
|
try {
|
|
197
|
-
const res = await remove(this.fetch, `${this.url}/object/${this.bucketId}`, { prefixes: paths }, {
|
|
205
|
+
const res = await remove(this.fetch, `${this.url}/object/${this.bucketId}`, { prefixes: paths }, {
|
|
206
|
+
headers: this.headers,
|
|
207
|
+
logFetch: this.loggerEnabled,
|
|
208
|
+
onRequestError: this.onRequestError,
|
|
209
|
+
}, undefined, { psmName: 'Storage.Remove' });
|
|
198
210
|
return { data: res.data.map((file) => transformFilePayload(file)), error: null };
|
|
199
211
|
}
|
|
200
212
|
catch (error) {
|
|
@@ -216,7 +228,7 @@ export default class StorageFileApi {
|
|
|
216
228
|
headers: this.headers,
|
|
217
229
|
logFetch: this.loggerEnabled,
|
|
218
230
|
onRequestError: this.onRequestError,
|
|
219
|
-
}, parameters);
|
|
231
|
+
}, parameters, { psmName: 'Storage.List' });
|
|
220
232
|
const transformedData = res.data.map((file) => transformFilePayload(file));
|
|
221
233
|
return {
|
|
222
234
|
data: transformedData,
|
|
@@ -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;AAaxB,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,WAAyB;;QAWzB,IAAI;YACF,MAAM,OAAO,mCAAQ,oBAAoB,GAAK,WAAW,CAAE,CAAC;YAE5D,aAAa;YACb,MAAM,aAAa,GAAkB;gBACnC,SAAS,EAAE,iBAAiB,CAAC,QAAQ,CAAC;gBACtC,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK;aAChC,CAAC;YAEF,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,
|
|
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;AAaxB,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,WAAyB;;QAWzB,IAAI;YACF,MAAM,OAAO,mCAAQ,oBAAoB,GAAK,WAAW,CAAE,CAAC;YAE5D,aAAa;YACb,MAAM,aAAa,GAAkB;gBACnC,SAAS,EAAE,iBAAiB,CAAC,QAAQ,CAAC;gBACtC,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK;aAChC,CAAC;YAEF,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CACpB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,WAAW,KAAK,EAAE,EAC7B,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;gBAC9C,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,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,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,EAClD;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,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,MAAM,GAAG,CACnB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,WAAW,KAAK,EAAE,EAC7B;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,GAAG,GAAG,MAAM,MAAM,CACtB,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,GAAG,WAAW,IAAI,CAAC,QAAQ,EAAE,EACrC,EAAE,QAAQ,EAAE,KAAK,EAAE,EACnB;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,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;IACxD,CAAC;IAEO,mBAAmB,CAAC,IAAY;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3D,CAAC;CACF"}
|
|
@@ -5,11 +5,11 @@ type LogParams = {
|
|
|
5
5
|
method: FetchMethod;
|
|
6
6
|
body?: unknown;
|
|
7
7
|
};
|
|
8
|
-
export declare const logRequest: (params: LogParams) => void;
|
|
8
|
+
export declare const logRequest: (params: LogParams, psmName?: string) => void;
|
|
9
9
|
export declare const logResponse: (traceId: number, response: {
|
|
10
10
|
data: any;
|
|
11
11
|
error: any;
|
|
12
12
|
status: number;
|
|
13
|
-
}) => void;
|
|
13
|
+
}, psmName?: string) => void;
|
|
14
14
|
export {};
|
|
15
15
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -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,
|
|
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,2BAgBpD,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
export const logRequest = (params) => {
|
|
1
|
+
export const logRequest = (params, psmName = 'Storage') => {
|
|
2
2
|
const { traceId, url, method, body } = params;
|
|
3
3
|
const decodedParams = Array.from(new URL(url).searchParams.entries())
|
|
4
4
|
.filter(([key]) => !['count', 'tx', 'missing', 'resolution', 'column'].includes(key))
|
|
5
5
|
.map(([key, value]) => `${key}=${value}`);
|
|
6
|
-
console.log(
|
|
6
|
+
console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
|
|
7
7
|
};
|
|
8
|
-
export const logResponse = (traceId, response) => {
|
|
8
|
+
export const logResponse = (traceId, response, psmName = 'Storage') => {
|
|
9
9
|
const { data, error, status } = response;
|
|
10
|
-
console[error ? 'error' : 'log'](`[Dataloom][
|
|
10
|
+
console[error ? 'error' : 'log'](`[Dataloom][${psmName}][Response ${error ? 'Failed' : 'Success'}]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data, 'error:', error);
|
|
11
11
|
};
|
|
12
12
|
//# 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,EAAE;
|
|
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;IAEzC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAC9B,cAAc,OAAO,cAAc,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,GAAG,EAClE,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,KAAK,CACN,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@data-loom/storage-js",
|
|
3
|
-
"version": "0.4.1-alpha.
|
|
3
|
+
"version": "0.4.1-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.1-alpha.
|
|
36
|
+
"@data-loom/node-fetch": "0.4.1-alpha.2"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/jest": "^26.0.13",
|