unbuild last push

src/adapters/localStorage.js

@@ -10,6 +10,71 @@ var store = root.localStorage || {setItem: noop, removeItem: noop, getItem: noop
 	If you update anything here, consider updating the other adapters as well.
 */
 
+Gun.on('opt', function(root){
+	// This code is used to queue offline writes for resync.
+	// See the next 'opt' code below for actual saving of data.
+	var ev = this.to, opt = root.opt;
+	if(root.once){ return ev.next(root) }
+	if(false === opt.localStorage){ return ev.next(root) }
+	opt.file = opt.file || 'gun/';
+	var gap = Gun.obj.ify(store.getItem('gap/'+opt.file)) || {};
+	var empty = Gun.obj.empty, id, to, go;
+	// add re-sync command.
+	if(!empty(gap)){
+		root.on('localStorage', function(disk){
+			this.off();
+			var send = {}
+			Gun.obj.map(gap, function(node, soul){
+				Gun.obj.map(node, function(val, key){
+					send[soul] = Gun.state.to(disk[soul], key, send[soul]);
+				});
+			});
+			setTimeout(function(){
+				root.on('out', {put: send, '#': root.ask(ack), I: root.gun});
+			},10);
+		});
+	}
+
+	root.on('out', function(msg){
+		if(msg.lS){ return }
+		if(msg.I && msg.put && !msg['@'] && !empty(opt.peers)){
+			id = msg['#'];
+			Gun.graph.is(msg.put, null, map);
+			if(!to){ to = setTimeout(flush, opt.wait || 1) }
+		}
+		this.to.next(msg);
+	});
+	root.on('ack', ack);
+
+	function ack(ack){ // TODO: This is experimental, not sure if we should keep this type of event hook.
+		if(ack.err || !ack.ok){ return }
+		var id = ack['@'];
+		setTimeout(function(){
+			Gun.obj.map(gap, function(node, soul){
+				Gun.obj.map(node, function(val, key){
+					if(id !== val){ return }
+					delete node[key];
+				});
+				if(empty(node)){
+					delete gap[soul];
+				}
+			});
+			flush();
+		}, opt.wait || 1);
+	};
+	ev.next(root);
+
+	var map = function(val, key, node, soul){
+		(gap[soul] || (gap[soul] = {}))[key] = id;
+	}
+	var flush = function(){
+		clearTimeout(to);
+		to = false;
+		try{store.setItem('gap/'+opt.file, JSON.stringify(gap));
+		}catch(e){ Gun.log(err = e || "localStorage failure") }
+	}
+});
+
 Gun.on('opt', function(root){
 	this.to.next(root);
 	var opt = root.opt;
@@ -18,6 +83,8 @@ Gun.on('opt', function(root){
 	opt.file = opt.file || opt.prefix || 'gun/'; // support old option name.
 	var graph = root.graph, acks = {}, count = 0, to;
 	var disk = Gun.obj.ify(store.getItem(opt.file)) || {};
+	var lS = function(){}, u;
+	root.on('localStorage', disk); // NON-STANDARD EVENT!
 	
 	root.on('put', function(at){
 		this.to.next(at);
@@ -31,12 +98,12 @@ Gun.on('opt', function(root){
 		to = setTimeout(flush, opt.wait || 1);
 	});
 
-	root.on('get', function(at){
-		this.to.next(at);
-		var lex = at.get, soul, data, u;
+	root.on('get', function(msg){
+		this.to.next(msg);
+		var lex = msg.get, soul, data, u;
 		//setTimeout(function(){
 		if(!lex || !(soul = lex['#'])){ return }
-		//if(0 >= at.cap){ return }
+		//if(0 >= msg.cap){ return }
 		var has = lex['.'];
 		data = disk[soul] || u;
 		if(data && has){
@@ -45,7 +112,7 @@ Gun.on('opt', function(root){
 		if(!data && !Gun.obj.empty(opt.peers)){ // if data not found, don't ack if there are peers.
 			return; // Hmm, what if we have peers but we are disconnected?
 		}
-		root.on('in', {'@': at['#'], put: Gun.graph.node(data), how: 'lS'});
+		root.on('in', {'@': msg['#'], put: Gun.graph.node(data), how: 'lS', lS: msg.I});
 		//},1);
 	});
 

src/adapters/mesh.js

@@ -5,6 +5,7 @@ function Mesh(ctx){
 	var mesh = function(){};
 
 	mesh.out = function(msg){ var tmp;
+		//console.log("count:", msg['#'], msg);
 		if(this.to){ this.to.next(msg) }
 		if((tmp = msg['@'])
 		&& (tmp = ctx.dup.s[tmp])
@@ -78,7 +79,8 @@ function Mesh(ctx){
 					return; // TODO: this still needs to be tested in the browser!
 				}
 			}
-			if((tmp = msh.to) && (tmp[peer.url] || tmp[peer.id])){ return } // TODO: still needs to be tested			
+			if((tmp = msh.to) && (tmp[peer.url] || tmp[peer.id])){ return } // TODO: still needs to be tested
+			//console.log('out', JSON.parse(raw));	
 			if(peer.batch){
 				peer.batch.push(raw);
 				return;
@@ -90,10 +92,12 @@ function Mesh(ctx){
 				peer.batch = null;
 				if(!tmp.length){ return }
 				send(JSON.stringify(tmp), peer);
-			}, ctx.opt.wait || 1);
+			}, ctx.opt.gap || ctx.opt.wait || 1);
 			send(raw, peer);
 		}
+
 		function send(raw, peer){
+			//console.log("send:", raw.slice(raw.indexOf('#'), 20));
 			var wire = peer.wire;
 			try{
 				if(wire.send){

src/adapters/websocket.js

@@ -18,7 +18,10 @@ Gun.on('opt', function(root){
 	opt.WebSocket = websocket;
 
 	var mesh = opt.mesh = opt.mesh || Gun.Mesh(root);
-	root.on('out', mesh.out);
+	//root.on('create', function(at){
+		//this.to.next(at);
+		root.on('out', mesh.out);
+	//});
 
 	opt.wire = opt.wire || open;
 	function open(peer){
@@ -40,7 +43,9 @@ Gun.on('opt', function(root){
 			mesh.hi(peer);
 		}
 		wire.onmessage = function(msg){
+			//console.log('in', JSON.parse(msg.data || msg));
 			if(!msg){ return }
+			env.inLength = (env.inLength || 0) + (msg.data || msg).length; // TEMPORARY, NON-STANDARD, FOR DEBUG
 			mesh.hear(msg.data || msg, peer);
 		};
 		return wire;

src/chain.js

@@ -16,6 +16,7 @@ Gun.chain.chain = function(sub){
 
 function output(msg){
 	var put, get, at = this.as, back = at.back, root = at.root;
+	if(!msg.I){ msg.I = at.gun }
 	if(!msg.gun){ msg.gun = at.gun }
 	this.to.next(msg);
 	if(get = msg.get){

src/put.js

@@ -93,6 +93,7 @@ function batch(){ var as = this;
 	as.res = as.res || function(cb){ if(cb){ cb() } };
 	as.res(function(){
 		var cat = (as.gun.back(-1)._), ask = cat.ask(function(ack){
+			cat.root.on('ack', ack);
 			this.off(); // One response is good enough for us currently. Later we may want to adjust this.
 			if(!as.ack){ return }
 			as.ack(ack, this);

src/root.js

@@ -35,6 +35,8 @@ Gun.dup = require('./dup');
 		if(!at.once){
 			at.on('in', root, at);
 			at.on('out', root, at);
+			Gun.on('create', at);
+			at.on('create', at);
 		}
 		at.once = 1;
 		return gun;
@@ -97,8 +99,11 @@ Gun.dup = require('./dup');
 	function merge(node, soul){
 		var ctx = this, cat = ctx.gun._, at = (cat.next || empty)[soul];
 		if(!at){
-			ctx.souls[soul] = false;
-			return 
+			if(!(cat.opt||empty).super){
+				ctx.souls[soul] = false;
+				return; 
+			}
+			at = (ctx.gun.get(soul)._);
 		}
 		var msg = ctx.map[soul] = {
 			put: node,