@electerm/electerm-react 3.8.8 → 3.8.15

package/client/common/parse-quick-connect.js

@@ -21,6 +21,12 @@
 
 const SUPPORTED_PROTOCOLS = ['ssh', 'telnet', 'vnc', 'rdp', 'spice', 'serial', 'ftp', 'http', 'https', 'electerm']
 
+/**
+ * Deny list for opts keys - these are parsed from the URL itself
+ * and should not be overridable via the opts JSON parameter for safety
+ */
+const OPTS_DENY_LIST = ['type', 'host']
+
 /**
  * Default ports for each protocol
  */
@@ -393,6 +399,7 @@ function parseQuickConnect (str) {
     if (optsStr) {
       try {
         const extraOpts = JSON.parse(optsStr)
+        OPTS_DENY_LIST.forEach(key => delete extraOpts[key])
         Object.assign(opts, extraOpts)
       } catch (err) {
         console.error('Failed to parse opts:', err)
@@ -439,5 +446,6 @@ export {
   getDefaultPort,
   getSupportedProtocols,
   SUPPORTED_PROTOCOLS,
-  DEFAULT_PORTS
+  DEFAULT_PORTS,
+  OPTS_DENY_LIST
 }

package/client/components/ai/ai-config-modal.jsx

@@ -0,0 +1,52 @@
+import Modal from '../common/modal'
+import { auto } from 'manate/react'
+import AIConfigForm from './ai-config'
+import message from '../common/message'
+import { aiConfigsArr } from './ai-config-props'
+import { pick } from 'lodash-es'
+
+const e = window.translate
+
+export default auto(function AIConfigModal ({ store }) {
+  const { showAIConfigModal } = store
+
+  if (!showAIConfigModal) {
+    return null
+  }
+
+  function getInitialValues () {
+    const res = pick(store.config, aiConfigsArr)
+    if (!res.languageAI) {
+      res.languageAI = window.store.getLangName()
+    }
+    return res
+  }
+
+  function handleSubmit (values) {
+    window.store.updateConfig(values)
+    message.success(e('saved') || 'Saved')
+    window.store.showAIConfigModal = false
+  }
+
+  function handleClose () {
+    window.store.showAIConfigModal = false
+  }
+
+  return (
+    <Modal
+      open={showAIConfigModal}
+      onCancel={handleClose}
+      footer={null}
+      title='AI Config'
+      width='80%'
+      destroyOnClose
+      className='ai-config-modal'
+    >
+      <AIConfigForm
+        initialValues={getInitialValues()}
+        onSubmit={handleSubmit}
+        showAIConfig
+      />
+    </Modal>
+  )
+})

package/client/components/ai/ai-config.jsx

@@ -6,7 +6,7 @@ import {
   Alert,
   Space
 } from 'antd'
-import { useEffect, useState } from 'react'
+import { useEffect } from 'react'
 import Link from '../common/external-link'
 import AiCache from './ai-cache'
 import {
@@ -15,9 +15,6 @@ import {
 import Password from '../common/password'
 import AiHistory, { addHistoryItem } from './ai-history'
 
-// Comprehensive API provider configurations
-import providers from './providers'
-
 const STORAGE_KEY_CONFIG = 'ai_config_history'
 const EVENT_NAME_CONFIG = 'ai-config-history-update'
 
@@ -39,7 +36,6 @@ const proxyOptions = [
 
 export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig }) {
   const [form] = Form.useForm()
-  const [modelOptions, setModelOptions] = useState([])
 
   useEffect(() => {
     if (initialValues) {
@@ -51,23 +47,6 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
     return true
   }
 
-  const getBaseURLOptions = () => {
-    return providers.map(provider => ({
-      value: provider.baseURL,
-      label: provider.label
-    }))
-  }
-
-  const getModelOptions = (baseURL) => {
-    const provider = providers.find(p => p.baseURL === baseURL)
-    if (!provider) return []
-
-    return provider.models.map(model => ({
-      value: model,
-      label: model
-    }))
-  }
-
   const handleSubmit = async (values) => {
     onSubmit(values)
     addHistoryItem(STORAGE_KEY_CONFIG, values, EVENT_NAME_CONFIG)
@@ -88,11 +67,6 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
     return { label, title }
   }
 
-  function handleChange (v) {
-    const options = getModelOptions(v)
-    setModelOptions(options)
-  }
-
   if (!showAIConfig) {
     return null
   }
@@ -127,12 +101,8 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
                 { type: 'url', message: 'Please enter a valid URL!' }
               ]}
             >
-              <AutoComplete
-                options={getBaseURLOptions()}
-                placeholder='Enter or select API provider URL'
-                filterOption={filter}
-                onChange={handleChange}
-                allowClear
+              <Input
+                placeholder='Enter API provider URL'
                 style={{ width: '75%' }}
               />
             </Form.Item>
@@ -156,10 +126,8 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
           name='modelAI'
           rules={[{ required: true, message: 'Please input or select a model!' }]}
         >
-          <AutoComplete
-            options={modelOptions}
+          <Input
             placeholder='Enter or select AI model'
-            filterOption={filter}
           />
         </Form.Item>
 
@@ -202,11 +170,10 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         >
           <AutoComplete
             options={proxyOptions}
-            placeholder='Enter proxy URL (optional)'
             filterOption={filter}
             allowClear
           >
-            <Input />
+            <Input placeholder='Enter proxy URL (optional)' />
           </AutoComplete>
         </Form.Item>
 

package/client/components/ai/get-brand.js

@@ -1,15 +1,4 @@
-import providers from './providers'
-
 export default function getBrand (baseURLAI) {
-  // First, try to match with providers
-  const provider = providers.find(p => p.baseURL === baseURLAI)
-  if (provider) {
-    return {
-      brand: provider.label,
-      brandUrl: provider.homepage
-    }
-  }
-
   // If no match, extract brand from URL
   try {
     const url = new URL(baseURLAI)

package/client/components/bg/custom-css.jsx

@@ -13,7 +13,8 @@ export default function CustomCss (props) {
     if (configLoaded) {
       const style = document.getElementById(themeDomId)
       if (style) {
-        style.innerHTML = customCss || ''
+        const safeCss = (customCss || '').replace(/@import/gi, '#')
+        style.innerHTML = safeCss
       }
     }
   }, [customCss, configLoaded])

package/client/components/main/main.jsx

@@ -28,6 +28,7 @@ import ConnectionHoppingWarning from './connection-hopping-warnning'
 import SshConfigLoadNotify from '../ssh-config/ssh-config-load-notify'
 import LoadSshConfigs from '../ssh-config/load-ssh-configs'
 import AIChat from '../ai/ai-chat'
+import AIConfigModal from '../ai/ai-config-modal'
 import Opacity from '../common/opacity'
 import MoveItemModal from '../tree-list/move-item-modal'
 import InputContextMenu from '../common/input-context-menu'
@@ -295,6 +296,7 @@ export default auto(function Index (props) {
         <BookmarkFromHistoryModal />
         <NotificationContainer />
         <BatchOpRunner />
+        <AIConfigModal store={store} />
       </div>
     </ConfigProvider>
   )

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

@@ -10,12 +10,9 @@ import {
 import { Button, Space, Dropdown } from 'antd'
 import copy from 'json-deep-copy'
 import time from '../../common/time'
-import { uniq } from 'lodash-es'
-import { fixBookmarks } from '../../common/db-fix'
 import download from '../../common/download'
-import delay from '../../common/wait'
-import { action } from 'manate'
 import Upload from '../common/upload'
+import { beforeBookmarkUpload } from './bookmark-upload'
 
 const e = window.translate
 
@@ -28,71 +25,12 @@ export default function BookmarkToolbar (props) {
     bookmarkGroups,
     bookmarks
   } = props
-  const upload = action(async (file) => {
-    const { store } = window
-    const filePath = file.filePath
-    const txt = await window.fs.readFile(filePath)
-
-    const content = JSON.parse(txt)
-    const {
-      bookmarkGroups: bookmarkGroups1,
-      bookmarks: bookmarks1
-    } = content
-    const bookmarkGroups0 = copy(bookmarkGroups)
-    const bookmarks0 = copy(bookmarks)
-
-    // Using Map instead of reduce
-    const bmTree = new Map(
-      bookmarks0.map(bookmark => [bookmark.id, bookmark])
-    )
-    const bmgTree = new Map(
-      bookmarkGroups0.map(group => [group.id, group])
-    )
-
-    const fixed = fixBookmarks(bookmarks1)
-
-    fixed.forEach(bg => {
-      if (!bmTree.has(bg.id)) {
-        store.bookmarks.push(bg)
-      }
-    })
-
-    bookmarkGroups1.forEach(bg => {
-      if (!bmgTree.has(bg.id)) {
-        store.bookmarkGroups.push(bg)
-      } else {
-        const bg1 = store.bookmarkGroups.find(
-          b => b.id === bg.id
-        )
-        bg1.bookmarkIds = uniq(
-          [
-            ...bg1.bookmarkIds,
-            ...bg.bookmarkIds
-          ]
-        )
-      }
-    })
-    return false
-  })
-  const beforeUpload = async (file) => {
-    const names = [
-      'bookmarks',
-      'bookmarkGroups'
-    ]
-    for (const name of names) {
-      window[`watch${name}`].stop()
-    }
-    upload(file)
-    await delay(1000)
-    for (const name of names) {
-      window[`watch${name}`].start()
-    }
-  }
+  const beforeUpload = beforeBookmarkUpload
 
   const handleDownload = () => {
     const txt = JSON.stringify({
-      bookmarkGroups: copy(bookmarkGroups),
-      bookmarks: copy(bookmarks)
+      bookmarkGroups: copy(bookmarkGroups || []),
+      bookmarks: copy(bookmarks || [])
     }, null, 2)
     const stamp = time(undefined, 'YYYY-MM-DD-HH-mm-ss')
     download('bookmarks-' + stamp + '.json', txt)

package/client/components/tree-list/bookmark-upload.js

@@ -0,0 +1,106 @@
+/**
+ * bookmark import/upload logic
+ */
+
+import copy from 'json-deep-copy'
+import { uniq, isPlainObject } from 'lodash-es'
+import { action } from 'manate'
+import uid from '../../common/uid'
+import time from '../../common/time'
+import { fixBookmarks } from '../../common/db-fix'
+import delay from '../../common/wait'
+
+function fixBookmarksId (bookmarks) {
+  return bookmarks.map(item => {
+    if (!isPlainObject(item)) {
+      return null
+    }
+    if (!item.id) {
+      item.id = uid()
+    }
+    return item
+  }).filter(Boolean)
+}
+export const bookmarkUpload = action(async (file) => {
+  const { store } = window
+  const { bookmarks, bookmarkGroups } = store
+
+  const filePath = file.filePath
+  const txt = await window.fs.readFile(filePath)
+
+  const content = JSON.parse(txt)
+  let bookmarkGroups1 = []
+  let bookmarks1 = []
+  if (Array.isArray(content)) {
+    bookmarks1 = fixBookmarksId(content)
+    bookmarkGroups1 = [{
+      id: uid(),
+      title: 'imported_' + time(),
+      color: '#0088cc',
+      bookmarkGroupIds: [],
+      bookmarkIds: bookmarks1.map(b => b.id)
+    }]
+  } else {
+    bookmarkGroups1 = content.bookmarkGroups || []
+    bookmarks1 = fixBookmarksId(content.bookmarks || [])
+  }
+
+  const bookmarkGroups0 = copy(bookmarkGroups)
+  const bookmarks0 = copy(bookmarks)
+
+  const bmTree = new Map(
+    bookmarks0.map(bookmark => [bookmark.id, bookmark])
+  )
+  const bmgTree = new Map(
+    bookmarkGroups0.map(group => [group.id, group])
+  )
+
+  const fixed = fixBookmarks(bookmarks1)
+
+  fixed.forEach(bg => {
+    if (!bmTree.has(bg.id)) {
+      store.bookmarks.push(bg)
+    }
+  })
+
+  bookmarkGroups1.forEach(bg => {
+    if (!bmgTree.has(bg.id)) {
+      store.bookmarkGroups.push(bg)
+    } else {
+      const bg1 = store.bookmarkGroups.find(
+        b => b.id === bg.id
+      )
+      bg1.bookmarkIds = uniq(
+        [
+          ...(bg1.bookmarkIds || []),
+          ...(bg.bookmarkIds || [])
+        ]
+      )
+      bg1.bookmarkGroupIds = uniq(
+        [
+          ...(bg1.bookmarkGroupIds || []),
+          ...(bg.bookmarkGroupIds || [])
+        ]
+      )
+    }
+  })
+
+  store.fixBookmarkGroups()
+
+  return false
+})
+
+export async function beforeBookmarkUpload (file) {
+  const names = [
+    'bookmarks',
+    'bookmarkGroups'
+  ]
+  for (const name of names) {
+    window[`watch${name}`].stop()
+  }
+  bookmarkUpload(file)
+  await delay(1000)
+  for (const name of names) {
+    window[`watch${name}`].start()
+  }
+}

package/client/store/common.js

@@ -10,9 +10,7 @@ import {
   rightSidebarWidthKey,
   addPanelWidthLsKey,
   dismissDelKeyTipLsKey,
-  connectionMap,
-  settingMap,
-  settingAiId
+  connectionMap
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 import { refs, refsStatic } from '../components/common/ref'
@@ -20,7 +18,6 @@ import { action } from 'manate'
 import uid from '../common/uid'
 import deepCopy from 'json-deep-copy'
 import { aiConfigsArr } from '../components/ai/ai-config-props'
-import settingList from '../common/setting-list'
 
 const e = window.translate
 const { assign } = Object
@@ -54,12 +51,7 @@ export default Store => {
   }
 
   Store.prototype.toggleAIConfig = function () {
-    const { store } = window
-    store.storeAssign({
-      settingTab: settingMap.setting
-    })
-    store.setSettingItem(settingList().find(d => d.id === settingAiId))
-    store.openSettingModal()
+    window.store.showAIConfigModal = true
   }
 
   Store.prototype.onResize = debounce(async function () {

package/client/store/init-state.js

@@ -118,6 +118,7 @@ export default () => {
     rightPanelTab: 'info',
     rightPanelPinned: false,
     rightPanelWidth: parseInt(ls.getItem(rightSidebarWidthKey), 10) || 500,
+    showAIConfigModal: false,
 
     // for settings related
     settingItem: initSettingItem([], settingMap.bookmarks),

package/package.json

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

package/client/components/ai/providers.js

@@ -1,14 +0,0 @@
-export default [
-  {
-    label: 'OpenAI',
-    baseURL: 'https://api.openai.com/v1',
-    homepage: 'https://openai.com',
-    models: ['gpt-4', 'gpt-3.5-turbo', 'gpt-3.5-turbo-16k', 'gpt-4.5']
-  },
-  {
-    label: 'DeepSeek',
-    baseURL: 'https://api.deepseek.com/v1',
-    homepage: 'https://deepseek.com',
-    models: ['deepseek-chat', 'deepseek-coder', 'deepseek-reasoner']
-  }
-]