@electerm/electerm-react 1.60.16 → 1.60.18

package/client/components/terminal/index.jsx

@@ -1110,6 +1110,22 @@ clear\r`
     this.bufferMode = buf.type
   }
 
+  buildWsUrl = () => {
+    const { host, port, tokenElecterm } = this.props.config
+    const { id } = this.props.tab
+    if (window.et.buildWsUrl) {
+      return window.et.buildWsUrl(
+        host,
+        port,
+        tokenElecterm,
+        id,
+        this.props.sessionId
+      )
+    }
+    const wsUrl = `ws://${host}:${port}/terminals/${id}?sessionId=${this.props.sessionId}&token=${tokenElecterm}`
+    return wsUrl
+  }
+
   remoteInit = async (term = this.term) => {
     this.setState({
       loading: true
@@ -1117,11 +1133,7 @@ clear\r`
     const { cols, rows } = term
     const { config } = this.props
     const {
-      host,
-      port,
-      tokenElecterm,
-      keywords = [],
-      server = ''
+      keywords = []
     } = config
     const { sessionId, logName } = this.props
     const tab = window.store.applyProfileToTabs(deepCopy(this.props.tab || {}))
@@ -1189,11 +1201,7 @@ clear\r`
     this.setStatus(statusMap.success)
     term.pid = id
     this.pid = id
-    const hs = server
-      ? server.replace(/https?:\/\//, '')
-      : `${host}:${port}`
-    const pre = server.startsWith('https') ? 'wss' : 'ws'
-    const wsUrl = `${pre}://${hs}/terminals/${id}?sessionId=${sessionId}&token=${tokenElecterm}`
+    const wsUrl = this.buildWsUrl()
     const socket = new WebSocket(wsUrl)
     socket.onclose = this.oncloseSocket
     socket.onerror = this.onerrorSocket

package/package.json

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