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

Merge branch 'master' into remove-union

Browse Source
This commit is contained in:
undefined committed 2024-10-18 06:16:19 +08:00
2 parents a47fee77b4 800e640070
commit baeafe7cd3
17 files changed
+107 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

framework/framework/server.ts
+7 -7
View File
@@ -23,7 +23,7 @@ import serializer from './serializer';
export { WebSocket, WebSocketServer } from 'ws';
const kHandler = Symbol.for('hydro.handler');
export const kHandler = Symbol.for('hydro.handler');
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
export function encodeRFC5987ValueChars(str: string) {
@@ -111,7 +111,7 @@ export interface UserModel {
export interface HandlerCommon { }
export class HandlerCommon {
static [kHandler] = true;
static [kHandler]: string | boolean = true;
session: Record<string, any>;
args: Record<string, any>;
request: HydroRequest;
@@ -313,7 +313,7 @@ function executeMiddlewareStack(context: any, middlewares: { name: string, func:
return dispatch(0);
}
interface WebServiceConfig {
export interface WebServiceConfig {
keys: string[];
proxy: boolean;
cors?: string;
@@ -459,6 +459,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
const h = new HandlerClass(ctx, this.ctx);
ctx.handler = h;
const method = ctx.method.toLowerCase();
const name = (typeof HandlerClass[kHandler] === 'string' ? HandlerClass[kHandler] : HandlerClass.name).replace(/Handler$/, '');
try {
const operation = (method === 'post' && ctx.request.body?.operation)
? `_${ctx.request.body.operation}`.replace(/_([a-z])/gm, (s) => s[1].toUpperCase())
@@ -479,7 +480,6 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
throw new MethodNotAllowedError(method);
}
const name = HandlerClass.name.replace(/Handler$/, '');
const steps = [
'log/__init', 'init', 'handler/init',
`handler/before-prepare/${name}#${method}`, `handler/before-prepare/${name}`, 'handler/before-prepare',
@@ -516,7 +516,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
}
} catch (e) {
try {
await this.ctx.serial(`handler/error/${HandlerClass.name.replace(/Handler$/, '')}`, h, e);
await this.ctx.serial(`handler/error/${name}`, h, e);
await this.ctx.serial('handler/error', h, e);
await h.onerror(e);
} catch (err) {
@@ -596,7 +596,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
private register(type: 'route' | 'conn', routeName: string, path: string, HandlerClass: any, ...permPrivChecker) {
if (!HandlerClass?.[kHandler] || !isClass(HandlerClass)) throw new Error('Invalid registration.');
const name = HandlerClass.name;
const name = typeof HandlerClass[kHandler] === 'string' ? HandlerClass[kHandler] : HandlerClass.name;
if (this.registrationCount[name] && this.registry[name] !== HandlerClass) {
logger.warn('Route with name %s already exists.', name);
}
@@ -697,7 +697,7 @@ declare module 'cordis' {
}
}
export async function apply(ctx: Context, config) {
export async function apply(ctx: Context, config: WebServiceConfig) {
ctx.provide('server', undefined, true);
ctx.server = new WebService(ctx, config);
}