@electerm/electerm-react 3.11.12 → 3.15.0

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

@@ -34,6 +34,7 @@ export default function TerminalInfoDisk (props) {
       const p = network[k]
       const pv = net[k]
       if (
+        diff > 0 &&
         p &&
         pv &&
         p.download &&
@@ -43,6 +44,7 @@ export default function TerminalInfoDisk (props) {
         p.down = Math.floor((p.download - pv.download) / diff)
       }
       if (
+        diff > 0 &&
         p &&
         pv &&
         p.upload &&
@@ -92,7 +94,7 @@ export default function TerminalInfoDisk (props) {
       },
       render: (v) => {
         if (k === 'up' || k === 'down') {
-          return filesize(v || 0)
+          return filesize(Number.isFinite(v) ? v : 0)
         }
         return v
       }

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

@@ -2,7 +2,7 @@
  * cpu/swap/mem general usage
  */
 
-import { isEmpty, isUndefined } from 'lodash-es'
+import { isEmpty } from 'lodash-es'
 import { Progress } from 'antd'
 import parseInt10 from '../../common/parse-int10'
 
@@ -51,7 +51,7 @@ export default function TerminalInfoResource (props) {
       percent,
       name
     } = obj
-    const hasPercent = !isUndefined(percent)
+    const hasPercent = Number.isFinite(percent)
     const p = hasPercent
       ? percent
       : computePercent(used, total) || 0
@@ -74,7 +74,7 @@ export default function TerminalInfoResource (props) {
   if (terminalInfos.includes('cpu')) {
     data.push({
       name: 'cpu',
-      percent: parseInt10(cpu)
+      percent: parseInt10(cpu) || 0
     })
   }
   if (terminalInfos.includes('mem')) {

package/client/components/tree-list/tree-list.styl

@@ -118,10 +118,16 @@
     visibility hidden
   &:hover
     .tree-item-title
-      padding-right 120px
+      padding-right 60px
     .tree-item-op-wrap
       opacity 1
       pointer-events auto
+.add-menu-wrap
+.sidebar-panel
+  .tree-list-row
+    &:hover
+      .tree-item-title
+        padding-right 20px
 
 .tree-list-row-group
   position relative

package/client/store/mcp-handler.js

@@ -11,6 +11,11 @@ import {
   getLocalFileInfo,
   getRemoteFileInfo
 } from '../components/sftp/file-read'
+import {
+  fixBookmarkData,
+  validateBookmarkData
+} from '../components/bookmark-form/fix-bookmark-default'
+import newTerm from '../common/new-terminal'
 
 export default Store => {
   // Initialize MCP handler - called when MCP widget is started
@@ -96,6 +101,9 @@ export default Store => {
         case 'open_local_terminal':
           result = store.mcpOpenLocalTerminal()
           break
+        case 'open_tab':
+          result = store.mcpOpenTab(args)
+          break
 
         // Terminal operations
         case 'send_terminal_command':
@@ -207,16 +215,14 @@ export default Store => {
 
   Store.prototype.mcpAddBookmark = async function (args) {
     const { store } = window
-    const bookmark = {
+    const bookmark = fixBookmarkData({
       id: uid(),
-      title: args.title,
-      host: args.host || '',
-      port: args.port || 22,
-      username: args.username || '',
-      password: args.password || '',
-      type: args.type || 'local',
-      term: 'xterm-256color',
       ...args
+    })
+
+    const { valid, errors } = validateBookmarkData(bookmark)
+    if (!valid) {
+      throw new Error(errors.join(', '))
     }
 
     store.addItem(bookmark, settingMap.bookmarks)
@@ -462,6 +468,32 @@ export default Store => {
     }
   }
 
+  Store.prototype.mcpOpenTab = function (args) {
+    const { store } = window
+    const data = fixBookmarkData({ ...args })
+
+    const { valid, errors } = validateBookmarkData(data)
+    if (!valid) {
+      throw new Error(errors.join(', '))
+    }
+
+    const tab = {
+      ...data,
+      from: 'mcp',
+      ...newTerm(true, true)
+    }
+
+    store.addTab(tab)
+    const newTabId = store.activeTabId
+
+    return {
+      success: true,
+      tabId: newTabId,
+      type: data.type,
+      message: `Opened ${data.type || 'local'} tab`
+    }
+  }
+
   // ==================== Terminal APIs ====================
 
   Store.prototype.mcpSendTerminalCommand = function (args) {
@@ -477,7 +509,7 @@ export default Store => {
       throw new Error('No command provided')
     }
 
-    store.runQuickCommand(command, args.inputOnly || false)
+    store.runQuickCommand(command, args.inputOnly || false, tabId)
 
     return {
       success: true,

package/client/store/quick-command.js

@@ -57,8 +57,9 @@ export default Store => {
     window.store.delItem({ id }, settingMap.quickCommands)
   }
 
-  Store.prototype.runQuickCommand = function (cmd, inputOnly = false) {
-    refs.get('term-' + window.store.activeTabId)?.runQuickCommand(cmd, inputOnly)
+  Store.prototype.runQuickCommand = function (cmd, inputOnly = false, tabId) {
+    const tid = tabId || window.store.activeTabId
+    refs.get('term-' + tid)?.runQuickCommand(cmd, inputOnly)
   }
 
   Store.prototype.runQuickCommandItem = debounce(async (id) => {

package/client/store/watch.js

@@ -23,13 +23,13 @@ export default store => {
   for (const name of dbNamesForWatch) {
     window[`watch${name}Running`] = false
     window[`watch${name}`] = autoRun(async () => {
+      const n = store.getItems(name)
       if (window.migrating || window[`watch${name}Running`]) {
         return
       }
       window[`watch${name}Running`] = true
       try {
         const old = refsStatic.get('oldState-' + name)
-        const n = store.getItems(name)
         const { updated, added, removed } = dataCompare(
           old,
           n

package/package.json

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