laravel-request 1.2.21 → 1.2.22
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/package.json +1 -1
- package/src/Api.js +6 -70
- package/src/ApiRequest.js +6 -8
package/package.json
CHANGED
package/src/Api.js
CHANGED
|
@@ -328,49 +328,7 @@ export default class Api {
|
|
|
328
328
|
return; // Просто выходим из обработчика, не вызывая error()
|
|
329
329
|
}
|
|
330
330
|
|
|
331
|
-
|
|
332
|
-
message: e.message,
|
|
333
|
-
code: e.code,
|
|
334
|
-
name: e.name,
|
|
335
|
-
stack: e.stack,
|
|
336
|
-
config: {
|
|
337
|
-
url: e.config?.url,
|
|
338
|
-
method: e.config?.method,
|
|
339
|
-
headers: e.config?.headers,
|
|
340
|
-
data: e.config?.data,
|
|
341
|
-
params: e.config?.params,
|
|
342
|
-
timeout: e.config?.timeout,
|
|
343
|
-
baseURL: e.config?.baseURL
|
|
344
|
-
},
|
|
345
|
-
request: {
|
|
346
|
-
readyState: e.request?.readyState,
|
|
347
|
-
status: e.request?.status,
|
|
348
|
-
statusText: e.request?.statusText,
|
|
349
|
-
responseURL: e.request?.responseURL
|
|
350
|
-
},
|
|
351
|
-
response: e.response ? {
|
|
352
|
-
status: e.response.status,
|
|
353
|
-
statusText: e.response.statusText,
|
|
354
|
-
headers: e.response.headers,
|
|
355
|
-
data: e.response.data
|
|
356
|
-
} : null
|
|
357
|
-
};
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
console.error(`API request to ${url} failed:`, errorInfo);
|
|
362
|
-
|
|
363
|
-
// Дополнительная информация в зависимости от типа ошибки
|
|
364
|
-
if (e.code === 'ECONNABORTED') {
|
|
365
|
-
console.error('Request timeout occurred');
|
|
366
|
-
} else if (e.code === 'ERR_NETWORK') {
|
|
367
|
-
console.error('Network error occurred');
|
|
368
|
-
} else if (e.code === 'ERR_BAD_REQUEST') {
|
|
369
|
-
console.error('Bad request error');
|
|
370
|
-
} else if (e.code === 'ERR_BAD_RESPONSE') {
|
|
371
|
-
console.error('Bad response from server');
|
|
372
|
-
}
|
|
373
|
-
|
|
331
|
+
console.error(`API request to ${url} failed: ${e}`);
|
|
374
332
|
console.error(e);
|
|
375
333
|
|
|
376
334
|
const response = e.response;
|
|
@@ -386,49 +344,27 @@ export default class Api {
|
|
|
386
344
|
const statusCode = response.status;
|
|
387
345
|
const statusText = response.statusText;
|
|
388
346
|
|
|
389
|
-
console.error('Response details:', {
|
|
390
|
-
status: statusCode,
|
|
391
|
-
statusText: statusText,
|
|
392
|
-
headers: response.headers,
|
|
393
|
-
data: responseData,
|
|
394
|
-
url: response.config?.url
|
|
395
|
-
});
|
|
396
|
-
|
|
397
347
|
try {
|
|
398
348
|
error(xhr, responseData, statusCode, statusText);
|
|
399
349
|
}catch (error){
|
|
400
|
-
console.error(
|
|
350
|
+
console.error(error);
|
|
401
351
|
}
|
|
402
352
|
}else{
|
|
403
|
-
console.error(
|
|
404
|
-
message: e.message,
|
|
405
|
-
code: e.code,
|
|
406
|
-
errno: e.errno,
|
|
407
|
-
syscall: e.syscall,
|
|
408
|
-
hostname: e.hostname,
|
|
409
|
-
port: e.port,
|
|
410
|
-
address: e.address
|
|
411
|
-
});
|
|
353
|
+
console.error(e)
|
|
412
354
|
|
|
413
355
|
try {
|
|
414
356
|
error({}, {}, '', e.message);
|
|
415
357
|
}catch (error){
|
|
416
|
-
console.error(
|
|
358
|
+
console.error(error);
|
|
417
359
|
}
|
|
418
360
|
}
|
|
419
361
|
}else{
|
|
420
|
-
console.error(
|
|
421
|
-
message: e.message,
|
|
422
|
-
name: e.name,
|
|
423
|
-
stack: e.stack,
|
|
424
|
-
url: url,
|
|
425
|
-
method: method
|
|
426
|
-
});
|
|
362
|
+
console.error(e)
|
|
427
363
|
|
|
428
364
|
try {
|
|
429
365
|
error({}, {}, '', e.message);
|
|
430
366
|
}catch (error){
|
|
431
|
-
console.error(
|
|
367
|
+
console.error(error);
|
|
432
368
|
}
|
|
433
369
|
}
|
|
434
370
|
|
package/src/ApiRequest.js
CHANGED
|
@@ -234,7 +234,11 @@ export default class ApiRequest {
|
|
|
234
234
|
* @param queryKey
|
|
235
235
|
* @return {object} data object for request
|
|
236
236
|
*/
|
|
237
|
-
constructRequestData(
|
|
237
|
+
constructRequestData(
|
|
238
|
+
dataKey = 'data',
|
|
239
|
+
argumentsKey = 'arguments',
|
|
240
|
+
queryKey = 'query',
|
|
241
|
+
) {
|
|
238
242
|
let data = {};
|
|
239
243
|
|
|
240
244
|
if (argumentsKey)
|
|
@@ -327,9 +331,6 @@ export default class ApiRequest {
|
|
|
327
331
|
* @param errorCallback
|
|
328
332
|
* @param finalCallback
|
|
329
333
|
* @param params
|
|
330
|
-
* @param dataKey
|
|
331
|
-
* @param argumentsKey
|
|
332
|
-
* @param queryKey
|
|
333
334
|
* @param byUrl
|
|
334
335
|
* @returns {ApiRequest}
|
|
335
336
|
*/
|
|
@@ -338,9 +339,6 @@ export default class ApiRequest {
|
|
|
338
339
|
errorCallback,
|
|
339
340
|
finalCallback,
|
|
340
341
|
params = {},
|
|
341
|
-
dataKey = 'data',
|
|
342
|
-
argumentsKey = 'arguments',
|
|
343
|
-
queryKey = 'query',
|
|
344
342
|
byUrl = false,
|
|
345
343
|
) {
|
|
346
344
|
let self = this;
|
|
@@ -351,7 +349,7 @@ export default class ApiRequest {
|
|
|
351
349
|
|
|
352
350
|
let url = byUrl ? this.url : this.getUrl();
|
|
353
351
|
let notify = null;
|
|
354
|
-
let data = this.constructRequestData(
|
|
352
|
+
let data = this.constructRequestData();
|
|
355
353
|
|
|
356
354
|
Api.makeRequest({
|
|
357
355
|
url: url,
|