@electerm/electerm-react 1.101.16 → 2.1.8

package/client/common/create-title.jsx

@@ -42,7 +42,7 @@ export default function createTitle (res, hide = true) {
   ) {
     f = `[T]${f}`
   }
-  if (type) {
+  if (type && type !== 'ssh') {
     f = `[${type}]${f}`
   }
   return f || e(terminalLocalType)

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

@@ -35,7 +35,25 @@ export default function AIOutput ({ item }) {
     }
 
     const runInTerminal = () => {
-      window.store.runCommandInTerminal(code)
+      // Filter out comments from the code before running
+      const filteredCode = code
+        .split('\n')
+        .map(line => line.trim())
+        .filter(line => {
+          // Remove empty lines and comments
+          if (!line) {
+            return false
+          }
+          if (line.startsWith('#')) {
+            return false
+          }
+          return true
+        })
+        .join('\n') // Join multiple commands with &&
+
+      if (filteredCode) {
+        window.store.runCommandInTerminal(filteredCode)
+      }
     }
 
     return (

package/client/components/bookmark-form/config/common-fields.js

@@ -270,12 +270,13 @@ export const sshAuthFields = [
 // Telnet auth fields - similar to SSH but with filtered auth types (no privateKey)
 export const telnetAuthFields = [
   commonFields.category,
+  commonFields.title,
   commonFields.host,
   commonFields.username,
   commonFields.password,
   { type: 'profileItem', name: '__profile__', label: '', profileFilter: d => !isEmpty(d.telnet) },
   commonFields.port,
-  commonFields.title,
+  commonFields.runScripts,
   commonFields.description,
   commonFields.setEnv,
   commonFields.startDirectoryLocal,

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

@@ -45,6 +45,7 @@ const serialConfig = {
         { type: 'switch', name: 'xon', label: 'xon', valuePropName: 'checked' },
         { type: 'switch', name: 'xoff', label: 'xoff', valuePropName: 'checked' },
         { type: 'switch', name: 'xany', label: 'xany', valuePropName: 'checked' },
+        commonFields.runScripts,
         commonFields.description,
         { type: 'input', name: 'type', label: 'type', hidden: true }
       ]

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

@@ -64,27 +64,31 @@ class MenuBtn extends PureComponent {
   }
 
   renderContext = () => {
-    return [
+    const items = [
       {
         func: 'onNewSsh',
         icon: 'CodeFilled',
         text: e('newBookmark'),
         subText: this.getShortcut('app_newBookmark')
-      },
-      {
+      }
+    ]
+    if (window.store.hasNodePty) {
+      items.push({
         func: 'addTab',
         icon: 'RightSquareFilled',
         text: e('newTab')
-      },
-      // {
-      //   type: 'hr'
-      // },
-      {
-        noCloseMenu: true,
-        icon: 'BookOutlined',
-        text: e('bookmarks'),
-        submenu: 'Bookmark'
-      },
+      })
+    }
+    // {
+    //   type: 'hr'
+    // },
+    items.push({
+      noCloseMenu: true,
+      icon: 'BookOutlined',
+      text: e('bookmarks'),
+      submenu: 'Bookmark'
+    })
+    items.push(
       {
         noCloseMenu: true,
         icon: 'ClockCircleOutlined',
@@ -162,7 +166,8 @@ class MenuBtn extends PureComponent {
         icon: 'CloseOutlined',
         text: e('close')
       }
-    ]
+    )
+    return items
   }
 
   renderMenu () {

package/client/components/tabs/index.jsx

@@ -124,6 +124,10 @@ export default class Tabs extends Component {
   }
 
   handleTabAdd = () => {
+    if (!window.store.hasNodePty) {
+      window.store.onNewSsh()
+      return
+    }
     window.store.addTab(
       undefined, undefined,
       this.props.batch
@@ -195,6 +199,16 @@ export default class Tabs extends Component {
   renderMenus () {
     const { onNewSsh } = window.store
     const cls = 'pd2x pd1y context-item pointer'
+    const addTabBtn = window.store.hasNodePty
+      ? (
+        <div
+          className={cls}
+          onClick={this.handleTabAdd}
+        >
+          <RightSquareFilled /> {e('newTab')}
+        </div>
+        )
+      : null
     return (
       <div
         className='add-menu-wrap' style={{
@@ -207,12 +221,7 @@ export default class Tabs extends Component {
         >
           <CodeFilled /> {e('newBookmark')}
         </div>
-        <div
-          className={cls}
-          onClick={this.handleTabAdd}
-        >
-          <RightSquareFilled /> {e('newTab')}
-        </div>
+        {addTabBtn}
         <BookmarksList
           store={window.store}
         />

package/client/components/tabs/no-session.jsx

@@ -13,8 +13,8 @@ export default function NoSessionPanel ({ height, onNewTab, onNewSsh, batch }) {
   const handleClick = () => {
     window.openTabBatch = batch
   }
-  return (
-    <div className='no-sessions electerm-logo-bg' {...props}>
+  const newTabDom = window.store.hasNodePty
+    ? (
       <Button
         onClick={onNewTab}
         size='large'
@@ -22,6 +22,11 @@ export default function NoSessionPanel ({ height, onNewTab, onNewSsh, batch }) {
       >
         {e('newTab')}
       </Button>
+      )
+    : null
+  return (
+    <div className='no-sessions electerm-logo-bg' {...props}>
+      {newTabDom}
       <Button
         onClick={onNewSsh}
         size='large'

package/client/components/tabs/tab.jsx

@@ -220,7 +220,11 @@ class Tab extends Component {
   }
 
   newTab = () => {
-    this.props.addTab()
+    if (window.store.hasNodePty) {
+      this.props.addTab()
+    } else {
+      window.store.onNewSsh()
+    }
   }
 
   doRename = () => {

package/client/store/db-upgrade.js

@@ -12,31 +12,55 @@ export default (Store) => {
       return false
     }
     const shouldUpgrade = await window.pre.runGlobalAsync('checkDbUpgrade')
-    if (!shouldUpgrade) {
+    const shouldMigrate = await window.pre.runGlobalAsync('checkMigrate')
+    if (!shouldUpgrade && !shouldMigrate) {
+      window.migrating = false
       return false
     }
-    const {
-      dbVersion,
-      packVersion
-    } = shouldUpgrade
-    const mod = Modal.info({
-      title: 'Upgrading database',
-      content: `Upgrading database... from v${dbVersion} to v${packVersion} please wait`,
+    window.migrating = true
+    let mod
+    const commonProps = {
       keyboard: false,
       okButtonProps: {
         style: {
           display: 'none'
         }
       }
-    })
-    await window.pre.runGlobalAsync('doUpgrade')
-    mod.update({
-      title: 'Done',
-      content: 'Database Upgraded',
-      okButtonProps: {}
-    })
-    await delay(2000)
-    mod.destroy()
+    }
+    if (shouldMigrate) {
+      mod = Modal.info({
+        title: 'Migrating database',
+        content: 'Migrating database... please wait',
+        ...commonProps
+      })
+      await window.pre.runGlobalAsync('migrate')
+      mod.update({
+        title: 'Done',
+        content: 'Database Migrated',
+        okButtonProps: {}
+      })
+      await delay(2000)
+      mod.destroy()
+    }
+    if (shouldUpgrade) {
+      const {
+        dbVersion,
+        packVersion
+      } = shouldUpgrade
+      mod = Modal.info({
+        title: 'Upgrading database',
+        content: `Upgrading database... from v${dbVersion} to v${packVersion} please wait`,
+        ...commonProps
+      })
+      await window.pre.runGlobalAsync('doUpgrade')
+      mod.update({
+        title: 'Done',
+        content: 'Database Upgraded',
+        okButtonProps: {}
+      })
+      await delay(2000)
+      mod.destroy()
+    }
     await store.restart()
     return true
   }

package/client/store/init-state.js

@@ -188,6 +188,7 @@ export default () => {
     innerWidth: window.innerWidth,
     height: 500,
     isMaximized: window.pre.runSync('isMaximized'),
+    hasNodePty: window.pre.runSync('nodePtyCheck'),
     terminalFullScreen: false,
     hideDelKeyTip: ls.getItem(dismissDelKeyTipLsKey) === 'y',
     tabsHeight: 36

package/client/store/tab.js

@@ -10,6 +10,7 @@ import {
   maxHistory
 } from '../common/constants'
 import { refs } from '../components/common/ref'
+import { message } from 'antd'
 import * as ls from '../common/safe-local-storage'
 import deepCopy from 'json-deep-copy'
 import generate from '../common/id-with-stamp'
@@ -312,6 +313,15 @@ export default Store => {
     index,
     batch
   ) {
+    if (
+      (!newTab.type || newTab.type === 'local') &&
+      !newTab.host &&
+      !window.store.hasNodePty
+    ) {
+      return message.warning(
+        'local terminal is not supported, due to node-pty not working in this build'
+      )
+    }
     const { store } = window
     const { tabs } = store
     newTab.tabCount = store.nextTabCount()

package/client/store/watch.js

@@ -40,6 +40,9 @@ export default store => {
 
   for (const name of dbNamesForWatch) {
     window[`watch${name}`] = autoRun(async () => {
+      if (window.migrating) {
+        return
+      }
       const old = refsStatic.get('oldState-' + name)
       const n = store.getItems(name)
       const { updated, added, removed } = dataCompare(
@@ -55,9 +58,10 @@ export default store => {
       for (const item of added) {
         await insert(name, item)
       }
+      const newOrder = (n || []).map(d => d.id)
       await update(
         `${name}:order`,
-        (n || []).map(d => d.id)
+        newOrder
       )
       refsStatic.add('oldState-' + name, deepCopy(n) || [])
       if (name === 'bookmarks') {

package/package.json

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