laravel-request 1.2.21 → 1.2.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "laravel-request",
   "productName": "laravel-request",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "description": "laravel-request",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/Api.js

@@ -328,49 +328,7 @@ export default class Api {
           return; // Просто выходим из обработчика, не вызывая error()
         }
 
-        const errorInfo = {
-          message: e.message,
-          code: e.code,
-          name: e.name,
-          stack: e.stack,
-          config: {
-            url: e.config?.url,
-            method: e.config?.method,
-            headers: e.config?.headers,
-            data: e.config?.data,
-            params: e.config?.params,
-            timeout: e.config?.timeout,
-            baseURL: e.config?.baseURL
-          },
-          request: {
-            readyState: e.request?.readyState,
-            status: e.request?.status,
-            statusText: e.request?.statusText,
-            responseURL: e.request?.responseURL
-          },
-          response: e.response ? {
-            status: e.response.status,
-            statusText: e.response.statusText,
-            headers: e.response.headers,
-            data: e.response.data
-          } : null
-        };
-
-
-
-        console.error(`API request to ${url} failed:`, errorInfo);
-
-        // Дополнительная информация в зависимости от типа ошибки
-        if (e.code === 'ECONNABORTED') {
-          console.error('Request timeout occurred');
-        } else if (e.code === 'ERR_NETWORK') {
-          console.error('Network error occurred');
-        } else if (e.code === 'ERR_BAD_REQUEST') {
-          console.error('Bad request error');
-        } else if (e.code === 'ERR_BAD_RESPONSE') {
-          console.error('Bad response from server');
-        }
-
+        console.error(`API request to ${url} failed: ${e}`);
         console.error(e);
 
         const response = e.response;
@@ -386,49 +344,27 @@ export default class Api {
           const statusCode = response.status;
           const statusText = response.statusText;
 
-          console.error('Response details:', {
-            status: statusCode,
-            statusText: statusText,
-            headers: response.headers,
-            data: responseData,
-            url: response.config?.url
-          });
-
           try {
             error(xhr, responseData, statusCode, statusText);
           }catch (error){
-            console.error('Error in error callback:', error);
+            console.error(error);
           }
         }else{
-          console.error('No response received. Error details:', {
-            message: e.message,
-            code: e.code,
-            errno: e.errno,
-            syscall: e.syscall,
-            hostname: e.hostname,
-            port: e.port,
-            address: e.address
-          });
+          console.error(e)
 
           try {
             error({}, {}, '', e.message);
           }catch (error){
-            console.error('Error in error callback:', error);
+            console.error(error);
           }
         }
       }else{
-        console.error('Non-axios error occurred:', {
-          message: e.message,
-          name: e.name,
-          stack: e.stack,
-          url: url,
-          method: method
-        });
+        console.error(e)
 
         try {
           error({}, {}, '', e.message);
         }catch (error){
-          console.error('Error in error callback:', error);
+          console.error(error);
         }
       }
 

package/src/ApiRequest.js

@@ -206,9 +206,6 @@ export default class ApiRequest {
    * @param successCallback
    * @param errorCallback
    * @param params
-   * @param dataKey
-   * @param argumentsKey
-   * @param queryKey
    * @param byUrl
    * @param finalCallback
    * @returns {ApiRequest}
@@ -218,13 +215,10 @@ export default class ApiRequest {
       errorCallback = () => {},
       finalCallback = () => {},
       params = {},
-      dataKey = 'data',
-      argumentsKey = 'arguments',
-      queryKey = 'query',
       byUrl = false,
   )
   {
-    return this.executeRequest(successCallback, errorCallback, finalCallback, params, dataKey, argumentsKey, queryKey, byUrl)
+    return this.executeRequest(successCallback, errorCallback, finalCallback, params, byUrl)
   }
 
   /**
@@ -234,7 +228,11 @@ export default class ApiRequest {
    * @param queryKey
    * @return {object} data object for request
    */
-  constructRequestData(dataKey, argumentsKey, queryKey) {
+  constructRequestData(
+      dataKey = 'data',
+      argumentsKey = 'arguments',
+      queryKey = 'query',
+  ) {
     let data = {};
 
     if (argumentsKey)
@@ -327,9 +325,6 @@ export default class ApiRequest {
    * @param errorCallback
    * @param finalCallback
    * @param params
-   * @param dataKey
-   * @param argumentsKey
-   * @param queryKey
    * @param byUrl
    * @returns {ApiRequest}
    */
@@ -338,9 +333,6 @@ export default class ApiRequest {
       errorCallback,
       finalCallback,
       params = {},
-      dataKey = 'data',
-      argumentsKey = 'arguments',
-      queryKey = 'query',
       byUrl = false,
   ) {
     let self = this;
@@ -351,7 +343,7 @@ export default class ApiRequest {
 
     let url = byUrl ? this.url : this.getUrl();
     let notify = null;
-    let data = this.constructRequestData(dataKey, argumentsKey, queryKey);
+    let data = this.constructRequestData();
 
     Api.makeRequest({
       url: url,
@@ -439,9 +431,6 @@ export default class ApiRequest {
    * @param successCallback
    * @param errorCallback
    * @param params
-   * @param dataKey
-   * @param argumentsKey
-   * @param queryKey
    * @param finalCallback
    * @returns {ApiRequest}
    */
@@ -449,13 +438,10 @@ export default class ApiRequest {
       successCallback = (response) => {},
       errorCallback = () => {},
       params = {},
-      dataKey = 'data',
-      argumentsKey = 'arguments',
-      queryKey = 'query',
       finalCallback = () => {}
     )
   {
-    return this.executeRequest(successCallback, errorCallback, finalCallback, params, dataKey, argumentsKey, queryKey, true)
+    return this.executeRequest(successCallback, errorCallback, finalCallback, params, true)
   }
 
   /**