Browse Source

socket和webrtc全部切断了。

xushiting 3 years ago
parent
commit
80cc5254c6
3 changed files with 22 additions and 20 deletions
  1. 20 17
      src/NetworkController.js
  2. 2 2
      src/Socket.js
  3. 0 1
      src/Xverse_Room.js

+ 20 - 17
src/NetworkController.js

@@ -144,7 +144,7 @@ export default class NetworkController extends EventEmitter {
             // }
             // ),
             
-            this.socket.start()
+            //this.socket.start()
         }
         )
     }
@@ -199,22 +199,25 @@ export default class NetworkController extends EventEmitter {
         this.socket.off("gameRoomAvailable"),
         this.socket.off("socketClosed"),
         this.rtcp.off("rtcDisconnected"),
-        this.rtcp.off("rtcConnected"),
-        this.connectAndStart(!0).then(({session_id: e})=>{
-            this.room.updateCurrentNetworkOptions({
-                sessionId: e
-            }),
-            reporter.updateBody({
-                serverSession: e
-            }),
-            logger.info("reconnect success"),
-            this.setState("connected"),
-            this.reconnectCount = 0,
-            this.emit("stateChanged", {
-                state: "reconnected"
-            })
-        }
-        ))
+        this.rtcp.off("rtcConnected")
+
+        // ,
+        // this.connectAndStart(!0).then(({session_id: e})=>{
+        //     this.room.updateCurrentNetworkOptions({
+        //         sessionId: e
+        //     }),
+        //     reporter.updateBody({
+        //         serverSession: e
+        //     }),
+        //     logger.info("reconnect success"),
+        //     this.setState("connected"),
+        //     this.reconnectCount = 0,
+        //     this.emit("stateChanged", {
+        //         state: "reconnected"
+        //     })
+        // })
+
+        )
     }
     prepareReconnect() {
         this.rtcp.disconnect(),

+ 2 - 2
src/Socket.js

@@ -65,7 +65,7 @@ export default class Socket extends EventEmitter {
                     extra: JSON.stringify(R)
                 })
             };
-            this.send(x);
+            //this.send(x);
             // logger.warn("startGame", le(oe({}, x), {
             //     data: JSON.parse(x.data)
             // }))
@@ -105,7 +105,7 @@ export default class Socket extends EventEmitter {
         const e = this.getAddress();
         logger.info(`connecting to ${e}`);
         const t = Date.now();
-        this._ws = new WebSocket(e),
+        // this._ws = new WebSocket(e);
         // this._openTimer = new Timeout(()=>{
         //     const r = `Failed to open websocket in ${DEFAULT_OPEN_TIMEOUT_MS} ms`;
         //     this._hasTimeout = !0,

+ 0 - 1
src/Xverse_Room.js

@@ -539,7 +539,6 @@ export default class Xverse_Room extends EventEmitter {
         try {
             await this.beforeStartGameHook(this.options);
             //const {room_id: room_id, data: n, session_id: session_id} = await this.networkController.startGame();
-            this.networkController.socket.startGame()
             const room_id = this.options.roomId;
             const n = JSON.stringify(this.options.camera);
             const session_id = '';