@electerm/electerm-react 1.100.60 → 1.101.10

package/client/components/bookmark-form/config/common-fields.js

@@ -0,0 +1,305 @@
+/**
+ * Common field definitions shared across multiple configs
+ * Reduces duplication and ensures consistency
+ */
+import { terminalTypes } from '../../../common/constants'
+import defaultSettings from '../../../common/default-setting'
+import encodes from '../common/encodes'
+import { isEmpty } from 'lodash-es'
+
+const e = window.translate
+
+// Common individual fields
+export const commonFields = {
+  // Basic connection fields
+  host: {
+    type: 'colorTitle',
+    name: 'host',
+    label: e('host'),
+    rules: [{ required: true, message: e('host') + ' required' }]
+  },
+
+  colorTitle: {
+    type: 'colorTitle',
+    name: 'title',
+    label: e('title')
+  },
+
+  title: {
+    type: 'input',
+    name: 'title',
+    label: e('title')
+  },
+
+  username: {
+    type: 'input',
+    name: 'username',
+    label: e('username')
+  },
+
+  password: {
+    type: 'password',
+    name: 'password',
+    label: e('password')
+  },
+
+  port: {
+    type: 'number',
+    name: 'port',
+    label: e('port'),
+    rules: [{ required: true, message: 'port required' }]
+  },
+
+  description: {
+    type: 'textarea',
+    name: 'description',
+    label: e('description')
+  },
+
+  category: {
+    type: 'categorySelect',
+    name: 'category',
+    label: e('category')
+  },
+
+  type: {
+    type: 'input',
+    name: 'type',
+    label: 'type',
+    hidden: true
+  },
+
+  // SSH/Terminal specific fields
+  setEnv: {
+    type: 'input',
+    name: 'setEnv',
+    label: 'SetEnv',
+    props: { placeholder: 'SEC=xxx BEC=xxxx' }
+  },
+
+  startDirectoryLocal: {
+    type: 'input',
+    name: 'startDirectoryLocal',
+    label: `${e('startDirectory')}:${e('local')}`
+  },
+
+  startDirectory: {
+    type: 'input',
+    name: 'startDirectory',
+    label: `${e('startDirectory')}:${e('remote')}`
+  },
+
+  interactiveValues: {
+    type: 'textarea',
+    name: 'interactiveValues',
+    label: e('interactiveValues')
+  },
+
+  encode: {
+    type: 'select',
+    name: 'encode',
+    label: e('encode'),
+    options: encodes.map(k => ({ label: k.toUpperCase(), value: k }))
+  },
+
+  // Terminal UI settings
+  envLang: {
+    type: 'input',
+    name: 'envLang',
+    label: 'ENV:LANG',
+    rules: [{ max: 130, message: '130 chars max' }],
+    props: { placeholder: 'en_US.UTF-8' }
+  },
+
+  terminalType: {
+    type: 'autocomplete',
+    name: 'term',
+    label: e('terminalType'),
+    rules: [{ required: true, message: 'terminal type required' }],
+    options: terminalTypes.map(t => ({ label: t, value: t }))
+  },
+
+  displayRaw: {
+    type: 'switch',
+    name: 'displayRaw',
+    label: e('displayRaw'),
+    valuePropName: 'checked'
+  },
+
+  fontFamily: {
+    type: 'input',
+    name: 'fontFamily',
+    label: e('fontFamily'),
+    rules: [{ max: 130, message: '130 chars max' }],
+    props: { placeholder: defaultSettings.fontFamily }
+  },
+
+  fontSize: {
+    type: 'number',
+    name: 'fontSize',
+    label: e('fontSize'),
+    props: {
+      min: 9,
+      max: 65535,
+      step: 1,
+      placeholder: defaultSettings.fontSize
+    }
+  },
+
+  keepaliveInterval: {
+    type: 'number',
+    name: 'keepaliveInterval',
+    label: e('keepaliveIntervalDesc'),
+    props: {
+      min: 0,
+      max: 20000000,
+      step: 1000
+    }
+  },
+
+  terminalBackground: {
+    type: 'terminalBackground',
+    name: 'terminalBackground',
+    label: e('terminalBackgroundImage')
+  },
+
+  proxy: {
+    type: 'proxy',
+    name: '__proxy__',
+    label: e('proxy')
+  },
+
+  x11: {
+    type: 'x11',
+    name: '__x11__',
+    label: 'x11'
+  },
+
+  // Dynamic sections
+  quickCommands: {
+    type: 'quickCommands',
+    name: '__quick__',
+    label: ''
+  },
+
+  sshTunnels: {
+    type: 'sshTunnels',
+    name: '__tunnels__',
+    label: ''
+  },
+
+  connectionHopping: {
+    type: 'connectionHopping',
+    name: '__hopping__',
+    label: ''
+  },
+
+  runScripts: {
+    type: 'runScripts',
+    name: 'runScripts',
+    label: ''
+  }
+}
+
+// Common field groups for settings tabs
+export const terminalSettings = [
+  commonFields.envLang,
+  commonFields.terminalType,
+  commonFields.displayRaw,
+  commonFields.fontFamily,
+  commonFields.fontSize,
+  commonFields.keepaliveInterval,
+  commonFields.terminalBackground
+]
+
+export const sshSettings = [
+  {
+    type: 'switch',
+    name: 'enableSsh',
+    label: 'SSH',
+    valuePropName: 'checked'
+  },
+  {
+    type: 'switch',
+    name: 'enableSftp',
+    label: 'SFTP',
+    valuePropName: 'checked'
+  },
+  {
+    type: 'switch',
+    name: 'ignoreKeyboardInteractive',
+    label: e('ignoreKeyboardInteractive'),
+    valuePropName: 'checked'
+  },
+  ...terminalSettings.slice(0, -1), // All except terminalBackground
+  commonFields.proxy,
+  commonFields.x11,
+  commonFields.terminalBackground
+]
+
+// Common auth fields
+export const basicAuthFields = [
+  commonFields.host,
+  commonFields.username,
+  commonFields.password,
+  commonFields.port,
+  commonFields.category,
+  commonFields.title,
+  commonFields.description,
+  commonFields.type
+]
+
+export const sshAuthFields = [
+  commonFields.category,
+  commonFields.title,
+  { ...commonFields.host, type: 'sshHostSelector' },
+  commonFields.username,
+  { type: 'sshAuthTypeSelector', name: 'authType', label: '' },
+  { type: 'sshAuthSelector', name: '__auth__', label: '', formItemName: 'password' },
+  commonFields.port,
+  commonFields.runScripts,
+  commonFields.description,
+  commonFields.setEnv,
+  commonFields.startDirectoryLocal,
+  commonFields.startDirectory,
+  commonFields.interactiveValues,
+  commonFields.encode,
+  commonFields.type
+]
+
+// Telnet auth fields - similar to SSH but with filtered auth types (no privateKey)
+export const telnetAuthFields = [
+  commonFields.category,
+  commonFields.host,
+  commonFields.username,
+  commonFields.password,
+  { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.telnet) },
+  commonFields.port,
+  commonFields.title,
+  commonFields.description,
+  commonFields.setEnv,
+  commonFields.startDirectoryLocal,
+  commonFields.startDirectory,
+  commonFields.interactiveValues,
+  commonFields.encode,
+  commonFields.type
+]
+
+// Common tab configurations - functions to ensure translation happens at render time
+export const quickCommandsTab = () => ({
+  key: 'quickCommands',
+  label: e('quickCommands'),
+  fields: [commonFields.quickCommands]
+})
+
+export const sshTunnelTab = () => ({
+  key: 'tunnel',
+  label: e('sshTunnel'),
+  fields: [commonFields.sshTunnels]
+})
+
+export const connectionHoppingTab = () => ({
+  key: 'connectionHopping',
+  label: e('connectionHopping'),
+  fields: [commonFields.connectionHopping]
+})

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

