@electerm/electerm-react 2.11.6 → 2.12.0

package/client/common/default-setting.js

@@ -32,6 +32,7 @@ export default {
   enableSixel: true,
   terminalType: 'xterm-256color',
   keepaliveCountMax: 10,
+  keyword2FA: 'verification code,otp,one-time,two-factor,2fa,totp,authenticator,duo,yubikey,security code,mfa,passcode',
   saveTerminalLogToFile: false,
   checkUpdateOnStart: true,
   cursorBlink: false,

package/client/common/fetch.jsx

@@ -30,7 +30,7 @@ export async function handleErr (res) {
   }
   console.debug(text, 'fetch err info')
   notification.error({
-    message: 'http request error',
+    message: 'error',
     description: (
       <div className='common-err'>
         {text}

package/client/components/bg/css-overwrite.jsx

@@ -118,7 +118,11 @@ export default class CssOverwrite extends Component {
     const selector = `#container .sessions .session-${tab.id} .xterm-screen::before`
     const styles = []
     if (st === 'index') {
-      styles.push(`content: '${tab.tabCount}'`)
+      styles.push(
+        `content: '${tab.tabCount}'`,
+        'background-image: none',
+        'opacity: 0.1'
+      )
     } else if (st === 'text') {
       const text = bg.terminalBackgroundText || this.props.terminalBackgroundText || ''
       const size = bg.terminalBackgroundTextSize || this.props.terminalBackgroundTextSize || 48

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

@@ -25,7 +25,6 @@ import { fixBookmarkData } from './fix-bookmark-default.js'
 import generate from '../../common/id-with-stamp'
 import AiHistory, { addHistoryItem } from '../ai/ai-history.jsx'
 import { getItem, setItem } from '../../common/safe-local-storage'
-import newTerminal from '../../common/new-terminal'
 
 const STORAGE_KEY_DESC = 'ai_bookmark_description'
 const STORAGE_KEY_HISTORY = 'ai_bookmark_history'
@@ -110,12 +109,12 @@ export default function AIBookmarkForm (props) {
   }
 
   function getGeneratedData () {
-    if (!editorText) return message.warning(e('noData') || 'No data')
+    if (!editorText) return []
     let parsed = null
     try {
       parsed = fixBookmarkData(JSON.parse(editorText))
     } catch (err) {
-      return message.error(e('invalidJson') || 'Invalid JSON')
+      return []
     }
     if (!parsed) return []
     return Array.isArray(parsed) ? parsed : [parsed]
@@ -182,7 +181,6 @@ export default function AIBookmarkForm (props) {
 
     const tabOptions = {
       ...bm,
-      ...newTerminal(),
       from: 'quickConnect'
     }
 

package/client/components/main/main.jsx

@@ -48,7 +48,7 @@ export default auto(function Index (props) {
     ipcOnEvent('open-about', store.openAbout)
     ipcOnEvent('new-ssh', store.onNewSsh)
     ipcOnEvent('add-tab-from-command-line', store.addTabFromCommandLine)
-    ipcOnEvent('open-tab', store.addTab)
+    ipcOnEvent('open-tab', (e, parsed) => store.addTab(parsed))
     ipcOnEvent('openSettings', store.openSetting)
     ipcOnEvent('selectall', store.selectall)
     ipcOnEvent('focused', store.focus)

package/client/components/setting-panel/deep-link-control.jsx

@@ -65,7 +65,7 @@ export default function DeepLinkControl () {
   }
 
   const renderTooltipContent = () => {
-    const protocols = ['ssh', 'telnet', 'rdp', 'vnc', 'serial', 'spice', 'electerm']
+    const protocols = ['ssh', 'telnet', 'rdp', 'vnc', 'serial', 'spice', 'electerm', 'ftp']
     const tip = `Register electerm to handle protocol URLs (${protocols.join('://, ')})`
 
     return (

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

@@ -584,6 +584,10 @@ export default class SettingCommon extends Component {
         {
           this.renderTextExec('execLinux')
         }
+        <div className='pd1b'>{e('keyword2FA')}</div>
+        {
+          this.renderText('keyword2FA')
+        }
         {
           [
             'autoRefreshWhenSwitchToSftp',

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

@@ -302,7 +302,7 @@ export default class Sftp extends Component {
     }, () => this[`${type}List`]())
   }
 
-  updateCwd = (cwd) => {
+  updateCwd = (cwd = this.props.cwd) => {
     if (!this.state.inited) {
       return
     }

package/client/components/shortcuts/shortcut-control.jsx

@@ -219,6 +219,27 @@ class ShortcutControl extends React.PureComponent {
     }
   }, 1000)
 
+  clickSftpIcon = () => {
+    const icon = document.querySelector('.session-current .sftp-follow-ssh-icon')
+    if (!icon) return
+    icon.click()
+  }
+
+  syncSftpPathShortcut = throttle((e) => {
+    e.stopPropagation()
+    const { activeTabId } = window.store
+    if (!activeTabId) return
+    // Get the SFTP component which can sync the path
+    const sftp = refs.get('sftp-' + activeTabId)
+    if (!sftp) return
+    this.clickSftpIcon()
+    // Wait for the path to be synced
+    setTimeout(() => {
+      this.clickSftpIcon()
+      sftp.updateCwd()
+    }, 100)
+  }, 1000)
+
   render () {
     return null
   }

package/client/components/shortcuts/shortcuts-defaults.js

@@ -115,6 +115,11 @@ export default () => {
       name: 'terminal_zoomoutTerminal',
       shortcut: 'ctrl+▼',
       shortcutMac: 'meta+▼'
+    },
+    {
+      name: 'terminal_syncSftpPath',
+      shortcut: 'alt+shift+f11',
+      shortcutMac: 'alt+shift+f11'
     }
   ]
 }

package/client/components/tabs/quick-connect.jsx

@@ -3,7 +3,6 @@ import { Button, Space } from 'antd'
 import { ArrowRightOutlined, ThunderboltOutlined } from '@ant-design/icons'
 import message from '../common/message'
 import InputAutoFocus from '../common/input-auto-focus'
-import newTerminal from '../../common/new-terminal'
 import HelpIcon from '../common/help-icon'
 
 const e = window.translate
@@ -17,7 +16,6 @@ function connectWithOptions (opts, batch) {
   const { store } = window
   const tabOptions = {
     ...opts,
-    ...newTerminal(),
     from: 'quickConnect',
     batch
   }
@@ -61,7 +59,6 @@ export default function QuickConnect ({ batch, inputOnly }) {
     }
 
     const opts = window.store.parseQuickConnect(inputValue)
-    console.log('quick connect opts', opts)
     if (!opts) {
       return message.error('Format error, please check the input', 10)
     }

package/client/components/terminal/terminal.jsx

@@ -1097,6 +1097,7 @@ class Term extends Component {
         'execWindowsArgs',
         'execMacArgs',
         'execLinuxArgs',
+        'keyword2FA',
         'debug'
       ]),
       keepaliveInterval: tab.keepaliveInterval || config.keepaliveInterval,

package/client/store/load-data.js

@@ -220,7 +220,7 @@ export default (Store) => {
   Store.prototype.checkPendingDeepLink = async function () {
     const pending = await window.pre.runGlobalAsync('getPendingDeepLink')
     if (pending) {
-      addTabFromCommandLine(window.store, pending)
+      window.store.addTab(pending)
     }
   }
   Store.prototype.parseQuickConnect = function (url) {

package/client/store/tab.js

@@ -341,6 +341,15 @@ export default Store => {
     const { tabs } = store
     newTab.tabCount = store.nextTabCount()
     newTab.batch = batch ?? newTab.batch ?? window.openTabBatch ?? window.store.currentLayoutBatch
+    if (!newTab.id) {
+      newTab.id = generate()
+    }
+    if (!newTab.status) {
+      newTab.status = statusMap.processing
+    }
+    if (!newTab.pane) {
+      newTab.pane = paneMap.terminal
+    }
     if (typeof index === 'number' && index >= 0 && index <= tabs.length) {
       tabs.splice(index, 0, newTab)
     } else {

package/package.json

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