@mojojs/core 0.25.0 → 0.28.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/README.md +2 -2
- package/lib/app.d.ts +11 -7
- package/lib/app.js +24 -17
- package/lib/app.js.map +1 -1
- package/lib/body.d.ts +9 -5
- package/lib/body.js +14 -15
- package/lib/body.js.map +1 -1
- package/lib/cli/get.js +3 -25
- package/lib/cli/get.js.map +1 -1
- package/lib/cli/server.js +32 -9
- package/lib/cli/server.js.map +1 -1
- package/lib/context.d.ts +5 -5
- package/lib/context.js +4 -5
- package/lib/context.js.map +1 -1
- package/lib/headers.d.ts +34 -0
- package/lib/headers.js +97 -0
- package/lib/headers.js.map +1 -0
- package/lib/plugins/default-conditions.d.ts +5 -0
- package/lib/plugins/{header-conditions.js → default-conditions.js} +3 -3
- package/lib/plugins/default-conditions.js.map +1 -0
- package/lib/plugins/default-helpers.js +122 -0
- package/lib/plugins/default-helpers.js.map +1 -1
- package/lib/renderer.js +1 -1
- package/lib/renderer.js.map +1 -1
- package/lib/server/request.d.ts +24 -15
- package/lib/server/request.js +20 -29
- package/lib/server/request.js.map +1 -1
- package/lib/server/response.d.ts +23 -9
- package/lib/server/response.js +35 -48
- package/lib/server/response.js.map +1 -1
- package/lib/server.d.ts +22 -8
- package/lib/server.js +66 -6
- package/lib/server.js.map +1 -1
- package/lib/static.js +7 -7
- package/lib/static.js.map +1 -1
- package/lib/types.d.ts +18 -5
- package/lib/user-agent/mock.d.ts +3 -3
- package/lib/user-agent/mock.js +4 -4
- package/lib/user-agent/mock.js.map +1 -1
- package/lib/user-agent/response.d.ts +22 -11
- package/lib/user-agent/response.js +9 -21
- package/lib/user-agent/response.js.map +1 -1
- package/lib/user-agent/test.d.ts +2 -2
- package/lib/user-agent/test.js +5 -5
- package/lib/user-agent/test.js.map +1 -1
- package/lib/user-agent/transport/http.js +21 -1
- package/lib/user-agent/transport/http.js.map +1 -1
- package/lib/user-agent/transport/ws.js +11 -2
- package/lib/user-agent/transport/ws.js.map +1 -1
- package/lib/user-agent.js +5 -5
- package/lib/user-agent.js.map +1 -1
- package/lib/util.d.ts +4 -0
- package/lib/util.js +10 -0
- package/lib/util.js.map +1 -1
- package/lib/websocket.d.ts +1 -1
- package/lib/websocket.js +6 -6
- package/lib/websocket.js.map +1 -1
- package/package.json +1 -1
- package/vendor/views/mojo/debug.html.mt +5 -4
- package/lib/mock/request.d.ts +0 -9
- package/lib/mock/request.js +0 -13
- package/lib/mock/request.js.map +0 -1
- package/lib/mock/response.d.ts +0 -7
- package/lib/mock/response.js +0 -7
- package/lib/mock/response.js.map +0 -1
- package/lib/plugins/exception-helpers.d.ts +0 -5
- package/lib/plugins/exception-helpers.js +0 -101
- package/lib/plugins/exception-helpers.js.map +0 -1
- package/lib/plugins/header-conditions.d.ts +0 -5
- package/lib/plugins/header-conditions.js.map +0 -1
- package/lib/plugins/view-helpers.d.ts +0 -5
- package/lib/plugins/view-helpers.js +0 -33
- package/lib/plugins/view-helpers.js.map +0 -1
package/lib/headers.js
ADDED
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HTTP header class.
|
|
3
|
+
*/
|
|
4
|
+
export class Headers {
|
|
5
|
+
constructor(init = []) {
|
|
6
|
+
this._normalCase = {};
|
|
7
|
+
this._init = init;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Append header value.
|
|
11
|
+
*/
|
|
12
|
+
append(name, value) {
|
|
13
|
+
const lowerCase = name.toLowerCase();
|
|
14
|
+
const headers = this._getHeaders();
|
|
15
|
+
if (headers[lowerCase] === undefined)
|
|
16
|
+
return this.set(name, value);
|
|
17
|
+
if (lowerCase === 'set-cookie') {
|
|
18
|
+
headers[lowerCase].push(value);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
headers[lowerCase] = [[...headers[lowerCase], value].join(', ')];
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Get header value.
|
|
26
|
+
*/
|
|
27
|
+
get(name) {
|
|
28
|
+
const values = this._getHeaders()[name.toLowerCase()];
|
|
29
|
+
if (values === undefined)
|
|
30
|
+
return null;
|
|
31
|
+
return values.join(', ');
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Get all headers values individually.
|
|
35
|
+
*/
|
|
36
|
+
getAll(name) {
|
|
37
|
+
const values = this._getHeaders()[name.toLowerCase()] ?? [];
|
|
38
|
+
return [...values];
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Set header value.
|
|
42
|
+
*/
|
|
43
|
+
set(name, value) {
|
|
44
|
+
const lowerCase = name.toLowerCase();
|
|
45
|
+
if (this._normalCase[lowerCase] === undefined)
|
|
46
|
+
this._normalCase[lowerCase] = name;
|
|
47
|
+
this._getHeaders()[lowerCase] = [value];
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Convert headers into a plain array of name/value pairs.
|
|
51
|
+
*/
|
|
52
|
+
toArray() {
|
|
53
|
+
const array = [];
|
|
54
|
+
const headers = this._getHeaders();
|
|
55
|
+
const normalCase = this._normalCase;
|
|
56
|
+
for (const [name, values] of Object.entries(headers)) {
|
|
57
|
+
const normal = normalCase[name];
|
|
58
|
+
for (const value of values) {
|
|
59
|
+
array.push(normal, value);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
return array;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Convert headers into a plain object.
|
|
66
|
+
*/
|
|
67
|
+
toObject() {
|
|
68
|
+
const object = {};
|
|
69
|
+
const headers = this._getHeaders();
|
|
70
|
+
const normalCase = this._normalCase;
|
|
71
|
+
for (const [name, values] of Object.entries(headers)) {
|
|
72
|
+
object[normalCase[name]] = values.join(', ');
|
|
73
|
+
}
|
|
74
|
+
return object;
|
|
75
|
+
}
|
|
76
|
+
_getHeaders() {
|
|
77
|
+
if (this._headers === undefined) {
|
|
78
|
+
const headers = (this._headers = {});
|
|
79
|
+
const normalCase = this._normalCase;
|
|
80
|
+
const init = this._init;
|
|
81
|
+
for (let i = 0; i < init.length; i += 2) {
|
|
82
|
+
const name = init[i];
|
|
83
|
+
const value = init[i + 1];
|
|
84
|
+
const lowerCase = name.toLowerCase();
|
|
85
|
+
normalCase[lowerCase] = name;
|
|
86
|
+
if (headers[lowerCase] === undefined) {
|
|
87
|
+
headers[lowerCase] = [value];
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
headers[lowerCase].push(value);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return this._headers;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=headers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../src/headers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Default condition plugin.
|
|
3
3
|
*/
|
|
4
|
-
export default function
|
|
4
|
+
export default function defaultConditionsPlugin(app) {
|
|
5
5
|
const router = app.router;
|
|
6
6
|
router.addCondition('headers', headerCondition);
|
|
7
7
|
router.addCondition('host', hostCondition);
|
|
@@ -19,4 +19,4 @@ function headerCondition(ctx, requirement) {
|
|
|
19
19
|
function hostCondition(ctx, requirement) {
|
|
20
20
|
return headerCondition(ctx, { Host: requirement });
|
|
21
21
|
}
|
|
22
|
-
//# sourceMappingURL=
|
|
22
|
+
//# sourceMappingURL=default-conditions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"default-conditions.js","sourceRoot":"","sources":["../../src/plugins/default-conditions.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,GAAQ;IACtD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAChD,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,eAAe,CAAC,GAAgB,EAAE,WAAmC;IAC5E,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACvD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC5C,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;KAC/C;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,aAAa,CAAC,GAAgB,EAAE,WAAmB;IAC1D,OAAO,eAAe,CAAC,GAAG,EAAE,EAAC,IAAI,EAAE,WAAW,EAAC,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -1,9 +1,29 @@
|
|
|
1
1
|
import { inspect } from 'util';
|
|
2
|
+
import { Logger } from '../logger.js';
|
|
3
|
+
import { SafeString } from '../util.js';
|
|
4
|
+
import { exceptionContext } from '../util.js';
|
|
5
|
+
import DOM from '@mojojs/dom';
|
|
2
6
|
/**
|
|
3
7
|
* Default helper plugin.
|
|
4
8
|
*/
|
|
5
9
|
export default function defaultHelpersPlugin(app) {
|
|
10
|
+
app.addHelper('exception', exception);
|
|
11
|
+
app.addHelper('htmlException', htmlException);
|
|
12
|
+
app.addHelper('htmlNotFound', htmlNotFound);
|
|
13
|
+
app.addHelper('httpException', httpException);
|
|
14
|
+
app.addHelper('jsonException', jsonException);
|
|
15
|
+
app.addHelper('jsonNotFound', jsonNotFound);
|
|
16
|
+
app.addHelper('txtException', txtException);
|
|
17
|
+
app.addHelper('txtNotFound', txtNotFound);
|
|
18
|
+
app.addHelper('notFound', notFound);
|
|
19
|
+
app.addHelper('websocketException', websocketException);
|
|
6
20
|
app.addHelper('currentRoute', currentRoute);
|
|
21
|
+
app.addHelper('include', include);
|
|
22
|
+
app.addHelper('linkTo', linkTo);
|
|
23
|
+
app.addHelper('mojoFaviconTag', mojoFaviconTag);
|
|
24
|
+
app.addHelper('scriptTag', scriptTag);
|
|
25
|
+
app.addHelper('styleTag', styleTag);
|
|
26
|
+
app.addHelper('tag', tag);
|
|
7
27
|
app.decorateContext('inspect', (object, options) => inspect(object, options));
|
|
8
28
|
}
|
|
9
29
|
function currentRoute(ctx) {
|
|
@@ -15,4 +35,106 @@ function currentRoute(ctx) {
|
|
|
15
35
|
return null;
|
|
16
36
|
return endpoint.customName ?? endpoint.defaultName ?? null;
|
|
17
37
|
}
|
|
38
|
+
async function exception(ctx, error) {
|
|
39
|
+
if (ctx.isWebSocket)
|
|
40
|
+
return ctx.websocketException(error);
|
|
41
|
+
return ctx.httpException(error);
|
|
42
|
+
}
|
|
43
|
+
async function htmlException(ctx, error) {
|
|
44
|
+
ctx.stash.exception = error;
|
|
45
|
+
const mode = ctx.app.mode;
|
|
46
|
+
if (await ctx.render({ view: `exception.${mode}`, maybe: true, status: 500 }))
|
|
47
|
+
return true;
|
|
48
|
+
if (await ctx.render({ view: 'exception', maybe: true, status: 500 }))
|
|
49
|
+
return true;
|
|
50
|
+
const view = mode === 'development' ? 'mojo/debug' : 'mojo/exception';
|
|
51
|
+
return await ctx.render({ view, status: 500, stringFormatter: Logger.stringFormatter, exceptionContext });
|
|
52
|
+
}
|
|
53
|
+
async function htmlNotFound(ctx) {
|
|
54
|
+
ctx.stash.exception = null;
|
|
55
|
+
const mode = ctx.app.mode;
|
|
56
|
+
if (await ctx.render({ view: `not-found.${mode}`, maybe: true, status: 404 }))
|
|
57
|
+
return true;
|
|
58
|
+
if (await ctx.render({ view: 'not-found', maybe: true, status: 404 }))
|
|
59
|
+
return true;
|
|
60
|
+
const view = mode === 'development' ? 'mojo/debug' : 'mojo/not-found';
|
|
61
|
+
return await ctx.render({ view, status: 404, stringFormatter: Logger.stringFormatter });
|
|
62
|
+
}
|
|
63
|
+
async function httpException(ctx, error) {
|
|
64
|
+
error = ensureError(error);
|
|
65
|
+
ctx.log.error(error.stack);
|
|
66
|
+
const exceptionFormat = ctx.exceptionFormat;
|
|
67
|
+
if (exceptionFormat === 'txt')
|
|
68
|
+
return ctx.txtException(error);
|
|
69
|
+
if (exceptionFormat === 'json')
|
|
70
|
+
return ctx.jsonException(error);
|
|
71
|
+
return ctx.htmlException(error);
|
|
72
|
+
}
|
|
73
|
+
async function include(ctx, options, stash) {
|
|
74
|
+
return await ctx.renderToString(options, stash);
|
|
75
|
+
}
|
|
76
|
+
async function jsonException(ctx, error) {
|
|
77
|
+
if (ctx.app.mode === 'development') {
|
|
78
|
+
return await ctx.render({
|
|
79
|
+
json: {
|
|
80
|
+
error: {
|
|
81
|
+
message: error.message,
|
|
82
|
+
name: error.name,
|
|
83
|
+
stack: error.stack ?? ''
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
pretty: true,
|
|
87
|
+
status: 500
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
return await ctx.render({ json: { error: { message: 'Internal Server Error' } }, pretty: true, status: 500 });
|
|
91
|
+
}
|
|
92
|
+
async function jsonNotFound(ctx) {
|
|
93
|
+
return await ctx.render({ json: { error: { message: 'Not Found' } }, pretty: true, status: 404 });
|
|
94
|
+
}
|
|
95
|
+
function linkTo(ctx, target, attrs, content) {
|
|
96
|
+
const href = ctx.urlFor(target);
|
|
97
|
+
return ctx.tag('a', { href, ...attrs }, content);
|
|
98
|
+
}
|
|
99
|
+
function mojoFaviconTag(ctx) {
|
|
100
|
+
return ctx.tag('link', { rel: 'icon', href: ctx.urlForFile('/mojo/favicon.ico') });
|
|
101
|
+
}
|
|
102
|
+
async function notFound(ctx) {
|
|
103
|
+
const exceptionFormat = ctx.exceptionFormat;
|
|
104
|
+
if (exceptionFormat === 'txt')
|
|
105
|
+
return ctx.txtNotFound();
|
|
106
|
+
if (exceptionFormat === 'json')
|
|
107
|
+
return ctx.jsonNotFound();
|
|
108
|
+
return ctx.htmlNotFound();
|
|
109
|
+
}
|
|
110
|
+
function scriptTag(ctx, target) {
|
|
111
|
+
return ctx.tag('script', { src: ctx.urlForFile(target) });
|
|
112
|
+
}
|
|
113
|
+
function styleTag(ctx, target) {
|
|
114
|
+
return ctx.tag('link', { rel: 'stylesheet', href: ctx.urlForFile(target) });
|
|
115
|
+
}
|
|
116
|
+
function tag(ctx, name, attrs = {}, content = '') {
|
|
117
|
+
return new SafeString(DOM.newTag(name, attrs, content).toString());
|
|
118
|
+
}
|
|
119
|
+
async function txtException(ctx, error) {
|
|
120
|
+
if (ctx.app.mode === 'development') {
|
|
121
|
+
return await ctx.render({ text: error.stack, status: 500 });
|
|
122
|
+
}
|
|
123
|
+
return await ctx.render({ text: 'Internal Server Error', status: 500 });
|
|
124
|
+
}
|
|
125
|
+
async function txtNotFound(ctx) {
|
|
126
|
+
return await ctx.render({ text: 'Not Found', status: 404 });
|
|
127
|
+
}
|
|
128
|
+
async function websocketException(ctx, error) {
|
|
129
|
+
error = ensureError(error);
|
|
130
|
+
ctx.log.error(error.stack);
|
|
131
|
+
const ws = ctx.ws;
|
|
132
|
+
if (ws !== null && ctx.isEstablished)
|
|
133
|
+
ws.close(1011);
|
|
134
|
+
return true;
|
|
135
|
+
}
|
|
136
|
+
// If you see this then your code has thrown something that was not an Error object
|
|
137
|
+
function ensureError(error) {
|
|
138
|
+
return error instanceof Error ? error : new Error(error);
|
|
139
|
+
}
|
|
18
140
|
//# sourceMappingURL=default-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-helpers.js","sourceRoot":"","sources":["../../src/plugins/default-helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"default-helpers.js","sourceRoot":"","sources":["../../src/plugins/default-helpers.ts"],"names":[],"mappings":"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"}
|
package/lib/renderer.js
CHANGED
|
@@ -137,7 +137,7 @@ export class Renderer {
|
|
|
137
137
|
if (this.autoCompress === true && Buffer.byteLength(output) >= this.minCompressSize) {
|
|
138
138
|
res.append('Vary', 'Accept-Encoding');
|
|
139
139
|
const accept = ctx.req.get('accept-encoding');
|
|
140
|
-
if (accept !==
|
|
140
|
+
if (accept !== null && /gzip/i.test(accept)) {
|
|
141
141
|
res.set('Content-Encoding', 'gzip');
|
|
142
142
|
output = await gzipPromise(output);
|
|
143
143
|
}
|
package/lib/renderer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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"}
|
package/lib/server/request.d.ts
CHANGED
|
@@ -1,28 +1,45 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import type { ServerRequestOptions } from '../types.js';
|
|
3
|
-
import type { IncomingMessage } from 'http';
|
|
4
2
|
import { Body } from '../body.js';
|
|
5
3
|
import { Params } from '../body/params.js';
|
|
6
4
|
/**
|
|
7
5
|
* Server request class.
|
|
8
6
|
*/
|
|
9
7
|
export declare class ServerRequest extends Body {
|
|
8
|
+
/**
|
|
9
|
+
* Check if underlying socket was encrypted with TLS.
|
|
10
|
+
*/
|
|
11
|
+
isSecure: boolean;
|
|
10
12
|
/**
|
|
11
13
|
* Request is a WebSocket handshake.
|
|
12
14
|
*/
|
|
13
15
|
isWebSocket: boolean;
|
|
16
|
+
/**
|
|
17
|
+
* Request method.
|
|
18
|
+
*/
|
|
19
|
+
method: string | null;
|
|
20
|
+
/**
|
|
21
|
+
* Peer address.
|
|
22
|
+
*/
|
|
23
|
+
remoteAddress: string | null;
|
|
14
24
|
/**
|
|
15
25
|
* Request ID.
|
|
16
26
|
*/
|
|
17
27
|
requestId: string;
|
|
28
|
+
/**
|
|
29
|
+
* Reverse proxy support is activated.
|
|
30
|
+
*/
|
|
31
|
+
reverseProxy: boolean;
|
|
32
|
+
/**
|
|
33
|
+
* Request URL.
|
|
34
|
+
*/
|
|
35
|
+
url: string | null;
|
|
18
36
|
_cookies: Record<string, string> | undefined;
|
|
19
|
-
_ip: string | undefined;
|
|
37
|
+
_ip: string | null | undefined;
|
|
20
38
|
_path: string | null | undefined;
|
|
21
39
|
_protocol: string | undefined;
|
|
22
40
|
_query: Params | undefined;
|
|
23
|
-
_reverseProxy: boolean;
|
|
24
41
|
_userinfo: string | null | undefined;
|
|
25
|
-
constructor(
|
|
42
|
+
constructor(options: ServerRequestOptions);
|
|
26
43
|
/**
|
|
27
44
|
* Server base URL.
|
|
28
45
|
*/
|
|
@@ -32,23 +49,15 @@ export declare class ServerRequest extends Body {
|
|
|
32
49
|
*/
|
|
33
50
|
getCookie(name: string): string | null;
|
|
34
51
|
/**
|
|
35
|
-
* Remote IP address.
|
|
52
|
+
* Remote IP address. Uses he `X-Forwarded-For` header value if reverse proxy support is activated.
|
|
36
53
|
*/
|
|
37
54
|
get ip(): string | null;
|
|
38
|
-
/**
|
|
39
|
-
* Check if underlying socket was encrypted with TLS.
|
|
40
|
-
*/
|
|
41
|
-
get isSecure(): boolean;
|
|
42
|
-
/**
|
|
43
|
-
* Request method.
|
|
44
|
-
*/
|
|
45
|
-
get method(): string | null;
|
|
46
55
|
/**
|
|
47
56
|
* Request path.
|
|
48
57
|
*/
|
|
49
58
|
get path(): string | null;
|
|
50
59
|
/**
|
|
51
|
-
* Request protocol.
|
|
60
|
+
* Request protocol. Uses the `X-Forwarded-Proto` header value if reverse proxy support is activated.
|
|
52
61
|
*/
|
|
53
62
|
get protocol(): string;
|
|
54
63
|
/**
|
package/lib/server/request.js
CHANGED
|
@@ -9,24 +9,28 @@ let requestId = 0;
|
|
|
9
9
|
* Server request class.
|
|
10
10
|
*/
|
|
11
11
|
export class ServerRequest extends Body {
|
|
12
|
-
constructor(
|
|
13
|
-
super(
|
|
12
|
+
constructor(options) {
|
|
13
|
+
super(options.headers, options.body);
|
|
14
14
|
this._cookies = undefined;
|
|
15
15
|
this._ip = undefined;
|
|
16
16
|
this._path = undefined;
|
|
17
17
|
this._protocol = undefined;
|
|
18
18
|
this._query = undefined;
|
|
19
19
|
this._userinfo = undefined;
|
|
20
|
+
this.method = options.method ?? null;
|
|
21
|
+
this.url = options.url ?? null;
|
|
20
22
|
this.isWebSocket = options.isWebSocket;
|
|
23
|
+
this.isSecure = options.isSecure;
|
|
21
24
|
requestId = (requestId + 1) & 2147483647;
|
|
22
25
|
this.requestId = `${process.pid}-${requestId.toString(36).padStart(6, '0')}`;
|
|
23
|
-
this.
|
|
26
|
+
this.remoteAddress = options.remoteAddress ?? null;
|
|
27
|
+
this.reverseProxy = options.reverseProxy;
|
|
24
28
|
}
|
|
25
29
|
/**
|
|
26
30
|
* Server base URL.
|
|
27
31
|
*/
|
|
28
32
|
get baseURL() {
|
|
29
|
-
return `${this.protocol}://${this.
|
|
33
|
+
return `${this.protocol}://${this.get('Host') ?? ''}`;
|
|
30
34
|
}
|
|
31
35
|
/**
|
|
32
36
|
* Get cookie value.
|
|
@@ -34,59 +38,46 @@ export class ServerRequest extends Body {
|
|
|
34
38
|
getCookie(name) {
|
|
35
39
|
if (this._cookies === undefined) {
|
|
36
40
|
const header = this.get('Cookie');
|
|
37
|
-
this._cookies = header ===
|
|
41
|
+
this._cookies = header === null ? {} : parseCookie(header);
|
|
38
42
|
}
|
|
39
43
|
return this._cookies[name] ?? null;
|
|
40
44
|
}
|
|
41
45
|
/**
|
|
42
|
-
* Remote IP address.
|
|
46
|
+
* Remote IP address. Uses he `X-Forwarded-For` header value if reverse proxy support is activated.
|
|
43
47
|
*/
|
|
44
48
|
get ip() {
|
|
45
49
|
if (this._ip === undefined) {
|
|
46
|
-
this._ip = this.
|
|
47
|
-
if (this.
|
|
50
|
+
this._ip = this.remoteAddress;
|
|
51
|
+
if (this.reverseProxy === true) {
|
|
48
52
|
const forwarded = this.get('X-Forwarded-For');
|
|
49
|
-
if (forwarded !==
|
|
53
|
+
if (forwarded !== null) {
|
|
50
54
|
const match = forwarded.match(/([^,\s]+)$/);
|
|
51
55
|
if (match !== null)
|
|
52
56
|
this._ip = match[1];
|
|
53
57
|
}
|
|
54
58
|
}
|
|
55
59
|
}
|
|
56
|
-
return this._ip
|
|
57
|
-
}
|
|
58
|
-
/**
|
|
59
|
-
* Check if underlying socket was encrypted with TLS.
|
|
60
|
-
*/
|
|
61
|
-
get isSecure() {
|
|
62
|
-
const socket = this._raw.socket;
|
|
63
|
-
return socket.encrypted ?? false;
|
|
64
|
-
}
|
|
65
|
-
/**
|
|
66
|
-
* Request method.
|
|
67
|
-
*/
|
|
68
|
-
get method() {
|
|
69
|
-
return this._raw.method ?? null;
|
|
60
|
+
return this._ip;
|
|
70
61
|
}
|
|
71
62
|
/**
|
|
72
63
|
* Request path.
|
|
73
64
|
*/
|
|
74
65
|
get path() {
|
|
75
66
|
if (this._path === undefined) {
|
|
76
|
-
const match = this.
|
|
67
|
+
const match = (this.url ?? '').match(URL_RE);
|
|
77
68
|
this._path = match === null ? null : decodeURIComponentSafe(match[5]);
|
|
78
69
|
}
|
|
79
70
|
return this._path;
|
|
80
71
|
}
|
|
81
72
|
/**
|
|
82
|
-
* Request protocol.
|
|
73
|
+
* Request protocol. Uses the `X-Forwarded-Proto` header value if reverse proxy support is activated.
|
|
83
74
|
*/
|
|
84
75
|
get protocol() {
|
|
85
76
|
if (this._protocol === undefined) {
|
|
86
77
|
this._protocol = this.isSecure ? 'https' : 'http';
|
|
87
|
-
if (this.
|
|
78
|
+
if (this.reverseProxy === true) {
|
|
88
79
|
const forwarded = this.get('X-Forwarded-Proto');
|
|
89
|
-
if (forwarded !==
|
|
80
|
+
if (forwarded !== null)
|
|
90
81
|
this._protocol = forwarded;
|
|
91
82
|
}
|
|
92
83
|
}
|
|
@@ -97,7 +88,7 @@ export class ServerRequest extends Body {
|
|
|
97
88
|
*/
|
|
98
89
|
get query() {
|
|
99
90
|
if (this._query === undefined) {
|
|
100
|
-
const url = this.
|
|
91
|
+
const url = this.url ?? '';
|
|
101
92
|
if (url.includes('?') === true) {
|
|
102
93
|
const match = url.match(URL_RE);
|
|
103
94
|
this._query = match !== null ? new Params(match[7]) : new Params();
|
|
@@ -115,7 +106,7 @@ export class ServerRequest extends Body {
|
|
|
115
106
|
if (this._userinfo === undefined) {
|
|
116
107
|
this._userinfo = null;
|
|
117
108
|
const auth = this.get('Authorization');
|
|
118
|
-
if (auth !==
|
|
109
|
+
if (auth !== null) {
|
|
119
110
|
const match = auth.match(/Basic (.+)$/);
|
|
120
111
|
if (match !== null)
|
|
121
112
|
this._userinfo = Buffer.from(match[1], 'base64').toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/server/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/server/request.ts"],"names":[],"mappings":"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"}
|
package/lib/server/response.d.ts
CHANGED
|
@@ -1,28 +1,41 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { Context } from '../context.js';
|
|
3
3
|
import type { CookieOptions } from '../types.js';
|
|
4
|
-
import type
|
|
5
|
-
import
|
|
4
|
+
import type { Stream } from 'stream';
|
|
5
|
+
import EventEmitter from 'events';
|
|
6
|
+
import { Headers } from '../headers.js';
|
|
7
|
+
declare type SendResponse = (res: ServerResponse, body?: string | Buffer | Stream) => void;
|
|
6
8
|
/**
|
|
7
9
|
* Server response class.
|
|
8
10
|
*/
|
|
9
|
-
export declare class ServerResponse {
|
|
11
|
+
export declare class ServerResponse extends EventEmitter {
|
|
12
|
+
/**
|
|
13
|
+
* Response headers.
|
|
14
|
+
*/
|
|
15
|
+
headers: Headers;
|
|
10
16
|
/**
|
|
11
17
|
* Response has already been sent.
|
|
12
18
|
*/
|
|
13
19
|
isSent: boolean;
|
|
14
20
|
/**
|
|
15
|
-
* Response status.
|
|
21
|
+
* Response status code.
|
|
16
22
|
*/
|
|
17
23
|
statusCode: number;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
24
|
+
/**
|
|
25
|
+
* Response status message.
|
|
26
|
+
*/
|
|
27
|
+
statusMessage: string | null;
|
|
28
|
+
_ctx: WeakRef<Context> | undefined;
|
|
29
|
+
_sendResponse: SendResponse;
|
|
30
|
+
constructor(sendResponse: SendResponse);
|
|
22
31
|
/**
|
|
23
32
|
* Append header value.
|
|
24
33
|
*/
|
|
25
34
|
append(name: string, value: string): this;
|
|
35
|
+
/**
|
|
36
|
+
* Bind context to response.
|
|
37
|
+
*/
|
|
38
|
+
bindContext(ctx: Context): void;
|
|
26
39
|
/**
|
|
27
40
|
* Set response content length.
|
|
28
41
|
*/
|
|
@@ -42,9 +55,10 @@ export declare class ServerResponse {
|
|
|
42
55
|
/**
|
|
43
56
|
* Set response status.
|
|
44
57
|
*/
|
|
45
|
-
status(code: number): this;
|
|
58
|
+
status(code: number, message?: string): this;
|
|
46
59
|
/**
|
|
47
60
|
* Set response content type.
|
|
48
61
|
*/
|
|
49
62
|
type(type: string): this;
|
|
50
63
|
}
|
|
64
|
+
export {};
|