@electerm/electerm-react 1.80.5 → 1.80.18

package/client/common/default-setting.js

@@ -8,7 +8,7 @@ export default {
   scrollback: 3000,
   onStartSessions: [],
   fontSize: 16,
-  fontFamily: 'Fira Code, mono, courier-new, courier, monospace',
+  fontFamily: 'Maple Mono, mono, courier-new, courier, monospace',
   execWindows: 'System32/WindowsPowerShell/v1.0/powershell.exe',
   execMac: 'zsh',
   execLinux: 'bash',

package/client/components/file-transfer/conflict-resolve.jsx

@@ -153,7 +153,7 @@ export default class ConfirmModalStore extends Component {
         <Button
           type='dashed'
           className='mg1l'
-          onClick={() => this.act(fileActions.cancel)}
+          onClick={() => this.act(fileActions.skipAll)}
         >
           {e('cancel')}
         </Button>
@@ -208,6 +208,16 @@ export default class ConfirmModalStore extends Component {
           >
             {e('renameAll')}
           </Button>
+          <Button
+            type='primary'
+            className='mg1l'
+            title={e('skipAll')}
+            onClick={
+              () => this.act(fileActions.skipAll)
+            }
+          >
+            {e('skipAll')}
+          </Button>
         </div>
       </div>
     )

package/client/components/file-transfer/transfer.jsx

@@ -28,6 +28,7 @@ export default class TransportAction extends Component {
     refsTransfers.add(this.id, this)
     this.total = 0
     this.transferred = 0
+    this.currentProgress = 1
   }
 
   componentDidMount () {
@@ -421,11 +422,11 @@ export default class TransportAction extends Component {
     }
     this.transferred += transferred
     const up = {}
-    let percent = this.total === 0
-      ? 0
-      : Math.floor(100 * this.transferred / this.total)
-    percent = percent >= 100 ? 99 : percent
-    up.percent = percent
+
+    // Increment progress slightly with each file/folder (but never exceed 99%)
+    this.currentProgress = Math.min(this.currentProgress + 0.2, 99)
+
+    up.percent = Math.floor(this.currentProgress)
     up.status = 'active'
     up.transferred = this.transferred
     up.startTime = this.startTime
@@ -505,49 +506,157 @@ export default class TransportAction extends Component {
     return transfer
   }
 
-  transferFolderRecursive = async (transfer = this.getDefaultTransfer()) => {
+  // Handle file transfers in parallel batches
+  transferFiles = async (files, batch, transfer) => {
+    if (this.onCancel) {
+      return
+    }
+
+    const { fromPath, toPath } = transfer
+
+    // Process files in batches
+    for (let i = 0; i < files.length; i += batch) {
+      if (this.onCancel) {
+        return
+      }
+
+      const batchFiles = files.slice(i, i + batch)
+      const promises = batchFiles.map(file => {
+        if (this.onCancel) {
+          return Promise.resolve(0)
+        }
+
+        const fromItemPath = resolve(fromPath, file.name)
+        const toItemPath = resolve(toPath, file.name)
+
+        const itemTransfer = {
+          ...transfer,
+          fromPath: fromItemPath,
+          toPath: toItemPath,
+          fromFile: file
+        }
+
+        return this.transferFileAsSubTransfer(itemTransfer)
+      })
+
+      // Wait for all files in batch to complete
+      const results = await Promise.all(promises)
+
+      // Update progress once for the entire batch
+      const batchTotalSize = results.reduce((sum, size) => sum + size, 0)
+      if (batchTotalSize > 0) {
+        this.onFolderData(batchTotalSize)
+      }
+    }
+  }
+
+  // Handle folder transfers sequentially to prevent concurrency explosion
+  transferFolders = async (folders, batch, transfer) => {
+    if (this.onCancel) {
+      return
+    }
+
+    const { fromPath, toPath } = transfer
+
+    // Step 1: Create all folders concurrently in batches
+    for (let i = 0; i < folders.length; i += batch) {
+      if (this.onCancel) {
+        return
+      }
+
+      const batchFolders = folders.slice(i, i + batch)
+      const createFolderPromises = batchFolders.map(folder => {
+        const toItemPath = resolve(toPath, folder.name)
+
+        // Create folder itself (don't process contents)
+        const createTransfer = {
+          ...transfer,
+          toPath: toItemPath,
+          fromFile: folder
+        }
+
+        return this.mkdir(createTransfer)
+      })
+
+      // Create all folders in this batch concurrently
+      await Promise.all(createFolderPromises)
+    }
+
+    // Step 2: Process contents of each folder sequentially
+    for (const folder of folders) {
+      if (this.onCancel) {
+        return
+      }
+
+      const fromItemPath = resolve(fromPath, folder.name)
+      const toItemPath = resolve(toPath, folder.name)
+
+      const itemTransfer = {
+        ...transfer,
+        fromPath: fromItemPath,
+        toPath: toItemPath,
+        fromFile: folder
+      }
+
+      // Transfer folder contents (set createFolder = false since we already created it)
+      await this.transferFolderRecursive(itemTransfer, false)
+    }
+  }
+
+  // Main recursive function using the separate handlers
+  transferFolderRecursive = async (transfer = this.getDefaultTransfer(), createFolder = true) => {
     if (this.onCancel) {
       return
     }
     const {
       fromPath,
-      toPath,
       typeFrom,
-      typeTo,
       sessionId,
       toFile,
       isRenamed
     } = transfer
-    if (!toFile || isRenamed) {
+
+    if (createFolder && (!toFile || isRenamed)) {
       const folderCreated = await this.mkdir(transfer)
       if (!folderCreated) {
         return
       }
     }
+
     const list = await this.list(typeFrom, fromPath, sessionId)
+    const bigFileSize = 1024 * 1024
+    const smallFilesBatch = 30
+    const BigFilesBatch = 3
+    const foldersBatch = 50
 
-    for (const item of list) {
-      if (!item.isDirectory) {
-        this.total += item.size
+    const {
+      folders,
+      smallFiles,
+      largeFiles
+    } = list.reduce((p, c) => {
+      if (c.isDirectory) {
+        p.folders.push(c)
+      } else {
+        this.total += c.size
+        if (c.size < bigFileSize) {
+          p.smallFiles.push(c)
+        } else {
+          p.largeFiles.push(c)
+        }
       }
-      const fromItemPath = resolve(fromPath, item.name)
-      const toItemPath = resolve(toPath, item.name)
+      return p
+    }, {
+      folders: [],
+      smallFiles: [],
+      largeFiles: []
+    })
 
-      const itemTransfer = {
-        ...transfer,
-        fromPath: fromItemPath,
-        toPath: toItemPath,
-        fromFile: item
-      }
+    // Process files with parallel batching
+    await this.transferFiles(smallFiles, smallFilesBatch, transfer)
+    await this.transferFiles(largeFiles, BigFilesBatch, transfer)
 
-      const toFile = await this.checkExist(typeTo, toItemPath, sessionId)
-      itemTransfer.toFile = toFile
-      if (item.isDirectory) {
-        await this.transferFolderRecursive(itemTransfer)
-      } else {
-        await this.transferFileAsSubTransfer(itemTransfer)
-      }
-    }
+    // Process folders sequentially
+    await this.transferFolders(folders, foldersBatch, transfer)
   }
 
   onError = (e) => {

package/client/components/main/upgrade.jsx

@@ -34,6 +34,9 @@ export default class Upgrade extends PureComponent {
   downloadTimer = null
 
   componentDidMount () {
+    if (window.et.isWebApp) {
+      return
+    }
     setTimeout(() => {
       getLatestReleaseVersion(1)
     }, 5000)

package/client/components/sftp/file-icon.jsx

@@ -14,7 +14,7 @@ export default function FileIcon ({ file, ...extra }) {
   return (
     <img
       src={extIconPath + name}
-      height={12}
+      height={16}
       alt=''
       {...extra}
     />

package/client/components/sftp/file-item.jsx

@@ -671,7 +671,7 @@ export default class FileSection extends React.Component {
     const {
       path, name
     } = this.state.file
-    const rp = resolve(path, name)
+    const rp = path ? resolve(path, name) : this.props[`${this.props.type}Path`]
     this.props.tab.pane = paneMap.terminal
     refs.get('term-' + this.props.tab.id)?.cd(rp)
   }
@@ -953,7 +953,7 @@ export default class FileSection extends React.Component {
       })
     }
     if (
-      isDirectory && isRealFile &&
+      isDirectory &&
       (
         (hasHost && enableSsh !== false && isRemote) ||
         (isLocal && !hasHost)

package/client/components/sftp/file-table-header.jsx

@@ -49,7 +49,7 @@ export default class FileListTableHeader extends Component {
     }
     const text = e(id || '')
     const directionIcon = isSorting
-      ? (sortDirection === 'asc' ? <DownOutlined /> : <UpOutlined />)
+      ? (sortDirection === 'asc' ? <UpOutlined /> : <DownOutlined />)
       : null
     const itemProps = {
       onClick: this.props.onClickName,

package/client/components/sidebar/bookmark.jsx

@@ -1,15 +1,35 @@
-/**
- * bookmark select
- */
-
+import { refsStatic } from '../common/ref'
+import { useEffect, useRef } from 'react'
 import BookmarkSelect from './bookmark-select'
+import { debounce } from 'lodash-es'
 
 export default function BookmarkPanel (props) {
   const { store } = window
+  const bookmarksPanelRef = useRef(null)
+  const SCROLL_REF_ID = 'bookmarks-scroll-position'
+
+  // On component mount, restore scroll position
+  useEffect(() => {
+    if (store.openedSideBar) {
+      const savedPosition = refsStatic.get(SCROLL_REF_ID)
+      if (savedPosition) {
+        setTimeout(() => {
+          bookmarksPanelRef.current.scrollTop = savedPosition
+        }, 100)
+      }
+    }
+  }, [store.openedSideBar])
+
+  // Save scroll position when scrolling
+  const handleScroll = debounce((e) => {
+    const top = e.target.scrollTop
+    if (top > 0) {
+      refsStatic.add(SCROLL_REF_ID, e.target.scrollTop)
+    }
+  }, 100)
+
   return (
-    <div
-      className='sidebar-panel-bookmarks'
-    >
+    <div className='sidebar-panel-bookmarks' ref={bookmarksPanelRef} onScroll={handleScroll}>
       <div className='pd2l sidebar-inner'>
         <BookmarkSelect store={store} from='sidebar' />
       </div>

package/client/components/sidebar/info-modal.jsx

@@ -32,7 +32,7 @@ export default auto(function InfoModal (props) {
   }
 
   const renderCheckUpdate = () => {
-    if (srcsSkipUpgradeCheck.includes(props.installSrc)) {
+    if (window.et.isWebApp || srcsSkipUpgradeCheck.includes(props.installSrc)) {
       return null
     }
     const {

package/client/components/sidebar/sidebar.styl

@@ -40,6 +40,8 @@
   top 112px
   bottom 0
   overflow-y scroll
+  .item-list-wrap
+    overflow-y hidden
 .not-system-ui.is-mac
   .sidebar-bar
     margin-top 20px

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

@@ -53,11 +53,14 @@ export default class TermSearch extends PureComponent {
   }
 
   toggleSearch = () => {
-    if (this.props.termSearchOpen) {
+    const isClosing = this.props.termSearchOpen
+    if (isClosing) {
       this.clearSearch()
     }
     window.store.toggleTerminalSearch()
-    setTimeout(window.store.focus, 200)
+    if (isClosing) {
+      setTimeout(window.store.focus, 200)
+    }
   }
 
   prev = (v = this.props.termSearch) => {

package/client/components/terminal/terminal.jsx

@@ -336,6 +336,7 @@ clear\r`
       try {
         const fileData = JSON.parse(fromFile)
         const filePath = resolve(fileData.path, fileData.name)
+        console.log('filePath', filePath)
         if (this.isUnsafeFilename(filePath)) {
           message.error(notSafeMsg)
           return
@@ -350,14 +351,15 @@ clear\r`
     // Handle regular file drop
     const files = dt.files
     if (files && files.length) {
-      const filesAll = Array.from(files).map(f => `"${f.path}"`).join(' ')
-      if (this.isUnsafeFilename(filesAll)) {
+      const arr = Array.from(files)
+      // Check each file path individually
+      const hasUnsafeFilename = arr.some(f => this.isUnsafeFilename(f.path))
+      if (hasUnsafeFilename) {
         message.error(notSafeMsg)
         return
       }
-      this.attachAddon._sendData(
-        Array.from(files).map(f => `"${f.path}"`).join(' ')
-      )
+      const filesAll = arr.map(f => `"${f.path}"`).join(' ')
+      this.attachAddon._sendData(filesAll)
     }
   }
 

package/client/entry/electerm.jsx

@@ -2,7 +2,7 @@ import { createRoot } from 'react-dom/client'
 import 'antd/dist/reset.css'
 import '@xterm/xterm/css/xterm.css'
 import '../common/trzsz.js'
-import 'firacode/distr/fira_code.css'
+import '@fontsource/maple-mono/index.css'
 import Main from '../components/main/index.jsx'
 
 const rootElement = createRoot(document.getElementById('container'))

package/package.json

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