routup 0.6.0 → 0.7.0
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/dist/config/accessors.d.ts +15 -0
- package/dist/config/accessors.d.ts.map +1 -0
- package/dist/config/accessors.js +32 -0
- package/dist/config/accessors.js.map +1 -0
- package/dist/config/index.d.ts +5 -0
- package/dist/config/index.d.ts.map +1 -0
- package/dist/config/index.js +27 -0
- package/dist/config/index.js.map +1 -0
- package/dist/config/module.d.ts +20 -0
- package/dist/config/module.d.ts.map +1 -0
- package/dist/config/module.js +65 -0
- package/dist/config/module.js.map +1 -0
- package/dist/config/singleton.d.ts +4 -0
- package/dist/config/singleton.d.ts.map +1 -0
- package/dist/config/singleton.js +35 -0
- package/dist/config/singleton.js.map +1 -0
- package/dist/config/type.d.ts +66 -0
- package/dist/config/type.d.ts.map +1 -0
- package/dist/config/type.js +9 -0
- package/dist/config/type.js.map +1 -0
- package/dist/config/utils/defaults.d.ts +3 -0
- package/dist/config/utils/defaults.d.ts.map +1 -0
- package/dist/config/utils/defaults.js +23 -0
- package/dist/config/utils/defaults.js.map +1 -0
- package/dist/config/utils/etag.d.ts +3 -0
- package/dist/config/utils/etag.d.ts.map +1 -0
- package/dist/config/utils/etag.js +43 -0
- package/dist/config/utils/etag.js.map +1 -0
- package/dist/config/utils/index.d.ts +4 -0
- package/dist/config/utils/index.d.ts.map +1 -0
- package/dist/config/utils/index.js +26 -0
- package/dist/config/utils/index.js.map +1 -0
- package/dist/config/utils/trust-proxy.d.ts +3 -0
- package/dist/config/utils/trust-proxy.d.ts.map +1 -0
- package/dist/config/utils/trust-proxy.js +31 -0
- package/dist/config/utils/trust-proxy.js.map +1 -0
- package/dist/constants.d.ts +5 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +4 -0
- package/dist/constants.js.map +1 -1
- package/dist/helpers/request/hostname.d.ts +8 -0
- package/dist/helpers/request/hostname.d.ts.map +1 -0
- package/dist/helpers/request/hostname.js +46 -0
- package/dist/helpers/request/hostname.js.map +1 -0
- package/dist/helpers/request/index.d.ts +3 -0
- package/dist/helpers/request/index.d.ts.map +1 -1
- package/dist/helpers/request/index.js +3 -0
- package/dist/helpers/request/index.js.map +1 -1
- package/dist/helpers/request/ip.d.ts +8 -0
- package/dist/helpers/request/ip.d.ts.map +1 -0
- package/dist/helpers/request/ip.js +29 -0
- package/dist/helpers/request/ip.js.map +1 -0
- package/dist/helpers/request/protocol.d.ts +9 -0
- package/dist/helpers/request/protocol.d.ts.map +1 -0
- package/dist/helpers/request/protocol.js +50 -0
- package/dist/helpers/request/protocol.js.map +1 -0
- package/dist/helpers/response/send.js +11 -14
- package/dist/helpers/response/send.js.map +1 -1
- package/dist/layer/module.d.ts.map +1 -1
- package/dist/layer/module.js +17 -2
- package/dist/layer/module.js.map +1 -1
- package/dist/route/module.d.ts.map +1 -1
- package/dist/route/module.js +3 -1
- package/dist/route/module.js.map +1 -1
- package/dist/router/module.d.ts.map +1 -1
- package/dist/router/module.js +14 -8
- package/dist/router/module.js.map +1 -1
- package/dist/type.d.ts +1 -0
- package/dist/type.d.ts.map +1 -1
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/request.d.ts +3 -0
- package/dist/utils/request.d.ts.map +1 -0
- package/dist/utils/{response.js → request.js} +7 -6
- package/dist/utils/request.js.map +1 -0
- package/package.json +6 -4
- package/dist/utils/response.d.ts +0 -3
- package/dist/utils/response.d.ts.map +0 -1
- package/dist/utils/response.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/helpers/request/index.ts"],"names":[],"mappings":"AAOA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/helpers/request/index.ts"],"names":[],"mappings":"AAOA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,MAAM,CAAC;AACrB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC"}
|
|
@@ -28,8 +28,11 @@ __exportStar(require("./header-accept-charset"), exports);
|
|
|
28
28
|
__exportStar(require("./header-accept-encoding"), exports);
|
|
29
29
|
__exportStar(require("./header-accept-language"), exports);
|
|
30
30
|
__exportStar(require("./header-content-type"), exports);
|
|
31
|
+
__exportStar(require("./hostname"), exports);
|
|
32
|
+
__exportStar(require("./ip"), exports);
|
|
31
33
|
__exportStar(require("./mount-path"), exports);
|
|
32
34
|
__exportStar(require("./negotiator"), exports);
|
|
33
35
|
__exportStar(require("./params"), exports);
|
|
36
|
+
__exportStar(require("./protocol"), exports);
|
|
34
37
|
__exportStar(require("./path"), exports);
|
|
35
38
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/request/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,kDAAgC;AAChC,0DAAwC;AACxC,2DAAyC;AACzC,2DAAyC;AACzC,wDAAsC;AACtC,+CAA6B;AAC7B,+CAA6B;AAC7B,2CAAyB;AACzB,yCAAuB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/request/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,kDAAgC;AAChC,0DAAwC;AACxC,2DAAyC;AACzC,2DAAyC;AACzC,wDAAsC;AACtC,6CAA2B;AAC3B,uCAAqB;AACrB,+CAA6B;AAC7B,+CAA6B;AAC7B,2CAAyB;AACzB,6CAA2B;AAC3B,yCAAuB"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { TrustProxyInput } from '../../config';
|
|
2
|
+
import { Request } from '../../type';
|
|
3
|
+
type RequestIpOptions = {
|
|
4
|
+
trustProxy?: TrustProxyInput;
|
|
5
|
+
};
|
|
6
|
+
export declare function getRequestIp(req: Request, options?: RequestIpOptions): string;
|
|
7
|
+
export {};
|
|
8
|
+
//# sourceMappingURL=ip.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ip.d.ts","sourceRoot":"","sources":["../../../src/helpers/request/ip.ts"],"names":[],"mappings":"AAQA,OAAO,EAAgB,eAAe,EAAa,MAAM,cAAc,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,KAAK,gBAAgB,GAAG;IACpB,UAAU,CAAC,EAAE,eAAe,CAAA;CAC/B,CAAC;AAEF,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAI,MAAM,CAY9E"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* Copyright (c) 2022.
|
|
4
|
+
* Author Peter Placzek (tada5hi)
|
|
5
|
+
* For the full copyright and license information,
|
|
6
|
+
* view the LICENSE file that was distributed with this source code.
|
|
7
|
+
*/
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.getRequestIp = void 0;
|
|
13
|
+
const proxy_addr_1 = __importDefault(require("proxy-addr"));
|
|
14
|
+
const config_1 = require("../../config");
|
|
15
|
+
const utils_1 = require("../../config/utils");
|
|
16
|
+
function getRequestIp(req, options) {
|
|
17
|
+
options = options || {};
|
|
18
|
+
let trustProxy;
|
|
19
|
+
if (typeof options.trustProxy !== 'undefined') {
|
|
20
|
+
trustProxy = (0, utils_1.buildConfigTrustProxyOption)(options.trustProxy);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
const config = (0, config_1.useConfig)();
|
|
24
|
+
trustProxy = config.get('trustProxy');
|
|
25
|
+
}
|
|
26
|
+
return (0, proxy_addr_1.default)(req, trustProxy);
|
|
27
|
+
}
|
|
28
|
+
exports.getRequestIp = getRequestIp;
|
|
29
|
+
//# sourceMappingURL=ip.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ip.js","sourceRoot":"","sources":["../../../src/helpers/request/ip.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,4DAAmC;AACnC,yCAAwE;AACxE,8CAAiE;AAOjE,SAAgB,YAAY,CAAC,GAAY,EAAE,OAA0B;IACjE,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAExB,IAAI,UAAyB,CAAC;IAC9B,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW,EAAE;QAC3C,UAAU,GAAG,IAAA,mCAA2B,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KAChE;SAAM;QACH,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;KACzC;IAED,OAAO,IAAA,oBAAS,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AACtC,CAAC;AAZD,oCAYC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { TrustProxyInput } from '../../config';
|
|
2
|
+
import { Request } from '../../type';
|
|
3
|
+
type RequestProtocolOptions = {
|
|
4
|
+
trustProxy?: TrustProxyInput;
|
|
5
|
+
default?: string;
|
|
6
|
+
};
|
|
7
|
+
export declare function getRequestProtocol(req: Request, options?: RequestProtocolOptions): string;
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=protocol.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/helpers/request/protocol.ts"],"names":[],"mappings":"AAQA,OAAO,EAAgB,eAAe,EAAa,MAAM,cAAc,CAAC;AAGxE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,KAAK,sBAAsB,GAAG;IAC1B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,sBAAsB,UAyChF"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* Copyright (c) 2022.
|
|
4
|
+
* Author Peter Placzek (tada5hi)
|
|
5
|
+
* For the full copyright and license information,
|
|
6
|
+
* view the LICENSE file that was distributed with this source code.
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.getRequestProtocol = void 0;
|
|
10
|
+
const smob_1 = require("smob");
|
|
11
|
+
const config_1 = require("../../config");
|
|
12
|
+
const utils_1 = require("../../config/utils");
|
|
13
|
+
const constants_1 = require("../../constants");
|
|
14
|
+
function getRequestProtocol(req, options) {
|
|
15
|
+
options = options || {};
|
|
16
|
+
let trustProxy;
|
|
17
|
+
if (typeof options.trustProxy !== 'undefined') {
|
|
18
|
+
trustProxy = (0, utils_1.buildConfigTrustProxyOption)(options.trustProxy);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
const config = (0, config_1.useConfig)();
|
|
22
|
+
trustProxy = config.get('trustProxy');
|
|
23
|
+
}
|
|
24
|
+
let protocol = options.default;
|
|
25
|
+
/* istanbul ignore next */
|
|
26
|
+
if ((0, smob_1.hasOwnProperty)(req.socket, 'encrypted') &&
|
|
27
|
+
!!req.socket.encrypted) {
|
|
28
|
+
protocol = 'https';
|
|
29
|
+
}
|
|
30
|
+
else if (!protocol) {
|
|
31
|
+
protocol = 'http';
|
|
32
|
+
}
|
|
33
|
+
if (!req.socket.remoteAddress || !trustProxy(req.socket.remoteAddress, 0)) {
|
|
34
|
+
return protocol;
|
|
35
|
+
}
|
|
36
|
+
let header = req.headers[constants_1.HeaderName.X_FORWARDED_PROTO];
|
|
37
|
+
/* istanbul ignore next */
|
|
38
|
+
if (Array.isArray(header)) {
|
|
39
|
+
header = header.pop();
|
|
40
|
+
}
|
|
41
|
+
if (!header) {
|
|
42
|
+
return protocol;
|
|
43
|
+
}
|
|
44
|
+
const index = header.indexOf(',');
|
|
45
|
+
return index !== -1 ?
|
|
46
|
+
header.substring(0, index).trim() :
|
|
47
|
+
header.trim();
|
|
48
|
+
}
|
|
49
|
+
exports.getRequestProtocol = getRequestProtocol;
|
|
50
|
+
//# sourceMappingURL=protocol.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/helpers/request/protocol.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAsC;AACtC,yCAAwE;AACxE,8CAAiE;AACjE,+CAA6C;AAQ7C,SAAgB,kBAAkB,CAAC,GAAY,EAAE,OAAgC;IAC7E,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAExB,IAAI,UAAyB,CAAC;IAC9B,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW,EAAE;QAC3C,UAAU,GAAG,IAAA,mCAA2B,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KAChE;SAAM;QACH,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;KACzC;IAED,IAAI,QAAQ,GAAwB,OAAO,CAAC,OAAO,CAAC;IACpD,0BAA0B;IAC1B,IACI,IAAA,qBAAc,EAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC;QACvC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EACxB;QACE,QAAQ,GAAG,OAAO,CAAC;KACtB;SAAM,IAAI,CAAC,QAAQ,EAAE;QAClB,QAAQ,GAAG,MAAM,CAAC;KACrB;IAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE;QACvE,OAAO,QAAQ,CAAC;KACnB;IAED,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,sBAAU,CAAC,iBAAiB,CAAC,CAAC;IACvD,0BAA0B;IAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvB,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;KACzB;IAED,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,QAAQ,CAAC;KACnB;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAElC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AAzCD,gDAyCC"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.send = void 0;
|
|
7
4
|
/*
|
|
@@ -10,7 +7,7 @@ exports.send = void 0;
|
|
|
10
7
|
* For the full copyright and license information,
|
|
11
8
|
* view the LICENSE file that was distributed with this source code.
|
|
12
9
|
*/
|
|
13
|
-
const
|
|
10
|
+
const config_1 = require("../../config");
|
|
14
11
|
const constants_1 = require("../../constants");
|
|
15
12
|
const header_1 = require("./header");
|
|
16
13
|
const header_content_type_1 = require("./header-content-type");
|
|
@@ -59,17 +56,17 @@ function send(res, chunk) {
|
|
|
59
56
|
encoding = undefined;
|
|
60
57
|
len = chunk.length;
|
|
61
58
|
}
|
|
62
|
-
res.setHeader(constants_1.HeaderName.CONTENT_LENGTH, len);
|
|
59
|
+
res.setHeader(constants_1.HeaderName.CONTENT_LENGTH, `${len}`);
|
|
63
60
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
const chunkHash = (
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
61
|
+
const config = (0, config_1.useConfig)();
|
|
62
|
+
const etagFn = config.get('etag');
|
|
63
|
+
if (typeof len !== 'undefined') {
|
|
64
|
+
const chunkHash = etagFn(chunk, encoding, len);
|
|
65
|
+
if (typeof chunkHash === 'string') {
|
|
66
|
+
res.setHeader('ETag', chunkHash);
|
|
67
|
+
if (res.req.headers['if-none-match'] === chunkHash) {
|
|
68
|
+
res.statusCode = 304;
|
|
69
|
+
}
|
|
73
70
|
}
|
|
74
71
|
}
|
|
75
72
|
// strip irrelevant headers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/helpers/response/send.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/helpers/response/send.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":"AAQA,OAAO,EACH,YAAY,EAAE,qBAAqB,EACtC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":"AAQA,OAAO,EACH,YAAY,EAAE,qBAAqB,EACtC,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EACH,cAAc,EAAQ,IAAI,EAAE,OAAO,EAAE,QAAQ,EAChD,MAAM,SAAS,CAAC;AAEjB,qBAAa,KAAK;IACd,QAAQ,CAAC,aAAa,SAAuB;IAE7C,SAAS,CAAC,EAAE,EAAG,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,EAAG,WAAW,CAAC;gBAKhC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,GAAG,YAAY,EAC7C,EAAE,EAAE,gBAAgB;IAaxB,OAAO;IAMP,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,gBAAgB,GACtB,IAAI;IAER,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,KAAK,GACV,IAAI;IA6DR,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAIjC,IAAI,CAAC,IAAI,EAAE,MAAM;CAGpB"}
|
package/dist/layer/module.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Layer = void 0;
|
|
10
10
|
const http_1 = require("@ebec/http");
|
|
11
|
+
const config_1 = require("../config");
|
|
11
12
|
const handler_1 = require("../handler");
|
|
12
13
|
const helpers_1 = require("../helpers");
|
|
13
14
|
const path_1 = require("../path");
|
|
@@ -15,6 +16,10 @@ class Layer {
|
|
|
15
16
|
// --------------------------------------------------
|
|
16
17
|
constructor(path, options, fn) {
|
|
17
18
|
this['@instanceof'] = Symbol.for('Layer');
|
|
19
|
+
if (typeof options.sensitive === 'undefined') {
|
|
20
|
+
const config = (0, config_1.useConfig)();
|
|
21
|
+
options.sensitive = config.get('caseSensitive');
|
|
22
|
+
}
|
|
18
23
|
this.pathMatcher = new path_1.PathMatcher(path, options);
|
|
19
24
|
this.fn = fn;
|
|
20
25
|
}
|
|
@@ -32,7 +37,15 @@ class Layer {
|
|
|
32
37
|
}
|
|
33
38
|
catch (e) {
|
|
34
39
|
/* istanbul ignore next */
|
|
35
|
-
next
|
|
40
|
+
/* istanbul ignore next */
|
|
41
|
+
if (e instanceof Error) {
|
|
42
|
+
next(e);
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
next(new http_1.BadRequestError({
|
|
46
|
+
message: 'The request could not be processed by the error handler.',
|
|
47
|
+
}));
|
|
48
|
+
}
|
|
36
49
|
}
|
|
37
50
|
return;
|
|
38
51
|
}
|
|
@@ -56,7 +69,9 @@ class Layer {
|
|
|
56
69
|
next(e);
|
|
57
70
|
}
|
|
58
71
|
else {
|
|
59
|
-
next(new http_1.
|
|
72
|
+
next(new http_1.BadRequestError({
|
|
73
|
+
message: 'The request could not be processed by the handler.',
|
|
74
|
+
}));
|
|
60
75
|
}
|
|
61
76
|
}
|
|
62
77
|
}
|
package/dist/layer/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA6C;AAI7C,sCAAsC;AACtC,wCAA2D;AAC3D,wCAAmE;AACnE,kCAAsC;AAKtC,MAAa,KAAK;IAOd,qDAAqD;IAErD,YACI,IAAU,EACV,OAA6C,EAC7C,EAAoB;QAXf,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAazC,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;YAC1C,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;YAC3B,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,qDAAqD;IAErD,OAAO;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;IAChC,CAAC;IAmBD,QAAQ,CACJ,GAAY,EACZ,GAAa,EACb,IAAoB,EACpB,IAAU,EACV,GAAW;QAEX,IAAA,0BAAgB,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QACzC,IAAA,6BAAmB,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC;QAEhD,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;YAC5B,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,IAAI;oBACA,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;iBAChC;gBAAC,OAAO,CAAC,EAAE;oBACR,0BAA0B;oBAC1B,0BAA0B;oBAC1B,IAAI,CAAC,YAAY,KAAK,EAAE;wBACpB,IAAI,CAAC,CAAC,CAAC,CAAC;qBACX;yBAAM;wBACH,IAAI,CAAC,IAAI,sBAAe,CAAC;4BACrB,OAAO,EAAE,0DAA0D;yBACtE,CAAC,CAAC,CAAC;qBACP;iBACJ;gBAED,OAAO;aACV;YAED,0BAA0B;YAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,0BAA0B;YAC1B,OAAO;SACV;QAED,0BAA0B;QAC1B,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,IAAI,EAAE,CAAC;YACP,OAAO;SACV;QAED,IAAI;YACA,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAEvC,IAAA,uCAA6B,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACR,0BAA0B;YAC1B,IAAI,CAAC,YAAY,KAAK,EAAE;gBACpB,IAAI,CAAC,CAAC,CAAC,CAAC;aACX;iBAAM;gBACH,IAAI,CAAC,IAAI,sBAAe,CAAC;oBACrB,OAAO,EAAE,oDAAoD;iBAChE,CAAC,CAAC,CAAC;aACP;SACJ;IACL,CAAC;IAED,qDAAqD;IAErD,SAAS,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC,IAAY;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ;AAhHD,sBAgHC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EACH,cAAc,EACd,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAChC,MAAM,SAAS,CAAC;AAEjB,qBAAa,KAAK;IACd,QAAQ,CAAC,aAAa,SAAuB;IAEtC,IAAI,EAAG,IAAI,CAAC;IAEnB,SAAS,CAAC,WAAW,EAAG,WAAW,CAAC;IAEpC,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;IAElD,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAM;gBAIpC,IAAI,EAAE,IAAI;IAWtB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAIjC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAI,OAAO;IAerC,UAAU,IAAK,MAAM,EAAE;IAevB,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,IAAI,GACV,IAAI;IAuDR,QAAQ,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE;IAcpD,GAAG,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI1B,IAAI,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI3B,GAAG,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI1B,KAAK,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI5B,MAAM,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI7B,IAAI,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI3B,OAAO,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAM9B,OAAO,CAAC,YAAY;CAIvB"}
|
package/dist/route/module.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Route = void 0;
|
|
10
10
|
const smob_1 = require("smob");
|
|
11
|
+
const config_1 = require("../config");
|
|
11
12
|
const constants_1 = require("../constants");
|
|
12
13
|
const layer_1 = require("../layer");
|
|
13
14
|
const path_1 = require("../path");
|
|
@@ -17,7 +18,8 @@ class Route {
|
|
|
17
18
|
this['@instanceof'] = Symbol.for('Route');
|
|
18
19
|
this.layers = {};
|
|
19
20
|
this.path = path;
|
|
20
|
-
|
|
21
|
+
const config = (0, config_1.useConfig)();
|
|
22
|
+
this.pathMatcherOptions = { end: true, strict: this.isStrictPath(), sensitive: config.get('caseSensitive') };
|
|
21
23
|
this.pathMatcher = new path_1.PathMatcher(path, this.pathMatcherOptions);
|
|
22
24
|
}
|
|
23
25
|
// --------------------------------------------------
|
package/dist/route/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA6C;AAC7C,4CAAsC;AAEtC,oCAAiC;AACjC,kCAA0D;AAM1D,MAAa,KAAK;IAWd,qDAAqD;IAErD,YAAY,IAAU;QAZb,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAQnC,WAAM,GAA6B,EAAE,CAAC;QAK5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,CAAC,kBAAkB,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";AAWA,OAAO,EAAE,eAAe,EAAgB,MAAM,MAAM,CAAC;AAIrD,OAAO,EACH,YAAY,EAAE,OAAO,EACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAStC,OAAO,EAAE,KAAK,EAAmB,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,KAAK,EAAmB,MAAM,UAAU,CAAC;AAClD,OAAO,EACH,cAAc,EACd,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,QAAQ,EACX,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAI,KAAK,IAAI,MAAM,CAEjE;AAED,qBAAa,MAAM;IACf,QAAQ,CAAC,aAAa,SAAwB;IAE9C,SAAS,CAAC,SAAS,EAAG,IAAI,GAAG,SAAS,CAAC;IAEvC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAEtC,SAAS,CAAC,KAAK,EAAG,CAAC,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC,EAAE,CAAM;IAElD,SAAS,CAAC,WAAW,EAAG,WAAW,GAAG,SAAS,CAAC;IAEhD;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAG,OAAO,GAAG,SAAS,CAAC;gBAI3B,OAAO,CAAC,EAAE,aAAa;IASnC,YAAY,CAAC,KAAK,EAAE,IAAI;IAkBxB,cAAc,IAAK,eAAe;IASlC,MAAM,CAAC,IAAI,EAAE,MAAM;IAOnB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAUjC,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,CAAC,EAAE,cAAc,EACrB,IAAI,CAAC,EAAE,IAAI,GACX,IAAI;IA6JR,aAAa,CACT,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,IAAI,CAAC;IAejB,KAAK,CACD,IAAI,EAAE,IAAI,GACV,KAAK;IAsBT,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAOjD,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAO9C,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAO/C,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAO9C,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAOhD,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAO/C,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IASlD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAI,IAAI;IAE1B,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,IAAI;IAE5B,GAAG,CAAC,OAAO,EAAE,YAAY,GAAI,IAAI;IAEjC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAI,IAAI;IAEtC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAI,IAAI;IAExC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,GAAI,IAAI;CA+BhD"}
|
package/dist/router/module.js
CHANGED
|
@@ -7,8 +7,10 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Router = exports.isRouterInstance = void 0;
|
|
10
|
-
const http_1 = require("http");
|
|
10
|
+
const http_1 = require("@ebec/http");
|
|
11
|
+
const http_2 = require("http");
|
|
11
12
|
const smob_1 = require("smob");
|
|
13
|
+
const config_1 = require("../config");
|
|
12
14
|
const constants_1 = require("../constants");
|
|
13
15
|
const path_1 = require("../path");
|
|
14
16
|
const utils_1 = require("../utils");
|
|
@@ -40,7 +42,8 @@ class Router {
|
|
|
40
42
|
else {
|
|
41
43
|
this.mountPath = value;
|
|
42
44
|
}
|
|
43
|
-
|
|
45
|
+
const config = (0, config_1.useConfig)();
|
|
46
|
+
this.pathMatcher = new path_1.PathMatcher(this.mountPath, { end: false, sensitive: config.get('caseSensitive') });
|
|
44
47
|
}
|
|
45
48
|
// --------------------------------------------------
|
|
46
49
|
createListener() {
|
|
@@ -51,7 +54,7 @@ class Router {
|
|
|
51
54
|
}
|
|
52
55
|
/* istanbul ignore next */
|
|
53
56
|
listen(port) {
|
|
54
|
-
const server = (0,
|
|
57
|
+
const server = (0, http_2.createServer)(this.createListener());
|
|
55
58
|
return server.listen(port);
|
|
56
59
|
}
|
|
57
60
|
// --------------------------------------------------
|
|
@@ -68,7 +71,7 @@ class Router {
|
|
|
68
71
|
let allowedMethods = [];
|
|
69
72
|
if (this.isRoot &&
|
|
70
73
|
this.timeout) {
|
|
71
|
-
(0, utils_1.
|
|
74
|
+
(0, utils_1.createRequestTimeout)(res, this.timeout, done);
|
|
72
75
|
}
|
|
73
76
|
const fn = (err) => {
|
|
74
77
|
/* istanbul ignore if */
|
|
@@ -79,8 +82,8 @@ class Router {
|
|
|
79
82
|
return;
|
|
80
83
|
}
|
|
81
84
|
if (typeof err !== 'undefined') {
|
|
82
|
-
res.statusCode =
|
|
83
|
-
res.statusMessage =
|
|
85
|
+
res.statusCode = http_1.BadRequestErrorOptions.statusCode;
|
|
86
|
+
res.statusMessage = http_1.BadRequestErrorOptions.message;
|
|
84
87
|
res.end();
|
|
85
88
|
return;
|
|
86
89
|
}
|
|
@@ -93,7 +96,7 @@ class Router {
|
|
|
93
96
|
(0, helpers_1.send)(res, options);
|
|
94
97
|
return;
|
|
95
98
|
}
|
|
96
|
-
res.statusCode =
|
|
99
|
+
res.statusCode = http_1.NotFoundErrorOptions.statusCode;
|
|
97
100
|
res.end();
|
|
98
101
|
};
|
|
99
102
|
let path = meta.path || (0, helpers_1.useRequestPath)(req);
|
|
@@ -115,7 +118,7 @@ class Router {
|
|
|
115
118
|
meta.mountPath = '/';
|
|
116
119
|
}
|
|
117
120
|
const next = (err) => {
|
|
118
|
-
if (index >= this.stack.length
|
|
121
|
+
if (index >= this.stack.length) {
|
|
119
122
|
fn(err);
|
|
120
123
|
return;
|
|
121
124
|
}
|
|
@@ -125,6 +128,9 @@ class Router {
|
|
|
125
128
|
index++;
|
|
126
129
|
layer = this.stack[index];
|
|
127
130
|
if ((0, layer_1.isLayerInstance)(layer)) {
|
|
131
|
+
if (!layer.isError() && err) {
|
|
132
|
+
continue;
|
|
133
|
+
}
|
|
128
134
|
match = layer.matchPath(path);
|
|
129
135
|
}
|
|
130
136
|
if (isRouterInstance(layer)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAqD;AACrD,+BAA0C;AAC1C,4CAAkD;AAIlD,kCAAsC;AACtC,oCAOkB;AAClB,oCAAkD;AAClD,oCAAkD;AAQlD,wCAGoB;AAGpB,SAAgB,gBAAgB,CAAC,KAAc;IAC3C,OAAO,IAAA,kBAAU,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACvC,CAAC;AAFD,4CAEC;AAED,MAAa,MAAM;IAkBf,qDAAqD;IAErD,YAAY,OAAuB;QAnB1B,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAMpC,UAAK,GAAgC,EAAE,CAAC;QAc9C,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QAExB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,qDAAqD;IAErD,YAAY,CAAC,KAAW;QACpB,IAAI,KAAK,KAAK,GAAG,IAAI,CAAC,IAAA,cAAM,EAAC,KAAK,CAAC,EAAE;YACjC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;YACrB,OAAO;SACV;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,IAAI,CAAC,SAAS,GAAG,IAAA,wBAAgB,EAAC,IAAA,4BAAoB,EAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;SACvE;aAAM;YACH,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;SAC1B;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAGoB;AACpB,+BAAqD;AACrD,+BAA0C;AAC1C,sCAAsC;AACtC,4CAAkD;AAIlD,kCAAsC;AACtC,oCAOkB;AAClB,oCAAkD;AAClD,oCAAkD;AAQlD,wCAGoB;AAGpB,SAAgB,gBAAgB,CAAC,KAAc;IAC3C,OAAO,IAAA,kBAAU,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACvC,CAAC;AAFD,4CAEC;AAED,MAAa,MAAM;IAkBf,qDAAqD;IAErD,YAAY,OAAuB;QAnB1B,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAMpC,UAAK,GAAgC,EAAE,CAAC;QAc9C,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QAExB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,qDAAqD;IAErD,YAAY,CAAC,KAAW;QACpB,IAAI,KAAK,KAAK,GAAG,IAAI,CAAC,IAAA,cAAM,EAAC,KAAK,CAAC,EAAE;YACjC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;YACrB,OAAO;SACV;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,IAAI,CAAC,SAAS,GAAG,IAAA,wBAAgB,EAAC,IAAA,4BAAoB,EAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;SACvE;aAAM;YACH,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;SAC1B;QAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAW,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC/G,CAAC;IAED,qDAAqD;IAErD,cAAc;QACV,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAChB,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5B,CAAC,CAAC;IACN,CAAC;IAED,0BAA0B;IAC1B,MAAM,CAAC,IAAY;QACf,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,qDAAqD;IAErD,SAAS,CAAC,IAAY;QAClB,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACtC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,qDAAqD;IAErD,QAAQ,CACJ,GAAY,EACZ,GAAa,EACb,IAAqB,EACrB,IAAW;QAEX,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;QAEf,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAElB,IAAI,cAAc,GAAc,EAAE,CAAC;QAEnC,IACI,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,OAAO,EACd;YACE,IAAA,4BAAoB,EAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SACjD;QAED,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,EAAE;YACvB,wBAAwB;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACd,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE;oBAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;iBACb;gBAED,OAAO;aACV;YAED,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;gBAC5B,GAAG,CAAC,UAAU,GAAG,6BAAsB,CAAC,UAAU,CAAC;gBACnD,GAAG,CAAC,aAAa,GAAG,6BAAsB,CAAC,OAAO,CAAC;gBAEnD,GAAG,CAAC,GAAG,EAAE,CAAC;gBAEV,OAAO;aACV;YAED,IACI,GAAG,CAAC,MAAM;gBACV,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,kBAAM,CAAC,OAAO,EAC7C;gBACE,MAAM,OAAO,GAAG,cAAc;qBACzB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;qBAC/B,IAAI,CAAC,GAAG,CAAC,CAAC;gBAEf,GAAG,CAAC,SAAS,CAAC,sBAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACzC,IAAA,cAAI,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBAEnB,OAAO;aACV;YAED,GAAG,CAAC,UAAU,GAAG,2BAAoB,CAAC,UAAU,CAAC;YACjD,GAAG,CAAC,GAAG,EAAE,CAAC;QACd,CAAC,CAAC;QAEF,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,IAAA,wBAAc,EAAC,GAAG,CAAC,CAAC;QAE5C,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;gBAC/B,IAAI,CAAC,SAAS,GAAG,IAAA,0BAAkB,EAAC,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBAE9E,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE;oBACtB,IAAI,GAAG,GAAG,CAAC;iBACd;qBAAM;oBACH,IAAI,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;iBAC/D;gBAED,IAAI,CAAC,MAAM,GAAG,IAAA,YAAK,EAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;aACzD;SACJ;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;SACxB;QAED,MAAM,IAAI,GAAG,CAAC,GAAW,EAAS,EAAE;YAChC,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC5B,EAAE,CAAC,GAAG,CAAC,CAAC;gBACR,OAAO;aACV;YAED,IAAI,KAA0C,CAAC;YAC/C,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,OAAO,CAAC,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACxC,KAAK,EAAE,CAAC;gBAER,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAE1B,IAAI,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE;oBACxB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,GAAG,EAAE;wBACzB,SAAS;qBACZ;oBAED,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;iBACjC;gBAED,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE;oBACzB,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;iBACjC;gBAED,IAAI,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE;oBACxB,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBAE9B,IACI,GAAG,CAAC,MAAM;wBACV,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAChC;wBACE,KAAK,GAAG,KAAK,CAAC;wBAEd,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,kBAAM,CAAC,OAAO,EAAE;4BAC7C,cAAc,GAAG,IAAA,kBAAW,EACxB,cAAc,EACd,KAAK,CAAC,UAAU,EAAE,EAClB,IAAI,CACP,CAAC;yBACL;qBACJ;iBACJ;aACJ;YAED,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE;gBAClB,EAAE,CAAC,GAAG,CAAC,CAAC;gBACR,OAAO;aACV;YAED,MAAM,SAAS,qBAAyB,IAAI,CAAE,CAAC;YAE/C,IAAI,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE;gBACxB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEhC,IAAI,MAAM,EAAE;oBACR,SAAS,CAAC,MAAM,GAAG,IAAA,YAAK,EAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;oBAChE,SAAS,CAAC,SAAS,GAAG,IAAA,0BAAkB,EAAC,GAAG,SAAS,CAAC,SAAS,IAAI,EAAE,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;iBAC3F;aACJ;YAED,IAAI,GAAG,EAAE;gBACL,IACI,IAAA,uBAAe,EAAC,KAAK,CAAC;oBACtB,KAAK,CAAC,OAAO,EAAE,EACjB;oBACE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;oBAC/C,OAAO;iBACV;gBAED,0BAA0B;gBAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,OAAO;aACV;YAED,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC,CAAC;QAEF,IAAI,EAAE,CAAC;IACX,CAAC;IAED,0BAA0B;IAC1B,aAAa,CACT,GAAY,EACZ,GAAa;QAEb,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAW,EAAE,EAAE;gBACxC,IAAI,GAAG,EAAE;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;oBACZ,OAAO;iBACV;gBAED,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qDAAqD;IAErD,KAAK,CACD,IAAU;QAEV,IACI,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,CAAC,MAAM,GAAG,CAAC,EACjB;YACE,IAAI,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC;SACjC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAC9B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CACxD,CAAC;QAEF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAU,CAAC;SACrC;QAED,MAAM,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEvB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,IAAU,EAAE,GAAG,QAAmB;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC;QAE1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,IAAU,EAAE,GAAG,QAAmB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAEvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAU,EAAE,GAAG,QAAmB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,IAAU,EAAE,GAAG,QAAmB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAEvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,IAAU,EAAE,GAAG,QAAmB;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC;QAEzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAU,EAAE,GAAG,QAAmB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,GAAG,QAAmB;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC;QAE3B,OAAO,IAAI,CAAC;IAChB,CAAC;IAgBD,GAAG,CAAC,GAAG,KAAgB;QACnB,0BAA0B;QAC1B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,IAAI,CAAC;SACf;QAED,IAAI,IAAuB,CAAC;QAE5B,IAAI,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YAClB,IAAI,GAAG,KAAK,CAAC,KAAK,EAAU,CAAC;SAChC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE;gBACxB,IAAI,IAAI,EAAE;oBACN,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBAC3B;gBACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtB,SAAS;aACZ;YAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;gBAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,aAAK,CAAC,IAAI,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;aAChF;SACJ;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAjXD,wBAiXC"}
|
package/dist/type.d.ts
CHANGED
package/dist/type.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAIvD,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAIhD,MAAM,WAAW,QAAS,SAAQ,cAAc;CAE/C;AAED,MAAM,WAAW,OAAQ,SAAQ,eAAe;CAE/C;AAED,MAAM,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;AAEzC,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;AAInC,MAAM,MAAM,cAAc,GAAG;IACzB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAC"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAOA,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAOA,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC"}
|
package/dist/utils/index.js
CHANGED
|
@@ -25,6 +25,6 @@ __exportStar(require("./mime"), exports);
|
|
|
25
25
|
__exportStar(require("./object"), exports);
|
|
26
26
|
__exportStar(require("./path"), exports);
|
|
27
27
|
__exportStar(require("./promise"), exports);
|
|
28
|
-
__exportStar(require("./
|
|
28
|
+
__exportStar(require("./request"), exports);
|
|
29
29
|
__exportStar(require("./url"), exports);
|
|
30
30
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,gDAA8B;AAC9B,yCAAuB;AACvB,2CAAyB;AACzB,yCAAuB;AACvB,4CAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,gDAA8B;AAC9B,yCAAuB;AACvB,2CAAyB;AACzB,yCAAuB;AACvB,4CAA0B;AAC1B,4CAA0B;AAC1B,wCAAsB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/utils/request.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGzC,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,QAuB/E"}
|
|
@@ -6,12 +6,13 @@
|
|
|
6
6
|
* view the LICENSE file that was distributed with this source code.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
9
|
+
exports.createRequestTimeout = void 0;
|
|
10
|
+
const http_1 = require("@ebec/http");
|
|
10
11
|
/* istanbul ignore next */
|
|
11
|
-
function
|
|
12
|
+
function createRequestTimeout(res, timeout, done) {
|
|
12
13
|
const instance = setTimeout(() => {
|
|
13
|
-
res.statusCode =
|
|
14
|
-
res.statusMessage =
|
|
14
|
+
res.statusCode = http_1.GatewayTimeoutErrorOptions.statusCode;
|
|
15
|
+
res.statusMessage = http_1.GatewayTimeoutErrorOptions.message;
|
|
15
16
|
res.end();
|
|
16
17
|
}, timeout);
|
|
17
18
|
res.once('close', () => {
|
|
@@ -27,5 +28,5 @@ function createResponseTimeout(res, timeout, done) {
|
|
|
27
28
|
}
|
|
28
29
|
});
|
|
29
30
|
}
|
|
30
|
-
exports.
|
|
31
|
-
//# sourceMappingURL=
|
|
31
|
+
exports.createRequestTimeout = createRequestTimeout;
|
|
32
|
+
//# sourceMappingURL=request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/utils/request.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAAwD;AAGxD,0BAA0B;AAC1B,SAAgB,oBAAoB,CAAC,GAAa,EAAE,OAAe,EAAE,IAAW;IAC5E,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;QAC7B,GAAG,CAAC,UAAU,GAAG,iCAA0B,CAAC,UAAU,CAAC;QACvD,GAAG,CAAC,aAAa,GAAG,iCAA0B,CAAC,OAAO,CAAC;QAEvD,GAAG,CAAC,GAAG,EAAE,CAAC;IACd,CAAC,EAAE,OAAO,CAAC,CAAC;IAEZ,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEvB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC5B,IAAI,EAAE,CAAC;SACV;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;QACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEvB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC5B,IAAI,CAAC,CAAC,CAAC,CAAC;SACX;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAvBD,oDAuBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "routup",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"description": "Routup is a minimalistic http based routing framework.",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -42,15 +42,17 @@
|
|
|
42
42
|
"@types/etag": "^1.8.1",
|
|
43
43
|
"@types/mime": "^3.0.1",
|
|
44
44
|
"@types/minimatch": "^5.1.2",
|
|
45
|
-
"@types/negotiator": "^0.6.1"
|
|
45
|
+
"@types/negotiator": "^0.6.1",
|
|
46
|
+
"@types/proxy-addr": "^2.0.0"
|
|
46
47
|
},
|
|
47
48
|
"dependencies": {
|
|
48
|
-
"@ebec/http": "^0.0
|
|
49
|
+
"@ebec/http": "^0.1.0",
|
|
49
50
|
"etag": "^1.8.1",
|
|
50
51
|
"mime": "^3.0.0",
|
|
51
52
|
"negotiator": "^0.6.3",
|
|
52
53
|
"path-to-regexp": "^6.2.1",
|
|
54
|
+
"proxy-addr": "^2.0.7",
|
|
53
55
|
"smob": "^0.0.6"
|
|
54
56
|
},
|
|
55
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "2aa1a79ca54862a91661468f1484acb27a992c2f"
|
|
56
58
|
}
|
package/dist/utils/response.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGzC,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,QAuBhF"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,0BAA0B;AAC1B,SAAgB,qBAAqB,CAAC,GAAa,EAAE,OAAe,EAAE,IAAW;IAC7E,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;QAC7B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;QACrB,GAAG,CAAC,aAAa,GAAG,iBAAiB,CAAC;QAEtC,GAAG,CAAC,GAAG,EAAE,CAAC;IACd,CAAC,EAAE,OAAO,CAAC,CAAC;IAEZ,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEvB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC5B,IAAI,EAAE,CAAC;SACV;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;QACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEvB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC5B,IAAI,CAAC,CAAC,CAAC,CAAC;SACX;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAvBD,sDAuBC"}
|