ts

rf/class_dec.js

@@ -80,8 +80,53 @@ function _method_dec_v2(fn,fn_name){
   }
 }
 
+function _method_dec_v2_1(fn,fn_name,cname){
+  return function() {
+
+    window.sv_trc ? sv_trc({fn_name,cname,that:this,args:[...arguments]}) : 0
+    // const ret1 = dec_fns[fn_name] && dec_fns[fn_name].pre ? dec_fns[fn_name].pre({that:this, args:arguments}) : 0
+    // const ret1 = dec_fns[fn_name] && dec_fns[fn_name].pre ? dec_fns[fn_name].pre.call(this,[{that:this, args:arguments}]) : 0
+    const ret1 = dec_fns[fn_name] && dec_fns[fn_name].pre ? dec_fns[fn_name].pre.apply(this,[{that:this, args:arguments}]) : 0
+
+    if (ret1){
+      return ret1.ret
+    }
+    const ret = fn.apply(this, arguments);
+    const ret2 = dec_fns[fn_name] && dec_fns[fn_name].post ? dec_fns[fn_name].post({that:this, arguments}) : 0
+        // clog("MDEX",{ret1,ret2})
+    if (ret2){
+      return ret2.ret
+    }
+    return ret;
+  }
+}
+
+function _method_dec_v2_2(fn,fn_name){
+  return function() {
+
+    const ret1 = dec_fns[fn_name] && dec_fns[fn_name].pre ? dec_fns[fn_name].pre({that:this, args:arguments}) : 0
+
+    if (ret1){
+      return ret1.ret
+    }
+    const ret = fn.apply(this, arguments);
+    const ret2 = dec_fns[fn_name] && dec_fns[fn_name].post ? dec_fns[fn_name].post({that:this, arguments}) : 0
+        // clog("MDEX",{ret1,ret2})
+    if (ret2){
+      return ret2.ret
+    }
+    return ret;
+  }
+}
+
+
+
+
+
+
 
 function dec_class_v2(cls,cls_orig,cname){
+  clog("trc dec_class_v2",cname,{cls,cls_orig,cname})
   var k,v
   var proto = cls_orig
   // var proto = glob_react.vidClass.LocalVideo.prototype
@@ -93,6 +138,19 @@ function dec_class_v2(cls,cls_orig,cname){
     // clog(k,v)
   } 
 }
+function dec_class_v2_1(cls,cls_orig,cname){
+  clog("trc dec_class_v2",cname,{cls,cls_orig,cname})
+  var k,v
+  var proto = cls_orig
+  // var proto = glob_react.vidClass.LocalVideo.prototype
+  // for ([k,v] of iter_desc(proto)){
+  for ([k,v] of Object.entries(proto)){
+    // glob_react.Filmstrip[k] = v
+    // clog(k,v)
+    cls.prototype[k] = _method_dec_v2_1(v.value,k,cname)
+    // clog(k,v)
+  } 
+}
 
 
 
@@ -137,6 +195,8 @@ cdec.glob_orig = window[GLOB_ORIG]
 if (runonce){
 
     window[GLOB_ORIG].classes["SharedVideoManager"] = cdec.get_class_methods(glob_react.SharedVideoManager)
+    window[GLOB_ORIG].classes["SharedVideoContainer"] = cdec.get_class_methods(glob_react.SharedVideoContainer)
+    // 
 }
 
 }
@@ -148,7 +208,8 @@ function undec_svm(){
 
 }
 function dec_svm(){
-    cdec.dec_class(glob_react.SharedVideoManager,cdec.glob_orig.classes.SharedVideoManager)
+    cdec.dec_class(glob_react.SharedVideoManager,cdec.glob_orig.classes.SharedVideoManager,"SharedVideoManager")
+    cdec.dec_class(glob_react.SharedVideoContainer,cdec.glob_orig.classes.SharedVideoContainer,"SharedVideoContainer")
 
 }
 // function dec_svm(){}
