Skip to content

Commit 9b752c3

Browse files
amarkamark
committedApr 21, 2017
clarify root more for SEA, lots more to go
·
v0.99970.9.101
1 parent 1fd2bfa commit 9b752c3

17 files changed

+317
-466
lines changed
 

‎gun.js

+145-229
Large diffs are not rendered by default.

‎gun.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/file.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ Gun.on('put', function(at){
1515
var f = at.gun.back('opt._file')
1616
if(!f.use){ return }
1717
var graph = at.put, opt = at.opt || {};
18-
var Graph = f.gun._.graph
19-
Gun.obj.map(graph, function(node, soul){
20-
f.disk.graph[soul] = Graph[soul] || graph[soul];
18+
var Graph = f.gun._.graph;
19+
var dg = f.disk.graph;
20+
Gun.graph.is(graph, null, function(val, key, node, soul){
21+
dg[soul] = Gun.state.to(node, key, dg[soul]);
2122
});
2223
f.count = (f.count || 0) + 1;
2324
if(!at['@']){ // don't ack other acks!

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gun",
3-
"version": "0.7.2",
3+
"version": "0.7.3",
44
"description": "Graph engine",
55
"main": "index.js",
66
"browser": "gun.min.js",

‎src/HAM.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ function HAM(machineState, incomingState, currentState, incomingValue, currentVa
1313

1414
}
1515
if(incomingState === currentState){
16-
if(Lexical(incomingValue) === Lexical(currentValue)){ // Note: while these are practically the same, the deltas could be technically different
16+
incomingValue = Lexical(incomingValue) || "";
17+
currentValue = Lexical(currentValue) || "";
18+
if(incomingValue === currentValue){ // Note: while these are practically the same, the deltas could be technically different
1719
return {state: true};
1820
}
1921
/*
@@ -24,10 +26,10 @@ function HAM(machineState, incomingState, currentState, incomingValue, currentVa
2426
because convergence (data integrity) is generally more important.
2527
Any difference in this algorithm must be given a new and different name.
2628
*/
27-
if(Lexical(incomingValue) < Lexical(currentValue)){ // Lexical only works on simple value types!
29+
if(incomingValue < currentValue){ // Lexical only works on simple value types!
2830
return {converge: true, current: true};
2931
}
30-
if(Lexical(currentValue) < Lexical(incomingValue)){ // Lexical only works on simple value types!
32+
if(currentValue < incomingValue){ // Lexical only works on simple value types!
3133
return {converge: true, incoming: true};
3234
}
3335
}

‎src/adapters/localStorage.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ Gun.on('put', function(at){ var err, id, opt, root = at.gun._.root;
1111
this.to.next(at);
1212
(opt = {}).prefix = (at.opt || opt).prefix || at.gun.back('opt.prefix') || 'gun/';
1313
var graph = root._.graph;
14-
1514
Gun.obj.map(at.put, function(node, soul){
16-
async[soul] = graph[soul] || node;
15+
async[soul] = async[soul] || graph[soul] || node;
1716
});
1817
count += 1;
1918
check[at['#']] = root;
@@ -28,7 +27,7 @@ Gun.on('put', function(at){ var err, id, opt, root = at.gun._.root;
2827
Gun.obj.map(all, function(node, soul){
2928
// Since localStorage only has 5MB, it is better that we keep only
3029
// the data that the user is currently interested in.
31-
node = graph[soul] || all[soul];
30+
node = graph[soul] || all[soul] || node;
3231
try{store.setItem(opt.prefix + soul, JSON.stringify(node));
3332
}catch(e){ err = e || "localStorage failure" }
3433
});
@@ -56,10 +55,9 @@ Gun.on('get', function(at){
5655
if(!lex || !(soul = lex[Gun._.soul])){ return }
5756
//if(0 >= at.cap){ return }
5857
var field = lex['.'];
59-
6058
data = Gun.obj.ify(store.getItem(opt.prefix + soul) || null) || async[soul] || u;
6159
if(data && field){
62-
data = Gun.state.ify(u, field, Gun.state.is(data, field), data[field], soul);
60+
data = Gun.state.to(data, field);
6361
}
6462
if(!data && !Gun.obj.empty(gun.back('opt.peers'))){ // if data not found, don't ack if there are peers.
6563
return; // Hmm, what if we have peers but we are disconnected?

‎src/chain.js

+29-20
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,24 @@ function output(at){
1717
at.gun = gun;
1818
}
1919
if(get = at.get){
20-
if(!get[_soul]){
20+
if(tmp = get[_soul]){
21+
tmp = (root.get(tmp)._);
22+
if(obj_has(get, _field)){
23+
if(obj_has(put = tmp.put, get = get[_field])){
24+
tmp.on('in', {get: tmp.get, put: Gun.state.to(put, get), gun: tmp.gun}); // TODO: Ugly, clean up? Simplify all these if conditions (without ruining the whole chaining API)?
25+
}
26+
} else
27+
if(obj_has(tmp, 'put')){
28+
//if(u !== tmp.put){
29+
tmp.on('in', tmp);
30+
}
31+
} else {
2132
if(obj_has(get, _field)){
2233
get = get[_field];
2334
var next = get? (gun.get(get)._) : cat;
2435
// TODO: BUG! Handle plural chains by iterating over them.
25-
if(obj_has(next, 'put')){ // potentially incorrect? Maybe?
26-
//if(u !== next.put){ // potentially incorrect? Maybe?
36+
//if(obj_has(next, 'put')){ // potentially incorrect? Maybe?
37+
if(u !== next.put){ // potentially incorrect? Maybe?
2738
//next.tag['in'].last.next(next);
2839
next.on('in', next);
2940
return;
@@ -37,8 +48,8 @@ function output(at){
3748
if(rel = Gun.val.rel.is(val)){
3849
if(!at.gun._){ return }
3950
(at.gun._).on('out', {
40-
get: {'#': rel, '.': get},
41-
'#': root._.ask(Gun.HAM.synth, at.gun),
51+
get: tmp = {'#': rel, '.': get, gun: at.gun},
52+
'#': root._.ask(Gun.HAM.synth, tmp),
4253
gun: at.gun
4354
});
4455
return;
@@ -56,12 +67,12 @@ function output(at){
5667
obj_map(cat.map, function(proxy){
5768
proxy.at.on('in', proxy.at);
5869
});
59-
}
70+
};
6071
if(cat.soul){
6172
if(!at.gun._){ return }
6273
(at.gun._).on('out', {
63-
get: {'#': cat.soul, '.': get},
64-
'#': root._.ask(Gun.HAM.synth, at.gun),
74+
get: tmp = {'#': cat.soul, '.': get, gun: at.gun},
75+
'#': root._.ask(Gun.HAM.synth, tmp),
6576
gun: at.gun
6677
});
6778
return;
@@ -87,14 +98,15 @@ function output(at){
8798
}
8899
if(cat.ack){
89100
if(!obj_has(cat, 'put')){ // u !== cat.put instead?
101+
//if(u !== cat.put){
90102
return;
91103
}
92104
}
93105
cat.ack = -1;
94106
if(cat.soul){
95107
cat.on('out', {
96-
get: {'#': cat.soul},
97-
'#': root._.ask(Gun.HAM.synth, cat.gun),
108+
get: tmp = {'#': cat.soul, gun: cat.gun},
109+
'#': root._.ask(Gun.HAM.synth, tmp),
98110
gun: cat.gun
99111
});
100112
return;
@@ -115,7 +127,7 @@ function output(at){
115127
function input(at){
116128
at = at._ || at;
117129
var ev = this, cat = this.as, gun = at.gun, coat = gun._, change = at.put, back = cat.back._ || empty, rel, tmp;
118-
if(0 > cat.ack && !Gun.val.rel.is(change)){ // for better behavior?
130+
if(0 > cat.ack && !at.ack && !Gun.val.rel.is(change)){ // for better behavior?
119131
cat.ack = 1;
120132
}
121133
if(cat.get && at.get !== cat.get){
@@ -191,9 +203,8 @@ function relate(cat, at, coat, rel){
191203
not(cat, at);
192204
}
193205
tmp = (cat.map || (cat.map = {}))[coat.id] = cat.map[coat.id] || {at: coat};
194-
if(rel !== tmp.rel){
195-
ask(cat, tmp.rel = rel);
196-
}
206+
if(rel === tmp.rel){ return }
207+
ask(cat, tmp.rel = rel);
197208
}
198209
function echo(cat, at, ev){
199210
if(!cat.echo){ return } // || node_ === at.get ????
@@ -256,17 +267,15 @@ function ask(cat, soul){
256267
if(cat.ack){
257268
tmp.ack = tmp.ack || -1;
258269
tmp.on('out', {
259-
get: {'#': soul},
260-
'#': cat.root._.ask(Gun.HAM.synth, tmp.gun),
261-
gun: tmp.gun
270+
get: tmp = {'#': soul, gun: tmp.gun},
271+
'#': cat.root._.ask(Gun.HAM.synth, tmp)
262272
});
263273
return;
264274
}
265275
obj_map(cat.next, function(gun, key){
266276
(gun._).on('out', {
267-
get: {'#': soul, '.': key},
268-
'#': cat.root._.ask(Gun.HAM.synth, tmp.gun),
269-
gun: gun
277+
get: gun = {'#': soul, '.': key, gun: gun},
278+
'#': cat.root._.ask(Gun.HAM.synth, gun)
270279
});
271280
});
272281
}

‎src/graph.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ var Graph = {};
88
if(!g || !obj_is(g) || obj_empty(g)){ return false } // must be an object.
99
return !obj_map(g, map, {cb:cb,fn:fn,as:as}); // makes sure it wasn't an empty object.
1010
}
11-
function map(n, s){ // we invert this because the way we check for this is via a negation.
12-
if(!n || s !== Node.soul(n) || !Node.is(n, this.fn)){ return true } // it is true that this is an invalid graph.
11+
function map(n, s){ // we invert this because the way'? we check for this is via a negation.
12+
if(!n || s !== Node.soul(n) || !Node.is(n, this.fn, this.as)){ return true } // it is true that this is an invalid graph.
1313
if(!this.cb){ return }
1414
nf.n = n; nf.as = this.as; // sequential race conditions aren't races.
1515
this.cb.call(nf.as, n, s, nf);

‎src/index.js

+15-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,21 @@ module.exports = Gun;
101101
state_ify(delta, field, is);
102102
}
103103
}
104-
Gun.HAM.synth = function(at, ev, as){ var gun = this.as || as;
104+
Gun.HAM.synth = function(at, ev){
105+
var as = this.as, cat = as.gun._;
106+
if(!at.put || (as['.'] && !obj_has(at.put[as['#']], cat.get))){
107+
if(cat.put !== u){ return }
108+
cat.on('in', {
109+
get: cat.get,
110+
put: cat.put = u,
111+
gun: cat.gun,
112+
})
113+
return;
114+
}
115+
at.gun = cat.root;
116+
Gun.on('put', at);
117+
}
118+
Gun.HAM.synth_ = function(at, ev, as){ var gun = this.as || as;
105119
var cat = gun._, root = cat.root._, put = {}, tmp;
106120
if(!at.put){
107121
//if(obj_has(cat, 'put')){ return }

‎src/key.js

-166
This file was deleted.

‎src/node.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Node.soul.ify = function(n, o){ // put a soul on an object.
1010
n._[soul_] = o.soul || n._[soul_] || text_random(); // put the soul on it.
1111
return n;
1212
}
13+
Node.soul._ = Val.rel._;
1314
;(function(){
1415
Node.is = function(n, cb, as){ var s; // checks to see if an object is a valid node.
1516
if(!obj_is(n)){ return false } // must be an object.
@@ -51,7 +52,7 @@ Node.soul.ify = function(n, o){ // put a soul on an object.
5152
}());
5253
var obj = Type.obj, obj_is = obj.is, obj_del = obj.del, obj_map = obj.map;
5354
var text = Type.text, text_random = text.random;
54-
var soul_ = Val.rel._;
55+
var soul_ = Node.soul._;
5556
var u;
5657
module.exports = Node;
5758

‎src/not.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
var Gun = require('./core'), u;
33
Gun.chain.not = function(cb, opt, t){
4+
Gun.log.once("nottobe", "Warning: `.not` to be removed from core (but available as an extension), use `.val` instead, which now supports (v0.7.x+) 'not found data' as `undefined` data in callbacks. If you are opposed to this, please voice your opinion in https://gitter.im/amark/gun and ask others.");
45
return this.get(ought, {not: cb});
56
}
67
function ought(at, ev){ ev.off();

‎src/path.js

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var Gun = require('./core');
33
Gun.chain.path = function(field, cb, opt){
44
var back = this, gun = back, tmp;
55
opt = opt || {}; opt.path = true;
6+
Gun.log.once("pathing", "Warning: `.path` to be removed from core (but available as an extension), use `.get` chains instead. If you are opposed to this, please voice your opinion in https://gitter.im/amark/gun and ask others.");
67
if(gun === gun._.root){if(cb){cb({err: Gun.log("Can't do that on root instance.")})}return gun}
78
if(typeof field === 'string'){
89
tmp = field.split(opt.split || '.');

‎src/put.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ function map(v,f,n, at){ var as = this;
8787
ref = ref.get(path[i]);
8888
}
8989
if(as.not || Gun.node.soul(at.obj)){
90-
at.soul(Gun.node.soul(at.obj) || ((as.opt||{}).uuid || as.gun.back('opt.uuid') || Gun.text.random)());
90+
var id = Gun.node.soul(at.obj) || ((as.opt||{}).uuid || as.gun.back('opt.uuid') || Gun.text.random)();
91+
ref.back(-1).get(id);
92+
at.soul(id);
9193
return;
9294
}
9395
(as.stun = as.stun || {})[path] = true;
@@ -100,7 +102,9 @@ function soul(at, ev){ var as = this.as, cat = as.at; as = as.as;
100102
if(!at.gun || !at.gun._.back){ return } // TODO: Handle
101103
ev.off();
102104
at = (at.gun._.back._);
103-
cat.soul(Gun.node.soul(cat.obj) || Gun.node.soul(at.put) || Gun.val.rel.is(at.put) || ((as.opt||{}).uuid || as.gun.back('opt.uuid') || Gun.text.random)()); // TODO: BUG!? Do we really want the soul of the object given to us? Could that be dangerous?
105+
var id = Gun.node.soul(cat.obj) || Gun.node.soul(at.put) || Gun.val.rel.is(at.put) || ((as.opt||{}).uuid || as.gun.back('opt.uuid') || Gun.text.random)(); // TODO: BUG!? Do we really want the soul of the object given to us? Could that be dangerous?
106+
at.gun.back(-1).get(id);
107+
cat.soul(id);
104108
as.stun[cat.path] = false;
105109
as.batch();
106110
}

‎src/root.js

+68-22
Original file line numberDiff line numberDiff line change
@@ -51,39 +51,84 @@ Gun._ = { // some reserved key words, these are not the only ones.
5151
//console.log("add to.next(at)"); // TODO: BUG!!!
5252
var ev = this, cat = ev.as, coat;
5353
if(!at.gun){ at.gun = cat.gun }
54-
if(!at['#'] && at['@']){
55-
at['#'] = Gun.text.random(); // TODO: Use what is used other places instead.
56-
// TODO: BUG! For multi-instances, the "ack" system is globally shared, but it shouldn't be.
54+
if(!at['#']){ at['#'] = Gun.text.random() } // TODO: Use what is used other places instead.
55+
if(cat.dup.check(at['#'])){ return }
56+
if(at['@']){
57+
// TODO: BUG! For multi-instances, the "ack" system is globally shared, but it shouldn't be.
5758
if(cat.ack(at['@'], at)){ return } // TODO: Consider not returning here, maybe, where this would let the "handshake" on sync occur for Holy Grail?
5859
cat.dup.track(at['#']);
5960
Gun.on('out', obj_to(at, {gun: cat.gun}));
6061
return;
6162
}
62-
if(at['#'] && cat.dup.check(at['#'])){ return }
6363
cat.dup.track(at['#']);
64-
if(cat.ack(at['@'], at)){ return }
64+
//if(cat.ack(at['@'], at)){ return }
6565
//cat.ack(at['@'], at);
6666
coat = obj_to(at, {gun: cat.gun});
6767
if(at.get){
68-
if(!get(at, cat)){
69-
Gun.on('get', coat);
70-
}
68+
//Gun.on.GET(coat);
69+
Gun.on('get', coat);
7170
}
7271
if(at.put){
73-
Gun.HAM.synth(at, ev, cat.gun); // TODO: Clean up, just make it part of on('put')!
72+
//Gun.on.PUT(coat);
7473
Gun.on('put', coat);
7574
}
7675
Gun.on('out', coat);
7776
}
78-
function get(at, cat){
79-
var soul = at.get[_soul], node = cat.graph[soul], field = at.get[_field], tmp;
80-
var next = cat.next || (cat.next = {}), as = /*(at.gun||empty)._ ||*/ (next[soul] || (next[soul] = cat.gun.get(soul)))._;
81-
//console.log("GET", soul, field);
82-
if(!node){ return }
77+
}());
78+
79+
;(function(){
80+
Gun.on('put', function(at){
81+
//Gun.on.PUT = function(at){
82+
if(!at['#']){ return this.to.next(at) } // for tests.
83+
var ev = this, ctx = {gun: at.gun, graph: at.gun._.graph, put: {}, at: {}, machine: Gun.state()};
84+
if(!Gun.graph.is(at.put, null, verify, ctx)){ ctx.err = "Error: Invalid graph!" }
85+
if(ctx.err){ return ctx.gun.on('in', {'@': at['#'], err: Gun.log(ctx.err) }) }
86+
obj_map(ctx.put, merge, ctx);
87+
obj_map(ctx.at, map, ctx);
88+
if(!ctx.diff){ return }
89+
ev.to.next(obj_to(at, {put: ctx.diff}));
90+
});
91+
function verify(val, key, node, soul){ var ctx = this;
92+
var state = Gun.state.is(node, key), tmp;
93+
if(!state){ return ctx.err = "Error: No state on '"+key+"' in node '"+soul+"'!" }
94+
var vertex = ctx.graph[soul] || empty, was = Gun.state.is(vertex, key, true), known = vertex[key];
95+
var HAM = Gun.HAM(ctx.machine, state, was, val, known);
96+
if(!HAM.incoming){ return }
97+
ctx.put[soul] = Gun.state.to(node, key, ctx.put[soul]);
98+
(ctx.diff || (ctx.diff = {}))[soul] = Gun.state.to(node, key, ctx.diff[soul]); // TODO: Bug? If val is a relation, it is an object and therefore passed by reference. Will this be a problem?
99+
}
100+
function merge(node, soul){
101+
var ref = ((this.gun._).next || empty)[soul];
102+
if(!ref){ return }
103+
var at = this.at[soul] = {
104+
put: this.node = node,
105+
get: this.soul = soul,
106+
gun: this.ref = ref
107+
};
108+
obj_map(node, each, this);
109+
Gun.on('node', at);
110+
}
111+
function each(val, key){
112+
var graph = this.graph, soul = this.soul, cat = (this.ref._), tmp;
113+
graph[soul] = Gun.state.to(this.node, key, graph[soul]);
114+
(cat.put || (cat.put = {}))[key] = val;
115+
}
116+
function map(at, soul){
117+
if(!at.gun){ return }
118+
(at.gun._).on('in', at);
119+
}
120+
}());
121+
var tmpev = {to:{next:function(){}}}; // temporary while we have to switch event hooks.
122+
;(function(){
123+
Gun.on('get', function(at){
124+
var ev = this, soul = at.get[_soul], cat = at.gun._, node = cat.graph[soul], field = at.get[_field], tmp;
125+
var next = cat.next || (cat.next = {}), as = ((next[soul] || empty)._);
126+
if(!node || !as){ return ev.to.next(at) }
83127
if(field){
84-
if(!obj_has(node, field)){ return }
85-
tmp = Gun.obj.put(Gun.node.soul.ify({}, soul), field, node[field]);
86-
node = Gun.state.ify(tmp, field, Gun.state.is(node, field));
128+
if(!obj_has(node, field)){ return ev.to.next(at) }
129+
node = Gun.state.to(node, field);
130+
} else {
131+
node = Gun.obj.copy(node);
87132
}
88133
//if(at.gun === cat.gun){
89134
node = Gun.graph.node(node); // TODO: BUG! Clone node?
@@ -98,9 +143,10 @@ Gun._ = { // some reserved key words, these are not the only ones.
98143
gun: as.gun
99144
});
100145
if(0 < tmp){
101-
return true;
146+
return;
102147
}
103-
}
148+
ev.to.next(at);
149+
});
104150
}());
105151

106152
;(function(){
@@ -143,9 +189,9 @@ Gun._ = { // some reserved key words, these are not the only ones.
143189

144190
var text_is = Gun.text.is;
145191
var list_is = Gun.list.is;
146-
var obj = Gun.obj, obj_is = obj.is, obj_has = obj.has, obj_to = obj.to, obj_map = obj.map;
147-
var _soul = Gun._.soul, _field = Gun._.field;
148-
//var u;
192+
var obj = Gun.obj, obj_is = obj.is, obj_has = obj.has, obj_to = obj.to, obj_map = obj.map, obj_copy = obj.copy;
193+
var _soul = Gun._.soul, _field = Gun._.field, rel_is = Gun.val.rel.is;
194+
var empty = {}, u;
149195

150196
console.debug = function(i, s){ return (console.debug.i && i === console.debug.i && console.debug.i++) && (console.log.apply(console, arguments) || s) };
151197

‎src/state.js

+12-5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ var time = Type.time.is, last = -Infinity, N = 0, D = 1000; // WARNING! In the f
1717
var perf = (typeof performance !== 'undefined')? (performance.timing && performance) : false, start = (perf && perf.timing && perf.timing.navigationStart) || (perf = false);
1818
State._ = '>';
1919
State.drift = 0;
20+
State.is = function(n, f, o){ // convenience function to get the state on a field on a node and return it.
21+
var tmp = (f && n && n[N_] && n[N_][State._]) || o;
22+
if(!tmp){ return }
23+
return num_is(tmp = tmp[f])? tmp : -Infinity;
24+
}
2025
State.ify = function(n, f, s, v, soul){ // put a field's state on a node.
2126
if(!n || !n[N_]){ // reject if it is not node-like.
2227
if(!soul){ // unless they passed a soul
@@ -35,10 +40,12 @@ State.ify = function(n, f, s, v, soul){ // put a field's state on a node.
3540
}
3641
return n;
3742
}
38-
State.is = function(n, f, o){ // convenience function to get the state on a field on a node and return it.
39-
var tmp = (f && n && n[N_] && n[N_][State._]) || o;
40-
if(!tmp){ return }
41-
return num_is(tmp[f])? tmp[f] : -Infinity;
43+
State.to = function(from, f, to){
44+
var val = from[f];
45+
if(obj_is(val)){
46+
val = obj_copy(val);
47+
}
48+
return State.ify(to, f, State.is(from, f), val, Node.soul(from));
4249
}
4350
;(function(){
4451
State.map = function(cb, s, as){ var u; // for use with Node.ify
@@ -67,7 +74,7 @@ State.is = function(n, f, o){ // convenience function to get the state on a fiel
6774
State.ify(this.o, f, this.s) ;
6875
}
6976
}());
70-
var obj = Type.obj, obj_as = obj.as, obj_has = obj.has, obj_is = obj.is, obj_map = obj.map;
77+
var obj = Type.obj, obj_as = obj.as, obj_has = obj.has, obj_is = obj.is, obj_map = obj.map, obj_copy = obj.copy;
7178
var num = Type.num, num_is = num.is;
7279
var fn = Type.fn, fn_is = fn.is;
7380
var N_ = Node._, u;

‎test/common.js

+22-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var root;
22
(function(env){
33
root = env.window? env.window : global;
44
env.window && root.localStorage && root.localStorage.clear();
5+
try{ require('fs').unlinkSync('data.json') }catch(e){}
56
//root.Gun = root.Gun || require('../gun');
67
if(root.Gun){
78
root.Gun = root.Gun;
@@ -3008,7 +3009,7 @@ describe('Gun', function(){
30083009
var gun = Gun();
30093010

30103011
gun.get('val/follow').val(function(data){
3011-
//console.log("val");
3012+
//console.log("val", data);
30123013
}).get(function(at){
30133014
if(done.c){ return } done.c = 1;
30143015
done();
@@ -3022,7 +3023,6 @@ describe('Gun', function(){
30223023

30233024
var check = {}, count = {};
30243025
gun.map().val(function(v,f){
3025-
//console.log("***********", f,v);
30263026
check[f] = v;
30273027
count[f] = (count[f] || 0) + 1;
30283028
if(check['1_1'] && check['2_2']){
@@ -3134,15 +3134,18 @@ describe('Gun', function(){
31343134
);
31353135
setTimeout(function(){
31363136
gun.get(function(at){
3137+
//console.log('*', at.put);
31373138
done.app = done.app || at.put.alias;
31383139
});
31393140
gun.back(-1).get('pub').get(function(at){
3141+
//console.log("**", at.put);
31403142
done.pub = done.pub || at.put.auth;
31413143
});
31423144
gun.path('alias').get(function(at){
3145+
//console.log("***", at.put);
31433146
done.alias = done.alias || at.put.mark;
31443147
}).path('mark').get(function(at){
3145-
//console.log("************", at.put);
3148+
//console.log("************", at.put);return;
31463149
setTimeout(function(){
31473150
done.mark = done.mark || at.put.pub;
31483151
expect(Gun.val.rel.is(done.mark)).to.be('pub');
@@ -3469,7 +3472,6 @@ describe('Gun', function(){
34693472
try{ require('fs').unlinkSync('bdata') }catch(e){}
34703473
try{ require('fs').unlinkSync('ddata') }catch(e){}
34713474
Gun.on('out', function(msg){
3472-
//console.log("oye", msg);
34733475
this.to.next(msg);
34743476
var onGun = msg.gun.back(-1);
34753477
if(onGun === b) {
@@ -3492,7 +3494,6 @@ describe('Gun', function(){
34923494
d = Gun({file: "ddata"});
34933495
var db = d.get("key");
34943496
db.map().on(function(val,field){
3495-
//console.log("d key got val:", field, val)
34963497
expect(val).to.be('hello');
34973498
if(done.c){ return } done.c = 1;
34983499
setTimeout(function(){
@@ -3526,6 +3527,22 @@ describe('Gun', function(){
35263527
}
35273528
});
35283529
});
3530+
3531+
it('Callbacks should have database safe data copies', function(done){
3532+
var gun = Gun();
3533+
3534+
gun.get('ds/safe').put({a: 1});
3535+
3536+
gun.get('ds/safe').on(function(data){
3537+
data.b = 2;
3538+
});
3539+
3540+
gun.get('ds/safe').val(function(data){
3541+
expect(gun._.root._.graph['ds/safe'].b).to.not.be.ok();
3542+
if(done.c){ return } done.c = 1;
3543+
done();
3544+
});
3545+
});
35293546
return;
35303547
it.only('Custom extensions are chainable', function(done){
35313548
Gun.chain.filter = function(filter){

0 commit comments

Comments
 (0)
Please sign in to comment.