@electerm/electerm-react 1.91.16 → 1.100.8

package/client/common/default-setting.js

@@ -67,5 +67,6 @@ export default {
   sessionLogPath: '',
   sshSftpSplitView: false,
   showCmdSuggestions: false,
-  startDirectoryLocal: ''
+  startDirectoryLocal: '',
+  allowMultiInstance: false
 }

package/client/common/sftp.js

@@ -10,12 +10,13 @@ import initWs from './ws'
 const transferKeys = Object.keys(transferTypeMap)
 
 class Sftp {
-  async init (terminalId) {
+  async init (terminalId, port) {
     const id = generate()
-    const ws = await initWs('sftp', id, terminalId)
+    const ws = await initWs('sftp', id, terminalId, undefined, port)
     this.ws = ws
     this.id = id
     this.terminalId = terminalId
+    this.port = port
     ws.s({
       action: 'sftp-new',
       id,
@@ -32,7 +33,8 @@ class Sftp {
             isFtp: this.type === 'ftp',
             ...args[0],
             terminalId,
-            type: func
+            type: func,
+            port
           })
         }
         const fid = generate()
@@ -71,9 +73,9 @@ class Sftp {
   }
 }
 
-export default async (terminalId, type = 'sftp') => {
+export default async (terminalId, type = 'sftp', port) => {
   const sftp = new Sftp()
   sftp.type = type
-  await sftp.init(terminalId)
+  await sftp.init(terminalId, port)
   return sftp
 }

package/client/common/transfer.js

@@ -19,9 +19,10 @@ class Transfer {
     const th = this
     const {
       sftpId,
-      isFtp
+      isFtp,
+      port
     } = rest
-    const ws = await initWs('transfer', id, sftpId)
+    const ws = await initWs('transfer', id, sftpId, undefined, port)
     ws.s({
       action: 'transfer-new',
       ...rest,

package/client/common/ws.js

@@ -140,7 +140,17 @@ function onEvent (e) {
 
 window.worker.addEventListener('message', onEvent)
 
-export default (type, id, sftpId = '', persist) => {
+export default (type, id, sftpId = '', persist, port) => {
+  const opts = pick(window.store.config, [
+    'host',
+    'port',
+    'tokenElecterm',
+    'server',
+    'urlPath'
+  ])
+  if (port) {
+    opts.port = port
+  }
   return new Promise((resolve) => {
     send({
       id,
@@ -151,13 +161,7 @@ export default (type, id, sftpId = '', persist) => {
         type,
         id,
         sftpId,
-        pick(window.store.config, [
-          'host',
-          'port',
-          'tokenElecterm',
-          'server',
-          'urlPath'
-        ])
+        opts
       ]
     })
     onces[id] = {

package/client/components/ai/ai-config.jsx

@@ -27,8 +27,8 @@ const defaultRoles = [
 ]
 
 const proxyOptions = [
-  { value: 'socks5://127.0.0.1:1080' },
-  { value: 'http://127.0.0.1:8080' },
+  { value: 'socks5://localhost:1080' },
+  { value: 'http://localhost:8080' },
   { value: 'https://proxy.example.com:3128' }
 ]
 
@@ -180,7 +180,7 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         <Form.Item
           label={e('proxy')}
           name='proxyAI'
-          tooltip='Proxy for AI API requests (e.g., socks5://127.0.0.1:1080)'
+          tooltip='Proxy for AI API requests (e.g., socks5://localhost:1080)'
         >
           <AutoComplete
             options={proxyOptions}

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

@@ -25,7 +25,7 @@ export default function renderProxy (props) {
           value: d
         }
       }),
-    placeholder: 'socks5://127.0.0.1:1080',
+    placeholder: 'socks5://localhost:1080',
     allowClear: true
   }
   return (

package/client/components/bookmark-form/render-ssh-tunnel.jsx

@@ -29,9 +29,9 @@ export default function renderSshTunnels (props) {
   const [initialValues] = useState({
     sshTunnel: 'forwardRemoteToLocal',
     sshTunnelLocalPort: 12200,
-    sshTunnelLocalHost: '127.0.0.1',
+    sshTunnelLocalHost: 'localhost',
     sshTunnelRemotePort: 12300,
-    sshTunnelRemoteHost: '127.0.0.1'
+    sshTunnelRemoteHost: 'localhost'
   })
   const [isDynamic, setter] = useState(formData.sshTunnel === 'dynamicForward')
   const [list, setList] = useState(formData.sshTunnels || [])
@@ -85,9 +85,9 @@ export default function renderSshTunnels (props) {
         // sshTunnel is forwardRemoteToLocal or forwardLocalToRemote or dynamicForward
         const {
           sshTunnel,
-          sshTunnelRemoteHost = '127.0.0.1',
+          sshTunnelRemoteHost = 'localhost',
           sshTunnelRemotePort = '',
-          sshTunnelLocalHost = '127.0.0.1',
+          sshTunnelLocalHost = 'localhost',
           sshTunnelLocalPort = '',
           name
         } = item

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

@@ -63,7 +63,6 @@ export default class RdpSession extends PureComponent {
     const { config } = this.props
     const {
       host,
-      port,
       tokenElecterm,
       server = ''
     } = config
@@ -76,24 +75,27 @@ export default class RdpSession extends PureComponent {
     const opts = clone({
       term: terminalType || config.terminalType,
       tabId: id,
+      uid: tab.id,
       srcTabId: tab.id,
       termType: type,
       ...tab
     })
-    let pid = await createTerm(opts)
+    const r = await createTerm(opts)
       .catch(err => {
         const text = err.message
         handleErr({ message: text })
       })
-    pid = pid || ''
     this.setState({
       loading: false
     })
-    if (!pid) {
+    if (!r) {
       this.setStatus(statusMap.error)
       return
     }
     this.setStatus(statusMap.success)
+    const {
+      pid, port
+    } = r
     this.pid = pid
     const hs = server
       ? server.replace(/https?:\/\//, '')

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

@@ -434,7 +434,7 @@ export default class SettingCommon extends Component {
           />
         </div>
         {
-          this.renderText('proxy', 'socks5://127.0.0.1:1080')
+          this.renderText('proxy', 'socks5://localhost:1080')
         }
       </div>
     )
@@ -669,6 +669,7 @@ export default class SettingCommon extends Component {
             'useSystemTitleBar',
             'confirmBeforeExit',
             'hideIP',
+            'allowMultiInstance',
             'debug'
           ].map(this.renderToggle)
         }

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

@@ -51,7 +51,7 @@ export default function TerminalBackgroundConfig ({
       },
       {
         value: 'randomShape',
-        desc: e('randomCats')
+        desc: e('randomShape')
       }
     )
   }

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

@@ -3,6 +3,7 @@ import { refs } from '../common/ref'
 import generate from '../../common/uid'
 import runIdle from '../../common/run-idle'
 import { Spin, Modal, notification } from 'antd'
+import clone from '../../common/to-simple-obj'
 import { isEqual, last, isNumber, some, isArray, pick, uniq, debounce } from 'lodash-es'
 import FileSection from './file-item'
 import resolve from '../../common/resolve'
@@ -10,6 +11,7 @@ import wait from '../../common/wait'
 import isAbsPath from '../../common/is-absolute-path'
 import classnames from 'classnames'
 import sorterIndex from '../../common/index-sorter'
+import { handleErr } from '../../common/fetch'
 import { getLocalFileInfo, getRemoteFileInfo, getFolderFromFilePath } from './file-read'
 import {
   typeMap, maxSftpHistory, paneMap,
@@ -29,6 +31,7 @@ import memoizeOne from 'memoize-one'
 import * as owner from './owner-list'
 import AddressBar from './address-bar'
 import getProxy from '../../common/get-proxy'
+import { createTerm } from '../terminal/terminal-apis'
 import './sftp.styl'
 
 const e = window.translate
@@ -52,8 +55,7 @@ export default class Sftp extends Component {
     this.id = 'sftp-' + this.props.tab.id
     refs.add(this.id, this)
     if (this.props.isFtp) {
-      this.type = 'ftp'
-      this.initData()
+      this.initFtpData()
     }
   }
 
@@ -100,6 +102,31 @@ export default class Sftp extends Component {
     this.timer5 = null
   }
 
+  initFtpData = async () => {
+    this.type = 'ftp'
+    const { tab } = this.props
+    const { id } = tab
+    const opts = clone({
+      tabId: id,
+      uid: tab.id,
+      srcTabId: tab.id,
+      termType: 'ftp',
+      ...tab
+    })
+    const r = await createTerm(opts)
+      .catch(err => {
+        const text = err.message
+        handleErr({ message: text })
+      })
+    if (!r) {
+      return
+    }
+    const {
+      port
+    } = r
+    this.initData(undefined, port)
+  }
+
   directions = [
     'desc',
     'asc'
@@ -427,8 +454,9 @@ export default class Sftp extends Component {
     this[type + 'Dom'].onPaste()
   }
 
-  initData = (terminalId) => {
+  initData = (terminalId, port) => {
     this.terminalId = terminalId
+    this.port = port
     if (this.shouldRenderRemote()) {
       this.initRemoteAll()
     }
@@ -592,7 +620,7 @@ export default class Sftp extends Component {
     let sftp = this.sftp
     try {
       if (!this.sftp) {
-        sftp = await Client(this.terminalId, this.type)
+        sftp = await Client(this.terminalId, this.type, this.port)
         if (!sftp) {
           return
         }

package/client/components/tabs/tab.jsx

@@ -350,10 +350,10 @@ class Tab extends Component {
     const list = sshTunnelResults.map(({ sshTunnel: obj, error }, i) => {
       const {
         sshTunnelLocalPort,
-        sshTunnelRemoteHost = '127.0.0.1',
+        sshTunnelRemoteHost = 'localhost',
         sshTunnelRemotePort,
         sshTunnel,
-        sshTunnelLocalHost = '127.0.0.1',
+        sshTunnelLocalHost = 'localhost',
         name
       } = obj
       let tunnel

package/client/components/terminal/term-search.jsx

@@ -63,14 +63,14 @@ export default class TermSearch extends PureComponent {
     }
   }
 
-  prev = (v = this.props.termSearch) => {
+  prev = () => {
     const {
       activeTabId,
       termSearchOptions
     } = this.props
     refs.get('term-' + activeTabId)
       ?.searchPrev(
-        v,
+        this.props.termSearch,
         copy(termSearchOptions)
       )
   }

package/client/components/terminal/terminal.jsx

@@ -1105,8 +1105,8 @@ clear\r`
     this.bufferMode = buf.type
   }
 
-  buildWsUrl = () => {
-    const { host, port, tokenElecterm } = this.props.config
+  buildWsUrl = (port) => {
+    const { host, tokenElecterm } = this.props.config
     const { id } = this.props.tab
     if (window.et.buildWsUrl) {
       return window.et.buildWsUrl(
@@ -1172,13 +1172,12 @@ clear\r`
         ? typeMap.remote
         : typeMap.local
     })
-    let r = await createTerm(opts)
+    const r = await createTerm(opts)
       .catch(err => {
         const text = err.message
         handleErr({ message: text })
       })
-    r = r || ''
-    if (r.includes('fail')) {
+    if (typeof r === 'string' && r.includes('fail')) {
       return this.promote()
     }
     if (savePassword) {
@@ -1191,11 +1190,12 @@ clear\r`
       this.setStatus(statusMap.error)
       return
     }
+    this.port = r.port
     this.setStatus(statusMap.success)
-    refs.get('sftp-' + id)?.initData(id)
+    refs.get('sftp-' + id)?.initData(id, r.port)
     term.pid = id
     this.pid = id
-    const wsUrl = this.buildWsUrl()
+    const wsUrl = this.buildWsUrl(r.port)
     const socket = new WebSocket(wsUrl)
     socket.onclose = this.oncloseSocket
     socket.onerror = this.onerrorSocket

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

@@ -69,7 +69,6 @@ export default class VncSession extends RdpSession {
     const { config } = this.props
     const {
       host,
-      port,
       tokenElecterm,
       server = ''
     } = config
@@ -86,25 +85,27 @@ export default class VncSession extends RdpSession {
     const opts = clone({
       term: terminalType || config.terminalType,
       tabId: id,
+      uid: tab.id,
       srcTabId: tab.id,
       termType: type,
       ...tab
     })
-    let pid = await createTerm(opts)
+    const r = await createTerm(opts)
       .catch(err => {
         const text = err.message
         handleErr({ message: text })
       })
-    pid = pid || ''
     this.setState({
       loading: false
     })
-    if (!pid) {
+    if (!r) {
       this.setStatus(statusMap.error)
       return
     }
     this.setStatus(statusMap.success)
+    const { pid, port } = r
     this.pid = pid
+    this.port = port
     const hs = server
       ? server.replace(/https?:\/\//, '')
       : `${host}:${port}`

package/package.json

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