@electerm/electerm-react 2.6.0 → 2.7.8

package/client/common/constants.js

@@ -242,7 +242,7 @@ export const proxyHelpLink = 'https://github.com/electerm/electerm/wiki/proxy-fo
 export const regexHelpLink = 'https://github.com/electerm/electerm/wiki/Terminal-keywords-highlight-regular-expression-exmaples'
 export const connectionHoppingWikiLink = 'https://github.com/electerm/electerm/wiki/Connection-Hopping-Behavior-Change-in-electerm-since-v1.50.65'
 export const aiConfigWikiLink = 'https://github.com/electerm/electerm/wiki/AI-model-config-guide'
-export const rdpWikiLink = 'https://github.com/electerm/electerm/wiki/RDP-session-known-issues'
+export const rdpWikiLink = 'https://github.com/electerm/electerm/wiki/RDP-limitation'
 export const vncWikiLink = 'https://github.com/electerm/electerm/wiki/VNC-session-known-issues'
 export const modals = {
   hide: 0,

package/client/common/create-title.jsx

@@ -22,12 +22,12 @@ export default function createTitle (res, hide = true) {
     return ''
   }
   const {
-    host, port, username, title, type,
+    host, port, username, title, type, url,
     path, connectionHoppings, sshTunnels
   } = res
   const h = hide && window.store.config.hideIP ? maskHost(host) : host
   const fixTitle = `${username || ''}@${h}:${port}`
-  const extra = host || path ? (path || fixTitle) : ''
+  const extra = host || path ? (path || fixTitle) : (url || '')
   let f = title
     ? `${title}` + (extra ? ` - ${extra}` : '')
     : extra

package/client/common/download.jsx

@@ -6,22 +6,22 @@ import ShowItem from '../components/common/show-item'
 import { chooseSaveDirectory } from './choose-save-folder'
 import { DownloadOutlined } from '@ant-design/icons'
 
-function downloadForBrowser (filename, text) {
-  const blob = new Blob([text], { type: 'text/plain;charset=utf-8' })
-  const url = URL.createObjectURL(blob)
-  const a = document.createElement('a')
-  a.href = url
-  a.download = filename
-  document.body.appendChild(a)
-  a.click()
-  document.body.removeChild(a)
-  URL.revokeObjectURL(url)
-}
+// function downloadForBrowser (filename, text) {
+//   const blob = new Blob([text], { type: 'text/plain;charset=utf-8' })
+//   const url = URL.createObjectURL(blob)
+//   const a = document.createElement('a')
+//   a.href = url
+//   a.download = filename
+//   document.body.appendChild(a)
+//   a.click()
+//   document.body.removeChild(a)
+//   URL.revokeObjectURL(url)
+// }
 
 export default async function download (filename, text) {
-  if (window.et.isWebApp) {
-    return downloadForBrowser(filename, text)
-  }
+  // if (window.et.isWebApp) {
+  //   return downloadForBrowser(filename, text)
+  // }
   const savePath = await chooseSaveDirectory()
   if (!savePath) {
     return

package/client/components/common/zoom-control.jsx

@@ -0,0 +1,58 @@
+import React from 'react'
+import InputNumberConfirm from './input-number-confirm'
+import {
+  Space
+} from 'antd'
+import {
+  MinusCircleOutlined,
+  PlusCircleOutlined
+} from '@ant-design/icons'
+
+export default function ZoomControl (props) {
+  const {
+    value,
+    onChange,
+    min = 0.25,
+    max = 5,
+    step = 0.25
+  } = props
+
+  const handleChange = (v) => {
+    onChange(v / 100)
+  }
+
+  const handleAdd = () => {
+    let next = value + step
+    if (next > max) next = max
+    onChange(next)
+  }
+
+  const handleMinus = () => {
+    let next = value - step
+    if (next < min) next = min
+    onChange(next)
+  }
+
+  return (
+    <InputNumberConfirm
+      value={Math.round(value * 100)}
+      onChange={handleChange}
+      step={1}
+      min={min * 100}
+      max={max * 100}
+      suffix='%'
+      addonBefore={
+        <Space.Compact>
+          <PlusCircleOutlined
+            onClick={handleAdd}
+            className='mg1r pointer font16'
+          />
+          <MinusCircleOutlined
+            onClick={handleMinus}
+            className='pointer font16 mg1r'
+          />
+        </Space.Compact>
+      }
+    />
+  )
+}

package/client/components/rdp/rdp-session.jsx

@@ -8,10 +8,8 @@ import {
 } from '../../common/constants'
 import {
   Spin,
-  // Button,
   Select
 } from 'antd'
-import { notification } from '../common/notification'
 import {
   ReloadOutlined,
   EditOutlined
@@ -22,6 +20,25 @@ import resolutions from './resolutions'
 
 const { Option } = Select
 
+// IronRDP WASM module imports — loaded dynamically
+async function loadWasmModule () {
+  if (window.ironRdp) return
+  console.debug('[RDP-CLIENT] Loading IronRDP WASM module...')
+  const mod = await import('ironrdp-wasm')
+  window.ironRdp = {
+    wasmInit: mod.default,
+    wasmSetup: mod.setup,
+    SessionBuilder: mod.SessionBuilder,
+    DesktopSize: mod.DesktopSize,
+    InputTransaction: mod.InputTransaction,
+    DeviceEvent: mod.DeviceEvent,
+    Extension: mod.Extension
+  }
+  await window.ironRdp.wasmInit()
+  window.ironRdp.wasmSetup('info')
+  console.debug('[RDP-CLIENT] IronRDP WASM module loaded and initialized')
+}
+
 export default class RdpSession extends PureComponent {
   constructor (props) {
     const id = `rdp-reso-${props.tab.host}`
@@ -30,10 +47,9 @@ export default class RdpSession extends PureComponent {
     this.canvasRef = createRef()
     this.state = {
       loading: false,
-      bitmapProps: {},
-      aspectRatio: 4 / 3,
       ...resObj
     }
+    this.session = null
   }
 
   componentDidMount () {
@@ -41,14 +57,24 @@ export default class RdpSession extends PureComponent {
   }
 
   componentWillUnmount () {
-    this.socket && this.socket.close()
-    delete this.socket
+    this.cleanup()
   }
 
-  runInitScript = () => {
-
+  cleanup = () => {
+    console.debug('[RDP-CLIENT] cleanup() called')
+    if (this.session) {
+      try {
+        this.session.shutdown()
+        console.debug('[RDP-CLIENT] session.shutdown() called')
+      } catch (e) {
+        console.debug('[RDP-CLIENT] session.shutdown() error:', e)
+      }
+      this.session = null
+    }
   }
 
+  runInitScript = () => {}
+
   setStatus = status => {
     const id = this.props.tab?.id
     this.props.editTab(id, {
@@ -56,7 +82,7 @@ export default class RdpSession extends PureComponent {
     })
   }
 
-  remoteInit = async (term = this.term) => {
+  remoteInit = async () => {
     this.setState({
       loading: true
     })
@@ -80,237 +106,279 @@ export default class RdpSession extends PureComponent {
       termType: type,
       ...tab
     })
+
+    console.debug('[RDP-CLIENT] Creating RDP session term, host=', tab.host, 'port=', tab.port)
     const r = await createTerm(opts)
       .catch(err => {
         const text = err.message
         handleErr({ message: text })
       })
-    this.setState({
-      loading: false
-    })
     if (!r) {
+      this.setState({ loading: false })
       this.setStatus(statusMap.error)
+      console.error('[RDP-CLIENT] createTerm failed')
       return
     }
-    this.setStatus(statusMap.success)
+
     const {
       pid, port
     } = r
     this.pid = pid
+    console.debug('[RDP-CLIENT] Term created, pid=', pid, 'port=', port)
+
+    // Build the WebSocket proxy address for IronRDP WASM
     const hs = server
       ? server.replace(/https?:\/\//, '')
       : `${host}:${port}`
     const pre = server.startsWith('https') ? 'wss' : 'ws'
     const { width, height } = this.state
-    const wsUrl = `${pre}://${hs}/rdp/${pid}?&token=${tokenElecterm}&width=${width}&height=${height}`
-    const socket = new WebSocket(wsUrl)
-    socket.onclose = this.oncloseSocket
-    socket.onerror = this.onerrorSocket
-    this.socket = socket
-    socket.onopen = this.runInitScript
-    socket.onmessage = this.onData
-  }
-
-  decompress = (bitmap) => {
-    let fName = null
-    switch (bitmap.bitsPerPixel) {
-      case 15:
-        fName = 'bitmap_decompress_15'
-        break
-      case 16:
-        fName = 'bitmap_decompress_16'
-        break
-      case 24:
-        fName = 'bitmap_decompress_24'
-        break
-      case 32:
-        fName = 'bitmap_decompress_32'
-        break
-      default:
-        throw new Error('invalid bitmap data format')
+    // IronRDP connects to the proxy address, which then proxies via RDCleanPath
+    // The WebSocket URL includes the pid and token for auth
+    const proxyAddress = `${pre}://${hs}/rdp/${pid}?token=${tokenElecterm}&width=${width}&height=${height}`
+    console.debug('[RDP-CLIENT] Proxy address:', proxyAddress)
+
+    // Load WASM module if not already loaded
+    try {
+      await loadWasmModule()
+    } catch (e) {
+      console.error('[RDP-CLIENT] Failed to load WASM module:', e)
+      this.setState({ loading: false })
+      this.setStatus(statusMap.error)
+      return
     }
-    const rle = window.Module
-    const input = new Uint8Array(bitmap.data.data)
-    const inputPtr = rle._malloc(input.length)
-    const inputHeap = new Uint8Array(rle.HEAPU8.buffer, inputPtr, input.length)
-    inputHeap.set(input)
-
-    const outputWidth = bitmap.destRight - bitmap.destLeft + 1
-    const outputHeight = bitmap.destBottom - bitmap.destTop + 1
-    const ouputSize = outputWidth * outputHeight * 4
-    const outputPtr = rle._malloc(ouputSize)
-
-    const outputHeap = new Uint8Array(rle.HEAPU8.buffer, outputPtr, ouputSize)
-
-    rle.ccall(fName,
-      'number',
-      ['number', 'number', 'number', 'number', 'number', 'number', 'number', 'number'],
-      [outputHeap.byteOffset, outputWidth, outputHeight, bitmap.width, bitmap.height, inputHeap.byteOffset, input.length]
-    )
 
-    const output = new Uint8ClampedArray(outputHeap.buffer, outputHeap.byteOffset, ouputSize)
+    this.setStatus(statusMap.success)
 
-    rle._free(inputPtr)
-    rle._free(outputPtr)
+    // Connect using IronRDP SessionBuilder
+    try {
+      const canvas = this.canvasRef.current
+      if (!canvas) {
+        console.error('[RDP-CLIENT] Canvas ref not available')
+        this.setState({ loading: false })
+        return
+      }
 
-    return { width: outputWidth, height: outputHeight, arr: output }
-  }
+      const rdpHost = tab.host
+      const rdpPort = tab.port || 3389
+      const destination = `${rdpHost}:${rdpPort}`
+      const username = tab.username || ''
+      const password = tab.password || ''
+
+      console.debug('[RDP-CLIENT] Building IronRDP session...')
+      console.debug('[RDP-CLIENT] destination:', destination)
+      console.debug('[RDP-CLIENT] username:', username)
+      console.debug('[RDP-CLIENT] proxyAddress:', proxyAddress)
+      console.debug('[RDP-CLIENT] desktopSize:', width, 'x', height)
+
+      const desktopSize = new window.ironRdp.DesktopSize(width, height)
+      const enableCredsspExt = new window.ironRdp.Extension('enable_credssp', false)
+
+      const builder = new window.ironRdp.SessionBuilder()
+      builder.username(username)
+      builder.password(password)
+      builder.destination(destination)
+      builder.proxyAddress(proxyAddress)
+      builder.authToken('none')
+      builder.desktopSize(desktopSize)
+      builder.renderCanvas(canvas)
+      builder.extension(enableCredsspExt)
+
+      // Cursor style callback
+      builder.setCursorStyleCallbackContext(canvas)
+      builder.setCursorStyleCallback(function (style) {
+        canvas.style.cursor = style || 'default'
+      })
 
-  output = (data) => {
-    if (!data.isCompress) {
-      return {
-        width: data.width,
-        height: data.height,
-        arr: new Uint8ClampedArray(data.data)
-      }
-    }
-    return this.decompress(data)
-  }
+      console.debug('[RDP-CLIENT] Calling builder.connect()...')
+      this.session = await builder.connect()
+
+      const ds = this.session.desktopSize()
+      console.debug('[RDP-CLIENT] Connected! Desktop:', ds.width, 'x', ds.height)
+
+      // Update canvas size to match actual desktop size
+      canvas.width = ds.width
+      canvas.height = ds.height
+
+      this.setState({
+        loading: false
+      })
 
-  getButtonCode (button) {
-    if (button === 0) {
-      return 1
-    } else if (button === 2) {
-      return 2
-    } else {
-      return 0
+      canvas.focus()
+
+      // Run the session event loop (renders frames, handles protocol)
+      console.debug('[RDP-CLIENT] Starting session.run() event loop')
+      this.session.run().then((info) => {
+        console.debug('[RDP-CLIENT] Session ended:', info.reason())
+        this.onSessionEnd()
+      }).catch((e) => {
+        console.error('[RDP-CLIENT] Session error:', this.formatError(e))
+        this.onSessionEnd()
+      })
+    } catch (e) {
+      console.error('[RDP-CLIENT] Connection failed:', this.formatError(e))
+      this.setState({ loading: false })
+      this.setStatus(statusMap.error)
     }
   }
 
-  getKeyCode (event) {
-    const { type, button } = event
-    if (type.startsWith('key')) {
-      return scanCode(event)
-    } else if (type === 'mousemove') {
-      return 0
-    } else {
-      return this.getButtonCode(button)
+  formatError = (e) => {
+    if (e && typeof e === 'object' && '__wbg_ptr' in e) {
+      try {
+        const kindNames = {
+          0: 'General',
+          1: 'WrongPassword',
+          2: 'LogonFailure',
+          3: 'AccessDenied',
+          4: 'RDCleanPath',
+          5: 'ProxyConnect',
+          6: 'NegotiationFailure'
+        }
+        const kind = e.kind ? e.kind() : 'Unknown'
+        const bt = e.backtrace ? e.backtrace() : ''
+        return `[${kindNames[kind] || kind}] ${bt}`
+      } catch (_) {}
     }
+    return e?.message || e?.toString() || String(e)
   }
 
-  handleCanvasEvent = e => {
-    const {
-      type,
-      clientX,
-      clientY
-    } = e
-    const {
-      left,
-      top
-    } = e.target.getBoundingClientRect()
-    const x = clientX - left
-    const y = clientY - top
-    const keyCode = this.getKeyCode(e)
-    const action = type.startsWith('key')
-      ? 'sendKeyEventScancode'
-      : type === 'mousewheel'
-        ? 'sendWheelEvent'
-        : 'sendPointerEvent'
-    const pressed = type === 'mousedown' || type === 'keydown'
-    let params = []
-    if (type.startsWith('mouse') || type.startsWith('context')) {
-      params = [x, y, keyCode, pressed]
-    } else if (type === 'wheel') {
-      const isHorizontal = false
-      const delta = isHorizontal ? e.deltaX : e.deltaY
-      const step = Math.round(Math.abs(delta) * 15 / 8)
-      params = [x, y, step, delta > 0, isHorizontal]
-    } else if (type === 'keydown' || type === 'keyup') {
-      params = [keyCode, pressed]
-    }
-    this.socket.send(JSON.stringify({
-      action,
-      params
-    }))
+  onSessionEnd = () => {
+    console.debug('[RDP-CLIENT] onSessionEnd called')
+    this.session = null
+    this.setStatus(statusMap.error)
   }
 
-  onData = async (msg) => {
-    let { data } = msg
-    data = JSON.parse(data)
-    if (data.action === 'session-rdp-connected') {
-      return this.setState({
-        loading: false
-      })
-    }
+  setupInputHandlers = () => {
     const canvas = this.canvasRef.current
-    const ctx = canvas.getContext('2d')
-    const {
-      width,
-      height,
-      arr
-    } = this.output(data)
-    const imageData = ctx.createImageData(width, height)
-    imageData.data.set(arr)
-    ctx.putImageData(imageData, data.destLeft, data.destTop)
-  }
+    if (!canvas || this._inputHandlersSetup) return
+    this._inputHandlersSetup = true
+    console.debug('[RDP-CLIENT] Setting up input handlers')
+
+    canvas.addEventListener('keydown', (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      if (!this.session) return
+      const scancode = this.getScancode(e.code)
+      if (scancode === null) return
+      try {
+        const event = window.ironRdp.DeviceEvent.keyPressed(scancode)
+        const tx = new window.ironRdp.InputTransaction()
+        tx.addEvent(event)
+        this.session.applyInputs(tx)
+      } catch (err) {
+        console.error('[RDP-CLIENT] Key press error:', err)
+      }
+    })
 
-  onerrorSocket = err => {
-    this.setStatus(statusMap.error)
-    console.error('socket error', err)
+    canvas.addEventListener('keyup', (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      if (!this.session) return
+      const scancode = this.getScancode(e.code)
+      if (scancode === null) return
+      try {
+        const event = window.ironRdp.DeviceEvent.keyReleased(scancode)
+        const tx = new window.ironRdp.InputTransaction()
+        tx.addEvent(event)
+        this.session.applyInputs(tx)
+      } catch (err) {
+        console.error('[RDP-CLIENT] Key release error:', err)
+      }
+    })
+
+    canvas.addEventListener('mousemove', (e) => {
+      if (!this.session) return
+      try {
+        const rect = canvas.getBoundingClientRect()
+        const scaleX = canvas.width / rect.width
+        const scaleY = canvas.height / rect.height
+        const x = Math.round((e.clientX - rect.left) * scaleX)
+        const y = Math.round((e.clientY - rect.top) * scaleY)
+        const event = window.ironRdp.DeviceEvent.mouseMove(x, y)
+        const tx = new window.ironRdp.InputTransaction()
+        tx.addEvent(event)
+        this.session.applyInputs(tx)
+      } catch (err) {
+        // suppress frequent mouse errors
+      }
+    })
+
+    canvas.addEventListener('mousedown', (e) => {
+      e.preventDefault()
+      canvas.focus()
+      if (!this.session) return
+      try {
+        const event = window.ironRdp.DeviceEvent.mouseButtonPressed(e.button)
+        const tx = new window.ironRdp.InputTransaction()
+        tx.addEvent(event)
+        this.session.applyInputs(tx)
+      } catch (err) {
+        console.error('[RDP-CLIENT] Mouse down error:', err)
+      }
+    })
+
+    canvas.addEventListener('mouseup', (e) => {
+      e.preventDefault()
+      if (!this.session) return
+      try {
+        const event = window.ironRdp.DeviceEvent.mouseButtonReleased(e.button)
+        const tx = new window.ironRdp.InputTransaction()
+        tx.addEvent(event)
+        this.session.applyInputs(tx)
+      } catch (err) {
+        console.error('[RDP-CLIENT] Mouse up error:', err)
+      }
+    })
+
+    canvas.addEventListener('wheel', (e) => {
+      e.preventDefault()
+      if (!this.session) return
+      try {
+        if (e.deltaY !== 0) {
+          const amount = e.deltaY > 0 ? -1 : 1
+          const event = window.ironRdp.DeviceEvent.wheelRotations(true, amount, 1)
+          const tx = new window.ironRdp.InputTransaction()
+          tx.addEvent(event)
+          this.session.applyInputs(tx)
+        }
+        if (e.deltaX !== 0) {
+          const amount = e.deltaX > 0 ? -1 : 1
+          const event = window.ironRdp.DeviceEvent.wheelRotations(false, amount, 1)
+          const tx = new window.ironRdp.InputTransaction()
+          tx.addEvent(event)
+          this.session.applyInputs(tx)
+        }
+      } catch (err) {
+        console.error('[RDP-CLIENT] Wheel error:', err)
+      }
+    }, { passive: false })
+
+    canvas.addEventListener('contextmenu', (e) => e.preventDefault())
   }
 
-  closeMsg = () => {
-    notification.destroy(this.warningKey)
+  // Get PS/2 scancode from keyboard event code using existing code-scan module
+  getScancode = (code) => {
+    const sc = scanCode({ code })
+    return sc !== undefined ? sc : null
   }
 
-  handleClickClose = () => {
-    this.closeMsg()
-    this.handleReInit()
+  handleEditResolutions = () => {
+    window.store.toggleResolutionEdit()
   }
 
   handleReInit = () => {
-    this.socket.send(JSON.stringify({
-      action: 'reload',
-      params: [
-        this.state.width,
-        this.state.height
-      ]
-    }))
-    this.setState({
-      loading: true
-    })
+    console.debug('[RDP-CLIENT] handleReInit called')
+    this.cleanup()
+    this.props.reloadTab(
+      this.props.tab
+    )
   }
 
   handleReload = () => {
-    this.closeMsg()
     this.props.reloadTab(
       this.props.tab
     )
   }
 
-  handleEditResolutions = () => {
-    window.store.toggleResolutionEdit()
-  }
-
-  oncloseSocket = () => {
-    // this.setStatus(
-    //   statusMap.error
-    // )
-    // this.warningKey = `open${Date.now()}`
-    // notification.warning({
-    //   key: this.warningKey,
-    //   message: e('socketCloseTip'),
-    //   duration: 30,
-    //   description: (
-    //     <div className='pd2y'>
-    //       <Button
-    //         className='mg1r'
-    //         type='primary'
-    //         onClick={this.handleClickClose}
-    //       >
-    //         {m('close')}
-    //       </Button>
-    //       <Button
-    //         icon={<ReloadOutlined />}
-    //         onClick={this.handleReload}
-    //       >
-    //         {m('reload')}
-    //       </Button>
-    //     </div>
-    //   )
-    // })
-  }
-
   getAllRes = () => {
     return [
       ...this.props.resolutions,
@@ -389,6 +457,11 @@ export default class RdpSession extends PureComponent {
     )
   }
 
+  componentDidUpdate () {
+    // Set up native input handlers after canvas is rendered
+    this.setupInputHandlers()
+  }
+
   render () {
     const { width: w, height: h } = this.props
     const rdpProps = {
@@ -401,13 +474,6 @@ export default class RdpSession extends PureComponent {
     const canvasProps = {
       width,
       height,
-      onMouseDown: this.handleCanvasEvent,
-      onMouseUp: this.handleCanvasEvent,
-      onMouseMove: this.handleCanvasEvent,
-      onKeyDown: this.handleCanvasEvent,
-      onKeyUp: this.handleCanvasEvent,
-      onWheel: this.handleCanvasEvent,
-      onContextMenu: this.handleCanvasEvent,
       tabIndex: 0
     }
     return (

package/client/components/sftp/sftp.styl

@@ -167,7 +167,6 @@
 
 .sftp-has-pager
   .sftp-table-content
-    position static
     padding-bottom 42px
   .pager-wrap
     position absolute
@@ -175,6 +174,7 @@
     left 0
     width 100%
     background var(--main)
+    height 40px
     border-top 1px solid var(--main-darker)
 
 .file-header-context-menu

package/client/components/shortcuts/shortcut-handler.js

@@ -3,6 +3,87 @@ import shortcutsDefaultsGen from './shortcuts-defaults.js'
 import {
   isMacJs
 } from '../../common/constants'
+import keyControlPressed from '../../common/key-control-pressed.js'
+
+function sendInputData (ctx, data) {
+  if (!data) return
+  if (ctx.attachAddon && ctx.attachAddon._sendData) {
+    ctx.attachAddon._sendData(data)
+  }
+  // if (!ctx.onData) return
+  // if (splitChars) {
+  //   for (const ch of data) {
+  //     ctx.onData(ch)
+  //   }
+  //   return
+  // }
+  // ctx.onData(data)
+}
+
+function getSelectionReplaceInfo (term) {
+  if (!term || !term.hasSelection()) return null
+  if (term.buffer?.active?.type === 'alternate') return null
+  const getPos = term.getSelectionPosition?.bind(term)
+  if (!getPos) return null
+  const pos = getPos()
+  if (!pos || !pos.start || !pos.end) return null
+  const buffer = term.buffer.active
+  const cursorY = buffer.cursorY
+  if (pos.start.y !== cursorY || pos.end.y !== cursorY) return null
+  const startX = Math.min(pos.start.x, pos.end.x)
+  const endX = Math.max(pos.start.x, pos.end.x)
+  if (startX === endX) return null
+  return {
+    startX,
+    endX,
+    cursorX: buffer.cursorX
+  }
+}
+
+export function handleTerminalSelectionReplace (event, ctx) {
+  if (
+    !ctx.term ||
+    !ctx.term.hasSelection() ||
+    keyControlPressed(event)
+  ) {
+    return false
+  }
+  const { key } = event
+  const isBackspace = key === 'Backspace'
+  const isDelete = key === 'Delete'
+  const isPrintable = key && key.length === 1
+  if (!isBackspace && !isDelete && !isPrintable) return false
+
+  if (event && event.preventDefault) {
+    event.preventDefault()
+  }
+  if (event && event.stopPropagation) {
+    event.stopPropagation()
+  }
+
+  const info = getSelectionReplaceInfo(ctx.term)
+  if (!info) return false
+
+  const { startX, endX, cursorX } = info
+  const move = startX - cursorX
+  if (move > 0) {
+    sendInputData(ctx, '\x1b[C'.repeat(move))
+  } else if (move < 0) {
+    sendInputData(ctx, '\x1b[D'.repeat(-move))
+  }
+
+  const delCount = endX - startX
+  if (delCount > 0) {
+    sendInputData(ctx, '\x1b[3~'.repeat(delCount))
+  }
+
+  if (isPrintable) {
+    sendInputData(ctx, key)
+  }
+
+  ctx.term.clearSelection()
+  return true
+}
 
 function buildConfig (config, filter = d => d) {
   const defs = shortcutsDefaultsGen().filter(filter)
@@ -65,6 +146,9 @@ export function shortcutExtend (Cls) {
     if (isInAntdInput()) {
       return
     }
+    if (handleTerminalSelectionReplace(event, this)) {
+      return false
+    }
     if (
       this.term &&
       key === 'Backspace' &&

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

@@ -1,38 +1,11 @@
-import InputNumberConfirm from '../common/input-number-confirm'
-import {
-  Space
-} from 'antd'
-import {
-  MinusCircleOutlined,
-  PlusCircleOutlined
-} from '@ant-design/icons'
+import ZoomControl from '../common/zoom-control'
 
 export default function ZoomMenu (props) {
   const { store } = window
-  const handleChange = (v) => {
-    store.zoom(v / 100)
-  }
-
   return (
-    <InputNumberConfirm
-      value={parseInt(props.config.zoom * 100, 10)}
-      onChange={handleChange}
-      step={1}
-      min={25}
-      max={500}
-      suffix='%'
-      addonBefore={
-        <Space.Addon>
-          <PlusCircleOutlined
-            onClick={() => store.zoom(0.25, true)}
-            className='mg1r pointer font16'
-          />
-          <MinusCircleOutlined
-            onClick={() => store.zoom(-0.25, true)}
-            className='pointer font16'
-          />
-        </Space.Addon>
-      }
+    <ZoomControl
+      value={props.config.zoom}
+      onChange={(v) => store.zoom(v)}
     />
   )
 }

package/client/components/terminal/terminal.jsx

@@ -971,64 +971,70 @@ class Term extends Component {
       ?.openSuggestions(cursorPos, data)
   }
 
+  /**
+   * Read current input directly from terminal buffer
+   * This is more reliable than tracking character-by-character
+   */
   getCurrentInput = () => {
-    return this.currentInput
+    if (!this.term) return ''
+
+    const buffer = this.term.buffer.active
+    const cursorY = buffer.cursorY
+    const cursorX = buffer.cursorX
+
+    // Get the current line from buffer (baseY + cursorY gives absolute position)
+    const absoluteY = buffer.baseY + cursorY
+    const line = buffer.getLine(absoluteY)
+    if (!line) return ''
+
+    // Get text from start of line up to cursor position
+    const lineText = line.translateToString(true, 0, cursorX)
+
+    // Try to extract command after prompt
+    // Common prompt endings with trailing space
+    const promptEndings = ['$ ', '# ', '> ', '% ', '] ', ') ']
+
+    let commandStart = 0
+    for (const ending of promptEndings) {
+      const idx = lineText.lastIndexOf(ending)
+      if (idx !== -1 && idx + ending.length > commandStart) {
+        commandStart = idx + ending.length
+      }
+    }
+
+    return lineText.slice(commandStart)
   }
 
   setCurrentInput = (value) => {
     this.currentInput = value
   }
 
-  updateCurrentInput = (d) => {
-    // Handle backspace (both \x7f and \b)
-    if (d === '\x7f' || d === '\b') {
-      this.currentInput = this.currentInput.slice(0, -1)
-      return
-    }
-    // Handle Ctrl+U (clear line)
-    if (d === '\x15') {
-      this.currentInput = ''
-      return
-    }
-    // Handle Ctrl+W (delete word)
-    if (d === '\x17') {
-      this.currentInput = this.currentInput.replace(/\S*\s*$/, '')
-      return
-    }
-    // Handle Ctrl+C (cancel)
-    if (d === '\x03') {
-      this.currentInput = ''
-      return
-    }
-    // Handle Enter
+  /**
+   * Handle special input events for command history tracking
+   * The actual input reading is done via getCurrentInput from buffer
+   */
+  handleInputEvent = (d) => {
+    // Handle Enter - add command to history
     if (d === '\r' || d === '\n') {
-      // Add to manual command history if shell integration is not available
-      if (this.currentInput.trim() && this.shouldUseManualHistory()) {
-        this.manualCommandHistory.add(this.currentInput.trim())
-        // Also add to global history for suggestions
-        window.store.addCmdHistory(this.currentInput.trim())
+      const currentCmd = this.getCurrentInput()
+      if (currentCmd && currentCmd.trim() && this.shouldUseManualHistory()) {
+        this.manualCommandHistory.add(currentCmd.trim())
+        window.store.addCmdHistory(currentCmd.trim())
       }
-      this.currentInput = ''
-      return
-    }
-    // Handle Escape and other control characters
-    if (d.charCodeAt(0) < 32 && d !== '\t') {
-      return
-    }
-    // Handle arrow keys and other escape sequences
-    if (d.startsWith('\x1b')) {
-      return
+      this.closeSuggestions()
     }
-    // Regular character input - append to buffer
-    this.currentInput += d
   }
 
   onData = (d) => {
-    this.updateCurrentInput(d)
-    const data = this.getCurrentInput()
-    if (this.props.config.showCmdSuggestions && data) {
-      const cursorPos = this.getCursorPosition()
-      this.openSuggestions(cursorPos, data)
+    this.handleInputEvent(d)
+    if (this.props.config.showCmdSuggestions) {
+      const data = this.getCurrentInput()
+      if (data && d !== '\r' && d !== '\n') {
+        const cursorPos = this.getCursorPosition()
+        this.openSuggestions(cursorPos, data)
+      } else {
+        this.closeSuggestions()
+      }
     } else {
       this.closeSuggestions()
     }

package/client/components/web/address-bar.jsx

@@ -1,12 +1,16 @@
 import {
   Input,
-  Tooltip
+  Tooltip,
+  Dropdown,
+  Space
 } from 'antd'
 import { copy } from '../../common/clipboard'
 import {
   ReloadOutlined,
-  GlobalOutlined
+  GlobalOutlined,
+  EllipsisOutlined
 } from '@ant-design/icons'
+import ZoomControl from '../common/zoom-control'
 
 export default function AddressBar (props) {
   const {
@@ -14,7 +18,9 @@ export default function AddressBar (props) {
     onReload,
     onOpen,
     title,
-    description
+    description,
+    zoom,
+    onZoom
   } = props
   const content = (
     <>
@@ -25,6 +31,19 @@ export default function AddressBar (props) {
   function handleClick () {
     copy(url)
   }
+  const items = [
+    {
+      key: 'zoom',
+      label: (
+        <div onClick={e => e.stopPropagation()}>
+          <ZoomControl
+            value={zoom}
+            onChange={onZoom}
+          />
+        </div>
+      )
+    }
+  ]
   return (
     <div className='web-address-bar pd1'>
       <Tooltip
@@ -39,9 +58,19 @@ export default function AddressBar (props) {
             />
           }
           suffix={
-            <GlobalOutlined
-              onClick={onOpen}
-            />
+            <Space>
+              <GlobalOutlined
+                className='pointer'
+                onClick={onOpen}
+                title={window.translate('openInDefaultBrowser')}
+              />
+              <Dropdown
+                menu={{ items }}
+                trigger={['click']}
+              >
+                <EllipsisOutlined className='pointer' />
+              </Dropdown>
+            </Space>
           }
         />
       </Tooltip>

package/client/components/web/web-auth-modal.jsx

@@ -0,0 +1,69 @@
+import React, { useState, useCallback } from 'react'
+import { Input, Button } from 'antd'
+import Modal from '../common/modal'
+
+export default function WebAuthModal ({ authRequest, onAuthSubmit, onAuthCancel }) {
+  const [username, setUsername] = useState('')
+  const [password, setPassword] = useState('')
+
+  const handleSubmit = useCallback(() => {
+    onAuthSubmit(username, password)
+    setUsername('')
+    setPassword('')
+  }, [onAuthSubmit, username, password])
+
+  const handleCancel = useCallback(() => {
+    onAuthCancel()
+    setUsername('')
+    setPassword('')
+  }, [onAuthCancel])
+
+  return (
+    <Modal
+      open={!!authRequest}
+      title='Authentication Required'
+      width={400}
+      onCancel={handleCancel}
+      footer={null}
+    >
+      <div className='pd1y'>
+        <p>
+          <b>{authRequest?.host}</b> requires authentication
+          {authRequest?.realm ? ` (${authRequest.realm})` : ''}
+        </p>
+        <div className='pd1b'>
+          <div className='pd1b'>Username</div>
+          <Input
+            value={username}
+            onChange={e => setUsername(e.target.value)}
+            placeholder='Username'
+            autoFocus
+          />
+        </div>
+        <div className='pd1b'>
+          <div className='pd1b'>Password</div>
+          <Input.Password
+            value={password}
+            onChange={e => setPassword(e.target.value)}
+            placeholder='Password'
+            onPressEnter={handleSubmit}
+          />
+        </div>
+        <div className='pd1t alignright'>
+          <Button
+            className='mg1r'
+            onClick={handleCancel}
+          >
+            Cancel
+          </Button>
+          <Button
+            type='primary'
+            onClick={handleSubmit}
+          >
+            Login
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  )
+}

package/client/components/web/web-session.jsx

@@ -1,5 +1,6 @@
 import AddressBar from './address-bar'
-// import React, { useEffect } from 'react'
+import WebAuthModal from './web-auth-modal'
+import React, { useState, useRef, useEffect, useCallback } from 'react'
 
 export default function WebSession (props) {
   const {
@@ -8,6 +9,9 @@ export default function WebSession (props) {
     height,
     reloadTab
   } = props
+  const [zoom, setZoom] = useState(1.0)
+  const [authRequest, setAuthRequest] = useState(null)
+  const webviewRef = useRef(null)
   const urlRegex = /^[a-z\d.+-]+:\/\/[^\s/$.?#].[^\s]*$/i
 
   const { url = '' } = tab
@@ -15,6 +19,8 @@ export default function WebSession (props) {
     url,
     title: tab.title,
     description: tab.description,
+    zoom,
+    onZoom: handleZoom,
     onOpen: () => {
       window.openLink(tab.url)
     },
@@ -25,6 +31,50 @@ export default function WebSession (props) {
     }
   }
 
+  function handleZoom (v) {
+    setZoom(v)
+    const el = webviewRef.current
+    if (!el) {
+      return
+    }
+    if (el.setZoomFactor) {
+      el.setZoomFactor(v)
+    } else {
+      el.style.zoom = v
+    }
+  }
+
+  // Handle HTTP Basic Auth requests from webview
+  useEffect(() => {
+    if (!window.api || !window.api.onWebviewAuthRequest) {
+      return
+    }
+    const removeListener = window.api.onWebviewAuthRequest((data) => {
+      setAuthRequest(data)
+    })
+    return removeListener
+  }, [])
+
+  const handleAuthSubmit = useCallback((username, password) => {
+    if (!authRequest) return
+    window.api.sendWebviewAuthResponse({
+      id: authRequest.id,
+      username,
+      password
+    })
+    setAuthRequest(null)
+  }, [authRequest])
+
+  const handleAuthCancel = useCallback(() => {
+    if (!authRequest) return
+    window.api.sendWebviewAuthResponse({
+      id: authRequest.id,
+      username: '',
+      password: ''
+    })
+    setAuthRequest(null)
+  }, [authRequest])
+
   // TODO: 支持自定义Header和Cookie
   // useEffect(() => {
   //   const webview = document.querySelector('webview')
@@ -64,14 +114,15 @@ export default function WebSession (props) {
         }
       }
       return (
-        <iframe {...iframeProps} />
+        <iframe {...iframeProps} ref={webviewRef} />
       )
     }
     const viewProps = {
       src: url,
       style: {
         width: (width - 10) + 'px',
-        height: (height + hOffset) + 'px'
+        height: (height + hOffset) + 'px',
+        background: '#fff'
       },
       disableblinkfeatures: 'true',
       disablewebsecurity: 'true',
@@ -79,7 +130,7 @@ export default function WebSession (props) {
       useragent: tab.useragent || 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36'
     }
     return (
-      <webview {...viewProps} />
+      <webview {...viewProps} ref={webviewRef} />
     )
   }
 
@@ -91,6 +142,11 @@ export default function WebSession (props) {
       <div className='pd1'>
         {renderView()}
       </div>
+      <WebAuthModal
+        authRequest={authRequest}
+        onAuthSubmit={handleAuthSubmit}
+        onAuthCancel={handleAuthCancel}
+      />
     </div>
   )
 }

package/client/views/index.pug

@@ -47,7 +47,6 @@ html
         img.iblock.logo-filter(src='images/electerm.png', alt='', height=80)
     script.
       window.et = !{JSON.stringify(_global)}
-    - var url1 = '/src/client/entry/rle.js'
     - var url = '/src/client/entry/basic.js'
     - if (isDev)
       //- script(src='/external/react.development.js?' + version)
@@ -65,7 +64,6 @@ html
       //- script(src='/external/react.production.min.js?' + version)
       //- script(src='/external/react-dom.production.min.js?' + version)
       - var url = src='/js/basic-' + version + '.js'
-      - var url1 = src='/js/rle-' + version + '.js'
       script(src=url1, type='module')
       script(src=url, type='module')
 

package/package.json

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

package/client/entry/rle.js

@@ -1,2 +0,0 @@
-// This file and rle.wasm is generated by [**Emscripten**](https://github.com/kripken/emscripten) from [rle.c](https://raw.githubusercontent.com/citronneur/mstsc.js/master/obj/rle.c)
-var Module=typeof Module!="undefined"?Module:{};window.Module=Module;var ENVIRONMENT_IS_WEB=typeof window=="object";var ENVIRONMENT_IS_WORKER=typeof importScripts=="function";var ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof process.versions=="object"&&typeof process.versions.node=="string";if(ENVIRONMENT_IS_NODE){}var moduleOverrides=Object.assign({},Module);var arguments_=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var read_,readAsync,readBinary;if(ENVIRONMENT_IS_NODE){var fs=require("fs");var nodePath=require("path");scriptDirectory=__dirname+"/";read_=(filename,binary)=>{filename=isFileURI(filename)?new URL(filename):nodePath.normalize(filename);return fs.readFileSync(filename,binary?undefined:"utf8")};readBinary=filename=>{var ret=read_(filename,true);if(!ret.buffer){ret=new Uint8Array(ret)}return ret};readAsync=(filename,onload,onerror,binary=true)=>{filename=isFileURI(filename)?new URL(filename):nodePath.normalize(filename);fs.readFile(filename,binary?undefined:"utf8",(err,data)=>{if(err)onerror(err);else onload(binary?data.buffer:data)})};if(!Module["thisProgram"]&&process.argv.length>1){thisProgram=process.argv[1].replace(/\\/g,"/")}arguments_=process.argv.slice(2);if(typeof module!="undefined"){module["exports"]=Module}process.on("uncaughtException",ex=>{if(ex!=="unwind"&&!(ex instanceof ExitStatus)&&!(ex.context instanceof ExitStatus)){throw ex}});quit_=(status,toThrow)=>{process.exitCode=status;throw toThrow}}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(ENVIRONMENT_IS_WORKER){scriptDirectory=self.location.href}else if(typeof document!="undefined"&&document.currentScript){scriptDirectory=document.currentScript.src}if(scriptDirectory.startsWith("blob:")){scriptDirectory=""}else{scriptDirectory=scriptDirectory.substr(0,scriptDirectory.replace(/[?#].*/,"").lastIndexOf("/")+1)}{read_=url=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText};if(ENVIRONMENT_IS_WORKER){readBinary=url=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)}}readAsync=(url,onload,onerror)=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,true);xhr.responseType="arraybuffer";xhr.onload=()=>{if(xhr.status==200||xhr.status==0&&xhr.response){onload(xhr.response);return}onerror()};xhr.onerror=onerror;xhr.send(null)}}}else{}var out=Module["print"]||console.log.bind(console);var err=Module["printErr"]||console.error.bind(console);Object.assign(Module,moduleOverrides);moduleOverrides=null;if(Module["arguments"])arguments_=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];if(Module["quit"])quit_=Module["quit"];var wasmBinary;if(Module["wasmBinary"])wasmBinary=Module["wasmBinary"];var wasmMemory;var ABORT=false;var EXITSTATUS;var HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateMemoryViews(){var b=wasmMemory.buffer;Module["HEAP8"]=HEAP8=new Int8Array(b);Module["HEAP16"]=HEAP16=new Int16Array(b);Module["HEAPU8"]=HEAPU8=new Uint8Array(b);Module["HEAPU16"]=HEAPU16=new Uint16Array(b);Module["HEAP32"]=HEAP32=new Int32Array(b);Module["HEAPU32"]=HEAPU32=new Uint32Array(b);Module["HEAPF32"]=HEAPF32=new Float32Array(b);Module["HEAPF64"]=HEAPF64=new Float64Array(b)}var __ATPRERUN__=[];var __ATINIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function initRuntime(){runtimeInitialized=true;callRuntimeCallbacks(__ATINIT__)}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}function addOnInit(cb){__ATINIT__.unshift(cb)}function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function addRunDependency(id){runDependencies++;Module["monitorRunDependencies"]?.(runDependencies)}function removeRunDependency(id){runDependencies--;Module["monitorRunDependencies"]?.(runDependencies);if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}function abort(what){Module["onAbort"]?.(what);what="Aborted("+what+")";err(what);ABORT=true;EXITSTATUS=1;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);throw e}var dataURIPrefix="data:application/octet-stream;base64,";var isDataURI=filename=>filename.startsWith(dataURIPrefix);var isFileURI=filename=>filename.startsWith("file://");function findWasmBinary(){var f="rle.wasm";if(!isDataURI(f)){return locateFile(f)}return f}var wasmBinaryFile;function getBinarySync(file){if(file==wasmBinaryFile&&wasmBinary){return new Uint8Array(wasmBinary)}if(readBinary){return readBinary(file)}throw"both async and sync fetching of the wasm failed"}function getBinaryPromise(binaryFile){if(!wasmBinary&&(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER)){if(typeof fetch=="function"&&!isFileURI(binaryFile)){return fetch(binaryFile,{credentials:"same-origin"}).then(response=>{if(!response["ok"]){throw`failed to load wasm binary file at '${binaryFile}'`}return response["arrayBuffer"]()}).catch(()=>getBinarySync(binaryFile))}else if(readAsync){return new Promise((resolve,reject)=>{readAsync(binaryFile,response=>resolve(new Uint8Array(response)),reject)})}}return Promise.resolve().then(()=>getBinarySync(binaryFile))}function instantiateArrayBuffer(binaryFile,imports,receiver){return getBinaryPromise(binaryFile).then(binary=>WebAssembly.instantiate(binary,imports)).then(receiver,reason=>{err(`failed to asynchronously prepare wasm: ${reason}`);abort(reason)})}function instantiateAsync(binary,binaryFile,imports,callback){if(!binary&&typeof WebAssembly.instantiateStreaming=="function"&&!isDataURI(binaryFile)&&!isFileURI(binaryFile)&&!ENVIRONMENT_IS_NODE&&typeof fetch=="function"){return fetch(binaryFile,{credentials:"same-origin"}).then(response=>{var result=WebAssembly.instantiateStreaming(response,imports);return result.then(callback,function(reason){err(`wasm streaming compile failed: ${reason}`);err("falling back to ArrayBuffer instantiation");return instantiateArrayBuffer(binaryFile,imports,callback)})})}return instantiateArrayBuffer(binaryFile,imports,callback)}function getWasmImports(){return{"a":wasmImports}}function createWasm(){var info=getWasmImports();function receiveInstance(instance,module){wasmExports=instance.exports;wasmMemory=wasmExports["b"];updateMemoryViews();addOnInit(wasmExports["c"]);removeRunDependency("wasm-instantiate");return wasmExports}addRunDependency("wasm-instantiate");function receiveInstantiationResult(result){receiveInstance(result["instance"])}if(Module["instantiateWasm"]){try{return Module["instantiateWasm"](info,receiveInstance)}catch(e){err(`Module.instantiateWasm callback failed with error: ${e}`);return false}}if(!wasmBinaryFile)wasmBinaryFile=findWasmBinary();instantiateAsync(wasmBinary,wasmBinaryFile,info,receiveInstantiationResult);return{}}function ExitStatus(status){this.name="ExitStatus";this.message=`Program terminated with exit(${status})`;this.status=status}var callRuntimeCallbacks=callbacks=>{while(callbacks.length>0){callbacks.shift()(Module)}};var noExitRuntime=Module["noExitRuntime"]||true;var stackRestore=val=>__emscripten_stack_restore(val);var stackSave=()=>_emscripten_stack_get_current();var abortOnCannotGrowMemory=requestedSize=>{abort("OOM")};var _emscripten_resize_heap=requestedSize=>{var oldSize=HEAPU8.length;requestedSize>>>=0;abortOnCannotGrowMemory(requestedSize)};var getCFunc=ident=>{var func=Module["_"+ident];return func};var writeArrayToMemory=(array,buffer)=>{HEAP8.set(array,buffer)};var lengthBytesUTF8=str=>{var len=0;for(var i=0;i<str.length;++i){var c=str.charCodeAt(i);if(c<=127){len++}else if(c<=2047){len+=2}else if(c>=55296&&c<=57343){len+=4;++i}else{len+=3}}return len};var stringToUTF8Array=(str,heap,outIdx,maxBytesToWrite)=>{if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.charCodeAt(i);if(u>=55296&&u<=57343){var u1=str.charCodeAt(++i);u=65536+((u&1023)<<10)|u1&1023}if(u<=127){if(outIdx>=endIdx)break;heap[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;heap[outIdx++]=192|u>>6;heap[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;heap[outIdx++]=224|u>>12;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}else{if(outIdx+3>=endIdx)break;heap[outIdx++]=240|u>>18;heap[outIdx++]=128|u>>12&63;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}}heap[outIdx]=0;return outIdx-startIdx};var stringToUTF8=(str,outPtr,maxBytesToWrite)=>stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite);var stackAlloc=sz=>__emscripten_stack_alloc(sz);var stringToUTF8OnStack=str=>{var size=lengthBytesUTF8(str)+1;var ret=stackAlloc(size);stringToUTF8(str,ret,size);return ret};var UTF8Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf8"):undefined;var UTF8ArrayToString=(heapOrArray,idx,maxBytesToRead)=>{var endIdx=idx+maxBytesToRead;var endPtr=idx;while(heapOrArray[endPtr]&&!(endPtr>=endIdx))++endPtr;if(endPtr-idx>16&&heapOrArray.buffer&&UTF8Decoder){return UTF8Decoder.decode(heapOrArray.subarray(idx,endPtr))}var str="";while(idx<endPtr){var u0=heapOrArray[idx++];if(!(u0&128)){str+=String.fromCharCode(u0);continue}var u1=heapOrArray[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}var u2=heapOrArray[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u0=(u0&7)<<18|u1<<12|u2<<6|heapOrArray[idx++]&63}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}return str};var UTF8ToString=(ptr,maxBytesToRead)=>ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead):"";var ccall=(ident,returnType,argTypes,args,opts)=>{var toC={"string":str=>{var ret=0;if(str!==null&&str!==undefined&&str!==0){ret=stringToUTF8OnStack(str)}return ret},"array":arr=>{var ret=stackAlloc(arr.length);writeArrayToMemory(arr,ret);return ret}};function convertReturnValue(ret){if(returnType==="string"){return UTF8ToString(ret)}if(returnType==="boolean")return Boolean(ret);return ret}var func=getCFunc(ident);var cArgs=[];var stack=0;if(args){for(var i=0;i<args.length;i++){var converter=toC[argTypes[i]];if(converter){if(stack===0)stack=stackSave();cArgs[i]=converter(args[i])}else{cArgs[i]=args[i]}}}var ret=func(...cArgs);function onDone(ret){if(stack!==0)stackRestore(stack);return convertReturnValue(ret)}ret=onDone(ret);return ret};var wasmImports={a:_emscripten_resize_heap};var wasmExports=createWasm();var ___wasm_call_ctors=()=>(___wasm_call_ctors=wasmExports["c"])();var _bitmap_decompress_15=Module["_bitmap_decompress_15"]=(a0,a1,a2,a3,a4,a5,a6)=>(_bitmap_decompress_15=Module["_bitmap_decompress_15"]=wasmExports["d"])(a0,a1,a2,a3,a4,a5,a6);var _malloc=Module["_malloc"]=a0=>(_malloc=Module["_malloc"]=wasmExports["e"])(a0);var _free=Module["_free"]=a0=>(_free=Module["_free"]=wasmExports["f"])(a0);var _bitmap_decompress_16=Module["_bitmap_decompress_16"]=(a0,a1,a2,a3,a4,a5,a6)=>(_bitmap_decompress_16=Module["_bitmap_decompress_16"]=wasmExports["g"])(a0,a1,a2,a3,a4,a5,a6);var _bitmap_decompress_24=Module["_bitmap_decompress_24"]=(a0,a1,a2,a3,a4,a5,a6)=>(_bitmap_decompress_24=Module["_bitmap_decompress_24"]=wasmExports["h"])(a0,a1,a2,a3,a4,a5,a6);var _bitmap_decompress_32=Module["_bitmap_decompress_32"]=(a0,a1,a2,a3,a4,a5,a6)=>(_bitmap_decompress_32=Module["_bitmap_decompress_32"]=wasmExports["i"])(a0,a1,a2,a3,a4,a5,a6);var __emscripten_stack_restore=a0=>(__emscripten_stack_restore=wasmExports["k"])(a0);var __emscripten_stack_alloc=a0=>(__emscripten_stack_alloc=wasmExports["l"])(a0);var _emscripten_stack_get_current=()=>(_emscripten_stack_get_current=wasmExports["m"])();Module["ccall"]=ccall;var calledRun;dependenciesFulfilled=function runCaller(){if(!calledRun)run();if(!calledRun)dependenciesFulfilled=runCaller};function run(){if(runDependencies>0){return}preRun();if(runDependencies>0){return}function doRun(){if(calledRun)return;calledRun=true;Module["calledRun"]=true;if(ABORT)return;initRuntime();if(Module["onRuntimeInitialized"])Module["onRuntimeInitialized"]();postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout(function(){setTimeout(function(){Module["setStatus"]("")},1);doRun()},1)}else{doRun()}}if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].pop()()}}run();