@electerm/electerm-react 1.51.8 → 1.51.20

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,23 +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',
   'bookmarks',
   'bookmarkGroups',
   'profiles',
   'quickCommands',
-  'terminalThemes',
-  'serials',
-  'fonts',
-  'resolutions'
+  'terminalThemes'
 ]
 
 for (const prop of arrGetterProps) {
@@ -256,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
@@ -49,27 +49,28 @@ export default () => {
     tabs: [],
     activeTabId: '',
     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: [],
@@ -81,8 +82,8 @@ export default () => {
     transferTab: 'transfer',
     transferHistory: [],
     fileTransfers: [],
-    _transferToConfirm: '{}',
-    _sftpSortSetting: ls.getItem(sftpDefaultSortSettingKey) || JSON.stringify({
+    transferToConfirm: {},
+    sftpSortSetting: ls.getItemJSON(sftpDefaultSortSettingKey, {
       local: {
         prop: 'modifyTime',
         direction: 'asc'
@@ -100,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,
@@ -117,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: '[]',
@@ -161,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/load-data.js

@@ -152,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
@@ -165,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()
   }
@@ -198,9 +195,7 @@ 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) {

package/client/store/setting.js

@@ -22,21 +22,15 @@ 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
     )
   }
 
@@ -74,8 +68,7 @@ export default Store => {
     const { store } = window
     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
@@ -161,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/sync.js

@@ -489,7 +489,6 @@ export default (Store) => {
       'hideIP',
       'terminalTimeout',
       'theme',
-      'terminalTypes',
       'language',
       'copyWhenSelect',
       'customCss',

package/client/store/tab.js

@@ -13,10 +13,14 @@ import * as ls from '../common/safe-local-storage'
 import deepCopy from 'json-deep-copy'
 import generate from '../common/id-with-stamp'
 import uid from '../common/uid'
-import newTerm from '../common/new-terminal.js'
+import newTerm, { updateCount } from '../common/new-terminal.js'
 import { action } from 'manate'
 
 export default Store => {
+  Store.prototype.nextTabCount = function () {
+    return updateCount()
+  }
+
   Store.prototype.getTabs = function () {
     return window.store.tabs
   }
@@ -36,7 +40,10 @@ export default Store => {
       store.fileTransfers.map(d => d.tabId)
     )
     store.tabs.forEach(tab => {
-      tab.isTransporting = tabIdSet.has(tab.id)
+      const t = tabIdSet.has(tab.id)
+      if (Boolean(tab.isTransporting) !== t) {
+        tab.isTransporting = t
+      }
     })
   }
 
@@ -90,6 +97,7 @@ export default Store => {
     // Create copy of old tab with new ID
     const newTab = {
       ...oldTab,
+      tabCount: store.nextTabCount(),
       id: generate(), // Need to create new ID
       status: statusMap.processing // Reset status
     }
@@ -101,16 +109,17 @@ export default Store => {
     // Remove old tab
     tabs.splice(index, 1)
 
-    // Update current tab ID if needed
-    if (store.activeTabId === tabId) {
-      store.activeTabId = newTab.id
-    }
+    setTimeout(() => {
+      if (store.activeTabId === tabId) {
+        store.activeTabId = newTab.id
+      }
 
-    // Update batch current tab ID if needed
-    const batchProp = `activeTabId${oldBatch}`
-    if (store[batchProp] === tabId) {
-      store[batchProp] = newTab.id
-    }
+      // Update batch current tab ID if needed
+      const batchProp = `activeTabId${oldBatch}`
+      if (store[batchProp] === tabId) {
+        store[batchProp] = newTab.id
+      }
+    }, 0)
   }
 
   Store.prototype.duplicateTab = function (tabId) {
@@ -127,6 +136,7 @@ export default Store => {
     const duplicatedTab = {
       ...deepCopy(sourceTab),
       id: generate(),
+      tabCount: store.nextTabCount(),
       status: statusMap.processing,
       isTransporting: undefined
     }
@@ -303,6 +313,7 @@ export default Store => {
   ) {
     const { store } = window
     const { tabs } = store
+    newTab.tabCount = store.nextTabCount()
     newTab.batch = batch ?? newTab.batch ?? window.openTabBatch ?? window.store.currentLayoutBatch
     if (typeof index === 'number' && index >= 0 && index <= tabs.length) {
       tabs.splice(index, 0, newTab)

package/client/store/terminal-theme.js

@@ -65,7 +65,7 @@ export default Store => {
   }
 
   Store.prototype.setItermThemes = function (arr) {
-    window.store._itermThemes = JSON.stringify(arr)
+    window.store.itermThemes = arr
   }
 
   Store.prototype.fetchItermThemes = async function () {

package/client/store/transfer-list.js

@@ -68,14 +68,6 @@ export default Store => {
     fileTransfers.splice(index, 1)
   }
 
-  Store.prototype.removeTransfer = function (id) {
-    const { fileTransfers } = window.store
-    const index = fileTransfers.findIndex(t => t.id === id)
-    if (index > -1) {
-      fileTransfers.splice(index, 1)
-    }
-  }
-
   Store.prototype.skipAllTransfersSinceIndex = function (index) {
     window.store.fileTransfers.splice(index)
   }

package/client/store/ui-theme.js

@@ -15,15 +15,6 @@ import {
 import copy from 'json-deep-copy'
 
 export default Store => {
-  // Store.prototype.toCss = async function (stylus) {
-  //   const { host, port } = window._config
-  //   const url = `http://${host}:${port}/to-css`
-  //   const data = await fetch.post(url, {
-  //     stylus
-  //   })
-  //   return data
-  // }
-
   Store.prototype.getDefaultUiThemeConfig = function (stylus) {
     const reg = /[^\n]+ = [^\n]+\n/g
     const arr = stylus.match(reg)

package/client/store/watch.js

@@ -47,8 +47,8 @@ export default store => {
   }
 
   autoRun(async () => {
-    ls.setItem(resolutionsLsKey, store._resolutions)
-    return store._resolutions
+    ls.setItemJSON(resolutionsLsKey, store.resolutions)
+    return store.resolutions
   }).start()
 
   autoRun(() => {
@@ -64,7 +64,7 @@ export default store => {
     if (!isEmpty(store.config)) {
       window.pre.runGlobalAsync('saveUserConfig', store.config)
     }
-    return store._config
+    return store.config
   }, func => debounce(func, 100)).start()
 
   autoRun(() => {
@@ -74,17 +74,17 @@ export default store => {
 
   autoRun(() => {
     store.updateTabsStatus()
-    return store.fileTransfers
-  }, func => debounce(func, 100)).start()
+    return store.transferCount
+  }).start()
 
   autoRun(() => {
     ls.setItemJSON(sftpDefaultSortSettingKey, store.sftpSortSetting)
-    return store._sftpSortSetting
+    return store.sftpSortSetting
   }).start()
 
   autoRun(() => {
     ls.setItemJSON(expandedKeysLsKey, store.expandedKeys)
-    return store._expandedKeys
+    return store.expandedKeys
   }).start()
 
   autoRun(() => {
@@ -94,7 +94,7 @@ export default store => {
 
   autoRun(() => {
     ls.setItemJSON(checkedKeysLsKey, store.checkedKeys)
-    return store._checkedKeys
+    return store.checkedKeys
   }).start()
 
   autoRun(() => {

package/package.json

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