laravel-request 1.2.11 → 1.2.12
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 +2 -1
- package/src/Api.js +13 -3
- package/src/ApiRequest.js +1 -1
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "laravel-request",
|
|
3
3
|
"productName": "laravel-request",
|
|
4
|
-
"version": "1.2.
|
|
4
|
+
"version": "1.2.12",
|
|
5
5
|
"description": "laravel-request",
|
|
6
6
|
"main": "src/index.js",
|
|
7
7
|
"module": "src/index.js",
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@msgpack/msgpack": "^3.1.1",
|
|
17
17
|
"axios": "^1.8.4",
|
|
18
|
+
"axios-mock-adapter": "^2.1.0",
|
|
18
19
|
"query-string": "^8.1.0"
|
|
19
20
|
}
|
|
20
21
|
}
|
package/src/Api.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import ApiRequest from "./ApiRequest";
|
|
2
2
|
import axios from "axios";
|
|
3
|
+
import MockAdapter from "axios-mock-adapter";
|
|
3
4
|
import { decode } from "@msgpack/msgpack";
|
|
4
5
|
|
|
5
6
|
export default class Api {
|
|
@@ -25,6 +26,15 @@ export default class Api {
|
|
|
25
26
|
return localStorage.getItem('api_token');
|
|
26
27
|
}
|
|
27
28
|
|
|
29
|
+
/**
|
|
30
|
+
*
|
|
31
|
+
* @returns {Promise<AxiosStatic | axios.AxiosStatic | axios>}
|
|
32
|
+
*/
|
|
33
|
+
static axiosResolver = async () =>
|
|
34
|
+
{
|
|
35
|
+
return axios;
|
|
36
|
+
}
|
|
37
|
+
|
|
28
38
|
/**
|
|
29
39
|
*
|
|
30
40
|
* @return {string}
|
|
@@ -390,7 +400,7 @@ export default class Api {
|
|
|
390
400
|
cancelToken: source?.token
|
|
391
401
|
};
|
|
392
402
|
Api.logRequest(request);
|
|
393
|
-
response = await
|
|
403
|
+
response = await Api.axiosResolver().request(request);
|
|
394
404
|
} else {
|
|
395
405
|
data.timestamp = new Date().getTime();
|
|
396
406
|
let request = {
|
|
@@ -403,7 +413,7 @@ export default class Api {
|
|
|
403
413
|
cancelToken: source?.token
|
|
404
414
|
};
|
|
405
415
|
Api.logRequest(request);
|
|
406
|
-
response = await
|
|
416
|
+
response = await Api.axiosResolver().request(request);
|
|
407
417
|
}
|
|
408
418
|
|
|
409
419
|
return response;
|
|
@@ -435,6 +445,6 @@ export default class Api {
|
|
|
435
445
|
cancelToken: source?.token
|
|
436
446
|
};
|
|
437
447
|
Api.logRequest(request);
|
|
438
|
-
return await
|
|
448
|
+
return await Api.axiosResolver().request(request);
|
|
439
449
|
}
|
|
440
450
|
}
|
package/src/ApiRequest.js
CHANGED
|
@@ -347,7 +347,7 @@ export default class ApiRequest {
|
|
|
347
347
|
this.callSuccess = successCallback;
|
|
348
348
|
this.callError = errorCallback;
|
|
349
349
|
this.callFinal = finalCallback;
|
|
350
|
-
this.source =
|
|
350
|
+
this.source = Api.axiosResolver().CancelToken.source();
|
|
351
351
|
|
|
352
352
|
let url = byUrl ? this.url : this.getUrl();
|
|
353
353
|
let notify = null;
|