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

hopefully this resolved conflicts

Browse Source
This commit is contained in:
Mark Nadal 2016-09-27 11:46:20 -07:00
commit c6140712c9
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gun.js
View File

@ -1117,6 +1117,15 @@
ify(as); ify(as);
return gun; return gun;
} }
if(Gun.is(data)){
data.any(function(e,d,k,at,ev){
ev.off();
var s = Gun.node.soul(d);
if(!s){Gun.log("Can only save a node, not a property.");return}
gun.put(Gun.val.rel.ify(s), cb, opt);
});
return gun;
}
as.ref = as.ref || (root === (tmp = gun.Back(1)))? gun : tmp; as.ref = as.ref || (root === (tmp = gun.Back(1)))? gun : tmp;
as.ref.any(any, {as: as, '.': null}); as.ref.any(any, {as: as, '.': null});
if(!as.out){ if(!as.out){
@ -2103,6 +2112,18 @@
return this.Back(-1).put(Gun.node.ify({}, this._.get), null, this._.get); return this.Back(-1).put(Gun.node.ify({}, this._.get), null, this._.get);
} }
}()); }());
;(function(){
Gun.chain.set = function(item, cb, opt){
var gun = this;
cb = cb || function(){};
return item.val(function(node){
var put = {}, soul = Gun.node.soul(node);
if(!soul){ return cb.call(gun, {err: Gun.log('Only a node can be linked! Not "' + node + '"!')}) }
gun.put(Gun.obj.put(put, soul, Gun.val.rel.ify(soul)), cb, opt);
});
}
}());
})(require, './src/api'); })(require, './src/api');
}()); }());
@ -2165,7 +2186,7 @@
'$': at.get // msg BODY '$': at.get // msg BODY
}; };
Tab.on(msg['#'], function(err, data){ // TODO: ONE? PERF! Clear out listeners, maybe with setTimeout? Tab.on(msg['#'], function(err, data){ // TODO: ONE? PERF! Clear out listeners, maybe with setTimeout?
at.gun.Back(-1).on('in', {'@': at['#'], err: err, put: Gun.graph.node(data)}); at.gun.Back(-1).on('in', {'@': at['#'], err: err, put: data});
}); });
Tab.peers(peers).send(msg, {headers: {'gun-sid': Tab.server.sid}}); Tab.peers(peers).send(msg, {headers: {'gun-sid': Tab.server.sid}});
}); });

9
lib/wsp.js
View File

@ -147,13 +147,14 @@
} }
tran.get = function(req, cb){ tran.get = function(req, cb){
var body = req.body, lex = body['$'], reply = {headers: {'Content-Type': tran.json}}, opt; var body = req.body, lex = body['$'], reply = {headers: {'Content-Type': tran.json}}, opt;
gun.get(lex, function(err, node, key, at, ev){ gun.on('out', {gun: gun, get: lex, req: 1, '#': Gun.on.ask(function(at, ev){
ev.off(); ev.off();
var graph = at.put;
return cb({headers: reply.headers, body: { return cb({headers: reply.headers, body: {
'#': gun.wsp.msg(), '#': gun.wsp.msg(),
'@': body['#'], '@': body['#'],
'$': node, '$': graph,
'!': err '!': at.err
}}); }});
return; return;
if(Gun.obj.empty(node)){ if(Gun.obj.empty(node)){
@ -180,7 +181,7 @@
}([])); }([]));
*/ */
cb({headers: reply.headers, chunk: node }); // Use this if you don't want streaming chunks feature. cb({headers: reply.headers, chunk: node }); // Use this if you don't want streaming chunks feature.
}, opt); })});
} }
tran.put = function(req, cb){ tran.put = function(req, cb){
//console.log("tran.put", req); //console.log("tran.put", req);