Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-17 09:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
undefined committed 2025-03-16 23:28:05 +08:00
1 parent f5eab3b87b
commit 0b03b17fc8
6 files changed
+19 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

framework/framework/server.ts
+13 -12
View File
@@ -437,7 +437,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
...this.handlerLayers,
{
name: '404',
func: (t) => this.handleHttp(t, NotFoundHandler, () => true),
func: (t) => this.handleHttp(t, NotFoundHandler, () => true, this.ctx),
},
]));
this.addLayer('base', base(logger, this.config.xff, this.config.xhost));
@@ -471,10 +471,10 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
});
}
private async handleHttp(ctx: KoaContext, HandlerClass, checker) {
private async handleHttp(ctx: KoaContext, HandlerClass, checker, savedContext) {
const { args } = ctx.HydroContext;
Object.assign(args, ctx.params);
const h = new HandlerClass(ctx, this.ctx);
const h = new HandlerClass(ctx, savedContext);
ctx.handler = h;
const method = ctx.method.toLowerCase();
const name = ((Object.hasOwn(HandlerClass, kHandler) && typeof HandlerClass[kHandler] === 'string')
@@ -550,9 +550,9 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
}
}
private async handleWS(ctx: KoaContext, HandlerClass, checker, conn?, layer?) {
private async handleWS(ctx: KoaContext, HandlerClass, checker, conn?, layer?, savedContext?) {
const { args } = ctx.HydroContext;
const h = new HandlerClass(ctx, this.ctx);
const h = new HandlerClass(ctx, savedContext);
// FIXME: should pass type check
await (this.ctx.parallel as any)('connection/create', h);
const stream = new PassThrough();
@@ -695,18 +695,19 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
};
};
// if (name === 'ContestScoreboard') {
// console.log('-------------', this.ctx, this.ctx.scoreboard);
// }
// We hope to use parent context for handler (the context that calls register)
// So that handler can use services injected before calling register
const savedContext = Object.hasOwn(this.ctx, Symbol.for('cordis.shadow'))
? Object.getPrototypeOf(this.ctx)
: this.ctx;
if (type === 'route') {
router.all(routeName, path, (ctx) => this.handleHttp(ctx as any, HandlerClass, Checker(permPrivChecker)));
router.all(routeName, path, (ctx) => this.handleHttp(ctx as any, HandlerClass, Checker(permPrivChecker), savedContext));
} else {
const checker = Checker(permPrivChecker);
const layer = router.ws(path, async (conn, _req, ctx) => {
await this.handleWS(ctx as any, HandlerClass, checker, conn, layer);
await this.handleWS(ctx as any, HandlerClass, checker, conn, layer, savedContext);
});
router.get(path, (ctx) => this.handleWS(ctx as any, HandlerClass, checker, null, null));
router.get(path, (ctx) => this.handleWS(ctx as any, HandlerClass, checker, null, null, savedContext));
}
const dispose = router.disposeLastOp;
// @ts-ignore