rxtutils 1.0.6 → 1.0.7
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.
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var tslib_es6_js = require('C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js');
|
|
4
|
+
|
|
5
|
+
var RequestError = /** @class */ (function (_super) {
|
|
6
|
+
tslib_es6_js.__extends(RequestError, _super);
|
|
7
|
+
function RequestError(message, type, data) {
|
|
8
|
+
var _this = _super.call(this, message) || this;
|
|
9
|
+
_this.name = 'RequestError';
|
|
10
|
+
_this.type = type;
|
|
11
|
+
_this.data = data;
|
|
12
|
+
return _this;
|
|
13
|
+
}
|
|
14
|
+
return RequestError;
|
|
15
|
+
}(Error));
|
|
16
|
+
|
|
17
|
+
module.exports = RequestError;
|
|
@@ -6,6 +6,7 @@ var lodash = require('lodash');
|
|
|
6
6
|
var defaultHandlers = require('./defaultHandlers.cjs');
|
|
7
7
|
var defaultEquals = require('../defaultEquals.cjs');
|
|
8
8
|
var index = require('../cache/index.cjs');
|
|
9
|
+
var error = require('./error.cjs');
|
|
9
10
|
|
|
10
11
|
function createBaseRequest(baseOptions) {
|
|
11
12
|
var baseURL = Object(baseOptions).baseURL;
|
|
@@ -39,9 +40,7 @@ function createBaseRequest(baseOptions) {
|
|
|
39
40
|
return res.data;
|
|
40
41
|
}
|
|
41
42
|
var _a = errorCodeMap, _b = errorCode, _c = _a[_b], customHandler = _c === void 0 ? defaultErrorCodeHandler : _c;
|
|
42
|
-
var err = new
|
|
43
|
-
err.type = 'server';
|
|
44
|
-
err.data = res;
|
|
43
|
+
var err = new error('服务端错误', 'server', res);
|
|
45
44
|
if (typeof customHandler === 'string') {
|
|
46
45
|
defaultMessageShower(customHandler);
|
|
47
46
|
}
|
|
@@ -59,19 +58,17 @@ function createBaseRequest(baseOptions) {
|
|
|
59
58
|
throw err;
|
|
60
59
|
}
|
|
61
60
|
return res.data;
|
|
62
|
-
}, function (error) {
|
|
63
|
-
if (error.response) {
|
|
61
|
+
}, function (error$1) {
|
|
62
|
+
if (error$1.response) {
|
|
64
63
|
// 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
|
|
65
|
-
var resData = error;
|
|
66
|
-
var _a = httpErrorCodeMap, _b = error.response.status, _c = _a[_b], customHandler = _c === void 0 ? defaultHttpErrorCodeHandler : _c;
|
|
67
|
-
var err = new
|
|
68
|
-
err.type = 'http';
|
|
69
|
-
err.data = error;
|
|
64
|
+
var resData = error$1;
|
|
65
|
+
var _a = httpErrorCodeMap, _b = error$1.response.status, _c = _a[_b], customHandler = _c === void 0 ? defaultHttpErrorCodeHandler : _c;
|
|
66
|
+
var err = new error('服务端错误', 'http', error$1);
|
|
70
67
|
if (typeof customHandler === 'string') {
|
|
71
|
-
|
|
68
|
+
defaultMessageShower(customHandler);
|
|
72
69
|
}
|
|
73
70
|
else {
|
|
74
|
-
var _d = (Object(customHandler(error.response.status, error, tslib_es6_js.__assign(tslib_es6_js.__assign({}, requestOptions), requestParam)))), _e = _d.replaceResData, replaceResData = _e === void 0 ? error : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? 'default' : _f;
|
|
71
|
+
var _d = (Object(customHandler(error$1.response.status, error$1, tslib_es6_js.__assign(tslib_es6_js.__assign({}, requestOptions), requestParam)))), _e = _d.replaceResData, replaceResData = _e === void 0 ? error$1 : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? 'default' : _f;
|
|
75
72
|
resData = replaceResData;
|
|
76
73
|
switch (handlerThrowError) {
|
|
77
74
|
case true:
|
|
@@ -86,11 +83,11 @@ function createBaseRequest(baseOptions) {
|
|
|
86
83
|
return resData;
|
|
87
84
|
}
|
|
88
85
|
else {
|
|
89
|
-
var resData = error;
|
|
90
|
-
var err = new
|
|
86
|
+
var resData = error$1;
|
|
87
|
+
var err = new error('服务端错误', 'http', error$1);
|
|
91
88
|
err.type = 'http';
|
|
92
|
-
err.data = error;
|
|
93
|
-
var _g = (Object(otherErrorHandler(error))), _h = _g.replaceResData, replaceResData = _h === void 0 ? error : _h, _j = _g.throwError, handlerThrowError = _j === void 0 ? 'default' : _j;
|
|
89
|
+
err.data = error$1;
|
|
90
|
+
var _g = (Object(otherErrorHandler(error$1))), _h = _g.replaceResData, replaceResData = _h === void 0 ? error$1 : _h, _j = _g.throwError, handlerThrowError = _j === void 0 ? 'default' : _j;
|
|
94
91
|
resData = replaceResData;
|
|
95
92
|
switch (handlerThrowError) {
|
|
96
93
|
case true:
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { __extends } from 'C:\\Users\\ruixutong\\code\\RUtils\\node_modules\\tslib\\tslib.es6.js';
|
|
2
|
+
|
|
3
|
+
var RequestError = /** @class */ (function (_super) {
|
|
4
|
+
__extends(RequestError, _super);
|
|
5
|
+
function RequestError(message, type, data) {
|
|
6
|
+
var _this = _super.call(this, message) || this;
|
|
7
|
+
_this.name = 'RequestError';
|
|
8
|
+
_this.type = type;
|
|
9
|
+
_this.data = data;
|
|
10
|
+
return _this;
|
|
11
|
+
}
|
|
12
|
+
return RequestError;
|
|
13
|
+
}(Error));
|
|
14
|
+
|
|
15
|
+
export { RequestError as default };
|
|
@@ -4,6 +4,7 @@ import { at } from 'lodash';
|
|
|
4
4
|
import { _defaultErrorCodeHandler, _defaultHttpErrorCodeHandler, _defaultOtherErrorCodeHandler } from './defaultHandlers.mjs';
|
|
5
5
|
import defaultEquals from '../defaultEquals.mjs';
|
|
6
6
|
import Cache from '../cache/index.mjs';
|
|
7
|
+
import RequestError from './error.mjs';
|
|
7
8
|
|
|
8
9
|
function createBaseRequest(baseOptions) {
|
|
9
10
|
var baseURL = Object(baseOptions).baseURL;
|
|
@@ -37,9 +38,7 @@ function createBaseRequest(baseOptions) {
|
|
|
37
38
|
return res.data;
|
|
38
39
|
}
|
|
39
40
|
var _a = errorCodeMap, _b = errorCode, _c = _a[_b], customHandler = _c === void 0 ? defaultErrorCodeHandler : _c;
|
|
40
|
-
var err = new
|
|
41
|
-
err.type = 'server';
|
|
42
|
-
err.data = res;
|
|
41
|
+
var err = new RequestError('服务端错误', 'server', res);
|
|
43
42
|
if (typeof customHandler === 'string') {
|
|
44
43
|
defaultMessageShower(customHandler);
|
|
45
44
|
}
|
|
@@ -62,11 +61,9 @@ function createBaseRequest(baseOptions) {
|
|
|
62
61
|
// 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
|
|
63
62
|
var resData = error;
|
|
64
63
|
var _a = httpErrorCodeMap, _b = error.response.status, _c = _a[_b], customHandler = _c === void 0 ? defaultHttpErrorCodeHandler : _c;
|
|
65
|
-
var err = new
|
|
66
|
-
err.type = 'http';
|
|
67
|
-
err.data = error;
|
|
64
|
+
var err = new RequestError('服务端错误', 'http', error);
|
|
68
65
|
if (typeof customHandler === 'string') {
|
|
69
|
-
|
|
66
|
+
defaultMessageShower(customHandler);
|
|
70
67
|
}
|
|
71
68
|
else {
|
|
72
69
|
var _d = (Object(customHandler(error.response.status, error, __assign(__assign({}, requestOptions), requestParam)))), _e = _d.replaceResData, replaceResData = _e === void 0 ? error : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? 'default' : _f;
|
|
@@ -85,7 +82,7 @@ function createBaseRequest(baseOptions) {
|
|
|
85
82
|
}
|
|
86
83
|
else {
|
|
87
84
|
var resData = error;
|
|
88
|
-
var err = new
|
|
85
|
+
var err = new RequestError('服务端错误', 'http', error);
|
|
89
86
|
err.type = 'http';
|
|
90
87
|
err.data = error;
|
|
91
88
|
var _g = (Object(otherErrorHandler(error))), _h = _g.replaceResData, replaceResData = _h === void 0 ? error : _h, _j = _g.throwError, handlerThrowError = _j === void 0 ? 'default' : _j;
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { default as Cache, ICache, ICacheOptions, StorageMap, StorageType } from './cache/index.js';
|
|
2
2
|
export { ErrorHandlerReturnType, Options, RequestOptions, default as createBaseRequest } from './request/index.js';
|
|
3
3
|
export { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter, default as createStateStore } from './createStateStore/index.js';
|
|
4
|
+
export { default as RequestError, RequestErrorType } from './request/error.js';
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
type RequestErrorType = 'server' | 'http';
|
|
2
|
+
declare class RequestError<Data = any> extends Error {
|
|
3
|
+
code: string;
|
|
4
|
+
type: RequestErrorType;
|
|
5
|
+
data?: Data;
|
|
6
|
+
constructor(message: string, type: RequestErrorType, data?: Data);
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export { RequestError as default };
|
|
10
|
+
export type { RequestErrorType };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rxtutils",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.7",
|
|
4
4
|
"main": "dist/cjs/index.cjs",
|
|
5
5
|
"module": "dist/es/index.mjs",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
15
|
"@rollup/plugin-typescript": "^12.1.2",
|
|
16
|
+
"@types/lodash": "^4.17.17",
|
|
16
17
|
"@types/node": "^22.15.29",
|
|
17
18
|
"rollup": "^4.41.1",
|
|
18
19
|
"rollup-plugin-dts": "^6.2.1",
|