@miqro/core 1.7.0 → 1.7.1
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/app.js +2 -2
- package/dist/app.js.map +1 -1
- package/dist/router.js +2 -2
- package/dist/router.js.map +1 -1
- package/package.json +3 -5
- package/src/app.ts +2 -2
- package/src/app.unit.test.js +6 -7
- package/src/router.ts +2 -2
- package/src/router.unit.test.js +3 -4
package/dist/app.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.App = void 0;
|
|
4
4
|
const http_1 = require("http");
|
|
5
|
-
const
|
|
5
|
+
const crypto_1 = require("crypto");
|
|
6
6
|
const common_1 = require("./common");
|
|
7
7
|
const router_1 = require("./router");
|
|
8
8
|
const app_utils_1 = require("./app-utils");
|
|
@@ -12,7 +12,7 @@ class App extends router_1.Router {
|
|
|
12
12
|
const errorHandler = (0, app_utils_1.defaultAppErrorHandler)();
|
|
13
13
|
const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : common_1.defaultLoggerFactory;
|
|
14
14
|
this.listener = async (req, res) => {
|
|
15
|
-
const uuid = (0,
|
|
15
|
+
const uuid = (0, crypto_1.randomUUID)();
|
|
16
16
|
const logger = loggerFactory(uuid, req);
|
|
17
17
|
const ctx = new common_1.Context(uuid, req, res, logger);
|
|
18
18
|
ctx.logger.trace(`request received`);
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAC3D
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAC3D,mCAAmC;AACnC,qCAAuD;AACvD,qCAA+C;AAC/C,2CAAyE;AAEzE,MAAa,GAAI,SAAQ,eAAM;IAG7B,YAAY,MAAsB;QAChC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,YAAY,GAAG,IAAA,kCAAsB,GAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,6BAAoB,CAAC;QAClH,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,IAAA,mBAAU,GAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,gBAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YAChD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,IAAI;gBACF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACxB,MAAM,GAAG,CAAC,GAAG,CAAC;wBACZ,OAAO,EAAE,wBAAY;wBACrB,MAAM,EAAE,kBAAM,CAAC,SAAS;wBACxB,IAAI,EAAE,WAAW;qBAClB,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,CAAM,EAAE;gBACf,IAAI;oBACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;wBACxB,MAAM,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;wBAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;4BACxB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;4BACpB,MAAM,GAAG,CAAC,GAAG,CAAC;gCACZ,OAAO,EAAE,wBAAY;gCACrB,MAAM,EAAE,kBAAM,CAAC,KAAK;gCACpB,IAAI,EAAE,cAAc;6BACrB,CAAC,CAAC;yBACJ;qBACF;iBACF;gBAAC,OAAO,EAAE,EAAE;oBACX,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACtB;aACF;QACH,CAAC,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,GAAG,IAAW;QAC1B,OAAO,IAAA,mBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;IACpD,CAAC;CACF;AA5CD,kBA4CC"}
|
package/dist/router.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Router = void 0;
|
|
4
|
-
const uuid_1 = require("uuid");
|
|
5
4
|
const context_1 = require("./common/context");
|
|
6
5
|
const tokenize_match_1 = require("./common/tokenize-match");
|
|
7
6
|
const router_helpers_1 = require("./common/router-helpers");
|
|
8
7
|
const router_handler_1 = require("./common/router-handler");
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
9
9
|
class Router {
|
|
10
10
|
constructor(config) {
|
|
11
11
|
this.config = config;
|
|
@@ -13,7 +13,7 @@ class Router {
|
|
|
13
13
|
this.errorHandlers = [];
|
|
14
14
|
const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : router_helpers_1.defaultLoggerFactory;
|
|
15
15
|
this.listener = async (req, res) => {
|
|
16
|
-
const uuid = (0,
|
|
16
|
+
const uuid = (0, crypto_1.randomUUID)();
|
|
17
17
|
const logger = loggerFactory(uuid, req);
|
|
18
18
|
const ctx = new context_1.Context(uuid, req, res, logger);
|
|
19
19
|
ctx.logger.trace(`request received`);
|
package/dist/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":";;;AAEA,8CAAwE;AAExE,4DAA0F;AAC1F,4DAA6D;AAC7D,4DAAsD;AACtD,mCAAkC;AAOlC,MAAa,MAAM;IAKjB,YAAsB,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;QAJzB,aAAQ,GAAoB,EAAE,CAAC;QAC/B,kBAAa,GAAmB,EAAE,CAAC;QAIpD,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,qCAAoB,CAAC;QAClH,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,IAAA,mBAAU,GAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YAChD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;IAEM,GAAG,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACtH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEM,IAAI,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACvH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACxH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACzH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,GAAG,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QACtH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEM,OAAO,CAAC,IAAY,EAAE,OAA+D,EAAE,OAA8B;QAC1H,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,GAAG,CAAC,OAA+D,EAAE,IAAa,EAAE,MAAe,EAAE,OAA8B;QACxI,MAAM,KAAK,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,8BAAa,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,MAAM,CAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,8BAAa,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,YAAgD;QAC3D,MAAM,aAAa,GAAG,YAAY,YAAY,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACpF,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE;YAC7B,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE;gBAC3B,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;aACtD;YACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,UAAuB,EAAE,gBAAiC,EAAE;QACzF,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,0BAAS,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI;YACF,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC7B,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACvB,MAAM;iBACP;gBACD,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;gBACjE,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,IAAI,OAAO,CAAC,MAAM,EAAE;wBAClB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;4BACxB,GAAG,GAAG,CAAC,MAAM;4BACb,GAAG,OAAO,CAAC,MAAM;yBAClB,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;qBACpB;oBACD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;oBACtE,IAAI,CAAC,cAAc,EAAE;wBACnB,MAAM;qBACP;iBACF;aACF;YACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;SAC7B;QAAC,OAAO,CAAM,EAAE;YACf,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE;gBACnC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC7B,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACxC,OAAO,KAAK,CAAC;iBACd;aACF;YACD,MAAM,CAAC,CAAC,CAAC,uBAAuB;SACjC;IACH,CAAC;IAEM,UAAU,CAAC,MAAqB,EAAE,EAAE,OAAO,GAAG,GAAG;QACtD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAClC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAjGD,wBAiGC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miqro/core",
|
|
3
|
-
"version": "1.7.
|
|
3
|
+
"version": "1.7.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -19,8 +19,7 @@
|
|
|
19
19
|
"@miqro/test-http": "0.0.7",
|
|
20
20
|
"@types/node": "18.6.1",
|
|
21
21
|
"typescript": "4.7.4",
|
|
22
|
-
"@types/cookie": "0.4.1"
|
|
23
|
-
"@types/uuid": "8.3.4"
|
|
22
|
+
"@types/cookie": "0.4.1"
|
|
24
23
|
},
|
|
25
24
|
"engines": {
|
|
26
25
|
"node": ">=16.0.0",
|
|
@@ -29,7 +28,6 @@
|
|
|
29
28
|
"dependencies": {
|
|
30
29
|
"@miqro/parser": "^0.1.5",
|
|
31
30
|
"@miqro/request": "^0.1.1",
|
|
32
|
-
"cookie": "0.5.0"
|
|
33
|
-
"uuid": "8.3.2"
|
|
31
|
+
"cookie": "0.5.0"
|
|
34
32
|
}
|
|
35
33
|
}
|
package/src/app.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {createServer, RequestListener, Server} from "http";
|
|
2
|
-
import {
|
|
2
|
+
import { randomUUID } from 'crypto'
|
|
3
3
|
import {Context, defaultLoggerFactory} from "./common";
|
|
4
4
|
import {Router, RouterOptions} from "./router";
|
|
5
5
|
import {defaultAppErrorHandler, HTML_HEADERS, STATUS} from "./app-utils";
|
|
@@ -12,7 +12,7 @@ export class App extends Router {
|
|
|
12
12
|
const errorHandler = defaultAppErrorHandler();
|
|
13
13
|
const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : defaultLoggerFactory;
|
|
14
14
|
this.listener = async (req, res) => {
|
|
15
|
-
const uuid =
|
|
15
|
+
const uuid = randomUUID();
|
|
16
16
|
const logger = loggerFactory(uuid, req);
|
|
17
17
|
const ctx = new Context(uuid, req, res, logger);
|
|
18
18
|
ctx.logger.trace(`request received`);
|
package/src/app.unit.test.js
CHANGED
|
@@ -22,7 +22,6 @@ describe("app unit tests", () => {
|
|
|
22
22
|
"http": {
|
|
23
23
|
createServer
|
|
24
24
|
},
|
|
25
|
-
"uuid": {},
|
|
26
25
|
"./common": {},
|
|
27
26
|
"./router": {
|
|
28
27
|
Router: class {
|
|
@@ -95,8 +94,8 @@ describe("app unit tests", () => {
|
|
|
95
94
|
|
|
96
95
|
const {App} = requireMock(testFilePath, {
|
|
97
96
|
"http": {},
|
|
98
|
-
"
|
|
99
|
-
v4
|
|
97
|
+
"crypto": {
|
|
98
|
+
randomUUID: v4
|
|
100
99
|
},
|
|
101
100
|
"./common": {
|
|
102
101
|
defaultLoggerFactory,
|
|
@@ -189,8 +188,8 @@ describe("app unit tests", () => {
|
|
|
189
188
|
|
|
190
189
|
const {App} = requireMock(testFilePath, {
|
|
191
190
|
"http": {},
|
|
192
|
-
"
|
|
193
|
-
v4
|
|
191
|
+
"crypto": {
|
|
192
|
+
randomUUID: v4
|
|
194
193
|
},
|
|
195
194
|
"./common": {
|
|
196
195
|
defaultLoggerFactory,
|
|
@@ -286,8 +285,8 @@ describe("app unit tests", () => {
|
|
|
286
285
|
|
|
287
286
|
const {App} = requireMock(testFilePath, {
|
|
288
287
|
"http": {},
|
|
289
|
-
"
|
|
290
|
-
v4
|
|
288
|
+
"crypto": {
|
|
289
|
+
randomUUID: v4
|
|
291
290
|
},
|
|
292
291
|
"./common": {
|
|
293
292
|
defaultLoggerFactory,
|
package/src/router.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import {IncomingMessage, RequestListener} from "http";
|
|
2
|
-
import {v4} from "uuid";
|
|
3
2
|
import {Logger} from "./common/logger/index.js";
|
|
4
3
|
import {Context, ErrorHandler, Handler, Method} from "./common/context";
|
|
5
4
|
import {HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc} from "./common/router-utils";
|
|
6
5
|
import {normalizePath, PathPart, PathPartToken, splitPath} from "./common/tokenize-match";
|
|
7
6
|
import {defaultLoggerFactory} from "./common/router-helpers";
|
|
8
7
|
import {RouterHandler} from "./common/router-handler";
|
|
8
|
+
import {randomUUID} from "crypto";
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
export interface RouterOptions {
|
|
@@ -20,7 +20,7 @@ export class Router {
|
|
|
20
20
|
constructor(protected config?: RouterOptions) {
|
|
21
21
|
const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : defaultLoggerFactory;
|
|
22
22
|
this.listener = async (req, res) => {
|
|
23
|
-
const uuid =
|
|
23
|
+
const uuid = randomUUID();
|
|
24
24
|
const logger = loggerFactory(uuid, req);
|
|
25
25
|
const ctx = new Context(uuid, req, res, logger);
|
|
26
26
|
ctx.logger.trace(`request received`);
|
package/src/router.unit.test.js
CHANGED
|
@@ -60,7 +60,7 @@ describe("router unit tests", () => {
|
|
|
60
60
|
splitPath.reset();
|
|
61
61
|
const {Router} = requireMock(testFilePath, {
|
|
62
62
|
"http": {},
|
|
63
|
-
|
|
63
|
+
|
|
64
64
|
"./common/logger": {},
|
|
65
65
|
"./common/context": {},
|
|
66
66
|
"./common/router-utils": {},
|
|
@@ -219,7 +219,7 @@ describe("router unit tests", () => {
|
|
|
219
219
|
before(() => {
|
|
220
220
|
const {Router} = requireMock(testFilePath, {
|
|
221
221
|
"http": {},
|
|
222
|
-
|
|
222
|
+
|
|
223
223
|
"./common/logger": {},
|
|
224
224
|
"./common/context": {},
|
|
225
225
|
"./common/router-utils": {},
|
|
@@ -250,7 +250,7 @@ describe("router unit tests", () => {
|
|
|
250
250
|
before(() => {
|
|
251
251
|
const {Router} = requireMock(testFilePath, {
|
|
252
252
|
"http": {},
|
|
253
|
-
|
|
253
|
+
|
|
254
254
|
"./common/logger": {},
|
|
255
255
|
"./common/context": {},
|
|
256
256
|
"./common/router-utils": {},
|
|
@@ -331,7 +331,6 @@ describe("router unit tests", () => {
|
|
|
331
331
|
|
|
332
332
|
const {Router} = requireMock(testFilePath, {
|
|
333
333
|
"http": {},
|
|
334
|
-
"uuid": {},
|
|
335
334
|
"./common/logger": {},
|
|
336
335
|
"./common/context": {},
|
|
337
336
|
"./common/router-utils": {},
|