laravel-request 1.2.11 → 1.2.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "laravel-request",
   "productName": "laravel-request",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "description": "laravel-request",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -15,6 +15,7 @@
   "dependencies": {
     "@msgpack/msgpack": "^3.1.1",
     "axios": "^1.8.4",
+    "axios-mock-adapter": "^2.1.0",
     "query-string": "^8.1.0"
   }
 }

package/src/Api.js

@@ -1,5 +1,6 @@
 import ApiRequest from "./ApiRequest";
 import axios from "axios";
+import MockAdapter from "axios-mock-adapter";
 import { decode } from "@msgpack/msgpack";
 
 export default class Api {
@@ -25,6 +26,15 @@ export default class Api {
     return localStorage.getItem('api_token');
   }
 
+  /**
+   *
+   * @returns {Promise<AxiosStatic | axios.AxiosStatic | axios>}
+   */
+  static axiosResolver = () =>
+  {
+    return axios;
+  }
+
   /**
    *
    * @return {string}
@@ -230,7 +240,15 @@ export default class Api {
           jsonData = response.data; // Предполагаем, что данные уже в виде строки
         }
 
-        return JSON.parse(jsonData);
+        try {
+          return JSON.parse(jsonData);
+        }catch (error){
+
+          const enhancedError = new Error(`Ошибка при разборе JSON: ${error.message} - ${url}`);
+
+          // Выбрасываем улучшенную ошибку
+          throw enhancedError;
+        }
       } else if (contentType.includes("text/plain")) {
         // Возврат текстовых данных как строки
         return response.data.toString();
@@ -377,6 +395,7 @@ export default class Api {
     let response;
 
     data.unique_hash = Api.generateHash();
+    const axiosInstance = Api.axiosResolver();
 
     if (query.length > 5000) {
       data._method = 'GET';
@@ -390,7 +409,7 @@ export default class Api {
         cancelToken: source?.token
       };
       Api.logRequest(request);
-      response = await axios.request(request);
+      response = await axiosInstance.request(request);
     } else {
       data.timestamp = new Date().getTime();
       let request = {
@@ -403,7 +422,7 @@ export default class Api {
         cancelToken: source?.token
       };
       Api.logRequest(request);
-      response = await axios.request(request);
+      response = await axiosInstance.request(request);
     }
 
     return response;
@@ -423,6 +442,7 @@ export default class Api {
     params.timestamp = new Date().getTime();
 
     params.unique_hash = Api.generateHash();
+    const axiosInstance = Api.axiosResolver();
 
     let request = {
       url: url,
@@ -435,6 +455,6 @@ export default class Api {
       cancelToken: source?.token
     };
     Api.logRequest(request);
-    return await axios.request(request);
+    return await axiosInstance.request(request);
   }
 }

package/src/ApiRequest.js

@@ -347,7 +347,7 @@ export default class ApiRequest {
     this.callSuccess = successCallback;
     this.callError = errorCallback;
     this.callFinal = finalCallback;
-    this.source = axios.CancelToken.source();
+    this.source = Api.axiosResolver().CancelToken.source();
 
     let url = byUrl ? this.url : this.getUrl();
     let notify = null;