优化用户使用便携性

Author: NOTF-API

dependencies/IsaacBoxUtility.exe

@@ -1,5 +1,5 @@
 WEBSOCKET_PORT = 58869
-VERSION = "0.3.1"
+VERSION = "0.3.2"
 Mod = RegisterMod("IsaacBox", 1)
 local callbacks = require("modules.callbacks")
 

dependencies/isaac_box/main.lua

@@ -2,6 +2,6 @@
   <name>IsaacBox(auto installed)</name>
   <directory>isaac_box</directory>
   <description />
-  <version>0.3.1</version>
+  <version>0.3.2</version>
   <visibility />
 </metadata>

dependencies/isaac_box/metadata.xml

@@ -1,23 +1,23 @@
 local websocket = require("modules.websocket")
 local bridge = require("modules.bridge")
 local font = Font()
-local green = KColor(0, 1, 0, 1)
-local white = KColor(1, 1, 1, 1)
 font:Load("font/cjk/lanapixel.fnt")
 
 local function onPostRender()
   if IsaacSocket == nil or not IsaacSocket.IsConnected() then
     -- 因为IsaacSocket已经做了提示，故无需提示。
   elseif websocket.state.connecting then
-    font:DrawStringScaledUTF8("[IsaacBox]正在尝试连接...如果失败请检查IsaacBox是否已经开启", 2, 28, 0.5,
-      0.5,
-      green, 0, false)
+    -- 静悄悄地，不要告诉用户，不然扎眼
   elseif not websocket.state.ready then
     websocket.init(WEBSOCKET_PORT)
   else
-    font:DrawStringScaledUTF8("[IsaacBox] Version:" .. (VERSION), 216, 0, 0.5,
-      0.5,
-      white, 0, false)
+    if not websocket.state.shown then
+      local game = Game()
+      local hud = game:GetHUD()
+      hud:ShowItemText("IsaacBox", "Version:" .. VERSION)
+      print("IsaacBox Version:" .. VERSION)
+      websocket.state.shown = true
+    end
     if bridge.UpdateAllCollectibles() then
       websocket.emit("OFFER_ITEMS", require("json").encode(Items))
     end

dependencies/isaac_box/modules/callbacks.lua

@@ -1,7 +1,8 @@
 local state = {
   connection = nil,
   ready = false,
-  connecting = false
+  connecting = false,
+  shown = false
 }
 
 local function emit(topic, message)
@@ -45,17 +46,17 @@ local function callbackOnMessage(messageReceieved, isBinary)
 end
 
 local function callbackOnClose(closeStatus, statusDescription)
-  --   print("Websocket connection closed: ", closeStatus, statusDescription)
   state.connection = nil
   state.ready = false
   state.connecting = false
+  state.shown = false
 end
 
 local function callbackOnError(message)
-  --   print("Websocket connection error: ", message)
   state.connection = nil
   state.ready = false
   state.connecting = false
+  state.shown = false
 end
 
 local function init(port)

dependencies/isaac_box/modules/websocket.lua

@@ -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 = "0.3.1"
+const TARGET_ISAAC_BOX_MOD_VERSION = "0.3.2"
 
 const ISAAC_SOCKET_MOD_DIRNAME = "isaac_socket"
 const ISAAC_SOCKET_OFFICIAL_MOD_NAME = "IsaacSocket"
@@ -138,40 +138,6 @@ const getGameDirectorySync = () => {
   })
 }
 
