@miqro/core 1.5.20 → 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/proxy.js CHANGED
@@ -21,13 +21,12 @@ 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
- ctx.logger.info("proxy to %s", url.toString());
25
24
  const headers = {
26
25
  ...ctx.headers
27
26
  };
28
27
  delete headers["connection"];
29
28
  delete headers["keep-alive"];
30
- const response = await (0, request_1.request)({
29
+ const requestArgs = {
31
30
  url: url.toString(),
32
31
  disableThrow: true,
33
32
  rejectUnauthorized: this.rejectUnauthorized,
@@ -35,7 +34,10 @@ class ProxyRouter extends router_1.Router {
35
34
  method: ctx.method,
36
35
  headers,
37
36
  data: ctx.method !== "GET" ? ctx.buffer : undefined
38
- });
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);
39
41
  const responseHeaders = {
40
42
  ...response.headers
41
43
  };
package/dist/proxy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":";;;AACA,4CAAuC;AACvC,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;YAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE/C,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,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC;gBAC7B,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,CAAC;YAEH,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"}
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "1.5.20",
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.4",
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.9",
32
- "@miqro/parser": "^0.1.3",
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
  }
@@ -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,7 +32,6 @@ 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
36
  const headers = {
38
37
  ...ctx.headers
@@ -41,7 +40,7 @@ class ProxyRouter extends Router {
41
40
  delete headers["connection"];
42
41
  delete headers["keep-alive"];
43
42
 
44
- const response = await request({
43
+ const requestArgs: RequestOptions = {
45
44
  url: url.toString(),
46
45
  disableThrow: true,
47
46
  rejectUnauthorized: this.rejectUnauthorized,
@@ -49,7 +48,12 @@ class ProxyRouter extends Router {
49
48
  method: ctx.method,
50
49
  headers,
51
50
  data: ctx.method !== "GET" ? ctx.buffer : undefined
52
- });
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);
53
57
 
54
58
  const responseHeaders = {
55
59
  ...response.headers
@@ -83,6 +83,9 @@ describe("proxy unit tests", () => {
83
83
  logger: {
84
84
  info: fake(() => {
85
85
 
86
+ }),
87
+ debug: fake(() => {
88
+
86
89
  })
87
90
  },
88
91
  end: fake(()=>{
@@ -153,5 +156,4 @@ describe("proxy unit tests", () => {
153
156
  });
154
157
  });
155
158
  });
156
-
157
159
  });