@electerm/electerm-react 1.38.8 → 1.38.11

package/client/components/tabs/tabs.styl

@@ -126,7 +126,6 @@
   display inline-block
   vertical-align middle
   margin 0 3px 0 3px
-  -webkit-app-region no-drag
   color text
   &.empty
     font-size 20px
@@ -136,12 +135,11 @@
     color text-light
 .tabs-extra
   position absolute
-  height 20px
-  top 14px
+  height 40px
+  top 0
   right 96px
-  line-height 20px
+  line-height 40px
   z-index 20
-  -webkit-app-region no-drag
 
   .tabs-dd-icon
     color text
@@ -152,7 +150,6 @@
 .window-controls
   position absolute
   right 0
-  -webkit-app-region no-drag
   top 0
   z-index 200
   border-radius 0 0 3px 3px
@@ -163,7 +160,6 @@
   display inline-block
   padding 5px 10px
   color text
-  -webkit-app-region no-drag
   &:hover
     color primary
     cursor pointer

package/client/components/terminal/attach-addon-custom.js

@@ -5,100 +5,102 @@ import { AttachAddon } from 'xterm-addon-attach'
 import strip from '@electerm/strip-ansi'
 
 export default class AttachAddonCustom extends AttachAddon {
-  constructor (term, options, encode, isWindowsShell) {
-    super(term, options)
+  constructor (term, socket, isWindowsShell) {
+    super(socket)
     this.term = term
-    this.decoder = new TextDecoder(encode)
+    this.socket = socket
     this.isWindowsShell = isWindowsShell
   }
 
   activate (terminal = this.term) {
-    const writeToTerminal = (data) => {
-      if (terminal.parent?.onZmodem) {
-        return
-      }
-      if (typeof data === 'string') {
-        return terminal.write(data)
-      }
-      data = new Uint8Array(data)
-      if (!this.decoder) {
-        return terminal.write(data)
-      }
-      const fileReader = new FileReader()
-      fileReader.addEventListener('load', () => {
-        const str = this.decoder.decode(fileReader.result)
-        if (terminal.parent.props.sftpPathFollowSsh && terminal.buffer.active.type !== 'alternate') {
-          const {
-            cwdId
-          } = terminal
-          const nss = str.split('\r')
-          const nnss = []
-          for (const str1 of nss) {
-            const ns = strip(str1).trim()
-            if (ns.includes(cwdId) && ns.includes('$PWD')) {
-              nnss.push(str1.replace(`echo "${cwdId}$PWD"`, ''))
-            } else if (
-              (cwdId && ns.startsWith(cwdId))
-            ) {
-              delete terminal.cwdId
-              const cwd = ns.replace(cwdId, '').trim()
-              terminal.parent.setCwd(cwd)
-              nnss.push('\x1b[2A\x1b[0J')
-            } else {
-              nnss.push(str1)
-            }
-          }
-          terminal.write(nnss.join('\r'))
-        } else {
-          terminal.write(str)
-        }
-      })
-      fileReader.readAsArrayBuffer(new window.Blob([data]))
-    }
-
-    const sendToServer = (data) => {
-      this._sendData(data)
-    }
-
-    const trzsz = window.newTrzsz(
-      writeToTerminal,
-      sendToServer,
+    this.trzsz = window.newTrzsz(
+      this.writeToTerminal,
+      this.sendToServer,
       terminal.cols,
       this.isWindowsShell
     )
 
-    this._disposables.push(
-      addSocketListener(this._socket, 'message', (ev) =>
-        trzsz.processServerOutput(ev.data)
-      )
-    )
+    this.addSocketListener(this._socket, 'message', this.onMsg)
 
     if (this._bidirectional) {
-      this._disposables.push(terminal.onData((data) => trzsz.processTerminalInput(data)))
-      this._disposables.push(terminal.onBinary((data) => trzsz.processBinaryInput(data)))
+      this._disposables.push(terminal.onData((data) => this.trzsz.processTerminalInput(data)))
+      this._disposables.push(terminal.onBinary((data) => this.trzsz.processBinaryInput(data)))
     }
 
-    this._disposables.push(terminal.onResize((size) => trzsz.setTerminalColumns(size.cols)))
+    this._disposables.push(terminal.onResize((size) => this.trzsz.setTerminalColumns(size.cols)))
 
-    this._disposables.push(addSocketListener(this._socket, 'close', () => this.dispose()))
-    this._disposables.push(addSocketListener(this._socket, 'error', () => this.dispose()))
+    this._disposables.push(this.addSocketListener(this._socket, 'close', () => this.dispose()))
+    this._disposables.push(this.addSocketListener(this._socket, 'error', () => this.dispose()))
   }
 
-  dispose () {
-    this.term = null
-    this._disposables.forEach(d => d.dispose())
-    this._disposables.length = 0
+  onMsg = (ev) => {
+    this.trzsz.processServerOutput(ev.data)
+  }
+
+  writeToTerminal = (data) => {
+    const { term } = this
+    if (term.parent?.onZmodem) {
+      return
+    }
+    if (typeof data === 'string') {
+      return term.write(data)
+    }
+    data = new Uint8Array(data)
+    const fileReader = new FileReader()
+    fileReader.addEventListener('load', this.onRead)
+    fileReader.readAsArrayBuffer(new window.Blob([data]))
+  }
+
+  onRead = (ev) => {
+    const data = ev.target.result
+    const { term } = this
+    const str = this.decoder.decode(data)
+    if (term.parent.props.sftpPathFollowSsh && term.buffer.active.type !== 'alternate') {
+      const {
+        cwdId
+      } = term
+      const nss = str.split('\r')
+      const nnss = []
+      for (const str1 of nss) {
+        const ns = strip(str1).trim()
+        if (ns.includes(cwdId) && ns.includes('$PWD')) {
+          nnss.push(str1.replace(`echo "${cwdId}$PWD"`, ''))
+        } else if (
+          (cwdId && ns.startsWith(cwdId))
+        ) {
+          delete term.cwdId
+          const cwd = ns.replace(cwdId, '').trim()
+          term.parent.setCwd(cwd)
+          nnss.push('\x1b[2A\x1b[0J')
+        } else {
+          nnss.push(str1)
+        }
+      }
+      term.write(nnss.join('\r'))
+    } else {
+      term.write(str)
+    }
   }
-}
 
-function addSocketListener (socket, type, handler) {
-  socket.addEventListener(type, handler)
-  return {
-    dispose: () => {
-      if (!handler) {
-        return
+  sendToServer = (data) => {
+    this._sendData(data)
+  }
+
+  addSocketListener = (socket, type, handler) => {
+    socket.addEventListener(type, handler)
+    return {
+      dispose: () => {
+        if (!handler) {
+          return
+        }
+        socket.removeEventListener(type, handler)
       }
-      socket.removeEventListener(type, handler)
     }
   }
+
+  dispose = () => {
+    this.term = null
+    this._disposables.forEach(d => d.dispose())
+    this._disposables.length = 0
+  }
 }

package/client/components/terminal/highlight-addon.js

@@ -62,5 +62,7 @@ export class KeywordHighlighterAddon {
   dispose () {
     // Restore the original write method when disposing the addon
     this.terminal.write = this.originalWrite
+    this.originalWrite = null
+    this.term = null
   }
 }

package/client/components/terminal/index.jsx

@@ -166,18 +166,15 @@ class Term extends Component {
     }
   ]
 
-  initAttachAddon = (encode) => {
+  initAttachAddon = () => {
     this.attachAddon = new AttachAddon(
+      this.term,
       this.socket,
-      undefined,
-      this.props.tab.encode,
       isWin && !this.isRemote()
     )
-    if (encode || this.decode) {
-      this.attachAddon.decoder = encode
-        ? new TextDecoder(encode)
-        : this.decode
-    }
+    this.attachAddon.decoder = new TextDecoder(
+      this.encode || this.props.tab.encode || 'utf-8'
+    )
     this.term.loadAddon(this.attachAddon)
   }
 
@@ -688,6 +685,7 @@ class Term extends Component {
     delete this.zsession
     this.term.focus()
     this.term.write('\r\n')
+    this.onZmodem = false
     delete this.downloadFd
     delete this.downloadPath
     delete this.downloadCount
@@ -1078,7 +1076,6 @@ class Term extends Component {
     const {
       srcId, from = 'bookmarks',
       type,
-      encode,
       term: terminalType,
       displayRaw
     } = tab
@@ -1155,19 +1152,13 @@ class Term extends Component {
     const socket = new WebSocket(wsUrl)
     socket.onclose = this.oncloseSocket
     socket.onerror = this.onerrorSocket
+    this.socket = socket
+    this.term = term
     socket.onopen = () => {
-      this.attachAddon = new AttachAddon(
-        socket,
-        undefined,
-        encode,
-        isWin && !this.isRemote()
-      )
-      term.loadAddon(this.attachAddon)
-      // socket.addEventListener('message', this.onSocketData)
+      this.initAttachAddon()
       this.runInitScript()
       term._initialized = true
     }
-    this.socket = socket
     // term.onRrefresh(this.onRefresh)
     term.onResize(this.onResizeTerminal)
     if (pick(term, 'buffer._onBufferChange._listeners')) {
@@ -1187,7 +1178,6 @@ class Term extends Component {
     term.loadAddon(
       new KeywordHighlighterAddon(keywords)
     )
-    this.term = term
     window.store.triggerResize()
   }
 
@@ -1303,8 +1293,8 @@ class Term extends Component {
   // }
 
   switchEncoding = encode => {
-    this.decode = new TextDecoder(encode)
-    this.attachAddon.decoder = this.decode
+    this.encode = encode
+    this.attachAddon.decoder = new TextDecoder(encode)
   }
 
   render () {

package/client/components/terminal/xterm-zmodem.js

@@ -4,10 +4,10 @@ export class AddonZmodem {
   _disposables = []
 
   activate (terminal) {
-    terminal.zmodemAttach = this.zmodemAttach.bind(this)
+    terminal.zmodemAttach = this.zmodemAttach
   }
 
-  sendWebSocket (octets) {
+  sendWebSocket = (octets) => {
     const { socket } = this
     if (socket && socket.readyState === WebSocket.OPEN) {
       return socket.send(new Uint8Array(octets))
@@ -16,7 +16,7 @@ export class AddonZmodem {
     }
   }
 
-  zmodemAttach (ctx) {
+  zmodemAttach = (ctx) => {
     this.socket = ctx.socket
     this.term = ctx.term
     this.ctx = ctx
@@ -26,15 +26,15 @@ export class AddonZmodem {
           this.term.write(String.fromCharCode.apply(String, octets))
         }
       },
-      sender: this.sendWebSocket.bind(this),
+      sender: this.sendWebSocket,
       on_retract: ctx.onzmodemRetract,
       on_detect: ctx.onZmodemDetect
     })
     this.socket.binaryType = 'arraybuffer'
-    this.socket.addEventListener('message', this.handleWSMessage.bind(this))
+    this.socket.addEventListener('message', this.handleWSMessage)
   }
 
-  handleWSMessage (evt) {
+  handleWSMessage = (evt) => {
     if (typeof evt.data === 'string') {
       if (this.ctx.onZmodem) {
         this.term.write(evt.data)
@@ -44,7 +44,7 @@ export class AddonZmodem {
     }
   }
 
-  dispose () {
+  dispose = () => {
     this.socket && this.socket.removeEventListener('message', this.handleWSMessage)
     this._disposables.forEach(d => d.dispose())
     this._disposables.length = 0

package/package.json

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