Merge pull request #12 from wsrh8888/feature-rh

Feature rh

Author: wsrh8888

.gitignore

@@ -17,7 +17,6 @@ dist/*
 cache/*
 
 # Editor directories and files
-.vscode/*
 !.vscode/extensions.json
 .idea
 .DS_Store
@@ -33,4 +32,5 @@ plugins/*
 output/*.exe
 config.json
 config.json
-package-lock.json
+package-lock.json
+BEAVER_CACHE/*

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "files.associations": {
+    "build/shell/**/*.nsi": "nsis",
+    "build/shell/**/*.nsh": "nsis"
+  },
+  "[nsis]": {
+    "files.encoding": "gb2312"
+  }
+}

build/installer/index.bat

@@ -34,6 +34,8 @@ echo %BUILD% > %VERSION_FILE%
 
 powershell -Command "((Get-Content -Path '%WORKSPACE%\package.json' -Raw) | ConvertFrom-Json).version = '%VERSION%'; $_ | ConvertTo-Json -Depth 32 | Set-Content -Path '%WORKSPACE%\package.json' -Force"
 
+echo %VERSION% > %WORKSPACE%\release\win-unpacked\version
+
 %NSISPATH% /DVERSION=%VERSION% /DRESOURCEDIR=%WORKSPACE%\release\win-unpacked /DOUTPUTDIR=%WORKSPACE%\output\beaver_%VERSION%.exe %NSISCRIPT%
 
 endlocal

build/shell/beaver.nsi

@@ -63,7 +63,7 @@ Section "MainSection" SEC01
 
   WriteUninstaller "$INSTDIR\uninstall.exe"
 
