@electerm/electerm-react 3.1.16 → 3.2.0

package/client/components/terminal/terminal.jsx

@@ -19,7 +19,8 @@ import {
   isWin,
   rendererTypes,
   isMac,
-  isMacJs
+  isMacJs,
+  connectionMap
 } from '../../common/constants.js'
 import deepCopy from 'json-deep-copy'
 import { readClipboardAsync, readClipboard, copy } from '../../common/clipboard.js'
@@ -27,6 +28,7 @@ import AttachAddon from './attach-addon-custom.js'
 import getProxy from '../../common/get-proxy.js'
 import { ZmodemClient } from './zmodem-client.js'
 import { TrzszClient } from './trzsz-client.js'
+import DropFileModal from './drop-file-modal.jsx'
 import keyControlPressed from '../../common/key-control-pressed.js'
 import NormalBuffer from './normal-buffer.jsx'
 import { createTerm, resizeTerm } from './terminal-apis.js'
@@ -75,7 +77,9 @@ class Term extends Component {
       searchResults: [],
       matchIndex: -1,
       totalLines: 0,
-      reconnectCountdown: null
+      reconnectCountdown: null,
+      dropFileModalVisible: false,
+      droppedFiles: []
     }
     this.id = `term-${this.props.tab.id}`
     refs.add(this.id, this)
