Merge branch 'v1'

Author: pandadtdyy

.eslintignore

@@ -0,0 +1,2 @@
+dist
+node_modules

.github/workflows/release.yml

@@ -34,6 +34,8 @@ jobs:
       - run: yarn
       - name: Build
         run: yarn build:pkg
+      - name: Copy Origin Bundle to Dist
+        run: cp dist/xcpc-tools.js /tmp/xcpc-tools-bundle.js
       - name: Create Zip for Windows
         run: zip -r /tmp/xcpc-tools-win.zip dist/pkg/xcpc-tools-win.exe
       - name: Create Tar for MacOS
@@ -50,6 +52,7 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.version }}-${{ steps.tag.outputs.sha_short }}
           files: |
+            /tmp/xcpc-tools-bundle.js
             /tmp/xcpc-tools-win.zip
             /tmp/xcpc-tools-macos.tar.gz
             /tmp/xcpc-tools-linux.tar.gz

.gitignore

@@ -17,8 +17,6 @@ config.*.json
 data/
 yarn.lock
 pnpm-lock.yaml
-tsconfig.json
-tsconfig.*.json
 
 .yarn/cache
 .yarn/build-state.yml

build.ts

@@ -1,10 +1,21 @@
 /* eslint-disable import/no-dynamic-require */
 import path from 'path';
+import zlib from 'zlib';
+import { encode } from 'base16384';
 import esbuild from 'esbuild';
+import { chunk } from 'lodash';
 import { fs, Logger } from '@hydrooj/utils';
 
 const logger = new Logger('build');
 logger.info('Building...');
+
+function encodeBinary(a: Buffer) {
+    const file = zlib.gzipSync(a);
+    return chunk([...encode(file)], 1000).map((i) => String.fromCodePoint(...i)).join('');
+}
+
+const nopMap = '//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIiJdLCJtYXBwaW5ncyI6IkEifQ==';
+
 (async () => {
     fs.ensureDirSync(path.resolve(process.cwd(), 'dist'));
     const res = await esbuild.build({
@@ -13,12 +24,30 @@ logger.info('Building...');
         outdir: path.join(process.cwd(), 'dist'),
         splitting: false,
         write: false,
+        tsconfig: path.resolve(process.cwd(), 'tsconfig.json'),
         minify: true,
-        entryPoints: [path.resolve(process.cwd(), 'entry.ts')],
-        loader: {
-            '.frontend': 'base64',
-            '.ttf': 'base64',
-            '.wasm': 'base64',
+        entryPoints: [path.resolve(process.cwd(), 'packages/server/index.ts')],
+        charset: 'utf8',
+        sourcemap: 'inline',
+        plugins: [{
+            name: 'base16384',
+            setup(b) {
+                b.onLoad({ filter: /\.(frontend|ttf|wasm)$/, namespace: 'file' }, (t) => {
+                    const file = fs.readFileSync(path.join(t.path));
+                    return {
+                        contents: `module.exports = "${encodeBinary(file)}";\n${nopMap}`,
+                        loader: 'tsx',
+                    };
+                });
+                b.onLoad({ filter: /node_modules\/.+\.js$/ }, (t) => ({
+                    contents: `${fs.readFileSync(t.path, 'utf8')}\n${nopMap}`,
+                    loader: 'default',
+                }));
+            },
+        }],
+        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);

entry.ts

@@ -6,21 +6,24 @@
     "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/server/index.ts --client --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:server": "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"
   },
   "devDependencies": {
     "@expo-google-fonts/noto-color-emoji": "^0.2.3",
     "@expo-google-fonts/noto-sans-sc": "^0.2.3",
-    "@hydrooj/eslint-config": "^1.0.7",
-    "@hydrooj/utils": "^1.4.17",
-    "@types/node": "^20.10.5",
+    "@hydrooj/eslint-config": "^1.0.10",
+    "@hydrooj/register": "^1.0.1",
+    "@hydrooj/utils": "^1.4.24",
+    "@types/node": "^20.14.2",
+    "@yao-pkg/pkg": "^5.12.0",
     "dejavu-fonts-ttf": "^2.37.3",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "pkg": "^5.8.1",
     "typescript": "^5.3.3"
   },
   "resolutions": {