-/**
- * Waits for the game to launch.
- *
- * @return {Promise} A promise that resolves when the game launches.
- *                   Rejects with an error if there was an error launching the game.
- */
-const waitForGameLaunch = () => {
-  return new Promise((resolve, reject) => {
-    cp.execFile("./dependencies/IsaacBoxUtility.exe", ['-W'], (error) => {
-      if (!error) {
-        resolve();
-      }
-      reject(error)
-    })
-  })
-}
-
-/**
- * Kills the game process.
- *
- * @return {Promise} A promise that resolves when the game process is killed, or rejects with an error if there was an error killing the process.
- */
-const killGameProcess = () => {
-  return new Promise((resolve, reject) => {
-    cp.execFile("./dependencies/IsaacBoxUtility.exe", ['-K'], (error, stdout, stderr) => {
-      if (!error) {
-        resolve();
-      }
-      reject(error)
-    })
-  })
-}
-
-
 const openIsaacSocketUtility = () => {
   return new Promise((resolve,reject)=>{
     if(!fs.existsSync("./dependencies/IsaacSocketUtility/IsaacSocket.exe")){
@@ -192,7 +158,5 @@ module.exports = {
   getRequiredModsVersionInfo,
   patchMods,
   getGameDirectorySync,
-  waitForGameLaunch,
-  killGameProcess,
   openIsaacSocketUtility
 }

env.js

@@ -9,98 +9,64 @@ char exePath[MAX_PATH];
 DWORD GetGameProcessId();
 bool GetGameDirectory();
 void PrintGameDirectorySync();
-void KillGameProcess();
-void WaitForGameLaunch();
 
-
-int main(int argc, char* argv[])
+int main()
 {
-    if (argc <= 1)
-    {
-        return -1;
-    }
-    char* arg = argv[1];
-    if (strcmp(arg, "-D") == 0) {
-        PrintGameDirectorySync();
-    }
-    else if (strcmp(arg, "-K") == 0) {
-        KillGameProcess();
-    }
-    else if (strcmp(arg, "-W") == 0) {
-        WaitForGameLaunch();
-    }
-    return 0;
+  PrintGameDirectorySync();
+  return 0;
 }
 
-bool GetGameDirectory() {
-    DWORD gamePID = GetGameProcessId();
-    if (gamePID != 0) {
-        HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, gamePID);
-        if (hProcess == NULL) {
-            return false;
-        }
-        memset(exePath,0,sizeof(exePath));
-        DWORD result = GetModuleFileNameExA(hProcess, NULL, exePath, MAX_PATH);
-        CloseHandle(hProcess);
-        return result != 0;
+bool GetGameDirectory()
+{
+  DWORD gamePID = GetGameProcessId();
+  if (gamePID != 0)
+  {
+    HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, gamePID);
+    if (hProcess == NULL)
+    {
+      return false;
     }
-    return false;
+    memset(exePath, 0, sizeof(exePath));
+    DWORD result = GetModuleFileNameExA(hProcess, NULL, exePath, MAX_PATH);
+    CloseHandle(hProcess);
+    return result != 0;
+  }
+  return false;
 }
 
-void PrintGameDirectorySync() {
-    for (;;) {
-        if (GetGameDirectory()) {
-            printf("%s", exePath);
-            break;
-        }
-        Sleep(1000);
+void PrintGameDirectorySync()
+{
+  for (;;)
+  {
+    if (GetGameDirectory())
+    {
+      printf("%s", exePath);
+      break;
     }
+    Sleep(1000);
+  }
 }
 
-void WaitForGameLaunch() {
-    for (;;) {
-        if (GetGameProcessId()!=0) {
-            break;
+DWORD GetGameProcessId()
+{
+  DWORD processId = 0;
+  HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+  if (snapshot != INVALID_HANDLE_VALUE)
+  {
+    PROCESSENTRY32 processEntry;
+    processEntry.dwSize = sizeof(PROCESSENTRY32);
+    if (Process32First(snapshot, &processEntry))
+    {
+      do
+      {
+        if (wcscmp(processEntry.szExeFile, GAME_FILE_NAME) == 0)
+        {
+          processId = processEntry.th32ProcessID;
+          break;
         }
-        Sleep(1000);
-    }
-}
-
-DWORD GetGameProcessId() {
-	DWORD processId = 0;
-	HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-	if (snapshot != INVALID_HANDLE_VALUE) { 
-		PROCESSENTRY32 processEntry;
-		processEntry.dwSize = sizeof(PROCESSENTRY32);
-		if (Process32First(snapshot, &processEntry)) {
-			do {
-				if (wcscmp(processEntry.szExeFile, GAME_FILE_NAME) == 0) {
-					processId = processEntry.th32ProcessID;
-					break;
-				}
-			} while (Process32Next(snapshot, &processEntry));
-		}
-		CloseHandle(snapshot);
-	}
-	return processId;
-}
-
-void KillGameProcess() {
-    // 获取游戏进程的PID
-    DWORD gamePID = GetGameProcessId();
-    if (gamePID == 0) {
-        return;
+      } while (Process32Next(snapshot, &processEntry));
     }
-
-    // 打开游戏进程
-    HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, gamePID);
-    if (hProcess == NULL) {
-        return;
-    }
-
-    // 终止游戏进程
-    TerminateProcess(hProcess, 0);
-
-    // 关闭进程句柄
-    CloseHandle(hProcess);
-}
+    CloseHandle(snapshot);
+  }
+  return processId;
+}

exsrc/IsaacBoxUtility.cpp

@@ -7,8 +7,6 @@ const { getAllModsMetadata,
   getRequiredModsVersionInfo,
   patchMods,
   getGameDirectorySync,
-  //   waitForGameLaunch,
-  killGameProcess,
   openIsaacSocketUtility } = require("./env");
 
 let win;
@@ -111,11 +109,10 @@ const isPortTaken = (port) => {
   try {
     isPatched = await patchMods(gameDir, requiredMods)
     if (isPatched) {
-      await killGameProcess();
       dialog.showMessageBox({
         title: "提示",
         type: "info",
-        message: "所需MOD已经为您安装完成,请您手动重新启动游戏"
+        message: "所需MOD已经为您安装/更新完成,请您手动重新启动游戏"
       })
     }
   } catch (e) {

main.js

@@ -1,7 +1,7 @@
 {
   "name": "isaac-box",
   "private": true,
-  "version": "0.3.1",
+  "version": "0.3.2",
   "main": "main.js",
   "author": "NOTF-API",
   "description": "Isaac's Console Client based on IsaacSocket",