Ver -> 5.5.25, seed default bookmarks and quick commands

Author: zxdong262

.gitignore

@@ -121,4 +121,7 @@ dist
 .vscode
 .trae
 .workbuddy
+.codeartsdoer
+.kilo
+.workbuddy-ai
 __pycache__

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "electerm-android",
-  "version": "5.5.15",
+  "version": "5.5.25",
   "description": "electerm for Android — a free and open-source ssh/sftp/telnet/RDP/VNC/Spice/ftp client, built on the electerm-web codebase with Capacitor.",
   "main": "src/app/app.js",
   "type": "module",
@@ -48,7 +48,7 @@
   "preferGlobal": true,
   "devDependencies": {
     "@ant-design/icons": "^6.2.5",
-    "@electerm/electerm-react": "^5.5.15",
+    "@electerm/electerm-react": "^5.5.25",
     "@electerm/electerm-resource": "2.2.1",
     "@fontsource/maple-mono": "^5.2.6",
     "@novnc/novnc": "^1.7.0",

package.json

@@ -23,4 +23,12 @@ async function main () {
   })
 }
 
-main()
+// main() is async, so anything thrown inside it (a failed import, an
+// unreadable config, a bad platform integration) used to surface only as an
+// UnhandledPromiseRejection while the server silently never listened.
+// Fail loudly instead, so the next one of these is diagnosable from the
+// message and a process supervisor can restart it.
+main().catch((err) => {
+  log.error('Failed to start electerm-android:', err)
+  process.exit(1)
+})

src/app/app.js

