feat: 添加 Termux 支持的简化命令和打包命令

fix: 优化 kill-by-port 脚本，直接调用 sudo 以简化权限管理

Author: cute-omega

README.md

@@ -443,6 +443,18 @@ cd $HOME/dev-sidecar/packages/gui
 NODE_OPTIONS="--require ${HOME:-/data/data/com.termux/files/home}/dev-sidecar/packages/gui/src/utils/os-network-fallback.cjs" \
 ELECTRON_FORCE_NO_SANDBOX=1 ELECTRON_NO_SANDBOX=1 ELECTRON_DISABLE_SANDBOX=1 \
 npm run electron
+
+或使用简化命令（在 packages/gui 目录下）：
+
+```bash
+pnpm run electron:termux
+```
+
+若需在 Termux 尝试打包（不保证成功，缺少桌面依赖时可能失败）：
+
+```bash
+pnpm run electron:build:termux
+```
 ```
 
 - 说明：

packages/core/src/shell/scripts/kill-by-port.js

@@ -4,48 +4,20 @@ const sudo = require('../sudo')
 const execute = Shell.execute
 
 const executor = {
-  async windows (exec, { port }) {
+  async windows(exec, { port }) {
     const killCmd = `for /f "tokens=5" %a in ('netstat -aon ^| find ":${port}" ^| find "LISTENING"') do (taskkill /f /pid %a & exit /B)`
-    try {
-      await exec([killCmd], { type: 'cmd' })
-      return true
-    } catch (e) {
-      const msg = String(e || '')
-      if (/Access is denied|not permitted|permission denied/i.test(msg)) {
-        // Re-run via sudo to trigger UAC elevation on Windows
-        await sudo(killCmd, { name: `KillByPort ${port}` })
-        return true
-      }
-      throw e
-    }
+    await sudo(killCmd, { name: `KillByPort ${port}` })
+    return true
   },
-  async linux (exec, { port }) {
+  async linux(exec, { port }) {
     const pidCmd = `lsof -i:${port} |grep 'dev-sidecar\\|electron\\|@docmirro' |awk '{print $2}'`
-    try {
-      await exec(`kill \`${pidCmd}\``)
-      return true
-    } catch (e) {
-      const msg = String(e || '')
-      if (/not permitted|Operation not permitted|permission denied/i.test(msg)) {
-        await sudo(`kill \`${pidCmd}\``, { name: `KillByPort ${port}` })
-        return true
-      }
-      throw e
-    }
+    await sudo(`kill \`${pidCmd}\``, { name: `KillByPort ${port}` })
+    return true
   },
-  async mac (exec, { port }) {
+  async mac(exec, { port }) {
     const pidCmd = `lsof -i:${port} |grep 'dev-side\\|Elect' |awk '{print $2}'`
-    try {
-      await exec(`kill \`${pidCmd}\``)
-      return true
-    } catch (e) {
-      const msg = String(e || '')
-      if (/not permitted|Operation not permitted|permission denied/i.test(msg)) {
-        await sudo(`kill \`${pidCmd}\``, { name: `KillByPort ${port}` })
-        return true
-      }
-      throw e
-    }
+    await sudo(`kill \`${pidCmd}\``, { name: `KillByPort ${port}` })
+    return true
   },
 }
 

packages/core/src/shell/sudo.js

@@ -4,24 +4,27 @@ const os = require('node:os')
 const sudoPrompt = require('@vscode/sudo-prompt')
 const log = require('../utils/util.log.core')
 
