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

fix possible peer leak & add feature for @go1dfish

Browse Source
This commit is contained in:
Mark Nadal 2019-05-14 00:45:04 -07:00
parent 083c1c59f8
commit 124d0146c8
5 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gun.js
View File

@ -2126,10 +2126,10 @@
mesh.hi = function(peer){ mesh.hi = function(peer){
var tmp = peer.wire || {}; var tmp = peer.wire || {};
if(peer.id || peer.url){ if(peer.id || peer.url){
Type.obj.del(opt.peers, tmp.pid);
opt.peers[peer.url || peer.id] = peer; opt.peers[peer.url || peer.id] = peer;
Type.obj.del(opt.peers, tmp.id);
} else { } else {
tmp = tmp.id = tmp.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);
} }
if(!tmp.hied){ ctx.on(tmp.hied = 'hi', peer) } if(!tmp.hied){ ctx.on(tmp.hied = 'hi', peer) }
@ -2154,7 +2154,9 @@
// }); // });
return; return;
} }
peer.id = peer.id || msg.pid; if(!peer.wire){ return }
if(peer.wire.pid){ return } // they already set their ID!
peer.id = peer.wire.pid = msg.pid;
mesh.hi(peer); mesh.hi(peer);
} }
return mesh; return mesh;

4
sea.js
View File

@ -1113,6 +1113,10 @@
} }
var ctx = this.as; var ctx = this.as;
(msg._||(msg._=function(){})).user = ctx.user; (msg._||(msg._=function(){})).user = ctx.user;
if(ctx.opt.faith && msg._.faith){ // you probably shouldn't have faith in this!
this.to.next(msg);
return;
}
security.call(this, msg); security.call(this, msg);
} }

4
sea/index.js
View File

@ -55,6 +55,10 @@
} }
var ctx = this.as; var ctx = this.as;
(msg._||(msg._=function(){})).user = ctx.user; (msg._||(msg._=function(){})).user = ctx.user;
if(ctx.opt.faith && msg._.faith){ // you probably shouldn't have faith in this!
this.to.next(msg);
return;
}
security.call(this, msg); security.call(this, msg);
} }

8
src/adapters/mesh.js
View File

@ -188,10 +188,10 @@ function Mesh(ctx){
mesh.hi = function(peer){ mesh.hi = function(peer){
var tmp = peer.wire || {}; var tmp = peer.wire || {};
if(peer.id || peer.url){ if(peer.id || peer.url){
Type.obj.del(opt.peers, tmp.pid);
opt.peers[peer.url || peer.id] = peer; opt.peers[peer.url || peer.id] = peer;
Type.obj.del(opt.peers, tmp.id);
} else { } else {
tmp = tmp.id = tmp.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);
} }
if(!tmp.hied){ ctx.on(tmp.hied = 'hi', peer) } if(!tmp.hied){ ctx.on(tmp.hied = 'hi', peer) }
@ -216,7 +216,9 @@ function Mesh(ctx){
// }); // });
return; return;
} }
peer.id = peer.id || msg.pid; if(!peer.wire){ return }
if(peer.wire.pid){ return } // they already set their ID!
peer.id = peer.wire.pid = msg.pid;
mesh.hi(peer); mesh.hi(peer);
} }
return mesh; return mesh;

50
test/tmp/tmp.html Normal file
View File

@ -0,0 +1,50 @@
<!DOCTYPE HTML>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="../../examples/style.css">
</head>
<body>
<style>
@import url('https://fonts.googleapis.com/css?family=Oxygen');
html, body {
font-family: "Oxygen", sans-serif;
}
</style>
<script src="../../examples/jquery.js"></script>
<script src="../../gun.js"></script>
<script src="../../sea.js"></script>
<script>
var db = Gun({faith: true});
setTimeout(function(){
console.log(db.get(window.SOUL)._.put);
return;
db.get(window.SOUL).once(function(data){
console.log('oye!', data);
})
}, 1000);
function test(result, dedupId){ setTimeout(function(){
if (result) {
var foo = function(){}; foo.faith = true;
db.on('in').to.next({
'@': dedupId,
from: 'local',
put: { [Gun.node.soul(result)]: result },
err: null,
_: foo
})
}
},100) }
test(window.foo = {"_":{"#": window.SOUL = "nab/things/1d0f60a50f65b95dd91036836904c3bcbe916300/data~JG43ynRxqjy1-AemyMUoz14UqKM6cnh7zSPy_EAPgts.RCZ5dY7iRaIW_B7cDBlBsDNKwn2QCtbbA1uQ6iL8ENw.",">":{"title":1557772735675,"body":1557772735675,"topic":1557772735675,"url":1557772735675,"author":1557772735675,"authorId":1557772735675,"timestamp":1557772735675,"kind":1557772735675}},
"title":"{\":\":\"'I can't breathe': Officer faces CCRB trial in Eric Garner death\",\"~\":\"6mbgWoNB/zYMpttniBxEE8myvfm9aDKNLflSL1PiURknSZDMAGPG9LxZo0xcsfC24ZTDpmz/Z2PTkk3TpH8jjQ==\"}",
"body":"{\":\":\"\",\"~\":\"ivq/8T4ILsGTo7ME5GlcCNeU2uh4RAcLAn+k2J0+3dm+0nFs/uxN6jg5zBxPD3Qf+qs853haH1uM0032k2pKdg==\"}","topic":"{\":\":\"politics\",\"~\":\"X1Z/Wn3qIdaw6vfE22BlgKhXpIYQCavyYNAw9FkxQQanikQSjCmzqrKlDgpvBOYXob9RRXgruGOaWdLqkEvz5A==\"}",
"url":"{\":\":\"https://www.aljazeera.com/news/2019/05/breathe-officer-faces-ccrb-trial-eric-garner-death-190513163733279.html\",\"~\":\"g2pdJuGuwCgFyqEJX1Co/sUyG4h8t8lsFa5ON0MC8R7Y3zqKauNhFzcwVpP/QyM1lYr1duoZ7YE5PurDKRVuXw==\"}",
"author":"{\":\":\"go1dfish\",\"~\":\"ovwCbuQeYp5rRABi9bTNKcEeeFXEiozWG28aRCl+MjOMNeqOxDEKIsnsgYgJmmSXvNhe/MpuL3376nL0vTN6qA==\"}",
"authorId":"{\":\":\"JG43ynRxqjy1-AemyMUoz14UqKM6cnh7zSPy_EAPgts.RCZ5dY7iRaIW_B7cDBlBsDNKwn2QCtbbA1uQ6iL8ENw\",\"~\":\"ekhiqU7UP1M8nHxBFv8QItNBIstP6zuQBtutk6sqMBNaN/2U9BAjb7Vjsogj23kphEMHeCSgO7AqaOE3cOZiyg==\"}",
"timestamp":"{\":\":1557772735666,\"~\":\"Z2AiDehqJKrbRlXXUllkwWjOEn5//HnjjTMdgNz2j8K/Bw5XPK1g0huVQsfWdKOKfr9XU7Y5sY2N526V13O4XA==\"}","kind":"{\":\":\"submission\",\"~\":\"KwjYOjPnpZH85VVOHZAxLm2Ntd/0p3o74sLEGtTf7grBCKb0pzDo7yERjWIaTEiQJ2IFEtu43V/vzhZMTvuvUQ==\"}"})
db.get(window.SOUL);
</script>
</body>
</html>