@@ -0,0 +1,40 @@
+import { formItemLayout } from '../../../common/form-layout.js'
+import { terminalFtpType } from '../../../common/constants.js'
+import { createBaseInitValues } from '../common/init-values.js'
+import { commonFields } from './common-fields.js'
+import { isEmpty } from 'lodash-es'
+
+const e = window.translate
+
+const ftpConfig = {
+  key: 'ftp',
+  type: terminalFtpType,
+  initValues: (props) => {
+    return createBaseInitValues(props, terminalFtpType, {
+      port: 21,
+      user: '',
+      password: '',
+      secure: false
+    })
+  },
+  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: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.ftp) },
+        { type: 'input', name: 'user', label: e('username') },
+        { type: 'password', name: 'password', label: e('password') },
+        { type: 'switch', name: 'secure', label: e('secure'), valuePropName: 'checked' },
+        commonFields.type
+      ]
+    }
+  ]
+}
+
+export default ftpConfig

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

@@ -0,0 +1,96 @@
+import { formItemLayout } from '../../../common/form-layout.js'
+import { terminalLocalType, terminalTypes } from '../../../common/constants.js'
+import { createBaseInitValues, getTerminalDefaults, getSshDefaults } from '../common/init-values.js'
+import defaultSettings from '../../../common/default-setting.js'
+import { commonFields } from './common-fields.js'
+
+const e = window.translate
+
+const localConfig = {
+  key: 'local',
+  type: terminalLocalType,
+  initValues: (props) => {
+    const { store } = props
+    return createBaseInitValues(props, terminalLocalType, {
+      ...getTerminalDefaults(store),
+      ...getSshDefaults()
+    })
+  },
+  layout: formItemLayout,
+  tabs: () => [
+    {
+      key: 'auth',
+      label: e('auth'),
+      fields: [
+        commonFields.category,
+        commonFields.colorTitle,
+        commonFields.description,
+        { type: 'runScripts', name: 'runScripts', label: '' },
+        { type: 'input', name: 'type', label: 'type', hidden: true }
+      ]
+    },
+    {
+      key: 'settings',
+      label: e('settings'),
+      fields: [
+        {
+          type: 'input',
+          name: 'env.LANG',
+          label: 'ENV:LANG',
+          props: { maxLength: 130 }
+        },
+        {
+          type: 'autocomplete',
+          name: 'term',
+          label: e('terminalType'),
+          rules: [{ required: true, message: 'terminal type required' }],
+          options: terminalTypes.map(t => ({ label: t, value: t }))
+        },
+        {
+          type: 'switch',
+          name: 'displayRaw',
+          label: e('displayRaw'),
+          valuePropName: 'checked'
+        },
+        {
+          type: 'input',
+          name: 'fontFamily',
+          label: e('fontFamily'),
+          rules: [{ max: 130, message: '130 chars max' }],
+          props: { placeholder: defaultSettings.fontFamily }
+        },
+        {
+          type: 'number',
+          name: 'fontSize',
+          label: e('fontSize'),
+          props: {
+            min: 9,
+            max: 65535,
+            step: 1,
+            placeholder: defaultSettings.fontSize
+          }
+        },
+        {
+          type: 'number',
+          name: 'keepaliveInterval',
+          label: e('keepaliveIntervalDesc'),
+          props: {
+            min: 0,
+            max: 20000000,
+            step: 1000
+          }
+        },
+        { type: 'terminalBackground', name: 'terminalBackground', label: e('terminalBackgroundImage') }
+      ]
+    },
+    {
+      key: 'quickCommands',
+      label: e('quickCommands'),
+      fields: [
+        { type: 'quickCommands', name: '__quick__', label: '' }
+      ]
+    }
+  ]
+}
+
+export default localConfig

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

