fix fetcher service

Author: pandadtdyy

package.json

@@ -6,8 +6,8 @@
     "packages/*"
   ],
   "scripts": {
-    "start:client": "node -r ./register.js packages/client/index.ts",
-    "start:server": "node -r ./register.js packages/server/index.ts",
+    "start:client": "node -r ./register.js packages/client/index.ts --debug",
+    "start:server": "node -r ./register.js packages/server/index.ts --debug",
     "lint": "eslint packages --ext js,ts,tsx,jsx",
     "build": "yarn build:ui:prod && node -r ./register.js build.ts",
     "build:pkg": "yarn build:ui:prod && node -r ./register.js build.ts && pkg dist/xcpc-tools.js --targets linux,macos,win --out-path dist/pkg"

packages/server/config.ts

@@ -85,4 +85,4 @@ export const saveConfig = () => {
 
 logger.info(`Config loaded from ${configPath}`);
 logger.info(`xcpc-tools version: ${version}`);
-if (!isClient && !exit) logger.info(`Server View User Info: admin/${config.viewPass}`);
+if (!isClient && !exit) logger.info(`Server View User Info: admin / ${config.viewPass}`);

packages/server/index.ts

@@ -24,11 +24,8 @@ try {
 async function applyServer(ctx: Context) {
     ctx.plugin(require('./service/server'));
     ctx.plugin((require('./service/db')).default);
-    if (config.type !== 'server') {
-        logger.info('Fetch mode: ', config.type);
-        ctx.plugin(require('./service/fetcher').fetchers[config.type]);
-    }
-    ctx.inject(['server', 'dbservice'], (c) => {
+    ctx.plugin(require('./service/fetcher'));
+    ctx.inject(['server', 'dbservice', 'fetcher'], (c) => {
         c.plugin(require('./handler/misc'));
         c.plugin(require('./handler/printer'));
         c.plugin(require('./handler/monitor'));

packages/server/service/fetcher.ts

@@ -7,8 +7,15 @@ import { Logger } from '../utils';
 const logger = new Logger('fetcher');
 const fetch = (url: string, type: 'get' | 'post' = 'get') => superagent[type](new URL(url, config.server).toString())
     .set('Authorization', config.token).set('Accept', 'application/json');
-
-class DomJudgeFetcher extends Service {
+export interface IBasicFetcher {
+    contest: Record<string, any>
+    cron(): Promise<void>
+    contestInfo(): Promise<boolean>
+    teamInfo?(): Promise<void>
+    balloonInfo?(all: boolean): Promise<void>
+    setBalloonDone?(bid: string): Promise<void>
+}
+class BasicFetcher extends Service implements IBasicFetcher {
     contest: any;
     constructor(ctx: Context) {
         super(ctx, 'fetcher', true);
@@ -23,6 +30,27 @@ class DomJudgeFetcher extends Service {
         await this.balloonInfo(first);
     }
 
+    async contestInfo() {
+        const old = this?.contest?.id;
+        this.contest = { name: 'No Contest', id: 'server-mode' };
+        return old === this.contest.id;
+    }
+
+    async teamInfo() {
+        logger.debug('Found 0 teams');
+    }
+
+    async balloonInfo(all) {
+        logger.debug(all ? 'Sync all balloons...' : 'Sync new balloons...');
+        logger.debug('Found 0 balloons in Server Mode');
+    }
+
+    async setBalloonDone(bid) {
+        logger.debug(`Balloon ${bid} set done`);
+    }
+}
+
+class DomJudgeFetcher extends BasicFetcher {
     async contestInfo() {
         const { body } = await fetch('/api/v4/contests?onlyActive=true');
         if (!body || !body.length) {
@@ -46,7 +74,7 @@ class DomJudgeFetcher extends Service {
         for (const team of teams) {
             await this.ctx.db.teams.update({ id: team.id }, { $set: team }, { upsert: true });
         }
-        logger.info(`Found ${teams.length} teams`);
+        logger.debug(`Found ${teams.length} teams`);
     }
 
     async balloonInfo(all) {
@@ -84,19 +112,25 @@ class DomJudgeFetcher extends Service {
                 },
             }, { upsert: true });
         }
-        logger.info(`Found ${balloons.length} balloons`);
+        logger.debug(`Found ${balloons.length} balloons`);
     }
 
     async setBalloonDone(bid) {
         await fetch(`/api/v4/contests/${this.contest.id}/balloons/${bid}/done`, 'post');
-        logger.info(`Balloon ${bid} set done`);
+        logger.debug(`Balloon ${bid} set done`);
     }
 }
 
 const fetcherList = {
+    server: BasicFetcher,
     domjudge: DomJudgeFetcher,
+    hydro: BasicFetcher, // TODO: HydroFetcher
 };
 
 export async function apply(ctx) {
-    if (config.token && config.server) ctx.plugin(fetcherList[config.type]);
+    if (config.type !== 'server') {
+        logger.info('Fetch mode: ', config.type);
+    }
+    ctx.provide('fetcher', undefined, true);
+    ctx.fetcher = await new fetcherList[config.type](ctx);
 }

packages/server/utils.ts

@@ -133,6 +133,7 @@ export async function remoteRunner(user: string, target: string, targetPort: str
 }
 
 export function decodeBinary(file: string) {
+    if (process.env.NODE_ENV === 'development') return Buffer.from(file, 'base64');
     const buf = decode(file);
     return gunzipSync(buf);
 }