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

AXE - change necessary to work webrtc.

Browse Source
This commit is contained in:
Adriano Rogowski 2019-04-20 21:28:04 -03:00
parent 9cb1a52fc0
commit b99202f0ec
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gun.js
View File

@ -2062,7 +2062,8 @@
peer.say(raw); peer.say(raw);
} else } else
if(wire.send){ if(wire.send){
if(wire.readyState && 1 != wire.readyState){ throw "socket not ready yet!" } if(wire.readyState && 1 != wire.readyState && wire instanceof opt.WebSocket){ throw "socket not ready yet!" }
// if(wire.readyState && 'open' != wire.readyState && wire instanceof RTCDataChannel){ throw "rtc not ready yet!" }
wire.send(raw); wire.send(raw);
} }
}catch(e){ }catch(e){

27
src/adapters/mesh.js
View File

@ -20,7 +20,7 @@ function Mesh(ctx){
return; return;
} }
// add hook for AXE? // add hook for AXE?
if (Gun.AXE && opt && opt.super) { Gun.AXE.say(msg, mesh.say, this); return; } // rogowski if (Gun.AXE) { Gun.AXE.say(msg, mesh.say, this); return; }
mesh.say(msg); mesh.say(msg);
} }
@ -125,7 +125,8 @@ function Mesh(ctx){
peer.say(raw); peer.say(raw);
} else } else
if(wire.send){ if(wire.send){
if(wire.readyState && 1 != wire.readyState){ throw "socket not ready yet!" } if(wire.readyState && 1 != wire.readyState && wire instanceof opt.WebSocket){ throw "socket not ready yet!" }
// if(wire.readyState && 'open' != wire.readyState && wire instanceof RTCDataChannel){ throw "rtc not ready yet!" }
wire.send(raw); wire.send(raw);
} }
}catch(e){ }catch(e){
@ -193,26 +194,30 @@ function Mesh(ctx){
tmp = tmp.id = tmp.id || Type.text.random(9); tmp = tmp.id = tmp.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); }
tmp = peer.queue; peer.queue = []; // tmp = peer.queue; peer.queue = [];
Type.obj.map(tmp, function(msg){ // Type.obj.map(tmp, function(msg){
mesh.say(msg, peer); // mesh.say(msg, peer);
}); // });
} }
mesh.bye = function(peer){ mesh.bye = function(peer){
Type.obj.del(opt.peers, peer.id); // assume if peer.url then reconnect Type.obj.del(opt.peers, peer.id); // assume if peer.url then reconnect
ctx.on('bye', peer); ctx.on('bye', peer);
} }
mesh.hear['!'] = function(msg, peer){ opt.log('Error:', msg.err) } mesh.hear['!'] = function(msg, peer){ opt.log('Error:', msg.err) }
mesh.hear['?'] = function(msg, peer){ mesh.hear['?'] = function(msg, peer){
if(!msg.pid){ if(!msg.pid){
return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer); //return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer);
mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer);
var tmp = peer.queue; peer.queue = [];
Type.obj.map(tmp, function(msg){
mesh.say(msg, peer);
});
return;
} }
peer.id = peer.id || msg.pid; peer.id = peer.id || msg.pid;
mesh.hi(peer); mesh.hi(peer);
} }
return mesh; return mesh;
} }
@ -232,5 +237,3 @@ Mesh.hash = function(s){ // via SO
Object.keys = Object.keys || function(o){ return map(o, function(v,k,t){t(k)}) } Object.keys = Object.keys || function(o){ return map(o, function(v,k,t){t(k)}) }
try{ module.exports = Mesh }catch(e){} try{ module.exports = Mesh }catch(e){}