@electerm/electerm-react 2.8.16 → 2.10.26

package/client/components/bookmark-form/bookmark-form.styl

@@ -14,4 +14,4 @@
     .item-item-use
       display inline-block
 .number-input
-  min-width 210px
+  min-width 210px

package/client/components/bookmark-form/bookmark-schema.js

@@ -0,0 +1,192 @@
+const bookmarkSchema = {
+  ssh: {
+    type: 'ssh',
+    host: 'string (required) - hostname or IP address',
+    port: 'number (default: 22) - SSH port',
+    username: 'string (required) - SSH username',
+    password: 'string - password for authentication',
+    privateKey: 'string - private key content or path for key-based auth',
+    passphrase: 'string - passphrase for private key/cetificate',
+    certificate: 'string - certificate content',
+    authType: 'string - auth type (password|privateKey|profiles)',
+    profile: 'string - profile id to reuse saved auth',
+    title: 'string - bookmark title',
+    description: 'string - bookmark description',
+    startDirectoryRemote: 'string - remote starting directory',
+    startDirectoryLocal: 'string - local starting directory',
+    enableSsh: 'boolean - enable ssh, default is true',
+    enableSftp: 'boolean - enable sftp, default is true',
+    sshTunnels: 'array - ssh tunnel definitions (see sshTunnels items)',
+    connectionHoppings: 'array - connection hopping definitions',
+    useSshAgent: 'boolean - use SSH agent, default is true',
+    sshAgent: 'string - ssh agent path',
+    serverHostKey: 'array - server host key algorithms',
+    cipher: 'array - cipher list',
+    runScripts: 'array - run scripts after connected ({delay,script})',
+    quickCommands: 'array - quick commands ({name,command})',
+    proxy: 'string - proxy address (socks5://...)',
+    x11: 'boolean - enable x11 forwarding, default is false',
+    term: 'string - terminal type, default is xterm-256color, required',
+    displayRaw: 'boolean - display raw output, default is false',
+    encode: 'string - charset, default is utf8',
+    envLang: 'string - ENV LANG, default is en_US.UTF-8',
+    setEnv: 'string - environment variables, format: `KEY1=VALUE1 KEY2=VALUE2`',
+    color: 'string - tag color, like #000000',
+    interactiveValues: 'strings separated by newline'
+  },
+  sshTunnelsItem: {
+    sshTunnel: 'string - forwardRemoteToLocal|forwardLocalToRemote|dynamicForward',
+    sshTunnelLocalHost: 'string',
+    sshTunnelLocalPort: 'number',
+    sshTunnelRemoteHost: 'string',
+    sshTunnelRemotePort: 'number',
+    name: 'string - optional tunnel name'
+  },
+  connectionHoppingsItem: {
+    host: 'string',
+    port: 'number',
+    username: 'string',
+    password: 'string',
+    privateKey: 'string',
+    passphrase: 'string - passphrase',
+    certificate: 'string',
+    authType: 'string',
+    profile: 'string - profile id'
+  },
+  telnet: {
+    type: 'telnet',
+    host: 'string (required) - hostname or IP address',
+    port: 'number (default: 23) - Telnet port',
+    username: 'string - username',
+    password: 'string - password',
+    title: 'string - bookmark title',
+    description: 'string - bookmark description',
+    loginPrompt: 'string - login prompt regex',
+    passwordPrompt: 'string - password prompt regex',
+    runScripts: 'array - run scripts after connected ({delay,script})',
+    startDirectoryRemote: 'string - remote starting directory',
+    startDirectoryLocal: 'string - local starting directory',
+    profile: 'string - profile id',
+    proxy: 'string - proxy address (socks5://...)'
+  },
+  serial: {
+    type: 'serial',
+    path: 'string (required) - serial port path, e.g., /dev/ttyUSB0 or COM1',
+    baudRate: 'number (default: 9600) - baud rate',
+    dataBits: 'number (default: 8) - data bits',
+    stopBits: 'number (default: 1) - stop bits',
+    parity: 'string - "none", "even", "odd", "mark", "space"',
+    title: 'string - bookmark title',
+    rtscts: 'boolean - enable RTS/CTS flow control, default is false',
+    xon: 'boolean - enable XON flow control, default is false',
+    xoff: 'boolean - enable XOFF flow control, default is false',
+    xany: 'boolean - enable XANY flow control, default is false',
+    runScripts: 'array - run scripts after connected ({delay,script})',
+    description: 'string - bookmark description'
+  },
+  vnc: {
+    type: 'vnc',
+    host: 'string (required) - hostname or IP address',
+    port: 'number (default: 5900) - VNC port',
+    username: 'string - VNC username',
+    password: 'string - VNC password',
+    viewOnly: 'boolean - view only mode, default is false',
+    clipViewport: 'boolean - clip viewport to window, default is false',
+    scaleViewport: 'boolean - scale viewport to window, default is true',
+    qualityLevel: 'number (0-9) - VNC quality level, lower is faster, default is 3',
+    compressionLevel: 'number (0-9) - VNC compression level, lower is faster, default is 1',
+    shared: 'boolean - shared session, default is true',
+    proxy: 'string - proxy address (socks5://...)',
+    title: 'string - bookmark title',
+    description: 'string - bookmark description',
+    profile: 'string - profile id'
+  },
+  rdp: {
+    type: 'rdp',
+    host: 'string (required) - hostname or IP address',
+    port: 'number (default: 3389) - RDP port',
+    username: 'string - username',
+    password: 'string - password',
+    title: 'string - bookmark title',
+    description: 'string - bookmark description',
+    profile: 'string - profile id',
+    proxy: 'string - proxy address (socks5://...)',
+    domain: 'string - login domain'
+  },
+  ftp: {
+    type: 'ftp',
+    host: 'string (required) - hostname or IP address',
+    port: 'number (default: 21) - FTP port',
+    user: 'string - username',
+    secure: 'boolean - use secure FTP (FTPS), default is false',
+    password: 'string - password',
+    encode: 'string - charset for file names, default is utf-8',
+    title: 'string - bookmark title',
+    profile: 'string - profile id',
+    description: 'string - bookmark description'
+  },
+  web: {
+    type: 'web',
+    url: 'string (required) - website URL',
+    title: 'string - bookmark title',
+    description: 'string - bookmark description',
+    useragent: 'string - custom user agent'
+  },
+  local: {
+    type: 'local',
+    title: 'string - bookmark title',
+    description: 'string - bookmark description',
+    startDirectoryLocal: 'string - local starting directory',
+    runScripts: 'array - run scripts after connected ({delay,script})'
+  },
+  spice: {
+    type: 'spice',
+    host: 'string (required) - hostname or IP address',
+    port: 'number (default: 5900) - Spice port',
+    password: 'string - Spice password',
+    title: 'string - bookmark title',
+    viewOnly: 'boolean - view only mode, default is false',
+    scaleViewport: 'boolean - scale viewport to window, default is true',
+    description: 'string - bookmark description',
+    profile: 'string - profile id',
+    proxy: 'string - proxy address (socks5://...)'
+  }
+}
+
+export function buildPrompt (description) {
+  const lang = window.store.config.languageAI || window.store.getLangName()
+  const schemaDescription = Object.entries(bookmarkSchema)
+    .map(([type, fields]) => {
+      const fieldList = Object.entries(fields)
+        .map(([key, desc]) => `    ${key}: ${desc}`)
+        .join('\n')
+      return `  ${type}:\n${fieldList}`
+    })
+    .join('\n\n')
+
+  return `You are a bookmark configuration generator. Based on the user's natural language description, generate bookmark configurations in JSON format.
+
+Available bookmark types and their fields:
+${schemaDescription}
+
+Important rules:
+1. Analyze the user's description to determine the most appropriate connection type
+2. For SSH connections, use type "ssh" and default port 22 unless specified
+3. For Telnet connections, use type "telnet" and default port 23 unless specified
+4. For VNC connections, use type "vnc" and default port 5900 unless specified
+5. For RDP connections, use type "rdp" and default port 3389 unless specified
+6. For FTP connections, use type "ftp" and default port 21 unless specified
+7. For Serial connections, use type "serial"
+8. For Web/Browser connections, use type "web" with a URL field
+9. For Local terminal, use type "local"
+10. Only include fields that are relevant to the connection type
+11. Always include a meaningful title if not specified
+12. Respond ONLY with valid JSON, no markdown formatting or explanations
+13. Reply in ${lang} language
+
+User description: ${description}
+
+Generate the bookmark JSON:`
+}
+
+export default bookmarkSchema

