laravel-request 1.2.3 → 1.2.5

package/package.json

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

package/src/Api.js

@@ -4,11 +4,6 @@ import { decode } from "@msgpack/msgpack";
 
 export default class Api {
 
-  /**
-   *
-   * @type {ApiRequest}
-   */
-  static debug = false;
   /**
    *
    * @type {ApiRequest}
@@ -182,7 +177,7 @@ export default class Api {
    */
   static logRequest(request)
   {
-    if(Api.debug)
+    if(this.isDebug())
     {
       console.log('Url: ' + request.url)
       console.log('Method: ' + request.method)
@@ -249,7 +244,7 @@ export default class Api {
    * @param obj
    * @return {*}
    */
-  static async makeRequest({url, method, data = {}, params = {}, headers = {}, success = () => {}, error = () => {}})
+  static async makeRequest({url, method, data = {}, params = {}, source, headers = {}, success = () => {}, error = () => {}})
   {
     try {
       headers['Accept'] = 'application/json, application/msgpack, text/plain, */*';
@@ -265,10 +260,10 @@ export default class Api {
       switch (method)
       {
         case 'GET':
-          response = await Api.handleGetRequest({ url, data, headers });
+          response = await Api.handleGetRequest({ url, data, headers, source });
           break;
         default:
-          response = await Api.handleDefaultRequest({ url, method, data, params, headers });
+          response = await Api.handleDefaultRequest({ url, method, data, params, headers, source });
           break;
       }
 
@@ -297,18 +292,31 @@ export default class Api {
         console.error(e);
 
         const response = e.response;
-        const xhr = response.request;
-
-        const contentType = response.headers.get("Content-Type");
-        const responseData = await Api.decodeResponse(url, response, contentType);
 
-        const statusCode = response.status;
-        const statusText = response.statusText;
-
-        try {
-          error(xhr, responseData, statusCode, statusText);
-        }catch (error){
-          console.error(error);
+        //если прервали запрос или проблему с соединение то response может не быть
+        if(response)
+        {
+          const xhr = response.request;
+
+          const contentType = response.headers.get("Content-Type");
+          const responseData = await Api.decodeResponse(url, response, contentType);
+
+          const statusCode = response.status;
+          const statusText = response.statusText;
+
+          try {
+            error(xhr, responseData, statusCode, statusText);
+          }catch (error){
+            console.error(error);
+          }
+        }else{
+          console.error(e)
+
+          try {
+            error({}, {}, '', e.message);
+          }catch (error){
+            console.error(error);
+          }
         }
       }else{
         console.error(e)
@@ -336,9 +344,10 @@ export default class Api {
    * @param url
    * @param data
    * @param headers
+   * @param source
    * @return {Promise<AxiosResponse<any>>}
    */
-  static async handleGetRequest({ url, data, headers }) {
+  static async handleGetRequest({ url, data, headers, source }) {
     let query = Api.encodeQueryString(data);
     let response;
 
@@ -352,7 +361,8 @@ export default class Api {
         data: data,
         headers: headers,
         timeout: 0,
-        responseType: 'arraybuffer'
+        responseType: 'arraybuffer',
+        cancelToken: source?.token
       };
       Api.logRequest(request);
       response = await axios.request(request);
@@ -364,7 +374,8 @@ export default class Api {
         params: data,
         headers: headers,
         timeout: 0,
-        responseType: 'arraybuffer'
+        responseType: 'arraybuffer',
+        cancelToken: source?.token
       };
       Api.logRequest(request);
       response = await axios.request(request);
@@ -380,9 +391,10 @@ export default class Api {
    * @param data
    * @param params
    * @param headers
+   * @param source
    * @return {Promise<AxiosResponse<any>>}
    */
-  static async handleDefaultRequest({ url, method, data, params, headers }) {
+  static async handleDefaultRequest({ url, method, data, params, headers, source }) {
     params.timestamp = new Date().getTime();
 
     params.unique_hash = Api.generateHash();
@@ -394,7 +406,8 @@ export default class Api {
       params: params,
       headers: headers,
       timeout: 0,
-      responseType: 'arraybuffer'
+      responseType: 'arraybuffer',
+      cancelToken: source?.token
     };
     Api.logRequest(request);
     return await axios.request(request);

package/src/ApiRequest.js

@@ -1,6 +1,7 @@
 import Api from "./Api";
 import Builder from "./Builder";
 import Binding from "./Binding";
+import axios from "axios";
 
 /**
  *
@@ -46,6 +47,7 @@ export default class ApiRequest {
     this.callError = () => {
 
     };
+    this.source = null;
 
     Builder.availableMethod.map(function (val) {
       self[val] = function () {
@@ -171,6 +173,16 @@ export default class ApiRequest {
     return this.domain + '/api/v1/call/' + this.target + '/' + this.focus;
   }
 
+  /**
+   * вернет токен для отмены запроса
+   *
+   * @returns {null}
+   */
+  getSource()
+  {
+    return this.source;
+  }
+
   /**
    *
    * @param successCallback
@@ -298,6 +310,7 @@ export default class ApiRequest {
     let self = this;
     this.callSuccess = successCallback;
     this.callError = errorCallback;
+    this.source = axios.CancelToken.source();
 
     let url = byUrl ? this.url : this.getUrl();
     let notify = null;
@@ -308,6 +321,7 @@ export default class ApiRequest {
       method: this.method,
       data: data,
       params: params,
+      source: this.source,
       success: (response, status, xhr) => {
         if (response && response.result === 'success') {
           notify = this.handleSuccessNotification(response, xhr.status);