@electerm/electerm-react 3.12.0 → 3.15.28

package/client/components/terminal/osc52-addon.js

@@ -0,0 +1,147 @@
+/**
+ * Osc52Addon - Handles OSC 52 clipboard escape sequences
+ *
+ * OSC 52 allows terminal programs (TUI apps like vim, tmux, opencode, etc.)
+ * to copy and paste text via the system clipboard.
+ *
+ * Format: ESC ] 52 ; Pc ; Pd BEL (or ST)
+ *   Pc = clipboard selection: c (clipboard), p (primary), s (secondary)
+ *   Pd = base64-encoded content, or "?" to read
+ *
+ * Write request: ESC ] 52 ; c ; <base64data> BEL
+ *   -> decodes base64 and writes to system clipboard
+ *
+ * Read request: ESC ] 52 ; c ; ? BEL
+ *   -> reads system clipboard, encodes base64, sends response
+ */
+
+export class Osc52Addon {
+  constructor () {
+    this.terminal = undefined
+    this._disposables = []
+    this._sendData = null
+  }
+
+  /**
+   * Set the function used to send data back to the PTY
+   * @param {function} sendDataFn - function(string) to send data to server
+   */
+  setSendData (sendDataFn) {
+    this._sendData = sendDataFn
+  }
+
+  activate (terminal) {
+    this.terminal = terminal
+
+    if (terminal.parser && terminal.parser.registerOscHandler) {
+      const oscHandler = terminal.parser.registerOscHandler(52, (data) => {
+        return this._handleOsc52(data)
+      })
+      this._disposables.push(oscHandler)
+    }
+  }
+
+  dispose () {
+    this.terminal = null
+    if (this._disposables) {
+      this._disposables.forEach(d => d.dispose())
+      this._disposables.length = 0
+    }
+  }
+
+  /**
+   * Handle OSC 52 clipboard sequence
+   * @param {string} data - The OSC data after "52;"
+   * @returns {boolean} Whether the sequence was handled
+   */
+  _handleOsc52 (data) {
+    if (!data) return false
+
+    // Parse: Pc;Pd where Pc is selection target and Pd is payload
+    const semicolonIdx = data.indexOf(';')
+    if (semicolonIdx === -1) return false
+
+    const target = data.substring(0, semicolonIdx)
+    const payload = data.substring(semicolonIdx + 1)
+
+    // Only handle clipboard target ('c'), also accept 'c' among multiple targets
+    if (!target.includes('c')) return false
+
+    if (payload === '?') {
+      // Read request - send clipboard content back
+      return this._handleReadRequest()
+    }
+
+    // Write request - decode and write to clipboard
+    return this._handleWriteRequest(payload)
+  }
+
+  /**
+   * Handle clipboard read request (ESC]52;c;? BEL)
+   * Reads system clipboard and sends response back to the terminal
+   */
+  _handleReadRequest () {
+    try {
+      const text = window.pre.readClipboard()
+      const base64 = text ? this._encodeBase64(text) : ''
+      this._sendResponse(base64)
+    } catch (e) {
+      console.error('OSC 52 clipboard read failed:', e)
+      this._sendResponse('')
+    }
+    return true
+  }
+
+  /**
+   * Handle clipboard write request (ESC]52;c;<base64> BEL)
+   * Decodes base64 content and writes to system clipboard
+   */
+  _handleWriteRequest (base64Data) {
+    try {
+      const text = this._decodeBase64(base64Data)
+      if (text) {
+        window.pre.writeClipboard(text)
+      }
+    } catch (e) {
+      console.error('OSC 52 clipboard write failed:', e)
+    }
+    return true
+  }
+
+  /**
+   * Send OSC 52 response back to the terminal (for read requests)
+   * @param {string} base64Data - base64-encoded clipboard content
+   */
+  _sendResponse (base64Data) {
+    if (!this._sendData) return
+    // Response format: ESC ] 52 ; c ; <base64> BEL
+    const response = `\x1b]52;c;${base64Data}\x07`
+    this._sendData(response)
+  }
+
+  /**
+   * Encode a string to base64 (handles UTF-8 properly)
+   */
+  _encodeBase64 (str) {
+    const encoder = new TextEncoder()
+    const bytes = encoder.encode(str)
+    let binary = ''
+    for (let i = 0; i < bytes.length; i++) {
+      binary += String.fromCharCode(bytes[i])
+    }
+    return btoa(binary)
+  }
+
+  /**
+   * Decode a base64 string (handles UTF-8 properly)
+   */
+  _decodeBase64 (base64) {
+    const binary = atob(base64)
+    const bytes = new Uint8Array(binary.length)
+    for (let i = 0; i < binary.length; i++) {
+      bytes[i] = binary.charCodeAt(i)
+    }
+    const decoder = new TextDecoder()
+    return decoder.decode(bytes)
+  }
+}

