geoip: use context.service

packages/hydrooj/src/context.ts

@@ -1,6 +1,6 @@
 import * as cordis from 'cordis';
 import Schema from 'schemastery';
-import { ModuleInterfaces } from './interface';
+import { GeoIP, ModuleInterfaces } from './interface';
 import { inject } from './lib/ui';
 import { Loader } from './loader';
 import { EventMap } from './service/bus';
@@ -33,6 +33,7 @@ export interface Context {
     inject: typeof inject;
     api: ApiMixin;
     broadcast: Context['emit'];
+    geoip?: GeoIP;
 }
 
 export class Context extends cordis.Context {

packages/hydrooj/src/handler/home.ts

@@ -1,6 +1,7 @@
 import yaml from 'js-yaml';
 import { ObjectID } from 'mongodb';
 import { camelCase } from '@hydrooj/utils/lib/utils';
+import { Context } from '../context';
 import {
     BlacklistedError, DomainAlreadyExistsError, InvalidTokenError,
     NotFoundError, PermissionError, UserAlreadyExistError,
@@ -9,6 +10,7 @@ import {
 import { DomainDoc, MessageDoc, Setting } from '../interface';
 import avatar from '../lib/avatar';
 import * as mail from '../lib/mail';
+import * as useragent from '../lib/useragent';
 import { isDomainId, isEmail, isPassword } from '../lib/validator';
 import BlackListModel from '../model/blacklist';
 import { PERM, PRIV } from '../model/builtin';
@@ -28,8 +30,6 @@ import {
 } from '../service/server';
 import { md5 } from '../utils';
 
-const { geoip, useragent } = global.Hydro.lib;
-
 export class HomeHandler extends Handler {
     uids = new Set<number>();
 
@@ -147,6 +147,7 @@ export class HomeHandler extends Handler {
     }
 }
 
+let geoip: Context['geoip'] = null;
 class HomeSecurityHandler extends Handler {
     async get() {
         // TODO(iceboy): pagination? or limit session count for uid?
@@ -154,17 +155,18 @@ class HomeSecurityHandler extends Handler {
         for (const session of sessions) {
             session.isCurrent = session._id === this.session._id;
             session._id = md5(session._id);
-            if (useragent) session.updateUa = useragent.parse(session.updateUa || session.createUa || '');
-            if (geoip) {
-                session.updateGeoip = geoip.lookup(
-                    session.updateIp || session.createIp,
-                    this.translate('geoip_locale'),
-                );
-            }
+            session.updateUa = useragent.parse(session.updateUa || session.createUa || '');
+            session.updateGeoip = geoip?.lookup?.(
+                session.updateIp || session.createIp,
+                this.translate('geoip_locale'),
+            );
         }
         this.response.template = 'home_security.html';
-        this.response.body = { sessions, geoipProvider: geoip?.provider };
-        if (useragent) this.response.body.icon = useragent.icon;
+        this.response.body = {
+            sessions,
+            geoipProvider: geoip?.provider,
+            icon: useragent.icon,
+        };
     }
 
     @param('current', Types.String)
@@ -432,7 +434,10 @@ class HomeMessagesConnectionHandler extends ConnectionHandler {
     }
 }
 
-export async function apply(ctx) {
+export async function apply(ctx: Context) {
+    ctx.using(['geoip'], (g) => {
+        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/interface.ts

@@ -671,18 +671,17 @@ export interface ProblemSearchOptions {
 export type ProblemSearch = (domainId: string, q: string, options?: ProblemSearchOptions) => Promise<ProblemSearchResponse>;
 
 export interface Lib extends Record<string, any> {
-    difficulty: typeof import('./lib/difficulty'),
-    buildContent: typeof import('./lib/content').buildContent,
-    i18n: typeof import('./lib/i18n'),
-    mail: typeof import('./lib/mail'),
-    paginate: typeof import('./lib/paginate'),
-    rank: typeof import('./lib/rank'),
-    rating: typeof import('./lib/rating'),
-    testdataConfig: typeof import('./lib/testdataConfig'),
-    useragent: typeof import('./lib/useragent'),
-    validator: typeof import('./lib/validator'),
-    template?: any,
-    geoip?: GeoIP,
+    difficulty: typeof import('./lib/difficulty');
+    buildContent: typeof import('./lib/content').buildContent;
+    i18n: typeof import('./lib/i18n');
+    mail: typeof import('./lib/mail');
+    paginate: typeof import('./lib/paginate');
+    rank: typeof import('./lib/rank');
+    rating: typeof import('./lib/rating');
+    testdataConfig: typeof import('./lib/testdataConfig');
+    useragent: typeof import('./lib/useragent');
+    validator: typeof import('./lib/validator');
+    template?: any;
     problemSearch: ProblemSearch;
 }