调整类型标注以适应新版Lint

Author: qwertycxz

.github/workflows/ci.yml

@@ -1,55 +1,55 @@
-on: [push, pull_request]
-
-name: CI
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '14'
-    # see https://github.com/actions/cache/blob/main/examples.md#node---npm
-    - name: Get npm cache directory
-      id: npm-cache-dir
-      run: |
-        echo "::set-output name=dir::$(npm config get cache)"
-    - uses: actions/cache@v2
-      id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
-      with:
-        path: ${{ steps.npm-cache-dir.outputs.dir }}
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - run: npm update -g npm@latest
-    - run: npm install
-    - run: npm run ci-eslint
-
-  format:
-    name: Format
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '14'
-
-    # see https://github.com/actions/cache/blob/main/examples.md#node---npm
-    - name: Get npm cache directory
-      id: npm-cache-dir
-      run: |
-        echo "::set-output name=dir::$(npm config get cache)"
-    - uses: actions/cache@v2
-      id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
-      with:
-        path: ${{ steps.npm-cache-dir.outputs.dir }}
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - run: npm update -g npm@latest
-    - run: npm install
-    - run: npm run ci-format
+on: [push, pull_request]
+
+name: CI
+
+jobs:
+    lint:
+        name: Lint
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: "14"
+            # see https://github.com/actions/cache/blob/main/examples.md#node---npm
+            - name: Get npm cache directory
+              id: npm-cache-dir
+              run: |
+                  echo "::set-output name=dir::$(npm config get cache)"
+            - uses: actions/cache@v2
+              id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
+              with:
+                  path: ${{ steps.npm-cache-dir.outputs.dir }}
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - run: npm update -g npm@latest
+            - run: npm install
+            - run: npm run ci-eslint
+
+    format:
+        name: Format
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: "14"
+
+            # see https://github.com/actions/cache/blob/main/examples.md#node---npm
+            - name: Get npm cache directory
+              id: npm-cache-dir
+              run: |
+                  echo "::set-output name=dir::$(npm config get cache)"
+            - uses: actions/cache@v2
+              id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
+              with:
+                  path: ${{ steps.npm-cache-dir.outputs.dir }}
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - run: npm update -g npm@latest
+            - run: npm install
+            - run: npm run ci-format

.github/workflows/release.yaml

@@ -1,39 +1,39 @@
 name: Publish Docker image
 
 on:
-  release:
-    types: [published]
-  push:
-    branches:
-      - master
-      - main
-      - beta/*
-      - alpha/*
+    release:
+        types: [published]
+    push:
+        branches:
+            - master
+            - main
+            - beta/*
+            - alpha/*
 
 jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
+    push_to_registry:
+        name: Push Docker image to Docker Hub
+        runs-on: ubuntu-latest
+        steps:
+            - name: Check out the repo
+              uses: actions/checkout@v2
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+            - name: Log in to Docker Hub
+              uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+              with:
+                  username: ${{ secrets.DOCKER_HUB_USERNAME }}
+                  password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: thinkspiritlab/heng-client
+            - name: Extract metadata (tags, labels) for Docker
+              id: meta
+              uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+              with:
+                  images: thinkspiritlab/heng-client
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+            - name: Build and push Docker image
+              uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+              with:
+                  context: .
+                  push: true
+                  tags: ${{ steps.meta.outputs.tags }}
+                  labels: ${{ steps.meta.outputs.labels }}

.prettierignore

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

.prettierrc.json

@@ -1,5 +1,6 @@
 {
-    "tabWidth": 4,
     "endOfLine": "lf",
-    "singleQuote": false
+    "singleQuote": false,
+    "tabWidth": 4,
+    "trailingComma": "es5"
 }

README.md

@@ -100,7 +100,6 @@ npm run start # pm2 start ./dist/index.js --name judger
 
 对于 `Normal` 和 `Spj`，用户程序没有正常结束运行时，跳过执行结果判断程序。
 
-
 ## 其他
 
 ### spj 返回值及输出结果汇总
@@ -246,7 +245,6 @@ uoj：https://github.com/UniversalOJ/UOJ-System/blob/230738b770022cc6b882c42b67b
 
 pta: https://github.com/pintia/ljudge/tree/master/etc/ljudge
 
-
 ### todo
 
 - spj cache LRU

eslint.config.ts

@@ -1,25 +1,32 @@
 import js from "@eslint/js";
-import ts from "typescript-eslint";
-import importX from 'eslint-plugin-import-x';
+import ts, { configs } from "typescript-eslint";
+import importX from "eslint-plugin-import-x";
 import prettier from "eslint-plugin-prettier/recommended";
 export default ts.config({
     extends: [
         js.configs.recommended,
-        ...ts.configs.recommendedTypeChecked,
-        ...ts.configs.stylisticTypeChecked,
+        ...configs.recommendedTypeChecked,
+        ...configs.stylisticTypeChecked,
         importX.flatConfigs.recommended,
         importX.flatConfigs.typescript,
         prettier,
     ],
-    ignores: ["*.d.ts", "*.js"],
+    files: ["eslint.config.ts", "src/**/*.ts"],
     languageOptions: {
         parserOptions: {
             projectService: true,
-            tsconfigRootDir: import.meta.dirname,
+            tsconfigRootDir: __dirname, // FIXME: CommonJS
         },
     },
     rules: {
         "no-unused-vars": "off",
+        "@typescript-eslint/no-base-to-string": "off",
+        "@typescript-eslint/no-misused-promises": [
+            "warn",
+            {
+                checksVoidReturn: false,
+            },
+        ],
         "@typescript-eslint/no-unused-vars": ["warn"],
     },
 });

package-lock.json

@@ -26,6 +26,7 @@
         "@types/unzip-stream": "^0.3.4",
         "@types/validator": "^13.12.2",
         "@types/ws": "^8.5.13",
+        "@typescript-eslint/parser": "^8.19.0",
         "eslint": "^9.17.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-formatter-codeframe": "^7.32.1",
@@ -43,17 +44,17 @@
     "name": "heng-client",
     "repository": "https://github.com/ThinkSpiritLab/Heng-Client",
     "scripts": {
-        "build": "tsc",
-        "check:format": "prettier --check src/*.ts src/**/*.ts",
-        "check:lint": "eslint src -f codeframe",
-        "ci-eslint": "eslint src -f codeframe",
-        "ci-format": "prettier --check src/*.ts src/**/*.ts",
+        "build": "tsc -p tsconfig.build.json",
+        "check:format": "prettier --check .",
+        "check:lint": "eslint -f codeframe",
+        "ci-eslint": "eslint -f codeframe",
+        "ci-format": "prettier --check .",
         "dev": "ts-node-dev --respawn -- src/index.ts",
         "docker:build": "docker build -t thinkspiritlab/heng-client .",
         "docker:build:fresh": "docker build -t thinkspiritlab/heng-client --no-cache .",
         "docker:run": "docker run --cgroupns private --privileged -v $(pwd)/config.toml:/usr/src/app/config.toml heng-client",
         "docker:run:dev": "docker run --cgroupns private --privileged --network=\"host\" -v $(pwd)/config.toml:/usr/src/app/config.toml heng-client",
-        "format": "prettier -c ./src/**/*.ts --write",
+        "format": "prettier -c . --write",
         "lint": "eslint --fix",
         "start": "node dist/index.js"
     },