Ver -> 5.5.15

Author: zxdong262

build/replace/src/client/electerm-react/common/download.jsx

@@ -1,6 +1,6 @@
 {
   "name": "electerm-android",
-  "version": "5.5.10",
+  "version": "5.5.15",
   "description": "electerm for Android — a free and open-source ssh/sftp/telnet/RDP/VNC/Spice/ftp client, built on the electerm-web codebase with Capacitor.",
   "main": "src/app/app.js",
   "type": "module",
@@ -48,7 +48,7 @@
   "preferGlobal": true,
   "devDependencies": {
     "@ant-design/icons": "^6.2.5",
-    "@electerm/electerm-react": "^5.5.9",
+    "@electerm/electerm-react": "^5.5.15",
     "@electerm/electerm-resource": "2.2.1",
     "@fontsource/maple-mono": "^5.2.6",
     "@novnc/novnc": "^1.7.0",
@@ -92,7 +92,7 @@
     "@electerm/electerm-locales": "^2.3.19",
     "@electerm/electerm-themes": "^1.0.2",
     "@electerm/ftp-srv": "1.0.5",
-    "@electerm/ssh2": "1.22.0",
+    "@electerm/ssh2": "1.22.1",
     "@xterm/headless": "6.1.0-beta.292",
     "axios": "1.18.1",
     "basic-ftp": "6.0.1",
@@ -145,6 +145,7 @@
       "WebSocket",
       "FileReader",
       "CustomEvent",
+      "ResizeObserver",
       "onmessage",
       "self"
     ],

package-lock.json

@@ -85,6 +85,7 @@ export default {
   dragDropBehavior: 'ask',
   switchTabOnHover: false,
   disableShortcutBar: false,
+  disableConfirmForLargeClipboardContent: false,
   leftSideBarIcons: [
     'newBookmark',
     'quickConnect',

package.json

@@ -27,7 +27,7 @@ export const extIconPath = isDev
   ? '/node_modules/electerm-icons/icons/'
   : '/icons/'
 export const defaultUserName = 'default_user'
-export const minWindowWidth = 590
+export const minWindowWidth = 320
 export const minWindowHeight = 400
 export const defaultLang = 'en_us'
 export const tempDir = os.tmpdir()

src/app/common/default-setting.js

@@ -19,6 +19,10 @@ const onWatch = _.debounce(() => {
 }, 300, { leading: false, trailing: true })
 
 export const watchFile = (path) => {
+  const prev = globalState.get('watchFilePath')
+  if (prev && prev !== path) {
+    fs.unwatchFile(prev, onWatch)
+  }
   globalState.set('watchFilePath', path)
   fs.watchFile(path, onWatch)
 }
@@ -29,8 +33,8 @@ export const unwatchFile = (path) => {
 }
 
 const cleanWatchFile = () => {
-  globalState.set('watchFilePath', '')
   const filePath = globalState.get('watchFilePath')
+  globalState.set('watchFilePath', '')
   if (!filePath) {
     return
   }

src/app/common/runtime-constants.js

@@ -148,8 +148,28 @@ export function wsRoutes (app) {
       ws.send(JSON.stringify(data))
     }
 
-    // In the WebSocket setup, replace the data handler:
-    term.on('data', function (data) {
+    // Detach listeners from a previous WS connection for the same term.
+    // Reconnects create a new WS but reuse the same term instance; without
+    // this each reconnect stacks another 'data' handler, duplicating output
+    // and pinning closed sockets/buffers in memory.
+    if (term._wsDataHandler && typeof term.off === 'function') {
+      try {
+        term.off('data', term._wsDataHandler)
+      } catch (_) {}
+    }
+    if (term._wsPortDataHandler && term.port) {
+      try {
+        term.port.removeListener('data', term._wsPortDataHandler)
+      } catch (_) {}
+    }
+    if (term._wsCloseHandler && typeof term.off === 'function') {
+      try {
+        term.off('close', term._wsCloseHandler)
+        term.off('exit', term._wsCloseHandler)
+      } catch (_) {}
+    }
+
+    const onTermData = function (data) {
       // Check if zmodem session is active and handle data
       if (zmodemManager.isActive(pid)) {
         // Let zmodem handle the data, but still log it
@@ -247,25 +267,58 @@ export function wsRoutes (app) {
       if (!sendTimeout) {
         sendTimeout = setTimeout(flushBufferedData, flushIntervalMs - elapsed)
       }
-    })
+    }
+    term._wsDataHandler = onTermData
+    term.on('data', onTermData)
 
     // For serial terminals, register a raw data listener directly on the port to
     // feed binary XMODEM data to xmodemManager without rxLineEnding transformation.
     if (term.port) {
-      term.port.on('data', function (rawData) {
+      const onPortData = function (rawData) {
         if (xmodemManager.isActive(pid)) {
           term.writeLog(rawData)
           xmodemManager.handleData(pid, rawData, term, ws)
         }
-      })
+      }
+      term._wsPortDataHandler = onPortData
+      term.port.on('data', onPortData)
     }
 
+    let onCloseCalled = false
     function onClose () {
+      if (onCloseCalled) return
+      onCloseCalled = true
+      // Detach this connection's listeners so a reconnect does not stack
+      // duplicates on the reused term instance.
+      if (term._wsDataHandler && typeof term.off === 'function') {
+        try {
+          term.off('data', term._wsDataHandler)
+        } catch (_) {}
+      }
+      if (term._wsDataHandler === onTermData) {
+        term._wsDataHandler = null
+      }
+      if (term._wsPortDataHandler && term.port) {
+        try {
+          term.port.removeListener('data', term._wsPortDataHandler)
+        } catch (_) {}
+        term._wsPortDataHandler = null
+      }
+      if (typeof term.off === 'function') {
+        try {
+          term.off('close', onClose)
+          term.off('exit', onClose)
+        } catch (_) {}
+      }
+      if (term._wsCloseHandler === onClose) {
+        term._wsCloseHandler = null
+      }
       // Cancel any pending batched send
       if (sendTimeout) {
         clearTimeout(sendTimeout)
         sendTimeout = null
       }
+      dataBuffer.length = 0
       // Clean up zmodem session
       zmodemManager.destroySession(pid)
       // Clean up trzsz session
@@ -284,6 +337,7 @@ export function wsRoutes (app) {
       // own ws close handler; whole-process cleanup is handled on app exit.
     }
 
+    term._wsCloseHandler = onClose
     term.on('close', onClose)
     if (term.isLocal && isWin) {
       term.on('exit', onClose)

src/app/lib/watch-file.js

@@ -37,6 +37,14 @@ export class TerminalBase {
 
   cache = ''
   prevNewLine = true
+  on () {
+    // Implemented by subclasses (ssh/local/serial/telnet)
+  }
+
+  off () {
+    // Implemented by subclasses - removes a listener added via on()
+  }
+
   _initVtParser () {
     this._vtTerm = createVtParser(this.initOptions.cols || 4096)
     this._vtLastRow = 0

src/app/routes/ws.js

@@ -96,6 +96,21 @@ class TerminalLocal extends TerminalBase {
     this.term.on(event, cb)
   }
 
+  off (event, cb) {
+    try {
+      if (!this.term) {
+        return
+      }
+      if (typeof this.term.removeListener === 'function') {
+        this.term.removeListener(event, cb)
+      } else if (typeof this.term.off === 'function') {
+        this.term.off(event, cb)
+      }
+    } catch (_) {
+      // ignore removal errors during teardown
+    }
+  }
+
   write (data) {
     this.term.write(data)
   }

src/app/server/session-base.js

@@ -81,7 +81,7 @@ class TerminalSerial extends TerminalBase {
 
   on (event, cb) {
     if (event === 'data' && this.rxLineEnding && this.rxLineEnding !== 'none') {
-      this.port.on('data', (data) => {
+      const wrapper = (data) => {
         const str = Buffer.isBuffer(data) ? data.toString('latin1') : String(data)
         let processed
         if (this.rxLineEnding === 'lf_to_crlf') {
@@ -92,12 +92,50 @@ class TerminalSerial extends TerminalBase {
           processed = str
         }
         cb(Buffer.isBuffer(data) ? Buffer.from(processed, 'latin1') : processed)
-      })
+      }
+      if (!this._onWrappers) {
+        this._onWrappers = new Map()
+      }
+      let list = this._onWrappers.get(cb)
+      if (!list) {
+        list = []
+        this._onWrappers.set(cb, list)
+      }
+      list.push({ event, wrapper })
+      this.port.on(event, wrapper)
     } else {
       this.port.on(event, cb)
     }
   }
 
+  off (event, cb) {
+    try {
+      const list = this._onWrappers?.get(cb)
+      if (list) {
+        const remaining = []
+        for (const entry of list) {
+          if (entry.event === event) {
+            try {
+              this.port?.removeListener?.(event, entry.wrapper)
+            } catch (_) {}
+          } else {
+            remaining.push(entry)
+          }
+        }
+        if (remaining.length) {
+          this._onWrappers.set(cb, remaining)
+        } else {
+          this._onWrappers.delete(cb)
+        }
+      }
+      try {
+        this.port?.removeListener?.(event, cb)
+      } catch (_) {}
+    } catch (_) {
+      // ignore removal errors during teardown
+    }
+  }
+
   write (data) {
     try {
       const str = Buffer.isBuffer(data) ? data.toString('latin1') : String(data)