@electerm/electerm-react 1.39.99 → 1.39.109

package/client/common/constants.js

@@ -217,12 +217,14 @@ export const baseUpdateCheckUrls = [
 export const syncTypes = buildConst([
   'github',
   'gitee',
-  'custom'
+  'custom',
+  'cloud'
 ])
 export const syncTokenCreateUrls = {
   gitee: 'https://gitee.com/github-zxdong262/electerm/wikis/Create%20personal%20access%20token?sort_id=3028409',
   github: 'https://github.com/electerm/electerm/wiki/Create-personal-access-token',
-  custom: 'https://github.com/electerm/electerm/wiki/Custom-sync-server'
+  custom: 'https://github.com/electerm/electerm/wiki/Custom-sync-server',
+  cloud: 'https://electerm-cloud.html5beta.com'
 }
 export const settingSyncId = 'setting-sync'
 export const settingTerminalId = 'setting-terminal'

package/client/components/auth/login.jsx

@@ -10,6 +10,8 @@ import {
   ArrowRightOutlined
 } from '@ant-design/icons'
 import Main from '../main/main.jsx'
+import AppDrag from '../tabs/app-drag'
+import WindowControl from '../tabs/window-control'
 import './login.styl'
 
 const e = window.translate
@@ -90,6 +92,10 @@ export default class Login extends Component {
     } = this.state
     return (
       <div className='login-wrap'>
+        <AppDrag />
+        <WindowControl
+          store={window.store}
+        />
         <div className='pd3 aligncenter'>
           <LogoElem />
           <div className='pd3 aligncenter'>

package/client/components/auth/login.styl

@@ -4,4 +4,10 @@
   top 0
   width 100%
   height 100%
-  background #fff
+  background #fff
+  .app-drag
+    position fixed
+    right 0
+    top 0
+    width 100%
+    height 30px

package/client/components/bookmark-form/form-ssh-common.jsx

@@ -166,7 +166,7 @@ export default function renderCommon (props) {
         name='description'
         hasFeedback
       >
-        <Input.TextArea rows={1} />
+        <Input.TextArea autoSize={{ minRows: 1 }} />
       </FormItem>
       <FormItem
         {...formItemLayout}
@@ -196,7 +196,7 @@ export default function renderCommon (props) {
         hasFeedback
       >
         <Input.TextArea
-          rows={1}
+          autoSize={{ minRows: 1 }}
         />
       </FormItem>
       {renderRunScripts()}

package/client/components/bookmark-form/local-form-ui.jsx

@@ -87,7 +87,7 @@ export default function LocalFormUi (props) {
           name='description'
           hasFeedback
         >
-          <Input.TextArea rows={1} />
+          <Input.TextArea autoSize={{ minRows: 1 }} />
         </FormItem>
         <FormItem
           {...formItemLayout}

package/client/components/bookmark-form/rdp-form-ui.jsx

@@ -126,7 +126,7 @@ export default function RdpFormUi (props) {
           name='description'
           hasFeedback
         >
-          <Input.TextArea rows={1} />
+          <Input.TextArea autoSize={{ minRows: 1 }} />
         </FormItem>
         <FormItem
           {...formItemLayout}

package/client/components/bookmark-form/render-auth-ssh.jsx

@@ -103,7 +103,7 @@ export default function renderAuth (props) {
       <FormItem noStyle name='privateKey'>
         <TextArea
           placeholder={e('privateKeyDesc')}
-          rows={1}
+          autoSize={{ minRows: 1 }}
         />
       </FormItem>
       <Upload

package/client/components/bookmark-form/render-delayed-scripts.jsx

@@ -40,7 +40,7 @@ export default function renderRunScripts () {
             className='mg2x'
           >
             <Input.TextArea
-              rows={1}
+              autoSize={{ minRows: 1 }}
               placeholder={e('loginScript')}
               className='compact-input'
             />

package/client/components/bookmark-form/serial-form-ui.jsx

@@ -246,7 +246,7 @@ export default function SerialFormUi (props) {
           name='description'
           hasFeedback
         >
-          <Input.TextArea rows={1} />
+          <Input.TextArea autoSize={{ minRows: 1 }} />
         </FormItem>
         <FormItem
           {...formItemLayout}

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

@@ -174,7 +174,7 @@ export default function VncFormUi (props) {
           name='description'
           hasFeedback
         >
-          <Input.TextArea rows={1} />
+          <Input.TextArea autoSize={{ minRows: 1 }} />
         </FormItem>
         <FormItem
           {...formItemLayout}

package/client/components/bookmark-form/web-form-ui.jsx

@@ -85,7 +85,7 @@ export default function LocalFormUi (props) {
           name='description'
           hasFeedback
         >
-          <Input.TextArea rows={1} />
+          <Input.TextArea autoSize={{ minRows: 1 }} />
         </FormItem>
         <FormItem
           {...formItemLayout}

package/client/components/footer/batch-input.jsx

@@ -159,7 +159,7 @@ export default class BatchInput extends Component {
               onClick={this.handleClick}
               onBlur={this.handleBlur}
               size='small'
-              row={1}
+              autoSize={{ minRows: 1 }}
             />
           </AutoComplete>
           <Tooltip title={e('runInAllTerminals')}>

package/client/components/quick-commands/quick-commands-list-form.jsx

@@ -45,7 +45,7 @@ export default function renderQm () {
           className='mg2x'
         >
           <Input.TextArea
-            rows={1}
+            autoSize={{ minRows: 1 }}
             placeholder={e('quickCommand')}
             className='compact-input qm-input'
             onFocus={() => {

package/client/components/session/session.jsx

@@ -13,7 +13,8 @@ import {
   SearchOutlined,
   FullscreenOutlined,
   PaperClipOutlined,
-  CloseOutlined
+  CloseOutlined,
+  QuestionCircleOutlined
 } from '@ant-design/icons'
 import {
   Tooltip
@@ -37,6 +38,7 @@ import ResizeWrap from '../common/resize-wrap'
 import safeName from '../../common/safe-name'
 import TerminalInfoContent from '../terminal-info/content'
 import uid from '../../common/id-with-stamp'
+import Link from '../common/external-link'
 import postMessage from '../../common/post-msg'
 import './session.styl'
 
@@ -541,7 +543,18 @@ export default class SessionWrapper extends Component {
     if (isSsh || isLocal) {
       controls.push(isSsh ? paneMap.sftp : paneMap.fileManager)
     }
-    const checkTxt = e('sftpPathFollowSsh') + ' [Beta]'
+    const checkTxt = (
+      <div>
+        <span>{e('sftpPathFollowSsh')}</span>
+        <span className='mg1l color-red'>[Beta]</span>
+        <Link
+          to='https://github.com/electerm/electerm/wiki/Warning-about-sftp-follow-ssh-path-function'
+          className='mg1l'
+        >
+          Wiki <QuestionCircleOutlined />
+        </Link>
+      </div>
+    )
     const checkProps = {
       onClick: this.toggleCheckSftpPathFollowSsh,
       className: classnames(

package/client/components/session/session.styl

@@ -32,7 +32,11 @@
   &.active
     .type-tab-line
       display inline-block
-
+#container
+  .sftp-follow-ssh-icon
+    &:hover
+    &.active
+      color red
 .is-transporting
   .type-tab.sftp
     .type-tab-line

package/client/components/setting-sync/setting-sync-form.jsx

@@ -24,8 +24,11 @@ export default function SyncForm (props) {
   useConditionalEffect(() => {
     form.resetFields()
   }, delta && delta.prev && !eq(delta.prev, delta.curr))
-
+  const { syncType } = props
   function disabled () {
+    if (syncType === syncTypes.cloud) {
+      return !props.formData.token
+    }
     const {
       token,
       gistId
@@ -40,10 +43,15 @@ export default function SyncForm (props) {
     }
     if (res.gistId) {
       up[syncType + 'GistId'] = res.gistId
+    } else if (syncType === syncTypes.cloud) {
+      up[syncType + 'GistId'] = 'cloud'
     }
     up[syncType + 'SyncPassword'] = res.syncPassword || ''
     if (res.apiUrl) {
       up[syncType + 'ApiUrl'] = res.apiUrl
+    } else if (syncType === syncTypes.cloud) {
+      up[syncType + 'ApiUrl'] = 'https://electerm-cloud.html5beta.com/api/sync'
+      // up[syncType + 'ApiUrl'] = 'http://127.0.0.1:5678/api/sync'
     }
     props.store.updateSyncSetting(up)
     const test = await props.store.testSyncToken(syncType, res.gistId)
@@ -52,7 +60,7 @@ export default function SyncForm (props) {
         message: 'token invalid'
       })
     }
-    if (!res.gistId) {
+    if (!res.gistId && syncType !== syncTypes.custom && syncType !== syncTypes.cloud) {
       props.store.createGist(syncType)
     }
   }
@@ -93,7 +101,7 @@ export default function SyncForm (props) {
   const {
     lastSyncTime = ''
   } = props.formData
-  const { syncType } = props
+
   const isCustom = syncType === syncTypes.custom
   const timeFormatted = lastSyncTime
     ? dayjs(lastSyncTime).format('YYYY-MM-DD HH:mm:ss')
@@ -124,6 +132,15 @@ export default function SyncForm (props) {
     return 'sync-input-' + name + '-' + syncType
   }
   function createUrlItem () {
+    if (syncType === syncTypes.cloud) {
+      return (
+        <p>
+          <Link to='https://electerm-cloud.html5beta.com'>
+            https://electerm-cloud.html5beta.com[Beta]
+          </Link>
+        </p>
+      )
+    }
     if (syncType !== syncTypes.custom) {
       return null
     }
@@ -152,31 +169,11 @@ export default function SyncForm (props) {
   const gistLabel = createLabel('gist', idDesc)
   const syncPasswordName = e('encrypt') + ' ' + e('password')
   const syncPasswordLabel = createLabel(syncPasswordName, '')
-  return (
-    <Form
-      onFinish={save}
-      form={form}
-      className='form-wrap pd1x'
-      name={'setting-sync-form' + syncType}
-      layout='vertical'
-      initialValues={props.formData}
-    >
-      {createUrlItem()}
-      <FormItem
-        label={tokenLabel}
-        hasFeedback
-        name='token'
-        rules={[{
-          max: 100, message: '100 chars max'
-        }, {
-          required: true, message: createPlaceHolder('token') + ' required'
-        }]}
-      >
-        <Input.Password
-          placeholder={createPlaceHolder('token')}
-          id={createId('token')}
-        />
-      </FormItem>
+  function createIdItem () {
+    if (syncType === syncTypes.cloud) {
+      return null
+    }
+    return (
       <FormItem
         label={gistLabel}
         name='gistId'
@@ -189,6 +186,13 @@ export default function SyncForm (props) {
           id={createId('gistId')}
         />
       </FormItem>
+    )
+  }
+  function createPasswordItem () {
+    if (syncType === syncTypes.cloud) {
+      return null
+    }
+    return (
       <FormItem
         label={syncPasswordLabel}
         hasFeedback
@@ -201,16 +205,39 @@ export default function SyncForm (props) {
           placeholder={syncType + ' ' + syncPasswordName}
         />
       </FormItem>
-      {/* <FormItem
-        {...formItemLayout}
-        label={e('autoSync')}
+    )
+  }
+  return (
+    <Form
+      onFinish={save}
+      form={form}
+      className='form-wrap pd1x'
+      name={'setting-sync-form' + syncType}
+      layout='vertical'
+      initialValues={props.formData}
+    >
+      {createUrlItem()}
+      <FormItem
+        label={tokenLabel}
+        hasFeedback
+        name='token'
+        rules={[{
+          max: 1100, message: '1100 chars max'
+        }, {
+          required: true, message: createPlaceHolder('token') + ' required'
+        }]}
       >
-        <Switch
-          checked={autoSync}
-          disabled={this.disabled()}
-          onChange={this.onChangeAutoSync}
+        <Input.Password
+          placeholder={createPlaceHolder('token')}
+          id={createId('token')}
         />
-      </FormItem> */}
+      </FormItem>
+      {
+        createIdItem()
+      }
+      {
+        createPasswordItem()
+      }
       <FormItem>
         <p>
           <Button
@@ -232,7 +259,7 @@ export default function SyncForm (props) {
             type='dashed'
             onClick={upload}
             disabled={disabled()}
-            className='mg1r mg1b'
+            className='mg1r mg1b sync-btn-up'
             icon={<ArrowUpOutlined />}
           >{e('uploadSettings')}
           </Button>

package/client/components/sftp/sftp-entry.jsx

@@ -30,7 +30,6 @@ import deepCopy from 'json-deep-copy'
 import isValidPath from '../../common/is-valid-path'
 import memoizeOne from 'memoize-one'
 import postMessage from '../../common/post-msg'
-import { runCmd } from '../terminal/terminal-apis'
 import * as owner from './owner-list'
 import AddressBar from './address-bar'
 import getProxy from '../../common/get-proxy'
@@ -252,11 +251,7 @@ export default class Sftp extends Component {
     if (this.props.sftpPathFollowSsh && this.props.cwd) {
       return this.props.cwd
     }
-    const home = await runCmd(
-      this.props.pid,
-      this.props.sessionId,
-      'pwd'
-    ).catch(window.store.onError)
+    const home = await this.sftp.getHomeDir()
     if (home) {
       return home.trim()
     } else {

package/client/components/tabs/index.jsx

@@ -257,14 +257,16 @@ export default class Tabs extends React.Component {
   }
 
   renderContentInner () {
-    const { tabs = [], width } = this.props
+    const { tabs = [], width, config } = this.props
     const len = tabs.length
     const tabsWidthAll = tabMargin * len + 10 + this.tabsWidth()
     const { overflow } = this.state
     const left = overflow
       ? '100%'
       : tabsWidthAll
-    const w1 = isMacJs && window.et.isWebApp ? 30 : windowControlWidth
+    const w1 = isMacJs && (config.useSystemTitleBar || window.et.isWebApp)
+      ? 30
+      : windowControlWidth
     const style = {
       width: width - w1 - 166
     }

package/client/store/setting.js

@@ -94,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)
   }
 

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)
         }
@@ -113,8 +117,21 @@ export default (Store) => {
   }
 
   Store.prototype.handleClearSyncSetting = async function () {
-    window.store.setConfig({
-      syncSetting: {}
+    const { store } = window
+    const currentSyncType = store.syncType
+    const currentSettings = store.config.syncSetting || {}
+    console.log('currentSettings: ', currentSyncType, currentSettings)
+    // Create a new object without the current sync type's settings
+    const updatedSettings = Object.keys(currentSettings).reduce((acc, key) => {
+      if (!key.startsWith(currentSyncType)) {
+        acc[key] = currentSettings[key]
+      }
+      return acc
+    }, {})
+    console.log('updatedSettings: ', updatedSettings)
+
+    store.setConfig({
+      syncSetting: updatedSettings
     })
   }
 
@@ -149,11 +166,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 +235,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)
@@ -342,7 +359,7 @@ export default (Store) => {
   Store.prototype.handleExportAllData = async function () {
     const { store } = window
     const objs = {}
-    const names = store.getDataSyncNames(true)
+    const { names } = store.getDataSyncNames(true)
     for (const n of names) {
       objs[n] = store.getItems(n)
       const order = await getData(`${n}:order`)

package/package.json

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