test: frp

chenfan0 · Oct 30, 2024 · fc97640 · fc97640
1 parent edff5e7
commit fc97640
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -10,8 +10,7 @@ files:
   - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
   - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
 asarUnpack:
-  - ./resources/iconTemplate.png
-  - ./resources/index.html
+  - ./resources/*
 win:
   target:
     - target: "nsis"
@@ -24,6 +23,8 @@ win:
       to: "Resources"
     - from: "./resources/index.html"
       to: "Resources"
+    - from: "./resources/*"
+      to: "Resources"
 nsis:
   oneClick: false
   artifactName: ${name}-${version}-${arch}.${ext}

diff --git a/resources/frpc.exe b/resources/frpc.exe
diff --git a/src/main/download-dep/index.ts b/src/main/download-dep/index.ts
@@ -169,5 +169,5 @@ async function makeSureFrpDependenciesExist(dirname: string) {
 
 export async function makeSureDependenciesExist(dirname: string) {
   await makeSureFfmpegDependenciesExist(dirname)
-  await makeSureFrpDependenciesExist(dirname)
+  // await makeSureFrpDependenciesExist(dirname)
 }
diff --git a/src/main/frpc/index.ts b/src/main/frpc/index.ts
@@ -195,13 +195,17 @@ export async function startFrpcProcess(
 
     writeLog('frpc', 'frpcConfigPath: ' + frpcConfigPath)
 
+    const resourcePath = is.dev
+      ? join(__dirname, '../../../resources/')
+      : process.resourcesPath
+
     const frpcPath = isMac
       ? isArm
-        ? join(userPath, 'frp-mac-arm64/frpc')
-        : join(userPath, 'frp-mac-amd64/frpc')
+        ? join(resourcePath, 'frp-mac-arm64/frpc')
+        : join(resourcePath, 'frp-mac-amd64/frpc')
       : isArm
-        ? join(userPath, 'frp-win-arm64/frpc.exe')
-        : join(userPath, 'frp-win-amd64/frpc.exe')
+        ? join(resourcePath, 'frpc.exe')
+        : join(resourcePath, 'frpc.exe')
 
     const frpcProcess = spawn(frpcPath, ['-c', frpcConfigPath])