piral-cli 1.8.0-beta.7765 → 1.8.0-beta.7771
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/lib/common/http.d.ts +1 -1
- package/lib/common/http.js +28 -13
- package/lib/common/http.js.map +1 -1
- package/package.json +2 -2
- package/src/common/http.ts +35 -14
package/lib/common/http.d.ts
CHANGED
|
@@ -37,6 +37,6 @@ export interface PostFormResult {
|
|
|
37
37
|
success: boolean;
|
|
38
38
|
response?: object;
|
|
39
39
|
}
|
|
40
|
-
export declare function postData(target: string, scheme: PublishScheme, key: string, data: any, customHeaders?: Record<string, string>, httpsAgent?: Agent, interactive?: boolean): Promise<PostFormResult>;
|
|
40
|
+
export declare function postData(target: string, scheme: PublishScheme, key: string, data: any, customHeaders?: Record<string, string>, httpsAgent?: Agent, isForm?: boolean, interactive?: boolean): Promise<PostFormResult>;
|
|
41
41
|
export declare function postForm(target: string, scheme: PublishScheme, key: string, formData: FormDataObj, customHeaders?: Record<string, string>, httpsAgent?: Agent, interactive?: boolean): Promise<PostFormResult>;
|
|
42
42
|
export declare function postFile(target: string, scheme: PublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, agent?: Agent, interactive?: boolean): Promise<PostFormResult>;
|
package/lib/common/http.js
CHANGED
|
@@ -193,14 +193,31 @@ function handleAxiosError(error, interactive, httpsAgent, refetch, onfail) {
|
|
|
193
193
|
return onfail(500, undefined, error.message);
|
|
194
194
|
}
|
|
195
195
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
196
|
+
function createPayload(data, scheme, key, customHeaders, isForm) {
|
|
197
|
+
if (isForm) {
|
|
198
|
+
const form = createAxiosForm(data);
|
|
199
|
+
const extraHeaders = form.getHeaders();
|
|
200
|
+
const headers = {
|
|
201
|
+
...info_1.standardHeaders,
|
|
202
|
+
...customHeaders,
|
|
203
|
+
...getAuthorizationHeaders(scheme, key),
|
|
204
|
+
...extraHeaders,
|
|
205
|
+
};
|
|
206
|
+
return [form, headers];
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
const headers = {
|
|
210
|
+
...info_1.standardHeaders,
|
|
211
|
+
...customHeaders,
|
|
212
|
+
...getAuthorizationHeaders(scheme, key),
|
|
213
|
+
};
|
|
214
|
+
return [data, headers];
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
async function postData(target, scheme, key, data, customHeaders = {}, httpsAgent = undefined, isForm = false, interactive = false) {
|
|
202
218
|
try {
|
|
203
|
-
const
|
|
219
|
+
const [body, headers] = createPayload(data, scheme, key, customHeaders, isForm);
|
|
220
|
+
const res = await external_1.axios.post(target, body, {
|
|
204
221
|
headers,
|
|
205
222
|
httpsAgent,
|
|
206
223
|
maxContentLength: Infinity,
|
|
@@ -213,7 +230,7 @@ async function postData(target, scheme, key, data, customHeaders = {}, httpsAgen
|
|
|
213
230
|
};
|
|
214
231
|
}
|
|
215
232
|
catch (error) {
|
|
216
|
-
return await handleAxiosError(error, interactive, httpsAgent, (mode, token) => postData(target, mode, token, data, customHeaders, httpsAgent, false), (status, statusText, response) => {
|
|
233
|
+
return await handleAxiosError(error, interactive, httpsAgent, (mode, token) => postData(target, mode, token, data, customHeaders, httpsAgent, isForm, false), (status, statusText, response) => {
|
|
217
234
|
if (status === 500) {
|
|
218
235
|
(0, log_1.log)('failedHttpPost_0065', response);
|
|
219
236
|
return {
|
|
@@ -233,12 +250,10 @@ async function postData(target, scheme, key, data, customHeaders = {}, httpsAgen
|
|
|
233
250
|
});
|
|
234
251
|
}
|
|
235
252
|
}
|
|
236
|
-
function postForm(target, scheme, key, formData, customHeaders = {}, httpsAgent, interactive = false) {
|
|
237
|
-
|
|
238
|
-
const headers = form.getHeaders();
|
|
239
|
-
return postData(target, scheme, key, form, { ...customHeaders, ...headers }, httpsAgent, interactive);
|
|
253
|
+
function postForm(target, scheme, key, formData, customHeaders = {}, httpsAgent = undefined, interactive = false) {
|
|
254
|
+
return postData(target, scheme, key, formData, customHeaders, httpsAgent, true, interactive);
|
|
240
255
|
}
|
|
241
|
-
function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, agent, interactive = false) {
|
|
256
|
+
function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, agent = undefined, interactive = false) {
|
|
242
257
|
const data = { ...customFields, file: [file, 'pilet.tgz'] };
|
|
243
258
|
return postForm(target, scheme, key, data, customHeaders, agent, interactive);
|
|
244
259
|
}
|
package/lib/common/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":";;AAyCA,0CAoBC;AAED,wCAWC;AAED,0DAwBC;AAOD,0CAIC;AAED,4BAQC;AAED,oCAiBC;AAID,0CAgBC;AAED,4CAoDC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "1.8.0-beta.
|
|
3
|
+
"version": "1.8.0-beta.7771",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"typescript": "^5",
|
|
79
79
|
"yargs": "^17"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "ff76274f3fc3eb85a7ca60e9041df75b29ccbf9f"
|
|
82
82
|
}
|
package/src/common/http.ts
CHANGED
|
@@ -220,23 +220,46 @@ export interface PostFormResult {
|
|
|
220
220
|
response?: object;
|
|
221
221
|
}
|
|
222
222
|
|
|
223
|
+
function createPayload(
|
|
224
|
+
data: any,
|
|
225
|
+
scheme: PublishScheme,
|
|
226
|
+
key: string,
|
|
227
|
+
customHeaders: Record<string, string>,
|
|
228
|
+
isForm: boolean,
|
|
229
|
+
): [any, Record<string, string>] {
|
|
230
|
+
if (isForm) {
|
|
231
|
+
const form = createAxiosForm(data);
|
|
232
|
+
const extraHeaders = form.getHeaders();
|
|
233
|
+
const headers: Record<string, string> = {
|
|
234
|
+
...standardHeaders,
|
|
235
|
+
...customHeaders,
|
|
236
|
+
...getAuthorizationHeaders(scheme, key),
|
|
237
|
+
...extraHeaders,
|
|
238
|
+
};
|
|
239
|
+
return [form, headers];
|
|
240
|
+
} else {
|
|
241
|
+
const headers: Record<string, string> = {
|
|
242
|
+
...standardHeaders,
|
|
243
|
+
...customHeaders,
|
|
244
|
+
...getAuthorizationHeaders(scheme, key),
|
|
245
|
+
};
|
|
246
|
+
return [data, headers];
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
|
|
223
250
|
export async function postData(
|
|
224
251
|
target: string,
|
|
225
252
|
scheme: PublishScheme,
|
|
226
253
|
key: string,
|
|
227
254
|
data: any,
|
|
228
255
|
customHeaders: Record<string, string> = {},
|
|
229
|
-
httpsAgent
|
|
256
|
+
httpsAgent: Agent = undefined,
|
|
257
|
+
isForm = false,
|
|
230
258
|
interactive = false,
|
|
231
259
|
): Promise<PostFormResult> {
|
|
232
|
-
const headers: Record<string, string> = {
|
|
233
|
-
...standardHeaders,
|
|
234
|
-
...customHeaders,
|
|
235
|
-
...getAuthorizationHeaders(scheme, key),
|
|
236
|
-
};
|
|
237
|
-
|
|
238
260
|
try {
|
|
239
|
-
const
|
|
261
|
+
const [body, headers] = createPayload(data, scheme, key, customHeaders, isForm);
|
|
262
|
+
const res = await axios.post(target, body, {
|
|
240
263
|
headers,
|
|
241
264
|
httpsAgent,
|
|
242
265
|
maxContentLength: Infinity,
|
|
@@ -253,7 +276,7 @@ export async function postData(
|
|
|
253
276
|
error,
|
|
254
277
|
interactive,
|
|
255
278
|
httpsAgent,
|
|
256
|
-
(mode, token) => postData(target, mode, token, data, customHeaders, httpsAgent, false),
|
|
279
|
+
(mode, token) => postData(target, mode, token, data, customHeaders, httpsAgent, isForm, false),
|
|
257
280
|
(status, statusText, response) => {
|
|
258
281
|
if (status === 500) {
|
|
259
282
|
log('failedHttpPost_0065', response);
|
|
@@ -281,12 +304,10 @@ export function postForm(
|
|
|
281
304
|
key: string,
|
|
282
305
|
formData: FormDataObj,
|
|
283
306
|
customHeaders: Record<string, string> = {},
|
|
284
|
-
httpsAgent
|
|
307
|
+
httpsAgent: Agent = undefined,
|
|
285
308
|
interactive = false,
|
|
286
309
|
): Promise<PostFormResult> {
|
|
287
|
-
|
|
288
|
-
const headers = form.getHeaders();
|
|
289
|
-
return postData(target, scheme, key, form, { ...customHeaders, ...headers }, httpsAgent, interactive);
|
|
310
|
+
return postData(target, scheme, key, formData, customHeaders, httpsAgent, true, interactive);
|
|
290
311
|
}
|
|
291
312
|
|
|
292
313
|
export function postFile(
|
|
@@ -296,7 +317,7 @@ export function postFile(
|
|
|
296
317
|
file: Buffer,
|
|
297
318
|
customFields: Record<string, string> = {},
|
|
298
319
|
customHeaders: Record<string, string> = {},
|
|
299
|
-
agent
|
|
320
|
+
agent: Agent = undefined,
|
|
300
321
|
interactive = false,
|
|
301
322
|
): Promise<PostFormResult> {
|
|
302
323
|
const data: FormDataObj = { ...customFields, file: [file, 'pilet.tgz'] };
|