@@ -0,0 +1,39 @@
+import { formItemLayout } from '../../../common/form-layout.js'
+import { terminalRdpType } from '../../../common/constants.js'
+import { createBaseInitValues } from '../common/init-values.js'
+import { isEmpty } from 'lodash-es'
+import { commonFields } from './common-fields.js'
+
+const e = window.translate
+
+const rdpConfig = {
+  key: 'rdp',
+  type: terminalRdpType,
+  initValues: (props) => {
+    return createBaseInitValues(props, terminalRdpType, {
+      port: 3389
+    })
+  },
+  layout: formItemLayout,
+  tabs: () => [
+    {
+      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' }] },
+        commonFields.port,
+        { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.rdp) },
+        { ...commonFields.username, rules: [{ required: true, message: e('username') + ' required' }] },
+        { ...commonFields.password, rules: [{ required: true, message: e('password') + ' required' }] },
+        commonFields.description,
+        { type: 'input', name: 'domain', label: e('domain') },
+        commonFields.type
+      ]
+    }
+  ]
+}
+
+export default rdpConfig

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

@@ -0,0 +1,69 @@
+import { formItemLayout } from '../../../common/form-layout.js'
+import { terminalSerialType, commonBaudRates, commonDataBits, commonStopBits, commonParities } from '../../../common/constants.js'
+import defaultSettings from '../../../common/default-setting.js'
+import { createBaseInitValues, getTerminalBackgroundDefaults } from '../common/init-values.js'
+import { commonFields } from './common-fields.js'
+
+const e = window.translate
+
+const serialConfig = {
+  key: 'serial',
+  type: terminalSerialType,
+  initValues: (props) => {
+    return createBaseInitValues(props, terminalSerialType, {
+      baudRate: 9600,
+      dataBits: 8,
+      lock: true,
+      stopBits: 1,
+      parity: 'none',
+      rtscts: false,
+      xon: false,
+      xoff: false,
+      xany: false,
+      term: defaultSettings.terminalType,
+      displayRaw: false,
+      runScripts: [{}],
+      ignoreKeyboardInteractive: false,
+      ...getTerminalBackgroundDefaults(defaultSettings)
+    })
+  },
+  layout: formItemLayout,
+  tabs: () => [
+    {
+      key: 'auth',
+      label: e('auth'),
+      fields: [
+        commonFields.category,
+        commonFields.colorTitle,
+        { type: 'serialPathSelector', name: 'path', label: 'path', rules: [{ required: true, message: 'path required' }] },
+        { type: 'autocomplete', name: 'baudRate', label: 'baudRate', options: commonBaudRates.map(d => ({ value: String(d) })) },
+        { type: 'select', name: 'dataBits', label: 'dataBits', options: commonDataBits.map(d => ({ value: d, label: d })) },
+        { type: 'select', name: 'stopBits', label: 'stopBits', options: commonStopBits.map(d => ({ value: d, label: d })) },
+        { type: 'select', name: 'parity', label: 'parity', options: commonParities.map(d => ({ value: d, label: d })) },
+        { type: 'switch', name: 'lock', label: 'lock', valuePropName: 'checked' },
+        { type: 'switch', name: 'rtscts', label: 'rtscts', valuePropName: 'checked' },
+        { type: 'switch', name: 'xon', label: 'xon', valuePropName: 'checked' },
+        { type: 'switch', name: 'xoff', label: 'xoff', valuePropName: 'checked' },
+        { type: 'switch', name: 'xany', label: 'xany', valuePropName: 'checked' },
+        commonFields.description,
+        { type: 'input', name: 'type', label: 'type', hidden: true }
+      ]
+    },
+    {
+      key: 'settings',
+      label: e('settings'),
+      fields: [
+        { type: 'terminalBackground', name: 'terminalBackground', label: e('terminalBackgroundImage') }
+      ]
+    },
+    {
+      key: 'quickCommands',
+      label: e('quickCommands'),
+      fields: [
+        { type: 'quickCommands', name: '__quick__', label: '' }
+      ]
+    }
+  ]
+}
+
+export default serialConfig

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

