@electerm/electerm-react 3.2.0 → 3.5.6

package/client/components/batch-op/batch-op-runner.jsx

@@ -0,0 +1,315 @@
+import { Component } from 'react'
+import { refsStatic } from '../common/ref'
+import { statusMap } from '../../common/constants'
+import { autoRun } from 'manate'
+import uid from '../../common/uid'
+
+const STATIC_KEY = 'batch-op-runner'
+
+export default class BatchOpRunner extends Component {
+  constructor () {
+    super()
+    this.steps = []
+    this.currentIndex = 0
+    this.status = 'idle'
+    this.currentTabId = null
+    this.currentStep = null
+  }
+
+  componentDidMount () {
+    refsStatic.add(STATIC_KEY, this)
+  }
+
+  getActiveTabId () {
+    return window.store?.activeTabId
+  }
+
+  getState () {
+    return {
+      steps: this.steps,
+      currentIndex: this.currentIndex,
+      status: this.status,
+      currentStep: this.currentStep
+    }
+  }
+
+  reset () {
+    this.steps = []
+    this.currentIndex = 0
+    this.status = 'idle'
+    this.currentTabId = null
+    this.currentStep = null
+  }
+
+  runBatchOpFromFile (filePath) {
+    return this._runBatchOpFromFile(filePath)
+  }
+
+  executeWorkflow (workflows) {
+    return this._executeWorkflow(workflows)
+  }
+
+  async _runBatchOpFromFile (filePath) {
+    try {
+      const content = await window.fs.readFile(filePath)
+      let workflows
+      try {
+        workflows = JSON.parse(content)
+        if (!Array.isArray(workflows)) {
+          throw new Error('Workflow must be an array')
+        }
+      } catch (e) {
+        console.error('Invalid batch operation JSON:', e.message)
+        return
+      }
+
+      this.reset()
+      await this._executeWorkflow(workflows)
+      console.log('Batch operation completed from file')
+    } catch (e) {
+      console.error('Failed to run batch operation from file:', e.message)
+    }
+  }
+
+  async _executeWorkflow (workflows) {
+    if (!Array.isArray(workflows)) {
+      throw new Error('Workflow must be an array')
+    }
+
+    this.steps = []
+    this.currentIndex = 0
+    this.status = 'running'
+
+    const results = []
+    const logsRef = refsStatic.get('batch-op-logs')
+
+    for (let i = 0; i < workflows.length; i++) {
+      const step = workflows[i]
+      this.currentIndex = i
+      this.currentStep = step.name
+
+      logsRef?.setLogs(this.getState())
+
+      let result
+      try {
+        result = await this._executeStep(step, results)
+        this.steps.push({ name: step.name, status: 'success', result })
+        results.push(result)
+        console.log(`Batch op step ${i + 1} completed:`, step.name || 'unnamed')
+      } catch (e) {
+        console.log(e)
+        this.steps.push({ name: step.name, status: 'error', error: e.message })
+        logsRef?.setLogs(this.getState())
+        console.error(`Batch op step ${i + 1} failed:`, step.name || 'unnamed', e.message)
+        this.status = 'error'
+        logsRef?.setLogs(this.getState())
+        throw e
+      }
+    }
+
+    this.status = 'completed'
+    this.currentStep = null
+    logsRef?.setLogs(this.getState())
+  }
+
+  async _executeStep (step, previousResults) {
+    const { action, prevDelay, afterDelay } = step
+
+    if (!action) {
+      throw new Error('Step must have an "action" field')
+    }
+
+    if (prevDelay > 0) {
+      await new Promise(resolve => setTimeout(resolve, prevDelay))
+    }
+
+    const s = step.params ? { ...step, ...step.params } : step
+
+    let result
+    switch (action) {
+      case 'connect':
+        result = await this._batchStepConnect(s)
+        this.currentTabId = result.tabId
+        break
+      case 'command':
+        result = await this._batchStepCommand(s)
+        break
+      case 'sftp_upload':
+        result = await this._batchStepSftpUpload(s)
+        break
+      case 'sftp_download':
+        result = await this._batchStepSftpDownload(s)
+        break
+      default:
+        throw new Error(`Unknown action: ${action}`)
+    }
+
+    if (afterDelay > 0) {
+      await new Promise(resolve => setTimeout(resolve, afterDelay))
+    }
+
+    return result
+  }
+
+  async _batchStepConnect (step) {
+    const { store } = window
+    const p = step.params || step
+
+    const tabId = uid()
+    const tab = {
+      id: tabId,
+      type: 'ssh',
+      host: p.host || '',
+      port: p.port || 22,
+      username: p.username || '',
+      password: p.password || '',
+      privateKey: p.privateKey || '',
+      passphrase: p.passphrase || '',
+      certificate: p.certificate || '',
+      authType: p.authType || 'password',
+      profile: p.profile || '',
+      enableSftp: p.enableSftp !== false,
+      enableSsh: p.enableSsh !== false,
+      useSshAgent: p.useSshAgent !== false,
+      sshAgent: p.sshAgent || '',
+      term: p.term || 'xterm-256color',
+      encode: p.encode || 'utf8',
+      envLang: p.envLang || 'en_US.UTF-8',
+      setEnv: p.setEnv || '',
+      startDirectoryRemote: p.startDirectoryRemote || '',
+      startDirectoryLocal: p.startDirectoryLocal || '',
+      proxy: p.proxy || '',
+      x11: p.x11 || false,
+      displayRaw: p.displayRaw || false,
+      sshTunnels: p.sshTunnels || [],
+      connectionHoppings: p.connectionHoppings || [],
+      title: step.name || `SSH: ${p.host}`,
+      status: 'processing',
+      pane: 'terminal'
+    }
+
+    store.addTab(tab)
+    await this._waitForConnection(tabId)
+
+    return {
+      success: true,
+      action: 'connect',
+      host: p.host,
+      port: p.port,
+      tabId
+    }
+  }
+
+  _waitForConnection = async (tabId) => {
+    return new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        if (this._refWait) {
+          this._refWait.stop()
+          delete this._refWait
+        }
+        reject(new Error('Connection timeout'))
+      }, 30000)
+
+      this._refWait = autoRun(() => {
+        const { tabs } = window.store
+        const tab = tabs.find(t => t.id === tabId)
+        if (tab && tab.status === statusMap.success) {
+          clearTimeout(timeout)
+          this._refWait && this._refWait.stop()
+          delete this._refWait
+          resolve(tab)
+        } else if (tab && tab.status === statusMap.error) {
+          clearTimeout(timeout)
+          this._refWait && this._refWait.stop()
+          delete this._refWait
+          reject(new Error('Connection failed: ' + (tab.errorMsg || 'unknown error')))
+        }
+        return window.store.tabs
+      })
+      this._refWait.start()
+    })
+  }
+
+  async _batchStepCommand (step) {
+    const tabId = this.currentTabId
+
+    if (!tabId) {
+      throw new Error('No active tab. Please connect first.')
+    }
+
+    const { refs } = await import('../common/ref')
+    const term = refs.get('term-' + tabId)
+    if (!term || !term.term) {
+      throw new Error('Terminal not found')
+    }
+
+    let waited = 0
+    while (!term.attachAddon && waited < 10000) {
+      await new Promise(resolve => setTimeout(resolve, 200))
+      waited += 200
+    }
+    if (!term.attachAddon) {
+      throw new Error('Terminal not ready: attach addon not initialized')
+    }
+
+    term.runQuickCommand(step.command)
+
+    return {
+      success: true,
+      action: 'command',
+      command: step.command,
+      tabId
+    }
+  }
+
+  async _batchStepSftpUpload (step) {
+    const tabId = this.currentTabId
+    const { store } = window
+    const stepWithTabId = { ...step, tabId, conflictPolicy: 'mergeOrOverwriteAll' }
+    const { transferId } = await store.mcpSftpUpload(stepWithTabId)
+    await this._batchWaitForTransfer(transferId)
+    return { success: true, action: 'sftp_upload', localPath: step.localPath, remotePath: step.remotePath, transferId, tabId }
+  }
+
+  async _batchStepSftpDownload (step) {
+    const tabId = this.currentTabId
+    const { store } = window
+    const stepWithTabId = { ...step, tabId, conflictPolicy: 'mergeOrOverwriteAll' }
+    const { transferId } = await store.mcpSftpDownload(stepWithTabId)
+    await this._batchWaitForTransfer(transferId)
+    return { success: true, action: 'sftp_download', remotePath: step.remotePath, localPath: step.localPath, transferId, tabId }
+  }
+
+  async _batchWaitForTransfer (transferId) {
+    return new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        if (this._refTransferWait) {
+          this._refTransferWait.stop()
+          delete this._refTransferWait
+        }
+        reject(new Error('Transfer timeout (1 hour)'))
+      }, 60 * 60 * 1000)
+
+      this._refTransferWait = autoRun(() => {
+        const { transferHistory } = window.store
+        const item = transferHistory.find(t => t.id === transferId || t.originalId === transferId)
+        if (item) {
+          clearTimeout(timeout)
+          this._refTransferWait && this._refTransferWait.stop()
+          delete this._refTransferWait
+          if (item.error) {
+            reject(new Error('Transfer failed: ' + item.error))
+          } else {
+            resolve(item)
+          }
+        }
+        return window.store.transferHistory
+      })
+      this._refTransferWait.start()
+    })
+  }
+
+  render () {
+    return null
+  }
+}

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