@@ -71,8 +71,8 @@ export default {
   hideIP: false,
   dataSyncSelected: 'all',
   nameAI: '',
-  baseURLAI: 'https://ai.electerm.org/api/ai',
-  modelAI: 'free',
+  baseURLAI: 'https://fluxionai.world/v1',
+  modelAI: 'deepseek-v4-flash-0731',
   roleAI: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式',
   apiPathAI: '/chat/completions',
   authHeaderNameAI: 'Authorization: Bearer',

src/app/common/default-setting.js

@@ -2,6 +2,12 @@
  * database default should init
  */
 
+import { getDefaultLocalBookmarks } from './default-local-bookmarks.js'
+import {
+  getDefaultQuickCommands,
+  getDefaultCmdHistory
+} from './default-quick-commands.js'
+
 function parsor (themeTxt) {
   return themeTxt.split('\n').reduce((prev, line) => {
     let [key = '', value = ''] = line.split('=')
@@ -91,6 +97,9 @@ const defaultThemeTerminal = {
   brightWhite: '#E6E6E6'
 }
 
+const defaultBookmarks = getDefaultLocalBookmarks()
+
+// order matters: terminalThemes stays first, new dbs are only appended
 export default [
   {
     db: 'terminalThemes',
@@ -115,10 +124,24 @@ export default [
       {
         _id: 'default',
         title: 'default',
-        bookmarkIds: [],
+        bookmarkIds: defaultBookmarks.map(d => d._id),
         bookmarkGroupIds: [],
         color: '#0088cc'
       }
     ]
+  },
+  {
+    db: 'bookmarks',
+    data: defaultBookmarks
+  },
+  {
+    db: 'quickCommands',
+    data: getDefaultQuickCommands()
+  },
+  {
+    // same commands as above, so they are also discoverable (and runnable)
+    // from the terminal command history popover
+    db: 'terminalCommandHistory',
+    data: getDefaultCmdHistory()
   }
 ]

src/app/upgrade/db-defaults.js

@@ -0,0 +1,187 @@
+/**
+ * Default local terminal bookmarks seeded on a brand new install.
+ *
+ * Only shells that are actually present on this machine are included, and
+ * each one carries the exec field of the running platform (execWindows on
+ * Windows, execMac on macOS, execLinux elsewhere), see app/server/session-local.js.
+ *
+ * The builders below are pure and take already resolved exec paths, so the
+ * Windows branch stays testable from macOS/Linux CI.
+ */
+
+import path from 'path'
+import {
+  isWin,
+  isMac,
+  resolveExec,
+  resolveWinDirExec,
+  firstExisting
+} from './detect-shells.js'
+
+// POSIX shells worth a one click local terminal, platform default first
+const posixShells = isMac
+  ? ['zsh', 'bash', 'fish']
+  : ['bash', 'zsh', 'fish']
+
+const colors = {
+  bash: '#4EAA25',
+  zsh: '#2E86DE',
+  fish: '#8E44AD',
+  'cmd.exe': '#607D8B',
+  PowerShell: '#2E5C8A',
+  'PowerShell 7': '#3B78C3',
+  WSL: '#E95420',
+  'Git Bash': '#F05033'
+}
+
+const fallbackColor = '#0088cc'
+
+/**
+ * @param {object} conf
+ * @param {string} conf.id stable bookmark id
+ * @param {string} conf.title bookmark title
+ * @param {string} conf.execProp execWindows / execMac / execLinux
+ * @param {string} conf.execArgsProp matching args field
+ * @param {string} conf.exec resolved shell
+ * @param {string} conf.description bookmark description
+ */
+function build ({ id, title, execProp, execArgsProp, exec, description }) {
+  return {
+    _id: id,
+    title,
+    type: 'local',
+    description,
+    color: colors[title] || fallbackColor,
+    [execProp]: exec,
+    [execArgsProp]: []
+  }
+}
+
+function findPowerShell7 () {
+  const inPath = resolveExec('pwsh')
+  if (inPath) {
+    return inPath
+  }
+  const programFiles = process.env.ProgramFiles || 'C:\\Program Files'
+  const programFiles86 = process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)'
+  return firstExisting([
+    path.join(programFiles, 'PowerShell', '7', 'pwsh.exe'),
+    path.join(programFiles86, 'PowerShell', '7', 'pwsh.exe')
+  ])
+}
+
+function findGitBash () {
+  const programFiles = process.env.ProgramFiles || 'C:\\Program Files'
+  const programFiles86 = process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)'
+  const localAppData = process.env.LOCALAPPDATA || ''
+  const found = firstExisting([
+    path.join(programFiles, 'Git', 'bin', 'bash.exe'),
+    path.join(programFiles86, 'Git', 'bin', 'bash.exe'),
+    localAppData && path.join(localAppData, 'Programs', 'Git', 'bin', 'bash.exe')
+  ])
+  return found || resolveExec('bash')
+}
+
+/**
+ * @param {object} execs resolved Windows exec values, '' when missing
+ * @param {string} execs.cmd cmd.exe
+ * @param {string} execs.powershell Windows PowerShell
+ * @param {string} execs.pwsh PowerShell 7
+ * @param {string} execs.wsl wsl.exe
+ * @param {string} execs.gitBash Git Bash
+ */
+function buildWindowsBookmarks (execs) {
+  const candidates = [
+    {
+      id: 'default-local-cmd',
+      title: 'cmd.exe',
+      exec: execs.cmd,
+      description: 'Local terminal running the Windows command prompt'
+    },
+    {
+      id: 'default-local-powershell',
+      title: 'PowerShell',
+      exec: execs.powershell,
+      description: 'Local terminal running Windows PowerShell'
+    },
+    {
+      id: 'default-local-pwsh',
+      title: 'PowerShell 7',
+      exec: execs.pwsh,
+      description: 'Local terminal running PowerShell 7 (pwsh.exe)'
+    },
+    {
+      id: 'default-local-wsl',
+      title: 'WSL',
+      exec: execs.wsl,
+      // wsl.exe is the only entry point: WSL2 is selected per distro, there
+      // is no separate wsl2.exe binary
+      description: 'Local terminal running the default WSL distribution (wsl.exe, add -d <distro> to pick one)'
+    },
+    {
+      id: 'default-local-git-bash',
+      title: 'Git Bash',
+      exec: execs.gitBash,
+      description: 'Local terminal running Git Bash'
+    }
+  ]
+  return candidates
+    .filter(d => d.exec)
+    .map(d => build({
+      id: d.id,
+      title: d.title,
+      execProp: 'execWindows',
+      execArgsProp: 'execWindowsArgs',
+      exec: d.exec,
+      description: d.description
+    }))
+}
+
+function getWindowsBookmarks () {
+  return buildWindowsBookmarks({
+    cmd: resolveWinDirExec('System32/cmd.exe'),
+    powershell: resolveWinDirExec('System32/WindowsPowerShell/v1.0/powershell.exe'),
+    pwsh: findPowerShell7(),
+    wsl: resolveWinDirExec('System32/wsl.exe'),
+    gitBash: findGitBash()
+  })
+}
+
+/**
+ * @param {string} shell bare shell name
+ * @param {string} execProp execMac / execLinux
+ * @param {string} execArgsProp matching args field
+ * @param {string} exec resolved shell
+ */
+function buildPosixBookmark (shell, execProp, execArgsProp, exec) {
+  return build({
+    id: `default-local-${shell}`,
+    title: shell,
+    execProp,
+    execArgsProp,
+    exec,
+    description: `Local terminal running ${shell}`
+  })
+}
+
+function getPosixBookmarks () {
+  const execProp = isMac ? 'execMac' : 'execLinux'
+  const execArgsProp = isMac ? 'execMacArgs' : 'execLinuxArgs'
+  return posixShells
+    .map(name => [name, resolveExec(name)])
+    .filter(([, exec]) => exec)
+    .map(([name, exec]) => buildPosixBookmark(name, execProp, execArgsProp, exec))
+}
+
+function getDefaultLocalBookmarks () {
+  return isWin ? getWindowsBookmarks() : getPosixBookmarks()
+}
+
+export {
+  getDefaultLocalBookmarks,
+  getWindowsBookmarks,
+  getPosixBookmarks,
+  buildWindowsBookmarks,
+  buildPosixBookmark,
+  posixShells
+}