@@ -0,0 +1,23 @@
+// Config for each session type to drive rendering
+import { connectionMap } from '../../../common/constants'
+import ssh from './ssh'
+import web from './web'
+import vnc from './vnc'
+import telnet from './telnet'
+import serial from './serial'
+import local from './local'
+import rdp from './rdp'
+import ftp from './ftp'
+
+const sessionConfig = {
+  [connectionMap.ssh]: ssh,
+  [connectionMap.telnet]: telnet,
+  [connectionMap.serial]: serial,
+  [connectionMap.local]: local,
+  [connectionMap.vnc]: vnc,
+  [connectionMap.rdp]: rdp,
+  [connectionMap.ftp]: ftp,
+  [connectionMap.web]: web
+}
+
+export default sessionConfig

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

@@ -0,0 +1,47 @@
+// SSH config using common fields
+import { formItemLayout } from '../../../common/form-layout.js'
+import { connectionMap, authTypeMap, defaultEnvLang } from '../../../common/constants.js'
+import defaultSetting from '../../../common/default-setting.js'
+import { createBaseInitValues, getTerminalDefaults, getSshDefaults, getTerminalBackgroundDefaults } from '../common/init-values.js'
+import { sshAuthFields, sshSettings, quickCommandsTab, sshTunnelTab, connectionHoppingTab } from './common-fields.js'
+
+const e = window.translate
+
+const sshConfig = {
+  key: connectionMap.ssh,
+  type: connectionMap.ssh,
+  initValues: (props) => {
+    const { store } = props
+    return createBaseInitValues(props, connectionMap.ssh, {
+      port: 22,
+      authType: authTypeMap.password,
+      id: '',
+      envLang: defaultEnvLang,
+      enableSftp: true,
+      sshTunnels: [],
+      connectionHoppings: [],
+      serverHostKey: [],
+      cipher: [],
+      ...getTerminalDefaults(store),
+      ...getSshDefaults(),
+      ...getTerminalBackgroundDefaults(defaultSetting)
+    })
+  },
+  layout: formItemLayout,
+  tabs: () => [
+    {
+      key: 'auth',
+      label: e('auth'),
+      fields: sshAuthFields
+    },
+    {
+      key: 'settings',
+      label: e('settings'),
+      fields: sshSettings
+    },
+    quickCommandsTab(),
+    sshTunnelTab(),
+    connectionHoppingTab()
+  ]
+}
+export default sshConfig

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

