@electerm/electerm-react 3.5.6 → 3.6.6

package/client/common/ws.js

@@ -4,7 +4,6 @@
 
 import generate from './uid'
 import wait from './wait'
-import copy from 'json-deep-copy'
 import { pick } from 'lodash-es'
 
 const onces = {}
@@ -32,7 +31,13 @@ class Ws {
   }
 
   async once (func, id) {
+    const maxWait = 300
+    let waited = 0
     while (this.closed) {
+      if (++waited >= maxWait) {
+        console.warn('ws once timeout waiting for reconnection', id)
+        return
+      }
       await wait(100)
     }
     this.onceIds.push(id)
@@ -83,7 +88,7 @@ class Ws {
     if (this.eid) {
       delete persists[this.eid]
     }
-    const ids = copy(this.onceIds)
+    const ids = [...this.onceIds]
     ids.forEach(k => {
       delete onces[k]
     })
@@ -115,10 +120,16 @@ function onEvent (e) {
     action,
     persist
   } = e.data
-  if (wss[id]) {
-    if (action === 'close') {
-      wss[id].close && wss[id].close()
+  if (wss[id] && action === 'close') {
+    const ws = wss[id]
+    ws.onclose()
+    if (ws.persist) {
+      ws.closed = true
+    } else {
+      ws.clearOnces()
+      delete wss[id]
     }
+    return
   }
   if (persists[id]) {
     persists[id].resolve(data)

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

@@ -3,12 +3,10 @@
  */
 import { useState, useEffect } from 'react'
 import { Space } from 'antd'
-import { HistoryOutlined } from '@ant-design/icons'
 import { safeGetItemJSON, safeSetItemJSON } from '../../common/safe-local-storage'
 import AiHistoryItem from './ai-history-item'
 
 const MAX_HISTORY = 20
-const e = window.translate
 
 export function getHistory (storageKey) {
   return safeGetItemJSON(storageKey, [])
@@ -81,10 +79,6 @@ export default function AiHistory (props) {
 
   return (
     <div className='ai-bookmark-history pd1b'>
-      <div className='pd1b text-muted'>
-        <HistoryOutlined className='mg1r' />
-        <span className='mg1r'>{e('history') || 'History'}:</span>
-      </div>
       <Space size={[8, 8]} wrap>
         {history.map((item, index) => {
           const keyStr = typeof item === 'string' ? item : JSON.stringify(item)

package/client/components/shortcuts/shortcut-control.jsx

@@ -172,6 +172,15 @@ class ShortcutControl extends React.PureComponent {
     window.store.onNewSsh()
   }, 500)
 
+  newTabShortcut = throttle((e) => {
+    e.stopPropagation()
+    if (window.store.hasNodePty) {
+      window.store.addTab()
+    } else {
+      window.store.onNewSsh()
+    }
+  }, 500)
+
   toggleAddBtnShortcut = throttle((e) => {
     e.stopPropagation()
     const { currentLayoutBatch } = window.store

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

@@ -36,6 +36,11 @@ export default () => {
       shortcut: 'ctrl+n',
       shortcutMac: 'meta+n'
     },
+    {
+      name: 'app_newTab',
+      shortcut: 'alt+q',
+      shortcutMac: 'alt+q'
+    },
     {
       name: 'app_toggleAddBtn',
       shortcut: 'alt+n',

package/client/components/ssh-config/load-ssh-configs.jsx

@@ -1,5 +1,4 @@
 import {
-  Modal,
   Spin,
   Button,
   Empty
@@ -9,6 +8,7 @@ import * as ls from '../../common/safe-local-storage'
 import {
   sshConfigLoadKey
 } from '../../common/constants'
+import Modal from '../common/modal'
 import { ReloadOutlined } from '@ant-design/icons'
 import LoadSshConfigsItem from './load-ssh-configs-item'
 import './ssh-config.styl'

package/client/components/sys-menu/menu-btn.jsx

@@ -76,7 +76,8 @@ class MenuBtn extends PureComponent {
       items.push({
         func: 'addTab',
         icon: 'RightSquareFilled',
-        text: e('newTab')
+        text: e('newTab'),
+        subText: this.getShortcut('app_newTab')
       })
     }
     // {

package/package.json

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