@celljs/web 4.0.0 → 4.1.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/esm/node/body/body-middleware.d.ts +3 -0
- package/esm/node/body/body-middleware.js +13 -4
- package/esm/node/body/body-middleware.js.map +1 -1
- package/esm/node/context.js +1 -1
- package/esm/node/context.js.map +1 -1
- package/esm/node/http/http-middleware.d.ts +1 -0
- package/esm/node/http/http-middleware.js +10 -5
- package/esm/node/http/http-middleware.js.map +1 -1
- package/esm/node/session/session-store.js +4 -3
- package/esm/node/session/session-store.js.map +1 -1
- package/esm/node/session/session.d.ts +1 -1
- package/esm/node/session/session.js +4 -4
- package/esm/node/session/session.js.map +1 -1
- package/lib/node/body/body-middleware.d.ts +3 -0
- package/lib/node/body/body-middleware.d.ts.map +1 -1
- package/lib/node/body/body-middleware.js +12 -3
- package/lib/node/body/body-middleware.js.map +1 -1
- package/lib/node/body/body-middleware.spec.d.ts +2 -0
- package/lib/node/body/body-middleware.spec.d.ts.map +1 -0
- package/lib/node/body/body-middleware.spec.js +19 -0
- package/lib/node/body/body-middleware.spec.js.map +1 -0
- package/lib/node/context.js +1 -1
- package/lib/node/context.js.map +1 -1
- package/lib/node/http/http-middleware.d.ts +1 -0
- package/lib/node/http/http-middleware.d.ts.map +1 -1
- package/lib/node/http/http-middleware.js +10 -5
- package/lib/node/http/http-middleware.js.map +1 -1
- package/lib/node/session/session-store.d.ts.map +1 -1
- package/lib/node/session/session-store.js +4 -1
- package/lib/node/session/session-store.js.map +1 -1
- package/lib/node/session/session.d.ts +1 -1
- package/lib/node/session/session.d.ts.map +1 -1
- package/lib/node/session/session.js +37 -2
- package/lib/node/session/session.js.map +1 -1
- package/lib/node/session/session.spec.d.ts +2 -0
- package/lib/node/session/session.spec.d.ts.map +1 -0
- package/lib/node/session/session.spec.js +78 -0
- package/lib/node/session/session.spec.js.map +1 -0
- package/package.json +7 -10
- package/src/node/body/body-middleware.spec.ts +17 -0
- package/src/node/body/body-middleware.ts +12 -4
- package/src/node/context.ts +1 -1
- package/src/node/http/http-middleware.ts +10 -5
- package/src/node/session/session-store.ts +5 -1
- package/src/node/session/session.spec.ts +81 -0
- package/src/node/session/session.ts +5 -2
|
@@ -5,6 +5,9 @@ import { HandlerExecutionChain } from '../handler/index.js';
|
|
|
5
5
|
export declare class BodyMiddleware implements Middleware {
|
|
6
6
|
protected handlerExecutionChain: HandlerExecutionChain;
|
|
7
7
|
protected readonly options: Options;
|
|
8
|
+
/** The four parsers, made once: making them per request cost a noticeable share of each request. */
|
|
9
|
+
protected parsers: Middleware[];
|
|
10
|
+
protected init(): void;
|
|
8
11
|
handle(ctx: Context, next: () => Promise<void>): Promise<void>;
|
|
9
12
|
readonly priority: number;
|
|
10
13
|
}
|
|
@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import { convertExpressMiddleware, Middleware } from '../middleware/index.js';
|
|
11
|
-
import { Component, Autowired, Value } from '@celljs/core';
|
|
11
|
+
import { Component, Autowired, Value, PostConstruct } from '@celljs/core';
|
|
12
12
|
import __cellCjs0 from 'body-parser';
|
|
13
13
|
const { json, text, raw, urlencoded } = __cellCjs0;
|
|
14
14
|
import { BODY_MIDDLEWARE_PRIORITY } from './body-protocol.js';
|
|
@@ -17,13 +17,16 @@ let BodyMiddleware = class BodyMiddleware {
|
|
|
17
17
|
constructor() {
|
|
18
18
|
this.priority = BODY_MIDDLEWARE_PRIORITY;
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
init() {
|
|
21
|
+
this.parsers = [
|
|
22
22
|
convertExpressMiddleware(json({ ...this.options })),
|
|
23
23
|
convertExpressMiddleware(text({ ...this.options })),
|
|
24
24
|
convertExpressMiddleware(raw({ ...this.options })),
|
|
25
25
|
convertExpressMiddleware(urlencoded({ ...this.options, ...{ extended: true } }))
|
|
26
|
-
]
|
|
26
|
+
];
|
|
27
|
+
}
|
|
28
|
+
async handle(ctx, next) {
|
|
29
|
+
return this.handlerExecutionChain.execute(this.parsers, next);
|
|
27
30
|
}
|
|
28
31
|
};
|
|
29
32
|
__decorate([
|
|
@@ -34,6 +37,12 @@ __decorate([
|
|
|
34
37
|
Value('cell.web.body'),
|
|
35
38
|
__metadata("design:type", Object)
|
|
36
39
|
], BodyMiddleware.prototype, "options", void 0);
|
|
40
|
+
__decorate([
|
|
41
|
+
PostConstruct(),
|
|
42
|
+
__metadata("design:type", Function),
|
|
43
|
+
__metadata("design:paramtypes", []),
|
|
44
|
+
__metadata("design:returntype", void 0)
|
|
45
|
+
], BodyMiddleware.prototype, "init", null);
|
|
37
46
|
BodyMiddleware = __decorate([
|
|
38
47
|
Component(Middleware)
|
|
39
48
|
], BodyMiddleware);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-middleware.js","sourceRoot":"","sources":["../../../src/node/body/body-middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"body-middleware.js","sourceRoot":"","sources":["../../../src/node/body/body-middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,EAAW,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;QAyBM,aAAQ,GAAG,wBAAwB,CAAC;IAEjD,CAAC;IAfa,IAAI;QACV,IAAI,CAAC,OAAO,GAAG;YACX,wBAAwB,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,wBAAwB,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,wBAAwB,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAClD,wBAAwB,CAAC,UAAU,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;SACnF,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,IAAyB;QAChD,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;CAIJ,CAAA;AAxBa;IADT,SAAS,CAAC,qBAAqB,CAAC;;6DACsB;AAGpC;IADlB,KAAK,CAAC,eAAe,CAAC;;+CACa;AAM1B;IADT,aAAa,EAAE;;;;0CAQf;AAnBQ,cAAc;IAD1B,SAAS,CAAC,UAAU,CAAC;GACT,cAAc,CA2B1B"}
|
package/esm/node/context.js
CHANGED
package/esm/node/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/node/context.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/node/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Context } from '../context.js';
|
|
|
3
3
|
import { Logger } from '@celljs/core';
|
|
4
4
|
export declare class HttpMiddleware implements Middleware {
|
|
5
5
|
protected readonly logger: Logger;
|
|
6
|
+
/** The access log: one line before and one after each request, at the debug level. */
|
|
6
7
|
handle(ctx: Context, next: () => Promise<void>): Promise<void>;
|
|
7
8
|
readonly priority: number;
|
|
8
9
|
}
|
|
@@ -15,11 +15,14 @@ let HttpMiddleware = class HttpMiddleware {
|
|
|
15
15
|
constructor() {
|
|
16
16
|
this.priority = HTTP_MIDDLEWARE_PRIORITY;
|
|
17
17
|
}
|
|
18
|
+
/** The access log: one line before and one after each request, at the debug level. */
|
|
18
19
|
async handle(ctx, next) {
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
// Checked once per request: the lines are only built when they are written.
|
|
21
|
+
const log = this.logger.isEnabled('debug');
|
|
22
|
+
const start = log ? Date.now() : 0;
|
|
23
|
+
if (log) {
|
|
24
|
+
this.logger.debug(`starting ${ctx.request.method} ${ctx.request.path}`);
|
|
25
|
+
}
|
|
23
26
|
try {
|
|
24
27
|
await next();
|
|
25
28
|
const response = ctx.response;
|
|
@@ -28,7 +31,9 @@ let HttpMiddleware = class HttpMiddleware {
|
|
|
28
31
|
}
|
|
29
32
|
}
|
|
30
33
|
finally {
|
|
31
|
-
|
|
34
|
+
if (log) {
|
|
35
|
+
this.logger.debug(`ending ${ctx.request.method} ${ctx.request.path} [${Date.now() - start}ms]`);
|
|
36
|
+
}
|
|
32
37
|
}
|
|
33
38
|
}
|
|
34
39
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-middleware.js","sourceRoot":"","sources":["../../../src/node/http/http-middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;
|
|
1
|
+
{"version":3,"file":"http-middleware.js","sourceRoot":"","sources":["../../../src/node/http/http-middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;QA0BM,aAAQ,GAAG,wBAAwB,CAAC;IAEjD,CAAC;IAvBG,sFAAsF;IACtF,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,IAAyB;QAChD,4EAA4E;QAC5E,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,CAAC;YACD,MAAM,IAAI,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;gBACtD,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;QACL,CAAC;gBAAS,CAAC;YACP,IAAI,GAAG,EAAE,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC;YACpG,CAAC;QACL,CAAC;IACL,CAAC;CAIJ,CAAA;AAzBsB;IADlB,SAAS,CAAC,MAAM,CAAC;;8CACgB;AAHzB,cAAc;IAD1B,SAAS,CAAC,UAAU,CAAC;GACT,cAAc,CA4B1B"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { createRequire as __cellCreateRequire } from "node:module";
|
|
2
|
-
const require = __cellCreateRequire(import.meta.url);
|
|
3
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
4
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
5
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -12,7 +10,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
12
10
|
import { SessionStrategy, SessionStore, COOKIE_EXP_DATE } from './session-protocol.js';
|
|
13
11
|
import { Autowired, Value, Component, Logger } from '@celljs/core';
|
|
14
12
|
import { Context } from '../context.js';
|
|
15
|
-
|
|
13
|
+
import { promisify } from 'node:util';
|
|
14
|
+
import { gzip as gzipCallback, gunzip } from 'node:zlib';
|
|
15
|
+
const gzip = promisify(gzipCallback);
|
|
16
|
+
const ungzip = promisify(gunzip);
|
|
16
17
|
let CookieSessionStore = class CookieSessionStore {
|
|
17
18
|
async get(id) {
|
|
18
19
|
const value = Context.getCookies().get(this.sessionOptions.sessionKey, this.sessionOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAW,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAW,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,IAAI,IAAI,YAAY,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEzD,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;AACrC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAG1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAa3B,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5F,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC;gBACD,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAChE,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QAEL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACjH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE;YACzD,OAAO,EAAE,eAAe;YACxB,MAAM,EAAE,KAAK;SAChB,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;AAjCsB;IADlB,KAAK,CAAC,cAAc,CAAC;;0DACiB;AAGpB;IADlB,SAAS,CAAC,eAAe,CAAC;;2DACyB;AAGjC;IADlB,SAAS,CAAC,MAAM,CAAC;;kDACgB;AAXzB,kBAAkB;IAD9B,SAAS,CAAC,YAAY,CAAC;GACX,kBAAkB,CAsC9B"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { createRequire as __cellCreateRequire } from "node:module";
|
|
2
|
-
const require = __cellCreateRequire(import.meta.url);
|
|
3
1
|
import { generateUUUID } from '@celljs/core/lib/common/utils/uuid';
|
|
4
|
-
|
|
2
|
+
import * as zlib from 'node:zlib';
|
|
3
|
+
// zlib.crc32 exists from Node.js 20.15 (and in Bun); @types/node is pinned to 18 in this repository.
|
|
4
|
+
const crc32 = zlib.crc32;
|
|
5
5
|
export class SessionImpl {
|
|
6
6
|
constructor(sessionOptions, obj) {
|
|
7
7
|
this.id = generateUUUID();
|
|
@@ -19,7 +19,7 @@ export class SessionImpl {
|
|
|
19
19
|
this._preHash = this.hash();
|
|
20
20
|
}
|
|
21
21
|
hash() {
|
|
22
|
-
return crc32(JSON.stringify(this.toJSON()));
|
|
22
|
+
return String(crc32(JSON.stringify(this.toJSON())));
|
|
23
23
|
}
|
|
24
24
|
toJSON() {
|
|
25
25
|
const obj = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,qGAAqG;AACrG,MAAM,KAAK,GAAI,IAAmD,CAAC,KAAK,CAAC;AAEzE,MAAM,OAAO,WAAW;IAMpB,YAAY,cAAmB,EAAE,GAAS;QALjC,OAAE,GAAG,aAAa,EAAE,CAAC;QAC9B,UAAK,GAAG,IAAI,CAAC;QAKT,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC;IAES,IAAI;QACV,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM;QACF,MAAM,GAAG,GAAQ,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACpC,GAAG,CAAC,GAAG,CAAC,GAAI,IAAY,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,IAAI,OAAO;QACP,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
|
|
@@ -5,6 +5,9 @@ import { HandlerExecutionChain } from '../handler';
|
|
|
5
5
|
export declare class BodyMiddleware implements Middleware {
|
|
6
6
|
protected handlerExecutionChain: HandlerExecutionChain;
|
|
7
7
|
protected readonly options: Options;
|
|
8
|
+
/** The four parsers, made once: making them per request cost a noticeable share of each request. */
|
|
9
|
+
protected parsers: Middleware[];
|
|
10
|
+
protected init(): void;
|
|
8
11
|
handle(ctx: Context, next: () => Promise<void>): Promise<void>;
|
|
9
12
|
readonly priority: number;
|
|
10
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-middleware.d.ts","sourceRoot":"","sources":["../../../src/node/body/body-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAA+B,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,qBACa,cAAe,YAAW,UAAU;IAG7C,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"body-middleware.d.ts","sourceRoot":"","sources":["../../../src/node/body/body-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAA+B,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,qBACa,cAAe,YAAW,UAAU;IAG7C,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAEpC,oGAAoG;IACpG,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;IAGhC,SAAS,CAAC,IAAI,IAAI,IAAI,CAOrB;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;IAED,QAAQ,CAAC,QAAQ,SAA4B;CAEhD"}
|
|
@@ -19,13 +19,16 @@ let BodyMiddleware = class BodyMiddleware {
|
|
|
19
19
|
constructor() {
|
|
20
20
|
this.priority = body_protocol_1.BODY_MIDDLEWARE_PRIORITY;
|
|
21
21
|
}
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
init() {
|
|
23
|
+
this.parsers = [
|
|
24
24
|
(0, middleware_1.convertExpressMiddleware)((0, body_parser_1.json)({ ...this.options })),
|
|
25
25
|
(0, middleware_1.convertExpressMiddleware)((0, body_parser_1.text)({ ...this.options })),
|
|
26
26
|
(0, middleware_1.convertExpressMiddleware)((0, body_parser_1.raw)({ ...this.options })),
|
|
27
27
|
(0, middleware_1.convertExpressMiddleware)((0, body_parser_1.urlencoded)({ ...this.options, ...{ extended: true } }))
|
|
28
|
-
]
|
|
28
|
+
];
|
|
29
|
+
}
|
|
30
|
+
async handle(ctx, next) {
|
|
31
|
+
return this.handlerExecutionChain.execute(this.parsers, next);
|
|
29
32
|
}
|
|
30
33
|
};
|
|
31
34
|
exports.BodyMiddleware = BodyMiddleware;
|
|
@@ -37,6 +40,12 @@ __decorate([
|
|
|
37
40
|
(0, core_1.Value)('cell.web.body'),
|
|
38
41
|
__metadata("design:type", Object)
|
|
39
42
|
], BodyMiddleware.prototype, "options", void 0);
|
|
43
|
+
__decorate([
|
|
44
|
+
(0, core_1.PostConstruct)(),
|
|
45
|
+
__metadata("design:type", Function),
|
|
46
|
+
__metadata("design:paramtypes", []),
|
|
47
|
+
__metadata("design:returntype", void 0)
|
|
48
|
+
], BodyMiddleware.prototype, "init", null);
|
|
40
49
|
exports.BodyMiddleware = BodyMiddleware = __decorate([
|
|
41
50
|
(0, core_1.Component)(middleware_1.Middleware)
|
|
42
51
|
], BodyMiddleware);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-middleware.js","sourceRoot":"","sources":["../../../src/node/body/body-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAqE;AAErE,
|
|
1
|
+
{"version":3,"file":"body-middleware.js","sourceRoot":"","sources":["../../../src/node/body/body-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAqE;AAErE,uCAA0E;AAC1E,6CAAmE;AACnE,mDAA2D;AAC3D,wCAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;QAyBM,aAAQ,GAAG,wCAAwB,CAAC;IAEjD,CAAC;IAfa,IAAI;QACV,IAAI,CAAC,OAAO,GAAG;YACX,IAAA,qCAAwB,EAAC,IAAA,kBAAI,EAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,IAAA,qCAAwB,EAAC,IAAA,kBAAI,EAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,IAAA,qCAAwB,EAAC,IAAA,iBAAG,EAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAClD,IAAA,qCAAwB,EAAC,IAAA,wBAAU,EAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;SACnF,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,IAAyB;QAChD,OAAO,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;CAIJ,CAAA;;AAxBa;IADT,IAAA,gBAAS,EAAC,+BAAqB,CAAC;;6DACsB;AAGpC;IADlB,IAAA,YAAK,EAAC,eAAe,CAAC;;+CACa;AAM1B;IADT,IAAA,oBAAa,GAAE;;;;0CAQf;yBAnBQ,cAAc;IAD1B,IAAA,gBAAS,EAAC,uBAAU,CAAC;GACT,cAAc,CA2B1B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"body-middleware.spec.d.ts","sourceRoot":"","sources":["../../../src/node/body/body-middleware.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
|
+
const body_middleware_1 = require("./body-middleware");
|
|
6
|
+
(0, bun_test_1.describe)('BodyMiddleware', () => {
|
|
7
|
+
(0, bun_test_1.it)('makes its parsers once, not per request', async () => {
|
|
8
|
+
const middleware = new body_middleware_1.BodyMiddleware();
|
|
9
|
+
const seen = [];
|
|
10
|
+
Object.assign(middleware, { options: { limit: '1kb' }, handlerExecutionChain: { execute: async (parsers) => { seen.push(parsers); } } });
|
|
11
|
+
middleware.init();
|
|
12
|
+
await middleware.handle({}, async () => undefined);
|
|
13
|
+
await middleware.handle({}, async () => undefined);
|
|
14
|
+
(0, chai_1.expect)(seen).to.have.length(2);
|
|
15
|
+
(0, chai_1.expect)(seen[0]).to.have.length(4);
|
|
16
|
+
(0, chai_1.expect)(seen[1]).to.equal(seen[0]);
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
//# sourceMappingURL=body-middleware.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"body-middleware.spec.js","sourceRoot":"","sources":["../../../src/node/body/body-middleware.spec.ts"],"names":[],"mappings":";;AAAA,uCAAwC;AACxC,+BAA8B;AAC9B,uDAAmD;AAEnD,IAAA,mBAAQ,EAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAA,aAAE,EAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,UAAU,GAAG,IAAI,gCAAc,EAAE,CAAC;QACxC,MAAM,IAAI,GAAc,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,qBAAqB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAkB,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnJ,UAA0C,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,UAAU,CAAC,MAAM,CAAC,EAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,UAAU,CAAC,MAAM,CAAC,EAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAClC,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/lib/node/context.js
CHANGED
package/lib/node/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/node/context.ts"],"names":[],"mappings":";;;AAAA,gDAA+E;AAK/E,8CAAuD;AAA9C,sGAAA,cAAc,OAAA;AACV,QAAA,2BAA2B,GAAG,uBAAuB,CAAC;AACtD,QAAA,2BAA2B,GAAG,uBAAuB,CAAC;AACtD,QAAA,4BAA4B,GAAG,uBAAuB,CAAC;AACvD,QAAA,iCAAiC,GAAG,2BAA2B,CAAC;AAChE,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AAQjE,aAAqB,SAAQ,cAAW;IAEpC,YAAmB,OAAgB,EAAS,QAAkB;QAC1D,KAAK,EAAE,CAAC;uBADO,OAAO;wBAAkB,QAAQ;IAEpD,CAAC;IAED,MAAM,CAAC,UAAU;QACb,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,WAAW;QACd,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,UAAU;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,QAAA,2BAA2B,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAgB;QAC9B,OAAO,CAAC,OAAO,CAAC,QAAA,2BAA2B,EAAE,OAAO,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,CAAC,UAAU;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,QAAA,2BAA2B,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAgB;QAC9B,OAAO,CAAC,OAAO,CAAC,QAAA,2BAA2B,EAAE,OAAO,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAe;QAC7B,OAAO,CAAC,OAAO,CAAC,QAAA,4BAA4B,EAAE,OAAO,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAEnF,CAAC;IAED,MAAM,CAAC,UAAU;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,QAAA,4BAA4B,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,MAAc;QAC3B,OAAO,CAAC,OAAO,CAAC,QAAA,0BAA0B,EAAE,MAAM,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAAC,SAAS;QACZ,OAAO,OAAO,CAAC,OAAO,CAAC,QAAA,0BAA0B,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,WAAoB;QACtC,OAAO,CAAC,OAAO,CAAC,QAAA,iCAAiC,EAAE,WAAW,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IAC5F,CAAC;IAED,MAAM,CAAC,aAAa;QAChB,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAA,iCAAiC,EAAE,qBAAc,CAAC,OAAO,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,CAAU,OAAO,CAAC,GAAW,EAAE,KAAU,EAAE,KAAK,GAAmB,qBAAc,CAAC,OAAO;QAC3F,IAAI,KAAK,KAAK,qBAAc,CAAC,OAAO,EAAE,CAAC;YACnC,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtC,CAAC;aAAM,CAAC;YACJ,cAAW,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC;IAED,MAAM,CAAU,OAAO,CAAI,GAAW,EAAE,KAAsB;QAC1D,IAAI,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/node/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Context } from '../context';
|
|
|
3
3
|
import { Logger } from '@celljs/core';
|
|
4
4
|
export declare class HttpMiddleware implements Middleware {
|
|
5
5
|
protected readonly logger: Logger;
|
|
6
|
+
/** The access log: one line before and one after each request, at the debug level. */
|
|
6
7
|
handle(ctx: Context, next: () => Promise<void>): Promise<void>;
|
|
7
8
|
readonly priority: number;
|
|
8
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-middleware.d.ts","sourceRoot":"","sources":["../../../src/node/http/http-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAwB,MAAM,EAAE,MAAM,cAAc,CAAC;AAG5D,qBACa,cAAe,YAAW,UAAU;IAG7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"http-middleware.d.ts","sourceRoot":"","sources":["../../../src/node/http/http-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAwB,MAAM,EAAE,MAAM,cAAc,CAAC;AAG5D,qBACa,cAAe,YAAW,UAAU;IAG7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,sFAAsF;IAChF,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBnE;IAED,QAAQ,CAAC,QAAQ,SAA4B;CAEhD"}
|
|
@@ -18,11 +18,14 @@ let HttpMiddleware = class HttpMiddleware {
|
|
|
18
18
|
constructor() {
|
|
19
19
|
this.priority = http_protocol_1.HTTP_MIDDLEWARE_PRIORITY;
|
|
20
20
|
}
|
|
21
|
+
/** The access log: one line before and one after each request, at the debug level. */
|
|
21
22
|
async handle(ctx, next) {
|
|
22
|
-
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
// Checked once per request: the lines are only built when they are written.
|
|
24
|
+
const log = this.logger.isEnabled('debug');
|
|
25
|
+
const start = log ? Date.now() : 0;
|
|
26
|
+
if (log) {
|
|
27
|
+
this.logger.debug(`starting ${ctx.request.method} ${ctx.request.path}`);
|
|
28
|
+
}
|
|
26
29
|
try {
|
|
27
30
|
await next();
|
|
28
31
|
const response = ctx.response;
|
|
@@ -31,7 +34,9 @@ let HttpMiddleware = class HttpMiddleware {
|
|
|
31
34
|
}
|
|
32
35
|
}
|
|
33
36
|
finally {
|
|
34
|
-
|
|
37
|
+
if (log) {
|
|
38
|
+
this.logger.debug(`ending ${ctx.request.method} ${ctx.request.path} [${Date.now() - start}ms]`);
|
|
39
|
+
}
|
|
35
40
|
}
|
|
36
41
|
}
|
|
37
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-middleware.js","sourceRoot":"","sources":["../../../src/node/http/http-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2C;AAC3C,wCAAqC;AACrC,uCAA4D;AAC5D,mDAA2D;AAGpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;
|
|
1
|
+
{"version":3,"file":"http-middleware.js","sourceRoot":"","sources":["../../../src/node/http/http-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2C;AAC3C,wCAAqC;AACrC,uCAA4D;AAC5D,mDAA2D;AAGpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;QA0BM,aAAQ,GAAG,wCAAwB,CAAC;IAEjD,CAAC;IAvBG,sFAAsF;IACtF,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,IAAyB;QAChD,4EAA4E;QAC5E,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,CAAC;YACD,MAAM,IAAI,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAC9B,IAAI,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;gBACtD,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;QACL,CAAC;gBAAS,CAAC;YACP,IAAI,GAAG,EAAE,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC;YACpG,CAAC;QACL,CAAC;IACL,CAAC;CAIJ,CAAA;;AAzBsB;IADlB,IAAA,gBAAS,EAAC,aAAM,CAAC;;8CACgB;yBAHzB,cAAc;IAD1B,IAAA,gBAAS,EAAC,uBAAU,CAAC;GACT,cAAc,CA4B1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAA+B,MAAM,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAA+B,MAAM,EAAE,MAAM,cAAc,CAAC;AAQnE,qBACa,kBAAmB,YAAW,YAAY;IAEnD,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAE5B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAWlD;IAEK,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzC;IAEK,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKtC;CAEJ"}
|
|
@@ -13,7 +13,10 @@ exports.CookieSessionStore = void 0;
|
|
|
13
13
|
const session_protocol_1 = require("./session-protocol");
|
|
14
14
|
const core_1 = require("@celljs/core");
|
|
15
15
|
const context_1 = require("../context");
|
|
16
|
-
const
|
|
16
|
+
const node_util_1 = require("node:util");
|
|
17
|
+
const node_zlib_1 = require("node:zlib");
|
|
18
|
+
const gzip = (0, node_util_1.promisify)(node_zlib_1.gzip);
|
|
19
|
+
const ungzip = (0, node_util_1.promisify)(node_zlib_1.gunzip);
|
|
17
20
|
let CookieSessionStore = class CookieSessionStore {
|
|
18
21
|
async get(id) {
|
|
19
22
|
const value = context_1.Context.getCookies().get(this.sessionOptions.sessionKey, this.sessionOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA6F;AAC7F,uCAAmE;AACnE,wCAAqC;AACrC,MAAM,
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA6F;AAC7F,uCAAmE;AACnE,wCAAqC;AACrC,yCAAsC;AACtC,yCAAyD;AAEzD,MAAM,IAAI,GAAG,IAAA,qBAAS,EAAC,gBAAY,CAAC,CAAC;AACrC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,kBAAM,CAAC,CAAC;AAG1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAa3B,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,MAAM,KAAK,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5F,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC;gBACD,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAChE,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QAEL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACjH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE;YACzD,OAAO,EAAE,kCAAe;YACxB,MAAM,EAAE,KAAK;SAChB,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;;AAjCsB;IADlB,IAAA,YAAK,EAAC,cAAc,CAAC;;0DACiB;AAGpB;IADlB,IAAA,gBAAS,EAAC,kCAAe,CAAC;;2DACyB;AAGjC;IADlB,IAAA,gBAAS,EAAC,aAAM,CAAC;;kDACgB;6BAXzB,kBAAkB;IAD9B,IAAA,gBAAS,EAAC,+BAAY,CAAC;GACX,kBAAkB,CAsC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAM7C,qBAAa,WAAY,YAAW,OAAO;IACvC,QAAQ,CAAC,EAAE,SAAmB;IAC9B,KAAK,UAAQ;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,YAAY,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAWzC;IAED,SAAS,CAAC,IAAI,WAEb;IAED,MAAM,IAAI,GAAG,CAQZ;IAED,IAAI,OAAO,YAKV;CAEJ"}
|
|
@@ -1,8 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
exports.SessionImpl = void 0;
|
|
4
37
|
const uuid_1 = require("@celljs/core/lib/common/utils/uuid");
|
|
5
|
-
const
|
|
38
|
+
const zlib = __importStar(require("node:zlib"));
|
|
39
|
+
// zlib.crc32 exists from Node.js 20.15 (and in Bun); @types/node is pinned to 18 in this repository.
|
|
40
|
+
const crc32 = zlib.crc32;
|
|
6
41
|
class SessionImpl {
|
|
7
42
|
constructor(sessionOptions, obj) {
|
|
8
43
|
this.id = (0, uuid_1.generateUUUID)();
|
|
@@ -20,7 +55,7 @@ class SessionImpl {
|
|
|
20
55
|
this._preHash = this.hash();
|
|
21
56
|
}
|
|
22
57
|
hash() {
|
|
23
|
-
return crc32(JSON.stringify(this.toJSON()));
|
|
58
|
+
return String(crc32(JSON.stringify(this.toJSON())));
|
|
24
59
|
}
|
|
25
60
|
toJSON() {
|
|
26
61
|
const obj = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAAmE;AAEnE,MAAY,IAAI,sCAAkB;AAElC,qGAAqG;AACrG,MAAM,KAAK,GAAI,IAAmD,CAAC,KAAK,CAAC;AAEzE;IAMI,YAAY,cAAmB,EAAE,GAAS;QALjC,OAAE,GAAG,IAAA,oBAAa,GAAE,CAAC;QAC9B,UAAK,GAAG,IAAI,CAAC;QAKT,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC;IAES,IAAI;QACV,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM;QACF,MAAM,GAAG,GAAQ,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACpC,GAAG,CAAC,GAAG,CAAC,GAAI,IAAY,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,IAAI,OAAO;QACP,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session.spec.d.ts","sourceRoot":"","sources":["../../../src/node/session/session.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
|
+
const context_1 = require("../context");
|
|
6
|
+
const session_1 = require("./session");
|
|
7
|
+
const session_store_1 = require("./session-store");
|
|
8
|
+
const session_strategy_1 = require("./session-strategy");
|
|
9
|
+
const options = { maxAge: 1000, sessionKey: 'cell:session' };
|
|
10
|
+
/** Runs fn in a request context and waits for it (Context.run does not return its promise with cls-hooked). */
|
|
11
|
+
function inContext(fn) {
|
|
12
|
+
return new Promise((resolve, reject) => {
|
|
13
|
+
context_1.Context.run(async () => {
|
|
14
|
+
try {
|
|
15
|
+
context_1.Context.setCurrent(new context_1.Context({}, {}));
|
|
16
|
+
await fn();
|
|
17
|
+
resolve();
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
reject(error);
|
|
21
|
+
}
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
(0, bun_test_1.describe)('SessionImpl', () => {
|
|
26
|
+
(0, bun_test_1.it)('is unchanged until a value changes', () => {
|
|
27
|
+
const session = new session_1.SessionImpl(options);
|
|
28
|
+
(0, chai_1.expect)(session.isNew).to.equal(true);
|
|
29
|
+
(0, chai_1.expect)(session.changed).to.equal(false);
|
|
30
|
+
session.user = 'tom';
|
|
31
|
+
(0, chai_1.expect)(session.changed).to.equal(true);
|
|
32
|
+
});
|
|
33
|
+
(0, bun_test_1.it)('serializes its values without isNew and private fields', () => {
|
|
34
|
+
const session = new session_1.SessionImpl(options);
|
|
35
|
+
session.user = 'tom';
|
|
36
|
+
const json = session.toJSON();
|
|
37
|
+
(0, chai_1.expect)(json).to.include({ user: 'tom', maxAge: 1000 });
|
|
38
|
+
(0, chai_1.expect)(Object.keys(json)).to.not.include.members(['isNew', '_preHash']);
|
|
39
|
+
});
|
|
40
|
+
(0, bun_test_1.it)('restored from its values it is not new and unchanged', () => {
|
|
41
|
+
const session = new session_1.SessionImpl(options, { id: 'x', user: 'tom', expire: 5, maxAge: 1000 });
|
|
42
|
+
(0, chai_1.expect)(session.isNew).to.equal(false);
|
|
43
|
+
(0, chai_1.expect)(session.changed).to.equal(false);
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
(0, bun_test_1.describe)('CookieSessionStore', () => {
|
|
47
|
+
(0, bun_test_1.it)('stores a session compressed in a cookie and reads it back', async () => {
|
|
48
|
+
const jar = new Map();
|
|
49
|
+
const store = new session_store_1.CookieSessionStore();
|
|
50
|
+
const strategy = new session_strategy_1.SessionStrategyImpl();
|
|
51
|
+
Object.assign(strategy, { sessionOptions: options });
|
|
52
|
+
Object.assign(store, { sessionOptions: options, sessionStrategy: strategy, logger: { error: () => undefined } });
|
|
53
|
+
await inContext(async () => {
|
|
54
|
+
context_1.Context.setCookies({ get: (k) => jar.get(k), set: (k, v) => { jar.set(k, v); } });
|
|
55
|
+
const session = new session_1.SessionImpl(options);
|
|
56
|
+
session.user = '中文 user';
|
|
57
|
+
await store.set(session);
|
|
58
|
+
const value = jar.get('cell:session');
|
|
59
|
+
(0, chai_1.expect)(value).to.match(/^[A-Za-z0-9+/]+=*$/);
|
|
60
|
+
(0, chai_1.expect)(Buffer.from(value, 'base64').subarray(0, 2)).to.deep.equal(Buffer.from([0x1f, 0x8b]));
|
|
61
|
+
const restored = await store.get('ignored');
|
|
62
|
+
(0, chai_1.expect)(restored.user).to.equal('中文 user');
|
|
63
|
+
(0, chai_1.expect)(restored.id).to.equal(session.id);
|
|
64
|
+
(0, chai_1.expect)(restored.changed).to.equal(false);
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
(0, bun_test_1.it)('ignores a cookie it cannot read', async () => {
|
|
68
|
+
const errors = [];
|
|
69
|
+
const store = new session_store_1.CookieSessionStore();
|
|
70
|
+
Object.assign(store, { sessionOptions: options, sessionStrategy: new session_strategy_1.SessionStrategyImpl(), logger: { error: (e) => errors.push(e) } });
|
|
71
|
+
await inContext(async () => {
|
|
72
|
+
context_1.Context.setCookies({ get: () => 'bm90IGd6aXA=' });
|
|
73
|
+
(0, chai_1.expect)(await store.get('x')).to.equal(undefined);
|
|
74
|
+
});
|
|
75
|
+
(0, chai_1.expect)(errors).to.have.length(1);
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
//# sourceMappingURL=session.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../../src/node/session/session.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/web",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.1.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -29,22 +29,19 @@
|
|
|
29
29
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@celljs/core": "4.
|
|
33
|
-
"@celljs/http": "4.
|
|
34
|
-
"@types/cookies": "^0.7.7",
|
|
32
|
+
"@celljs/core": "4.1.0",
|
|
33
|
+
"@celljs/http": "4.1.0",
|
|
35
34
|
"@types/express": "^4.17.9",
|
|
36
|
-
"body-parser": "^1.20.
|
|
35
|
+
"body-parser": "^1.20.9",
|
|
37
36
|
"class-transformer": "^0.5.1",
|
|
38
|
-
"class-validator": "^0.14.
|
|
37
|
+
"class-validator": "^0.14.4",
|
|
39
38
|
"cookies": "^0.8.0",
|
|
40
39
|
"cors": "^2.8.5",
|
|
41
|
-
"
|
|
42
|
-
"express": "^4.17.1",
|
|
43
|
-
"node-gzip": "^1.1.2",
|
|
44
|
-
"tslib": "^2.8.0",
|
|
40
|
+
"express": "^4.22.3",
|
|
45
41
|
"url-pattern": "^1.0.3"
|
|
46
42
|
},
|
|
47
43
|
"devDependencies": {
|
|
44
|
+
"@types/cookies": "^0.7.7",
|
|
48
45
|
"@types/cors": "^2.8.6"
|
|
49
46
|
},
|
|
50
47
|
"publishConfig": {
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { describe, it } from 'bun:test';
|
|
2
|
+
import { expect } from 'chai';
|
|
3
|
+
import { BodyMiddleware } from './body-middleware';
|
|
4
|
+
|
|
5
|
+
describe('BodyMiddleware', () => {
|
|
6
|
+
it('makes its parsers once, not per request', async () => {
|
|
7
|
+
const middleware = new BodyMiddleware();
|
|
8
|
+
const seen: unknown[] = [];
|
|
9
|
+
Object.assign(middleware, { options: { limit: '1kb' }, handlerExecutionChain: { execute: async (parsers: unknown[]) => { seen.push(parsers); } } });
|
|
10
|
+
(middleware as unknown as { init(): void }).init();
|
|
11
|
+
await middleware.handle({} as any, async () => undefined);
|
|
12
|
+
await middleware.handle({} as any, async () => undefined);
|
|
13
|
+
expect(seen).to.have.length(2);
|
|
14
|
+
expect(seen[0]).to.have.length(4);
|
|
15
|
+
expect(seen[1]).to.equal(seen[0]);
|
|
16
|
+
});
|
|
17
|
+
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { convertExpressMiddleware, Middleware } from '../middleware';
|
|
2
2
|
import { Context } from '../context';
|
|
3
|
-
import { Component, Autowired, Value } from '@celljs/core';
|
|
3
|
+
import { Component, Autowired, Value, PostConstruct } from '@celljs/core';
|
|
4
4
|
import { json, text, raw, urlencoded, Options } from 'body-parser';
|
|
5
5
|
import { BODY_MIDDLEWARE_PRIORITY } from './body-protocol';
|
|
6
6
|
import { HandlerExecutionChain } from '../handler';
|
|
@@ -14,13 +14,21 @@ export class BodyMiddleware implements Middleware {
|
|
|
14
14
|
@Value('cell.web.body')
|
|
15
15
|
protected readonly options: Options;
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
/** The four parsers, made once: making them per request cost a noticeable share of each request. */
|
|
18
|
+
protected parsers: Middleware[];
|
|
19
|
+
|
|
20
|
+
@PostConstruct()
|
|
21
|
+
protected init(): void {
|
|
22
|
+
this.parsers = [
|
|
19
23
|
convertExpressMiddleware(json({ ...this.options })),
|
|
20
24
|
convertExpressMiddleware(text({ ...this.options })),
|
|
21
25
|
convertExpressMiddleware(raw({ ...this.options })),
|
|
22
26
|
convertExpressMiddleware(urlencoded({ ...this.options, ...{ extended: true } }))
|
|
23
|
-
]
|
|
27
|
+
];
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
async handle(ctx: Context, next: () => Promise<void>): Promise<void> {
|
|
31
|
+
return this.handlerExecutionChain.execute(this.parsers, next);
|
|
24
32
|
}
|
|
25
33
|
|
|
26
34
|
readonly priority = BODY_MIDDLEWARE_PRIORITY;
|
package/src/node/context.ts
CHANGED
|
@@ -80,7 +80,7 @@ export class Context extends BaseContext {
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
static override getAttr<T>(key: string, scope?: AttributeScope): T {
|
|
83
|
-
if (scope) {
|
|
83
|
+
if (scope !== undefined) {
|
|
84
84
|
if (scope === AttributeScope.Session) {
|
|
85
85
|
return Context.getSession()[key];
|
|
86
86
|
} else {
|
|
@@ -9,11 +9,14 @@ export class HttpMiddleware implements Middleware {
|
|
|
9
9
|
@Autowired(Logger)
|
|
10
10
|
protected readonly logger: Logger;
|
|
11
11
|
|
|
12
|
+
/** The access log: one line before and one after each request, at the debug level. */
|
|
12
13
|
async handle(ctx: Context, next: () => Promise<void>): Promise<void> {
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
// Checked once per request: the lines are only built when they are written.
|
|
15
|
+
const log = this.logger.isEnabled('debug');
|
|
16
|
+
const start = log ? Date.now() : 0;
|
|
17
|
+
if (log) {
|
|
18
|
+
this.logger.debug(`starting ${ctx.request.method} ${ctx.request.path}`);
|
|
19
|
+
}
|
|
17
20
|
try {
|
|
18
21
|
await next();
|
|
19
22
|
const response = ctx.response;
|
|
@@ -21,7 +24,9 @@ export class HttpMiddleware implements Middleware {
|
|
|
21
24
|
response.end(response.body);
|
|
22
25
|
}
|
|
23
26
|
} finally {
|
|
24
|
-
|
|
27
|
+
if (log) {
|
|
28
|
+
this.logger.debug(`ending ${ctx.request.method} ${ctx.request.path} [${Date.now() - start}ms]`);
|
|
29
|
+
}
|
|
25
30
|
}
|
|
26
31
|
}
|
|
27
32
|
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { Session, SessionStrategy, SessionStore, COOKIE_EXP_DATE } from './session-protocol';
|
|
2
2
|
import { Autowired, Value, Component, Logger } from '@celljs/core';
|
|
3
3
|
import { Context } from '../context';
|
|
4
|
-
|
|
4
|
+
import { promisify } from 'node:util';
|
|
5
|
+
import { gzip as gzipCallback, gunzip } from 'node:zlib';
|
|
6
|
+
|
|
7
|
+
const gzip = promisify(gzipCallback);
|
|
8
|
+
const ungzip = promisify(gunzip);
|
|
5
9
|
|
|
6
10
|
@Component(SessionStore)
|
|
7
11
|
export class CookieSessionStore implements SessionStore {
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { describe, it } from 'bun:test';
|
|
2
|
+
import { expect } from 'chai';
|
|
3
|
+
import { Context } from '../context';
|
|
4
|
+
import { SessionImpl } from './session';
|
|
5
|
+
import { CookieSessionStore } from './session-store';
|
|
6
|
+
import { SessionStrategyImpl } from './session-strategy';
|
|
7
|
+
|
|
8
|
+
const options = { maxAge: 1000, sessionKey: 'cell:session' };
|
|
9
|
+
|
|
10
|
+
/** Runs fn in a request context and waits for it (Context.run does not return its promise with cls-hooked). */
|
|
11
|
+
function inContext(fn: () => Promise<void>): Promise<void> {
|
|
12
|
+
return new Promise((resolve, reject) => {
|
|
13
|
+
Context.run(async () => {
|
|
14
|
+
try {
|
|
15
|
+
Context.setCurrent(new Context({} as any, {} as any));
|
|
16
|
+
await fn();
|
|
17
|
+
resolve();
|
|
18
|
+
} catch (error) {
|
|
19
|
+
reject(error);
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
describe('SessionImpl', () => {
|
|
26
|
+
it('is unchanged until a value changes', () => {
|
|
27
|
+
const session = new SessionImpl(options) as SessionImpl & Record<string, unknown>;
|
|
28
|
+
expect(session.isNew).to.equal(true);
|
|
29
|
+
expect(session.changed).to.equal(false);
|
|
30
|
+
session.user = 'tom';
|
|
31
|
+
expect(session.changed).to.equal(true);
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it('serializes its values without isNew and private fields', () => {
|
|
35
|
+
const session = new SessionImpl(options) as SessionImpl & Record<string, unknown>;
|
|
36
|
+
session.user = 'tom';
|
|
37
|
+
const json = session.toJSON();
|
|
38
|
+
expect(json).to.include({ user: 'tom', maxAge: 1000 });
|
|
39
|
+
expect(Object.keys(json)).to.not.include.members(['isNew', '_preHash']);
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
it('restored from its values it is not new and unchanged', () => {
|
|
43
|
+
const session = new SessionImpl(options, { id: 'x', user: 'tom', expire: 5, maxAge: 1000 });
|
|
44
|
+
expect(session.isNew).to.equal(false);
|
|
45
|
+
expect(session.changed).to.equal(false);
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
describe('CookieSessionStore', () => {
|
|
50
|
+
it('stores a session compressed in a cookie and reads it back', async () => {
|
|
51
|
+
const jar = new Map<string, string>();
|
|
52
|
+
const store = new CookieSessionStore();
|
|
53
|
+
const strategy = new SessionStrategyImpl();
|
|
54
|
+
Object.assign(strategy, { sessionOptions: options });
|
|
55
|
+
Object.assign(store, { sessionOptions: options, sessionStrategy: strategy, logger: { error: () => undefined } });
|
|
56
|
+
await inContext(async () => {
|
|
57
|
+
Context.setCookies({ get: (k: string) => jar.get(k), set: (k: string, v: string) => { jar.set(k, v); } } as any);
|
|
58
|
+
const session = new SessionImpl(options) as SessionImpl & Record<string, unknown>;
|
|
59
|
+
session.user = '中文 user';
|
|
60
|
+
await store.set(session);
|
|
61
|
+
const value = jar.get('cell:session')!;
|
|
62
|
+
expect(value).to.match(/^[A-Za-z0-9+/]+=*$/);
|
|
63
|
+
expect(Buffer.from(value, 'base64').subarray(0, 2)).to.deep.equal(Buffer.from([0x1f, 0x8b]));
|
|
64
|
+
const restored = await store.get('ignored') as SessionImpl & Record<string, unknown>;
|
|
65
|
+
expect(restored.user).to.equal('中文 user');
|
|
66
|
+
expect(restored.id).to.equal(session.id);
|
|
67
|
+
expect(restored.changed).to.equal(false);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it('ignores a cookie it cannot read', async () => {
|
|
72
|
+
const errors: unknown[] = [];
|
|
73
|
+
const store = new CookieSessionStore();
|
|
74
|
+
Object.assign(store, { sessionOptions: options, sessionStrategy: new SessionStrategyImpl(), logger: { error: (e: unknown) => errors.push(e) } });
|
|
75
|
+
await inContext(async () => {
|
|
76
|
+
Context.setCookies({ get: () => 'bm90IGd6aXA=' } as any);
|
|
77
|
+
expect(await store.get('x')).to.equal(undefined);
|
|
78
|
+
});
|
|
79
|
+
expect(errors).to.have.length(1);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { generateUUUID } from '@celljs/core/lib/common/utils/uuid';
|
|
2
2
|
import { Session } from './session-protocol';
|
|
3
|
-
|
|
3
|
+
import * as zlib from 'node:zlib';
|
|
4
|
+
|
|
5
|
+
// zlib.crc32 exists from Node.js 20.15 (and in Bun); @types/node is pinned to 18 in this repository.
|
|
6
|
+
const crc32 = (zlib as unknown as { crc32(data: string): number }).crc32;
|
|
4
7
|
|
|
5
8
|
export class SessionImpl implements Session {
|
|
6
9
|
readonly id = generateUUUID();
|
|
@@ -22,7 +25,7 @@ export class SessionImpl implements Session {
|
|
|
22
25
|
}
|
|
23
26
|
|
|
24
27
|
protected hash() {
|
|
25
|
-
return crc32(JSON.stringify(this.toJSON()));
|
|
28
|
+
return String(crc32(JSON.stringify(this.toJSON())));
|
|
26
29
|
}
|
|
27
30
|
|
|
28
31
|
toJSON(): any {
|