重构部分代码，增加标题提示

NOTF-API · NOTF-API · commit 51372f274f03 · 2023-11-24T00:13:12.000+08:00
diff --git a/app.config.commonjs.js b/app.config.commonjs.js
@@ -0,0 +1,3 @@
+module.exports = {
+    WEBSOCKET_PORT: 58869
+}
diff --git a/app.config.js b/app.config.js
@@ -0,0 +1,3 @@
+export const VERSION = `1.2.1`
+export const WEBSOCKET_PORT = 58869
+export const TITLE = `Isaac's Box 以撒的盒子外置控制台 简体中文版 V${VERSION}`
diff --git a/dependencies/isaac_box/main.lua b/dependencies/isaac_box/main.lua
@@ -1,5 +1,5 @@
 WEBSOCKET_PORT = 58869
-MOD_VERSION = "1.0.0"
+MOD_VERSION = "1.1"
 Mod = RegisterMod("IsaacBox", 1)
 local callbacks = require("modules.callbacks")
 
diff --git a/dependencies/isaac_box/metadata.xml b/dependencies/isaac_box/metadata.xml
@@ -2,6 +2,6 @@
   <name>IsaacBox(auto installed)</name>
   <directory>isaac_box</directory>
   <description />
-  <version>1.0.0</version>
+  <version>1.1</version>
   <visibility />
 </metadata>
diff --git a/env.js b/env.js
@@ -6,7 +6,7 @@ const parseString = promisify(require('xml2js').parseString);
 
 const ISAAC_BOX_MOD_DIRNAME = "isaac_box"
 const ISAAC_BOX_MOD_NAME = "IsaacBox(auto installed)"
-const TARGET_ISAAC_BOX_MOD_VERSION = "1.0.0"
+const TARGET_ISAAC_BOX_MOD_VERSION = "1.1"
 
 const ISAAC_SOCKET_MOD_DIRNAME = "isaac_socket"
 const ISAAC_SOCKET_OFFICIAL_MOD_NAME = "IsaacSocket"
@@ -146,7 +146,7 @@ const openIsaacSocketUtility = () => {
       console.log("IsaacSocket.exe not found");
       reject();
     }
