From a718a83cd6e88b57f8bc95e9fc37e632d5ac8756 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 13 Jan 2022 20:54:11 +0800
Subject: [PATCH] core: version list

---
 packages/hydrooj/package.json                   | 2 +-
 packages/hydrooj/src/init.ts                    | 2 +-
 packages/hydrooj/src/loader.ts                  | 4 ++++
 packages/ui-default/handler.ts                  | 1 -
 packages/ui-default/package.json                | 2 +-
 packages/ui-default/templates/layout/html5.html | 8 ++++----
 packages/vjudge/package.json                    | 2 +-
 packages/vjudge/src/providers/luogu.ts          | 4 ++--
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index ec50a4c38..bdbc359b9 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.3.9",
+    "version": "3.3.10",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
diff --git a/packages/hydrooj/src/init.ts b/packages/hydrooj/src/init.ts
index 656787860..daa617739 100644
--- a/packages/hydrooj/src/init.ts
+++ b/packages/hydrooj/src/init.ts
@@ -8,7 +8,7 @@ console.log('Process', process.pid, 'running as', process.env.NODE_APP_INSTANCE
 if (!global.Hydro) {
     global.Hydro = {
         version: {
-            node: process.version,
+            node: process.version.split('v')[1],
             hydrooj: require('hydrooj/package.json').version,
         },
         handler: {},
diff --git a/packages/hydrooj/src/loader.ts b/packages/hydrooj/src/loader.ts
index ff7e7cabd..45bf71d64 100644
--- a/packages/hydrooj/src/loader.ts
+++ b/packages/hydrooj/src/loader.ts
@@ -29,6 +29,10 @@ export function addon(addonPath: string, prepend = false) {
         try {
             // Is a npm package
             const packagejson = require.resolve(`${addonPath}/package.json`);
+            // eslint-disable-next-line import/no-dynamic-require
+            const payload = require(packagejson);
+            const name = payload.name.startsWith('@hydrooj/') ? payload.name.split('@hydrooj/')[1] : payload.name;
+            global.Hydro.version[name] = payload.version;
             const modulePath = path.dirname(packagejson);
             const publicPath = path.resolve(modulePath, 'public');
             if (fs.existsSync(publicPath)) {
diff --git a/packages/ui-default/handler.ts b/packages/ui-default/handler.ts
index fd3602f92..9f671e777 100644
--- a/packages/ui-default/handler.ts
+++ b/packages/ui-default/handler.ts
@@ -12,7 +12,6 @@ import markdown from './backendlib/markdown';
 const {
   system, user, setting, problem, contest,
 } = global.Hydro.model;
-global.Hydro.version.ui = require('./package.json').version;
 
 const pages = Object.keys(global.Hydro.ui.manifest)
   .filter((file) => file.endsWith('.page.js'))
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index d79db5558..010f6ee72 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.29.7",
+  "version": "4.29.8",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/templates/layout/html5.html b/packages/ui-default/templates/layout/html5.html
index 6a88a3659..2de9aa388 100644
--- a/packages/ui-default/templates/layout/html5.html
+++ b/packages/ui-default/templates/layout/html5.html
@@ -25,15 +25,15 @@
   <meta property="og:image" content="{{ static_url('favicon-96x96.png') }}" />
   {% endblock %}
   {% if not isIE(handler.request.headers['user-agent']) %}
-    <script src="{{ static_url((handler.user|default({})).theme|default('default') + '.theme.js') }}?version={{ global.Hydro.version.ui }}"></script>
+    <script src="{{ static_url((handler.user|default({})).theme|default('default') + '.theme.js') }}?version={{ global.Hydro.version['ui-default'] }}"></script>
     <script type="text/javascript" src="{{ static_url('l/'+handler.user.viewLang) }}"></script>
     {% if process.env.DEV %}
-      <script type="text/javascript" src="{{ static_url('hydro.js') }}?version={{ global.Hydro.version.ui }}"></script>
+      <script type="text/javascript" src="{{ static_url('hydro.js') }}?version={{ global.Hydro.version['ui-default'] }}"></script>
     {% else %}
-      <script type="text/javascript" src="{{ static_url('hydro-'+global.Hydro.version.ui+'.js') }}"></script>
+      <script type="text/javascript" src="{{ static_url('hydro-'+global.Hydro.version['ui-default']+'.js') }}"></script>
     {% endif %}
   {% endif %}
-  <link rel="stylesheet" media="all" href="{{ static_url((handler.user|default({})).theme|default('default') + '.theme.css') }}?version={{ global.Hydro.version.ui }}">
+  <link rel="stylesheet" media="all" href="{{ static_url((handler.user|default({})).theme|default('default') + '.theme.css') }}?version={{ global.Hydro.version['ui-default'] }}">
   <title>{{ handler.renderTitle(page_name) }}</title>
   {% if not isIE(handler.request.headers['user-agent']) %}
   <script>
diff --git a/packages/vjudge/package.json b/packages/vjudge/package.json
index e38663701..e2dec7c69 100644
--- a/packages/vjudge/package.json
+++ b/packages/vjudge/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/vjudge",
-    "version": "1.4.10",
+    "version": "1.4.11",
     "description": "Submit problems to remote oj",
     "main": "package.json",
     "repository": "https://github.com/hydro-dev/Hydro.git",
diff --git a/packages/vjudge/src/providers/luogu.ts b/packages/vjudge/src/providers/luogu.ts
index 195097de2..a8572d0f4 100644
--- a/packages/vjudge/src/providers/luogu.ts
+++ b/packages/vjudge/src/providers/luogu.ts
@@ -31,8 +31,8 @@ const STATUS_MAP = [
 ];
 
 const UA = [
-    `Hydro/${require('hydrooj/package.json').version}`,
-    `Vjudge/${require('@hydrooj/vjudge/package.json').version}`,
+    `Hydro/${global.Hydro.version.hydrooj}`,
+    `Vjudge/${global.Hydro.version.vjudge}`,
 ].join(' ');
 
 export default class LuoguProvider implements IBasicProvider {