@electerm/electerm-react 1.39.88 → 1.39.103

package/client/components/tree-list/bookmark-transport.jsx

@@ -15,10 +15,7 @@ import copy from 'json-deep-copy'
 import { find, uniq, isEqual } from 'lodash-es'
 import { fixBookmarks } from '../../common/db-fix'
 
-const { prefix } = window
-const f = prefix('form')
-const t = prefix('terminalThemes')
-const m = prefix('menu')
+const e = window.translate
 
 export default class BookmarkTransport extends Component {
   beforeUpload = async (file) => {
@@ -118,7 +115,7 @@ export default class BookmarkTransport extends Component {
       <Button
         icon={<EditOutlined />}
         onClick={this.handleToggleEdit}
-        title={m('edit')}
+        title={e('edit')}
         key='edit-and-del'
       />
     )
@@ -130,7 +127,7 @@ export default class BookmarkTransport extends Component {
       <Button
         icon={<DownloadOutlined />}
         onClick={this.handleDownload}
-        title={t('export')}
+        title={e('export')}
         key='export'
       />,
       <Upload
@@ -140,7 +137,7 @@ export default class BookmarkTransport extends Component {
       >
         <Button
           icon={<UploadOutlined />}
-          title={f('importFromFile')}
+          title={e('importFromFile')}
         />
       </Upload>
     ]

package/client/components/tree-list/tree-list-item.jsx

@@ -24,10 +24,7 @@ import uid from '../../common/uid'
 import { memo } from 'react'
 import './tree-list.styl'
 
-const { prefix } = window
-const e = prefix('menu')
-const c = prefix('common')
-const s = prefix('setting')
+const e = window.translate
 
 export default memo(function TreeListItem (props) {
   const handleDel = (e) => {
@@ -43,7 +40,7 @@ export default memo(function TreeListItem (props) {
         title={e('del') + '?'}
         onConfirm={handleDel}
         okText={e('del')}
-        cancelText={c('cancel')}
+        cancelText={e('cancel')}
         placement='top'
       >
         <CloseOutlined title={e('del')} className='pointer tree-control-btn' />
@@ -86,7 +83,7 @@ export default memo(function TreeListItem (props) {
     return (
       <FolderAddOutlined
         key='new-tree'
-        title={`${s('new')} ${c('bookmarkCategory')}`}
+        title={`${e('new')} ${e('bookmarkCategory')}`}
         onClick={handleAddSubCat}
         className='pointer tree-control-btn'
       />
@@ -129,7 +126,7 @@ export default memo(function TreeListItem (props) {
       return null
     }
     return (
-      <Tooltip title={s('openAll')}>
+      <Tooltip title={e('openAll')}>
         <FolderOpenOutlined
           key='open-all-tree'
           onClick={handleOpenAll}

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

@@ -42,10 +42,7 @@ import './tree-list.styl'
 import TreeExpander from './tree-expander'
 import TreeListItem from './tree-list-item'
 
-const { prefix } = window
-const e = prefix('menu')
-const c = prefix('common')
-const s = prefix('setting')
+const e = window.translate
 
 export default class ItemListTree extends Component {
   constructor (props) {
@@ -902,13 +899,13 @@ export default class ItemListTree extends Component {
         <Space.Compact>
           <Button
             onClick={this.handleNewBookmark}
-            title={`${s('new')} ${c('bookmarks')}`}
+            title={`${e('new')} ${e('bookmarks')}`}
           >
             <BookOutlined className='with-plus' />
           </Button>
           <Button
             onClick={this.handleNewBookmarkGroup}
-            title={`${s('new')} ${c('bookmarkCategory')}`}
+            title={`${e('new')} ${e('bookmarkCategory')}`}
           >
             <FolderOutlined className='with-plus' />
           </Button>

package/client/components/vnc/vnc-form.jsx

@@ -10,9 +10,7 @@ import {
 import { formItemLayout, tailFormItemLayout } from '../../common/form-layout'
 
 const FormItem = Form.Item
-const { prefix } = window
-const e = prefix('form')
-const s = prefix('sftp')
+const e = window.translate
 
 export default function VncForm (props) {
   const [form] = Form.useForm()
@@ -57,7 +55,7 @@ export default function VncForm (props) {
             type='primary'
             htmlType='submit'
           >
-            {s('submit')}
+            {e('submit')}
           </Button>
         </FormItem>
       </div>

package/client/components/vnc/vnc-session.jsx

@@ -18,8 +18,7 @@ import resolutions from '../rdp/resolutions'
 import RFB from '@novnc/novnc/core/rfb'
 import VncForm from './vnc-form'
 
-const { prefix } = window
-const e = prefix('form')
+const e = window.translate
 
 export default class VncSession extends RdpSession {
   constructor (props) {

package/client/entry/basic.js

@@ -43,12 +43,10 @@ async function load () {
   window.getLang = (lang = window.store?.config.language || 'en_us') => {
     return _get(window.langMap, `[${lang}].lang`)
   }
-  window.prefix = prefix => {
-    return (id) => {
-      const lang = window.getLang()
-      const str = _get(lang, `[${prefix}][${id}]`) || id
-      return window.capitalizeFirstLetter(str)
-    }
+  window.translate = txt => {
+    const lang = window.getLang()
+    const str = _get(lang, `[${txt}]`) || txt
+    return window.capitalizeFirstLetter(str)
   }
   await loadWorker()
   loadScript()

package/client/store/common.js

@@ -16,9 +16,7 @@ import {
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 
-const { prefix } = window
-const m = prefix('menu')
-const c = prefix('common')
+const e = window.translate
 
 export default Store => {
   Store.prototype.storeAssign = function (updates) {
@@ -160,14 +158,14 @@ export default Store => {
     ls.setItem(dismissDelKeyTipLsKey, 'y')
     window.store.hideDelKeyTip = true
   }
-  Store.prototype.beforeExit = function (e) {
+  Store.prototype.beforeExit = function (evt) {
     const { confirmBeforeExit } = window.store.config
     if (
       (confirmBeforeExit &&
       !window.confirmExit) ||
       window.store.isTransporting
     ) {
-      e.returnValue = false
+      evt.returnValue = false
       let mod = null
       mod = Modal.confirm({
         onCancel: () => {
@@ -178,14 +176,14 @@ export default Store => {
           window.confirmExit = true
           window.store[window.exitFunction]()
         },
-        title: m('quit'),
-        okText: c('ok'),
-        cancelText: c('cancel'),
+        title: e('quit'),
+        okText: e('ok'),
+        cancelText: e('cancel'),
         content: ''
       })
     }
   }
-  Store.prototype.beforeExitApp = function (e, name) {
+  Store.prototype.beforeExitApp = function (evt, name) {
     let mod = null
     mod = Modal.confirm({
       onCancel: () => {
@@ -195,9 +193,9 @@ export default Store => {
       onOk: () => {
         window.pre.runGlobalAsync(name)
       },
-      title: m('quit'),
-      okText: c('ok'),
-      cancelText: c('cancel'),
+      title: e('quit'),
+      okText: e('ok'),
+      cancelText: e('cancel'),
       content: ''
     })
   }

package/client/store/index.js

@@ -41,10 +41,7 @@ import {
   theme
 } from 'antd'
 
-const { prefix } = window
-const ss = prefix('settingSync')
-const s = prefix('setting')
-const sss = prefix('ssh')
+const e = window.translate
 
 function getReverseColor (hex) {
   // Check if the input is a valid hex color code
@@ -201,15 +198,15 @@ class Store {
     return [
       {
         id: settingTerminalId,
-        title: sss('terminal')
+        title: e('terminal')
       },
       {
         id: settingShortcutsId,
-        title: s('settingShortcuts')
+        title: e('settingShortcuts')
       },
       {
         id: settingSyncId,
-        title: ss('settingSync')
+        title: e('settingSync')
       }
     ]
   }

package/client/store/init-state.js

@@ -25,13 +25,12 @@ import { buildDefaultThemes } from '../common/terminal-theme'
 import * as ls from '../common/safe-local-storage'
 import initSettingItem from '../common/init-setting-item'
 
-const { prefix } = window
-const t = prefix('terminalThemes')
+const e = window.translate
 
 function getDefaultBookmarkGroups (bookmarks) {
   return [
     JSON.stringify({
-      title: t(defaultBookmarkGroupId),
+      title: e(defaultBookmarkGroupId),
       id: defaultBookmarkGroupId,
       bookmarkIds: bookmarks.map(d => d.id)
     })

package/client/store/load-data.js

@@ -11,6 +11,7 @@ import defaultSettings from '../common/default-setting'
 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'
 
 function getHost (argv, opts) {
   const arr = argv
@@ -75,6 +76,15 @@ export async function addTabFromCommandLine (store, opts) {
   if (options.port && parseInt10(options.port)) {
     update.port = parseInt10(options.port)
   }
+  if (options.opts) {
+    const opts = safeParse(options.opts)
+    if (opts !== options.opts) {
+      Object.assign(update, opts)
+    }
+  }
+  if (options.type) {
+    update.type = options.type
+  }
   Object.assign(conf, update)
   if (options.privateKeyPath) {
     conf.privateKey = await fs.readFile(options.privateKeyPath)

package/client/store/setting.js

@@ -18,8 +18,7 @@ import { buildNewTheme } from '../common/terminal-theme'
 import getInitItem from '../common/init-setting-item'
 import newTerm from '../common/new-terminal'
 
-const { prefix } = window
-const m = prefix('menu')
+const e = window.translate
 
 export default Store => {
   Store.prototype.setConfig = function (conf) {
@@ -95,17 +94,45 @@ export default Store => {
     if (!item) {
       return
     }
+
     store.addTab({
       ...item,
       from: 'bookmarks',
       srcId: item.id,
       ...newTerm(true, true)
     })
-    item.id = generate()
+
     if (store.config.disableSshHistory) {
       return
     }
-    history.unshift(item)
+
+    // 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(), // History item gets a unique id
+        bookmarkId, // Store original bookmark id for future matching
+        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)
   }
 
@@ -161,7 +188,7 @@ export default Store => {
     const { store } = window
     if (store.isSencondInstance) {
       return message.warning(
-        m('sencondInstanceTip')
+        e('sencondInstanceTip')
       )
     }
     store.showModal = modals.setting

package/client/store/sync.js

@@ -50,8 +50,12 @@ export default (Store) => {
   }
 
   Store.prototype.getSyncToken = function (type) {
-    if (type === syncTypes.custom) {
-      return ['AccessToken', 'ApiUrl', 'GistId'].map(
+    if (type === syncTypes.custom || type === syncTypes.cloud) {
+      const arr = ['AccessToken', 'ApiUrl']
+      if (type === syncTypes.custom) {
+        arr.push('GistId')
+      }
+      return arr.map(
         p => {
           return get(window.store.config, 'syncSetting.' + type + p)
         }
@@ -149,11 +153,11 @@ export default (Store) => {
     store.isSyncUpload = true
     const token = store.getSyncToken(type)
     let gistId = store.getSyncGistId(type)
-    if (!gistId) {
+    if (!gistId && type !== syncTypes.cloud && type !== syncTypes.custom) {
       await store.createGist(type)
       gistId = store.getSyncGistId(type)
     }
-    if (!gistId) {
+    if (!gistId && type !== syncTypes.custom && type !== syncTypes.cloud) {
       window.isSyncing = false
       store.isSyncingSetting = false
       store.isSyncUpload = false
@@ -218,11 +222,11 @@ export default (Store) => {
     store.isSyncDownload = true
     const token = store.getSyncToken(type)
     let gistId = store.getSyncGistId(type)
-    if (!gistId) {
+    if (!gistId && type !== syncTypes.cloud && type !== syncTypes.custom) {
       await store.createGist(type)
       gistId = store.getSyncGistId(type)
     }
-    if (!gistId) {
+    if (!gistId && type !== syncTypes.custom && type !== syncTypes.cloud) {
       return
     }
     const pass = store.getSyncPassword(type)

package/client/store/system-menu.js

@@ -11,9 +11,7 @@ import {
   minZoom
 } from '../common/constants'
 
-const { prefix } = window
-const m = prefix('menu')
-const c = prefix('common')
+const e = window.translate
 
 export default Store => {
   Store.prototype.zoom = function (level = 1, plus = false, zoomOnly) {
@@ -83,9 +81,9 @@ export default Store => {
     mod = Modal.confirm({
       onCancel: () => mod.destroy(),
       onOk: store.doExit,
-      title: m('quit'),
-      okText: c('ok'),
-      cancelText: c('cancel'),
+      title: e('quit'),
+      okText: e('ok'),
+      cancelText: e('cancel'),
       content: ''
     })
   }

package/client/store/terminal-theme.js

@@ -12,9 +12,7 @@ import {
 import copy from 'json-deep-copy'
 import { convertTheme } from '../common/terminal-theme'
 
-const { terminalThemes } = settingMap
-const { prefix } = window
-const t = prefix(terminalThemes)
+const e = window.translate
 
 export default Store => {
   Store.prototype.getTerminalThemes = function () {
@@ -105,7 +103,7 @@ export default Store => {
         }
       )
       message.info(
-        `${t('default')} ${t('themeConfig')} ${t('updated')}`
+        `${e('default')} ${e('themeConfig')} ${e('updated')}`
       )
     }
     const hasLightTheme = find(store.getTerminalThemes(), d => d.id === defaultThemeLight.id)

package/package.json

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