@electerm/electerm-react 2.3.191 → 2.4.16

package/client/components/setting-panel/keywords-form.jsx

@@ -1,6 +1,5 @@
 import {
   Form,
-  Input,
   Select,
   Space,
   Button
@@ -11,6 +10,7 @@ import {
   PlusOutlined
 } from '@ant-design/icons'
 import { useEffect } from 'react'
+import KeywordInput from './keyword-input'
 
 const FormItem = Form.Item
 const FormList = Form.List
@@ -26,10 +26,6 @@ export default function KeywordForm (props) {
     formChild.submit()
   }
 
-  function handleChange (e) {
-    formChild.submit()
-  }
-
   function handleFinish (data) {
     props.submit(data)
   }
@@ -59,9 +55,8 @@ export default function KeywordForm (props) {
             name={[field.name, 'keyword']}
             rules={[{ validator: checker }]}
           >
-            <Input
+            <KeywordInput
               addonBefore={renderBefore(field.name)}
-              onChange={handleChange}
             />
           </FormItem>
         </FormItem>

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

@@ -5,8 +5,8 @@ import {
   SunOutlined,
   MoonOutlined
 } from '@ant-design/icons'
+import message from '../common/message'
 import {
-  message,
   Select,
   Switch,
   Input,

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

@@ -3,8 +3,8 @@ import {
   CodeOutlined,
   LoadingOutlined
 } from '@ant-design/icons'
+import message from '../common/message'
 import {
-  message,
   Select,
   Switch,
   Input,

package/client/components/setting-panel/tab-settings.jsx

@@ -1,5 +1,5 @@
 import { auto } from 'manate/react'
-import { message } from 'antd'
+import message from '../common/message'
 import SettingCommon from './setting-common'
 import SettingTerminal from './setting-terminal'
 import SettingCol from './col'

package/client/components/setting-sync/setting-sync-form.jsx

@@ -7,7 +7,8 @@
  */
 import { useDelta, useConditionalEffect } from 'react-delta-hooks'
 import { ArrowDownOutlined, ArrowUpOutlined, SaveOutlined, ClearOutlined } from '@ant-design/icons'
-import { Button, Input, notification, Form } from 'antd'
+import { Button, Input, Form, Alert } from 'antd'
+import { notification } from '../common/notification'
 import Link from '../common/external-link'
 import dayjs from 'dayjs'
 import eq from 'fast-deep-equal'
@@ -15,6 +16,7 @@ import { syncTokenCreateUrls, syncTypes } from '../../common/constants'
 import HelpIcon from '../common/help-icon'
 import ServerDataStatus from './server-data-status'
 import Password from '../common/password'
+import { isError } from 'lodash-es'
 
 const FormItem = Form.Item
 const e = window.translate
@@ -58,11 +60,17 @@ export default function SyncForm (props) {
       up[syncType + 'ApiUrl'] = 'https://electerm-cloud.html5beta.com/api/sync'
       // up[syncType + 'ApiUrl'] = 'http://127.0.0.1:5678/api/sync'
     }
+    if (res.proxy) {
+      up[syncType + 'Proxy'] = res.proxy
+    } else {
+      up[syncType + 'Proxy'] = ''
+    }
     window.store.updateSyncSetting(up)
     const test = await window.store.testSyncToken(syncType, res.gistId)
-    if (!test) {
+    if (isError(test)) {
       return notification.error({
-        title: 'token invalid'
+        message: test.message || 'Request failed',
+        description: test.stack || 'Request failed'
       })
     }
     if (!res.gistId && syncType !== syncTypes.custom && syncType !== syncTypes.cloud) {
@@ -136,6 +144,27 @@ export default function SyncForm (props) {
   function createId (name) {
     return 'sync-input-' + name + '-' + syncType
   }
+  function renderWarning () {
+    if (syncType === syncTypes.gitee) {
+      return (
+        <Alert
+          message={
+            <span>
+              Gitee data sync is not recommended. For more information, please refer to the
+              <Link to='https://github.com/electerm/electerm/wiki/gitee-data-sync-warning' className='mg1l'>
+                wiki
+              </Link>
+              .
+            </span>
+          }
+          type='warning'
+          showIcon
+          className='mg1b'
+        />
+      )
+    }
+    return null
+  }
   function createUrlItem () {
     if (syncType === syncTypes.cloud) {
       return (
@@ -215,6 +244,23 @@ export default function SyncForm (props) {
       </FormItem>
     )
   }
+  function createProxyItem () {
+    return (
+      <FormItem
+        label='Proxy'
+        name='proxy'
+        normalize={trim}
+        rules={[{
+          max: 200, message: '200 chars max'
+        }]}
+      >
+        <Input
+          placeholder='socks5://127.0.0.1:1080'
+          id={createId('proxy')}
+        />
+      </FormItem>
+    )
+  }
   const sprops = {
     type: syncType,
     status: props.serverStatus
@@ -228,6 +274,7 @@ export default function SyncForm (props) {
       layout='vertical'
       initialValues={props.formData}
     >
+      {renderWarning()}
       {createUrlItem()}
       <FormItem
         label={tokenLabel}
@@ -251,6 +298,9 @@ export default function SyncForm (props) {
       {
         createPasswordItem()
       }
+      {
+        createProxyItem()
+      }
       <FormItem>
         <p>
           <Button

package/client/components/setting-sync/setting-sync.jsx

@@ -43,7 +43,8 @@ export default auto(function SyncSettingEntry (props) {
       url: syncSetting[type + 'Url'],
       apiUrl: syncSetting[type + 'ApiUrl'],
       lastSyncTime: syncSetting[type + 'LastSyncTime'],
-      syncPassword: syncSetting[type + 'SyncPassword']
+      syncPassword: syncSetting[type + 'SyncPassword'],
+      proxy: syncSetting[type + 'Proxy']
     }
     return (
       <SyncForm

package/client/components/sftp/owner-list.js

@@ -29,7 +29,7 @@ const linuxListGroup = 'cat /etc/group'
 
 export async function remoteListUsers (pid) {
   const users = await runCmd(pid, linuxListUser)
-    .catch(log.error)
+    .catch(console.error)
   if (users) {
     return parseNames(users)
   }
@@ -38,7 +38,7 @@ export async function remoteListUsers (pid) {
 
 export async function remoteListGroups (pid) {
   const groups = await runCmd(pid, linuxListGroup)
-    .catch(log.error)
+    .catch(console.error)
   if (groups) {
     return parseNames(groups)
   }
@@ -50,7 +50,7 @@ export async function localListUsers () {
     return {}
   } else if (isMac) {
     const g = await fs.run('dscl . -list /Users UniqueID')
-      .catch(log.error)
+      .catch(console.error)
     return g
       ? g.split('\n')
         .reduce((p, s) => {
@@ -65,7 +65,7 @@ export async function localListUsers () {
         }, {})
       : {}
   } else {
-    const g = await fs.run(linuxListUser).catch(log.error)
+    const g = await fs.run(linuxListUser).catch(console.error)
     return g
       ? parseNames(g)
       : {}
@@ -77,7 +77,7 @@ export async function localListGroups () {
     return {}
   } else if (isMac) {
     const g = await fs.run('dscl . list /Groups PrimaryGroupID')
-      .catch(log.error)
+      .catch(console.error)
     return g
       ? g.split('\n')
         .reduce((p, s) => {
@@ -89,7 +89,7 @@ export async function localListGroups () {
         }, {})
       : {}
   } else {
-    const g = await fs.run(linuxListGroup).catch(log.error)
+    const g = await fs.run(linuxListGroup).catch(console.error)
     return g
       ? parseNames(g)
       : {}

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

@@ -2,7 +2,9 @@ import { Component } from 'react'
 import { refs } from '../common/ref'
 import generate from '../../common/uid'
 import runIdle from '../../common/run-idle'
-import { Spin, Modal, notification } from 'antd'
+import { Spin } from 'antd'
+import { notification } from '../common/notification'
+import Modal from '../common/modal'
 import clone from '../../common/to-simple-obj'
 import { isEqual, last, isNumber, some, isArray, pick, uniq, debounce } from 'lodash-es'
 import FileSection from './file-item'
@@ -846,8 +848,8 @@ export default class Sftp extends Component {
           sftp,
           realpath
         ).catch(e => {
-          log.debug('seems a bad symbolic link')
-          log.debug(e)
+          console.debug('seems a bad symbolic link')
+          console.debug(e)
           return null
         })
         if (!realFileInfo) {
@@ -981,7 +983,7 @@ export default class Sftp extends Component {
     const np = this.parsePath(type, this.state[nt])
     if (!isValidPath(np)) {
       return notification.warning({
-        title: 'path not valid'
+        message: 'path not valid'
       })
     }
     this.setState({

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

@@ -1,9 +1,9 @@
 import { PureComponent } from 'react'
 import {
   Button,
-  Input,
-  message
+  Input
 } from 'antd'
+import message from '../common/message'
 import {
   EditFilled,
   CheckOutlined,

package/client/components/ssh-config/ssh-config-load-notify.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react'
-import { notification, Button } from 'antd'
+import { Button } from 'antd'
+import { notification } from '../common/notification'
 import * as ls from '../../common/safe-local-storage'
 import {
   sshConfigKey,
@@ -20,7 +21,7 @@ function handleIgnore () {
 
 function showNotification () {
   notification.info({
-    title: e('loadSshConfigs'),
+    message: e('loadSshConfigs'),
     duration: 0,
     placement: 'bottom',
     key: 'sshConfigNotify',

package/client/components/tabs/tab.jsx

@@ -12,9 +12,9 @@ import {
 } from '@ant-design/icons'
 import {
   Tooltip,
-  message,
   Dropdown
 } from 'antd'
+import message from '../common/message'
 import classnames from 'classnames'
 import { pick } from 'lodash-es'
 import Input from '../common/input-auto-focus'

package/client/components/tabs/workspace-save-modal.jsx

@@ -5,7 +5,8 @@
 import React, { useState } from 'react'
 import { auto } from 'manate/react'
 import Modal from '../common/modal'
-import { Input, Select, Button, Space, message, Radio } from 'antd'
+import { Input, Select, Button, Space, Radio } from 'antd'
+import message from '../common/message'
 import { SaveOutlined, EditOutlined } from '@ant-design/icons'
 
 const e = window.translate

package/client/components/terminal/attach-addon-custom.js

@@ -2,7 +2,6 @@
  * customize AttachAddon
  */
 import { AttachAddon } from '@xterm/addon-attach'
-import regEscape from 'escape-string-regexp'
 
 export default class AttachAddonCustom extends AttachAddon {
   constructor (term, socket, isWindowsShell) {
@@ -10,6 +9,80 @@ export default class AttachAddonCustom extends AttachAddon {
     this.term = term
     this.socket = socket
     this.isWindowsShell = isWindowsShell
+    // Output suppression state for shell integration injection
+    this.outputSuppressed = false
+    this.suppressedData = []
+    this.suppressTimeout = null
+    this.onSuppressionEndCallback = null
+    // Track if we've received initial data from the terminal
+    this.hasReceivedInitialData = false
+    this.onInitialDataCallback = null
+  }
+
+  /**
+   * Set callback for when initial data is received
+   * @param {Function} callback - Called when first data arrives
+   */
+  onInitialData = (callback) => {
+    if (this.hasReceivedInitialData) {
+      // Already received, call immediately
+      callback()
+    } else {
+      this.onInitialDataCallback = callback
+    }
+  }
+
+  /**
+   * Start suppressing output - used during shell integration injection
+   * @param {number} timeout - Max time to suppress in ms (safety fallback)
+   * @param {Function} onEnd - Callback when suppression ends
+   */
+  startOutputSuppression = (timeout = 3000, onEnd = null) => {
+    this.outputSuppressed = true
+    this.suppressedData = []
+    this.onSuppressionEndCallback = onEnd
+    // Safety timeout to ensure we always resume
+    this.suppressTimeout = setTimeout(() => {
+      console.warn('[AttachAddon] Output suppression timeout reached, resuming')
+      this.stopOutputSuppression(false)
+    }, timeout)
+  }
+
+  /**
+   * Stop suppressing output and optionally discard buffered data
+   * @param {boolean} discard - If true, discard buffered data; if false, write it to terminal
+   */
+  stopOutputSuppression = (discard = true) => {
+    if (this.suppressTimeout) {
+      clearTimeout(this.suppressTimeout)
+      this.suppressTimeout = null
+    }
+    this.outputSuppressed = false
+
+    if (!discard && this.suppressedData.length > 0) {
+      // Write buffered data to terminal
+      for (const data of this.suppressedData) {
+        this.writeToTerminalDirect(data)
+      }
+    }
+    this.suppressedData = []
+
+    // Call the end callback if set
+    if (this.onSuppressionEndCallback) {
+      const callback = this.onSuppressionEndCallback
+      this.onSuppressionEndCallback = null
+      callback()
+    }
+  }
+
+  /**
+   * Check if we should resume output based on OSC 633 detection
+   * Called when shell integration is detected
+   */
+  onShellIntegrationDetected = () => {
+    if (this.outputSuppressed) {
+      this.stopOutputSuppression(true) // Discard the integration command output
+    }
   }
 
   activate (terminal = this.term) {
@@ -43,11 +116,76 @@ export default class AttachAddonCustom extends AttachAddon {
     }
   }
 
+  /**
+   * Check if data contains OSC 633 shell integration sequences
+   * @param {string} str - Data string to check
+   * @returns {boolean} True if OSC 633 sequence detected
+   */
+  checkForShellIntegration = (str) => {
+    // OSC 633 sequences: ESC]633;X where X is A, B, C, D, E, or P
+    // ESC is character code 27 (0x1b)
+    // Use includes with the actual characters to avoid lint warning
+    const ESC = String.fromCharCode(27)
+    return str.includes(ESC + ']633;')
+  }
+
+  /**
+   * Write directly to terminal, bypassing suppression check
+   * Used for flushing buffered data
+   */
+  writeToTerminalDirect = (data) => {
+    const { term } = this
+    if (term.parent?.onZmodem) {
+      return
+    }
+    if (typeof data === 'string') {
+      return term.write(data)
+    }
+    term?.write(data)
+  }
+
   writeToTerminal = (data) => {
     const { term } = this
     if (term.parent?.onZmodem) {
       return
     }
+
+    // Track initial data arrival
+    if (!this.hasReceivedInitialData) {
+      this.hasReceivedInitialData = true
+      if (this.onInitialDataCallback) {
+        const callback = this.onInitialDataCallback
+        this.onInitialDataCallback = null
+        // Call after a micro-delay to ensure this data is written first
+        setTimeout(callback, 0)
+      }
+    }
+
+    // Check for shell integration in the data (only when suppressing)
+    if (this.outputSuppressed) {
+      let str = data
+      if (typeof data !== 'string') {
+        // Convert to string to check for OSC 633
+        const decoder = this.decoder || new TextDecoder('utf-8')
+        try {
+          str = decoder.decode(data instanceof ArrayBuffer ? data : new Uint8Array(data))
+        } catch (e) {
+          str = ''
+        }
+      }
+
+      // If we detect OSC 633, shell integration is working
+      if (this.checkForShellIntegration(str)) {
+        this.onShellIntegrationDetected()
+        // Don't buffer this - just discard the integration output
+        return
+      }
+
+      // Buffer the data while suppressed
+      this.suppressedData.push(data)
+      return
+    }
+
     if (typeof data === 'string') {
       return term.write(data)
     }
@@ -62,31 +200,9 @@ export default class AttachAddonCustom extends AttachAddon {
     const { term } = this
     term?.parent?.notifyOnData()
     const str = this.decoder.decode(data)
-    if (term?.parent?.props.sftpPathFollowSsh && term?.buffer.active.type !== 'alternate') {
-      const {
-        cwdId
-      } = term
-      const nss = str.split('\r')
-      const nnss = []
-      for (const str1 of nss) {
-        const ns = str1.trim()
-        if (cwdId) {
-          const cwdIdEscaped = regEscape(cwdId)
-          const dirRegex = new RegExp(`${cwdIdEscaped}([^\\n]+?)${cwdIdEscaped}`, 'g')
-          if (ns.match(dirRegex)) {
-            const cwd = dirRegex.exec(ns)[1].trim()
-            if (cwd === '~' || cwd === '%d' || cwd === '%/' || cwd === '$PWD') term.parent.setCwd('')
-            else term.parent.setCwd(cwd)
-            nnss.push(ns.replaceAll(dirRegex, ''))
-          } else nnss.push(str1)
-        } else {
-          nnss.push(str1)
-        }
-      }
-      term.write(nnss.join('\r'))
-    } else {
-      term?.write(str)
-    }
+    // CWD tracking is now handled by shell integration automatically
+    // No need to parse PS1 markers
+    term?.write(str)
   }
 
   sendToServer = (data) => {