@electerm/electerm-react 3.15.36 → 3.15.38

package/client/components/bookmark-form/index.jsx

@@ -90,6 +90,9 @@ export default class BookmarkIndex2 extends PureComponent {
 
   renderTypes (bookmarkType, isNew, keys) {
     if (!isNew || this.state.aiMode) return null
+    const filtered = window.et && Array.isArray(window.et.supportSessionTypes)
+      ? keys.filter(k => window.et.supportSessionTypes.includes(k))
+      : keys
     return (
       <Radio.Group
         buttonStyle='solid'
@@ -99,7 +102,7 @@ export default class BookmarkIndex2 extends PureComponent {
         disabled={!isNew}
         onChange={this.handleChange}
       >
-        {keys.map(v => {
+        {filtered.map(v => {
           const txt = v === 'ssh' ? 'Ssh/Sftp' : e(v)
           return (<Radio.Button key={v} value={v}>{txt}</Radio.Button>)
         })}

package/client/components/terminal/terminal.jsx

@@ -1356,7 +1356,7 @@ class Term extends Component {
         id
       )
     }
-    return `ws://${host}:${port}/terminals/${id}`
+    return `ws://${host}:${port}/terminals/${id}?token=${tokenElecterm}`
   }
 
   remoteInit = async (term = this.term) => {
@@ -1448,7 +1448,7 @@ class Term extends Component {
     if (this.onClose) {
       if (r && r.port) {
         try {
-          const tmpSock = new WebSocket(this.buildWsUrl(r.port), [this.props.config.tokenElecterm])
+          const tmpSock = new WebSocket(this.buildWsUrl(r.port))
           tmpSock.onopen = () => tmpSock.close()
         } catch (_e) {}
       }
@@ -1477,7 +1477,7 @@ class Term extends Component {
     term.pid = id
     this.pid = id
     const wsUrl = this.buildWsUrl(r.port)
-    const socket = new WebSocket(wsUrl, [this.props.config.tokenElecterm])
+    const socket = new WebSocket(wsUrl)
     socket.onclose = this.oncloseSocket
     socket.onerror = this.onerrorSocket
     this.socket = socket

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

@@ -96,7 +96,7 @@ export default class VncSession extends PureComponent {
         extra
       )
     }
-    return `ws://${host}:${port}/${type}/${id}${extra}`
+    return `ws://${host}:${port}/${type}/${id}?token=${tokenElecterm}${extra}`
   }
 
   getControlProps = (options = {}) => {
@@ -226,7 +226,7 @@ export default class VncSession extends PureComponent {
     }
 
     const { width, height } = this.calcCanvasSize()
-    const wsUrl = this.buildWsUrl(port, 'vnc', `?width=${width}&height=${height}`)
+    const wsUrl = this.buildWsUrl(port, 'vnc', `&width=${width}&height=${height}`)
     // When scaleViewport is false, we don't set fixed dimensions on the canvas
     // so it can render at the actual remote screen size
     const vncOpts = {
@@ -243,8 +243,7 @@ export default class VncSession extends PureComponent {
             overflow: 'hidden'
           }
         : {},
-      credentials: {},
-      wsProtocols: [this.props.config.tokenElecterm]
+      credentials: {}
     }
     if (username) {
       vncOpts.credentials.username = username

package/client/entry/basic.js

@@ -0,0 +1,62 @@
+/**
+ * init app data then write main script to html body
+ */
+import '../css/basic.styl'
+import '../css/mobile.styl'
+import { get as _get } from 'lodash-es'
+import '../common/pre'
+
+const { isDev } = window.et
+const { version } = window.pre.packInfo
+
+async function loadWorker () {
+  return new Promise((resolve) => {
+    const url = !isDev ? `js/worker-${version}.js` : 'js/worker.js'
+    window.worker = new window.Worker(url)
+    function onInit (e) {
+      if (!e || !e.data) {
+        return false
+      }
+      const {
+        action
+      } = e.data
+      if (action === 'worker-init') {
+        window.worker.removeEventListener('message', onInit)
+        resolve(1)
+      }
+    }
+    window.worker.addEventListener('message', onInit)
+  })
+}
+
+async function load () {
+  window.capitalizeFirstLetter = (string) => {
+    return string.charAt(0).toUpperCase() + string.slice(1)
+  }
+  function loadScript () {
+    const rcs = document.createElement('script')
+    const url = !isDev ? `js/electerm-${version}.js` : 'js/electerm.js'
+    rcs.src = url
+    rcs.type = 'module'
+    rcs.onload = () => {
+      const loadingEl = document.getElementById('content-loading')
+      if (loadingEl) {
+        document.body.removeChild(loadingEl)
+      }
+    }
+    document.body.appendChild(rcs)
+  }
+  window.getLang = (lang = window.store?.config.language || 'en_us') => {
+    return _get(window.langMap, `[${lang}].lang`)
+  }
+  window.translate = txt => {
+    const lang = window.getLang()
+    const str = _get(lang, `[${txt}]`) || txt
+    return window.capitalizeFirstLetter(str)
+  }
+  await loadWorker()
+  loadScript()
+}
+
+// window.addEventListener('load', load)
+load()

package/client/entry/electerm.jsx

@@ -0,0 +1,9 @@
+import { createRoot } from 'react-dom/client'
+import 'antd/dist/reset.css'
+import '@fontsource/maple-mono/index.css'
+import Main from '../components/main/index.jsx'
+
+const rootElement = createRoot(document.getElementById('container'))
+rootElement.render(
+  <Main />
+)

package/client/entry/worker.js

@@ -0,0 +1,146 @@
+/**
+ * web worker
+ */
+
+self.insts = {}
+
+function createWs (
+  type,
+  id,
+  sftpId = '',
+  config
+) {
+  // init gloabl ws
+  const { host, port, tokenElecterm } = config
+  const wsUrl = `ws://${host}:${port}/${type}/${id}?&sftpId=${sftpId}&token=${tokenElecterm}`
+  const ws = new WebSocket(wsUrl)
+  ws.s = msg => {
+    try {
+      ws.send(JSON.stringify(msg))
+    } catch (e) {
+      console.error('ws send error', e)
+    }
+  }
+  ws.id = id
+  ws.once = (callack, id) => {
+    const func = (evt) => {
+      const arg = JSON.parse(evt.data)
+      if (id === arg.id) {
+        callack(arg)
+        ws.removeEventListener('message', func)
+      }
+    }
+    ws.addEventListener('message', func)
+  }
+  ws.onclose = () => {
+    if (ws.dup) {
+      return
+    }
+    send({
+      id: ws.id,
+      action: 'close'
+    })
+    delete self.insts[ws.id]
+  }
+  return new Promise((resolve) => {
+    ws.onopen = () => {
+      if (self.insts[ws.id]) {
+        ws.dup = true
+        ws.close()
+        resolve(null)
+      } else {
+        resolve(ws)
+      }
+    }
+  })
+}
+
+function send (data) {
+  self.postMessage(data)
+}
+
+async function onMsg (e) {
+  const {
+    id,
+    wsId,
+    args,
+    action,
+    type,
+    persist
+  } = e.data
+  if (action === 'create') {
+    const inst = self.insts[id]
+    if (inst instanceof WebSocket) {
+      return send({
+        action,
+        id,
+        persist
+      }, '*')
+    } else if (inst) {
+      return false
+    } else {
+      const ws = await createWs(...args)
+      if (ws) {
+        self.insts[id] = ws
+      }
+    }
+    send({
+      action,
+      persist,
+      id
+    }, '*')
+  } else if (action === 'once') {
+    const ws = self.insts[wsId]
+    if (ws) {
+      const cb = (data) => {
+        send({
+          id,
+          wsId,
+          data
+        })
+      }
+      ws.once(cb, id)
+    }
+  } else if (action === 'close') {
+    const ws = self.insts[wsId]
+    if (ws) {
+      ws.close()
+    }
+  } else if (action === 's') {
+    const ws = self.insts[wsId]
+    if (ws) {
+      ws.s(...args)
+    }
+  } else if (action === 'addEventListener') {
+    const ws = self.insts[wsId]
+    if (ws) {
+      if (!ws.cbs) {
+        ws.cbs = {}
+      }
+      const cb = (e) => {
+        send({
+          wsId,
+          id,
+          data: {
+            data: e.data
+          }
+        })
+      }
+      ws.cbs[id] = cb
+      ws.addEventListener(type, cb)
+    }
+  } else if (action === 'removeEventListener') {
+    const ws = self.insts[wsId]
+    if (ws && ws.cbs && ws.cbs[id]) {
+      ws.removeEventListener(type, ws.cbs[id])
+      delete ws.cbs[id]
+    }
+  }
+}
+
+self.addEventListener('message', onMsg)
+setTimeout(() => {
+  send({
+    action: 'worker-init'
+  })
+}, 10)

package/client/store/tab.js

@@ -333,6 +333,9 @@ export default Store => {
       !newTab.host &&
       !window.store.hasNodePty
     ) {
+      if (window.et.isWebApp) {
+        return
+      }
       return message.warning(
         'local terminal is not supported, due to node-pty not working in this build'
       )

package/package.json

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