package/client/components/terminal/terminal-apis.js

@@ -49,3 +49,12 @@ export function setTerminalLogPath (pid, logPath) {
     action: 'set-terminal-log-path'
   })
 }
+
+export function startTerminalLogFile (pid, logFilePath, addTimeStampToTermLog) {
+  return fetch({
+    pid,
+    logFilePath,
+    addTimeStampToTermLog,
+    action: 'start-terminal-log-file'
+  })
+}

package/client/components/terminal/terminal.jsx

@@ -7,6 +7,8 @@ import {
   Dropdown
 } from 'antd'
 import message from '../common/message'
+import { notification } from '../common/notification'
+import ShowItem from '../common/show-item.jsx'
 import Modal from '../common/modal'
 import classnames from 'classnames'
 import './terminal.styl'
@@ -30,11 +32,13 @@ import { XmodemClient } from './xmodem-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'
+import { createTerm, resizeTerm, startTerminalLogFile, toggleTerminalLog } from './terminal-apis.js'
 import { shortcutExtend, shortcutDescExtend } from '../shortcuts/shortcut-handler.js'
 import { KeywordHighlighterAddon } from './highlight-addon.js'
 import { getFilePath, isUnsafeFilename } from '../../common/file-drop-utils.js'
+import { getFolderFromFilePath } from '../sftp/file-read.js'
 import { CommandTrackerAddon } from './command-tracker-addon.js'