@@ -2,7 +2,8 @@
  * AI-powered bookmark generation form
  */
 import { useState, useEffect } from 'react'
-import { Button, Input, message, Space, Alert } from 'antd'
+import { Button, Input, Space, Alert } from 'antd'
+import message from '../common/message'
 import {
   RobotOutlined,
   LoadingOutlined,

package/client/components/bookmark-form/bookmark-from-history-modal.jsx

@@ -3,7 +3,8 @@
  */
 
 import React from 'react'
-import { Button, message } from 'antd'
+import { Button } from 'antd'
+import message from '../common/message'
 import { PlusOutlined } from '@ant-design/icons'
 import Modal from '../common/modal'
 import { refsStatic } from '../common/ref'

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

@@ -22,6 +22,7 @@ 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 ExternalLink from '../../common/external-link.jsx'
 const Fragment = React.Fragment
 const FormItem = Form.Item
 
@@ -115,6 +116,20 @@ export function renderFormItem (item, formItemLayout, form, ctxProps, index) {
 
   // Render complex/custom components directly (no extra wrapper component)
   switch (type) {
+    case 'wiki':
+      return (
+        <Alert
+          key={name}
+          type='warning'
+          className='mg2b'
+          showIcon
+          description={
+            <>
+              <ExternalLink to={item.link}>{item.link}</ExternalLink>
+            </>
+          }
+        />
+      )
     case 'alert':
       return <Alert key={name} {...item.props} />
     case 'info':

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

@@ -21,6 +21,11 @@ const rdpConfig = {
       key: 'auth',
       label: e('auth'),
       fields: [
+        {
+          type: 'wiki',
+          name: 'rdp-limitation-warning',
+          link: 'https://github.com/electerm/electerm/wiki/RDP-limitation'
+        },
         commonFields.category,
         commonFields.colorTitle,
         { type: 'input', name: 'host', label: () => e('host'), rules: [{ required: true, message: e('host') + ' required' }] },

package/client/components/common/auto-check-update.jsx

@@ -0,0 +1,31 @@
+import { useEffect, useRef } from 'react'
+
+export default function AutoCheckUpdate ({ config }) {
+  const lastCheckTimeRef = useRef(0)
+  const intervalIdRef = useRef(null)
+
+  useEffect(() => {
+    if (!config.checkUpdateOnStart) {
+      clearInterval(intervalIdRef.current)
+      return
+    }
+
+    const checkForUpdate = () => {
+      const { store } = window
+      if (store.config.checkUpdateOnStart) {
+        store.onCheckUpdate(false)
+      }
+      lastCheckTimeRef.current = Date.now()
+    }
+
+    intervalIdRef.current = setInterval(checkForUpdate, 60 * 60 * 1000)
+
+    return () => {
+      if (intervalIdRef.current) {
+        clearInterval(intervalIdRef.current)
+      }
+    }
+  }, [config.checkUpdateOnStart])
+
+  return null
+}

package/client/components/common/notification.styl

@@ -2,7 +2,7 @@
   position fixed
   bottom 20px
   right 20px
-  z-index 1000
+  z-index 9999
 
 .notification
   background var(--main-lighter)

package/client/components/file-transfer/conflict-resolve.jsx

@@ -21,6 +21,9 @@ function formatTimeAuto (strOrDigit) {
   if (isString(strOrDigit)) {
     return formatTime(strOrDigit)
   }
+  if (strOrDigit > 9999999999) {
+    return formatTime(strOrDigit)
+  }
   return formatTime(strOrDigit * 1000)
 }
 

package/client/components/footer/batch-input.jsx

@@ -136,12 +136,10 @@ export default class BatchInput extends Component {
     } = this.props
     const opts = {
       options: this.buildOptions(),
-      placeholder: e('batchInput'),
       value: cmd,
       onChange: this.handleChange,
       defaultOpen: false,
       open,
-      allowClear: true,
       className: 'batch-input-wrap'
     }
     const cls = classNames(
@@ -155,6 +153,15 @@ export default class BatchInput extends Component {
       placeholder: e('batchInput'),
       className: 'batch-input-holder'
     }
+    const textAreaProps = {
+      onPressEnter: this.handleEnter,
+      onClick: this.handleClick,
+      onBlur: this.handleBlur,
+      size: 'small',
+      autoSize: { minRows: 1 },
+      placeholder: e('batchInput'),
+      allowClear: true
+    }
     const tabSelectProps = {
       activeTabId: this.props.activeTabId,
       tabs: this.getTabs(),
@@ -179,11 +186,7 @@ export default class BatchInput extends Component {
             {...opts}
           >
             <Input.TextArea
-              onPressEnter={this.handleEnter}
-              onClick={this.handleClick}
-              onBlur={this.handleBlur}
-              size='small'
-              autoSize={{ minRows: 1 }}
+              {...textAreaProps}
             />
           </AutoComplete>
           <TabSelect {...tabSelectProps} />

package/client/components/main/error-wrapper.jsx

@@ -77,12 +77,9 @@ export default class ErrorBoundary extends React.PureComponent {
   }
 
   renderTroubleShoot = () => {
-    const {
-      bugs: {
-        url: bugReportLink
-      }
-    } = packInfo
-    const bugUrl = `${bugReportLink}/new/choose`
+    if (window.et.isWebApp) {
+      return this.renderContacts()
+    }
     return (
       <div className='pd1y wordbreak'>
         <h2>{e('troubleShoot')}</h2>
@@ -99,6 +96,20 @@ export default class ErrorBoundary extends React.PureComponent {
             )
           })
         }
+        {this.renderContacts()}
+      </div>
+    )
+  }
+
+  renderContacts () {
+    const {
+      bugs: {
+        url: bugReportLink
+      }
+    } = packInfo
+    const bugUrl = `${bugReportLink}/new/choose`
+    return (
+      <>
         <div className='pd1b'>
           <Link to={bugUrl}>{e('bugReport')}</Link>
         </div>
@@ -112,7 +123,7 @@ export default class ErrorBoundary extends React.PureComponent {
             className='mwm-100'
           />
         </div>
-      </div>
+      </>
     )
   }
 

package/client/components/main/main.jsx

@@ -6,7 +6,6 @@ import UpdateCheck from './upgrade'
 import SettingModal from '../setting-panel/setting-modal'
 import TextEditor from '../text-editor/text-editor'
 import Sidebar from '../sidebar'
-import BatchOp from '../batch-op/batch-op'
 import CssOverwrite from '../bg/css-overwrite'
 import UiTheme from './ui-theme'
 import CustomCss from '../bg/custom-css.jsx'
@@ -34,6 +33,9 @@ import MoveItemModal from '../tree-list/move-item-modal'
 import InputContextMenu from '../common/input-context-menu'
 import WorkspaceSaveModal from '../tabs/workspace-save-modal'
 import BookmarkFromHistoryModal from '../bookmark-form/bookmark-from-history-modal'
+import AutoSync from '../setting-sync/auto-sync'
+import AutoCheckUpdate from '../common/auto-check-update'
+import BatchOpRunner from '../batch-op/batch-op-runner'
 import { pick } from 'lodash-es'
 import deepCopy from 'json-deep-copy'
 import './wrapper.styl'
@@ -184,11 +186,6 @@ export default auto(function Index (props) {
     fileTransferChanged: JSON.stringify(copiedTransfer),
     fileTransfers: copiedTransfer
   }
-  const batchOpProps = {
-    transferHistory,
-    showModal: store.showModal,
-    innerWidth: store.innerWidth
-  }
   const resProps = {
     resolutions: deepCopy(store.resolutions),
     openResolutionEdit
@@ -263,7 +260,6 @@ export default auto(function Index (props) {
         />
         <FileInfoModal />
         <SettingModal store={store} />
-        <BatchOp {...batchOpProps} />
         <MoveItemModal store={store} />
         <div
           id='outside-context'
@@ -295,9 +291,12 @@ export default auto(function Index (props) {
         <ConnectionHoppingWarning {...warningProps} />
         <TerminalCmdSuggestions {...cmdSuggestionsProps} />
         <TransferQueue />
+        <AutoSync config={config} />
+        <AutoCheckUpdate config={config} />
         <WorkspaceSaveModal store={store} />
         <BookmarkFromHistoryModal />
         <NotificationContainer />
+        <BatchOpRunner />
       </div>
     </ConfigProvider>
   )