Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-07 14:46:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

finally fix pid , I'm sure @rogowski will be delighted!

Browse Source
This commit is contained in:
Mark Nadal 2019-05-21 00:21:02 -07:00
parent a6a5aec76f
commit a786944ed6
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gun.js
View File

@ -2038,7 +2038,7 @@
var wire = peer.wire || ((opt.wire) && opt.wire(peer));// || open(peer, ctx); // TODO: Reopen! var wire = peer.wire || ((opt.wire) && opt.wire(peer));// || open(peer, ctx); // TODO: Reopen!
if(!wire){ return } if(!wire){ return }
if(peer === meta.via){ return } if(peer === meta.via){ return }
if((tmp = meta.to) && (tmp[peer.url] || tmp[peer.id]) && !o){ return } // TODO: still needs to be tested if((tmp = meta.to) && (tmp[peer.url] || tmp[peer.pid] || tmp[peer.id]) && !o){ return } // TODO: still needs to be tested
if(peer.batch){ if(peer.batch){
peer.tail = (peer.tail || 0) + raw.length; peer.tail = (peer.tail || 0) + raw.length;
if(peer.tail <= opt.pack){ if(peer.tail <= opt.pack){
@ -2096,7 +2096,7 @@
} }
if(!msg.dam){ if(!msg.dam){
var i = 0, to = []; Type.obj.map(opt.peers, function(p){ var i = 0, to = []; Type.obj.map(opt.peers, function(p){
to.push(p.url || p.id); if(++i > 9){ return true } // limit server, fast fix, improve later! to.push(p.url || p.pid || p.id); if(++i > 9){ return true } // limit server, fast fix, improve later!
}); msg['><'] = to.join(); }); msg['><'] = to.join();
} }
var raw = $(msg); var raw = $(msg);
@ -2133,7 +2133,7 @@
if(peer.id || peer.url){ if(peer.id || peer.url){
opt.peers[peer.url || peer.id] = peer; opt.peers[peer.url || peer.id] = peer;
} else { } else {
tmp = peer.id = tmp.pid = peer.id || Type.text.random(9); tmp = peer.id = peer.id || Type.text.random(9);
mesh.say({dam: '?'}, opt.peers[tmp] = peer); mesh.say({dam: '?'}, opt.peers[tmp] = peer);
} }
peer.met = peer.met || +(new Date); peer.met = peer.met || +(new Date);
@ -2161,12 +2161,8 @@
// }); // });
return; return;
} }
if(!peer.wire){ return } if(peer.pid){ return }
if(!peer.wire.pid){ return } // only run code below if wire.pid exists peer.pid = msg.pid;
Type.obj.del(opt.peers, peer.wire.pid || peer.id);
delete peer.wire.pid;
peer.id = msg.pid;
mesh.hi(peer);
} }
return mesh; return mesh;
} }

2
test/axe/holy-grail.js
View File

@ -169,7 +169,7 @@ describe("The Holy Grail AXE Test!", function(){
}) })
}); });
it("Jhon Read what Bob say to Alice: Hi Alice!", function(){ it("John Read what Bob say to Alice: Hi Alice!", function(){
return john.run(function(test){ return john.run(function(test){
test.async(); test.async();
console.log("I AM JOHN"); console.log("I AM JOHN");