+import { Osc52Addon } from './osc52-addon.js'
 import AIIcon from '../icons/ai-icon.jsx'
 import {
   getShellIntegrationCommand,
@@ -72,6 +76,9 @@ class Term extends Component {
       saveTerminalLogToFile: !!this.props.config.saveTerminalLogToFile,
       addTimeStampToTermLog: !!this.props.config.addTimeStampToTermLog,
       logPath: this.props.config.sessionLogPath || createDefaultLogPath(),
+      logFileName: '',
+      recording: false,
+      recordingFilePath: '',
       passType: 'password',
       lines: [],
       searchResults: [],
@@ -198,6 +205,9 @@ class Term extends Component {
       this.encode || this.props.tab.encode || 'utf-8'
     )
     await this.attachAddon.activate(this.term)
+    if (this.osc52Addon) {
+      this.osc52Addon.setSendData(this.attachAddon._sendData.bind(this.attachAddon))
+    }
   }
 
   getValue = (props, type, name) => {
@@ -385,7 +395,8 @@ class Term extends Component {
     if (isUnsafeFilename(p)) {
       return message.error('File name contains unsafe characters')
     }
-    this.runQuickCommand(`cd "${p}"`)
+    const isWinPath = /^[a-zA-Z]:\\/.test(p)
+    this.runQuickCommand(isWinPath ? `cd /d "${p}"` : `cd "${p}"`)
   }
 
   onDrop = e => {
@@ -676,8 +687,101 @@ class Term extends Component {
     )
   }
 
+  getTerminalBufferText = () => {
+    const { addTimeStampToTermLog } = this.state
+    const buffer = this.term.buffer.active
+    const len = buffer.length
+    const rawLines = []
+    for (let i = 0; i < len; i++) {
+      const line = buffer.getLine(i)
+      rawLines.push(line ? line.translateToString(false) : '')
+    }
+    // trim trailing blank lines before applying timestamps
+    while (rawLines.length && !rawLines[rawLines.length - 1].trim()) {
+      rawLines.pop()
+    }
+    if (!addTimeStampToTermLog) {
+      return rawLines.join('\n')
+    }
+    return rawLines.map(text => {
+      const now = new Date()
+      const ts = `[${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}:${String(now.getSeconds()).padStart(2, '0')}.${String(now.getMilliseconds()).padStart(3, '0')}] `
+      return ts + text
+    }).join('\n')
+  }
+
+  syncTermInfo = (stateUpdate) => {
+    this.setState(stateUpdate)
+    const infoUpdate = pick(stateUpdate, ['saveTerminalLogToFile', 'addTimeStampToTermLog', 'logPath', 'logFileName'])
+    if (Object.keys(infoUpdate).length) {
+      refs.get('term-info-' + this.props.tab.id)?.setState(infoUpdate)
+    }
+  }
+
+  openLogSaveDialog = async (titleKey) => {
+    const { logName } = this.props
+    const result = await window.api.saveDialog({
+      title: e(titleKey),
+      defaultPath: logName + '.log',
+      filters: [
+        { name: 'Log files', extensions: ['log'] }
+      ],
+      properties: ['createDirectory', 'showOverwriteConfirmation']
+    })
+    if (result.canceled || !result.filePath) {
+      return null
+    }
+    return result.filePath
+  }
+
+  onSaveTerminalLog = async () => {
+    const filePath = await this.openLogSaveDialog('saveTerminalLogToFile')
+    if (!filePath) {
+      return
+    }
+    const content = this.getTerminalBufferText()
+    await window.fs.writeFile(filePath, content).catch(window.store.onError)
+    const { addTimeStampToTermLog } = this.state
+    startTerminalLogFile(this.pid, filePath, addTimeStampToTermLog).catch(window.store.onError)
+    const { path: logPath, name: logFileName } = getFolderFromFilePath(filePath, false)
+    this.syncTermInfo({ saveTerminalLogToFile: true, logPath, logFileName })
+    notification.success({
+      message: e('saveTerminalLogToFile'),
+      description: <ShowItem to={filePath}>{filePath}</ShowItem>,
+      duration: 5
+    })
+  }
+
+  onRecord = async () => {
+    const filePath = await this.openLogSaveDialog('record')
+    if (!filePath) {
+      return
+    }
+    const { addTimeStampToTermLog } = this.state
+    startTerminalLogFile(this.pid, filePath, addTimeStampToTermLog).catch(window.store.onError)
+    const { path: logPath, name: logFileName } = getFolderFromFilePath(filePath, false)
+    this.syncTermInfo({ saveTerminalLogToFile: true, logPath, logFileName })
+    this.setState({ recording: true, recordingFilePath: filePath })
+    notification.success({
+      message: e('record'),
+      description: <ShowItem to={filePath}>{filePath}</ShowItem>,
+      duration: 5
+    })
+  }
+
+  onStopRecord = () => {
+    const { recordingFilePath } = this.state
+    toggleTerminalLog(this.pid).catch(window.store.onError)
+    this.syncTermInfo({ saveTerminalLogToFile: false })
+    this.setState({ recording: false, recordingFilePath: '' })
+    notification.success({
+      message: e('stopRecord'),
+      description: <ShowItem to={recordingFilePath}>{recordingFilePath}</ShowItem>
+    })
+  }
+
   renderContextMenu = () => {
-    const { hasSelection } = this.state
+    const { hasSelection, recording } = this.state
     const copyed = true
     const copyShortcut = this.getShortcut('terminal_copy')
     const pasteShortcut = this.getShortcut('terminal_paste')
@@ -730,6 +834,16 @@ class Term extends Component {
         icon: <iconsMap.SearchOutlined />,
         label: e('search'),
         extra: searchShortcut
+      },
+      {
+        key: 'onSaveTerminalLog',
+        icon: <iconsMap.SaveOutlined />,
+        label: e('saveTerminalLogToFile')
+      },
+      {
+        key: recording ? 'onStopRecord' : 'onRecord',
+        icon: recording ? <iconsMap.StopOutlined /> : <iconsMap.PlayCircleFilled />,
+        label: e(recording ? 'stopRecord' : 'record')
       }
     ]
     if (isSerial) {
@@ -1016,6 +1130,8 @@ class Term extends Component {
     term.loadAddon(this.fitAddon)
     term.loadAddon(this.searchAddon)
     term.loadAddon(this.cmdAddon)
+    this.osc52Addon = new Osc52Addon()
+    term.loadAddon(this.osc52Addon)
     if (tab.enableTerminalImage) {
       const ImageAddon = await loadImageAddon()
       this.imageAddon = new ImageAddon({

package/client/components/terminal/xmodem-client.js

@@ -66,6 +66,68 @@ export class XmodemClient extends TransferClientBase {
       case 'session-error':
         this.onError(msg.error)
         break
+      case 'auto-trigger-receive':
+        this.handleAutoReceive(msg.name)
+        break
+      case 'auto-trigger-send':
+        this.handleAutoSend()
+        break
+    }
+  }
+
+  /**
+   * Auto-triggered: device is sending a file, electerm should receive it.
+   * Opens save folder dialog then starts xmodem receive.
+   * @param {string} fileName - Original filename from the device
+   */
+  async handleAutoReceive (fileName) {
+    if (this.isActive) return
+
+    this.isActive = true
+    this.writeBanner('RECEIVE', null)
+
+    const savePath = await this.openSaveFolderSelect()
+    if (savePath) {
+      this.savePath = savePath
+      this.sendToServer({
+        event: 'start-receive'
+      })
+      this.sendToServer({
+        event: 'set-save-path',
+        path: savePath,
+        name: fileName
+      })
+    } else {
+      this.isActive = false
+      this.writeToTerminal('\r\n\x1b[33mXMODEM Receive cancelled\x1b[0m\r\n')
+    }
+  }
+
+  /**
+   * Auto-triggered: device wants to receive a file, electerm should send it.
+   * Opens file select dialog then starts xmodem send.
+   */
+  async handleAutoSend () {
+    if (this.isActive) return
+
+    this.isActive = true
+    this.writeBanner('SEND', null)
+
+    const files = await this.openFileSelect({
+      title: 'Choose file to send via XMODEM',
+      message: 'Choose file to send via XMODEM'
+    })
+    if (files && files.length > 0) {
+      this.sendToServer({
+        event: 'start-send'
+      })
+      this.sendToServer({
+        event: 'send-files',
+        files
+      })
+    } else {
+      this.isActive = false
+      this.writeToTerminal('\r\n\x1b[33mXMODEM Send cancelled\x1b[0m\r\n')
     }
   }
 

package/client/components/terminal-info/base.jsx

@@ -8,7 +8,7 @@ import {
   Button
 } from 'antd'
 import defaults from '../../common/default-setting'
-import { toggleTerminalLog, toggleTerminalLogTimestamp, setTerminalLogPath } from '../terminal/terminal-apis'
+import { toggleTerminalLog, toggleTerminalLogTimestamp } from '../terminal/terminal-apis'
 import {
   ClockCircleOutlined,
   BorderlessTableOutlined,
@@ -18,7 +18,9 @@ import {
   PartitionOutlined
 } from '@ant-design/icons'
 import { refs } from '../common/ref'
-import LogPathEdit from './log-path-edit'
+import ShowItem from '../common/show-item'
+import { osResolve } from '../../common/resolve'
+import createDefaultLogPath from '../../common/default-log-path'
 
 const e = window.translate
 
@@ -35,15 +37,20 @@ export default class TerminalInfoBase extends Component {
   state = {
     saveTerminalLogToFile: false,
     addTimeStampToTermLog: false,
-    logPath: ''
+    logPath: '',
+    logFileName: ''
   }
 
   componentDidMount () {
+    const { pid } = this.props
+    refs.add('term-info-' + pid, this)
     this.getState()
   }
 
   componentWillUnmount () {
     clearTimeout(this.timer)
+    const { pid } = this.props
+    refs.remove('term-info-' + pid)
   }
 
   handleToggleTimestamp = () => {
@@ -74,17 +81,6 @@ export default class TerminalInfoBase extends Component {
     })
   }
 
-  onLogPathChange = (v) => {
-    const { pid } = this.props
-    setTerminalLogPath(pid, v)
-    refs.get('term-' + pid)?.setState({
-      logPath: v
-    })
-    this.setState({
-      logPath: v
-    })
-  }
-
   handleToggle = () => {
     const { saveTerminalLogToFile, addTimeStampToTermLog } = this.state
     const {
@@ -112,7 +108,8 @@ export default class TerminalInfoBase extends Component {
       this.setState({
         saveTerminalLogToFile: term.state.saveTerminalLogToFile,
         addTimeStampToTermLog: term.state.addTimeStampToTermLog,
-        logPath: term.state.logPath
+        logPath: term.state.logPath,
+        logFileName: term.state.logFileName || ''
       })
     } else {
       this.timer = setTimeout(this.getState, 100)
@@ -166,39 +163,45 @@ export default class TerminalInfoBase extends Component {
   render () {
     const {
       id,
-      logName,
-      pid
+      logName
     } = this.props
-    const { saveTerminalLogToFile, logPath } = this.state
+    const { saveTerminalLogToFile, logPath, logFileName } = this.state
     const name = e('saveTerminalLogToFile')
+    const base = logPath || createDefaultLogPath()
+    const fileName = logFileName || (logName + '.log')
+    const fullPath = osResolve(base, fileName)
     return (
       <div className='terminal-info-section terminal-info-base'>
-        <div className='fix'>
-          <span className='fleft'><b>ID:</b> {id}</span>
-          <span className='fright'>
-            <Switch
-              checkedChildren={name}
-              unCheckedChildren={name}
-              checked={saveTerminalLogToFile}
-              onChange={this.handleToggle}
-              className='mg1r mg1b'
-            />
-            {
-              this.renderTimestamp()
-            }
-          </span>
+        <div className='pd1b'>
+          <b>ID:</b> {id}
+        </div>
+        <div className='pd1b'>
+          <Switch
+            checkedChildren={name}
+            unCheckedChildren={name}
+            checked={saveTerminalLogToFile}
+            onChange={this.handleToggle}
+            className='mg1r mg1b'
+          />
+          {
+            this.renderTimestamp()
+          }
         </div>
+        {
+          saveTerminalLogToFile
+            ? (
+              <div className='pd1b font-xs color-grey'>
+                {e('terminalLogPath')}: {fullPath} <ShowItem to={fullPath} />
+              </div>
+              )
+            : null
+        }
         <div className='pd2y'>
           {
             this.renderInfoSelection()
           }
         </div>
-        <LogPathEdit
-          pid={pid}
-          logPath={logPath}
-          logName={logName}
-          setLogPath={this.onLogPathChange}
-        />
+
       </div>
     )
   }

package/client/components/terminal-info/log-path-edit.jsx

@@ -12,10 +12,11 @@ import { osResolve } from '../../common/resolve'
 
 const e = window.translate
 
-export default function LogPathEdit ({ pid, logPath, logName, setLogPath }) {
+export default function LogPathEdit ({ pid, logPath, logName, logFileName, setLogPath }) {
   const defaultPath = createDefaultLogPath()
   const base = logPath || defaultPath
-  const fullPath = osResolve(base, logName + '.log')
+  const fileName = logFileName || (logName + '.log')
+  const fullPath = osResolve(base, fileName)
 
   const testAndSet = async (v) => {
     if (v) {

package/client/store/common.js

@@ -298,7 +298,7 @@ export default Store => {
   }
 
   Store.prototype.aiConfigMissing = function () {
-    return aiConfigsArr.filter(k => k !== 'apiKeyAI' && k !== 'proxyAI').some(k => !window.store.config[k])
+    return aiConfigsArr.filter(k => k !== 'apiKeyAI' && k !== 'proxyAI' && k !== 'nameAI').some(k => !window.store.config[k])
   }
 
   Store.prototype.clearHistory = function () {

package/client/store/load-data.js

@@ -52,6 +52,20 @@ export async function addTabFromCommandLine (store, opts) {
   if (isHelp) {
     return store.openAbout(infoTabs.cmd)
   }
+  // Check if argv contains a protocol URL (e.g., ssh://user@host)
+  // and use parseQuickConnect for proper parsing
+  if (argv && argv.length) {
+    const protocolUrl = argv.find(arg =>
+      /^(ssh|telnet|rdp|vnc|serial|spice|ftp|http|https|electerm):\/\//i.test(arg)
+    )
+    if (protocolUrl) {
+      const parsed = parseQuickConnect(protocolUrl)
+      if (parsed) {
+        return store.ipcOpenTab(parsed)
+      }
+    }
+  }
+
   const conf = getHost(argv, options)
   const update = {
     passphrase: options.passphrase,