-  CreateShortcut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\beaver.exe" "$INSTDIR\app.ico"
+  CreateShortcut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electron\beaver.exe" "$INSTDIR\electron\app.ico"
 
   WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME} ${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstall.exe"

build/shell/include/beaver.nsh

@@ -3,7 +3,7 @@
 
 !macro REGISTER_BEAVER install_path version
     WriteRegStr ${PRODUCT_ROOT_KEY} "${DAEMON_DIR_REGKEY}" "install path" "${install_path}"
-    WriteRegStr ${PRODUCT_ROOT_KEY} "${DAEMON_DIR_REGKEY}" "exe path" "${install_path}\\beaver.exe"
+    WriteRegStr ${PRODUCT_ROOT_KEY} "${DAEMON_DIR_REGKEY}" "exe path" "${install_path}\\electron\\beaver.exe"
     WriteRegStr ${PRODUCT_ROOT_KEY} "${DAEMON_DIR_REGKEY}" "version" "${version}"
 
     ${WordFind} "${install_path}" "\\AppData" +1 $R0
@@ -17,7 +17,7 @@
 !macroend
 
 !macro INSTALL_BEAVER install_path resource_path version
-    SetOutPath "${install_path}"
+    SetOutPath "${install_path}\electron"
     File /r "${resource_path}\\*.*"
 !macroend
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "beaver",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "description": "beaverIM",
   "author": "Robert",

src/main/cache/index.ts

@@ -7,7 +7,7 @@ import type { CacheType } from 'commonModule/type/cache/cache'
 import type { DownloadedFileInfo } from 'mainModule/utils/file/download'
 import * as path from 'node:path'
 import { previewOnlineFileApi } from 'mainModule/api/file'
-import { getRootPath } from 'mainModule/config'
+import { getCachePath, getRootPath } from 'mainModule/config'
 import { downloadFile } from 'mainModule/utils/file/download'
 import dBServicemediaCache  from '../database/services/media/media'
 import { calculateFileMD5, createDir, deleteFile, fileExists, getFileSize } from '../utils/file'
@@ -33,7 +33,7 @@ class MediaManager {
   private cacheFile: Record<string, string> = {}
 
   constructor() {
-    this.cacheRoot = path.join(getRootPath(), 'cache')
+    this.cacheRoot = getCachePath()
   }
 
   init(userId?: string) {

src/main/config/index.ts

@@ -1,20 +1,23 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { app } from 'electron'
 import ini from 'ini'
 import { machineIdSync } from 'node-machine-id'
 
 export const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 export const getCachePath = () => {
-  return path.resolve(getRootPath(), 'cache')
+  return path.resolve(getRootPath(), 'BEAVER_CACHE')
 }
 
 export const getRootPath = () => {
   if (process.env.NODE_ENV === 'development') {
     return path.resolve(__dirname, '../')
   }
-  return path.resolve(__dirname, '../../../')
+  // 获取 exe 文件的目录，然后取其父目录（因为 exe 在 electron 子目录下）
+  const exePath = app.getPath('exe')
+  return path.dirname(path.dirname(exePath))
 }
 
 export function initCustom() {
@@ -66,5 +69,6 @@ export const getExePath = () => {
   if (process.env.NODE_ENV === 'development') {
     return path.resolve(__dirname, '../')
   }
-  return path.resolve(__dirname, '../../../')
+  // 获取 exe 文件的目录（因为 version 文件在安装根目录）
+  return path.dirname(app.getPath('exe'))
 }

src/main/ipc/render-to-main/updater/index.ts

@@ -6,7 +6,7 @@ import { UpdateCommand } from 'commonModule/type/ipc/command'
 import { shell } from 'electron'
 import { previewOnlineFileApi } from 'mainModule/api/file'
 import { cacheTypeToFilePath } from 'mainModule/cache/config'
-import { getRootPath } from 'mainModule/config'
+import { getCachePath, getRootPath } from 'mainModule/config'
 import dBServicemediaCache from 'mainModule/database/services/media/media'
 import { downloadFile } from 'mainModule/utils/download/index'
 import logger from 'mainModule/utils/log'
@@ -42,7 +42,7 @@ class UpdaterHandler {
       logger.info({ text: '开始下载更新', data: { fileKey, md5, version } }, 'UpdaterHandler')
 
       // 获取升级缓存目录（绝对路径）
-      const cacheRoot = path.join(getRootPath(), 'cache')
+      const cacheRoot = getCachePath()
       const updateDir = path.join(cacheRoot, cacheTypeToFilePath[CacheType.PUBLIC_UPDATE])
 
       // 构建完整的文件路径（直接使用 fileKey 作为文件名）
@@ -93,7 +93,7 @@ class UpdaterHandler {
       logger.info({ text: '开始升级', data: { fileKey, md5, version } }, 'UpdaterHandler')
 
       // 根据data中的信息构建文件路径（绝对路径）
-      const cacheRoot = path.join(getRootPath(), 'cache')
+      const cacheRoot = getCachePath()
       const updateDir = path.join(cacheRoot, cacheTypeToFilePath[CacheType.PUBLIC_UPDATE])
       const filePath = path.join(updateDir, fileKey)
 

src/main/main.ts

@@ -16,6 +16,12 @@ process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = 'true'
 
 class Main {
   constructor() {
+    // 单例检查 - 如果已经有实例运行，直接返回
+    if (!this.checkSingleInstance()) {
+      return
+    }
+
+    // 只有当前实例是唯一的才继续初始化
     this.initUa()
     initCustom()
     loadConfigs()
@@ -64,6 +70,19 @@ class Main {
     })
   }
 
+  checkSingleInstance() {
+    // 检查是否已经有实例在运行
+    const gotTheLock = app.requestSingleInstanceLock()
+
+    if (!gotTheLock) {
+      // 如果已经有实例在运行，直接退出
+      app.quit()
+      return false
+    }
+
+    return true
+  }
+
   initUa() {
     const customIdentifier = generateUserAgentIdentifier()
     app.userAgentFallback = `${app.userAgentFallback || ''} ${customIdentifier}`.trim()