Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-03-30 15:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sea

Browse Source
This commit is contained in:
mhelander 2017-09-14 21:41:32 +03:00
commit 276a0cd722
6 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gun.js
View File

@ -1769,6 +1769,7 @@
var url = peer.url.replace('http', 'ws');
var wire = peer.wire = new WebSocket(url);
wire.onclose = function(){
ctx.on('bye', peer);
reconnect(peer, as);
};
wire.onerror = function(error){
@ -1779,6 +1780,7 @@
}
};
wire.onopen = function(){
ctx.on('hi', peer);
var queue = peer.queue;
peer.queue = [];
Gun.obj.map(queue, function(msg){

2
gun.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/bye.js
View File

@ -13,6 +13,7 @@ Gun.on('opt', function(ctx){
(peer.bye = peer.bye || []).push(msg.BYE);
})
ctx.on('bye', function(peer){
this.to.next(peer);
if(!peer.bye){ return }
var gun = ctx.gun;
Gun.obj.map(peer.bye, function(data){
@ -33,6 +34,7 @@ Gun.chain.bye = function(){
(data = {})[at.get] = tmp;
});
root.on('out', {BYE: data});
return gun;
}
return bye;
}

14
lib/shim.js
View File

@ -15,4 +15,16 @@ Gun.chain.on = function(a,b,c){
}
Gun.chain.bye || require('gun/lib/bye');
Gun.chain.onDisconnect = Gun.chain.bye;
Gun.chain.onDisconnect = Gun.chain.bye;
Gun.chain.connected = function(cb){
var root = this.back(-1), last;
root.on('hi', function(peer){
if(!cb){ return }
cb(last = true, peer);
});
root.on('bye', function(peer){
if(!cb || last === peer){ return }
cb(false, last = peer);
});
return this;
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "gun",
"version": "0.8.4",
"version": "0.8.5",
"description": "Graph engine",
"main": "index.js",
"browser": "gun.min.js",

2
src/adapters/websocket.js
View File

@ -64,6 +64,7 @@ Gun.on('opt', function(ctx){
var url = peer.url.replace('http', 'ws');
var wire = peer.wire = new WebSocket(url);
wire.onclose = function(){
ctx.on('bye', peer);
reconnect(peer, as);
};
wire.onerror = function(error){
@ -74,6 +75,7 @@ Gun.on('opt', function(ctx){
}
};
wire.onopen = function(){
ctx.on('hi', peer);
var queue = peer.queue;
peer.queue = [];
Gun.obj.map(queue, function(msg){