-    cp.execFile("./dependencies/IsaacSocketUtility/IsaacSocket.exe", ["-silent"], (error) => {
+    cp.execFile("./dependencies/IsaacSocketUtility/IsaacSocket.exe", ["-silent","-noupdate"], (error) => {
       if (error) {
         reject(error)
       }
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Isaac's Box</title>
+  <title></title>
 </head>
 
 <body oncontextmenu="return false">
diff --git a/main.js b/main.js
@@ -2,6 +2,7 @@ const { BrowserWindow, app, dialog } = require("electron");
 const net = require('net');
 const path = require("path")
 const { initServer } = require("./server/index")
+const { WEBSOCKET_PORT } = require("./app.config.commonjs")
 
 const { getAllModsMetadata,
   getRequiredModsVersionInfo,
@@ -25,7 +26,7 @@ const createMainWindow = () => {
     }
   })
   win.menuBarVisible = false
-  //   win.webContents.openDevTools() // 打开electron控制台
+  // win.webContents.openDevTools() // 打开electron控制台
   win.loadFile(path.join(__dirname, "dist", "index.html"))
   win.on("ready-to-show", () => {
     win.show();
@@ -49,18 +50,17 @@ const isPortTaken = (port) => {
 }
 
 (async () => {
-  const PORT = 58869
   await app.whenReady();
-  if (await isPortTaken(PORT)) {
+  if (await isPortTaken(WEBSOCKET_PORT)) {
     dialog.showMessageBoxSync({
       title: "警告",
-      message: `工具所需要使用的端口${PORT}已被占用，无法开启工具`,
+      message: `工具所需要使用的端口${WEBSOCKET_PORT}已被占用,无法开启工具.您可能是开启了第二个应用,请勿重复开启`,
       type: "warning"
     })
     app.quit();
     return;
   }
-  initServer(PORT);
+  initServer(WEBSOCKET_PORT);
   win = createMainWindow();
 
   let gameDir;
@@ -70,8 +70,9 @@ const isPortTaken = (port) => {
   catch (e) {
     dialog.showMessageBoxSync({
       title: "错误",
-      message: `无法获取游戏目录，请检查IsaacBoxUtility.exe是否被杀毒软件删除或限制访问。
-      您可以手动复制dependencies文件夹下的isaac_box与isaac_socket目录到游戏MOD目录，然后重新启动游戏.
+      message: `无法获取游戏目录,请检查IsaacBoxUtility.exe是否被杀毒软件删除或限制访问.
+      您可以手动复制dependencies文件夹下的isaac_box与isaac_socket目录到游戏MOD目录,然后重新启动游戏.
+      如果您已经手动复制了MOD,但是依旧提示,可以忽略该提示.
       请确保游戏内只有一个IsaacBox和IsaacSocket MOD,否则无法正常运行!`,
       type: "error"
     })
@@ -84,9 +85,7 @@ const isPortTaken = (port) => {
   } catch (e) {
     dialog.showMessageBoxSync({
       title: "错误",
-      message: `无法获取所有MOD信息.
-      您可以手动复制dependencies文件夹下的isaac_box与isaac_socket目录到游戏MOD目录,
-      然后重新启动游戏.请确保游戏内只有一个IsaacBox和IsaacSocket MOD,否则无法正常运行!`,
+      message: `无法获取所有MOD信息,请检查您的游戏版本是否正确,当前仅支持忏悔版本.`,
       type: "error"
     })
     return;
@@ -98,8 +97,8 @@ const isPortTaken = (port) => {
   } catch (e) {
     dialog.showMessageBoxSync({
       title: "错误",
-      message: `无法读取您是否安装了必须的MOD，您可以手动复制dependencies文件夹下的isaac_box与isaac_socket目录到游戏MOD目录,
-      然后重新启动游戏.请确保游戏内只有一个IsaacBox和IsaacSocket MOD,否则无法正常运行!`,
+      message: `无法读取您是否安装了必须的MOD,您可以手动复制dependencies文件夹下的isaac_box与isaac_socket目录到游戏MOD目录,
+      然后重新启动游戏.如果已手动安装,请忽略该提示.`,
       type: "error"
     })
     return;
@@ -119,23 +118,12 @@ const isPortTaken = (port) => {
     dialog.showMessageBoxSync({
       title: "错误",
       message: `无法安装所需MOD.您可以手动复制dependencies文件夹下的isaac_box与isaac_socket目录到游戏MOD目录,
-      然后重新启动游戏.请确保游戏内只有一个IsaacBox和IsaacSocket MOD,否则无法正常运行!`,
-      type: "error"
-    })
-    return;
-  }
-
-  try {
-    await openIsaacSocketUtility();
-  }
-  catch (e) {
-    dialog.showMessageBoxSync({
-      title: "错误",
-      message: `无法打开IsaacSocket连接工具，请检查.NET环境是否安装或IsaacSocketUtility.exe是否被杀毒软件删除或限制访问,或者请以管理员权限打开。如果无法解决，请手动开启dependencies/IsaacSocketUtility/IsaacSocket.exe 并在游戏运行时保持开启状态。`,
+      然后重新启动游戏.请尝试管理员权限运行该程序,或关闭杀毒软件`,
       type: "error"
     })
     return;
   }
+  openIsaacSocketUtility();
 })();
 
 
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
     "dev": "vite",
     "build": "vite build",
     "start": "vite build && electron main.js",
-    "make": "electron-forge make && ./makeDependencies.bat"
+    "preview": "electron main.js",
+    "make": "vite build && electron-forge make && ./makeDependencies.bat"
   },
   "dependencies": {
     "electron-squirrel-startup": "^1.0.0",
diff --git a/server/console.js b/server/console.js
diff --git a/server/context.js b/server/context.js
@@ -1,7 +1,6 @@
 const context = {
   consoleSocket: null,
   gameSocket: null,
-  enableForward: false
 }
 
 module.exports = { context };
diff --git a/server/handler.js b/server/handler.js
@@ -1,5 +1,4 @@
 const { context } = require("./context.js")
-const { debugConsole } = require("./console.js")
 const handler = {
   callbacksMap: new Map(),
   /**
@@ -71,58 +70,50 @@ const emitToGame = (topic, message) => {
 }
 
 handler.on("JOIN_AS_GAME", (ws, message) => {
+  // console.log("SERVER ON:JOIN_AS_GAME")
   context.gameSocket = ws;
-  debugConsole("game ready");
   if (context.consoleSocket) {
-    debugConsole("and console is ready");
     emitToConsole("GAME_READY")
   }
 })
 
 handler.on("JOIN_AS_CONSOLE", (ws, message) => {
+  // console.log("SERVER ON:JOIN_AS_CONSOLE")
   if (context.consoleSocket !== null) {
-    debugConsole("console is already in use");
     emit(ws, "CONSOLE_ALREADY_IN_USE");
     return;
   }
   context.consoleSocket = ws;
   if (context.gameSocket == null) {
-    debugConsole("console is ready,waiting for game");
     emit(ws, "GAME_NOT_READY");
   } else {
-    debugConsole("console is ready and game is ready too");
     emitToConsole("GAME_READY")
   }
 })
 
 //以下为需要转发的内容
 handler.on("COMMAND", (ws, message) => {
   if (context.gameSocket == null) {
-    debugConsole("game not ready while redirect command");
     return;
   }
   emitToGame("COMMAND", message)
 })
 
 handler.on("GET_ITEMS", (ws, message) => {
-//   debugConsole("redirecting GET_ITEMS");
-    //因为这个消息只会由console发送过来，因此无需判断console是否为空
+  //因为这个消息只会由console发送过来，因此无需判断console是否为空
   if (context.gameSocket == null) {
-    // debugConsole("some part not ready while redirect GET_ITEMS");
     return;
   }
   emitToGame("GET_ITEMS")
 })
 
 handler.on("OFFER_ITEMS", (ws, message) => {
-  // debugConsole("redirecting OFFER_ITEMS");
   if (context.consoleSocket == null) {
     //因为这个消息只会由game发送过来，因此无需判断game是否为空
-    // debugConsole("some part not ready while redirect OFFER_ITEMS");
     return;
   }
   emitToConsole("OFFER_ITEMS", message)
 })
 
 
-module.exports = { handler };
+module.exports = { handler, emit, emitToConsole, emitToGame };
diff --git a/server/index.js b/server/index.js
@@ -1,8 +1,8 @@
 
 const { WebSocketServer } = require("ws")
 const { context } = require("./context.js")
-const { handler } = require("./handler.js")
-const { debugConsole } = require("./console.js")
+const { handler, emitToConsole } = require("./handler.js")
+const { WEBSOCKET_PORT } = require("../app.config.commonjs.js")
 
 const initServer = (port) => {
   const server = new WebSocketServer({ port });
@@ -22,24 +22,20 @@ const initServer = (port) => {
         console.log(e)
         console.warn("[warn] error while parsing json of data: " + data.toString())
       }
-
     });
     ws.on("close", () => {
-      if (ws === context.game) {
+      if (ws === context.gameSocket) {
         context.gameSocket = null;
-        context.enableForward = false;
-        debugConsole("game left,stop forward");
-        context.consoleSocket?.send("GAME_LEFT")
+        // console.log("SERVER ON CLOSE AND EMIT TO CONSOLE GAME_LEFT")
+        emitToConsole("GAME_LEFT")
       } else if (ws === context.consoleSocket) {
         context.consoleSocket = null;
-        context.enableForward = false;
-        debugConsole("console left,stop forward");
       } else {
 
       }
     })
   });
-  console.log("ws listening on ws://localhost:58869")
+  console.log(`ws listening on ws://localhost:${WEBSOCKET_PORT}`)
 }
 
 module.exports = {
diff --git a/src/main.js b/src/main.js
@@ -5,8 +5,10 @@ import App from './App.vue'
 import { initResources } from '@/utils/resources'
 import { initI18n } from '@/utils/i18n'
 import { disableTab } from '@/utils/keys'
+import { TITLE } from '../app.config'
 
 const init = async () => {
+  document.title = TITLE;
   disableTab();
   const i18n = initI18n();
   await initResources();
diff --git a/src/utils/i18n.js b/src/utils/i18n.js
@@ -1,5 +1,6 @@
 
 import { createI18n } from 'vue-i18n'
+import { VERSION } from '../../app.config'
 
 const I18N_TYPE_KEY = "i18n"
 
@@ -41,7 +42,7 @@ export const getIndexByI18nType = (i18nType) => {
   }
 }
 
-const $VERSION_TEXT = "V1.1.1"
+const $VERSION_TEXT = `V${VERSION}`
 
 const messages = {
   // [I18N_TYPE.ENGLISH]: {
diff --git a/src/utils/ws.js b/src/utils/ws.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = {`
	`2`	`+ WEBSOCKET_PORT: 58869`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+export const VERSION = `1.2.1`
	`2`	`+export const WEBSOCKET_PORT = 58869`
	`3`	+export const TITLE = `Isaac's Box 以撒的盒子外置控制台简体中文版 V${VERSION}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`const context = {`
`2`	`2`	`consoleSocket: null,`
`3`	`3`	`gameSocket: null,`
`4`		`- enableForward: false`
`5`	`4`	`}`
`6`	`5`
`7`	`6`	`module.exports = { context };`