chore: small changes

Author: surunzi

.gitignore

@@ -1,12 +1,10 @@
 node_modules/
 dist/
 release/
-/adb
+resources/
 package-lock.json
 
 .gradle/
 .idea/
 server/**/build/
 local.properties
-aya.dex
-scrcpy.jar

package.json

@@ -87,6 +87,6 @@
     "vite": "^5.4.9",
     "webm-muxer": "^5.1.2",
     "xml2js": "^0.6.2",
-    "zx": "^8.1.9"
+    "zx": "^8.8.0"
   }
 }

script/adb.mjs

@@ -3,7 +3,7 @@ import isMac from 'licia/isMac.js'
 import normalizePath from 'licia/normalizePath.js'
 import path from 'path'
 
-const adbDir = resolve(__dirname, '../adb')
+const adbDir = resolve(__dirname, '../resources/adb')
 
 await fs.ensureDir(adbDir)
 

script/build.mjs

@@ -15,9 +15,7 @@ await $`npm run build:preload`
 await $`npm run build:renderer`
 
 await fs.copy('build', 'dist/build')
-await fs.copy('adb', 'dist/adb')
-await fs.copy('server/aya.dex', 'dist/server/aya.dex')
-await fs.copy('server/scrcpy.jar', 'dist/server/scrcpy.jar')
+await fs.copy('resources', 'dist/resources')
 cd('dist')
 
 await fs.writeJson('package.json', pkg, {

script/pack.mjs

@@ -15,9 +15,13 @@ const config = {
   directories: {
     output: `../release/${pkg.version}`,
   },
-  files: ['main', 'preload', 'renderer', 'adb', 'server'],
-  asarUnpack: ['adb/**/*', 'server/**/*'],
+  files: ['main', 'preload', 'renderer'],
   artifactName: '${productName}-${version}-${os}-${arch}.${ext}',
+  extraResources: {
+    from: 'resources',
+    to: './',
+    filter: ['**/*'],
+  },
   nsis: {
     allowToChangeInstallationDirectory: true,
     oneClick: false,

script/scrcpy.mjs

@@ -4,5 +4,5 @@ import normalizePath from 'licia/normalizePath.js'
 const version = '3.1'
 const url = `https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}`
 
-const scrcpyDir = normalizePath(path.resolve(__dirname, '../server'))
+const scrcpyDir = normalizePath(path.resolve(__dirname, '../resources'))
 await $`curl -Lk ${url} > ${scrcpyDir}/scrcpy.jar`

script/server.mjs

@@ -1,3 +1,4 @@
 $.verbose = true
 cd('server')
 await $`./gradlew :server:assembleRelease`
+await fs.move('aya.dex', '../resources/aya.dex')

src/main/lib/adb.ts

@@ -1,7 +1,7 @@
 import { app } from 'electron'
 import Adb, { Client, Device } from '@devicefarmer/adbkit'
 import androidDeviceList from 'android-device-list'
-import { resolveUnpack, handleEvent } from 'share/main/lib/util'
+import { resolveResources, handleEvent } from 'share/main/lib/util'
 import map from 'licia/map'
 import types from 'licia/types'
 import filter from 'licia/filter'
@@ -307,7 +307,7 @@ async function inputKey(deviceId: string, keyCode: number) {
 }
 
 async function openAdbCli() {
-  let cwd = resolveUnpack('adb')
+  let cwd = resolveResources('adb')
   const adbPath = settingsStore.get('adbPath')
   if (!isStrBlank(adbPath) && fs.existsSync(adbPath)) {
     cwd = path.dirname(adbPath)

src/main/lib/adb/base.ts

@@ -10,7 +10,7 @@ import toNum from 'licia/toNum'
 import types from 'licia/types'
 import isStr from 'licia/isStr'
 import log from 'share/common/log'
-import { handleEvent, resolveUnpack } from 'share/main/lib/util'
+import { handleEvent, resolveResources } from 'share/main/lib/util'
 import isWindows from 'licia/isWindows'
 import isStrBlank from 'licia/isStrBlank'
 import fs from 'fs-extra'
@@ -178,7 +178,9 @@ export function setDeviceStore(deviceId: string, key: string, value: any) {
 }
 
 export function getAdbPath() {
-  let bin = isWindows ? resolveUnpack('adb/adb.exe') : resolveUnpack('adb/adb')
+  let bin = isWindows
+    ? resolveResources('adb/adb.exe')
+    : resolveResources('adb/adb')
   const adbPath = settingsStore.get('adbPath')
   if (adbPath === 'adb' || (!isStrBlank(adbPath) && fs.existsSync(adbPath))) {
     bin = adbPath

src/main/lib/adb/scrcpy.ts

@@ -1,5 +1,5 @@
 import { Client } from '@devicefarmer/adbkit'
-import { handleEvent, resolveUnpack } from 'share/main/lib/util'
+import { handleEvent, resolveResources } from 'share/main/lib/util'
 import { getDeviceStore, setDeviceStore } from './base'
 import log from 'share/common/log'
 
@@ -35,7 +35,7 @@ class ScrcpyClient {
 
     const device = client.getDevice(this.deviceId)
     await device.push(
-      resolveUnpack('server/scrcpy.jar'),
+      resolveResources('scrcpy.jar'),
       '/data/local/tmp/aya/scrcpy.jar'
     )
   }