fix build

Author: undefined-moe

build.ts

@@ -13,13 +13,18 @@ logger.info('Building...');
         outdir: path.join(process.cwd(), 'dist'),
         splitting: false,
         write: false,
-        minify: true,
+        tsconfig: path.resolve(process.cwd(), 'tsconfig.json'),
+        minify: false,
         entryPoints: [path.resolve(process.cwd(), 'packages/server/index.ts')],
         loader: {
             '.frontend': 'base64',
             '.ttf': 'base64',
             '.wasm': 'base64',
         },
+        alias: {
+            ws: `${path.dirname(require.resolve('ws/package.json'))}/index.js`,
+            saslprep: path.resolve(__dirname, 'saslprep.js'),
+        },
     });
     if (res.errors.length) console.error(res.errors);
     if (res.warnings.length) console.warn(res.warnings);

packages/server/config.ts

@@ -11,8 +11,13 @@ const isClient = process.argv.includes('--client');
 const configPath = path.resolve(process.cwd(), `config.${isClient ? 'client' : 'server'}.yaml`);
 fs.ensureDirSync(path.resolve(process.cwd(), 'data'));
 
+// eslint-disable-next-line import/no-mutable-exports
+export let exit: Promise<void> | null = null;
+
 if (!fs.existsSync(configPath)) {
-    const serverConfigDefault = `\
+    // eslint-disable-next-line no-promise-executor-return
+    exit = new Promise((resolve) => (async () => {
+        const serverConfigDefault = `\
 type: 
 viewPass: ${String.random(8)}
 server: 
@@ -23,18 +28,19 @@ secretRoute: ${String.random(12)}
 seatFile: /home/icpc/Desktop/seat.txt
 `;
 
-    const clientConfigDefault = yaml.dump({
-        server: '',
-        balloon: '',
-        printers: (await getPrinters()).map((p) => p.printer),
-        token: '',
-    });
-    fs.writeFileSync(configPath, isClient ? clientConfigDefault : serverConfigDefault);
-    logger.error('Config file generated, please fill in the config.yaml');
-    process.exit(1);
+        const clientConfigDefault = yaml.dump({
+            server: '',
+            balloon: '',
+            printers: await getPrinters().then((r) => r.map((p) => p.printer)).catch(() => []),
+            token: '',
+        });
+        fs.writeFileSync(configPath, isClient ? clientConfigDefault : serverConfigDefault);
+        logger.error('Config file generated, please fill in the config.yaml');
+        resolve();
+    })());
+    throw new Error();
 }
 
-const data = yaml.load(fs.readFileSync(configPath, 'utf8').toString());
 const serverSchema = Schema.object({
     viewPass: Schema.string().default(String.random(8)),
     server: Schema.string().role('url').required(),
@@ -52,12 +58,12 @@ const clientSchema = Schema.object({
     token: Schema.string().required().description('Token generated on server'),
     fonts: Schema.array(Schema.string()).default([]),
 });
-export const config = (isClient ? clientSchema : serverSchema)(data as any);
 
+export const config = (isClient ? clientSchema : serverSchema)(yaml.load(fs.readFileSync(configPath, 'utf8')) as any);
 export const saveConfig = () => {
     fs.writeFileSync(configPath, yaml.dump(config));
 };
 
 logger.info(`Config loaded from ${configPath}`);
 logger.info(`xcpc-tools version: ${version}`);
-if (!isClient) logger.info(`Server View User Info: admin/${config.viewPassword}`);
+if (!isClient && !exit) logger.info(`Server View User Info: admin/${config.viewPassword}`);

packages/server/index.ts

@@ -1,7 +1,6 @@
 import os from 'os';
 import path from 'path';
 import { Context } from 'cordis';
-import { config } from './config';
 import { fs, Logger } from './utils';
 
 Logger.levels.base = 3;
@@ -15,25 +14,29 @@ const app = new Context();
 const tmpdir = path.resolve(os.tmpdir(), 'xcpc-tools');
 fs.ensureDirSync(tmpdir);
 
+let config;
+try {
+    config = require('./config').config;
+} catch (e) { }
+
 async function applyServer(ctx: Context) {
-    fs.ensureDirSync(tmpdir);
-    await require('./service/server').apply(ctx);
-    await require('./service/db').apply(ctx);
+    ctx.plugin(await import('./service/server'));
+    ctx.plugin((await import('./service/db')).default);
     if (config.type !== 'server') {
         logger.info('Fetch mode: ', config.type);
-        await require('./service/fetcher').apply(ctx);
+        ctx.plugin(await import('./service/fetcher'));
     }
-    await require('./handler/misc').apply(ctx);
-    await require('./handler/printer').apply(ctx);
-    await require('./handler/monitor').apply(ctx);
-    await require('./handler/client').apply(ctx);
-    await require('./handler/balloon').apply(ctx);
-    await require('./handler/commands').apply(ctx);
+    ctx.plugin(await import('./handler/misc'));
+    ctx.plugin(await import('./handler/printer'));
+    ctx.plugin(await import('./handler/monitor'));
+    ctx.plugin(await import('./handler/client'));
+    ctx.plugin(await import('./handler/balloon'));
+    ctx.plugin(await import('./handler/commands'));
 }
 
 async function applyClient(ctx: Context) {
-    if (config.printers?.length) await require('./client/printer').apply(ctx);
-    if (config.balloon) await require('./client/balloon').apply(ctx);
+    if (config.printers?.length) ctx.plugin(await import('./client/printer'));
+    if (config.balloon) ctx.plugin(await import('./client/balloon'));
 }
 
 async function apply(ctx) {
@@ -49,4 +52,4 @@ async function apply(ctx) {
     await ctx.parallel('app/ready');
 }
 
-apply(app);
+if (config) apply(app);

packages/server/interface.ts

@@ -13,22 +13,6 @@ declare module 'cordis' {
 
 export type VoidReturn = Promise<any> | any;
 
-export interface ToolsConfig {
-    type: string;
-    endpoint: string;
-    contestId: string;
-    uname: string;
-    password: string;
-}
-
-export interface Tools {
-    contest: {
-        info: any,
-        id: string,
-        name: string,
-    },
-}
-
 export interface PrintCodeDoc {
     _id: string;
     tid: string;

saslprep.js

@@ -0,0 +1 @@
+export default (str) => str;