From 5f1957019113294f7613f26e7ea00c3d11a95cb5 Mon Sep 17 00:00:00 2001 From: Mark Nadal Date: Tue, 5 Jan 2021 03:06:36 -0800 Subject: [PATCH] @rogowski approved of these trace changes :) --- test/trace.html | 106 +++++++++++++++++++++++++++++++++--------------- test/trace.js | 19 +++++---- 2 files changed, 85 insertions(+), 40 deletions(-) diff --git a/test/trace.html b/test/trace.html index bd7e8344..cb459d3d 100644 --- a/test/trace.html +++ b/test/trace.html @@ -8,6 +8,7 @@ html, body { margin: 0 0; font-family: monospace; padding: 10px 15px; + color: white; } body { background: rgba(0,0,0,0.7); @@ -35,6 +36,8 @@ body { }*/ #diagram svg text { fill: #79ce7f; + f-ill: black; + f-ill: red; } #diagram svg text:hover { fill: #20ff3b; @@ -48,6 +51,11 @@ body { #diagram svg .actor rect, #diagram svg .actor path { fill: #ffffff; + position: fixed; + top: 1em; +} +#diagram svg .actor { + opacity: 0; } #diagram svg .actor text { fill: #000000; @@ -60,6 +68,14 @@ body { stroke: rgba(0,0,0,0.5); /* stroke-width: 5px; */ } +.method { + font-size: 140%; + display: block; + background: black; + color: white; + padding: 0.3em; + top: 5em; +} @@ -82,52 +98,78 @@ body { diff --git a/test/trace.js b/test/trace.js index 2e4ad5ec..b83c0127 100644 --- a/test/trace.js +++ b/test/trace.js @@ -1,14 +1,15 @@ // @rogowski CAME UP WITH THIS BRILLIANT GENIUS ABSOLUTELY AMAZING AWESOME IDEA!!!! ///// TESTS rogowski -Gun.traces=[`Participant GUN`]; -// Gun.logs=[]; +//Gun.traces=[`Participant GUN`]; +Gun.traces=[]; Gun._trace = function(evname, msg) { + //if(!(console.only.i)){ return } clearTimeout(Gun._trace.to); Gun._trace.to = setTimeout(function(){ Gun.on('trace.end', {code: Gun.traces.join('\n')}); }, 1000); if (!msg) { - console.log('WARN, empty message: ',msg); + //console.log('WARN, empty message: ',msg); // msg=evname; // evname = 'GUN'; } @@ -17,15 +18,15 @@ Gun._trace = function(evname, msg) { }; // msg.lastev = Gun._tracelastev; Gun._trace.i = Gun._trace.i ? ++Gun._trace.i : 1; - console.log(`*(${Gun._trace.i}) ${Gun._tracelastev}->:%s, msg:`, evname, msg); + //console.log(`*(${Gun._trace.i}) ${Gun._tracelastev}->:%s, msg:`, evname, msg); - var __ = (!msg||!msg['#'] ? '' : ('#:'+msg['#']).slice(0,6)+'...'); + var __ = (!msg||!msg['#'] ? '' : ('#'+msg['#']).slice(0,4)+''); var dam = (!msg||!msg.dam ? '' : ('dam:'+msg.dam)); - var at = (!msg||!msg['@'] ? '' : ('@:'+msg['@']).slice(0,9)+'...'); + var at = (!msg||!msg['@'] ? '' : ('@:'+msg['@']).slice(0,9)+''); var lS = (!msg||!msg.lS ? '' : ('lS:'+msg.lS)); var id = (!msg||!msg.id ? '' : ('id:'+msg.id)); var ram = (!msg||!msg.ram ? '' : ('ram:'+msg.ram)); - var get = (!msg||!msg.get ? '' : ('get:'+Gun._clean(msg.get)).slice(0,15)+'...'); + var get = (!msg||!msg.get ? '' : ('get:'+Gun._clean(msg.get)).slice(0,15)+''); var put = !(typeof msg === 'object' && ('put' in msg)) ? '' : ('put:'+Gun._clean(msg&&msg.put?msg.put:'')).slice(0,30)+'...'; // Gun._tracelastevdt Gun._tracelastev; @@ -38,6 +39,7 @@ Gun._trace = function(evname, msg) { var keys = Array.isArray(msg) ? keys.sort().join(',') : typeof msg==='object' ? Object.keys(msg).sort().join(',') : 'this'; + if (dam) { if (msg['#']) { evname='GUN'; @@ -46,7 +48,8 @@ Gun._trace = function(evname, msg) { } Gun.traces.push(`${Gun._tracelastev}->${evname}: (${Gun._trace.i}) {${keys}} ${get} ${put} ${__} ${dam} ${ram} ${id} ${at} ${lS}`); } else { - Gun.traces.push(`${Gun._tracelastev}->${evname}: (${Gun._trace.i}) {${keys.slice(0,15)}} ${get} ${put} ${__} ${dam} ${ram} ${id} ${at} ${lS}`); + //Gun.traces.push(`${Gun._tracelastev}->${evname}: (${Gun._trace.i}) {${keys.slice(0,15)}} ${get} ${put} ${__} ${dam} ${ram} ${id} ${at} ${lS}`); + Gun.traces.push(Gun._tracelastev+'->'+evname+': '+(console.only.i||'')+' '+__); // Gun.traces.push(`${Gun._tracelastev}->${evname}: (${Gun._trace.i}) {${!keys?'this':keys}}`); }