zhyz-cloudrender-v5 1.0.8 → 1.0.9

package/cloudRender.es.js

@@ -28819,6 +28819,7 @@ class CloudRender extends DefaultApi {
     this.p2pWs = null;
     this.renderWidth = 0;
     this.renderHeight = 0;
+    this.isWss = url.includes("https");
     this.webscoketCallback = () => {};
     const init = (async () => {
       initBaseInfo({
@@ -29119,7 +29120,7 @@ class CloudRender extends DefaultApi {
             myhostname: myhostname,
             protooPort: protooPort,
             displayName: this.username,
-            ishttps: this.url.includes("https"),
+            ishttps: this.isWss,
             setRenderStatus: this.setRenderStatus
           });
           this.room = room;
@@ -29151,7 +29152,7 @@ class CloudRender extends DefaultApi {
         console.log("客户端渲染");
         createWebGLContext(ele, this.renderWidth, this.renderHeight);
       }
-      let socketUrl1 = `ws://${this.url.split("://")[1]}websocket/${this.appliId + v4$2()}`;
+      let socketUrl1 = `${isWss ? 'wss' : 'ws'}://${this.url.split("://")[1]}websocket/${this.appliId + v4$2()}`;
       let webscoket1 = new WebSocket(socketUrl1);
       this.serveScoket = webscoket1;
       webscoket1.onmessage = info => {

package/cloudRender.js

@@ -28824,6 +28824,7 @@ Expected function or array of functions, received type ${typeof value}.`
 	    this.p2pWs = null;
 	    this.renderWidth = 0;
 	    this.renderHeight = 0;
+	    this.isWss = url.includes("https");
 	    this.webscoketCallback = () => {};
 	    const init = (async () => {
 	      initBaseInfo({
@@ -29124,7 +29125,7 @@ Expected function or array of functions, received type ${typeof value}.`
 	            myhostname: myhostname,
 	            protooPort: protooPort,
 	            displayName: this.username,
-	            ishttps: this.url.includes("https"),
+	            ishttps: this.isWss,
 	            setRenderStatus: this.setRenderStatus
 	          });
 	          this.room = room;
@@ -29156,7 +29157,7 @@ Expected function or array of functions, received type ${typeof value}.`
 	        console.log("客户端渲染");
 	        createWebGLContext(ele, this.renderWidth, this.renderHeight);
 	      }
-	      let socketUrl1 = `ws://${this.url.split("://")[1]}websocket/${this.appliId + v4$2()}`;
+	      let socketUrl1 = `${isWss ? 'wss' : 'ws'}://${this.url.split("://")[1]}websocket/${this.appliId + v4$2()}`;
 	      let webscoket1 = new WebSocket(socketUrl1);
 	      this.serveScoket = webscoket1;
 	      webscoket1.onmessage = info => {

package/cloudRender.umd.js

@@ -28825,6 +28825,7 @@ Expected function or array of functions, received type ${typeof value}.`
 	    this.p2pWs = null;
 	    this.renderWidth = 0;
 	    this.renderHeight = 0;
+	    this.isWss = url.includes("https");
 	    this.webscoketCallback = () => {};
 	    const init = (async () => {
 	      initBaseInfo({
@@ -29125,7 +29126,7 @@ Expected function or array of functions, received type ${typeof value}.`
 	            myhostname: myhostname,
 	            protooPort: protooPort,
 	            displayName: this.username,
-	            ishttps: this.url.includes("https"),
+	            ishttps: this.isWss,
 	            setRenderStatus: this.setRenderStatus
 	          });
 	          this.room = room;
@@ -29157,7 +29158,7 @@ Expected function or array of functions, received type ${typeof value}.`
 	        console.log("客户端渲染");
 	        createWebGLContext(ele, this.renderWidth, this.renderHeight);
 	      }
-	      let socketUrl1 = `ws://${this.url.split("://")[1]}websocket/${this.appliId + v4$2()}`;
+	      let socketUrl1 = `${isWss ? 'wss' : 'ws'}://${this.url.split("://")[1]}websocket/${this.appliId + v4$2()}`;
 	      let webscoket1 = new WebSocket(socketUrl1);
 	      this.serveScoket = webscoket1;
 	      webscoket1.onmessage = info => {

package/package.json

@@ -1,14 +1,11 @@
 {
   "name": "zhyz-cloudrender-v5",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "cloudrender zhyz",
   "main": "cloudRender.es.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
-  "license": "ISC",
-  "__npminstall_done": true,
-  "_from": "zhyz-cloudrender-v4@1.0.0",
-  "_resolved": "https://registry.npmmirror.com/zhyz-cloudrender-v4/-/zhyz-cloudrender-v4-1.3.87.tgz"
-}
+  "license": "ISC"
+}

package/websocket-worker.js

@@ -0,0 +1,98 @@
+// websocket-worker.js
+let ws = null;
+let time = 2000;
+let replayCount = 0;
+let maxReplayCount = 100;
+let lockReconnect = false;
+let replayFn = null;
+
+// 监听主线程发来的消息
+self.onmessage = function(e) {
+    const { type, data } = e.data;
+    
+    switch(type) {
+        case 'init':
+            initWebSocket(data);
+            break;
+        case 'mouseEvent':
+        case 'keyEvent':
+        case 'wheelEvent':
+            sendMessage(type, data);
+            break;
+        case 'close':
+            closeWebSocket();
+            break;
+    }
+};
+
+function initWebSocket({ remoteIp, wsPort, streamId, isClient }) {
+    const ishttps = 'https:' === self.location.protocol;
+    const url = isClient 
+        ? `${ishttps ? 'wss' : 'ws'}://${remoteIp}:${wsPort}/websocket/request/`
+        : `${ishttps ? 'wss' : 'ws'}://${remoteIp}:${wsPort}/cloudRenderInput/proxy/${streamId}`;
+    
+    ws = new WebSocket(url);
+    
+    
+    ws.onopen = function() {
+        console.log('WebSocket connection opened');
+        self.postMessage({ type: 'status', status: 'open' });
+    };
+    
+    ws.onclose = function() {
+        console.log('WebSocket connection closed');
+        self.postMessage({ type: 'status', status: 'close' });
+    };
+    
+    ws.onerror = function(error) {
+        console.log('websocket已断开', error);
+        
+        if (lockReconnect) return;
+        
+        if (replayFn) clearTimeout(replayFn);
+        lockReconnect = true;
+        
+        if (ws && ws.readyState === WebSocket.OPEN) {
+            ws.close();
+        }
+        
+        replayFn = setTimeout(() => {
+            if (replayCount < maxReplayCount) {
+                self.postMessage({ 
+                    type: 'status', 
+                    status: 'reconnecting',
+                    count: replayCount,
+                    nextTime: time
+                });
+                
+                initWebSocket({ remoteIp, wsPort, streamId, isClient });
+                time = time * 2;
+                replayCount++;
+            }
+        }, time);
+        
+        self.postMessage({ type: 'error', error: error.toString() });
+    };
+}
+
+function sendMessage(eventType, data) {
+    if (ws && ws.readyState === WebSocket.OPEN) {
+        ws.send(JSON.stringify(data));
+    } else {
+        self.postMessage({ 
+            type: 'warning', 
+            message: 'WebSocket未连接，消息未发送',
+            eventType,
+            data
+        });
+    }
+}
+
+function closeWebSocket() {
+    if (ws) {
+        ws.close();
+    }
+    if (replayFn) {
+        clearTimeout(replayFn);
+    }
+}