@miqro/core 1.5.18 → 1.5.21
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/common/api-router-utils.js +3 -3
- package/dist/common/api-router-utils.js.map +1 -1
- package/dist/common/context.d.ts +1 -0
- package/dist/common/context.js +7 -1
- package/dist/common/context.js.map +1 -1
- package/dist/proxy.js +18 -6
- package/dist/proxy.js.map +1 -1
- package/package.json +4 -4
- package/src/common/api-router-utils.ts +3 -3
- package/src/common/context.ts +7 -0
- package/src/common/context.unit.test.js +3 -1
- package/src/proxy.func.test.js +65 -0
- package/src/proxy.ts +24 -7
- package/src/proxy.unit.test.js +3 -1
|
@@ -10,18 +10,18 @@ const parser_1 = require("@miqro/parser");
|
|
|
10
10
|
exports.APIRouteValidator = {
|
|
11
11
|
name: "string?",
|
|
12
12
|
description: "string?",
|
|
13
|
-
path: "string[]!?",
|
|
14
13
|
method: "string[]!?",
|
|
14
|
+
path: "string[]!?",
|
|
15
15
|
parser: "ParserInterface?",
|
|
16
16
|
headers: "ParseOptions[]!?",
|
|
17
17
|
query: "boolean?|ParseOptions[]!?|string?",
|
|
18
18
|
params: "boolean?|ParseOptions[]!?|string?",
|
|
19
19
|
body: "boolean?|ParseOptions[]!?|string?",
|
|
20
20
|
response: "ParseOptions[]!?|string?",
|
|
21
|
+
handler: "function[]!",
|
|
21
22
|
middleware: "function[]!?",
|
|
22
23
|
session: "function?|SessionHandlerOptions?",
|
|
23
|
-
|
|
24
|
-
handler: "function[]!"
|
|
24
|
+
policy: "GroupPolicy?"
|
|
25
25
|
};
|
|
26
26
|
function traverseAPIRouteDir(featureName, dirname, basePath = "/", features = {}, logger) {
|
|
27
27
|
if (logger) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/common/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA0C;AAC1C,+BAAuD;AAGvD,qDAA+C;AAC/C,qCAA0C;AAC1C,sCAAiC;AAGjC,0CAAoD;AAEvC,QAAA,iBAAiB,GAAmB;IAC/C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,
|
|
1
|
+
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/common/api-router-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/common/context.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerRespon
|
|
|
5
5
|
import { URL } from "url";
|
|
6
6
|
import { CookieSerializeOptions } from "cookie";
|
|
7
7
|
export declare type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
|
|
8
|
+
export declare const IGNORE_HEADER: string[];
|
|
8
9
|
export declare type Handler<T = boolean | void | any> = ((ctx: Context) => Promise<T>) | ((ctx: Context) => T);
|
|
9
10
|
export declare type ErrorHandler<T = boolean | void | any> = ((e: unknown, ctx: Context) => Promise<T>) | ((e: unknown, ctx: Context) => T);
|
|
10
11
|
export declare class Context {
|
package/dist/common/context.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Context = void 0;
|
|
3
|
+
exports.Context = exports.IGNORE_HEADER = void 0;
|
|
4
4
|
const tokenize_match_1 = require("./tokenize-match");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
6
|
const cookie_1 = require("cookie");
|
|
7
|
+
exports.IGNORE_HEADER = ["keep-alive", "connection"];
|
|
7
8
|
class Context {
|
|
8
9
|
constructor(uuid, req, res, logger) {
|
|
9
10
|
this.uuid = uuid;
|
|
@@ -59,10 +60,15 @@ class Context {
|
|
|
59
60
|
this.res.statusCode = status;
|
|
60
61
|
const keys = Object.keys(headers);
|
|
61
62
|
for (const key of keys) {
|
|
63
|
+
if (exports.IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
64
|
+
this.logger.warn("ignoring " + key);
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
62
67
|
if (headers[key] !== undefined) {
|
|
63
68
|
this.res.setHeader(key, headers[key]);
|
|
64
69
|
}
|
|
65
70
|
}
|
|
71
|
+
this.res.setHeader("connection", "close");
|
|
66
72
|
this.res.end(body !== undefined ? (body instanceof Buffer ? body : String(body)) : undefined, () => {
|
|
67
73
|
resolve();
|
|
68
74
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":";;;AAGA,qDAAkE;AAElE,uCAAiC;AACjC,mCAAyD;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":"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"}
|
package/dist/proxy.js
CHANGED
|
@@ -21,19 +21,31 @@ class ProxyRouter extends router_1.Router {
|
|
|
21
21
|
const nUrl = new url_1.URL(this.proxyURL.toString());
|
|
22
22
|
nUrl.pathname = nUrl.pathname + relative;
|
|
23
23
|
const url = nUrl.toString();
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
const headers = {
|
|
25
|
+
...ctx.headers
|
|
26
|
+
};
|
|
27
|
+
delete headers["connection"];
|
|
28
|
+
delete headers["keep-alive"];
|
|
29
|
+
const requestArgs = {
|
|
26
30
|
url: url.toString(),
|
|
27
31
|
disableThrow: true,
|
|
28
32
|
rejectUnauthorized: this.rejectUnauthorized,
|
|
29
33
|
disableUserAgent: true,
|
|
30
34
|
method: ctx.method,
|
|
31
|
-
headers
|
|
35
|
+
headers,
|
|
32
36
|
data: ctx.method !== "GET" ? ctx.buffer : undefined
|
|
33
|
-
}
|
|
37
|
+
};
|
|
38
|
+
ctx.logger.info("proxy to %s", url.toString());
|
|
39
|
+
ctx.logger.debug("proxy with %o", requestArgs);
|
|
40
|
+
const response = await (0, request_1.request)(requestArgs);
|
|
41
|
+
const responseHeaders = {
|
|
42
|
+
...response.headers
|
|
43
|
+
};
|
|
44
|
+
delete responseHeaders["connection"];
|
|
45
|
+
delete responseHeaders["keep-alive"];
|
|
34
46
|
await ctx.end({
|
|
35
|
-
headers:
|
|
36
|
-
body: response.
|
|
47
|
+
headers: responseHeaders,
|
|
48
|
+
body: response.buffer,
|
|
37
49
|
status: response.status
|
|
38
50
|
});
|
|
39
51
|
}
|
package/dist/proxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":";;;AACA,4CAAuD;AACvD,qCAA+C;AAC/C,4DAAqE;AACrE,6BAAwB;AAOxB,MAAM,WAAY,SAAQ,eAAM;IAI9B,YAAY,OAA2B;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,QAAQ,GAAG,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,QAAQ,GAAG,IAAA,8BAAa,EAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,UAA+C,EAAE,gBAAiC,EAAE;QAE1G,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC;QACnC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAEvE,IAAI,cAAc,EAAE;YAClB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE9F,MAAM,IAAI,GAAG,IAAI,SAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE5B,MAAM,OAAO,GAAG;gBACd,GAAG,GAAG,CAAC,OAAO;aACf,CAAC;YAEF,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;YAC7B,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;YAE7B,MAAM,WAAW,GAAmB;gBAClC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,YAAY,EAAE,IAAI;gBAClB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,gBAAgB,EAAE,IAAI;gBACtB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO;gBACP,IAAI,EAAE,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aACpD,CAAC;YAEF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;YAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC,WAAW,CAAC,CAAC;YAE5C,MAAM,eAAe,GAAG;gBACtB,GAAG,QAAQ,CAAC,OAAO;aACpB,CAAC;YACF,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC;YACrC,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC;YAErC,MAAM,GAAG,CAAC,GAAG,CAAC;gBACZ,OAAO,EAAE,eAAe;gBACxB,IAAI,EAAE,QAAQ,CAAC,MAAM;gBACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;aACxB,CAAC,CAAC;SACJ;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IAC9B,CAAC;CACF;AAEM,MAAM,KAAK,GAAG,CAAC,OAA2B,EAAE,EAAE;IACnD,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC,CAAA;AAFY,QAAA,KAAK,SAEjB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miqro/core",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.21",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"license": "ISC",
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@miqro/test": "0.2.1",
|
|
20
|
-
"@miqro/test-http": "0.0.
|
|
20
|
+
"@miqro/test-http": "0.0.5",
|
|
21
21
|
"@types/node": "17.0.23",
|
|
22
22
|
"typescript": "4.6.4",
|
|
23
23
|
"@types/cookie": "0.4.1",
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"npm": ">=6.0.0"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@miqro/request": "^0.0.
|
|
32
|
-
"@miqro/parser": "^0.1.
|
|
31
|
+
"@miqro/request": "^0.0.10",
|
|
32
|
+
"@miqro/parser": "^0.1.4",
|
|
33
33
|
"cookie": "0.5.0",
|
|
34
34
|
"uuid": "8.3.2"
|
|
35
35
|
}
|
|
@@ -12,18 +12,18 @@ import {parse, ParseOptionMap} from "@miqro/parser";
|
|
|
12
12
|
export const APIRouteValidator: ParseOptionMap = {
|
|
13
13
|
name: "string?",
|
|
14
14
|
description: "string?",
|
|
15
|
-
path: "string[]!?",
|
|
16
15
|
method: "string[]!?",
|
|
16
|
+
path: "string[]!?",
|
|
17
17
|
parser: "ParserInterface?",
|
|
18
18
|
headers: "ParseOptions[]!?",
|
|
19
19
|
query: "boolean?|ParseOptions[]!?|string?",
|
|
20
20
|
params: "boolean?|ParseOptions[]!?|string?",
|
|
21
21
|
body: "boolean?|ParseOptions[]!?|string?",
|
|
22
22
|
response: "ParseOptions[]!?|string?",
|
|
23
|
+
handler: "function[]!",
|
|
23
24
|
middleware: "function[]!?",
|
|
24
25
|
session: "function?|SessionHandlerOptions?",
|
|
25
|
-
|
|
26
|
-
handler: "function[]!"
|
|
26
|
+
policy: "GroupPolicy?"
|
|
27
27
|
};
|
|
28
28
|
|
|
29
29
|
export function traverseAPIRouteDir(
|
package/src/common/context.ts
CHANGED
|
@@ -20,6 +20,8 @@ export type Method =
|
|
|
20
20
|
| "PATCH"
|
|
21
21
|
| "OPTIONS";
|
|
22
22
|
|
|
23
|
+
export const IGNORE_HEADER = ["keep-alive", "connection"];
|
|
24
|
+
|
|
23
25
|
export type Handler<T = boolean | void | any> = ((ctx: Context) => Promise<T>) | ((ctx: Context) => T);
|
|
24
26
|
|
|
25
27
|
export type ErrorHandler<T = boolean | void | any> =
|
|
@@ -99,10 +101,15 @@ export class Context {
|
|
|
99
101
|
this.res.statusCode = status;
|
|
100
102
|
const keys = Object.keys(headers);
|
|
101
103
|
for (const key of keys) {
|
|
104
|
+
if (IGNORE_HEADER.indexOf(key.toLocaleLowerCase()) !== -1) {
|
|
105
|
+
this.logger.warn("ignoring " + key);
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
102
108
|
if (headers[key] !== undefined) {
|
|
103
109
|
this.res.setHeader(key, headers[key] as any);
|
|
104
110
|
}
|
|
105
111
|
}
|
|
112
|
+
this.res.setHeader("connection", "close");
|
|
106
113
|
this.res.end(body !== undefined ? (body instanceof Buffer ? body : String(body)) : undefined, () => {
|
|
107
114
|
resolve();
|
|
108
115
|
});
|
|
@@ -236,11 +236,13 @@ describe("context unit tests", () => {
|
|
|
236
236
|
});
|
|
237
237
|
strictEqual(res.end.callCount, 1);
|
|
238
238
|
strictEqual(res.end.callArgs[0][0], body);
|
|
239
|
-
strictEqual(res.setHeader.callCount,
|
|
239
|
+
strictEqual(res.setHeader.callCount, 3);
|
|
240
240
|
strictEqual(res.setHeader.callArgs[0][0], "key1");
|
|
241
241
|
strictEqual(res.setHeader.callArgs[0][1], "value1");
|
|
242
242
|
strictEqual(res.setHeader.callArgs[1][0], "key2");
|
|
243
243
|
strictEqual(res.setHeader.callArgs[1][1], "value2");
|
|
244
|
+
strictEqual(res.setHeader.callArgs[2][0], "connection");
|
|
245
|
+
strictEqual(res.setHeader.callArgs[2][1], "close");
|
|
244
246
|
});
|
|
245
247
|
|
|
246
248
|
[{status: "status"}, {status: undefined}].forEach(({status}) => {
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
const {fake, requireMock} = require("@miqro/test");
|
|
2
|
+
const {resolve} = require("path");
|
|
3
|
+
const {strictEqual} = require("assert");
|
|
4
|
+
const {distPath, basePath} = require("./setup-test.js");
|
|
5
|
+
const {TestHelper} = require("@miqro/test-http");
|
|
6
|
+
const {request} = require("@miqro/request");
|
|
7
|
+
|
|
8
|
+
const testFilePath = resolve(distPath, "proxy.js");
|
|
9
|
+
|
|
10
|
+
describe("proxy functional tests2", () => {
|
|
11
|
+
describe("simple post", () => {
|
|
12
|
+
setTestTimeout(10000);
|
|
13
|
+
const lib = requireMock(distPath, {});
|
|
14
|
+
let server;
|
|
15
|
+
const port = 9595;
|
|
16
|
+
before(async () => {
|
|
17
|
+
const serverApp = new lib.App();
|
|
18
|
+
serverApp.use(lib.JSONParser());
|
|
19
|
+
serverApp.use(async (ctx) => {
|
|
20
|
+
ctx.logger.info("serverApp hit with %o", ctx.body);
|
|
21
|
+
});
|
|
22
|
+
serverApp.post("/api/login", async (ctx) => {
|
|
23
|
+
ctx.logger.info("login hit with %o", ctx.body);
|
|
24
|
+
await ctx.json(ctx.body);
|
|
25
|
+
});
|
|
26
|
+
server = await serverApp.listen(9595);
|
|
27
|
+
|
|
28
|
+
await (async function testServerApp() {
|
|
29
|
+
const response = await request({
|
|
30
|
+
url: `http://localhost:${port}/api/login`,
|
|
31
|
+
method: "POST",
|
|
32
|
+
data: {
|
|
33
|
+
testUP: "1"
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
strictEqual(response.status, 200);
|
|
37
|
+
})()
|
|
38
|
+
});
|
|
39
|
+
after(async () => {
|
|
40
|
+
await server.close();
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
it("happy path", async () => {
|
|
44
|
+
const proxyApp = new lib.App();
|
|
45
|
+
proxyApp.use(lib.JSONParser());
|
|
46
|
+
proxyApp.use(async (ctx) => {
|
|
47
|
+
ctx.logger.info("proxy hit with %o", ctx.body);
|
|
48
|
+
});
|
|
49
|
+
proxyApp.use(lib.Proxy({
|
|
50
|
+
url: "http://localhost:" + port
|
|
51
|
+
}), "/proxy");
|
|
52
|
+
const response = await TestHelper(proxyApp, {
|
|
53
|
+
disableThrow: true,
|
|
54
|
+
url: `/proxy/api/login`,
|
|
55
|
+
method: "POST",
|
|
56
|
+
data: {
|
|
57
|
+
userName: "hello",
|
|
58
|
+
password: "world"
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
strictEqual(response.status, 200);
|
|
62
|
+
})
|
|
63
|
+
|
|
64
|
+
})
|
|
65
|
+
});
|
package/src/proxy.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {Context} from "./common";
|
|
2
|
-
import {request} from "@miqro/request";
|
|
2
|
+
import {request, RequestOptions} from "@miqro/request";
|
|
3
3
|
import {Router, RouterOptions} from "./router";
|
|
4
4
|
import {normalizePath, PathPartToken} from "./common/tokenize-match";
|
|
5
5
|
import {URL} from "url";
|
|
@@ -32,21 +32,38 @@ class ProxyRouter extends Router {
|
|
|
32
32
|
const nUrl = new URL(this.proxyURL.toString());
|
|
33
33
|
nUrl.pathname = nUrl.pathname + relative;
|
|
34
34
|
const url = nUrl.toString();
|
|
35
|
-
ctx.logger.info("proxy to %s", url.toString());
|
|
36
35
|
|
|
37
|
-
const
|
|
36
|
+
const headers = {
|
|
37
|
+
...ctx.headers
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
delete headers["connection"];
|
|
41
|
+
delete headers["keep-alive"];
|
|
42
|
+
|
|
43
|
+
const requestArgs: RequestOptions = {
|
|
38
44
|
url: url.toString(),
|
|
39
45
|
disableThrow: true,
|
|
40
46
|
rejectUnauthorized: this.rejectUnauthorized,
|
|
41
47
|
disableUserAgent: true,
|
|
42
48
|
method: ctx.method,
|
|
43
|
-
headers
|
|
49
|
+
headers,
|
|
44
50
|
data: ctx.method !== "GET" ? ctx.buffer : undefined
|
|
45
|
-
}
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
ctx.logger.info("proxy to %s", url.toString());
|
|
54
|
+
ctx.logger.debug("proxy with %o", requestArgs);
|
|
55
|
+
|
|
56
|
+
const response = await request(requestArgs);
|
|
57
|
+
|
|
58
|
+
const responseHeaders = {
|
|
59
|
+
...response.headers
|
|
60
|
+
};
|
|
61
|
+
delete responseHeaders["connection"];
|
|
62
|
+
delete responseHeaders["keep-alive"];
|
|
46
63
|
|
|
47
64
|
await ctx.end({
|
|
48
|
-
headers:
|
|
49
|
-
body: response.
|
|
65
|
+
headers: responseHeaders,
|
|
66
|
+
body: response.buffer,
|
|
50
67
|
status: response.status
|
|
51
68
|
});
|
|
52
69
|
}
|
package/src/proxy.unit.test.js
CHANGED