package/client/components/bookmark-form/common/ai-category-select.jsx

@@ -0,0 +1,32 @@
+import { TreeSelect } from 'antd'
+import formatBookmarkGroups from './bookmark-group-tree-format'
+
+const e = window.translate
+
+export default function AICategorySelect ({
+  bookmarkGroups = [],
+  value,
+  onChange
+}) {
+  const tree = formatBookmarkGroups(bookmarkGroups)
+
+  const handleChange = (categoryId) => {
+    if (onChange) {
+      onChange(categoryId)
+    }
+  }
+
+  return (
+    <div className='pd1b'>
+      <label className='iblock mg1r'>{e('bookmarkCategory')}</label>
+      <TreeSelect
+        value={value}
+        treeData={tree}
+        treeDefaultExpandAll
+        showSearch
+        onChange={handleChange}
+        style={{ minWidth: 200 }}
+      />
+    </div>
+  )
+}

package/client/components/bookmark-form/common/category-select.jsx

@@ -14,7 +14,7 @@ const e = window.translate
 export default function BookmarkCategorySelect ({
   bookmarkGroups = [],
   form,
-  formItemLayout,
+  formItemLayout = defaultFormItemLayout,
   name = 'category',
   onChange,
   formData = {} // Add formData prop to access bookmark ID
@@ -67,11 +67,9 @@ export default function BookmarkCategorySelect ({
     }
   }
 
-  const layout = formItemLayout || defaultFormItemLayout
-
   return (
     <FormItem
-      {...layout}
+      {...formItemLayout}
       label={e('bookmarkCategory')}
       name={name}
     >

package/client/components/bookmark-form/common/fields.jsx

@@ -21,12 +21,6 @@ import SshHostSelector from './ssh-host-selector.jsx'
 import SshAuthTypeSelector from './ssh-auth-type-selector.jsx'
 import SshAuthSelector from './ssh-auth-selector.jsx'
 import CategorySelect from './category-select.jsx'
-import WikiAlert from './wiki-alert.jsx'
-import {
-  rdpWikiLink,
-  vncWikiLink
-} from '../../../common/constants.js'
-
 const Fragment = React.Fragment
 const FormItem = Form.Item
 
@@ -126,10 +120,6 @@ export function renderFormItem (item, formItemLayout, form, ctxProps, index) {
       return <Alert key={name} type='info' {...item.props} />
     case 'warning':
       return <Alert key={name} type='warning' {...item.props} />
-    case 'rdpWarning':
-      return <WikiAlert key={name} wikiUrl={rdpWikiLink} />
-    case 'vncWarning':
-      return <WikiAlert key={name} wikiUrl={vncWikiLink} />
     case 'categorySelect':
       return (
         <CategorySelect

package/client/components/bookmark-form/config/ftp.js

@@ -15,6 +15,7 @@ const ftpConfig = {
       user: '',
       password: '',
       secure: false,
+      encode: 'utf-8',
       ...getAuthTypeDefault(props)
     })
   },
@@ -32,6 +33,7 @@ const ftpConfig = {
         { type: 'input', name: 'user', label: () => e('username') },
         { type: 'password', name: 'password', label: () => e('password') },
         { type: 'switch', name: 'secure', label: () => e('secure'), valuePropName: 'checked' },
+        commonFields.encode,
         commonFields.type
       ]
     }

package/client/components/bookmark-form/config/rdp.js

@@ -21,7 +21,6 @@ const rdpConfig = {
       key: 'auth',
       label: e('auth'),
       fields: [
-        { type: 'rdpWarning', name: 'rdpWarning' },
         commonFields.category,
         commonFields.colorTitle,
         { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },

package/client/components/bookmark-form/config/session-config.js

@@ -8,6 +8,7 @@ import serial from './serial'
 import local from './local'
 import rdp from './rdp'
 import ftp from './ftp'
+import spice from './spice'
 
 const sessionConfig = {
   [connectionMap.ssh]: ssh,
@@ -17,7 +18,8 @@ const sessionConfig = {
   [connectionMap.vnc]: vnc,
   [connectionMap.rdp]: rdp,
   [connectionMap.ftp]: ftp,
-  [connectionMap.web]: web
+  [connectionMap.web]: web,
+  [connectionMap.spice]: spice
 }
 
 export default sessionConfig

package/client/components/bookmark-form/config/spice.js

@@ -0,0 +1,43 @@
+import { formItemLayout } from '../../../common/form-layout.js'
+import { terminalSpiceType } from '../../../common/constants.js'
+import { createBaseInitValues, getAuthTypeDefault } from '../common/init-values.js'
+import { isEmpty } from 'lodash-es'
+import { commonFields } from './common-fields.js'
+
+const e = window.translate
+
+const spiceConfig = {
+  key: 'spice',
+  type: terminalSpiceType,
+  initValues: (props) => {
+    return createBaseInitValues(props, terminalSpiceType, {
+      port: 5900,
+      viewOnly: false,
+      scaleViewport: true,
+      connectionHoppings: [],
+      ...getAuthTypeDefault(props)
+    })
+  },
+  layout: formItemLayout,
+  tabs: () => [
+    {
+      key: 'auth',
+      label: e('auth'),
+      fields: [
+        commonFields.category,
+        commonFields.colorTitle,
+        { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },
+        commonFields.port,
+        { type: 'switch', name: 'viewOnly', label: () => e('viewOnly'), valuePropName: 'checked' },
+        { type: 'switch', name: 'scaleViewport', label: () => e('scaleViewport'), valuePropName: 'checked' },
+        { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.spice) },
+        commonFields.password,
+        commonFields.description,
+        commonFields.proxy,
+        commonFields.type
+      ]
+    }
+  ]
+}
+
+export default spiceConfig

package/client/components/bookmark-form/config/vnc.js

@@ -13,7 +13,7 @@ const vncConfig = {
     return createBaseInitValues(props, terminalVncType, {
       port: 5900,
       viewOnly: false,
-      clipViewport: true,
+      clipViewport: false,
       scaleViewport: true,
       qualityLevel: 3, // 0-9, lower = faster performance, default 6
       compressionLevel: 1, // 0-9, lower = faster performance, default 2
@@ -28,7 +28,6 @@ const vncConfig = {
       key: 'auth',
       label: e('auth'),
       fields: [
-        { type: 'vncWarning', name: 'vncWarning' },
         commonFields.category,
         commonFields.colorTitle,
         { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },

package/client/components/bookmark-form/fix-bookmark-default.js

@@ -0,0 +1,134 @@
+import bookmarkSchema from './bookmark-schema.js'
+
+const defaultValues = {
+  ssh: {
+    port: 22,
+    enableSsh: true,
+    enableSftp: true,
+    useSshAgent: true,
+    x11: false,
+    term: 'xterm-256color',
+    displayRaw: false,
+    encode: 'utf8',
+    envLang: 'en_US.UTF-8'
+  },
+  telnet: {
+    port: 23
+  },
+  serial: {
+    baudRate: 9600,
+    dataBits: 8,
+    stopBits: 1,
+    parity: 'none',
+    rtscts: false,
+    xon: false,
+    xoff: false,
+    xany: false
+  },
+  vnc: {
+    port: 5900,
+    viewOnly: false,
+    clipViewport: false,
+    scaleViewport: true,
+    qualityLevel: 3,
+    compressionLevel: 1,
+    shared: true
+  },
+  rdp: {
+    port: 3389
+  },
+  ftp: {
+    port: 21,
+    secure: false
+  }
+}
+
+const requiredFields = {
+  ssh: ['host', 'username', 'term'],
+  telnet: ['host'],
+  serial: ['path'],
+  vnc: ['host'],
+  rdp: ['host'],
+  ftp: ['host'],
+  web: ['url']
+}
+
+export function fixBookmarkData (data) {
+  if (!data || typeof data !== 'object') {
+    return data
+  }
+
+  const type = data.type || 'ssh'
+  const schema = bookmarkSchema[type]
+
+  if (!schema) {
+    return data
+  }
+
+  const fixed = { ...data }
+
+  if (!fixed.type) {
+    fixed.type = type
+  }
+
+  const defaults = defaultValues[type] || {}
+  for (const [key, value] of Object.entries(defaults)) {
+    if (fixed[key] === undefined || fixed[key] === null) {
+      fixed[key] = value
+    }
+  }
+
+  if (fixed.connectionHoppings?.length) {
+    fixed.hasHopping = true
+  }
+
+  return fixed
+}
+
+export function validateBookmarkData (data) {
+  if (!data || typeof data !== 'object') {
+    return {
+      valid: false,
+      errors: ['Invalid data format']
+    }
+  }
+
+  const type = data.type || 'ssh'
+  const required = requiredFields[type] || []
+  const errors = []
+
+  for (const field of required) {
+    if (!data[field]) {
+      errors.push(`Missing required field: ${field}`)
+    }
+  }
+
+  return {
+    valid: errors.length === 0,
+    errors
+  }
+}
+
+export function getMissingRequiredFields (data) {
+  if (!data || typeof data !== 'object') {
+    return []
+  }
+
+  const type = data.type || 'ssh'
+  const required = requiredFields[type] || []
+  const missing = []
+
+  for (const field of required) {
+    if (!data[field]) {
+      missing.push(field)
+    }
+  }
+
+  return missing
+}
+
+export default {
+  fixBookmarkData,
+  validateBookmarkData,
+  getMissingRequiredFields
+}

package/client/components/bookmark-form/index.jsx

@@ -2,7 +2,7 @@
  * Config-driven bookmark form (drop-in replacement)
  */
 import { PureComponent } from 'react'
-import { Radio } from 'antd'
+import { Radio, Button } from 'antd'
 import {
   settingMap,
   connectionMap,
@@ -13,12 +13,14 @@ import {
   terminalLocalType,
   terminalTelnetType,
   terminalFtpType,
-  newBookmarkIdPrefix
+  newBookmarkIdPrefix,
+  terminalSpiceType
 } from '../../common/constants'
 import { createTitleWithTag } from '../../common/create-title'
-import { LoadingOutlined, BookOutlined } from '@ant-design/icons'
+import { LoadingOutlined, BookOutlined, RobotOutlined } from '@ant-design/icons'
 import sessionConfig from './config/session-config'
 import renderForm from './render-form'
+import AIBookmarkForm from './ai-bookmark-form'
 import './bookmark-form.styl'
 
 const e = window.translate
@@ -34,27 +36,56 @@ export default class BookmarkIndex2 extends PureComponent {
       terminalSerialType,
       terminalRdpType,
       terminalVncType,
-      terminalFtpType
+      terminalFtpType,
+      terminalSpiceType
     ].includes(initType)) {
       initType = connectionMap.ssh
     }
-    this.state = { ready: false, bookmarkType: initType }
+    const v = this.getInitAiModeState()
+    this.state = {
+      ready: v,
+      bookmarkType: initType,
+      aiMode: v
+    }
   }
 
   componentDidMount () {
-    this.timer = setTimeout(() => this.setState({ ready: true }), 75)
+    this.timer = setTimeout(() => {
+      this.setState({ ready: true })
+    }, 75)
   }
 
   componentWillUnmount () {
     clearTimeout(this.timer)
   }
 
+  getInitAiModeState () {
+    const v = window.et.openBookmarkWithAIMode
+    if (v !== true) {
+      return false
+    }
+    delete window.et.openBookmarkWithAIMode
+    return true
+  }
+
   handleChange = (e) => {
     this.setState({ bookmarkType: e.target.value })
   }
 
+  handleCancelAiMode = () => {
+    this.setState({ aiMode: false })
+  }
+
+  handleToggleAIMode = () => {
+    if (window.store.aiConfigMissing()) {
+      window.store.toggleAIConfig()
+      return
+    }
+    this.setState(prev => ({ aiMode: !prev.aiMode }))
+  }
+
   renderTypes (bookmarkType, isNew, keys) {
-    if (!isNew) return null
+    if (!isNew || this.state.aiMode) return null
     return (
       <Radio.Group
         buttonStyle='solid'
@@ -66,11 +97,7 @@ export default class BookmarkIndex2 extends PureComponent {
       >
         {keys.map(v => {
           const txt = v === 'ssh' ? 'Ssh/Sftp' : e(v)
-          let sup = null
-          if (v === connectionMap.vnc || v === connectionMap.rdp) {
-            sup = <sup className='color-red'>Beta</sup>
-          }
-          return (<Radio.Button key={v} value={v}>{txt}{sup}</Radio.Button>)
+          return (<Radio.Button key={v} value={v}>{txt}</Radio.Button>)
         })}
       </Radio.Group>
     )
@@ -85,6 +112,38 @@ export default class BookmarkIndex2 extends PureComponent {
     )
   }
 
+  renderAIButton (isNew) {
+    if (!isNew || this.state.aiMode) {
+      return null
+    }
+    return (
+      <Button
+        size='small'
+        className='mg2l create-ai-btn'
+        icon={<RobotOutlined />}
+        onClick={this.handleToggleAIMode}
+      >
+        {e('createBookmarkByAI')}
+      </Button>
+    )
+  }
+
+  renderAiForm () {
+    return (
+      <AIBookmarkForm
+        onCancel={this.handleCancelAiMode}
+      />
+    )
+  }
+
+  renderForm () {
+    const { bookmarkType, aiMode } = this.state
+    if (aiMode) {
+      return this.renderAiForm()
+    }
+    return renderForm(bookmarkType, this.props)
+  }
+
   render () {
     const { formData } = this.props
     const { id = '' } = formData
@@ -102,15 +161,16 @@ export default class BookmarkIndex2 extends PureComponent {
     const keys = Object.keys(sessionConfig)
     return (
       <div className='form-wrap pd1x'>
-        <div className='form-title pd1t pd1x pd2b'>
+        <div className='form-title pd1t pd1x pd2b bold'>
           <BookOutlined className='mg1r' />
           <span>
             {((!isNew ? e('edit') : e('new')) + ' ' + e(settingMap.bookmarks))}
           </span>
           {this.renderTitle(formData, isNew)}
           {this.renderTypes(bookmarkType, isNew, keys)}
+          {this.renderAIButton(isNew)}
         </div>
-        {renderForm(bookmarkType, this.props)}
+        {this.renderForm()}
       </div>
     )
   }