@@ -173,12 +234,53 @@ function onSharedVideoUpdate_mod(id, url, attributes) {
     }
 
 dec_fns_v2 = {
+  fireSharedVideoEvent:{
+
+      pre(o) {
+        // return
+        const sendPauseEvent = o.args[0]
+        const UIEvents = glob_react.UIEvents
+        clog("fireSharedVideoEventx",this,o,o.args[0],[...arguments])
+        // return {}
+        // return 
+        // ignore update checks if we are not the owner of the video
+        // or there is still no player defined or we are stopped
+        // (in a process of stopping)
+        if (!APP.conference.isLocalId(this.from) || !this.player
+            || !this.isSharedVideoShown) {
+            // return;
+            return {};
+        }
+
+        const state = this.player.getPlayerState();
+
+        // if its paused and haven't been pause - send paused
+
+        if (state === YT.PlayerState.PAUSED && sendPauseEvent) {
+            this.emitter.emit(UIEvents.UPDATE_SHARED_VIDEO,
+                this.url, 'pause', this.player.getCurrentTime());
+        } else if (state === YT.PlayerState.PLAYING) {
+            // if its playing and it was paused - send update with time
+            // if its playing and was playing just send update with time
+            this.emitter.emit(UIEvents.UPDATE_SHARED_VIDEO,
+                this.url, 'playing',
+                this.player.getCurrentTime(),
+                this.player.isMuted(),
+                this.player.getVolume(),);
+                // this.player.getVolume(),"xtra_var");
+        }
+            return {};
+    }
+  },
     onSharedVideoUpdate:{
         pre(o){
             try {
                 if (!o.that.player){
                     window.autoplay_probably_disabled ? autoplay_probably_disabled(o) : clog("NO fix implemented")
+                    // window.autoplay_probably_disabled ? autoplay_probably_disabled(o) : clog("NO fix implemented2")
                     clog("...autoplay_probably_disabled...")
+                } else {
+                  // clog("yt_dbg AUTO")
                 }
 /*
             clog("onSharedVideoUpdate pre arg",[...o.args])
@@ -213,10 +315,18 @@ dec_fns_v2 = {
     }
 }
 
+
+
+
+
+// clog("TRC_ <!--#echo var='request_filename' -->",'<!--#echo var="uri" -->')
+clog("TRC_2 ",'<!--#echo var="request_filename" -->'.split("/").pop())
+
 cdec = {
     get_class_methods:save_orig_class,
     undec_class:undec_class_v2,
-    dec_class:dec_class_v2,
+    // dec_class:dec_class_v2,
+    dec_class:dec_class_v2_1,
     glob_orig:window[GLOB_ORIG],
 }
 dec_fns = window.dec_fns || {}

rf/conn/cui5.js

@@ -0,0 +1,390 @@
+
+
+
+
+twsfn5 = window.twsfn5 || {}
+
+vc2 = {
+    key:"key",
+}
+
+
+
+
+
+
+if (!window.gws){
+    window.gws = {
+        sockets:{},
+    }
+}
+gws.twsfn5 = twsfn5
+
+// gws
+
+
+
+
+// Object.keys(twsfn5_bak)
+// Object.keys(twsfn5)
+
+// Object.keys(twsfn5_bak) +"" == Object.keys(twsfn5)+""
+
+
+
+
+function connect_helper5(){
+        var o = {  
+            // ':8943/ws/vts/'
+            // url:'wss://' + window.location.host + '/ws/vts2/' + window.roomName.toLowerCase() + '/?CONN',
+            url:'wss://' + window.location.host + ':8943/ws/vts2/' + window.roomName.toLowerCase() + '/?CONN',
+            wsfn:twsfn5,
+            name:"ws_n15",
+        }
+        clog("o",o)
+        connect_ws_arg(o)
+}
+
+
+
+
+
+// connect_ws_arg()
+
+
+        // 'wss://' + window.location.host +
+        // '/ws/vts/' + window.roomName + '/?qqAAAAAAAAAAAAAAAAA'
+
+
+
+
+    twsfn5.ts_t2x = function(data) {
+        clog("ts_t2x",data)
+        var k,v
+        for ([k,v] of Object.entries(data.obj.times)){
+            clog(k,v.t - data.obj.t0 )
+        }
+    }
+
+
+    twsfn5.ts_t0x = function(data) {
+        // clog("pub_msg",pub_msg)
+        var msg = {}
+        msg[vc2.key] = "ts_t1"
+        twsfn5.s(msg)
+    }
+
+    twsfn5.ts_test = function(data) {
+        // clog("pub_msg",pub_msg)
+        // var msg = {}
+        // msg[vc2.key] = "ts_t1"
+        // twsfn.s(msg)
+        clog("jx twsfn5.ts_test TEST")
+    }
+
+    twsfn5.pub_msg = function(data) {
+        clog("pub_msg",data)
+        // var msg = {}
+        // msg[vc2.key] = "pong"
+        // twsfn5.s(msg)
+    }
+
+
+
+
+
+
+    twsfn5.qdb_got = function(data) {
+        clog("jx qdb_data",data)
+        clog("jx qdb_got",data.obj)
+        clog(data.obj)
+    }
+
+    twsfn5.qdb_got3 = function(data) {
+        clog("jx qdb_data",data)
+        clog("jx qdb_got",data.obj)
+        clog("~jx~",data.obj.participants,data.obj.corners)
+    }
+
+    twsfn5.recv_corners = function(data) {
+        // clog("jx qdb_data",data)
+        // clog("jx qdb_got",data.obj)
+        // glob_corner.corners=data.obj.corners
+        cad_ts5r()
+        clog("~jx~",data.obj.participants,data.obj.corners)
+    }
+
+    twsfn5.pingpong = function(data) {
+        // clog("VFB5 PONG2!")
+
+        var msg = {}
+        msg[vc2.key] = "pong"
+        twsfn5.s(msg)
+    }
+
+
+
+
+    twsfn5.onmessage = function(e) {
+        var recv_ts_u0 = window.performance.now()
+        var recv_ts = Date.now()
+        var recv_ts_u1 = window.performance.now()
+        // clog("VFB MSG",e)
+
+        // clog()
+        // return
+        var data = JSON.parse(e.data);
+        data.recv_ts = recv_ts
+        data.recv_ts_u0 = recv_ts_u0
+        data.recv_ts_u1 = recv_ts_u1
+        if (data.type != "pingpong"){
+            // clog("ixq twsfn5.onmessage")
+        }
+        // clog("VFB data",data)
+        // clog("WS ONMSG",data)
+        if (data.message != undefined){
+            // twsfn5.on_chat_message(data)
+        }
+        if (data.type != undefined && twsfn5[data.type]){
+            twsfn5[data.type](data,e)
+
+        } else {
+            clog("VFB data",data)
+        }
+    };
+
+    twsfn5.onopen = function(e) {
+        clog("jx ONCON...")
+        chatSocket.onopen
+        // clog("jx ONCON....")
+        // window.qdb ? onconnect : console.err("ERR no qdb")
+        // window.qdb ? window.qdb.onconnect() : console.error(" jx ERR no qdb")
+        window.qdb ? window.qdb.onconnect_2() : console.error(" jx ERR no qdb")
+        // console.error(" jx ERR test")
+        // console.error(" jx ERR test2")
+        // clog("jx ONCON... fin")
+    }
+    twsfn5.onclose = function(e) {
+        console.error('VFB2 vChat socket closed unexpectedly');
+        setTimeout(connect_helper5,1400)
+        // setTimeout(vconnect_ws,1400)
+    };
+
+
+ twsfn5.s=   function(o){
+
+        if (o.key != "pong"){
+            // clog("ixq twsfn5.send")
+        }
+
+    var vchatSocket = gws.sockets["ws_n15"]
+        // .send(JSON.stringify(o));
+        // twsfn5.s0 =
+         vchatSocket.send(JSON.stringify(o));
+    }
+
+// s =twsfn5.s
+// vconnect_ws()
+
+
+
+
+
+
+// delete qdb
+{
+
+class QDB {
+    constructor(){
+        this.db = {}
+    }
+    onconnect(){
+
+        qdb.get_corners()
+    }
+    onconnect_2(){
+        clog("JX onconnect_2")
+        // qdb.get_corners()
+        // setTimeout(this.get_corners.bind(this,1000))
+
+        setTimeout(this.get_corners.bind(this),100)
+        setTimeout(this.get_corners.bind(this),2000)
+        get_cui_html(rldi.files["cui3.html"])
+
+        // setTimeout(this.get_corners.bind(this,1000))
+        // setTimeout(this.get_corners.bind(this,))
+        // setTimeout(qdb.get_corners.bind(this,100)
+
+        // qdb.get_corners()
+    }
+
+    send(o){
+        twsfn5.s(o)
+    }
+    q(action){
+        this.send({"key":"qdb","action":action})
+
+    }
+    get_db(){
+        this.send({"key":"qdb","action":"get_db"})
+
+    }
+    get_db2(){
+        this.send({"key":"qdb","action":"get_db2"})
+
+    }
+
+    
+    set_db(){
+        this.send({"key":"qdb","action":"set_db"})
+
+    }
+
+    update(){
+
+    }
+    proc_response(data){
+        clog("jx proc_response",data)
+    }
+
+    updated(){
+
+    }
+
+    set_corners(corner_name){
+        this.send({"key":"qdb","action":"set_corners","corner_name":corner_name})
+    }
+    get_corners(corner_name){
+        clog("jx get_corners abc 123",this)
+        this.send({"key":"qdb","action":"get_corners"})
+    }
+    add_corner(corner_name){
+        this.send({"key":"qdb","action":"add_corner","corner_name":corner_name})
+    }
+    remove_corner(corner_name){
+        this.send({"key":"qdb","action":"remove_corner","corner_name":corner_name})
+    }
+    move(corner_name){
+        this.send({"key":"qdb","action":"move","corner_name":corner_name})
+    }
+
+
+    time_sync(){
+        clog("TIME SYNC")
+        // Date.now()
+
+
+        this.send({"key":"qdb","action":"time_sync","t0":Date.now(),"t0_u":window.performance.now()})
+    }
+
+    // server_ts
+
+
+
+
+
+
+
+
+}
+window.QDB = QDB
+}
+function replace_proto(){
+    window.qdb.__proto__ = QDB.prototype
+    var vchatSocket = gws.sockets["ws_n15"]
+    var wsfn = twsfn5
+
+    vchatSocket.onmessage = wsfn.onmessage
+    vchatSocket.onclose = wsfn.onclose  
+    vchatSocket.onopen = wsfn.onopen  
+
+}
+if (!window.qdb){
+    window.qdb = new QDB()
+
+} 
+
+
+
+
+window.QDB_def0 = QDB + ""
+if (window.QDB_def0 != window.QDB_def){
+    if (window.QDB_def){
+
+window.QDB_def = QDB + ""
+replace_proto()
+    }
+window.QDB_def = QDB + ""
+}
+if (window.qdb){
+    twsfn5.client_qbd = window.qdb.proc_response
+}
+
+twsfn5.get_db = function(){
+
+}
+twsfn5.server_ts = function(data,e){
+    var ts_u1 = window.performance.now()
+
+    var t1 = Date.now()
+    var t0 = data.req.t0
+    var ts = data.server_time
+    var tsx =ts * 1000
+    var ta = (t0+t1)/2
+    tsd = new Date(ts*1000)
+    t0d = new Date(t0)
+    t1d = new Date(t1)
+    td2 = ta - tsx
+    td  =  tsx - ta
+    tarr = [[t1,"t1"],[tsx,"tsx"],[t0,"t0"],[ta,"ta"],[td,"td"],[td2,"td2"]]
+    tobj = {t1,tsx,t0,ta,td,td2}
+
+    clog("ts:",t1 - data.recv_ts,ts_u1- data.recv_ts_u1,data)
+    // clog("ts:",{t0,ts,t1})
+
+    // clog("ts3:",(t0+t1)/2 - (ts *1000),t0 - t1)
+
+    t01 = t0 - t1
+    t01_u = data.req.t0_u - ts_u1
+
+    clog("ts3:",(t0+t1)/2 - tsx,t0-tsx,t1-tsx,t0 - t1)
+    if (!qdb.td){
+        qdb.td = 0
+    }
+    clog("ts4:",qdb.td - td,"~",qdb.td,td)
+    clog("ts5:",t01,t01_u)
+    qdb.td = td
+    qdb.td2 = td2
+    if (window.clock_info_draw){
+        clock_info_draw()
+    }
+
+}
+twsfn5.update_db = function(){}
+twsfn5.updated_db = function(){}
+
+
+
+
+
+function rld_continues(){
+    clog("vfb jx RC")
+    if (window.stop_flag){
+        return 
+    }
+    twsfn5.s({"key":"rld"})
+    setTimeout(rld_continues,500)
+}
+
+
+
+
+
+connect_helper5()
+
+
+
+// setTimeout
+
+
+clog("BX5")

rf/conn/tconn.js

@@ -0,0 +1,163 @@
+twsfn = {}
+
+vc2 = {
+    key:"key",
+}
+
+
+window.roomName = window.location.pathname.split("/").pop()
+
+if (!window.gws){
+    window.gws = {
+        sockets:{},
+    }
+}
+gws.twsfn= twsfn
+
+
+function connect_ws_arg(o){
+    // console.trace("lxw")
+    var vchatSocket
+    // vchatSocket = gws[o.name]
+    vchatSocket = gws.sockets[o.name]
+    if (vchatSocket && vchatSocket.readyState < 2) {
+    clog("VFB2 WSS ALLREADY CONNECTED!")
+        return
+    }
+    clog("VFB2 WSS CONTECTING")
+
+    vchatSocket = new WebSocket(o.url);
+        // '/ws/chat/' + window.roomName + '/?qqAAAAAAAAAAAAAAAAA');
+    // window.vchatSocket =vchatSocket
+    gws.sockets[o.name] = vchatSocket
+    // var wsfn = gws[o.wsfn]
+    var wsfn = o.wsfn
+
+    vchatSocket.onmessage = wsfn.onmessage
+    vchatSocket.onclose = wsfn.onclose  
+    vchatSocket.onopen = wsfn.onopen  
+}
+
+
+
+function connect_helper(){
+        var o = {  
+            // url:'wss://' + window.location.host + '/ws/vts/' + window.roomName.toLowerCase() + '/?qqAAAAAAAAAAAAAAAAA',
+            // url:'wss://' + window.location.host + '/chat/' + window.roomName.toLowerCase() + '/?qqAAAAAAAAAAAAAAAAA',
+            url:'wss://' + window.location.host + ':8943/ws/vts/' + window.roomName.toLowerCase() + '/?qqAAAAAAAAAAAAAAAAA',
+            // url:'ws://' + window.location.host + '/ws/vts/' + window.roomName.toLowerCase() + '/?qqAAAAAAAAAAAAAAAAA',
+            wsfn:twsfn,
+            name:"ws_n1",
+        }
+        clog("o",o)
+        connect_ws_arg(o)
+}
+
+
+
+
+
+// connect_ws_arg()
+
+
+        // 'wss://' + window.location.host +
+        // '/ws/vts/' + window.roomName + '/?qqAAAAAAAAAAAAAAAAA'
+
+
+
+
+    twsfn.ts_t2x = function(data) {
+        clog("ts_t2x",data)
+        var k,v
+        for ([k,v] of Object.entries(data.obj.times)){
+            clog(k,v.t - data.obj.t0 )
+        }
+    }
+
+
+    twsfn.ts_t0x = function(data) {
+        // clog("pub_msg",pub_msg)
+        var msg = {}
+        msg[vc2.key] = "ts_t1"
+        twsfn.s(msg)
+    }
+
+
+
+    twsfn.pub_msg = function(data) {
+        clog("pub_msg",data)
+        // var msg = {}
+        // msg[vc2.key] = "pong"
+        // twsfn.s(msg)
+    }
+
+
+
+
+
+
+    twsfn.pingpong = function(data) {
+        // clog("VFB2 PONG2!")
+
+        var msg = {}
+        msg[vc2.key] = "pong"
+        twsfn.s(msg)
+    }
+
+
+
+
+    twsfn.onmessage = function(e) {
+        // clog("VFB MSG",e)
+
+        // clog()
+        // return
+        var data = JSON.parse(e.data);
+        // clog("VFB data",data)
+        // clog("WS ONMSG",data)
+        if (data.message != undefined){
+            // twsfn.on_chat_message(data)
+        }
+        if (data.type != undefined && twsfn[data.type]){
+            twsfn[data.type](data,e)
+
+        } else {
+            clog("VFB data",data)
+        }
+    };
+
+    twsfn.onopen = function(e) {
+        chatSocket.onopen
+    }
+    twsfn.onclose = function(e) {
+        console.error('VFB2 vChat socket closed unexpectedly');
+        setTimeout(connect_helper,1400)
+        // setTimeout(vconnect_ws,1400)
+    };
+
+
+ twsfn.s=   function(o){
+    var vchatSocket = gws.sockets["ws_n1"]
+        // .send(JSON.stringify(o));
+        vchatSocket.send(JSON.stringify(o));
+    }
+    twsfn.ts_test = function(data) {
+        // clog("pub_msg",pub_msg)
+        // var msg = {}
+        // msg[vc2.key] = "ts_t1"
+        // twsfn.s(msg)
+        clog("jx twsfn.ts_test TEST")
+    }
+
+// s =twsfn.s
+// vconnect_ws()
+
+
+// connect_helper()
+
+
+
+// setTimeout
+// twsfn.s({key:"ts_t0"})
+
+

rf/fake_resize.js

@@ -1,6 +1,10 @@
 
 // make the App think you resized the window
 function dispatch_resize(store = APP.store) {
+	if (!store){
+		clog("nostore")
+		return
+	}
         // store.dispatch(clientResized_dev(innerWidth, innerHeight));
         store.dispatch({
         type: "CLIENT_RESIZED",

rf/filmstrip_mod/m.js

@@ -113,6 +113,7 @@ function refresh_toolbars(){
     n = `
     <span class="plugin_top tbar"><span class="outline_indicator ind_1"></span><span class="outline_indicator ind_2"></span><span class="outline_indicator ind_3"></span><span class="outline_indicator ind_4"></span>
     <div class="m xbox">ABC</div>
+    <div class="m sv_info"></div>
     </span>`
 
     html_hooks.create_vid_toptoolbar_hook_after(n)

rf/filmstrip_mod/m0.js

@@ -333,6 +333,8 @@ function calc_fs_dims(){
         width:s_width - m,
         // height:h53,
         height:h_height - hm,
+        "--vheight":h_height - hm,
+        "--width":s_width - m,
         // top:vtop - 2 + (hm * .5),
         transform: "translate(0%, -50%)",
         top:`calc(50% + ${Math.floor(hm * 1)}px)`,
@@ -661,19 +663,19 @@ window.reverse_indexed_map =  new Map()
     // remap_set($(".local_vid")[0],1)
     remap_set($(".local_vid")[0],3)
     // remap_set( $(`#participant_${mod_id.id}`)[0],2)
-    clog("indexed_map0",arr,indexed_map)
+    // clog("indexed_map0",arr,indexed_map)
     if (window.rotate_tiles){
         try {
-            clog("mod_sort2")
+            // clog("mod_sort2")
         window.rotate_tiles(arr)
 
         } catch {}
     }
-    clog("indexed_map",arr,indexed_map)
+    // clog("indexed_map",arr,indexed_map)
     arr = remap_sort(arr)
     arr = remap_sort(arr)
     arr = remap_sort(arr)
-    clog("indexed_map2",arr,indexed_map)
+    // clog("indexed_map2",arr,indexed_map)
     window.sorted_tiles = arr
 
 
@@ -869,7 +871,7 @@ function get_bcrs(arr,fs_bcr){
         
 
     }
-    clog("````",ret)
+    // clog("````",ret)
     $(ret.first_right).addClass("ir0")
     $(ret.first_left).addClass("il0")
     return ret

rf/fs.css

@@ -69,8 +69,8 @@
 }
 
 #sharedVideoIFrame {
-	width: 100% !important;
-	height: 100% !important;
+	/*width: 100% !important;*/
+	/*height: 100% !important;*/
 }
 
 #videospace{

rf/i4n/m.css

@@ -337,3 +337,6 @@
 	/*height: 2em;*/
 	/*top: 0px; left: 0px; right: 0px; bottom: 0px;*/
 }
+
+
+

rf/m/m_api_v2.js

@@ -173,7 +173,7 @@ function html_rld_cb4(rsp,status,xhr){
 }
 function html_rld_cb5(that,rsp,status,xhr){
 	clog("html_rld_cb5",{that,rsp,status,xhr})
-	console.err("~ async load_err html_rld_cb5 ~")
+	console.error("~ async load_err html_rld_cb5 ~")
 	window[xhr.file.success_js](rsp,status,xhr)
 
 

rf/m/m_utils.js

@@ -41,16 +41,16 @@ glob_mx.filmstrip_handlers  = {}
 //glob_mx.filmstrip_handlers = glob_mx.filmstrip_handlers || {}
 
 }
-
+dlog = nop
 
 
 function match(mx,m,o){
 	var k,v,k2,v2
 	var r = 0
-		// clog("@",mx,m,o)
+
 	for ([k,v] of Object.entries(m || {})){
 		v2 = o[k]
-    // clog("M~",k,typeof(v),typeof(v2),v,v2)
+
 		if (typeof(v) == "string" && typeof(v2) == "string") {
 			r += !(v==v2)
 		} else if (Array.isArray(v) && Array.isArray(v2)){
@@ -58,7 +58,7 @@ function match(mx,m,o){
 		} else if (Array.isArray(v) && typeof(v2) == "string"){
       // r += !(isSubset_arr(v2,v))
       r += !v.includes(v2)
-			// clog("!!!!!!!!!!!!!",v,v2,isSubset_arr(v2,v))
+
 		} else if (Array.isArray(v2) && typeof(v) == "string"){
 			r += !(v2.includes(v))
 		}
@@ -116,10 +116,10 @@ function dispatch_events(e,key){
 	var k,v
 	e.parsed.etype ? 1 : e.parsed.etype = "null"
 	var mflag =0
-		clog("dispatch_events??",e,key)
+		dlog("dispatch_events??",e,key)
 
 	for ([k,v] of Object.entries(glob_mx.event_handlers || {}) ) {
-		clog("dispatch_events:",k)
+		dlog("dispatch_events:",k)
 		if (v.m){
 			mflag = match({},v.m,e.parsed)
 		mflag ? v.fn(e) : 1
@@ -130,20 +130,20 @@ function dispatch_events(e,key){
 
 function run_cbs(key){
 	var k,v
-		clog("RUN_CB??",key,glob_mx.cb[key])
+		dlog("RUN_CB??",key,glob_mx.cb[key])
 
 	for ([k,v] of Object.entries(glob_mx.cb[key]|| {}) ) {
-		clog("RUN_CB:",k)
+		dlog("RUN_CB:",k)
 		v()
 	}
 }
 
 function run_hook_cbs(key,o){
 	var k,v
-		// clog("RUN_HOOK_CB??",key,glob_mx.hook_cb[key])
+		// dlog("RUN_HOOK_CB??",key,glob_mx.hook_cb[key])
 
 	for ([k,v] of Object.entries(glob_mx.hook_cb[key]|| {}) ) {
-		// clog("RUN_HOOK_CB:",k)
+		// dlog("RUN_HOOK_CB:",k)
 		v(o)
 	}
 }
@@ -199,28 +199,28 @@ function mhndlr_rld(that,m){
 		// var id = ai.from.split().slice(-1)[0]
 		var id = ai.from.split("/").pop()
 
-		clog("mhndlr_rld2",m,parsed,n,n.dataset)
+		dlog("mhndlr_rld2",m,parsed,n,n.dataset)
 		var o = parsed.payload
 		switch (parsed.type){
 			case "set_msg":
 				pf._set_recv(o.path,o.key,o.val)
 			break;
 			case "event":
-				clog("~event~",parsed)
+				dlog("~event~",parsed)
 				dispatch_events({parsed,ai,m,that})
 			break;
 			case "msg_test":
-				clog("msg_test",parsed)
+				dlog("msg_test",parsed)
 			break;
 			case "db_sync_request":
 				// tmsgx3({type:"db_sync_response",payload:pf.root})
 				tmsgx3({type:"db_sync_response",payload:pf.root},{to:ai.from})
 				
-				clog("db_sync_request",parsed)
+				dlog("db_sync_request",parsed)
 			break;
 			case "db_sync_response":
 				if (id == glob_mx.local_id){
-					clog( "db_sync_response ...")
+					dlog( "db_sync_response ...")
 					break
 
 				}
@@ -229,7 +229,7 @@ function mhndlr_rld(that,m){
 
 					}
 
-				clog("db_sync_response",ai.from == glob_mx.local_id,ai.from,parsed)
+				dlog("db_sync_response",ai.from == glob_mx.local_id,ai.from,parsed)
 			break;
 
 		}
@@ -333,7 +333,7 @@ class Proxy_Factory {
 		this.SymPrx = Symbol("SymPrx")
 	}
 	init(o){
-		// clog("BP",this,this.baseProp,this.__proto__.baseProp,window.baseProp)
+		// dlog("BP",this,this.baseProp,this.__proto__.baseProp,window.baseProp)
 		this.root = o
 	}
 	sync(o){
@@ -349,15 +349,15 @@ class Proxy_Factory {
 	}
 
 	_sett(o,k,v,prx,a0){
-		clog("_SETT",this,arguments)
+		dlog("_SETT",this,arguments)
 	}
 	_sett2(o,k,v,prx,a0){
-		clog("_SETT2",this,arguments)
+		dlog("_SETT2",this,arguments)
 	}
 
 	set_pub(obj, prop, val,receiver){
-		// clog("qia_pub",obj, prop, val,receiver)
-		// clog("qia_pub2",this.n,obj.__path_arr, prop, jx(val))
+		// dlog("qia_pub",obj, prop, val,receiver)
+		// dlog("qia_pub2",this.n,obj.__path_arr, prop, jx(val))
 		this._set_pub(obj.__path_arr, prop, jx(val))
 
 	}
@@ -393,7 +393,7 @@ class Proxy_Factory {
 	}
 
 	set(obj, prop, val,receiver){
-		// clog("prx_db set ",this,obj, prop, val,receiver,val.__prx)
+		// dlog("prx_db set ",this,obj, prop, val,receiver,val.__prx)
 		if (obj[prop] === val){
 			return Reflect.set(...arguments)
 		}
@@ -415,7 +415,7 @@ class Proxy_Factory {
 		return Reflect.set(...arguments)
 	}
 	get(obj, prop,receiver){
-		// clog("prx_db get ...",prop==isProxy,this,obj, prop,receiver)
+		// dlog("prx_db get ...",prop==isProxy,this,obj, prop,receiver)
 		if (this.hidden_props.includes(prop)){
 			switch (prop){
 				case "add_proxy":
@@ -424,7 +424,7 @@ class Proxy_Factory {
 				case "prxy":
 				return this
 				case "_set":
-				// clog("_SET")
+				// dlog("_SET")
 				// return this._set.bind({this})
 				return this._set.bind({that:this,obj, prop,receiver})
 				case "_sett":
@@ -470,7 +470,7 @@ class Proxy_Factory {
 	}
 
 	walker(o,tfo,dpth=0){
-		clog("qia WALK",this)
+		// dlog("qia WALK",this)
 		if (dpth > 7){
 			console.error("MAX DEPTH")
 			return
@@ -515,7 +515,7 @@ function arr_match(m,o){
 
 	// for ([k,v] in m){
 		// case 
-		clog(k,v)
+		// dlog(k,v)
 	}
 	return !r
 }
@@ -526,7 +526,7 @@ permissions_def = {
 		fn(set_scope,match){
 
 
-			clog("FN....",match.fp,match.fp[1] == window.glob_mx.local_id)
+			// clog("FN....",match.fp,match.fp[1] == window.glob_mx.local_id)
 			if (match.fp[1] != window.glob_mx.local_id)
 				throw "permission err"
 			return 
@@ -541,7 +541,7 @@ permissions_def__set = {
 		fn(set_scope,match){
 
 
-			clog("FN....",match.fp,match.fp[1] == window.glob_mx.local_id)
+			dlog("FN....",match.fp,match.fp[1] == window.glob_mx.local_id)
 			if (match.fp[1] != window.glob_mx.local_id)
 				// throw "permission err"
 			return 
@@ -556,7 +556,7 @@ permissions_def__set = {
 			super(...arguments)
 		}
 		set(obj, prop, val,receiver){
-			clog("PRX_PERM",obj.__path_arr,prop)
+			// clog("PRX_PERM",obj.__path_arr,prop)
 			var k,v
 			var r
 			var matched 
@@ -570,10 +570,10 @@ permissions_def__set = {
 			}
 			// case
 			// if (obj.__path_arr && obj.__path_arr.length){}
-			super.set(obj, prop, val,receiver)
+			return super.set(obj, prop, val,receiver)
 		}
 		_set(){
-			clog("Proxy_Permissions _set")
+			// clog("Proxy_Permissions _set")
 			super._set(...arguments)
 		}
 	}
@@ -645,9 +645,9 @@ run_cbs("init_db")
 
 function init_mu(persistent_mods){
 	// .role == "moderator"
-		clog(">>>>>>>>>>>>>>>>>>>.. RUN_CB")
+		// clog(">>>>>>>>>>>>>>>>>>>.. RUN_CB")
 var participants = get_participants()
-clog(participants)
+// clog(participants)
 
 
 
@@ -655,7 +655,7 @@ clog(participants)
 var local = get_local(participants)
 	if (window.glob_mx.local_id && persistent_mods && local.role=="moderator"){
 		// if window.glob_mx.local_id
-		clog("no RUN_CB")
+		// clog("no RUN_CB")
 
 		return
 	}

rf/m/moveto.js

@@ -38,7 +38,8 @@ function allevnt_rld(a0,a1,a2,a3,a4){
 	if (get_local().id == _from){
 		rld_room(room)
 	} else {
-		setTimeout(rld_room,2500,room)
+		// setTimeout(rld_room,2500,room)
+		setTimeout(rld_room,3500,room)
 
 	}
 

rf/m2/m2.js

@@ -80,8 +80,8 @@ function refresh_toolbar_config(){
 		} else {
 			
 		arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"sharedvideo")
-		}
 		arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"desktop")
+		}
 
 		
 		// arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"")
@@ -101,46 +101,23 @@ function mod_now(){
 	refresh_toolbar_config()
 dispatch_resize()
 }
-window.ifn_obj.iammod = [mod_now]
 
-
-refresh_toolbar_config()
-dispatch_resize()
-// function
-clog("zzz")
-
-// mouseenter/mouseleave
+window.ifn_obj.iammod = [mod_now]
 
 
 
+refresh_toolbar_config()
 
+dispatch_resize()
 
+// function
 
-function dev_raf(){
-	if (glob_dbg.ff.stop){
-		return
-	}
-	let now = Date.now()
-	let ts = glob_dbg.ff.ts
-	let then = glob_dbg.ff.then
-	glob_dbg.ff.n.innerHTML = (now - ts ) / 1000 + "<br>"+ ( now - then ) + "<br>" + glob_dbg.ff.mmc + "<br>" + Math.max(...glob_dbg.ff.mma) + "<br>" + glob_dbg.ff.mma
-	glob_dbg.ff.then=now
-	// glob_dbg.ff.mmc
-	glob_dbg.ff.mma.push(glob_dbg.ff.mmc)
-	glob_dbg.ff.mma.shift()
 
+// mouseenter/mouseleave
 
-	glob_dbg.ff.mmc = 0
-	requestAnimationFrame(dev_raf)
 
-}
 
 
-glob_dbg.ff={
-	stop:0,
-	mmc:0,
-	mma:[-1,-1,-1,-1,-1,-1,-1],
-}
 // glob_dbg.ytp.playVideo()
 
 /*

rf/resize_hook.js

@@ -250,14 +250,14 @@ function save_orig_prototype(classes){
   // for ([k,v] of Object.entries(o)){
   // for ([k2,v2] of Object.entries(glob_react.vidClass)){
   for ([k2,v2] of Object.entries(classes)){
-      clog("...",k2)
+      clog("... dec",k2)
       ret[k2] = {}
       o = v2.prototype
     for ([k,v] of iter_desc(o)){
 
       // clog(k,v)
       ret[k2][k]=v
-      clog(k2,k,v)
+      // clog(k2,k,v)
     }
   }
   // clog("><",Object.getOwnPropertyDescriptors(o))

rf/svm.js

@@ -1,13 +1,35 @@
 
+
+
+function psc(o){
+	let event = o.args[0]
+	// if (event. == )
+
+ 	// event.data.push(event.data)
+ 	glob_dbg.yt.psl.push(event.data)
+	clog("yt_s psc",event.data,"~",event.target.getPlayerState(),event.target,event)
+	if (event.data == YT.PlayerState.PLAYING){
+		// glob_dbg.yt.unstart ? 0 : clog("yt_s psc","UNSTART 1")
+		glob_dbg.yt.unstart ? clog("yt_s psc","UNSTART 1") : 0
+		window.yt_rem1 ? window.yt_rem1() : clog("yt_dbg NO yt_rem1")
+ 	glob_dbg.yt.unstart = 0
+	}
+ 	window.ytp_unstart ? ytp_started_check(o.args[0]) : 0
+}
+glob_dbg.yt = glob_dbg.yt || {psl:[]}
+
 svm_win = {
  onYouTubeIframeAPIReady:function (o) {
  	
  }, 
  onPlayerStateChange:function (o) {
  	// clog("xyz",o.args[0])
+ 	// clog("yt_0dbg","onPlayerStateChange",o,)
  	// console.trace("OPSC")
+
  	// if ()
- 	window.ytp_unstart ? ytp_started_check(o.args[0]) : 0
+ 	psc(o)
+ 	// window.ytp_unstart ? ytp_started_check(o.args[0]) : 0
  	
  }, 
  onVideoProgress:function (o) {
@@ -17,6 +39,8 @@ svm_win = {
  	
  }, 
  onPlayerReady:function (o) {
+ 	glob_dbg.yt.psl.push("R")
+ 	glob_dbg.yt.unstart = 1
  	
  }, 
  onPlayerError:function (o) {
@@ -25,11 +49,14 @@ svm_win = {
  svm:function (o) {
  	try {
  	// clog("svm xyz",this,o)
+ 	// clog("yt_0dbg","svm",o.fn_name,o)
  	this[o.fn_name](o)
 
  	}catch (err) {
 
- 	// clog("svm xyz err",err)
+ 	clog("svm xyz err",err)
  	}
  },
-}
+}
+
+

rf/ts/dev_raf.js

@@ -0,0 +1,308 @@
+
+
+function isEven(n) {
+   return Math.floor(n) % 2 == 0;
+}
+function to_server_time(t){
+	return t - - qdb.td
+
+}
+function to_client_time(t){
+	return t -  qdb.td
+	
+}
+
+function start_dev_raf(){
+	  glob_dbg.ff.ts = Date.now()
+	  glob_dbg.ff.ts = glob_dbg.ff0.ts
+    glob_dbg.ff.stop = 0
+    // glob_dbg.ff.n = $(".toggle_ff")[0]
+    glob_dbg.ff.n = $(".shared_vid_overlay")[0]
+    glob_dbg.ff.n.classList.remove("dev_raf_t0")
+    glob_dbg.ff.n.classList.remove("dev_raf_t1")
+
+    dev_raf()
+}
+
+
+function stop_dev_raf(){
+	  // glob_dbg.ff.ts = Date.now()
+    glob_dbg.ff.stop = 1
+    // glob_dbg.ff.n = $(".toggle_ff")[0]
+}
+function step_dev_raf(){
+	  // glob_dbg.ff.ts = Date.now()
+    glob_dbg.ff.stop = 1
+    glob_dbg.ff.step = 1
+	  glob_dbg.ff.ts = glob_dbg.ff0.ts
+    glob_dbg.ff.n = $(".shared_vid_overlay")[0]
+    glob_dbg.ff.n.classList.remove("dev_raf_t0")
+    glob_dbg.ff.n.classList.remove("dev_raf_t1")
+    dev_raf()
+    // glob_dbg.ff.n = $(".toggle_ff")[0]
+}
+
+function step_dev_raf_t(){
+	  // glob_dbg.ff.ts = Date.now()
+    glob_dbg.ff.stop = 1
+    glob_dbg.ff.step = 1
+	  glob_dbg.ff.ts = glob_dbg.ff0.ts
+	  // glob_dbg.ff.ts1 = Date.now()
+    glob_dbg.ff.n = $(".shared_vid_overlay")[0]
+    glob_dbg.ff.n.classList.remove("even")
+    glob_dbg.ff.n.classList.add("dev_raf_t0")
+    glob_dbg.ff.n.classList.remove("dev_raf_t1")
+    // setTimeout(dev_raf_t,1500)
+	  glob_dbg.ff.ts1 = to_server_time(Date.now())
+    setTimeout(dev_raf_t,1150)
+    // dev_raf_t()
+    // glob_dbg.ff.n = $(".toggle_ff")[0]
+}
+
+
+
+
+
+
+
+
+function dev_raf_t(){
+	if (glob_dbg.ff.stop && !glob_dbg.ff.step){
+		return
+	}
+
+	let now = Date.now()
+
+	let ts = glob_dbg.ff.ts
+	let then = glob_dbg.ff.then
+	let tcount0  = (now - ts ) / 1000
+	// let tcount = tcount0 + qdb.td2
+
+	// let tcount = tcount0 - qdb.td2
+	let tcount = tcount0 - qdb_td2
+	let tcount2 = tcount0 + qdb_td2
+	// let tcount2 = tcount0 + qdb.td2
+
+	// glob_dbg.ff.n.innerHTML = tcount0 + "<br>" + tcount + "<br>" +  tcount2 + "<br>"+ ( now - then ) + "<br>"  +qdb_td2  +  "<br>"  
+	glob_dbg.ff.n.innerHTML =  `  ${tcount0} <br>${tcount} <br>${tcount2} <br>${ now - then }<br>${qdb_td2}  <br>`
+	glob_dbg.ff.then=now
+    glob_dbg.ff.n.classList.remove("dev_raf_t0")
+    glob_dbg.ff.n.classList.add("dev_raf_t1")
+    /*
+	if (isEven((tcount )/5)){
+		glob_dbg.ff.n.classList.add("even")
+		// glob_dbg.ff.n.classlist
+	} else {
+		glob_dbg.ff.n.classList.remove("even")
+	}
+	// glob_dbg.ff.mmc
+	glob_dbg.ff.mma.push(now - then)
+	// glob_dbg.ff.mma.push(glob_dbg.ff.mmc)
+	glob_dbg.ff.mma.shift()
+
+
+	glob_dbg.ff.mmc = 0
+    */
+
+	if (glob_dbg.ff.stop){
+		return
+	}
+
+	requestAnimationFrame(dev_raf_t)
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+function dev_raf(){
+	if (glob_dbg.ff.stop && !glob_dbg.ff.step){
+		return
+	}
+
+	let now = Date.now()
+
+	let ts = glob_dbg.ff.ts
+	let then = glob_dbg.ff.then
+	let tcount0  = (now - ts ) / 1000
+	// let tcount = tcount0 + qdb.td2
+
+	// let tcount = tcount0 - qdb.td2
+	let tcount = tcount0 - qdb_td2
+	let tcount2 = tcount0 + qdb_td2
+	// let tcount2 = tcount0 + qdb.td2
+
+	glob_dbg.ff.n.innerHTML = tcount0 + "<br>" + tcount + "<br>" +  tcount2 + "<br>"+ ( now - then ) + "<br>"  +qdb_td2 + "<br>" + glob_dbg.ff.mmc + "<br>" + Math.max(...glob_dbg.ff.mma) + "<br>" + glob_dbg.ff.mma
+	glob_dbg.ff.then=now
+	if (isEven((tcount )/5)){
+		glob_dbg.ff.n.classList.add("even")
+		// glob_dbg.ff.n.classlist
+	} else {
+		glob_dbg.ff.n.classList.remove("even")
+	}
+	// glob_dbg.ff.mmc
+	glob_dbg.ff.mma.push(now - then)
+	// glob_dbg.ff.mma.push(glob_dbg.ff.mmc)
+	glob_dbg.ff.mma.shift()
+
+
+	glob_dbg.ff.mmc = 0
+
+	if (glob_dbg.ff.stop){
+		return
+	}
+
+	// requestAnimationFrame(dev_raf)
+	requestAnimationFrame(dev_raf)
+
+}
+// clog("m2 glob_dbg",window.glob_dbg)
+
+// clog("RF m2 070")
+
+
+
+
+
+
+
+
+
+
+glob_dbg.ff={
+	stop:1,
+	mmc:0,
+	mma:[-1,-1,-1,-1,-1,-1,-1],
+	 n:$(".shared_vid_overlay")[0]
+}
+
+
+
+
+/*
+    config.desktopSharingFrameRate ={
+        min: 15,
+        max: 15
+    },
+
+*/
+
+glob_dbg.et = 0
+glob_dbg.et = glob_dbg.et || {
+	tsarr :[],
+	tsarr2 :[],
+} 
+
+function ltime0(n){
+	glob_dbg.et.x = Date.now()
+	setTimeout(ltime,0,0)
+	setTimeout(ltime,1,1)
+	setTimeout(ltime,2,2)
+	setTimeout(ltime,3,3)
+	setTimeout(ltime,4,4)
+	setTimeout(ltime,20,5)
+	setTimeout(ltime,40,6)
+	glob_dbg.et.x2 = Date.now()
+
+}
+function ltime(n){
+	glob_dbg.et.tsarr2[n] = Date.now()
+	// glob_dbg.et.tsarr.push(Date.now())
+
+}
+function exact_time(c=0){
+	if (c > 16){
+		return
+	}
+	setTimeout(exact_time,0,c+1)
+	glob_dbg.et.tsarr.push(Date.now())
+
+}
+
+function et_info(){
+	var t = 0
+	var ret = [] 
+	var k,v 
+	for (k of glob_dbg.et.tsarr){
+		ret.push(k-t)
+		t=k
+	}
+	return ret
+}
+
+function et_info2(){
+	var t = glob_dbg.et.x
+	var ret = [] 
+	var k,v 
+	for (k of glob_dbg.et.tsarr2){
+		ret.push(k-t)
+		// t=k
+	}
+	clog(glob_dbg.et.x2 - glob_dbg.et.x)
+	return ret
+}
+// glob_dbg.ff0 = 0
+glob_dbg.ff0 = glob_dbg.ff0 || {
+	ts:1594655494321,
+}
+
+
+function ff0_init(){
+	try {
+		clog(msto)
+		if (glob_mx.flags.init_db && msto.conference.ts){
+			glob_dbg.ff0.ts = msto.conference.ts
+		}
+		qdb.td ? 0 : qdb.time_sync()
+		glob_dbg.ff.n.classList.remove("even")
+	} catch (e){
+		clog("ff0 err:",e)
+	}
+
+}
+function reset_ts(){
+	// msto.conference.ts = Date.now() - qdb.td2
+	msto.conference.ts = Date.now() - Math.round(qdb.td2)
+	// msto.conference.ts = Date.now() - Math.round(qdb.td2)
+}
+
+
+
+ff0_init()
+
+
+window.qdb ? qdb_td2 = qdb.td2/1000 : 0
+// start_dev_raf()
+    // setTimeout(start_dev_raf,-100)
+    
+
+
+step_dev_raf()
+step_dev_raf_t()
+
+
+
+
+
+
+
+
+

rf/ts/ts.css

@@ -0,0 +1,35 @@
+
+
+.shared_vid_overlay{
+	position: relative;
+	/*text-align: left !important;*/
+	text-align: justify !important;
+	display: block;
+	/*width: 200px;*/
+	z-index: 20;
+	width: 100%;
+	height: 100%;
+	/*display: inline-block;*/
+}
+.shared_vid_overlay.even{
+
+	background-color: #0088;
+}
+
+.dev_raf_t0 {
+	background-color: #8008;
+
+}
+
+.dev_raf_t1 {
+	background-color: #0ff4;
+
+}
+
+.sv_info {
+	position: absolute;
+	width: 50%;
+	height: 50px;
+	/*background-color: red;*/
+	z-index: 3;
+}

rf/ts/ts.html

@@ -0,0 +1,8 @@
+
+TS<br>
+<!--#echo var="DATE_GMT" --> 
+<br>
+
+<!--#echo var="time_iso8601" --> 
+<br>
+<!--#echo var="msec" --> 

rf/ts/ts.js

@@ -0,0 +1,15 @@
+
+
+
+ts_js = {
+	filename:'<!--#echo var="request_filename" -->',
+	fn2:'<!--#echo var="uri" -->',
+	fn3:'<!--#echo var="args" -->',
+	ts:<!--#echo var="msec" --> ,
+	ts2:Date.now() ,
+}
+
+
+ 
+// clog("TS_dbg TS.JS")
+

rf/ts/ts.json

@@ -0,0 +1,9 @@
+
+
+{
+	"filename":"<!--#echo var='request_filename' -->",
+	"fn2":"<!--#echo var="uri" -->",
+	"fn3":"<!--#echo var="args" -->",
+	"ts":"<!--#echo var="msec" -->" ,
+	"ts2":"Date.now()" ,
+}

rf/ts/ts.txt

@@ -0,0 +1,9 @@
+
+
+{
+	"filename":"<!--#echo var='request_filename' -->",
+	"fn2":"<!--#echo var="uri" -->",
+	"fn3":"<!--#echo var="args" -->",
+	"ts":"<!--#echo var="msec" -->" ,
+	"ts2":"Date.now()" ,
+}

rf/ts/ts2.html

@@ -0,0 +1,9 @@
+
+
+{
+	"filename":"<!--#echo var='request_filename' -->",
+	"fn2":"<!--#echo var="uri" -->",
+	"fn3":"<!--#echo var="args" -->",
+	"ts":<!--#echo var="msec" --> ,
+	"ts2":"Date.now()" ,
+}

rf/ts/ts_dev.js

@@ -0,0 +1,52 @@
+
+
+// browser_tag
+
+
+// browser_tag
+
+
+
+if (typeof(window.isonfocus) == "undefined"){
+	window.isonfocus=true
+}
+
+// var isonfocus=true;  
+window.onblur = function(){  
+	clog("onblur")
+  isonfocus=false;  
+}  
+window.onfocus = function(){  
+	clog("onfocus")
+  isonfocus=true;  
+}
+
+
+function isviv(){
+	if (localStorage.browser_tag == "Vivaldi"){
+		clog("isviv")
+		$("body").addClass("vivaldi")
+	} else {
+		clog("!isviv")
+
+	}
+
+}
+
+isviv()
+
+
+function sv_trc(o){
+	let cnick = ""
+	if (o.cname == "SharedVideoManager"){
+		cnick = "svm"
+	} else if (o.cname == "SharedVideoContainer") {
+		cnick = "svc"
+
+	}
+		// SharedVideoManager
+		// SharedVideoContainer
+	clog("sv_trc",cnick,o.fn_name,[o])
+}
+
+

rf/ts/ts_req.js

@@ -0,0 +1,178 @@
+
+
+
+glob_ts = window.glob_ts || {}
+
+function ts_req() {
+		clog("ts_dbg")
+		var file = {
+			url:"/ign/rf/ts/ts.js",
+  			cache:false,
+  			data:{"z":"abc"},
+  			dataType: "script",
+  			success:ts_rsp,
+		}
+		var ts = {}
+
+			var aii 
+		ts.t0= Date.now()
+			aii= $.ajax(file)
+		ts.t1= Date.now()
+			aii.jreq=file
+			aii.jmeta=ts
+
+
+		// clog("RLD CHECK")
+		/*
+		for (var file of this.arr){
+			var aii 
+			aii= $.ajax({
+  				url: file.url,
+  				data: file.qs,
+  				cache:false,
+  				success: file.respH,
+  				dataType: "text"
+			})
+			aii.rldh=file
+		}
+		*/
+	}
+
+function ts_rsp(resp,status,jqXHR) {
+	// clog("ts_dbg ts_rsp",{that:this,args:[arguments]})
+	var tfin = Date.now()
+	clog("ts_dbg ts_rsp",{that:this,resp,status,jqXHR,ts_js,tfin})
+	var ts_arr,ts_com
+	var ts_obj
+	ts_arr = [
+	jqXHR.jmeta.t0,
+	jqXHR.jmeta.t1,
+	ts_js.ts,
+	ts_js.ts2,
+	tfin,
+	]
+
+	ts_obj = {
+	req0:jqXHR.jmeta.t0,
+	req1:jqXHR.jmeta.t1,
+	server:ts_js.ts,
+	js:ts_js.ts2,
+	fin:tfin,
+	}
+
+	clog(ts_arr,ts_obj)
+	glob_ts.ts_obj = ts_obj
+	glob_ts.ts_arr = ts_arr
+	var tping = tfin - jqXHR.jmeta.t0
+	var tavg = (tfin + jqXHR.jmeta.t0)/2
+	var tsrv = ts_obj.server * 1000
+	var tdiff = tsrv  - tavg
+	ts_com = {
+		ts_dbg:"ts_com",
+		tping,
+		tavg,
+		tsrv,
+		tdiff,
+	}
+	glob_ts.ts_com = ts_com
+	console.table(ts_com)
+	// clog("ts_dbg","tdiff:",,)
+
+
+}
+
+
+function ts_req2() {
+		clog("ts_dbg")
+		var file = {
+			url:"/ign/rf/ts/tse.js",
+  			cache:false,
+  			data:{"z":"abc"},
+  			// dataType: "text",
+  			// dataType: "plane-text",
+  			dataType: "text",
+  			success:ts_rsp2,
+		}
+		var ts = {}
+
+			var aii 
+		ts.t0= Date.now()
+		file.xyz =ts.t0
+			aii= $.ajax(file)
+		// ts.t1= Date.now()
+			// aii.jreq=file
+			// aii.jmeta=ts
+
+
+		// clog("RLD CHECK")
+		/*
+		for (var file of this.arr){
+			var aii 
+			aii= $.ajax({
+  				url: file.url,
+  				data: file.qs,
+  				cache:false,
+  				success: file.respH,
+  				dataType: "text"
+			})
+			aii.rldh=file
+		}
+		*/
+	}
+
+function ts_rsp2(resp,status,jqXHR) {
+	// clog("ts_dbg ts_rsp",{that:this,args:[arguments]})
+	var tfin = Date.now()
+	// ts_js
+	clog("ts_dbg ts_rsp2",{that:this,resp,status,jqXHR,tfin})
+	// clog("ts_dbg ts_rsp2..",tfin - jqXHR.jmeta.t0)
+	clog("ts_dbg ts_rsp2..",tfin - this.xyz)
+	return
+
+	// clog("ts_dbg ts_rsp",{that:this,resp,status,jqXHR,ts_js,tfin})
+	var ts_arr,ts_com
+	var ts_obj
+	ts_arr = [
+	jqXHR.jmeta.t0,
+	jqXHR.jmeta.t1,
+	ts_js.ts,
+	ts_js.ts2,
+	tfin,
+	]
+
+	ts_obj = {
+	req0:jqXHR.jmeta.t0,
+	req1:jqXHR.jmeta.t1,
+	server:ts_js.ts,
+	js:ts_js.ts2,
+	fin:tfin,
+	}
+
+	clog(ts_arr,ts_obj)
+	glob_ts.ts_obj = ts_obj
+	glob_ts.ts_arr = ts_arr
+	var tping = tfin - jqXHR.jmeta.t0
+	var tavg = (tfin + jqXHR.jmeta.t0)/2
+	var tsrv = ts_obj.server * 1000
+	var tdiff = tsrv  - tavg
+	ts_com = {
+		ts_dbg:"ts_com",
+		tping,
+		tavg,
+		tsrv,
+		tdiff,
+	}
+	glob_ts.ts_com = ts_com
+	console.table(ts_com)
+	// clog("ts_dbg","tdiff:",,)
+
+
+}
+
+
+
+
+
+
+glob_ts.t = Date.now()
+setTimeout(ts_req,1250)

rf/ts/tse.js

@@ -0,0 +1 @@
+:<!--#echo var="msec" -->

rf/u/universals.js

@@ -2,8 +2,8 @@
 
 clog = console.log
 function nop(){}
-window.dev_flag = 0
-// window.dev_flag = 1
+// window.dev_flag = 0
+window.dev_flag = 1
 
 if (window.dev_flag){
 

rf/ui_msg/r1.js

@@ -11,28 +11,7 @@ function rvm_to(a){
 	var svg,icon_template
 
 	var jmod_templates_ui_msg = $(mod_templates_ui_msg)
-	// n = jmod_templates_ui_msg.find(".popup_item_t")
-	// n = jmod_templates_ui_msg.find(".popup_item")
 	n = jmod_templates_ui_msg.find(".popup_item_req")
-	// ji_mic_on
-	/*
-
-	// svg = $(`<span>${glob_mx.svg["mic-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
-	svg = $(`<span>${glob_mx.svg["mic-camera-combined.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
-	// svg[0].setAttribute("width",16)                           
-	// svg[0].setAttribute("height",16)  
-	n.find(".jitsi-icon").append(svg)
-
-	svg = $(`<span>${glob_mx.svg["close.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
-	svg[0].setAttribute("width",16)                           
-	svg[0].setAttribute("height",16) 
-	svg.addClass("x_svg") 
-	n.find(".jitsi-icon").append(svg)
-	*/
-
-	// ji_mic_on
-	// popup_item
-	// popupmenu
 	n.find(".av_io").click(evnt_av_io)
 	$(".popupmenu").prepend(n)
 
@@ -576,10 +555,7 @@ function evnt_av_io(a,a2,a3){
 	} else {
 		// participant_07b5a03f
 		j.parents(".small_vid")[0]
-		// clog("ELS",j.parents(".small_vid")[0].id.split("_").pop())
-		// o.id = j.parents(".small_vid")[0].id.split("_").pop()
 		o.to = j.parents(".small_vid")[0].id.split("_").pop()
-		// o.to = "abc"
 	}
 	req_av_send(o)
 
@@ -607,12 +583,9 @@ function refresh_overflow_menu_only(){
 
 
 console.log("R1",$("#sharedVideoIFrame")[0].contentWindow)
-// $(".popover")
 // dispatch_evnt()
 // refresh_overflow_menu()
 // toggle_overflow_menu()
-// toggle_overflow_menu()
-// toggle_overflow_menu()
 
 
 

rf/ui_msg/r2.js

@@ -16,8 +16,6 @@ defined_depth_dflt = {
 
 function defined_depth(o) {
 	var n
-	// n = $("#sideToolbarContainer").clone()
-	// n = $(".sideToolbarContainer").clone()
 	n=$(o.root).clone()
 	clog("DEF DEPTH",n)
 
@@ -67,8 +65,6 @@ function defined_depth(o) {
 	k.parent().addBack().removeAttr("id")
 
 	return {n,z:n[0],raw_str:n[0].outerHTML,k,k2:k.parent().addBack()}
-
-	// n = $("#sideToolbarContainer")
 	// n.remove()
 
 	// body...
@@ -116,8 +112,6 @@ function r_callback(){
 tbx_u = 0
 tbx_uadd = 0
 function toolbox_update(o,name){
-	// console.trace("toolbox_update")
-	// _overflowMenuVisible
 	var diff,prevProps,that,props,ovrm
 	var attrs = [
 	"_overflowMenuVisible",
@@ -142,7 +136,7 @@ function toolbox_update(o,name){
 	} else if (o.prevProps._overflowMenuVisible && !o.that.props._overflowMenuVisible){
 		close_ovfm(ovrm)
 	}
-	clog(name,o,diff,tbx_u,ovrm,o.prevProps._overflowMenuVisible && !o.that.props._overflowMenuVisible)
+	// clog(name,o,diff,tbx_u,ovrm,o.prevProps._overflowMenuVisible && !o.that.props._overflowMenuVisible)
 
 	if (Object.entries(diff).length){
 

rf/ytsv/y.css

@@ -39,7 +39,10 @@ div#sharedVideo {
 
 .yt_thumb{
 	opacity: 0;
+}
+.yt_thumb.yt_thumb_focus{
 	pointer-events: none;
+
 }
 .ic1 {
 	/*opacity: .4;*/
@@ -83,4 +86,81 @@ div#sharedVideo {
 .yt_fs_focus .ic1> *:not(.yt_thumb) {
 	pointer-events: auto;
 	/*opacity: .4;*/
-}
+}
+
+
+
+
+
+
+
+
+
+
+.yt_fs .toggle_ff {
+	bottom: 45px !important;
+	padding-bottom: 0px;
+	/*left: 50%;*/
+	right:  50%;
+	transform: translateX(50%);
+}
+
+
+.yt_fs_focus {
+	/*background-color: red;*/
+}
+
+
+
+.toggle_ff.lvov{
+	/*opacity: 1 !important;*/
+}
+
+.yt_fs {
+	/*background-color: red;*/
+	/*outline: 20px solid #004;*/
+	/*outline: 20px inset #004;*/
+	outline: 20px ridge #008;
+	outline-offset: -15px;
+	/*opacity: 0;*/
+}
+.x_yt_fs2.x {
+	/*opacity: .5;*/
+		/*outline: 20px ridge #008;*/
+	background-color: #ff0;
+	/*outline-offset: -15px;*/
+}
+.x_yt_fs {
+	/*background-color: #055;*/
+		/*outline: 20px ridge #008;*/
+	/*outline-offset: -15px;*/
+}
+
+
+
+#largeVideoContainer{
+}
+
+
+#sharedVideoIFrame.z {
+	position: relative;
+
+	height:calc(var(--vheight) *  1px + 360px) !important;
+	/*padding-bottom: 20px;*/
+	top:0px;
+	/*padding-top: 0px;*/
+	/*height:  */
+	/*width: 100% !important;*/
+	/*height: 100% !important;*/
+	/*position: */
+	/*bottom: 0px;*/
+}
+
+
+
+.vivaldi #sharedVideo{
+	/*pointer-events: auto;*/
+	/*padding-bottom: 20px;*/
+}
+
+

rf/ytsv/y.js

@@ -48,6 +48,7 @@ function bcr_offset(b1,b2){
 
 
 function mv_yt(){
+	// clog("ytp_dbg MV_YT")
 	// clog( $(`#sharedVideoContainer.small_vid`),$("#sharedVideo"))
 	var shared_small_vid,shared_vid,sv_css,shared_vid_bcr,small_vid_bcr,node_offset
 	// var shared_vid
@@ -85,6 +86,9 @@ function mv_yt(){
 		// $("#sharedVideo").css("pointer-events")
 	if (shared_vid.css("pointer-events") != "none"){
 			shared_small_vid.addClass("yt_thumb_focus")
+	// $(".fs_container").removeClass("yt_fs")
+	// $(".fs_container").addClass("yt_sv")
+	// $(".lvov_container").addClass("yt_fs_focus")
 	$(".fs_container").addClass("yt_fs_focus")
 	}
 
@@ -105,6 +109,12 @@ function mv_yt0(){
 	shared_small_vid.removeClass("yt_thumb")
 	shared_small_vid.removeClass("yt_thumb_focus")
 	$(".fs_container").removeClass("yt_fs_focus")
+
+
+	// $(".fs_container").addClass("yt_fs")
+	// $(".fs_container").removeClass("yt_sv")
+
+
 	shared_vid.css(dflt_shared_vid_css)
 	clog("mv_yt")
 }
@@ -137,8 +147,54 @@ function slvp(o){
 	mvyt_helper()
 }
 window.glob_mx.qxi_cb.SELECT_LARGE_VIDEO_PARTICIPANT.fn = slvp
+
+
+function yt_ui(lvp,lvs){
+
+if ($("#sharedVideoContainer.small_vid").length &&  $("#sharedVideo").css("pointer-events") != "none") {
+
+
+		 // $(".fs_container").removeClass("x_yt_fs")
+		 $(".lvov_container").addClass("yt_fs")
+
+	} else {
+		 $(".lvov_container").removeClass("yt_fs")
+
+	}
+
+}
+function yt_ui2(lvp,lvs){
+		 $(".fs_container").removeClass("x_yt_fs2")
+
+	if ((!lvs.isVideoMuted ) && (!(lvp.isFakeParticipant && lvp.name == "YouTube") )){
+		 $(".lvov_container").removeClass("yt_fs")
+		 $(".fs_container").addClass("x_yt_fs")
+		 if ($("#sharedVideoContainer.small_vid").length) {
+		 $(".fs_container").addClass("x_yt_fs2")
+
+		 }
+
+
+	} else if ($("#sharedVideoContainer.small_vid").length &&  $("#sharedVideo").css("pointer-events") != "none") {
+
+
+		 $(".fs_container").removeClass("x_yt_fs")
+		 $(".lvov_container").addClass("yt_fs")
+
+	} else {
+		 $(".fs_container").addClass("x_yt_fs")
+		 $(".lvov_container").removeClass("yt_fs")
+
+	}
+
+	// $("#sharedVideoContainer.small_vid")
+}
+
+
 function get_large_vid(){
 	var lv,smallvids,participants,id,lvp,lvs
+	// $(".fs_container").removeClass("yt_sv")
+	// $(".fs_container").removeClass("yt_fs")
 	lv = APP.store.getState()['features/large-video']
 	id = lv.participantId
 
@@ -160,7 +216,15 @@ function get_large_vid(){
 		mv_yt0()
 
 	}
-	// glob_dev_hooks.smallvids
+
+	// $("#sharedVideoContainer.small_vid")
+	yt_ui(lvp,lvs)
+	// if (lvp.isFakeParticipant && lvp.name == "YouTube"){
+
+	// }
+	// fix theater & full screen possitions
+	 // $("#sharedVideo").css("pointer-events")
+ 
 
 }
 
@@ -172,9 +236,15 @@ function init_db_yt(){
 	clog("init_db_yt...",jc(msto))
 	msto.my_data.yt_dbg = {
 		yt_id:"",
+		shared:{},
 		yt_all_evnt:[],
 		yt_evnt:[],
 	}
+	glob_dbg.participants = get_participants()
+	if (glob_dbg.ytp_onload){
+		clog("yt_dbg onload")
+		yt_check_status()
+	}
 	// msto.
 }
 
@@ -198,12 +268,148 @@ what_is_loaded()
 // window.glob_mx.qxi_cb.PARTICIPANT_LEFT    = window.glob_mx.qxi_cb.PARTICIPANT_LEFT || {}
 // window.glob_mx.qxi_cb.CONFERENCE_JOINED    = window.glob_mx.qxi_cb.CONFERENCE_JOINED || {}
 // window.glob_mx.qxi_cb.PARTICIPANT_JOINED  = window.glob_mx.qxi_cb.PARTICIPANT_JOINED || {}
+function yt_remove(){
+	glob_dbg.svm.onSharedVideoStop(glob_dbg.svm.from)
+}
+
+
 
+function identical(array) {
+    for(var i = 0; i < array.length - 1; i++) {
+        if(array[i] !== array[i+1]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+
+
+function yt_conf_match(){
+	if (!glob_mx.flags.init_db){return}
+	var yt_id = glob_dbg.svc.id
+	var shared_by = glob_dbg.svm.from
+	if (msto.conference.yt && yt_id == msto.conference.yt.id && shared_by == msto.conference.yt.shared_by){
+		return true
+	} 
+	return false
+
+}
+
+
+function yt_rem1(){
+	var m
+	clog("yt_dbg yt_rem1")
+	m=yt_conf_match()
+	if (m){
+		if (msto.conference.yt.stopped){
+		yt_check_status("YR1")
+			setTimeout(yt_remove,100)
+			// yt_remove()
+		}
+	} else {
+		setTimeout(yt_rem2,250)
+	}
+}
+
+function yt_rem2(){
+	var m
+	m=yt_conf_match()
+	clog("yt_dbg2 yt_rem1")
+
+	if (m && !msto.conference.yt.stopped){
+		// if (msto.conference.yt.stopped){
+		// }
+	} else {
+		yt_check_status("YR2")
+			setTimeout(yt_remove,10)
+		// yt_remove()
+
+	}
+
+}
+
+function detect_stop(n){
+	try {
+		return yt_conf_match() && !msto.conference.yt.stopped
+	 // clog(yt_conf_match() && !msto.conference.yt.stopped)
+	} catch {
+		return "err"
+	}
+
+}
+function yt_check_status(n){
+
+
+	try {
+
+
+
+
+	var yt_id = glob_dbg.svc.id
+	var shared_by = glob_dbg.svm.from
+	var ret
+	var tdiff
+	ret = {
+		msto:jc(msto),
+		yt:jc(msto.conference.yt),
+		yt_dbg:jc(msto.my_data.yt_dbg),
+		yt_id,
+		shared_by,
+	}
+
+	try {
+	ret.A_conf_match = yt_conf_match()
+	ret.A_yt_stopped = !!msto.conference.yt.stopped
+	ret.A_detect_stop = detect_stop()
+	ret.tdiff = msto.my_data.yt_dbg.shared.now - msto.conference.yt.now 
+		// tdiff:
+	ret.ident_id = identical([yt_id,msto.conference.yt.id,msto.my_data.yt_dbg.shared.id])
+	ret.ident_from =  identical([shared_by,msto.conference.yt.shared_by,msto.my_data.yt_dbg.shared.shared_by])
+	// msto.conference.yt.stopped
+	// msto.participants["7d2b7157"]
+	} catch (err) {}
+	// shared_by
+
+		clog("yt_dbg yt_stat",n,ret)
+
+
+	// shared_by
+
+	// msto.conference.yt
+	// msto.my_data.yt_dbg
+		// clog("yt_dbg yt_stat err:",n,err)
+	
+	} catch (err) {
+		clog("yt_dbg yt_stat err:",n,err)
+	}
+	
+
+}
 function yt_left(o){
 	try {
 
 		// clog("yt_dbg yt_left",{init_db:glob_mx.flags.init_db,o})
-		clog("yt_dbg yt_left",glob_mx.flags.init_db ? 1 : 0,o)
+		var now,shared_by,ytp,local
+		if (o.action.participant.id == msto.my_data.yt_dbg.shared.id && msto.my_data.yt_dbg.shared.id){
+			local = get_local() 
+			now = Date.now()
+			if (msto.my_data.yt_dbg.shared.shared_by == local.id) {
+				msto.conference.yt.stopped = 1
+			}
+			// delete msto.conference.yt
+			msto.my_data.yt_dbg.shared = {}
+			// delete msto.conference.yt
+			// shared_by = glob_dbg.svm.from
+		} else {
+
+		}
+
+
+		
+
+
+		clog("yt_dbg yt_left",glob_mx.flags.init_db ? 1 : 0,{svm:glob_dbg.svm,svc:glob_dbg.svc,o,participants:get_participants(),smallvids:get_smallvids()})
 		return
 	// clog("yt_dbg yt_left0")
 	clog("yt_dbg yt_left",{that:this,args:[...arguments]})
@@ -215,11 +421,52 @@ function yt_left(o){
 
 }
 function yt_join(o){
-	try {
+	try {		
+		var now,shared_by,ytp,local
+		if (o.action.participant.isFakeParticipant && o.action.participant.name == "YouTube"){
+			// glob_mx.flags.init_db ? 0 :  setTimeout(yt_check_status,250,o)
+			glob_mx.flags.init_db ? 0 :  setTimeout(yt_check_status,250,"no_msto t")
+			glob_mx.flags.init_db ? 0 :  glob_dbg.ytp_onload = 1
+
+			local = get_local() 
+			now = Date.now()
+			shared_by = glob_dbg.svm.from
+			ytp = {shared_by,now}
+			ytp.id = o.action.participant.id
+
+			if (glob_dbg.svm.from == local.id){
+				ytp.a = "LOCAL"
+				msto.conference.yt = {
+					id:ytp.id,
+					shared_by,
+					now,
+				}
+				// msto.my_data.yt_dbg
+			}
+			if (msto.conference.yt){
+				if (shared_by == msto.conference.yt.shared_by && ytp.id == msto.conference.yt.id && !msto.conference.yt.stopped){
+				ytp.ytc = 1
+
+				} else {
+					ytp.ytc = "?"
+					yt_check_status("inv")
+					setTimeout(yt_check_status,250,"inv t")
+				}
+			} else {
+					yt_check_status("ytc")
+					setTimeout(yt_check_status,250,"ytc t")
+				ytp.ytc = 0
+			}
 
-		// glob_mx.flags.init_db ? 1 : 0
-		clog("yt_dbg yt_join",glob_mx.flags.init_db ? 1 : 0,o)
-		// clog("yt_dbg yt_join",{init_db:glob_mx.flags.init_db,o})
+			msto.my_data.yt_dbg.shared = ytp
+
+
+		} else {
+
+		return
+			
+		}
+		clog("yt_dbg yt_join",glob_mx.flags.init_db ? 1 : 0,{svm:glob_dbg.svm,svc:glob_dbg.svc,o,participants:get_participants(),smallvids:get_smallvids()})
 		return
 		var local = get_local() 
 		clog("yt_dbg J",o.action.participant,jc(o.action.participant))
@@ -238,7 +485,7 @@ function yt_join(o){
 
 	} catch (err){
 
-		clog("yt_dbg yt_join ERR:",err)
+		clog("yt_dbg yt_join ERR:",glob_mx.flags,err)
 	}
 
 
@@ -249,9 +496,10 @@ function yt_join(o){
 
 
 
-function mute_audio_helper(){
+function mute_audio_helper(n){
 	try {
 	// setAudioMuted
+	clog("yt_dbg yt_s",n)
 	disp(glob_react.media.setAudioMuted(1))
 
 	} catch (err) {