@electerm/electerm-react 1.38.65 → 1.38.70

package/client/components/tabs/tabs.styl

@@ -151,7 +151,7 @@
   position absolute
   right 0
   top 0
-  z-index 200
+  z-index 900
   border-radius 0 0 3px 3px
   padding 0
   background main-light

package/client/components/terminal/index.jsx

@@ -1110,6 +1110,7 @@ class Term extends Component {
       ]),
       sessionId,
       tabId: id,
+      srcTabId: tab.id,
       terminalIndex,
       termType,
       readyTimeout: config.sshReadyTimeout,

package/client/components/terminal/terminal-interactive.jsx

@@ -5,7 +5,9 @@
 import { useEffect, useState } from 'react'
 import { Modal, Form, Button } from 'antd'
 import InputAutoFocus from '../common/input-auto-focus'
+import { tabActions } from '../../common/constants'
 import wait from '../../common/wait'
+import postMsg from '../../common/post-msg'
 
 const { prefix } = window
 const e = prefix('sftp')
@@ -16,6 +18,13 @@ export default function TermInteractive () {
   const [trigger] = useState(0)
   const [opts, setter] = useState(null)
   const [form] = Form.useForm()
+  function updateTab (data) {
+    postMsg({
+      action: tabActions.updateTabs,
+      id: data.tabId,
+      update: data.update
+    })
+  }
   function onMsg (e) {
     if (
       e &&
@@ -24,6 +33,12 @@ export default function TermInteractive () {
       e.data.includes('session-interactive')
     ) {
       setter(JSON.parse(e.data))
+    } else if (
+      e &&
+      e.data &&
+      e.data.includes('ssh-tunnel-result')
+    ) {
+      updateTab(JSON.parse(e.data))
     }
   }
   function clear () {

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

@@ -13,6 +13,15 @@ export default function TerminalInfoDisk (props) {
     return null
   }
   const col = colsParser(disks[0])
+  disks.sort((a, b) => {
+    if (a.filesystem.startsWith('/') && !b.filesystem.startsWith('/')) {
+      return -1
+    }
+    if (!a.filesystem.startsWith('/') && b.filesystem.startsWith('/')) {
+      return 1
+    }
+    return 0
+  })
   const ps = {
     rowKey: (rec) => `${rec.mount}_${rec.filesystem}`,
     dataSource: disks,

package/client/store/index.js

@@ -233,6 +233,10 @@ class Store {
     return JSON.parse(window.store._upgradeInfo)
   }
 
+  get transferToConfirm () {
+    return JSON.parse(window.store._transferToConfirm)
+  }
+
   get settingItem () {
     return JSON.parse(window.store._settingItem)
   }

package/client/store/init-state.js

@@ -92,9 +92,11 @@ export default () => {
 
     // sftp
     fileOperation: fileOperationsMap.cp, // cp or mv
+    pauseAllTransfer: false,
     transferTab: 'transfer',
     _transferHistory: '[]',
     _fileTransfers: '[]',
+    _transferToConfirm: '{}',
     _sftpSortSetting: ls.getItem(sftpDefaultSortSettingKey) || JSON.stringify({
       local: {
         prop: 'modifyTime',
@@ -169,9 +171,6 @@ export default () => {
     _serials: '[]',
     loaddingSerials: false,
 
-    // transfer list
-    transports: [],
-
     _sshConfigItems: '[]',
 
     appPath: '',

package/client/store/sync.js

@@ -12,6 +12,7 @@ import fetch from '../common/fetch-from-server'
 import download from '../common/download'
 import { fixBookmarks } from '../common/db-fix'
 import dayjs from 'dayjs'
+import parseJsonSafe from '../common/parse-json-safe'
 
 const names = without(dbNames, settingMap.history)
 const {
@@ -262,10 +263,12 @@ export default (Store) => {
       })
       store.setItems(n, arr)
     }
-    const userConfig = JSON.parse(
+    const userConfig = parseJsonSafe(
       get(gist, 'files["userConfig.json"].content')
     )
-    store.setTheme(userConfig.theme)
+    if (userConfig && userConfig.theme) {
+      store.setTheme(userConfig.theme)
+    }
     const up = {
       [type + 'LastSyncTime']: Date.now()
     }

package/client/store/tab.js

@@ -11,7 +11,7 @@ import postMsg from '../common/post-msg'
 export default Store => {
   Store.prototype.updateTabsStatus = function () {
     const tabIds = uniq(
-      window.store.getTransfers().map(d => d.tabId)
+      window.store.fileTransfers.map(d => d.tabId)
     )
     postMsg({
       action: tabActions.updateTabsStatus,

package/client/store/transfer-list.js

@@ -4,10 +4,9 @@ export default Store => {
     window.store.transferTab = tab
   }
 
-  // should update any item with same id in oldList from list array, should add any new item from list array to oldList, should remove any item with same id and sessionId in oldList but not in list array
   Store.prototype.setTransfers = function (list, _sessId) {
     const { store } = window
-    let oldList = store.getTransfers()
+    let oldList = store.fileTransfers
     const sessId = _sessId || list[0].sessionId
     const arr2 = oldList.filter(t => {
       return t.sessionId === sessId
@@ -48,4 +47,58 @@ export default Store => {
   Store.prototype.addTransfers = function (objs) {
     return window.store.addItems(objs, 'fileTransfers')
   }
+  Store.prototype.setFileTransfers = function (objs) {
+    return window.store.setState('fileTransfers', objs)
+  }
+  Store.prototype.addTransferList = function (objs) {
+    const { store } = window
+    store.setFileTransfers([
+      ...store.fileTransfers,
+      ...objs
+    ])
+  }
+  Store.prototype.toggleTransfer = function (itemId) {
+    const { store } = window
+    const { fileTransfers } = store
+    const index = findIndex(fileTransfers, t => t.id === itemId)
+    if (index < 0) {
+      return
+    }
+    fileTransfers[index].pausing = !fileTransfers[index].pausing
+    store.setFileTransfers(fileTransfers)
+  }
+
+  Store.prototype.pauseAll = function () {
+    const { store } = window
+    store.pauseAllTransfer = true
+    store.setFileTransfers(store.fileTransfers.map(t => {
+      t.pausing = true
+      return t
+    }))
+  }
+  Store.prototype.resumeAll = function () {
+    const { store } = window
+    store.pauseAllTransfer = false
+    store.setFileTransfers(store.fileTransfers.map(t => {
+      t.pausing = false
+      return t
+    }))
+  }
+  Store.prototype.cancelAll = function () {
+    const { store } = window
+    store.setFileTransfers(store.fileTransfers.map(t => {
+      t.cancel = true
+      return t
+    }))
+  }
+  Store.prototype.cancelTransfer = function (itemId) {
+    const { store } = window
+    const { fileTransfers } = store
+    const index = findIndex(fileTransfers, t => t.id === itemId)
+    if (index < 0) {
+      return
+    }
+    fileTransfers[index].cancel = true
+    store.setFileTransfers(fileTransfers)
+  }
 }

package/client/store/watch.js

@@ -33,14 +33,6 @@ export default store => {
   //   return store.menuOpened
   // })
 
-  // autoRun(store, () => {
-  //   const v = store.getItems('tabs').map(t => {
-  //     delete t.isTransporting
-  //     return t
-  //   })
-  //   update('sessions', v)
-  //   return store._tabs
-  // }, func => debounce(func, 100))
   for (const name of dbNamesForWatch) {
     autoRun(store, async () => {
       await update(

package/package.json

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

package/client/components/sftp/transfer-conflict.jsx

@@ -1,323 +0,0 @@
-/**
- * pass transfer list from props
- * when list changes, do transfer and other op
- */
-
-import { useRef } from 'react'
-import { useDelta, useConditionalEffect } from 'react-delta'
-import { maxTransport, typeMap } from '../../common/constants'
-import {
-  getLocalFileInfo,
-  getRemoteFileInfo,
-  getFolderFromFilePath,
-  getFileExt,
-  checkFolderSize
-} from './file-read'
-import copy from 'json-deep-copy'
-import { findIndex, find } from 'lodash-es'
-import generate from '../../common/uid'
-import resolve from '../../common/resolve'
-import eq from 'fast-deep-equal'
-import { createTransferProps } from './transfer-common'
-
-export default (props) => {
-  const { transferList, sessionId } = props
-  const delta = useDelta(transferList)
-  const currentId = useRef('')
-  const timer = useRef(null)
-  const onConfirm = useRef(false)
-  const ref = {}
-
-  ref.localCheckExist = (path) => {
-    return getLocalFileInfo(path)
-  }
-
-  ref.remoteCheckExist = (path) => {
-    const { sftp } = props
-    return getRemoteFileInfo(sftp, path)
-      .then(r => r)
-      .catch(() => false)
-  }
-
-  const checkExist = (type, path) => {
-    return ref[type + 'CheckExist'](path)
-  }
-
-  function rename (tr, action, _renameId) {
-    const isRemote = tr.typeTo === typeMap.remote
-    const { path, name } = getFolderFromFilePath(tr.toPath, isRemote)
-    const { base, ext } = getFileExt(name)
-    const renameId = _renameId || generate()
-    const newName = ext
-      ? `${base}(rename-${renameId}).${ext}`
-      : `${base}(rename-${renameId})`
-    const res = {
-      ...tr,
-      renameId,
-      newName,
-      oldName: base,
-      toPath: resolve(path, newName)
-    }
-    if (action) {
-      res.action = action
-    }
-    return res
-  }
-
-  function updateTransferAction (data) {
-    const {
-      id,
-      action,
-      transfer
-    } = data
-    const {
-      fromFile
-    } = transfer
-    clear()
-    props.modifier((old) => {
-      let transferList = copy(old.transferList)
-      const index = findIndex(transferList, d => d.id === id)
-      if (index < 0) {
-        return {
-          transferList
-        }
-      }
-      transferList[index].fromFile = fromFile
-      transferList[index].action = action
-      if (action === 'skip') {
-        transferList.splice(index, 1)
-      } else if (action === 'cancel') {
-        transferList = transferList.slice(0, index)
-      }
-      if (action.includes('All')) {
-        transferList = transferList.map((t, i) => {
-          if (i < index) {
-            return t
-          }
-          return {
-            ...t,
-            action: action.replace('All', '')
-          }
-        })
-      }
-      if (action.includes('rename')) {
-        transferList[index] = rename(transferList[index])
-      } else if (action === 'skipAll') {
-        transferList.splice(index, 1)
-      }
-      window.store.setTransfers(transferList, sessionId)
-      return {
-        transferList
-      }
-    })
-  }
-
-  function tagTransferError (id, errorMsg) {
-    const tr = find(transferList, d => d.id === id)
-    window.store.addTransferHistory({
-      ...tr,
-      host: props.host,
-      error: errorMsg,
-      finishTime: Date.now()
-    })
-    props.modifier(old => {
-      const transferList = copy(old.transferList)
-      const index = findIndex(transferList, d => d.id === id)
-      if (index >= 0) {
-        transferList.splice(index, 1)
-      }
-      window.store.setTransfers(transferList, sessionId)
-      return {
-        transferList
-      }
-    })
-  }
-
-  function setConflict (tr) {
-    if (props.transferToConfirm) {
-      return
-    }
-    props.modifier({
-      transferToConfirm: tr
-    })
-  }
-
-  function onDecision (event) {
-    if (event && event.data && event.data.id === currentId.current) {
-      // const {
-      //   transferGroupId,
-      //   fileId,
-      //   id,
-      //   action
-      // } = event.data
-      currentId.current = ''
-      updateTransferAction(event.data)
-      onConfirm.current = false
-      window.removeEventListener('message', onDecision)
-    }
-  }
-
-  function waitForSignal () {
-    window.addEventListener('message', onDecision)
-  }
-
-  function setCanTransfer (fromFile, tr) {
-    clear()
-    props.modifier((old) => {
-      const transferList = copy(old.transferList)
-      const index = findIndex(transferList, t => {
-        return t.id === tr.id
-      })
-      if (index >= 0) {
-        const up = {
-          action: 'transfer',
-          fromFile
-        }
-        Object.assign(transferList[index], up)
-      }
-      window.store.setTransfers(transferList, sessionId)
-      return {
-        transferList
-      }
-    })
-  }
-
-  async function expand (fromFile, tr) {
-    let list = []
-    if (!tr.skipExpand) {
-      const { type } = fromFile
-      list = await props[type + 'List'](
-        true, tr.fromPath
-      )
-      list = list.map(t => {
-        return {
-          typeFrom: tr.typeFrom,
-          typeTo: tr.typeTo,
-          fromPath: resolve(t.path, t.name),
-          toPath: resolve(tr.toPath, t.name),
-          id: generate(),
-          ...createTransferProps(props),
-          parentId: tr.id
-        }
-      })
-    }
-    clear()
-    props.modifier((old) => {
-      const transferList = copy(old.transferList)
-      const index = findIndex(transferList, t => {
-        return t.id === tr.id
-      })
-      transferList.splice(index + 1, 0, ...list)
-      if (transferList[index]) {
-        transferList[index].expanded = true
-      }
-      window.store.setTransfers(transferList, sessionId)
-      return {
-        transferList
-      }
-    })
-  }
-
-  function clear () {
-    currentId.current = ''
-  }
-  async function watchFile () {
-    if (!transferList.length && currentId.current) {
-      return clear()
-    }
-    const tr = transferList
-      .filter(t => {
-        return (
-          !t.action ||
-          !t.fromFile ||
-          (t.fromFile.isDirectory && !t.expanded)
-        )
-      })[0]
-    if (!tr) {
-      onConfirm.current = false
-      return clear()
-    }
-    if (currentId.current) {
-      return null
-    }
-    currentId.current = tr.id
-    const {
-      typeFrom,
-      typeTo,
-      fromPath,
-      toPath,
-      id,
-      action,
-      expanded,
-      renameId,
-      parentId,
-      skipConfirm
-    } = tr
-    const fromFile = tr.fromFile
-      ? tr.fromFile
-      : await checkExist(typeFrom, fromPath)
-    if (!fromFile) {
-      currentId.current = ''
-      return tagTransferError(id, 'file not exist')
-    }
-    let toFile = false
-    if (renameId || parentId) {
-      toFile = false
-    } else if (fromPath === toPath && typeFrom === typeTo) {
-      toFile = true
-    } else {
-      toFile = await checkExist(typeTo, toPath)
-    }
-    if (fromFile.isDirectory) {
-      const skip = await checkFolderSize(props, fromFile)
-        .then(d => d && typeFrom !== typeTo)
-      tr.zip = skip
-      tr.skipExpand = skip
-    }
-    if (fromPath === toPath && typeFrom === typeTo) {
-      return updateTransferAction({
-        id,
-        action: 'rename',
-        transfer: {
-          ...tr,
-          operation: 'cp',
-          fromFile
-        }
-      })
-    } else if (toFile && !action && !skipConfirm) {
-      waitForSignal(id)
-      if (!onConfirm.current) {
-        onConfirm.current = true
-        return setConflict({
-          ...tr,
-          fromFile,
-          toFile
-        })
-      }
-    } else if (toFile && !tr.fromFile && action) {
-      return updateTransferAction({
-        id,
-        action,
-        transfer: {
-          ...tr,
-          fromFile
-        }
-      })
-    } else if (
-      fromFile.isDirectory &&
-      !expanded &&
-      typeFrom !== typeTo &&
-      transferList.filter(t => t.fromFile).length < maxTransport
-    ) {
-      return expand(fromFile, tr)
-    }
-    setCanTransfer(fromFile, tr)
-  }
-  useConditionalEffect(() => {
-    watchFile()
-    return () => {
-      clearTimeout(timer.current)
-    }
-  }, delta && delta.prev && !eq(delta.prev, delta.curr))
-  return null
-}