next: esbuild loader

packages/hydrooj/bin/hydrooj.js

@@ -1,11 +1,40 @@
 #!/usr/bin/env node
 
+/* eslint-disable consistent-return */
+
 const os = require('os');
 const path = require('path');
 const cluster = require('cluster');
 const fs = require('fs-extra');
 const argv = require('cac')().parse();
 const child = require('child_process');
+const esbuild = require('esbuild');
+
+let transformTimeUsage = 0;
+let displayTimeout;
+function transform(type, filename) {
+    const start = new Date();
+    const result = esbuild.buildSync({
+        entryPoints: [filename],
+        sourcemap: 'inline',
+        platform: 'node',
+        format: 'cjs',
+        target: `node${process.version.split('.')[0].split('v')[1]}`,
+        jsx: 'transform',
+        write: false,
+    });
+    if (result.warnings.length) console.warn(result.warnings);
+    transformTimeUsage += new Date().getTime() - start.getTime();
+    if (displayTimeout) clearTimeout(displayTimeout);
+    displayTimeout = setTimeout(() => console.log(`Code transform took ${transformTimeUsage}ms`), 1000);
+    return result.outputFiles[0].text;
+}
+require.extensions['.ts'] = function loader(module, filename) {
+    return module._compile(transform('ts', filename), filename);
+};
+require.extensions['.tsx'] = function loader(module, filename) {
+    return module._compile(transform('tsx', filename), filename);
+};
 
 function buildUrl(opts) {
     let mongourl = `${opts.protocol || 'mongodb'}://`;
@@ -16,7 +45,7 @@ function buildUrl(opts) {
 }
 
 if (!cluster.isMaster) {
-    const hydro = require('../dist/loader');
+    const hydro = require('../src/loader');
     // Forked by hydro
     hydro.load().catch((e) => {
         console.error(e);
@@ -78,7 +107,7 @@ if (!cluster.isMaster) {
             fs.writeFileSync(addonPath, JSON.stringify(addons, null, 2));
         }
     } else {
-        const hydro = require('../dist/loader');
+        const hydro = require('../src/loader');
         addons = Array.from(new Set(addons));
         for (const addon of addons) hydro.addon(addon);
         (argv.args[0] === 'cli' ? hydro.loadCli : hydro.load)().catch((e) => {

packages/hydrooj/package.json

@@ -2,8 +2,8 @@
     "name": "hydrooj",
     "version": "2.29.46",
     "bin": "bin/hydrooj.js",
-    "main": "dist/loader.js",
-    "typings": "dist/loader.d.ts",
+    "main": "src/loader",
+    "module": "src/loader",
     "repository": "https://github.com/hydro-dev/Hydro.git",
     "author": "undefined <i@undefined.moe>",
     "license": "AGPL-3.0-or-later",

packages/hydrooj/src/entry/common.ts

@@ -46,7 +46,8 @@ function getFiles(folder: string, base = ''): string[] {
 
 export async function handler(pending: string[], fail: string[]) {
     for (const i of pending) {
-        const p = path.resolve(i, 'handler.js');
+        let p = path.resolve(i, 'handler.ts');
+        if (!fs.existsSync(p)) p = path.resolve(i, 'handler.js');
         if (fs.existsSync(p) && !fail.includes(i)) {
             try {
                 logger.info('Handler init: %s', i);
@@ -161,7 +162,8 @@ export async function uistatic(pending: string[], fail: string[]) {
 
 export async function model(pending: string[], fail: string[]) {
     for (const i of pending) {
-        const p = path.resolve(i, 'model.js');
+        let p = path.resolve(i, 'model.ts');
+        if (!fs.existsSync(p)) p = path.resolve(i, 'model.js');
         if (fs.existsSync(p) && !fail.includes(i)) {
             try {
                 logger.info('Model init: %s', i);
@@ -178,7 +180,8 @@ export async function model(pending: string[], fail: string[]) {
 
 export async function lib(pending: string[], fail: string[]) {
     for (const i of pending) {
-        const p = path.resolve(i, 'lib.js');
+        let p = path.resolve(i, 'lib.ts');
+        if (!fs.existsSync(p)) p = path.resolve(i, 'lib.js');
         if (fs.existsSync(p) && !fail.includes(i)) {
             try {
                 logger.info('Lib init: %s', i);
@@ -195,7 +198,8 @@ export async function lib(pending: string[], fail: string[]) {
 
 export async function service(pending: string[], fail: string[]) {
     for (const i of pending) {
-        const p = path.resolve(i, 'service.js');
+        let p = path.resolve(i, 'service.ts');
+        if (!fs.existsSync(p)) p = path.resolve(i, 'service.js');
         if (fs.existsSync(p) && !fail.includes(i)) {
             try {
                 logger.info('Service init: %s', i);
@@ -216,7 +220,8 @@ export async function service(pending: string[], fail: string[]) {
 
 export async function script(pending: string[], fail: string[], active: string[]) {
     for (const i of pending) {
-        const p = path.resolve(i, 'script.js');
+        let p = path.resolve(i, 'script.ts');
+        if (!fs.existsSync(p)) p = path.resolve(i, 'script.js');
         if (await fs.pathExists(p) && !fail.includes(i)) {
             try {
                 logger.info('Script init: %s', i);

packages/hydrooj/src/init.ts

@@ -0,0 +1,37 @@
+
+
+const versionNum = +process.version.replace(/v/gim, '').split('.')[0];
+if (versionNum < 14) throw new Error('NodeJS >=v14 required');
+
+
+if (!global.Hydro) {
+    global.Hydro = {
+        version: {
+            node: process.version,
+            hydrooj: require('hydrooj/package.json').version,
+        },
+        stat: { reqCount: 0 },
+        handler: {},
+        // @ts-ignore
+        service: {},
+        // @ts-ignore
+        model: {},
+        script: {},
+        // @ts-ignore
+        lib: {},
+        // @ts-ignore
+        ui: {
+            manifest: {},
+            nodes: {
+                nav: [],
+                problem_add: [],
+                user_dropdown: [],
+            },
+            template: {},
+        },
+        // @ts-ignore
+        error: {},
+        locales: {},
+    };
+    global.addons = [];
+}

packages/hydrooj/src/loader.ts

@@ -1,64 +1,25 @@
-import 'reflect-metadata';
-/* eslint-disable import/first */
-/* eslint-disable no-continue */
 /* eslint-disable import/no-dynamic-require */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-eval */
-
-const versionNum = +process.version.replace(/v/gim, '').split('.')[0];
-if (versionNum < 14) throw new Error('NodeJS >=v14 required');
-
-import cac from 'cac';
-
-const argv = cac().parse();
-
-if (argv.options.debug) {
-    process.env.NODE_ENV = 'development';
-    process.env.DEV = 'on';
-} else process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-
-if (!global.Hydro) {
-    global.Hydro = {
-        version: {
-            node: process.version,
-            hydrooj: require('hydrooj/package.json').version,
-        },
-        stat: { reqCount: 0 },
-        handler: {},
-        // @ts-ignore
-        service: {},
-        // @ts-ignore
-        model: {},
-        script: {},
-        // @ts-ignore
-        lib: {},
-        // @ts-ignore
-        ui: {
-            manifest: {},
-            nodes: {
-                nav: [],
-                problem_add: [],
-                user_dropdown: [],
-            },
-            template: {},
-        },
-        // @ts-ignore
-        error: {},
-        locales: {},
-    };
-    global.addons = [];
-}
+import 'reflect-metadata';
+import './init';
 import './interface';
 import os from 'os';
 import path from 'path';
 import cluster from 'cluster';
 import fs from 'fs-extra';
 import './utils';
+import cac from 'cac';
 import { Logger } from './logger';
 import './ui';
 import * as bus from './service/bus';
 
 export * from './interface';
+const argv = cac().parse();
+if (argv.options.debug) {
+    process.env.NODE_ENV = 'development';
+    process.env.DEV = 'on';
+} else process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 const logger = new Logger('loader');
 logger.debug('%o', argv);
 

packages/hydrooj/src/ui.ts

@@ -42,6 +42,7 @@ if (cluster.isMaster) {
     });
     if (process.env.NODE_ENV !== 'test') {
         process.stdin.setEncoding('utf-8');
+        process.stdin.setRawMode(false);
         process.stdin.on('data', (buf) => {
             const input = buf.toString();
             if (input[0] === '@') {