Version -> 3.3.100

zxdong262 · zxdong262 · commit f117510a6573 · 2025-11-13T17:05:42.000+08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electerm-web",
-  "version": "3.3.85",
+  "version": "3.3.100",
   "description": "Running electerm in as web app",
   "main": "src/app/app.js",
   "type": "module",
@@ -47,7 +47,7 @@
   "preferGlobal": true,
   "devDependencies": {
     "@ant-design/icons": "5.6.1",
-    "@electerm/electerm-react": "2.3.85",
+    "@electerm/electerm-react": "2.3.100",
     "@electerm/electerm-resource": "1.3.7",
     "@electerm/strip-ansi": "^1.0.0",
     "@fontsource/maple-mono": "^5.2.5",
diff --git a/src/app/routes/ws.js b/src/app/routes/ws.js
@@ -38,7 +38,8 @@ export function wsRoutes (app) {
     const term = terminals(req.params.pid)
     const { pid } = term
     log.debug('ws: connected to terminal ->', pid)
-
+    const dataBuffer = []
+    let sendTimeout = null
     term.on('data', function (data) {
       try {
         if (term.sessionLogger) {
@@ -47,9 +48,25 @@ export function wsRoutes (app) {
             : ''
           term.sessionLogger.write(`${dt}${strip(data.toString())}`)
         }
-        ws.send(Buffer.from(data))
+
+        // Buffer incoming data instead of sending immediately
+        dataBuffer.push(data)
+
+        // If no timeout is pending, schedule a batched send
+        if (!sendTimeout) {
+          sendTimeout = setTimeout(() => {
+            // Combine buffered data (optional: limit size to avoid memory issues)
+            const combinedData = dataBuffer.splice(0).join('')
+
+            // Send to WebSocket
+            ws.send(combinedData)
+
+            // Reset timeout
+            sendTimeout = null
+          }, 10) // Small delay (10ms) to throttle; adjust based on testing
+        }
       } catch (ex) {
-        console.log('kkk', ex)
+        console.log(ex)
       // The WebSocket is not open, ignore
       }
     })
diff --git a/src/app/server/session-local.js b/src/app/server/session-local.js
@@ -3,7 +3,6 @@
  */
 import pty from 'node-pty'
 import { resolve as pathResolve } from 'path'
-import log from '../common/log.js'
 import globalState from './global-state.js'
 import { TerminalBase } from './session-base.js'
 
@@ -56,14 +55,7 @@ class TerminalLocal extends TerminalBase {
   }
 
   write (data) {
-    try {
-      this.term.write(data)
-      if (this.sessionLogger) {
-        this.sessionLogger.write(data)
-      }
-    } catch (e) {
-      log.error(e)
-    }
+    this.term.write(data)
   }
 
   kill () {
diff --git a/src/app/server/session-ssh.js b/src/app/server/session-ssh.js
@@ -725,12 +725,7 @@ class TerminalSshBase extends TerminalBase {
   }
 
   write (data) {
-    try {
-      this.channel.write(data)
-      // this.writeLog(data)
-    } catch (e) {
-      log.error(e)
-    }
+    this.channel.write(data)
   }
 
   kill () {
diff --git a/src/app/server/session-telnet.js b/src/app/server/session-telnet.js
@@ -7,6 +7,24 @@ import { Telnet } from './telnet.js'
 import { TerminalBase } from './session-base.js'
 import globalState from './global-state.js'
 
+// Helper function to convert regex string to RegExp object
+function stringToRegExp (regexString) {
+  // Check if it's already a RegExp
+  if (regexString instanceof RegExp) {
+    return regexString
+  }
+
+  // Parse string format like /pattern/flags
+  const match = regexString.match(/^\/(.+)\/([gimsuy]*)$/)
+  if (match) {
+    const [, pattern, flags] = match
+    return new RegExp(pattern, flags)
+  }
+
+  // If no slashes, treat as plain pattern
+  return new RegExp(regexString)
+}
+
 class TerminalTelnet extends TerminalBase {
   async init () {
     const connection = new Telnet()
@@ -27,6 +45,13 @@ class TerminalTelnet extends TerminalBase {
         'terminalHeight'
       ]
     )
+    // Convert string regex patterns to RegExp objects
+    if (typeof initOptions.loginPrompt === 'string') {
+      params.loginPrompt = stringToRegExp(initOptions.loginPrompt)
+    }
+    if (typeof initOptions.passwordPrompt === 'string') {
+      params.passwordPrompt = stringToRegExp(initOptions.passwordPrompt)
+    }
     Object.assign(
       params,
       {

Original file line number	Diff line number	Diff line change
`@@ -725,12 +725,7 @@ class TerminalSshBase extends TerminalBase {`
`725`	`725`	`}`
`726`	`726`
`727`	`727`	`write (data) {`
`728`		`- try {`
`729`		`- this.channel.write(data)`
`730`		`- // this.writeLog(data)`
`731`		`- } catch (e) {`
`732`		`- log.error(e)`
`733`		`- }`
	`728`	`+ this.channel.write(data)`
`734`	`729`	`}`
`735`	`730`
`736`	`731`	`kill () {`