chore: remove deprecated constants and alias in config

Author: luoingly

backend/package.json

@@ -7,22 +7,23 @@
     "node": ">= 22.0.0"
   },
   "scripts": {
+    "build": "tsc && cp -r src/scripts dist/scripts",
+    "coverage": "nyc report --reporter=text-lcov > coverage.lcov",
+    "deploy:init": "cross-env NODE_ENV=production node setup.js",
+    "deploy:start": "npx pm2 start pm2.config.json",
     "dev": "concurrently \"npm run dev:app\" \"npm run dev:ws\" \"npm run dev:updater\" \"npm run dev:worker\"",
     "dev:app": "cross-env NODE_ENV=development nodemon -e ts,js --exec ts-node src/app.ts",
-    "dev:ws": "cross-env NODE_ENV=development nodemon -e ts,js --exec ts-node src/ws.ts",
     "dev:updater": "cross-env NODE_ENV=development nodemon -e ts,js --exec ts-node src/jobs/updater.ts",
     "dev:worker": "cross-env NODE_ENV=development nodemon -e ts,js --exec ts-node src/jobs/worker.ts",
-    "build": "tsc && cp -r src/scripts dist/scripts",
-    "start": "cross-env NODE_ENV=production node dist/app.js",
-    "deploy:init": "cross-env NODE_ENV=production node setup.js",
-    "deploy:start": "npx pm2 start pm2.config.json",
-    "pretest": "cross-env NODE_ENV=test ts-node test/pretest.ts",
-    "test": "cross-env-shell NODE_ENV=test \"ts-node test/pretest.ts && nyc ava && ts-node test/posttest.ts\"",
-    "report": "nyc report --reporter=html",
-    "posttest": "cross-env NODE_ENV=test ts-node test/posttest.ts",
+    "dev:ws": "cross-env NODE_ENV=development nodemon -e ts,js --exec ts-node src/ws.ts",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "coverage": "nyc report --reporter=text-lcov > coverage.lcov"
+    "posttest": "cross-env NODE_ENV=test ts-node test/posttest.ts",
+    "pretest": "cross-env NODE_ENV=test ts-node test/pretest.ts",
+    "report": "nyc report --reporter=html",
+    "start": "cross-env NODE_ENV=production node dist/app.js",
+    "test": "cross-env-shell NODE_ENV=test \"ts-node test/pretest.ts && nyc ava && ts-node test/posttest.ts\"",
+    "typecheck": "tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
     "@koa/router": "^15.3.0",

backend/src/config/index.ts

@@ -3,7 +3,6 @@ import type { OAuthClientConfig } from '../services/oauth'
 import { randomBytes } from 'node:crypto'
 import { env } from 'node:process'
 import dotenvFlow from 'dotenv-flow'
-import constants from '../utils/constants'
 
 dotenvFlow.config()
 
@@ -151,11 +150,4 @@ export const globalConfig: GlobalConfig = {
   submissionHeatmapTimezone: stringEnv('PTOJ_SUBMISSION_HEATMAP_TIMEZONE', 'Asia/Shanghai'),
 }
 
-const config = {
-  globalConfig,
-  ...globalConfig,
-  /** @deprecated */
-  ...constants,
-} as const
-
-export default config
+export default globalConfig

backend/src/config/setup.ts

@@ -1,11 +1,11 @@
 import path from 'node:path'
+import { UserPrivilege } from '@putongoj/shared'
 import fse from 'fs-extra'
-import config from '.'
 import ID from '../models/ID'
 import Problem from '../models/Problem'
 import User from '../models/User'
 import { passwordHash } from '../utils'
-import { privilege } from '../utils/constants'
+import { deploy } from '../utils/constants'
 
 export async function databaseSetup () {
   const tasks: Promise<any>[] = []
@@ -36,8 +36,8 @@ export async function databaseSetup () {
     tasks.push(
       new User({
         uid: 'admin',
-        pwd: passwordHash(config.deploy.adminInitPwd),
-        privilege: privilege.Root,
+        pwd: passwordHash(deploy.adminInitPwd),
+        privilege: UserPrivilege.Root,
       }).save(),
     )
   }

backend/src/controllers/news.ts

@@ -1,8 +1,8 @@
 import type { Context } from 'koa'
-import config from '../config'
 import { loadProfile } from '../middlewares/authn'
 import News from '../models/News'
 import { only } from '../utils'
+import { status } from '../utils/constants'
 
 /**
  * 预加载通知信息
@@ -30,7 +30,7 @@ const find = async (ctx: Context) => {
 
   const filter: Record<string, any> = {}
   if (!ctx.state.profile?.isAdmin) {
-    filter.status = config.status.Available
+    filter.status = status.Available
   }
 
   const list = await News.paginate(filter, {

backend/src/models/News.ts

@@ -1,8 +1,8 @@
 import type { Document, PaginateModel, Types } from 'mongoose'
 import type { NewsEntity } from '../types/entity'
 import mongoosePaginate from 'mongoose-paginate-v2'
-import config from '../config'
 import mongoose from '../config/db'
+import { status } from '../utils/constants'
 import ids from './ID'
 
 export interface NewsDocument extends Document<Types.ObjectId>, NewsEntity {}
@@ -39,7 +39,7 @@ const newsSchema = new mongoose.Schema({
   },
   status: {
     type: Number,
-    default: config.status.Available, // 默认新建的消息显示
+    default: status.Available, // 默认新建的消息显示
   },
   create: {
     type: Number,

backend/src/models/Problem.ts

@@ -2,8 +2,8 @@ import type { Document, PaginateModel, Types } from 'mongoose'
 import type { ProblemEntity } from '../types/entity'
 import type { TagDocument } from './Tag'
 import mongoosePaginate from 'mongoose-paginate-v2'
-import config from '../config'
 import mongoose from '../config/db'
+import { limitation, problemType, status } from '../utils/constants'
 import ID from './ID'
 
 export type ProblemDocument = Document<Types.ObjectId> & ProblemEntity
@@ -39,13 +39,13 @@ const problemSchema = new mongoose.Schema({
     type: Number,
     default: 1000,
     min: 100,
-    max: config.limitation.time,
+    max: limitation.time,
   },
   memory: {
     type: Number,
     default: 32768,
     min: 32768,
-    max: config.limitation.memory,
+    max: limitation.memory,
   },
   description: {
     type: String,
@@ -73,13 +73,13 @@ const problemSchema = new mongoose.Schema({
   },
   status: {
     type: Number,
-    enum: Object.values(config.status),
-    default: config.status.Reserve,
+    enum: Object.values(status),
+    default: status.Reserve,
   },
   type: {
     type: Number,
-    enum: Object.values(config.problemType),
-    default: config.problemType.Traditional,
+    enum: Object.values(problemType),
+    default: problemType.Traditional,
   },
   code: {
     type: String,

backend/src/models/User.ts

@@ -1,9 +1,8 @@
 import type { UserModel } from '@putongoj/shared'
 import type { Document, PaginateModel, Schema, Types } from 'mongoose'
-import { UserModelSchema } from '@putongoj/shared'
+import { UserModelSchema, UserPrivilege, UserPrivilegeValues } from '@putongoj/shared'
 import mongoosePaginate from 'mongoose-paginate-v2'
 import mongoose from '../config/db'
-import { privilege } from '../utils/constants'
 
 export interface UserEntity extends UserModel { }
 
@@ -36,8 +35,8 @@ const userSchema: Schema = new mongoose.Schema({
   },
   privilege: {
     type: Number,
-    enum: Object.values(privilege),
-    default: privilege.User,
+    enum: UserPrivilegeValues,
+    default: UserPrivilege.User,
   },
   nick: {
     type: String,
@@ -119,13 +118,13 @@ const userSchema: Schema = new mongoose.Schema({
 userSchema.plugin(mongoosePaginate)
 
 userSchema.virtual('isBanned').get(function (this: UserDocument): boolean {
-  return this.privilege === privilege.Banned
+  return this.privilege === UserPrivilege.Banned
 })
 userSchema.virtual('isAdmin').get(function (this: UserDocument): boolean {
-  return this.privilege >= privilege.Admin
+  return this.privilege >= UserPrivilege.Admin
 })
 userSchema.virtual('isRoot').get(function (this: UserDocument): boolean {
-  return this.privilege >= privilege.Root
+  return this.privilege >= UserPrivilege.Root
 })
 
 const User = mongoose.model<UserDocument, PaginateModel<UserDocument>>(

backend/src/utils/constants.ts

@@ -1,13 +1,6 @@
 import type { CourseRole } from '../types'
 import { ErrorCode } from '@putongoj/shared'
 
-export const privilege = Object.freeze({
-  Banned: 0,
-  User: 1,
-  Admin: 2,
-  Root: 3,
-})
-
 export const limitation = Object.freeze({
   time: 10 * 1000,
   memory: 256 * 1024,
@@ -88,7 +81,6 @@ export default Object.freeze({
   deploy,
   encrypt,
   limitation,
-  privilege,
   problemType,
   status,
   courseRoleNone,

backend/test/controllers/contest/admin.test.ts

@@ -1,8 +1,8 @@
 import test from 'ava'
 import supertest from 'supertest'
 import app from '../../../src/app'
-import config from '../../../src/config'
 import { encryptData } from '../../../src/services/crypto'
+import { deploy } from '../../../src/utils/constants'
 
 const server = app.listen()
 const request = supertest.agent(server)
@@ -25,7 +25,7 @@ test.before('Login as admin', async (t) => {
     .post('/api/account/login')
     .send({
       username: 'admin',
-      password: await encryptData(config.deploy.adminInitPwd),
+      password: await encryptData(deploy.adminInitPwd),
     })
 
   t.is(login.status, 200)

backend/test/controllers/contest/user.test.ts

@@ -2,8 +2,8 @@ import { ParticipationStatus } from '@putongoj/shared'
 import test from 'ava'
 import supertest from 'supertest'
 import app from '../../../src/app'
-import config from '../../../src/config'
 import { encryptData } from '../../../src/services/crypto'
+import { deploy } from '../../../src/utils/constants'
 import { userSeeds } from '../../seeds/user'
 
 const server = app.listen()
@@ -35,7 +35,7 @@ test.before('Setup: admin creates test contests and user logs in', async (t) =>
     .post('/api/account/login')
     .send({
       username: 'admin',
-      password: await encryptData(config.deploy.adminInitPwd),
+      password: await encryptData(deploy.adminInitPwd),
     })
   t.is(adminLogin.status, 200)
   t.true(adminLogin.body.success)