@electerm/electerm-react 1.35.0 → 1.36.1

package/client/components/terminal/index.jsx

@@ -2,7 +2,7 @@ import { Component } from 'react'
 import ZmodemTransfer from './zmodem-transfer'
 import { handleErr } from '../../common/fetch'
 import generate from '../../common/uid'
-import { isEqual, pick, debounce } from 'lodash-es'
+import { isEqual, pick, debounce, throttle } from 'lodash-es'
 import postMessage from '../../common/post-msg'
 import clone from '../../common/to-simple-obj'
 import runIdle from '../../common/run-idle'
@@ -51,6 +51,7 @@ import NormalBuffer from './normal-buffer'
 import { createTerm, resizeTerm } from './terminal-apis'
 import createLsId from './build-ls-term-id'
 import { shortcutExtend, shortcutDescExtend } from '../shortcuts/shortcut-handler.js'
+import { KeywordHighlighterAddon } from './highlight-addon.js'
 
 const { prefix } = window
 const e = prefix('ssh')
@@ -255,12 +256,12 @@ class Term extends Component {
     this.openNormalBuffer()
   }
 
-  prevTabShortcut = debounce((e) => {
+  prevTabShortcut = throttle((e) => {
     e.stopPropagation()
     window.store.clickPrevTab()
   }, 300)
 
-  nextTabShortcut = debounce((e) => {
+  nextTabShortcut = throttle((e) => {
     e.stopPropagation()
     window.store.clickNextTab()
   }, 300)
@@ -820,10 +821,6 @@ class Term extends Component {
     term.onData(this.onData)
     this.term = term
     term.attachCustomKeyEventHandler(this.handleKeyboardEvent.bind(this))
-    term.onKey(this.onKey)
-    // if (host && !password && !privateKey) {
-    //   return this.promote()
-    // }
     await this.remoteInit(term)
   }
 
@@ -905,7 +902,13 @@ class Term extends Component {
     })
     const { cols, rows } = term
     const { config } = this.props
-    const { host, port, tokenElecterm, server = '' } = config
+    const {
+      host,
+      port,
+      tokenElecterm,
+      keywords = [],
+      server = ''
+    } = config
     const { sessionId, terminalIndex, id, logName } = this.props
     const tab = deepCopy(this.props.tab || {})
     const {
@@ -1025,47 +1028,15 @@ class Term extends Component {
         noTerminalWriteOutsideSession: true
       }, this)
     }
-
-    // this.decoder = new TextDecoder(encode)
-    if (displayRaw) {
-      const oldWrite = term.write
-      const th = this
-      term.write = function (data) {
-        // let str = ''
-        // if (typeof data === 'object') {
-        //   if (data instanceof ArrayBuffer) {
-        //     str = th.decoder.decode(data)
-        //     oldWrite.call(term, th.escape(str))
-        //   } else {
-        //     const fileReader = new FileReader()
-        //     fileReader.addEventListener('load', () => {
-        //       str = th.decoder.decode(fileReader.result)
-        //       oldWrite.call(term, th.escape(str))
-        //     })
-        //     fileReader.readAsArrayBuffer(new window.Blob([data]))
-        //   }
-        // } else if (typeof data === 'string') {
-        //   oldWrite.call(term, th.escape(data))
-        // } else {
-        //   throw Error(`Cannot handle ${typeof data} websocket message.`)
-        // }
-        oldWrite.call(term, th.escape(data))
-      }
-    }
+    term.displayRaw = displayRaw
+    term.loadAddon(
+      new KeywordHighlighterAddon(keywords)
+    )
     this.term = term
     window.store.triggerResize()
   }
 
-  escape = str => {
-    return str.replace(/\\x1B/g, '\\x1B')
-      .replace(/\033/g, '\\033')
-  }
-
-  onKey = (key, e) => {
-    // log.log('onKey', key, e)
-  }
-
-  onResize = debounce(() => {
+  onResize = throttle(() => {
     const cid = this.props.currentTabId
     const tid = this.props.tab?.id
     if (

package/client/store/index.js

@@ -35,7 +35,8 @@ import {
   sidebarPanelWidth,
   paneMap,
   settingSyncId,
-  settingShortcutsId
+  settingShortcutsId,
+  settingTerminalId
 } from '../common/constants'
 import getInitItem from '../common/init-setting-item'
 import {
@@ -45,6 +46,7 @@ import {
 const { prefix } = window
 const ss = prefix('settingSync')
 const s = prefix('setting')
+const sss = prefix('ssh')
 
 function getReverseColor (hex) {
   // Check if the input is a valid hex color code
@@ -248,12 +250,16 @@ class Store {
   get setting () {
     return [
       {
-        id: settingSyncId,
-        title: ss('settingSync')
+        id: settingTerminalId,
+        title: sss('terminal')
       },
       {
         id: settingShortcutsId,
         title: s('settingShortcuts')
+      },
+      {
+        id: settingSyncId,
+        title: ss('settingSync')
       }
     ]
   }

package/client/store/setting.js

@@ -11,6 +11,7 @@ import copy from 'json-deep-copy'
 import {
   settingMap,
   settingCommonId,
+  settingSyncId,
   modals
 } from '../common/constants'
 import { buildNewTheme } from '../common/terminal-theme'
@@ -150,7 +151,7 @@ export default Store => {
     store.storeAssign({
       settingTab: settingMap.setting
     })
-    store.setSettingItem(copy(store.setting[0]))
+    store.setSettingItem(copy(store.setting.find(d => d.id === settingSyncId)))
     store.openSettingModal()
   }
 

package/package.json

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

package/client/common/shortcuts-defaults.js

@@ -1,51 +0,0 @@
-export default () => {
-  return [
-    {
-      name: 'app_closeCurrentTab',
-      shortcut: 'ctrl+w',
-      shortcutMac: 'ctrl+w'
-    },
-    {
-      name: 'app_prevTab',
-      shortcut: 'ctrl+shift+tab',
-      shortcutMac: 'ctrl+shift+tab'
-    },
-    {
-      name: 'app_nextTab',
-      shortcut: 'ctrl+tab',
-      shortcutMac: 'ctrl+tab'
-    },
-    {
-      name: 'terminal_clear',
-      shortcut: 'ctrl+l,ctrl+shift+l',
-      shortcutMac: 'meta+l'
-    },
-    {
-      name: 'terminal_selectAll',
-      shortcut: 'ctrl+a,ctrl+shift+a',
-      shortcutMac: 'meta+a',
-      readonly: true
-    },
-    {
-      name: 'terminal_copy',
-      shortcut: 'ctrl+c,ctrl+shift+c',
-      shortcutMac: 'meta+c',
-      readonly: true
-    },
-    {
-      name: 'terminal_search',
-      shortcut: 'ctrl+shift+f',
-      shortcutMac: 'meta+f'
-    },
-    {
-      name: 'terminal_pasteSelected',
-      shortcut: 'alt+insert',
-      shortcutMac: 'alt+insert'
-    },
-    {
-      name: 'terminal_showNormalBuffer',
-      shortcut: 'ctrl+ArrowUp',
-      shortcutMac: 'meta+ArrowUp'
-    }
-  ]
-}