laravel-request 1.2.2 → 1.2.4

package/package.json

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

package/src/Api.js

@@ -37,9 +37,9 @@ export default class Api {
    *
    * @return {string}
    */
-  static envResolver = () =>
+  static isDebug = () =>
   {
-    return process.env.REACT_APP_ENV;
+    return process.env.REACT_APP_DEBUG === 'true';
   }
 
   /**
@@ -211,7 +211,7 @@ export default class Api {
 
         const data = decode(arrayBuffer);
 
-        if(this.envResolver() === 'local')
+        if(this.isDebug())
         {
           console.log(url)
           console.log(data)
@@ -297,18 +297,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)