Merge pull request #416 from OpenWebGAL/dev

4.5.13

Author: MakinoharaShoko

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-terre",
-  "version": "4.5.12",
+  "version": "4.5.13",
   "private": true,
   "scripts": {
     "dev": "concurrently \"yarn dev:terre\" \"yarn dev:origine\" \"yarn dev:start-dev-server\"",
@@ -31,7 +31,7 @@
     "iconv-lite": "^0.6.3"
   },
   "engines": {
-    "node": "18"
+    "node": ">=18"
   },
   "packageManager": "yarn@1.22.22"
 }

packages/WebGAL-electron/main.js

@@ -57,11 +57,18 @@ const createWindow = () => {
 
         logMessage(message);
     });
+    
+    /**
+	 * 侦听BrowserWindow关闭事件
+	 */
+	win.on("close", () => {
+		app.quit();
+	});
 }
 
 /**
  * 在关闭所有窗口时退出应用
  */
 app.on('window-all-closed', () => {
     if (process.platform !== 'darwin') app.quit()
-})
+})

packages/origine2/package.json

@@ -1,12 +1,12 @@
 {
   "name": "webgal-origine-2",
   "private": true,
-  "version": "4.5.12",
+  "version": "4.5.13",
   "license": "MPL-2.0",
   "scripts": {
     "dev": "lingui extract && lingui compile --typescript && vite --host",
-    "build": "lingui extract && lingui compile --typescript && node version-sync.js && tsc && vite build --base=./",
-    "build-lowram": "lingui extract && lingui compile --typescript && node version-sync.js && tsc && node --max_old_space_size=512000 ./node_modules/bin/vite build --base=./",
+    "build": "lingui extract && lingui compile --typescript && tsc && vite build --base=./",
+    "build-lowram": "lingui extract && lingui compile --typescript && tsc && node --max_old_space_size=512000 ./node_modules/bin/vite build --base=./",
     "preview": "vite preview",
     "lint": "eslint src/** --fix",
     "openapi": "tsx openapi.ts",
@@ -79,6 +79,7 @@
     "swagger-typescript-api": "^13.0.3",
     "tsx": "^3.14.0",
     "typescript": "^4.6.3",
+    "unplugin-info": "^1.2.1",
     "vite": "^4.4.9"
   }
 }

packages/origine2/src/App.tsx

@@ -44,42 +44,7 @@ function App() {
 
   // 建立 WS 连接
   useEffect(() => {
-    try {
-      const loc: string = window.location.hostname;
-      const protocol: string = window.location.protocol;
-      const port: string = window.location.port; // 获取端口号
 
-      // 默认情况下，不需要在URL中明确指定标准HTTP(80)和HTTPS(443)端口
-      let defaultPort = '';
-      if (port && port !== '80' && port !== '443') {
-        // 如果存在非标准端口号，将其包含在URL中
-        defaultPort = `:${port}`;
-      }
-
-      if (protocol !== 'http:' && protocol !== 'https:') {
-        return;
-      }
-
-      // 根据当前协议构建WebSocket URL，并包括端口号（如果有）
-      let wsUrl = `ws://${loc}${defaultPort}/api/webgalsync`;
-      if (protocol === 'https:') {
-        wsUrl = `wss://${loc}${defaultPort}/api/webgalsync`;
-      }
-
-      console.log('正在启动socket连接位于：' + wsUrl);
-      const socket = new WebSocket(wsUrl);
-      socket.onopen = () => {
-        console.log('socket已连接');
-        socket.send('WebGAL Origine 已和 Terre 建立连接');
-      };
-      socket.onmessage = (e) => {
-        eventBus.emit('get-ws-message', e.data);
-      };
-      // @ts-ignore
-      window['currentWs'] = socket;
-    } catch (e) {
-      console.warn('ws连接失败');
-    }
   }, []);
 
   useHashRoute();

packages/origine2/src/config/info.ts

@@ -1,9 +1,12 @@
+import { version } from '~build/package';
+import now from '~build/time';
+
 export interface Info {
   version: string,
-  buildTime: string,
+  buildTime: Date,
 }
 
 export const __INFO: Info = {
-  version: '4.5.12',
-  buildTime: '2025-03-01T14:52:34.009Z', // 编译时会通过 version-sync.js 自动更新
+  version,
+  buildTime: now,
 };