From b24778a00d10e5103362e8ddefed205a61f8da9a Mon Sep 17 00:00:00 2001
From: rogowski <163828+rogowski@users.noreply.github.com>
Date: Mon, 4 Jan 2021 17:59:25 -0300
Subject: [PATCH] Update trace.js

Change `Gun.logs` to `Gun.traces` and `Gun._log` to `Gun._trace`.
---
 test/trace.js | 47 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/test/trace.js b/test/trace.js
index 0e89cdc2..2e4ad5ec 100644
--- a/test/trace.js
+++ b/test/trace.js
@@ -1,21 +1,23 @@
 // @rogowski CAME UP WITH THIS BRILLIANT GENIUS ABSOLUTELY AMAZING AWESOME IDEA!!!!
 ///// TESTS rogowski
-Gun.logs=[`Participant GUN`];
+Gun.traces=[`Participant GUN`];
 // Gun.logs=[];
-Gun._log = function(evname, msg) {
-  clearTimeout(Gun._log.to);
-  Gun._log.to = setTimeout(function(){
-    Gun.on('trace.end', {code: Gun.logs.join('\n')});
+Gun._trace = function(evname, msg) {
+  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);
 //         msg=evname;
 //         evname = 'GUN';
   }
-  if (!Gun.lastev) { Gun.lastev=evname||'PEER'; };
-//       msg.lastev = Gun.lastev;
-  Gun._log.i = Gun._log.i ? ++Gun._log.i : 1;
-  console.log(`*(${Gun._log.i}) ${Gun.lastev}->:%s, msg:`, evname, msg);
+  if (!Gun._tracelastev) {
+    Gun._tracelastev=evname||'PEER';
+  };
+//       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);
 
   var __ = (!msg||!msg['#'] ? '' : ('#:'+msg['#']).slice(0,6)+'...');
   var dam = (!msg||!msg.dam ? '' : ('dam:'+msg.dam));
@@ -24,20 +26,31 @@ Gun._log = function(evname, msg) {
   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 put = !(msg && ('put' in msg)) ? '' : ('put:'+Gun._clean(msg.put)).slice(0,30)+'...';
-//       if (dam && Gun.lastev==='UNIVERSE') { evname='PEER'; }
-  var keys = Object.keys(msg||{}).sort();
+  var put = !(typeof msg === 'object' && ('put' in msg)) ? '' : ('put:'+Gun._clean(msg&&msg.put?msg.put:'')).slice(0,30)+'...';
+  
+//   Gun._tracelastevdt Gun._tracelastev;
+//   Gun._tracelastevdt = +new Date();
+
+  var tm = +new Date();
+  Gun._tracelastevdt = +new Date();
+
+//       if (dam && Gun._tracelastev==='UNIVERSE') { evname='PEER'; }
+  var keys = Array.isArray(msg) ? keys.sort().join(',')
+    : typeof msg==='object' ? Object.keys(msg).sort().join(',')
+    : 'this';
   if (dam) {
     if (msg['#']) {
       evname='GUN';
     } else {
-      Gun.lastev='GUN';
+      Gun._tracelastev='GUN';
     }
-    Gun.logs.push(`${Gun.lastev}->${evname}: (${Gun._log.i})  {${keys}} ${get} ${put} ${__} ${dam} ${ram} ${id} ${at} ${lS}`);
+    Gun.traces.push(`${Gun._tracelastev}->${evname}: (${Gun._trace.i})  {${keys}} ${get} ${put} ${__} ${dam} ${ram} ${id} ${at} ${lS}`);
   } else {
-    Gun.logs.push(`${Gun.lastev}->${evname}: (${Gun._log.i})  {${keys}} ${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}: (${Gun._trace.i}) {${!keys?'this':keys}}`);
   }
 
-  Gun.lastev = evname;
+  Gun._tracelastev = evname;
+  Gun._tracelastevdt = tm;
 };
-Gun._clean = function(txt) { return JSON.stringify(typeof txt==='undefined' ? 'undef' : txt||null).replace(/"|\{|\}+/g,'').slice(0,20).trim(); };
\ No newline at end of file
+Gun._clean = function(txt) { return JSON.stringify(typeof txt==='undefined' ? 'undef' : txt||null).replace(/"|\{|\}+/g,'').slice(0,20).trim(); };