-function sudo (command, options = {}) {
-  const { name = 'DevSidecar', onStdout, onStderr } = options
+function sudo(command, options = {}) {
+    const { name = 'DevSidecar', onStdout, onStderr } = options
 
-  if (!['darwin', 'linux', 'win32'].includes(os.platform())) {
-    return Promise.reject(new Error('Unsupported platform for privileged operations'))
-  }
+    if (!['darwin', 'linux', 'win32'].includes(os.platform())) {
+        return Promise.reject(new Error('Unsupported platform for privileged operations'))
+    }
 
-  return new Promise((resolve, reject) => {
-    sudoPrompt.exec(command, { name }, (error, stdout = '', stderr = '') => {
-      if (stdout && onStdout) onStdout(stdout)
-      if (stderr && onStderr) onStderr(stderr)
-      if (error) {
-        log.error('[sudo] command failed:', command, error)
-        return reject(error)
-      }
-      resolve({ stdout, stderr })
+    return new Promise((resolve, reject) => {
+        sudoPrompt.exec(command, { name }, (error, stdout = '', stderr = '') => {
+            if (stdout && onStdout) onStdout(stdout)
+            if (stderr && onStderr) onStderr(stderr)
+            if (error) {
+                const msg = `[sudo] command failed or was denied. Command: ${command}`
+                log.error(msg, error)
+                const wrapped = new Error(`${msg} Please approve the prompt or run manually with elevated privileges.`)
+                wrapped.cause = error
+                return reject(wrapped)
+            }
+            resolve({ stdout, stderr })
+        })
     })
-  })
 }
 
 module.exports = sudo

packages/core/test/killByPortTest.js

@@ -1,7 +1,7 @@
 const assert = require('node:assert')
 const path = require('node:path')
 
-// Stub Shell.execute and sudo to test fallback without running real commands
+// Stub Shell.execute and sudo to test direct sudo invocation without running real commands
 const shellModulePath = path.join(__dirname, '../src/shell/index.js')
 const sudoModulePath = path.join(__dirname, '../src/shell/sudo.js')
 
@@ -13,14 +13,8 @@ require.cache[shellModulePath] = {
     filename: shellModulePath,
     loaded: true,
     exports: {
-        // Simulate linux execution path and a permission error on normal kill
-        execute: async (executor, _args) => {
-            const fakeExec = async () => {
-                const err = new Error('Operation not permitted')
-                throw err
-            }
-            return executor.linux(fakeExec, { port: 12345 })
-        },
+        // Simulate linux execution path; sudo should be called directly
+        execute: async (executor, _args) => executor.linux(async () => { }, { port: 12345 }),
         execFile: async () => { }
     }
 }
@@ -40,7 +34,7 @@ const killByPort = require('../src/shell/scripts/kill-by-port')
 
     (async () => {
         await killByPort({ port: 12345 })
-        assert.ok(sudoCalled, 'Expected sudo fallback to be called')
+        assert.ok(sudoCalled, 'Expected sudo to be called')
         assert.ok(/lsof -i:12345/.test(sudoCmd), 'Expected sudo command to target the specified port')
         console.log('killByPortTest passed: sudo fallback invoked as expected')
     })()

packages/gui/package.json

@@ -13,6 +13,8 @@
     "lint": "vue-cli-service lint",
     "electron:build": "vue-cli-service electron:build",
     "electron": "vue-cli-service electron:serve",
+    "electron:termux": "NODE_OPTIONS=\"--require ${HOME:-/data/data/com.termux/files/home}/dev-sidecar/packages/gui/src/utils/os-network-fallback.cjs\" ELECTRON_FORCE_NO_SANDBOX=1 ELECTRON_NO_SANDBOX=1 ELECTRON_DISABLE_SANDBOX=1 vue-cli-service electron:serve",
+    "electron:build:termux": "NODE_OPTIONS=\"--require ${HOME:-/data/data/com.termux/files/home}/dev-sidecar/packages/gui/src/utils/os-network-fallback.cjs\" ELECTRON_FORCE_NO_SANDBOX=1 ELECTRON_NO_SANDBOX=1 ELECTRON_DISABLE_SANDBOX=1 vue-cli-service electron:build",
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
     "electron:icons": "electron-icon-builder --input=./public/logo/win.png --output=build --flatten",