@electerm/electerm-react 1.38.19 → 1.38.40

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

@@ -562,6 +562,22 @@ export default class Sftp extends Component {
     })
   }
 
+  sftpList = (sftp, remotePath) => {
+    return sftp.list(remotePath)
+      .then(arr => {
+        return arr.map(item => {
+          const { type } = item
+          return {
+            ...pick(item, ['name', 'size', 'accessTime', 'modifyTime', 'mode', 'owner', 'group']),
+            isDirectory: type === fileTypeMap.directory,
+            type: typeMap.remote,
+            path: remotePath,
+            id: generate()
+          }
+        })
+      })
+  }
+
   remoteList = async (
     returnList = false,
     remotePathReal,
@@ -644,52 +660,8 @@ export default class Sftp extends Component {
         }
       }
 
-      let remote = await sftp.list(remotePath)
+      const remote = await this.sftpList(sftp, remotePath)
       this.sftp = sftp
-      const remotes = deepCopy(remote)
-      remote = []
-      for (const _r of remotes) {
-        const r = _r
-        const { type, name } = r
-        const f = {
-          ...pick(r, ['name', 'size', 'accessTime', 'modifyTime', 'mode', 'owner', 'group']),
-          isDirectory: r.type === fileTypeMap.directory,
-          type: typeMap.remote,
-          path: remotePath,
-          id: generate()
-        }
-        if (type === fileTypeMap.link) {
-          const linkPath = resolve(remotePath, name)
-          let realpath = await sftp.readlink(linkPath)
-            .catch(e => {
-              console.debug(e)
-              return null
-            })
-          if (!realpath) {
-            continue
-          }
-          if (!isAbsPath(realpath)) {
-            realpath = resolve(remotePath, realpath)
-            realpath = await sftp.realpath(realpath)
-          }
-          const realFileInfo = await getRemoteFileInfo(
-            sftp,
-            realpath
-          ).catch(e => {
-            log.debug('seems a bad symbolic link')
-            log.debug(e)
-            return null
-          })
-          if (!realFileInfo) {
-            continue
-          }
-          f.isSymbolicLink = true
-          f.isDirectory = realFileInfo.isDirectory
-        } else {
-          f.isSymbolicLink = false
-        }
-        remote.push(f)
-      }
       const update = {
         remote,
         remoteFileTree: buildTree(remote),
@@ -712,6 +684,7 @@ export default class Sftp extends Component {
         ]).slice(0, maxSftpHistory)
       }
       this.setState(update, () => {
+        this.updateRemoteList(remote, remotePath, sftp)
         this.props.editTab(tab.id, {
           sftpCreated: true
         })
@@ -731,6 +704,53 @@ export default class Sftp extends Component {
     }
   }
 
+  updateRemoteList = async (
+    remotes,
+    remotePath,
+    sftp
+  ) => {
+    const remote = []
+    for (const r of remotes) {
+      const { type, name } = r
+      if (type === fileTypeMap.link) {
+        const linkPath = resolve(remotePath, name)
+        let realpath = await sftp.readlink(linkPath)
+          .catch(e => {
+            console.debug(e)
+            return null
+          })
+        if (!realpath) {
+          continue
+        }
+        if (!isAbsPath(realpath)) {
+          realpath = resolve(remotePath, realpath)
+          realpath = await sftp.realpath(realpath)
+        }
+        const realFileInfo = await getRemoteFileInfo(
+          sftp,
+          realpath
+        ).catch(e => {
+          log.debug('seems a bad symbolic link')
+          log.debug(e)
+          return null
+        })
+        if (!realFileInfo) {
+          continue
+        }
+        r.isSymbolicLink = true
+        r.isDirectory = realFileInfo.isDirectory
+      } else {
+        r.isSymbolicLink = false
+      }
+      remote.push(r)
+    }
+    const update = {
+      remote,
+      remoteFileTree: buildTree(remote)
+    }
+    this.setState(update)
+  }
+
   localList = async (returnList = false, localPathReal, oldPath) => {
     if (!fs) return
     if (!returnList) {

package/client/components/shortcuts/shortcuts-defaults.js

@@ -50,13 +50,13 @@ export default () => {
       shortcut: 'ctrl+l,ctrl+shift+l',
       shortcutMac: 'meta+l'
     },
-    {
-      name: 'terminal_selectAll',
-      shortcut: 'ctrl+a,ctrl+shift+a',
-      shortcutMac: 'meta+a',
-      skipMac: true,
-      readonly: true
-    },
+    // {
+    //   name: 'terminal_selectAll',
+    //   shortcut: 'ctrl+a,ctrl+shift+a',
+    //   shortcutMac: 'meta+a',
+    //   skipMac: true,
+    //   readonly: true
+    // },
     {
       name: 'terminal_copy',
       shortcut: 'ctrl+c,ctrl+shift+c',

package/client/components/tabs/index.jsx

@@ -49,6 +49,7 @@ export default class Tabs extends React.Component {
       tabsRef
     } = this
     tabsRef.current.addEventListener('mousedown', this.handleClickEvent)
+    tabsRef.current.addEventListener('mousewheel', this.handleWheelEvent)
   }
 
   componentDidUpdate (prevProps) {
@@ -75,7 +76,7 @@ export default class Tabs extends React.Component {
     const len = tabs.length
     const addBtnWidth = 22
     const tabsWidth = this.tabsWidth()
-    const tabsWidthAll = tabMargin * len + 216 + tabsWidth
+    const tabsWidthAll = tabMargin * len + 166 + tabsWidth
     return width < (tabsWidthAll + addBtnWidth)
   }
 
@@ -129,6 +130,16 @@ export default class Tabs extends React.Component {
     this.dom.scrollLeft = scrollLeft
   }
 
+  handleWheelEvent = (e) => {
+    if (this.isOverflow()) {
+      if (e.deltaY < 0) {
+        this.handleScrollLeft()
+      } else {
+        this.handleScrollRight()
+      }
+    }
+  }
+
   handleClickMenu = ({ key }) => {
     const id = key.split('##')[1]
     this.props.onChangeTabId(id)

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

@@ -55,7 +55,7 @@ export default class AttachAddonCustom extends AttachAddon {
     const data = ev.target.result
     const { term } = this
     const str = this.decoder.decode(data)
-    if (term.parent.props.sftpPathFollowSsh && term.buffer.active.type !== 'alternate') {
+    if (term?.parent?.props.sftpPathFollowSsh && term?.buffer.active.type !== 'alternate') {
       const {
         cwdId
       } = term
@@ -78,7 +78,7 @@ export default class AttachAddonCustom extends AttachAddon {
       }
       term.write(nnss.join('\r'))
     } else {
-      term.write(str)
+      term?.write(str)
     }
   }
 

package/client/components/terminal/index.jsx

@@ -234,10 +234,10 @@ class Term extends Component {
     this.onClear()
   }
 
-  selectAllShortcut = (e) => {
-    e.stopPropagation()
-    this.term.selectAll()
-  }
+  // selectAllShortcut = (e) => {
+  //   e.stopPropagation()
+  //   this.term.selectAll()
+  // }
 
   copyShortcut = (e) => {
     const sel = this.term.getSelection()
@@ -425,6 +425,9 @@ class Term extends Component {
   }
 
   webLinkHandler = (event, url) => {
+    if (event?.button === 2) {
+      return false
+    }
     if (!this.props.config.ctrlOrMetaOpenTerminalLink) {
       return window.openLink(url, '_blank')
     }
@@ -757,9 +760,9 @@ class Term extends Component {
     this.term.focus()
   }
 
-  onSelectAll = () => {
-    this.term.selectAll()
-  }
+  // onSelectAll = () => {
+  //   this.term.selectAll()
+  // }
 
   onClear = () => {
     this.term.clear()
@@ -810,7 +813,7 @@ class Term extends Component {
     const copyShortcut = this.getShortcut('terminal_copy')
     const pasteShortcut = this.getShortcut('terminal_paste')
     const clearShortcut = this.getShortcut('terminal_clear')
-    const selectAllShortcut = this.getShortcut('terminal_selectAll')
+    // const selectAllShortcut = this.getShortcut('terminal_selectAll')
     const searchShortcut = this.getShortcut('terminal_search')
     return [
       {
@@ -833,12 +836,12 @@ class Term extends Component {
         text: e('clear'),
         subText: clearShortcut
       },
-      {
-        func: 'onSelectAll',
-        icon: 'SelectOutlined',
-        text: e('selectAll'),
-        subText: selectAllShortcut
-      },
+      // {
+      //   func: 'onSelectAll',
+      //   icon: 'SelectOutlined',
+      //   text: e('selectAll'),
+      //   subText: selectAllShortcut
+      // },
       {
         func: 'toggleSearch',
         icon: 'SearchOutlined',
@@ -1203,7 +1206,7 @@ class Term extends Component {
   }
 
   oncloseSocket = () => {
-    if (this.onClose) {
+    if (this.onClose || !this.props.tab.enableSsh) {
       return
     }
     this.setStatus(

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

@@ -4,15 +4,15 @@
 
 import { Table, Tooltip, Popconfirm } from 'antd'
 import { isEmpty } from 'lodash-es'
-import { CloseCircleOutlined } from '@ant-design/icons'
+import { CloseCircleOutlined, BarsOutlined } from '@ant-design/icons'
 import colsParser from './data-cols-parser'
 
 const { prefix } = window
 const m = prefix('menu')
 
 export default function TerminalInfoActivities (props) {
-  const { activities } = props
-  if (isEmpty(activities) || !props.isRemote) {
+  const { activities, isRemote, terminalInfos } = props
+  if (isEmpty(activities) || !isRemote || !terminalInfos.includes('activities')) {
     return null
   }
   const col = colsParser(activities[0])
@@ -47,7 +47,7 @@ export default function TerminalInfoActivities (props) {
   }
   return (
     <div className='terminal-info-section terminal-info-act'>
-      <div className='pd1y bold'>Activities</div>
+      <div className='pd1y bold'><BarsOutlined /> Activities</div>
       <Table {...ps} />
     </div>
   )

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

@@ -7,15 +7,28 @@ import {
   commonActions
 } from '../../common/constants'
 import {
-  Switch
+  Switch,
+  Space,
+  Button
 } from 'antd'
 import ShowItem from '../common/show-item'
+import defaults from '../../common/default-setting'
 import postMsg from '../../common/post-msg'
 import { toggleTerminalLog, toggleTerminalLogTimestamp } from '../terminal/terminal-apis'
+import { ClockCircleOutlined, BorderlessTableOutlined, DatabaseOutlined, BarsOutlined, ApiOutlined, PartitionOutlined } from '@ant-design/icons'
 
 const { prefix } = window
 const st = prefix('setting')
 
+const mapper = {
+  uptime: <ClockCircleOutlined />,
+  cpu: <BorderlessTableOutlined />,
+  mem: <DatabaseOutlined />,
+  activities: <BarsOutlined />,
+  network: <ApiOutlined />,
+  disks: <PartitionOutlined />
+}
+
 export default class TerminalInfoBase extends Component {
   state = {
     saveTerminalLogToFile: false,
@@ -54,6 +67,16 @@ export default class TerminalInfoBase extends Component {
     })
   }
 
+  toggleTerminalLogInfo = (h) => {
+    const { terminalInfos } = this.props
+    const nv = terminalInfos.includes(h)
+      ? terminalInfos.filter(f => f !== h)
+      : [...terminalInfos, h]
+    window.store.setConfig({
+      terminalInfos: nv
+    })
+  }
+
   handleToggle = () => {
     const { saveTerminalLogToFile, addTimeStampToTermLog } = this.state
     const {
@@ -120,10 +143,38 @@ export default class TerminalInfoBase extends Component {
         unCheckedChildren={name}
         checked={addTimeStampToTermLog}
         onChange={this.handleToggleTimestamp}
+        className='mg1b'
       />
     )
   }
 
+  renderInfoSelection () {
+    const {
+      terminalInfos
+    } = this.props
+    return (
+      <Space.Compact block>
+        {
+          defaults.terminalInfos.map(f => {
+            const type = terminalInfos.includes(f) ? 'primary' : 'default'
+            return (
+              <Button
+                key={f + 'term-info-sel'}
+                type={type}
+                size='small'
+                onClick={() => this.toggleTerminalLogInfo(f)}
+                className='cap'
+                icon={mapper[f]}
+              >
+                {f}
+              </Button>
+            )
+          })
+        }
+      </Space.Compact>
+    )
+  }
+
   render () {
     const {
       id,
@@ -149,13 +200,18 @@ export default class TerminalInfoBase extends Component {
               unCheckedChildren={name}
               checked={saveTerminalLogToFile}
               onChange={this.handleToggle}
-              className='mg1r'
+              className='mg1r mg1b'
             />
             {
               this.renderTimestamp()
             }
           </span>
         </div>
+        <div className='pd2y'>
+          {
+            this.renderInfoSelection()
+          }
+        </div>
         <p><b>log:</b> {to}</p>
       </div>
     )

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

@@ -5,10 +5,11 @@
 import { Table } from 'antd'
 import { isEmpty } from 'lodash-es'
 import colsParser from './data-cols-parser'
+import { PartitionOutlined } from '@ant-design/icons'
 
 export default function TerminalInfoDisk (props) {
-  const { disks } = props
-  if (isEmpty(disks) || !props.isRemote) {
+  const { disks, isRemote, terminalInfos } = props
+  if (isEmpty(disks) || !isRemote || !terminalInfos.includes('disks')) {
     return null
   }
   const col = colsParser(disks[0])
@@ -22,7 +23,7 @@ export default function TerminalInfoDisk (props) {
   }
   return (
     <div className='terminal-info-section terminal-info-disk'>
-      <div className='pd1y bold'>File system</div>
+      <div className='pd1y bold'><PartitionOutlined /> File system</div>
       <Table {...ps} />
     </div>
   )

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

@@ -7,10 +7,11 @@ import { isEmpty } from 'lodash-es'
 import { useEffect, useState } from 'react'
 import { formatBytes } from '../../common/byte-format'
 import copy from 'json-deep-copy'
+import { ApiOutlined } from '@ant-design/icons'
 
 export default function TerminalInfoDisk (props) {
-  const { network } = props
-  if (isEmpty(network) || !props.isRemote) {
+  const { network, isRemote, terminalInfos } = props
+  if (isEmpty(network) || !isRemote || !terminalInfos.includes('network')) {
     return null
   }
   const [state, setter] = useState({
@@ -107,7 +108,7 @@ export default function TerminalInfoDisk (props) {
   }
   return (
     <div className='terminal-info-section terminal-info-network'>
-      <div className='pd1y bold'>Network</div>
+      <div className='pd1y bold'><ApiOutlined /> Network</div>
       <Table {...ps} />
     </div>
   )

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

@@ -25,8 +25,13 @@ function computePercent (used, total) {
 }
 
 export default function TerminalInfoResource (props) {
-  const { cpu, mem, swap } = props
-  if (!props.isRemote) {
+  const { cpu, mem, swap, isRemote, terminalInfos } = props
+  if (
+    !isRemote ||
+    (!terminalInfos.includes('cpu') &&
+    !terminalInfos.includes('mem') &&
+    !terminalInfos.includes('swap'))
+  ) {
     return null
   }
   function renderItem (obj) {
@@ -56,20 +61,25 @@ export default function TerminalInfoResource (props) {
       </div>
     )
   }
-  const data = [
-    {
+  const data = []
+  if (terminalInfos.includes('cpu')) {
+    data.push({
       name: 'cpu',
       percent: parseInt10(cpu)
-    },
-    {
+    })
+  }
+  if (terminalInfos.includes('mem')) {
+    data.push({
       name: 'mem',
       ...mem
-    },
-    {
+    })
+  }
+  if (terminalInfos.includes('swap')) {
+    data.push({
       name: 'swap',
       ...swap
-    }
-  ]
+    })
+  }
   return (
     <div className='terminal-info-section terminal-info-resource'>
       {

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

@@ -2,14 +2,16 @@
  * up time info
  */
 
+import { ClockCircleOutlined } from '@ant-design/icons'
+
 export default function TerminalInfoUp (props) {
-  const { uptime } = props
-  if (!props.isRemote) {
+  const { uptime, isRemote, terminalInfos } = props
+  if (!isRemote || !terminalInfos.includes('uptime')) {
     return null
   }
   return (
     <div className='terminal-info-section terminal-info-up'>
-      <b>uptime</b>: {uptime}
+      <b><ClockCircleOutlined /> uptime</b>: {uptime}
     </div>
   )
 }

package/client/css/basic.styl

@@ -39,3 +39,6 @@ body
 
 a
   color primary
+
+.cap
+  text-transform capitalize

package/client/store/common.js

@@ -3,6 +3,7 @@
  */
 
 import handleError from '../common/error-handler'
+import { Modal } from 'antd'
 import { debounce } from 'lodash-es'
 import postMessage from '../common/post-msg'
 import {
@@ -15,6 +16,10 @@ import {
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 
+const { prefix } = window
+const m = prefix('menu')
+const c = prefix('common')
+
 export default Store => {
   Store.prototype.storeAssign = function (updates) {
     Object.assign(this, updates)
@@ -155,4 +160,50 @@ export default Store => {
     ls.setItem(dismissDelKeyTipLsKey, 'y')
     window.store.hideDelKeyTip = true
   }
+  Store.prototype.beforeExit = function (e) {
+    const { confirmBeforeExit } = window.store.config
+    if (
+      (confirmBeforeExit &&
+      !window.confirmExit) ||
+      window.store.isTransporting
+    ) {
+      e.returnValue = false
+      let mod = null
+      mod = Modal.confirm({
+        onCancel: () => {
+          window.confirmExit = false
+          mod.destroy()
+        },
+        onOk: () => {
+          window.confirmExit = true
+          window.store[window.exitFunction]()
+        },
+        title: m('quit'),
+        okText: c('ok'),
+        cancelText: c('cancel'),
+        content: ''
+      })
+    }
+  }
+  Store.prototype.beforeExitApp = function (e, name) {
+    let mod = null
+    mod = Modal.confirm({
+      onCancel: () => {
+        window.pre.runGlobalAsync('setCloseAction', 'closeApp')
+        mod.destroy()
+      },
+      onOk: () => {
+        window.pre.runGlobalAsync(name)
+      },
+      title: m('quit'),
+      okText: c('ok'),
+      cancelText: c('cancel'),
+      content: ''
+    })
+  }
+  Store.prototype.setTerminalInfos = function (arr) {
+    window.store.setConfig({
+      terminalInfos: arr
+    })
+  }
 }

package/client/store/index.js

@@ -8,7 +8,7 @@ import loadDataExtend from './load-data'
 import dbUpgradeExtend from './db-upgrade'
 import eventExtend from './event'
 import syncExtend from './sync'
-import appUpgrdeExtend from './app-upgrade'
+import appUpgradeExtend from './app-upgrade'
 import bookmarkGroupExtend from './bookmark-group'
 import bookmarkExtend from './bookmark'
 import commonExtend from './common'
@@ -288,7 +288,7 @@ loadDataExtend(Store)
 eventExtend(Store)
 dbUpgradeExtend(Store)
 syncExtend(Store)
-appUpgrdeExtend(Store)
+appUpgradeExtend(Store)
 bookmarkGroupExtend(Store)
 bookmarkExtend(Store)
 commonExtend(Store)

package/client/store/sync.js

@@ -2,12 +2,12 @@
  * sync data to github gist related
  */
 
-import { without, get, pick, debounce } from 'lodash-es'
+import { without, get, pick, debounce, findIndex } from 'lodash-es'
 import copy from 'json-deep-copy'
 import {
   settingMap, packInfo, syncTypes
 } from '../common/constants'
-import { remove, dbNames, insert, update } from '../common/db'
+import { remove, dbNames, insert, update, getData } from '../common/db'
 import fetch from '../common/fetch-from-server'
 import download from '../common/download'
 import { fixBookmarks } from '../common/db-fix'
@@ -169,6 +169,10 @@ export default (Store) => {
       objs[`${n}.json`] = {
         content: str
       }
+      const order = await getData(`${n}:order`)
+      objs[`${n}.order.json`] = {
+        content: JSON.stringify(order)
+      }
     }
     const res = await fetchData(type, 'update', [gistId, {
       description: 'sync electerm data',
@@ -235,6 +239,15 @@ export default (Store) => {
       } else if (n === settingMap.bookmarks) {
         arr = fixBookmarks(arr)
       }
+      let strOrder = get(gist, `files["${n}.order.json"].content`)
+      if (strOrder) {
+        strOrder = JSON.parse(strOrder)
+        arr.sort((a, b) => {
+          const ai = findIndex(strOrder, r => r === a.id)
+          const bi = findIndex(strOrder, r => r === b.id)
+          return ai - bi
+        })
+      }
       toInsert.push({
         name: n,
         value: arr