@electerm/electerm-react 1.51.3 → 1.51.18

package/client/store/index.js

@@ -27,15 +27,16 @@ import batchInputHistory from './batch-input-history'
 import transferExtend from './transfer-list'
 import addressBookmarkExtend from './address-bookmark'
 import isColorDark from '../common/is-color-dark'
-
+import { getReverseColor } from '../common/reverse-color'
 import { uniq } from 'lodash-es'
-import copy from 'json-deep-copy'
+import deepCopy from 'json-deep-copy'
 import {
   settingMap,
   paneMap,
   settingSyncId,
   settingShortcutsId,
-  settingTerminalId
+  settingTerminalId,
+  terminalSshConfigType
 } from '../common/constants'
 import getInitItem from '../common/init-setting-item'
 import {
@@ -44,19 +45,6 @@ import {
 
 const e = window.translate
 
-function getReverseColor (hex) {
-  // Check if the input is a valid hex color code
-  if (!/^#[0-9a-fA-F]{6}$/.test(hex)) {
-    return '#0088cc'
-  }
-  // Convert the hex color code to an integer
-  const num = parseInt(hex.slice(1), 16)
-  // Bitwise XOR the integer with 0xFFFFFF to get the reverse color
-  const reverse = num ^ 0xFFFFFF
-  // Convert the reverse color to a hex string and pad with zeros if needed
-  return '#' + reverse.toString(16).padStart(6, '0')
-}
-
 class Store {
   constructor () {
     Object.assign(
@@ -69,6 +57,10 @@ class Store {
     return window.store.innerWidth
   }
 
+  get config () {
+    return deepCopy(window.store._config)
+  }
+
   get currentQuickCommands () {
     const { currentTab } = this
     const { quickCommands } = window.store
@@ -100,12 +92,24 @@ class Store {
 
   get inActiveTerminal () {
     const { store } = window
-    return !store.showModal &&
-      store.currentTab &&
-      (
-        store.currentTab.pane === paneMap.ssh ||
-        store.currentTab.pane === paneMap.terminal
-      )
+    if (store.showModal) {
+      return false
+    }
+    const {
+      currentTab
+    } = store
+    if (!currentTab) {
+      return false
+    }
+    const {
+      type,
+      pane
+    } = currentTab
+    if (type === 'rdp' || type === 'vnc' || type === 'web') {
+      return false
+    }
+    return pane === paneMap.ssh ||
+        pane === paneMap.terminal
   }
 
   get quickCommandTags () {
@@ -124,6 +128,10 @@ class Store {
     return window.store.tabs.some(t => t.isTransporting)
   }
 
+  get transferCount () {
+    return window.store.fileTransfers.length
+  }
+
   get settingSidebarList () {
     const {
       settingTab
@@ -133,7 +141,7 @@ class Store {
     return settingTab === settingMap.history
       ? arr
       : [
-          copy(initItem),
+          deepCopy(initItem),
           ...arr
         ]
   }
@@ -144,7 +152,7 @@ class Store {
     } = window
     const theme = store.getThemeConfig()
     return {
-      ...JSON.parse(window.store._termSearchOptions),
+      ...window.store._termSearchOptions,
       decorations: {
         activeMatchBorder: theme.yellow,
         activeMatchBackground: theme.selectionBackground,
@@ -218,6 +226,12 @@ class Store {
     }, {})
   }
 
+  hasSshConfig () {
+    return !!window.store
+      .bookmarkGroups
+      .find(b => b.id === terminalSshConfigType)
+  }
+
   get bookmarkGroupTree () {
     const {
       bookmarkGroups
@@ -229,26 +243,22 @@ class Store {
       }
     }, {})
   }
+
+  get hasOldConnectionHoppingBookmark () {
+    return window.store.bookmarks.some(b => {
+      return b.connectionHoppings?.length && !b.hasHopping
+    })
+  }
 }
 
 const arrGetterProps = [
-  'expandedKeys',
-  'checkedKeys',
   'addressBookmarks',
   'addressBookmarksLocal',
-  'sshConfigItems',
-  'itermThemes',
-  'history',
   'bookmarks',
   'bookmarkGroups',
   'profiles',
-  'fileTransfers',
-  'transferHistory',
   'quickCommands',
-  'terminalThemes',
-  'serials',
-  'fonts',
-  'resolutions'
+  'terminalThemes'
 ]
 
 for (const prop of arrGetterProps) {
@@ -259,24 +269,6 @@ for (const prop of arrGetterProps) {
   })
 }
 
-const getterProps = [
-  'langs',
-  'config',
-  'sftpSortSetting',
-  'upgradeInfo',
-  'transferToConfirm',
-  'terminalInfoProps',
-  'settingItem'
-]
-
-for (const prop of getterProps) {
-  Object.defineProperty(Store.prototype, prop, {
-    get: function () {
-      return JSON.parse(window.store[`_${prop}`] || '{}')
-    }
-  })
-}
-
 loadDataExtend(Store)
 eventExtend(Store)
 dbUpgradeExtend(Store)

package/client/store/init-state.js

@@ -1,7 +1,6 @@
 /**
  * init static state
  */
-
 import {
   settingMap,
   defaultBookmarkGroupId,
@@ -24,6 +23,7 @@ import {
 } from '../common/constants'
 import { buildDefaultThemes } from '../common/terminal-theme'
 import * as ls from '../common/safe-local-storage'
+import { exclude } from 'manate'
 import initSettingItem from '../common/init-setting-item'
 
 const e = window.translate
@@ -48,27 +48,29 @@ export default () => {
     lastDataUpdateTime: 0,
     tabs: [],
     activeTabId: '',
-    _history: '[]',
+    history: ls.getItemJSON('history', []),
+    sshConfigs: [],
     _bookmarks: '[]',
+    sidebarPanelTab: 'bookmarks',
     _profiles: '[]',
     _bookmarkGroups: JSON.stringify(
       getDefaultBookmarkGroups([])
     ),
-    _config: '{}',
+    _config: {},
     _terminalThemes: JSON.stringify([
       buildDefaultThemes()
     ]),
-    _itermThemes: '[]',
+    itermThemes: exclude([]),
     currentBookmarkGroupId: defaultBookmarkGroupId,
-    _expandedKeys: ls.getItem(expandedKeysLsKey) || JSON.stringify([
+    expandedKeys: ls.getItemJSON(expandedKeysLsKey, [
       defaultBookmarkGroupId
     ]),
     bookmarkSelectMode: false,
-    _checkedKeys: ls.getItem(checkedKeysLsKey) || '[]',
+    checkedKeys: ls.getItemJSON(checkedKeysLsKey, []),
     _addressBookmarks: '[]',
     _addressBookmarksLocal: ls.getItem(localAddrBookmarkLsKey) || '[]',
     openResolutionEdit: false,
-    _resolutions: ls.getItem(resolutionsLsKey) || '[]',
+    resolutions: ls.getItemJSON(resolutionsLsKey, []),
 
     // init session control
     selectedSessions: [],
@@ -78,10 +80,10 @@ export default () => {
     fileOperation: fileOperationsMap.cp, // cp or mv
     pauseAllTransfer: false,
     transferTab: 'transfer',
-    _transferHistory: '[]',
-    _fileTransfers: '[]',
-    _transferToConfirm: '{}',
-    _sftpSortSetting: ls.getItem(sftpDefaultSortSettingKey) || JSON.stringify({
+    transferHistory: [],
+    fileTransfers: [],
+    transferToConfirm: {},
+    sftpSortSetting: ls.getItemJSON(sftpDefaultSortSettingKey, {
       local: {
         prop: 'modifyTime',
         direction: 'asc'
@@ -99,14 +101,14 @@ export default () => {
     activeTabId1: '',
     activeTabId2: '',
     activeTabId3: '',
-    _terminalInfoProps: '{}',
+    terminalInfoProps: {},
     rightPanelVisible: false,
     rightPanelPinned: false,
     rightPanelWidth: parseInt(ls.getItem(rightSidebarWidthKey), 10) || 500,
 
     // for settings related
     _setting: '',
-    _settingItem: JSON.stringify(initSettingItem([], settingMap.bookmarks)),
+    settingItem: initSettingItem([], settingMap.bookmarks),
     settingTab: settingMap.bookmarks, // setting tab
     autofocustrigger: Date.now(),
     bookmarkId: undefined,
@@ -116,23 +118,21 @@ export default () => {
     isSyncingSetting: false,
     isSyncUpload: false,
     isSyncDownload: false,
-    syncSetting: {},
     syncType: syncTypes.github,
-    _fonts: '[]',
 
     // term search
     termSearchOpen: false,
     termSearch: '',
     termSearchMatchCount: 0,
     termSearchMatchIndex: 0,
-    _termSearchOptions: JSON.stringify({
+    _termSearchOptions: {
       caseSensitive: false,
       wholeWord: false,
       regex: false,
       decorations: {
         activeMatchColorOverviewRuler: 'yellow'
       }
-    }),
+    },
 
     // quick commands
     _quickCommands: '[]',
@@ -160,20 +160,17 @@ export default () => {
     showFileModal: false,
 
     // update
-    _upgradeInfo: '{}',
+    upgradeInfo: {},
 
     // serial list related
-    _serials: '[]',
+    serials: [],
     loaddingSerials: false,
 
-    _sshConfigItems: '[]',
-
     appPath: '',
     exePath: '',
     isPortable: false,
     installSrc: '',
-
-    _langs: '[]',
+    showSshConfigModal: false,
 
     // batch inputs
     batchInputs: ls.getItemJSON(batchInputLsKey, []),

package/client/store/item.js

@@ -4,24 +4,12 @@
 
 import { find } from 'lodash-es'
 import {
-  maxHistory,
   settingMap
 } from '../common/constants'
 import getInitItem from '../common/init-setting-item'
 import { update, remove, dbNames } from '../common/db'
-import copy from 'json-deep-copy'
 
 export default Store => {
-  Store.prototype.removeOldHistoryFromDb = function (items) {
-    const arr = items.slice(maxHistory).map(k => {
-      return {
-        db: 'history',
-        id: k.id
-      }
-    })
-    window.store.batchDbDel(arr)
-  }
-
   Store.prototype.addItem = function (item, type) {
     return window.store.addItems([item], type)
   }
@@ -33,12 +21,6 @@ export default Store => {
       ...objs,
       ...items
     ]
-    if (type === settingMap.history && items.length > maxHistory) {
-      store.removeOldHistoryFromDb(
-        copy(items)
-      )
-      items.slice(0, maxHistory)
-    }
     store.setItems(type, items)
     if (dbNames.includes(type)) {
       store.batchDbAdd(
@@ -59,7 +41,6 @@ export default Store => {
     if (!item) {
       return
     }
-    // let index = findIndex(items, t => t.id === id)
     Object.assign(item, updates)
     store.setItems(type, items)
     if (dbNames.includes(type)) {

package/client/store/load-data.js

@@ -12,6 +12,7 @@ import encodes from '../components/bookmark-form/encodes'
 import runIdle from '../common/run-idle'
 import { initWsCommon } from '../common/fetch-from-server'
 import safeParse from '../common/parse-json-safe'
+import initWatch from './watch'
 
 function getHost (argv, opts) {
   const arr = argv
@@ -151,7 +152,8 @@ export default (Store) => {
         console.log('fetchSshConfigItems error', err)
         return []
       })
-    window.store._sshConfigItems = JSON.stringify(arr)
+    window.store.sshConfigs = arr
+    return arr
   }
   Store.prototype.confirmLoad = function () {
     window.store.configLoaded = true
@@ -164,12 +166,8 @@ export default (Store) => {
     store.appPath = globs.appPath
     store.exePath = globs.exePath
     store.isPortable = globs.isPortable
-    store._config = JSON.stringify(
-      globs.config
-    )
-    store._langs = JSON.stringify(
-      globs.langs
-    )
+    store._config = globs.config
+    window.et.langs = globs.langs
     store.zoom(store.config.zoom, false, true)
     await initWsCommon()
   }
@@ -197,10 +195,9 @@ export default (Store) => {
     store.loadFontList()
     store.fetchItermThemes()
     store.openInitSessions()
-    if (!store.config.hideSshConfig) {
-      store.fetchSshConfigItems()
-    }
+    store.fetchSshConfigItems()
     store.initCommandLine().catch(store.onError)
+    initWatch(store)
     if (store.config.checkUpdateOnStart) {
       store.onCheckUpdate(false)
     }

package/client/store/setting.js

@@ -6,7 +6,6 @@ import { find } from 'lodash-es'
 import {
   message
 } from 'antd'
-import generate from '../common/uid'
 import copy from 'json-deep-copy'
 import {
   settingMap,
@@ -23,33 +22,17 @@ const e = window.translate
 export default Store => {
   Store.prototype.setConfig = function (conf) {
     const { store } = window
-    store._config = JSON.stringify(
-      {
-        ...store.config,
-        ...conf
-      }
+    Object.assign(
+      store._config,
+      copy(conf)
     )
   }
   Store.prototype.setSftpSortSetting = function (conf) {
-    const { store } = window
-    const base = copy(store.sftpSortSetting)
-    store._sftpSortSetting = JSON.stringify(
-      {
-        ...base,
-        ...conf
-      }
+    Object.assign(
+      window.store.sftpSortSetting,
+      conf
     )
   }
-  Store.prototype.handleEditHistory = function () {
-    const { store } = window
-    const all = store.history
-    store.storeAssign({
-      settingTab: settingMap.history,
-      autofocustrigger: Date.now()
-    })
-    store.setSettingItem(all[0] || getInitItem([], settingMap.history))
-    store.openSettingModal()
-  }
 
   Store.prototype.openBookmarkEdit = function (item) {
     const { store } = window
@@ -71,14 +54,10 @@ export default Store => {
     store.openSettingModal()
   }
 
-  Store.prototype.onSelectHistory = function (id) {
+  Store.prototype.onSelectHistory = function (tab) {
     const { store } = window
-    const history = store.history
-    const item = find(history, it => it.id === id)
     store.addTab({
-      ...copy(item),
-      from: 'history',
-      srcId: item.id,
+      ...copy(tab),
       ...newTerm(true, true),
       batch: window.openTabBatch ?? store.currentLayoutBatch
     })
@@ -87,11 +66,9 @@ export default Store => {
 
   Store.prototype.onSelectBookmark = function (id) {
     const { store } = window
-    const history = store.history
     const bookmarks = store.bookmarks
     const item = copy(
-      find(bookmarks, it => it.id === id) ||
-      find(store.sshConfigItems, it => it.id === id)
+      find(bookmarks, it => it.id === id)
     )
     if (!item) {
       return
@@ -105,39 +82,6 @@ export default Store => {
     })
 
     delete window.openTabBatch
-
-    if (store.config.disableSshHistory) {
-      return
-    }
-
-    // Critical Change: Use bookmarkId for matching instead of history id
-    const bookmarkId = item.id
-    const existingIndex = history.findIndex(h => h.bookmarkId === bookmarkId)
-    if (existingIndex >= 0) {
-      history[existingIndex].count = (history[existingIndex].count || 0) + 1
-      history[existingIndex].lastUse = Date.now()
-      const updatedItem = history.splice(existingIndex, 1)[0]
-      history.unshift(updatedItem)
-    } else {
-      const historyItem = {
-        ...item,
-        id: generate(),
-        bookmarkId,
-        count: 1,
-        lastUse: Date.now()
-      }
-      history.unshift(historyItem)
-    }
-
-    history.sort((a, b) => b.count - a.count || b.lastUse - a.lastUse)
-
-    // Optional: Consider max history length
-    const maxHistoryLength = store.config.maxHistoryLength || 50
-    if (history.length > maxHistoryLength) {
-      history.length = maxHistoryLength
-    }
-
-    store.setItems('history', history)
   }
 
   Store.prototype.openSetting = function () {
@@ -210,7 +154,7 @@ export default Store => {
         console.log('loadFontList error', err)
         return []
       })
-    window.store._fonts = JSON.stringify(fonts)
+    window.et.fonts = fonts
   }
 
   Store.prototype.handleChangeSettingTab = function (settingTab) {

package/client/store/sidebar.js

@@ -3,7 +3,6 @@
  */
 
 import {
-  settingMap,
   openedSidebarKey,
   sidebarPinnedKey
 } from '../common/constants'
@@ -26,11 +25,6 @@ export default Store => {
     )
   }
 
-  Store.prototype.setOpenedSideBar = function (bar) {
-    ls.setItem(openedSidebarKey, bar)
-    window.store.openedSideBar = bar
-  }
-
   Store.prototype.handlePin = function (pinned) {
     const { store } = window
     const current = !store.pinned
@@ -42,7 +36,12 @@ export default Store => {
     window.store.onNewSsh()
   }
 
-  Store.prototype.onClickHistory = function () {
-    window.store.handleChangeSettingTab(settingMap.history)
+  Store.prototype.handleSidebarPanelTab = function (tab) {
+    window.store.sidebarPanelTab = tab
+  }
+
+  Store.prototype.setOpenedSideBar = function (v) {
+    ls.setItem(openedSidebarKey, v)
+    window.store.openedSideBar = v
   }
 }

package/client/store/sync.js

@@ -2,7 +2,7 @@
  * sync data to github gist related
  */
 
-import { get, pick, debounce, findIndex } from 'lodash-es'
+import { get, pick, debounce } from 'lodash-es'
 import copy from 'json-deep-copy'
 import {
   settingMap, packInfo, syncTypes, syncDataMaps
@@ -186,8 +186,8 @@ export default (Store) => {
       const order = await getData(`${n}:order`)
       if (order && order.length) {
         str.sort((a, b) => {
-          const ai = findIndex(order, r => r === a.id)
-          const bi = findIndex(order, r => r === b.id)
+          const ai = order.findIndex(r => r === a.id)
+          const bi = order.findIndex(r => r === b.id)
           return ai - bi
         })
       }
@@ -285,8 +285,8 @@ export default (Store) => {
       if (isJSON(strOrder)) {
         strOrder = JSON.parse(strOrder)
         arr.sort((a, b) => {
-          const ai = findIndex(strOrder, r => r === a.id)
-          const bi = findIndex(strOrder, r => r === b.id)
+          const ai = strOrder.findIndex(r => r === a.id)
+          const bi = strOrder.findIndex(r => r === b.id)
           return ai - bi
         })
       }
@@ -372,8 +372,8 @@ export default (Store) => {
       const order = await getData(`${n}:order`)
       if (order && order.length) {
         objs[n].sort((a, b) => {
-          const ai = findIndex(order, r => r === a.id)
-          const bi = findIndex(order, r => r === b.id)
+          const ai = order.findIndex(r => r === a.id)
+          const bi = order.findIndex(r => r === b.id)
           return ai - bi
         })
       }
@@ -489,7 +489,6 @@ export default (Store) => {
       'hideIP',
       'terminalTimeout',
       'theme',
-      'terminalTypes',
       'language',
       'copyWhenSelect',
       'customCss',