@electerm/electerm-react 3.15.58 → 3.15.68

package/client/common/bookmark-schemas.js

@@ -64,6 +64,7 @@ export const sshBookmarkSchema = {
   sshAgent: z.string().optional().describe('SSH agent path'),
   serverHostKey: z.array(z.string()).optional().describe('Server host key algorithms'),
   cipher: z.array(z.string()).optional().describe('Cipher list'),
+  compress: z.array(z.string()).optional().describe('Compression algorithms'),
   quickCommands: z.array(quickCommandSchema).optional().describe('Quick commands'),
   x11: z.boolean().optional().describe('Enable x11 forwarding, default is false'),
   term: z.string().optional().describe('Terminal type, default is xterm-256color'),

package/client/common/download-mirrors.js

@@ -1,6 +1,6 @@
 export default [
   {
     name: 'homepage',
-    url: 'https://electerm.html5beta.com'
+    url: 'https://electerm.org'
   }
 ]

package/client/components/bookmark-form/bookmark-schema.js

@@ -22,6 +22,7 @@ const bookmarkSchema = {
     sshAgent: 'string - ssh agent path',
     serverHostKey: 'array - server host key algorithms',
     cipher: 'array - cipher list',
+    compress: 'array - compression algorithms (zlib@openssh.com, zlib, none)',
     runScripts: 'array - run scripts after connected ({delay,script})',
     quickCommands: 'array - quick commands ({name,command})',
     proxy: 'string - proxy address (socks5://...)',

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

@@ -35,6 +35,13 @@ const cipherOptions = [
   'curve25519-sha256@libssh.org'
 ]
 
+// Available compress options
+const compressOptions = [
+  'zlib@openssh.com',
+  'zlib',
+  'none'
+]
+
 // Available serverHostKey options from ssh2-alg.js
 const serverHostKeyOptions = [
   'ssh-rsa',
@@ -98,6 +105,20 @@ export default function renderX11 ({ form }) {
           ))}
         </Select>
       </FormItem>
+      <FormItem
+        {...formItemLayout}
+        label='compress'
+        name='compress'
+      >
+        <Select
+          mode='tags'
+          style={{ width: '100%' }}
+        >
+          {compressOptions.map(c => (
+            <Option key={c} value={c}>{c}</Option>
+          ))}
+        </Select>
+      </FormItem>
       <FormItem
         {...formItemLayout}
         label='serverHostKey'

package/client/components/bookmark-form/config/ssh.js

@@ -24,6 +24,7 @@ const sshConfig = {
       sshAgent: '',
       serverHostKey: [],
       cipher: [],
+      compress: [],
       ...getTerminalDefaults(store),
       ...getSshDefaults(),
       ...getTerminalBackgroundDefaults(defaultSetting),

package/client/components/common/logo.styl

@@ -2,8 +2,9 @@
   height 80px
 .logo-img-small
   height 28px
+  border-radius 28px
 @media (max-width: 500px)
   .logo-img
     height 40px
   .logo-img-small
-    height 20px
+    height 20px

package/client/components/main/error-wrapper.jsx

@@ -119,7 +119,7 @@ export default class ErrorBoundary extends React.PureComponent {
         </div>
         <div className='pd3y'>
           <img
-            src='https://electerm.html5beta.com/electerm-wechat-group-qr.jpg'
+            src='https://electerm.org/electerm-wechat-group-qr.jpg'
             className='mwm-100'
           />
         </div>

package/client/components/setting-panel/setting-modal.jsx

@@ -70,7 +70,8 @@ export default auto(function SettingModalWrap (props) {
         'config',
         'checkedKeys',
         'expandedKeys',
-        'leftSidebarWidth'
+        'leftSidebarWidth',
+        'initLoadingData'
       ])
     }
     const items = [

package/client/components/sidebar/bookmark-select.jsx

@@ -13,7 +13,8 @@ export default auto(function BookmarkSelect (props) {
     leftSidebarWidth,
     expandedKeys,
     bookmarks,
-    bookmarksMap
+    bookmarksMap,
+    initLoadingData
   } = store
   if (from === 'sidebar' && openedSideBar !== 'bookmarks') {
     return null
@@ -39,7 +40,8 @@ export default auto(function BookmarkSelect (props) {
     expandedKeys,
     leftSidebarWidth,
     bookmarkGroupTree: store.bookmarkGroupTree,
-    autoFocus
+    autoFocus,
+    initLoadingData
   }
   return (
     <TreeList

package/client/components/sys-menu/menu-btn.jsx

@@ -6,13 +6,12 @@ import { PureComponent } from 'react'
 import {
   Popover
 } from 'antd'
-import logoRef from '@electerm/electerm-resource/res/imgs/electerm.svg'
+import logoSvg from '@electerm/electerm-resource/res/imgs/electerm.svg?raw'
 import { shortcutDescExtend } from '../shortcuts/shortcut-handler.js'
 import MenuRender from './sys-menu.jsx'
 import { refsStatic } from '../common/ref.js'
 
 const e = window.translate
-const logo = logoRef.replace(/^\//, '')
 
 class MenuBtn extends PureComponent {
   componentDidMount () {
@@ -202,7 +201,10 @@ class MenuBtn extends PureComponent {
         <div
           {...pops}
         >
-          <img src={logo} width={28} height={28} />
+          <span
+            className='menu-logo'
+            dangerouslySetInnerHTML={{ __html: logoSvg }}
+          />
         </div>
       </Popover>
     )

package/client/components/sys-menu/sys-menu.styl

@@ -68,17 +68,23 @@
   width 28px
   height 28px
   border-radius 30px
-  color var(--text-light)
+  color var(--text)
   font-size 16px
   text-align center
   display inline-block
   line-height 28px
   cursor pointer
+  color var(--text)
+
+.menu-logo
+  display inline-block
+  width 28px
+  height 28px
+  vertical-align middle
+  color var(--text-disabled)
   &:hover
     color var(--text)
-.is-main
-  .menu-control
-    img
-      border 1px solid var(--text-dark)
-      border-radius 28px
-      background #000
+  svg
+    fill currentColor
+    width 100%
+    height 100%

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

@@ -854,7 +854,7 @@ export default class ItemListTree extends Component {
 
   render () {
     const { ready } = this.state
-    if (!ready) {
+    if (!ready || this.props.initLoadingData) {
       return (
         <div className='pd3 aligncenter'>
           <LoadingOutlined />

package/client/store/init-state.js

@@ -48,6 +48,7 @@ export default () => {
     // common
     wsInited: false,
     configLoaded: false,
+    initLoadingData: false,
     loadTime: 0,
     lastDataUpdateTime: 0,
     tabs: [],

package/client/store/load-data.js

@@ -182,55 +182,62 @@ export default (Store) => {
   }
   Store.prototype.initData = async function () {
     const { store } = window
-    await store.initApp()
-    const ext = {}
-    const all = dbNames.map(async name => {
-      const data = await fetchInitData(name)
-      return {
-        name,
-        data
-      }
-    })
-    await Promise.all(all)
-      .then(arr => {
-        for (const { name, data } of arr) {
-          const dt = JSON.parse(data || '[]')
-          refsStatic.add('oldState-' + name, dt)
-          if (name === 'bookmarks') {
-            ext.bookmarksMap = new Map(
-              dt.map(d => [d.id, d])
-            )
-          }
-          ext[name] = dt
+    store.initLoadingData = true
+    try {
+      await store.initApp()
+      const ext = {}
+      const all = dbNames.map(async name => {
+        const data = await fetchInitData(name)
+        return {
+          name,
+          data
         }
       })
-    ext.lastDataUpdateTime = await getData('lastDataUpdateTime') || 0
-    Object.assign(store, ext)
-    store.loadFontList()
-    store.fetchItermThemes()
-    store.openInitSessions()
-    store.fetchSshConfigItems()
-    store.initCommandLine().catch(store.onError)
-    initWatch(store)
-    setTimeout(
-      () => {
-        store.fixProfiles()
-        store.fixBookmarkGroups()
-      },
-      1000
-    )
-    setTimeout(
-      () => {
-        store.autoSyncReady = true
-      },
-      2000
-    )
-    if (store.config.checkUpdateOnStart) {
-      store.onCheckUpdate(false)
+      await Promise.all(all)
+        .then(arr => {
+          for (const { name, data } of arr) {
+            const dt = JSON.parse(data || '[]')
+            refsStatic.add('oldState-' + name, dt)
+            if (name === 'bookmarks') {
+              ext.bookmarksMap = new Map(
+                dt.map(d => [d.id, d])
+              )
+            }
+            ext[name] = dt
+          }
+        })
+      ext.lastDataUpdateTime = await getData('lastDataUpdateTime') || 0
+      ext.initLoadingData = false
+      Object.assign(store, ext)
+      store.loadFontList()
+      store.fetchItermThemes()
+      store.openInitSessions()
+      store.fetchSshConfigItems()
+      store.initCommandLine().catch(store.onError)
+      initWatch(store)
+      setTimeout(
+        () => {
+          store.fixProfiles()
+          store.fixBookmarkGroups()
+        },
+        1000
+      )
+      setTimeout(
+        () => {
+          store.autoSyncReady = true
+        },
+        2000
+      )
+      if (store.config.checkUpdateOnStart) {
+        store.onCheckUpdate(false)
+      }
+      store.startAutoRunWidgets().catch(err => {
+        console.error('Failed to start autorun widgets:', err)
+      })
+    } catch (err) {
+      store.initLoadingData = false
+      store.onError(err)
     }
-    store.startAutoRunWidgets().catch(err => {
-      console.error('Failed to start autorun widgets:', err)
-    })
   }
   Store.prototype.initCommandLine = async function () {
     const opts = await window.pre.runGlobalAsync('initCommandLine')

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "3.15.58",
+  "version": "3.15.68",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",
   "langugeRepo": "https://github.com/electerm/electerm-locales",
   "privacyNoticeLink": "https://github.com/electerm/electerm/wiki/privacy-notice",
   "knownIssuesLink": "https://github.com/electerm/electerm/wiki/Know-issues",
-  "sponsorLink": "https://electerm.html5beta.com/sponsor-electerm.html",
+  "sponsorLink": "https://electerm.org/sponsor-electerm.html",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/electerm/electerm.git"
@@ -20,7 +20,7 @@
   "bugs": {
     "url": "https://github.com/electerm/electerm/issues"
   },
-  "homepage": "https://electerm.html5beta.com",
+  "homepage": "https://electerm.org",
   "releases": "https://github.com/electerm/electerm/releases",
   "engines": {
     "node": ">=18.0.0"