xushiting hace 3 años
padre
commit
3996f11abc
Se han modificado 5 ficheros con 51 adiciones y 17 borrados
  1. 0 3
      src/ActionsHandler.js
  2. 1 1
      src/Rtcp.js
  3. 2 2
      src/Socket.js
  4. 11 10
      src/Workers.js
  5. 37 1
      src/enum/Actions.js

+ 0 - 3
src/ActionsHandler.js

@@ -28,9 +28,6 @@ export default class ActionsHandler {
     }
 
     async sendData(actionData) {
-
-        console.log('发送数据:'+JSON.stringify(actionData))
-
         await this.beforeSend(actionData);
         const traceId = util.uuid();
         this.room.networkController.sendRtcData(le(oe({}, actionData.data), {

+ 1 - 1
src/Rtcp.js

@@ -120,7 +120,7 @@ export default class Rtcp extends EventEmitter {
             var o = this.inputChannel;
 			if(!this.actived || !this.inputChannel || this.inputChannel.readyState === "open"){
 				if(o != null){
-					console.log('发送webrtc数据:'+e)
+					//console.log('发送webrtc数据:'+e)
 					o.send(e)
 				}
 			}

+ 2 - 2
src/Socket.js

@@ -28,7 +28,7 @@ export default class Socket extends EventEmitter {
             const t = JSON.stringify(e);
             e.id !== "heartbeat" && logger.info("send ws frame", t);
             this._ws.send(t)
-            console.log('socket发送数据:'+t)
+            //console.log('socket发送数据:'+t)
         }
         );
         E(this, "startGame", ()=>{
@@ -164,7 +164,7 @@ export default class Socket extends EventEmitter {
             let r = null;
             try {
                 r = JSON.parse(t.data)
-                console.log('接收socket数据:'+t.data)
+                //console.log('接收socket数据:'+t.data)
             } catch (o) {
                 logger.error(o);
                 return

+ 11 - 10
src/Workers.js

@@ -473,6 +473,7 @@ export default class Workers {
             this.getPtr = (this.getPtr + 1) % this.cachedLength
         }
         const s = e.data.metadata;
+        console.log('接受的webrtc数据:'+JSON.stringify(s));
         if ((b = s == null ? void 0 : s.traceIds) != null && b.length)
             for (const k of s.traceIds) {
                 if (this.traceIdMap.has(k)) {
@@ -628,7 +629,7 @@ export default class Workers {
                         break
                     }
                 case 5:
-                    console.log('接受webrtc请求(来自worker):'+JSON.stringify(s.data.metadata))
+                    //console.log('接受webrtc请求(来自worker):'+JSON.stringify(s.data.metadata))
                     this.executeFunction("signal", {
                         signal: s.data.metadata,
                         pts: -1,
@@ -765,7 +766,7 @@ export default class Workers {
                 this.moveDisplayCircular.add(_e),
                 this.lastMoveDisplayTime = $
             }
-            console.log('接受webrtc请求(定时执行UpdateYUV):'+JSON.stringify(this.cachedMetas[e]))
+            //console.log('接受webrtc请求(定时执行UpdateYUV):'+JSON.stringify(this.cachedMetas[e]))
             this.executeFunction("signal", {
                 signal: this.cachedMetas[e],
                 pts: this.cachedPtss[e],
@@ -951,7 +952,7 @@ export default class Workers {
             };
             if (this.inPanoMode)
             {
-                console.log('接受webrtc请求:'+JSON.stringify(Mt));
+                //console.log('接受webrtc请求:'+JSON.stringify(Mt));
                 this.executeFunction("signal", {
                     signal: Mt,
                     pts: -1,
@@ -1024,7 +1025,7 @@ export default class Workers {
                     };
                     if (this.inPanoMode)
                     {
-                        console.log('接受webrtc请求:'+JSON.stringify(Rt));
+                        //console.log('接受webrtc请求:'+JSON.stringify(Rt));
                         this.executeFunction("signal", {
                            signal: Rt,
                            pts: -1,
@@ -1081,7 +1082,7 @@ export default class Workers {
     dataHandle(e) {
 
         if(this.saveframe){
-            console.log('接受webrtc请求:录制视频')
+            //console.log('接受webrtc请求:录制视频')
             this.decoderWorker.postMessage({
                 t: 6
             });
@@ -1089,7 +1090,7 @@ export default class Workers {
         }
 
         if(this.SaveMediaStream){
-            console.log('接受webrtc请求:下载视频')
+            //console.log('接受webrtc请求:下载视频')
             this.decoderWorker.postMessage({
                 t: 7
             }),
@@ -1099,23 +1100,23 @@ export default class Workers {
         const i = new Uint8Array(e);
         if (i.length >= 4 && this.isHeartBeatPacket(i.buffer, i.length) == !0)
         {
-            console.log('接受webrtc请求:心跳')
+            //console.log('接受webrtc请求:心跳')
             return;
         }
         if (i.length > 36 && this.unmarshalStream(i.buffer) == !0) {
             this.reconnectSignal && (this.executeFunction("reconnectedFrame", {}),
             this.reconnectSignal = !1);
-            console.log('接受webrtc请求:视频流')
+            //console.log('接受webrtc请求:视频流')
             return
         }
         if (i.length > 20 && this.unmarshalPano(i.buffer) == !0)
         {
-            console.log('接受webrtc请求:全景图')
+            //console.log('接受webrtc请求:全景图')
             return;
         }
         this.noWasmBytesReceived += e.byteLength;
         const o = JSON.parse(this.Stringify(i));
-        console.log('接受webrtc请求:'+JSON.stringify(o));
+        console.log('接受webrtc请求(不是心跳,视频):'+JSON.stringify(o));
         this.executeFunction("signal", {
             signal: o,
             pts: -1,

+ 37 - 1
src/enum/Actions.js

@@ -33,6 +33,42 @@ var Actions = {
     RemoveVisitor:1022,
     GetUserWithAvatar:1023,
     GetNewUserState:1024,
-    SetSyncPolicy:1025
+    SetSyncPolicy:1025,
+
+    1:'Clicking',
+    6:'PlayCG',
+    7:'Back',
+    8:'ChangeRoom',
+    13:'ChangeSkin',
+    15:'Joystick',
+    18:'Transfer',
+    22:'GetOnVehicle',
+    23:'GetOffVehicle',
+    34:'StopMoving',
+    1e3:'UnaryActionLine',
+    1001:'Init',
+    1002:'Exit',
+    1003:'SetIFrameInfo',
+    1004:'GetNeighborPoints',
+    1005:'ReserveSeat',
+    1006:'GetReserveStatus',
+    1007:'ChangeNickname',
+    1008:'ChangeBitRateInfo',
+    1009:'Echo',
+    1010:'SetPlayerState',
+    1011:'TurnTo',
+    1012:'TurnToFace',
+    1013:'RotateTo',
+    1014:'Rotation',
+    1015:'CameraTurnTo',
+    1016:'ConfirmEvent',
+    1017:'Broadcast',
+    2e4:'NotifyActionLine',
+    1020:'AudienceChangeToVisitor',
+    1021:'VisitorChangeToAudience',
+    1022:'RemoveVisitor',
+    1023:'GetUserWithAvatar',
+    1024:'GetNewUserState',
+    1025:'SetSyncPolicy'
 }
 export default Actions