@electerm/electerm-react 1.72.6 → 1.72.16

package/client/common/default-setting.js

@@ -64,5 +64,6 @@ export default {
   roleAI: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式',
   apiPathAI: '/chat/completions',
   sessionLogPath: '',
-  sshSftpSplitView: false
+  sshSftpSplitView: false,
+  showCmdSuggestions: false
 }

package/client/components/bookmark-form/sftp-enable.jsx

@@ -19,6 +19,15 @@ export default function renderEnableSftp () {
     >
       <Switch />
     </FormItem>,
+    <FormItem
+      {...formItemLayout}
+      label='SFTP'
+      name='enableSftp'
+      key='sftp'
+      valuePropName='checked'
+    >
+      <Switch />
+    </FormItem>,
     <FormItem
       {...formItemLayout}
       label={e('ignoreKeyboardInteractive')}

package/client/components/bookmark-form/ssh-form-ui.jsx

@@ -65,6 +65,7 @@ export default function BookmarkFormUI (props) {
     encode: encodes[0],
     envLang: defaultEnvLang,
     enableSsh: true,
+    enableSftp: true,
     sshTunnels: [],
     runScripts: [{}],
     category: initBookmarkGroupId,

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

@@ -237,6 +237,9 @@ export default class BookmarkForm extends PureComponent {
   }
 
   handleSubmit = async (evt, res, isTest = false) => {
+    if (res.enableSsh === false && res.enableSftp === false) {
+      return message.warning('SSH and SFTP all disabled')
+    }
     const obj = {
       ...this.props.formData,
       ...res

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

@@ -3,21 +3,90 @@
  */
 import {
   Switch,
-  Form
+  Form,
+  Select
 } from 'antd'
 import { formItemLayout } from '../../common/form-layout'
 
 const FormItem = Form.Item
+const { Option } = Select
+
+// Available cipher options from ssh2-alg.js
+const cipherOptions = [
+  'aes128-ctr',
+  'aes192-ctr',
+  'aes256-ctr',
+  'aes128-gcm',
+  'aes128-gcm@openssh.com',
+  'aes256-gcm',
+  'aes256-gcm@openssh.com',
+  'aes256-cbc',
+  'aes192-cbc',
+  'aes128-cbc',
+  'blowfish-cbc',
+  '3des-cbc',
+  'arcfour256',
+  'arcfour128',
+  'cast128-cbc',
+  'arcfour',
+  'chacha20-poly1305@openssh.com',
+  'umac-128-etm@openssh.com',
+  'curve25519-sha256@libssh.org'
+]
+
+// Available serverHostKey options from ssh2-alg.js
+const serverHostKeyOptions = [
+  'ssh-rsa',
+  'ssh-ed25519',
+  'ecdsa-sha2-nistp256',
+  'ecdsa-sha2-nistp384',
+  'ecdsa-sha2-nistp521',
+  'ssh-dss',
+  'rsa-sha2-512',
+  'rsa-sha2-256'
+]
 
 export default function renderX11 () {
   return (
-    <FormItem
-      {...formItemLayout}
-      label='x11'
-      name='x11'
-      valuePropName='checked'
-    >
-      <Switch />
-    </FormItem>
+    <>
+      <FormItem
+        {...formItemLayout}
+        label='cipher'
+        name='cipher'
+      >
+        <Select
+          mode='multiple'
+        >
+          {cipherOptions.map(cipher => (
+            <Option key={cipher} value={cipher}>
+              {cipher}
+            </Option>
+          ))}
+        </Select>
+      </FormItem>
+      <FormItem
+        {...formItemLayout}
+        label='serverHostKey'
+        name='serverHostKey'
+      >
+        <Select
+          mode='multiple'
+        >
+          {serverHostKeyOptions.map(key => (
+            <Option key={key} value={key}>
+              {key}
+            </Option>
+          ))}
+        </Select>
+      </FormItem>
+      <FormItem
+        {...formItemLayout}
+        label='x11'
+        name='x11'
+        valuePropName='checked'
+      >
+        <Switch />
+      </FormItem>
+    </>
   )
 }

package/client/components/layout/layout.jsx

@@ -180,7 +180,8 @@ export default auto(function Layout (props) {
       'openedSideBar',
       'config'
     ]),
-    tabs: store.tabs
+    tabs: store.tabs,
+    layout
   }
   return [
     <Layouts {...layoutProps} key='layouts'>

package/client/components/session/session.jsx

@@ -30,7 +30,8 @@ import {
   terminalRdpType,
   terminalVncType,
   terminalWebType,
-  terminalTelnetType
+  terminalTelnetType,
+  splitMap
 } from '../../common/constants'
 import { SplitViewIcon } from '../icons/split-view'
 import { refs } from '../common/ref'
@@ -73,6 +74,19 @@ export default class SessionWrapper extends Component {
     return this.domRef.current
   }
 
+  isDisabled = () => {
+    const { enableSsh, enableSftp } = this.props.tab
+    return enableSsh === false || enableSftp === false
+  }
+
+  isSshDisabled = () => {
+    return this.props.tab.enableSsh === false
+  }
+
+  isSftpDisabled = () => {
+    return this.props.tab.enableSftp === false
+  }
+
   handleSshSftpSplitView = () => {
     const nv = !this.props.tab.sshSftpSplitView
     this.editTab({
@@ -84,10 +98,9 @@ export default class SessionWrapper extends Component {
   canSplitView = () => {
     const {
       width,
-      height,
-      tab
+      height
     } = this.props
-    if (tab.enableSsh === false) {
+    if (this.isDisabled()) {
       return false
     }
     return width > this.minWithForSplit ||
@@ -419,7 +432,8 @@ export default class SessionWrapper extends Component {
     } = this.state
     const { pane, id, sshSftpSplitView } = this.props.tab
     if (
-      this.isNotTerminalType()
+      this.isNotTerminalType() ||
+      this.isSftpDisabled()
     ) {
       return null
     }
@@ -506,6 +520,12 @@ export default class SessionWrapper extends Component {
   }
 
   renderBroadcastIcon = () => {
+    if (
+      this.props.layout === splitMap.c1 ||
+      this.isSshDisabled()
+    ) {
+      return null
+    }
     const { broadcastInput } = this.state
     const title = e('broadcastInput')
     const iconProps = {
@@ -571,6 +591,9 @@ export default class SessionWrapper extends Component {
     const {
       sshSftpSplitView
     } = this.props.tab
+    if (this.isDisabled()) {
+      return null
+    }
     if (sshSftpSplitView && this.canSplitView()) {
       return null
     }
@@ -626,6 +649,9 @@ export default class SessionWrapper extends Component {
   }
 
   renderSftpPathFollowControl = () => {
+    if (this.isDisabled()) {
+      return null
+    }
     const {
       sftpPathFollowSsh
     } = this.state

package/client/components/session/sessions.jsx

@@ -62,6 +62,7 @@ export default class Sessions extends Component {
       }
       const sessProps = {
         activeTabId,
+        layout: this.props.layout,
         tab,
         width,
         height,

package/client/components/setting-panel/setting-terminal.jsx

@@ -594,7 +594,8 @@ export default class SettingTerminal extends Component {
             'copyWhenSelect',
             'ctrlOrMetaOpenTerminalLink',
             'sftpPathFollowSsh',
-            'sshSftpSplitView'
+            'sshSftpSplitView',
+            'showCmdSuggestions'
           ].map(d => this.renderToggle(d))
         }
         <div className='pd1b'>{e('terminalBackSpaceMode')}</div>

package/client/components/sftp/file-item.jsx

@@ -336,7 +336,7 @@ export default class FileSection extends React.Component {
       const { name, path } = file
       const info = await getLocalFileInfo(
         resolve(path, name)
-      )
+      ).catch(console.log)
       if (info) {
         res.push(info)
       }

package/client/components/sftp/file-read.js

@@ -43,25 +43,20 @@ export const getFolderFromFilePath = (filePath, isRemote) => {
 }
 
 export const getLocalFileInfo = async (filePath) => {
-  try {
-    const statr = await fs.statAsync(filePath)
-    const stat = await fs.lstatAsync(filePath)
-    return {
-      size: stat.size,
-      accessTime: stat.atime,
-      modifyTime: stat.mtime,
-      mode: stat.mode,
-      owner: stat.uid,
-      group: stat.gid,
-      type: 'local',
-      ...getFolderFromFilePath(filePath, false),
-      id: generate(),
-      isDirectory: statr.isDirectory,
-      isSymbolicLink: stat.isSymbolicLink
-    }
-  } catch (e) {
-    log.debug(e)
-    return null
+  const statr = await fs.statAsync(filePath)
+  const stat = await fs.lstatAsync(filePath)
+  return {
+    size: stat.size,
+    accessTime: stat.atime,
+    modifyTime: stat.mtime,
+    mode: stat.mode,
+    owner: stat.uid,
+    group: stat.gid,
+    type: 'local',
+    ...getFolderFromFilePath(filePath, false),
+    id: generate(),
+    isDirectory: statr.isDirectory,
+    isSymbolicLink: stat.isSymbolicLink
   }
 }
 

package/client/components/sftp/sftp-entry.jsx

@@ -736,7 +736,7 @@ export default class Sftp extends Component {
       const local = []
       for (const name of locals) {
         const p = resolve(localPath, name)
-        const fileObj = await getLocalFileInfo(p)
+        const fileObj = await getLocalFileInfo(p).catch(console.log)
         if (fileObj) {
           local.push(fileObj)
         }

package/client/components/sftp/transfer-conflict-store.jsx

@@ -39,7 +39,7 @@ export default class TransferConflictStore extends PureComponent {
   }
 
   localCheckExist = (path) => {
-    return getLocalFileInfo(path)
+    return getLocalFileInfo(path).catch(console.log)
   }
 
   remoteCheckExist = (path, sessionId) => {

package/client/components/terminal/terminal-command-dropdown.jsx

@@ -190,10 +190,10 @@ export default class TerminalCmdSuggestions extends Component {
     this.closeSuggestions()
   }
 
-  processCommands = (commands, type, uniqueCommands, res) => {
+  processCommands = (commands = [], type, uniqueCommands, res) => {
     const { cmd } = this.state
     commands
-      .filter(command => command.startsWith(cmd))
+      .filter(command => command && command.startsWith(cmd))
       .forEach(command => {
         if (!uniqueCommands.has(command)) {
           uniqueCommands.add(command)

package/client/components/terminal/terminal.jsx

@@ -75,10 +75,7 @@ class Term extends Component {
   componentDidMount () {
     this.initTerminal()
     if (this.props.tab.enableSsh === false) {
-      ;(
-        document.querySelector('.session-current .term-sftp-tabs .type-tab.sftp') ||
-        document.querySelector('.session-current .term-sftp-tabs .type-tab.fileManager')
-      ).click()
+      this.props.tab.pane = paneMap.fileManager
     }
   }
 
@@ -560,7 +557,7 @@ clear\r`
     }
     const r = []
     for (const filePath of files) {
-      const stat = await getLocalFileInfo(filePath)
+      const stat = await getLocalFileInfo(filePath).catch(console.log)
       r.push({ ...stat, filePath })
     }
     return r
@@ -867,9 +864,11 @@ clear\r`
     if (!d.includes('\r')) {
       delete this.userTypeExit
       const cursorPos = this.getCursorPosition()
-      refsStatic
-        .get('terminal-suggestions')
-        ?.openSuggestions(cursorPos, data)
+      if (this.props.config.showCmdSuggestions && data.length > 1) {
+        refsStatic
+          .get('terminal-suggestions')
+          ?.openSuggestions(cursorPos, data)
+      }
     } else {
       this.closeSuggestions()
       if (this.term.buffer.active.type !== 'alternate') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "1.72.6",
+  "version": "1.72.16",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",