@@ -392,9 +396,9 @@ class Term extends Component {
     const dt = e.dataTransfer
     const fromFile = dt.getData('fromFile')
     const notSafeMsg = 'File name contains unsafe characters'
+    const isSshTerminal = this.props.tab.type === connectionMap.ssh
 
     if (fromFile) {
-      // Handle SFTP file drop
       try {
         const fileData = JSON.parse(fromFile)
         const filePath = resolve(fileData.path, fileData.name)
@@ -402,6 +406,13 @@ class Term extends Component {
           message.error(notSafeMsg)
           return
         }
+        if (isSshTerminal) {
+          this.setState({
+            dropFileModalVisible: true,
+            droppedFiles: [{ path: filePath, isRemote: true }]
+          })
+          return
+        }
         this.attachAddon._sendData(`"${filePath}" `)
         return
       } catch (e) {
@@ -409,24 +420,78 @@ class Term extends Component {
       }
     }
 
-    // Handle regular file drop
     const files = dt.files
     if (files && files.length) {
       const arr = Array.from(files)
       const filePaths = arr.map(f => getFilePath(f))
 
-      // Check each file path individually
       const hasUnsafeFilename = filePaths.some(path => isUnsafeFilename(path))
       if (hasUnsafeFilename) {
         message.error(notSafeMsg)
         return
       }
 
+      if (isSshTerminal) {
+        this.setState({
+          dropFileModalVisible: true,
+          droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
+        })
+        return
+      }
+
       const filesAll = filePaths.map(path => `"${path}"`).join(' ')
       this.attachAddon._sendData(filesAll)
     }
   }
 
+  handleDropFileModalCancel = () => {
+    this.setState({
+      dropFileModalVisible: false,
+      droppedFiles: []
+    })
+  }
+
+  handleDropFileAction = (action) => {
+    const { droppedFiles } = this.state
+    if (!droppedFiles || !droppedFiles.length) {
+      this.handleDropFileModalCancel()
+      return
+    }
+
+    const filePaths = droppedFiles.map(f => f.path)
+
+    switch (action) {
+      case 'trzUpload': {
+        if (this.trzszClient && this.trzszClient.isActive) {
+          message.warning('A transfer is already in progress')
+          this.handleDropFileModalCancel()
+          return
+        }
+        window._apiControlSelectFile = filePaths
+        this.attachAddon._sendData('trz\r')
+        break
+      }
+      case 'rzUpload': {
+        if (this.zmodemClient && this.zmodemClient.isActive) {
+          message.warning('A transfer is already in progress')
+          this.handleDropFileModalCancel()
+          return
+        }
+        window._apiControlSelectFile = filePaths
+        this.attachAddon._sendData('rz\r')
+        break
+      }
+      case 'inputPath':
+      default: {
+        const filesAll = filePaths.map(path => `"${path}"`).join(' ')
+        this.attachAddon._sendData(filesAll)
+        break
+      }
+    }
+
+    this.handleDropFileModalCancel()
+  }
+
   onSelection = () => {
     if (
       !this.props.config.copyWhenSelect ||
@@ -771,8 +836,35 @@ class Term extends Component {
     }
   }
 
+  onPasswordPromptDetected = () => {
+    if (!this.props.config.showCmdSuggestions) {
+      return
+    }
+    const cursorPos = this.getCursorPosition()
+    if (cursorPos) {
+      refsStatic
+        .get('terminal-suggestions')
+        ?.openPasswordSuggestions(cursorPos)
+    }
+  }
+
+  onPasswordPromptCancelled = () => {
+    const suggestions = refsStatic.get('terminal-suggestions')
+    if (suggestions?.state?.passwordMode) {
+      suggestions.closeSuggestions()
+    }
+  }
+
   onData = (d) => {
     this.handleInputEvent(d)
+    // Skip normal suggestion logic when in password mode
+    const suggestions = refsStatic.get('terminal-suggestions')
+    if (suggestions?.state?.passwordMode) {
+      if (d === '\r' || d === '\n') {
+        this.closeSuggestions()
+      }
+      return
+    }
     if (this.props.config.showCmdSuggestions) {
       const data = this.getCurrentInput()
       if (data && d !== '\r' && d !== '\n') {
@@ -1459,6 +1551,12 @@ class Term extends Component {
             countdown={this.state.reconnectCountdown}
             onCancel={this.handleCancelAutoReconnect}
           />
+          <DropFileModal
+            visible={this.state.dropFileModalVisible}
+            files={this.state.droppedFiles}
+            onSelect={this.handleDropFileAction}
+            onCancel={this.handleDropFileModalCancel}
+          />
           {spin}
         </div>
       </Dropdown>

package/client/components/terminal/terminal.styl

@@ -127,6 +127,15 @@
   &:hover
     color var(--success)
 
+.suggestion-hint
+  margin-left 5px
+  font-size 0.8em
+  color var(--text-light, #888)
+  white-space nowrap
+  overflow hidden
+  text-overflow ellipsis
+  max-width 150px
+
 .suggestion-delete
   margin-left 5px
   visibility hidden

package/client/components/tree-list/tree-list-item.jsx

@@ -21,7 +21,6 @@ import {
 } from '../../common/constants'
 import highlight from '../common/highlight'
 import uid from '../../common/uid'
-import './tree-list.styl'
 
 const e = window.translate
 

package/client/components/vnc/vnc-session.jsx

@@ -186,6 +186,7 @@ export default class VncSession extends PureComponent {
       qualityLevel = 3, // 0-9, lower = faster performance
       compressionLevel = 1, // 0-9, lower = faster performance
       shared = true,
+      showDotCursor = true, // show dot cursor when server sends no cursor image (common on Windows)
       username,
       password
     } = tab
@@ -376,6 +377,7 @@ export default class VncSession extends PureComponent {
     rfb.qualityLevel = qualityLevel
     rfb.compressionLevel = compressionLevel
     rfb.viewOnly = viewOnly
+    rfb.showDotCursor = showDotCursor
     this.rfb = rfb
   }
 

package/client/components/widgets/widget-control.jsx

@@ -49,6 +49,9 @@ export default function WidgetControl ({ formData, widgetInstancesLength }) {
         config
       }
       window.store.widgetInstances.push(instance)
+      if (config.autoRun) {
+        window.store.toggleAutoRunWidget(instance)
+      }
       showMsg(msg, 'success', result.serverInfo, 10)
     } catch (err) {
       console.error('Failed to run widget:', err)

package/client/components/widgets/widget-instance.jsx

@@ -1,12 +1,21 @@
-import { Popconfirm, Popover } from 'antd'
-import { CloseOutlined, CopyOutlined } from '@ant-design/icons'
+import {
+  Popconfirm,
+  Popover,
+  Tooltip,
+  Tag
+} from 'antd'
+import { CloseOutlined, CopyOutlined, ThunderboltOutlined } from '@ant-design/icons'
 import { copy } from '../../common/clipboard'
+import classnames from 'classnames'
+import { auto } from 'manate/react'
 
 const e = window.translate
 
-export default function WidgetInstance ({ item }) {
-  const { id, title, serverInfo } = item
-  const cls = 'item-list-unit'
+export default auto(function WidgetInstance ({ item }) {
+  const { id, title, serverInfo, autoRun } = item
+  const cls = classnames('item-list-unit', {
+    'autorun-active': autoRun
+  })
   const delProps = {
     title: e('del'),
     className: 'pointer list-item-remove'
@@ -31,6 +40,9 @@ export default function WidgetInstance ({ item }) {
       copy(serverInfo.url)
     }
   }
+  const handleToggleAutoRun = () => {
+    window.store.toggleAutoRunWidget(item)
+  }
   const popoverContent = serverInfo
     ? (
       <div>
@@ -45,12 +57,13 @@ export default function WidgetInstance ({ item }) {
       </div>
       )
     : null
+  const tag = autoRun ? <Tag color='green'>{e('autoRun')}</Tag> : null
   const titleDiv = (
     <div
       title={title}
       className='elli pd1y pd2x list-item-title'
     >
-      {title}
+      {tag} {title}
     </div>
   )
   return (
@@ -71,6 +84,12 @@ export default function WidgetInstance ({ item }) {
             )
           : titleDiv
       }
+      <Tooltip title='Toggle auto-run'>
+        <ThunderboltOutlined
+          className='pointer list-item-autorun'
+          onClick={handleToggleAutoRun}
+        />
+      </Tooltip>
       <Popconfirm
         {...popProps}
       >
@@ -78,4 +97,4 @@ export default function WidgetInstance ({ item }) {
       </Popconfirm>
     </div>
   )
-}
+})

package/client/css/includes/box.styl

@@ -106,6 +106,9 @@ for $i, $index in 5 16 32
   position absolute
 .pointer
   cursor pointer
+.drag
+  cursor move
+  user-select none
 .width-100
   width 100%
 .width-40

package/client/store/init-state.js

@@ -126,6 +126,7 @@ export default () => {
     showModal: 0,
 
     // setting sync related
+    autoSyncReady: false,
     isSyncingSetting: false,
     isSyncUpload: false,
     isSyncDownload: false,
@@ -155,7 +156,7 @@ export default () => {
     qmSortByFrequency: ls.getItem(qmSortByFrequencyKey) === 'yes',
 
     // sidebar
-    openedSideBar: ls.getItem(openedSidebarKey),
+    openedSideBar: ls.getItem(openedSidebarKey) || '',
     leftSidebarWidth: parseInt(ls.getItem(leftSidebarWidthKey), 10) || 300,
     addPanelWidth: parseInt(ls.getItem(addPanelWidthLsKey), 10) || 300,
     menuOpened: false,
@@ -200,6 +201,7 @@ export default () => {
     // widgets
     widgets: [],
     widgetInstances: [],
+    autoRunWidgets: [],
     // move item
     openMoveModal: false,
     moveItem: null,

package/client/store/load-data.js

@@ -206,9 +206,18 @@ export default (Store) => {
       },
       1000
     )
+    setTimeout(
+      () => {
+        store.autoSyncReady = true
+      },
+      2000
+    )
     if (store.config.checkUpdateOnStart) {
       store.onCheckUpdate(false)
     }
+    store.startAutoRunWidgets().catch(err => {
+      console.error('Failed to start autorun widgets:', err)
+    })
   }
   Store.prototype.initCommandLine = async function () {
     const opts = await window.pre.runGlobalAsync('initCommandLine')

package/client/store/mcp-handler.js

@@ -130,6 +130,14 @@ export default Store => {
           result = await store.mcpSftpDownload(args)
           break
 
+        // Transfer list/history operations
+        case 'sftp_transfer_list':
+          result = store.mcpSftpTransferList()
+          break
+        case 'sftp_transfer_history':
+          result = store.mcpSftpTransferHistory()
+          break
+
         // Zmodem (trzsz/rzsz) operations
         case 'zmodem_upload':
           result = store.mcpZmodemUpload(args)
@@ -692,6 +700,16 @@ export default Store => {
     }
   }
 
+  // ==================== Transfer List/History APIs ====================
+
+  Store.prototype.mcpSftpTransferList = function () {
+    return deepCopy(window.store.fileTransfers)
+  }
+
+  Store.prototype.mcpSftpTransferHistory = function () {
+    return deepCopy(window.store.transferHistory)
+  }
+
   // ==================== Zmodem (trzsz/rzsz) APIs ====================
 
   Store.prototype.mcpZmodemUpload = function (args) {

package/client/store/sync.js

@@ -7,7 +7,7 @@ import copy from 'json-deep-copy'
 import {
   settingMap, packInfo, syncTypes, syncDataMaps
 } from '../common/constants'
-import { dbNames, update, getData } from '../common/db'
+import { update, getData } from '../common/db'
 import fetch from '../common/fetch-from-server'
 import download from '../common/download'
 import { fixBookmarks } from '../common/db-fix'
@@ -152,10 +152,8 @@ export default (Store) => {
   }
 
   Store.prototype.uploadSettingAll = async function () {
-    const { store, onSyncAll, syncCount = 0 } = window
-    const max = dbNames.length * 2
-    if (syncCount < max) {
-      window.syncCount = syncCount + 1
+    const { store, onSyncAll } = window
+    if (store.autoSyncReady === false) {
       return
     }
     if (onSyncAll) {

package/client/store/watch.js

@@ -4,7 +4,7 @@
 
 import createTitle from '../common/create-title'
 import { autoRun } from 'manate'
-import { update, remove, insert, dbNamesForWatch } from '../common/db'
+import { update, remove, insert, dbNamesForWatch, dbNamesForSync } from '../common/db'
 import {
   sftpDefaultSortSettingKey,
   checkedKeysLsKey,
@@ -68,7 +68,7 @@ export default store => {
         )
       }
       await store.updateLastDataUpdateTime()
-      if (store.config.autoSync) {
+      if (store.config.autoSync && dbNamesForSync.includes(name)) {
         await store.uploadSettingAll()
       }
       return store[name]

package/client/store/widgets.js

@@ -7,6 +7,8 @@ import {
   settingMap
 } from '../common/constants'
 import getInitItem from '../common/init-setting-item'
+import deepCopy from 'json-deep-copy'
+import generate from '../common/uid'
 
 export default Store => {
   Store.prototype.listWidgets = async () => {
@@ -58,4 +60,56 @@ export default Store => {
     store.settingTab = settingMap.widgets
     store.openSettingModal()
   }
+
+  Store.prototype.toggleAutoRunWidget = (instance) => {
+    const { store } = window
+    const { widgetId, config } = instance
+    if (instance.autoRun) {
+      const index = store.autoRunWidgets.findIndex(
+        w => w.id === instance.autoRunId
+      )
+      if (index > -1) {
+        store.autoRunWidgets.splice(index, 1)
+      }
+      instance.autoRun = false
+      instance.autoRunId = undefined
+    } else {
+      const id = generate()
+      const item = {
+        id,
+        widgetId,
+        config
+      }
+      store.autoRunWidgets.push(item)
+      instance.autoRun = true
+      instance.autoRunId = id
+    }
+  }
+
+  Store.prototype.startAutoRunWidgets = async function () {
+    const { store } = window
+    const items = store.autoRunWidgets
+    if (!items || !items.length) {
+      return
+    }
+    for (const item of items) {
+      try {
+        const result = await store.runWidget(item.widgetId, deepCopy(item.config))
+        if (result && result.instanceId) {
+          const instance = {
+            id: result.instanceId,
+            title: `${result.widgetId} (${result.instanceId})`,
+            widgetId: result.widgetId,
+            serverInfo: result.serverInfo,
+            config: item.config,
+            autoRun: true,
+            autoRunId: item.id
+          }
+          store.widgetInstances.push(instance)
+        }
+      } catch (err) {
+        console.error(`Failed to autorun widget ${item.widgetId}:`, err)
+      }
+    }
+  }
 }

package/package.json

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