core: upgrade to context tracing

framework/framework/server.ts

@@ -338,7 +338,6 @@ export class WebService extends Service {
     HandlerCommon = HandlerCommon;
     Handler = Handler;
     ConnectionHandler = ConnectionHandler;
-    handlerCtxBase = this.ctx;
 
     constructor(ctx: Context, public config: WebServiceConfig) {
         super(ctx, 'server', true);
@@ -439,9 +438,6 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
             }
             socket.close();
         });
-        this.ctx.inject(['server'], (c) => {
-            this.handlerCtxBase = c;
-        });
     }
 
     async listen() {
@@ -460,7 +456,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
     private async handleHttp(ctx: KoaContext, HandlerClass, checker) {
         const { args } = ctx.HydroContext;
         Object.assign(args, ctx.params);
-        const h = new HandlerClass(ctx, this.handlerCtxBase);
+        const h = new HandlerClass(ctx, this.ctx);
         ctx.handler = h;
         const method = ctx.method.toLowerCase();
         try {
@@ -534,7 +530,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
 
     private async handleWS(ctx: KoaContext, HandlerClass, checker, conn, layer) {
         const { args } = ctx.HydroContext;
-        const h = new HandlerClass(ctx, this.handlerCtxBase);
+        const h = new HandlerClass(ctx, this.ctx);
         await this.ctx.parallel('connection/create', h);
         ctx.handler = h;
         h.conn = conn;
@@ -599,8 +595,8 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
     }
 
     private register(type: 'route' | 'conn', routeName: string, path: string, HandlerClass: any, ...permPrivChecker) {
-        const name = HandlerClass.name;
         if (!HandlerClass?.[kHandler] || !isClass(HandlerClass)) throw new Error('Invalid registration.');
+        const name = HandlerClass.name;
         if (this.registrationCount[name] && this.registry[name] !== HandlerClass) {
             logger.warn('Route with name %s already exists.', name);
         }
@@ -617,7 +613,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
         const dispose = router.disposeLastOp;
         // @ts-ignore
         this.ctx.parallel(`handler/register/${name}`, HandlerClass);
-        this[Context.current]?.on('dispose', () => {
+        this.ctx.on('dispose', () => {
             this.registrationCount[name]--;
             if (!this.registrationCount[name]) delete this.registry[name];
             dispose();
@@ -650,7 +646,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
         const dispose = () => {
             this[name] = this[name].filter((i) => i !== layer);
         };
-        this[Context.current]?.on('dispose', dispose);
+        this[Context.origin]?.on('dispose', dispose);
         return dispose;
     }
 
@@ -683,9 +679,11 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
 
     public registerRenderer(name: string, func: RendererFunction) {
         if (this.renderers[name]) logger.warn('Renderer %s already exists.', name);
+        this.ctx.effect(() => {
             this.renderers[name] = func;
-        this[Context.current]?.on('dispose', () => {
+            return () => {
                 delete this.renderers[name];
+            };
         });
     }
 }

packages/hydrooj/src/context.ts

@@ -50,8 +50,10 @@ export abstract class Service<T = any, C extends Context = Context> extends cord
 
 const T = <F extends (...args: any[]) => any>(origFunc: F, disposeFunc?) =>
     function method(this: cordis.Service, ...args: Parameters<F>) {
+        this.ctx.effect(() => {
             const res = origFunc(...args);
-        this[Context.current]?.on('dispose', () => (disposeFunc ? disposeFunc(res) : res()));
+            return () => (disposeFunc ? disposeFunc(res) : res());
+        });
     };
 
 export class ApiMixin extends Service {

packages/hydrooj/src/handler/home.ts

@@ -179,7 +179,6 @@ export class HomeHandler extends Handler {
     }
 }
 
-let geoip: Context['geoip'] = null;
 class HomeSecurityHandler extends Handler {
     @requireSudo
     async get() {
@@ -189,7 +188,7 @@ class HomeSecurityHandler extends Handler {
             session.isCurrent = session._id === this.session._id;
             session._id = md5(session._id);
             session.updateUa = useragent.parse(session.updateUa || session.createUa || '');
-            session.updateGeoip = geoip?.lookup?.(
+            session.updateGeoip = this.ctx.geoip?.lookup?.(
                 session.updateIp || session.createIp,
                 this.translate('geoip_locale'),
             );
@@ -202,7 +201,7 @@ class HomeSecurityHandler extends Handler {
                 'credentialID', 'name', 'credentialType', 'credentialDeviceType',
                 'authenticatorAttachment', 'regat', 'fmt',
             ])),
-            geoipProvider: geoip?.provider,
+            geoipProvider: this.ctx?.geoip?.provider,
             icon: (str = '') => str.split(' ')[0].toLowerCase(),
         };
     }
@@ -591,10 +590,8 @@ class HomeMessagesConnectionHandler extends ConnectionHandler {
     }
 }
 
-export async function apply(ctx: Context) {
+export const inject = { geoip: { required: false } };
-    ctx.inject(['geoip'], (g) => {
+export function apply(ctx: Context) {
-        geoip = g.geoip;
-    });
     ctx.Route('homepage', '/', HomeHandler);
     ctx.Route('home_security', '/home/security', HomeSecurityHandler, PRIV.PRIV_USER_PROFILE);
     ctx.Route('user_changemail_with_code', '/home/changeMail/:code', UserChangemailWithCodeHandler, PRIV.PRIV_USER_PROFILE);

packages/hydrooj/src/handler/misc.ts

@@ -2,6 +2,7 @@
 import { statSync } from 'fs';
 import { pick } from 'lodash';
 import { lookup } from 'mime-types';
+import { Context } from '../context';
 import {
     AccessDeniedError, FileExistsError, FileLimitExceededError, FileUploadError, NotFoundError,
     ValidationError,
@@ -132,7 +133,7 @@ export class SwitchAccountHandler extends Handler {
     }
 }
 
-export async function apply(ctx) {
+export async function apply(ctx: Context) {
     ctx.Route('switch_language', '/language/:lang', SwitchLanguageHandler);
     ctx.Route('home_files', '/file', FilesHandler);
     ctx.Route('fs_download', '/file/:uid/:filename', FSDownloadHandler);

packages/hydrooj/src/lib/i18n.ts

@@ -19,10 +19,12 @@ class I18nService extends Service {
     }
 
     load(lang: string, content: Record<string, string>) {
+        this.ctx.effect(() => {
             translations[lang] ||= [];
             translations[lang].unshift(content);
-        this[Context.current]?.on('dispose', () => {
+            return () => {
                 translations[lang] = translations[lang].filter((i) => i !== content);
+            };
         });
     }
 

packages/hydrooj/src/model/setting.ts

@@ -301,8 +301,10 @@ declare module 'cordis' {
 
 const T = <F extends (...args: any[]) => any>(origFunc: F, disposeFunc?) =>
     function method(this: cordis.Service, ...args: Parameters<F>) {
+        this.ctx.effect(() => {
             const res = origFunc(...args);
-        this[Context.current]?.on('dispose', () => (disposeFunc ? disposeFunc(res) : res()));
+            return () => (disposeFunc ? disposeFunc(res) : res());
+        });
     };
 
 export class SettingService extends Service {
@@ -316,7 +318,7 @@ export class SettingService extends Service {
     }
 
     get(key: string) {
-        return (this[Context.current] ? this[Context.current].domain?.config?.[key.replace(/\./g, '$')] : null) ?? global.Hydro.model.system.get(key);
+        return (this.ctx ? this.ctx.domain?.config?.[key.replace(/\./g, '$')] : null) ?? global.Hydro.model.system.get(key);
     }
 }
 

packages/hydrooj/src/service/check.ts

@@ -13,9 +13,11 @@ export class CheckService extends Service {
     checkers: Dictionary<CheckItem> = {};
     c = {};
     addChecker(type: string, checkFunc: CheckItem) {
+        this.ctx.effect(() => {
             this.checkers[`check${type}`] = checkFunc;
-        this[Context.current]?.on('dispose', () => {
+            return () => {
                 delete this.checkers[`check${type}`];
+            };
         });
     }
 

packages/hydrooj/src/service/worker.ts

@@ -72,9 +72,11 @@ export class WorkerService extends Service {
     }
 
     public addHandler(type: string, handler: Function) {
+        this.ctx.effect(() => {
             this.handlers[type] = handler;
-        this[Context.current]?.on('dispose', () => {
+            return () => {
                 delete this.handlers[type];
+            };
         });
     }
 

packages/vjudge/src/index.ts

@@ -194,9 +194,7 @@ class VJudgeService extends Service {
         }
         // FIXME: potential race condition
         if (provider.Langs) this.updateLangs(type, provider.Langs);
-        this[Context.current]?.on('dispose', () => {
         // TODO dispose session
-        });
     }
 
     async updateLangs(provider: string, mapping: Record<string, Partial<LangConfig>>) {