merge branches

build/videoinputapp.html

@@ -20,11 +20,14 @@
         <div class="callapp_local_video">local video</div>
         <div class="callapp_remote_video">remote video</div>
     </div>
-	
+	<div style="position: fixed;background: transparent;color:black;border:1px solid rgba(0,0,0,0.5);padding:4px 8px; font-size:12px;bottom:0;right:0" id="logger"></div>
     <canvas id="canvas1"> </canvas>
 
     <script> 
-    var rgbToHex = function (rgb) { 
+    window.logging = function(who, what) {
+        D.div({renderTo: document.getElementById('logger')}, `to: ${who}, msg: ${JSON.stringify(what)}`);
+    };
+    var rgbToHex = function (rgb) {
         var hex = Number(rgb).toString(16);
         if (hex.length < 2) {
              hex = "0" + hex;

build/view/CallScreen.js

@@ -236,7 +236,6 @@ Screen.Conference = function() {
 
 			RTCinstance.callApp.connectMessage = ()=>{
 				var slot = slots[store.get( 'userRole' )][store.get( 'guestPosition' )];
-				debugger
 
 				return {
 					"roomSlot": slot,

src/apps/videoinputapp.ts

@@ -204,12 +204,27 @@ export class VideoInputApp {
         }
         else if (args.Type == awrtc.CallEventType.Message) {
             //no ui for this yet. simply echo messages for testing
-            /*let messageArgs = args as awrtc.MessageEventArgs;
-            this.mCall.Send(messageArgs.Content, messageArgs.Reliable, messageArgs.ConnectionId);*/
+            let messageArgs = args as awrtc.MessageEventArgs;
+            /*this.mCall.Send(messageArgs.Content, messageArgs.Reliable, messageArgs.ConnectionId);*/
+            let msg;
+            try{
+                msg = JSON.parse(messageArgs.Content)
+                if(msg.web){
+                    setTimeout(()=>{
+                        window['logging'](`try to disconnect: ${messageArgs.ConnectionId.id}`);
+                        this.mCall.mNetwork.Disconnect(messageArgs.ConnectionId);
+                    }, 300)
+                }
+            }catch (e){
+
+            }
+            window['logging'](`message: ${JSON.stringify(messageArgs.Content)} from: ${messageArgs.ConnectionId.id}`);
+
         }
         else if (args.Type == awrtc.CallEventType.DataMessage) {
+            let messageArgs = args as awrtc.DataMessageEventArgs;
             //no ui for this yet. simply echo messages for testing
-            //let messageArgs = args as awrtc.DataMessageEventArgs;
+
             //this.mCall.SendData(messageArgs.Content, messageArgs.Reliable, messageArgs.ConnectionId);
         }
         else if (args.Type == awrtc.CallEventType.CallAccepted) {
@@ -218,7 +233,16 @@ export class VideoInputApp {
 
             let messageArgs = args as awrtc.MessageEventArgs;
 
-            this.mCall.Send(JSON.stringify(this.connectMessage()), messageArgs.Reliable, messageArgs.ConnectionId);
+            let sendingObj = this.connectMessage();
+            sendingObj.web = true;
+
+
+            window['logging'](`income call id: ${messageArgs.ConnectionId.id}`);
+            setTimeout(()=>{
+                window['logging'](`send my user data to ${messageArgs.ConnectionId.id} (${JSON.stringify(sendingObj)})`);
+                this.mCall.Send(JSON.stringify(sendingObj), messageArgs.Reliable, messageArgs.ConnectionId);
+            }, (50+220*Math.random())|0)
+
 /*            this.mCall.SendData(JSON.stringify({
                 userId: store.get('userRole'+this.___id),
                 webCam: store.get('webcam'+this.___id)

src/awrtc/media/AWebRtcCall.ts

@@ -169,7 +169,7 @@ export class AWebRtcCall implements ICall {
         this.mCallEventHandlers = this.mCallEventHandlers.filter(h => h !== listener);
     }
 
-    protected mNetwork: IMediaNetwork = null
+    public mNetwork: IMediaNetwork = null
     private mConnectionInfo = new ConnectionInfo();
 
     private mConferenceMode = false;