@@ -0,0 +1,40 @@
+import { formItemLayout } from '../../../common/form-layout.js'
+import { terminalTelnetType, authTypeMap } from '../../../common/constants.js'
+import defaultSettings from '../../../common/default-setting.js'
+import { createBaseInitValues, getSshDefaults, getTerminalBackgroundDefaults } from '../common/init-values.js'
+import { telnetAuthFields, terminalSettings, quickCommandsTab } from './common-fields.js'
+
+const e = window.translate
+
+const telnetConfig = {
+  key: 'telnet',
+  type: terminalTelnetType,
+  initValues: (props) => {
+    return createBaseInitValues(props, terminalTelnetType, {
+      port: 23,
+      id: '',
+      username: 'root',
+      password: 'guest',
+      authType: authTypeMap.password,
+      term: defaultSettings.terminalType,
+      ...getSshDefaults(),
+      ...getTerminalBackgroundDefaults(defaultSettings)
+    })
+  },
+  layout: formItemLayout,
+  tabs: () => [
+    {
+      key: 'auth',
+      label: e('auth'),
+      fields: telnetAuthFields
+    },
+    {
+      key: 'settings',
+      label: e('settings'),
+      fields: terminalSettings
+    },
+    quickCommandsTab()
+  ]
+}
+
+export default telnetConfig