From 98f5b7ecd1d860c31eaddfa5bc210089788fd848 Mon Sep 17 00:00:00 2001
From: d3x0r <d3ck0r@gmail.com>
Date: Sun, 9 Oct 2016 13:13:20 -0700
Subject: [PATCH 01/21] Update package.json

---
 examples/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/package.json b/examples/package.json
index 89c2dc2e..e3eb1358 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -8,7 +8,7 @@
 	}
 ,	"dependencies": {
 		"express": "~>4.13.4",
-		"gun": "~>0.3.0"
+		"gun": "github:amark/gun#0.5"
 	}
 ,	"scripts": {
         "start": "node http.js",

From df4d87eb3e2a3b8451b4f0f340268bb72800e9ba Mon Sep 17 00:00:00 2001
From: Mark Nadal <mark@accelsor.com>
Date: Mon, 10 Oct 2016 02:03:25 -0700
Subject: [PATCH 02/21] Update gun.js

---
 gun.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gun.js b/gun.js
index b924fc8f..dfab1a48 100644
--- a/gun.js
+++ b/gun.js
@@ -897,19 +897,18 @@
 				opt = opt || {};
 				var gun = this, at = gun._, tmp, u;
 				if(!at.root){ root(at) }
-				tmp = at.opt = at.opt || {};
+				at.opt = at.opt || {};
 				if(text_is(opt)){ opt = {peers: opt} }
 				else if(list_is(opt)){ opt = {peers: opt} }
 				if(text_is(opt.peers)){ opt.peers = [opt.peers] }
 				if(list_is(opt.peers)){ opt.peers = obj_map(opt.peers, function(n,f,m){m(n,{})}) }
 				obj_map(opt, function map(v,f){
 					if(obj_is(v)){
-						tmp = tmp[f] || (tmp[f] = {}); // TODO: Bug? Be careful of falsey values getting overwritten?
-						obj_map(v, map);
+						obj_map(v, map, this[f] || (this[f] = {})); // TODO: Bug? Be careful of falsey values getting overwritten?
 						return;
 					}
-					tmp[f] = v;
-				});
+					this[f] = v;
+				}, at.opt);
 				Gun.on('opt', at);
 				return gun;
 			}

From c5c2d190e52dbba39dc394b006250ab44a6cb536 Mon Sep 17 00:00:00 2001
From: d3x0r <d3ck0r@gmail.com>
Date: Mon, 10 Oct 2016 20:11:56 -0700
Subject: [PATCH 03/21] Update gun.js

Fix localStorage to pull and cache options from parent.
---
 gun.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gun.js b/gun.js
index dfab1a48..0cb6dd42 100644
--- a/gun.js
+++ b/gun.js
@@ -2031,7 +2031,8 @@
 		var store = root.localStorage || {setItem: noop, removeItem: noop, getItem: noop};
 
 		function put(at){ var err, id, opt, root = at.gun._.root;
-			(opt = at.opt || {}).prefix = opt.prefix || 'gun/';
+			opt = at.opt || ( at.opt = at.gun.Back('opt') || {} );
+			opt.prefix = opt.prefix || 'gun/';
 			Gun.graph.is(at.put, function(node, soul){
 				//try{store.setItem(opt.prefix + soul, Gun.text.ify(node));
 				try{store.setItem(opt.prefix + soul, Gun.text.ify(root._.graph[soul]||node));
@@ -2043,7 +2044,8 @@
 		function get(at){
 			var gun = at.gun, lex = at.get, soul, data, opt, u;
 			//setTimeout(function(){
-			(opt = at.opt || {}).prefix = opt.prefix || 'gun/';
+			opt = at.opt || ( at.opt = at.gun.Back('opt') || {} );
+			opt.prefix = opt.prefix || 'gun/';
 			if(!lex || !(soul = lex[Gun._.soul])){ return }
 			data = Gun.obj.ify(store.getItem(opt.prefix + soul) || null);
 			if(!data){ return } // localStorage isn't trustworthy to say "not found".

From 9355a36a545c4b6e89c91a8e23684fb4f16c2f15 Mon Sep 17 00:00:00 2001
From: Mark Nadal <mark@accelsor.com>
Date: Wed, 12 Oct 2016 01:00:42 -0700
Subject: [PATCH 04/21] Update gun.js

---
 gun.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gun.js b/gun.js
index 0cb6dd42..044eb0fc 100644
--- a/gun.js
+++ b/gun.js
@@ -2031,8 +2031,7 @@
 		var store = root.localStorage || {setItem: noop, removeItem: noop, getItem: noop};
 
 		function put(at){ var err, id, opt, root = at.gun._.root;
-			opt = at.opt || ( at.opt = at.gun.Back('opt') || {} );
-			opt.prefix = opt.prefix || 'gun/';
+			(opt = at.opt || {}).prefix = opt.prefix || (at.gun.Back('opt')||{}).prefix || 'gun/';
 			Gun.graph.is(at.put, function(node, soul){
 				//try{store.setItem(opt.prefix + soul, Gun.text.ify(node));
 				try{store.setItem(opt.prefix + soul, Gun.text.ify(root._.graph[soul]||node));
@@ -2044,8 +2043,7 @@
 		function get(at){
 			var gun = at.gun, lex = at.get, soul, data, opt, u;
 			//setTimeout(function(){
-			opt = at.opt || ( at.opt = at.gun.Back('opt') || {} );
-			opt.prefix = opt.prefix || 'gun/';
+			(opt = at.opt || {}).prefix = opt.prefix || (at.gun.Back('opt')||{}).prefix || 'gun/';
 			if(!lex || !(soul = lex[Gun._.soul])){ return }
 			data = Gun.obj.ify(store.getItem(opt.prefix + soul) || null);
 			if(!data){ return } // localStorage isn't trustworthy to say "not found".

From 58753e0f9e02ac2de317d7cf71acfe214ffe3e99 Mon Sep 17 00:00:00 2001
From: Mark Nadal <mark@accelsor.com>
Date: Wed, 12 Oct 2016 01:35:20 -0700
Subject: [PATCH 05/21] Update gun.js

---
 gun.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gun.js b/gun.js
index 044eb0fc..99005afe 100644
--- a/gun.js
+++ b/gun.js
@@ -1818,7 +1818,9 @@
 			if(typeof field === 'string'){
 				tmp = field.split(opt.split || '.');
 				if(1 === tmp.length){
-					return back.get(field, cb, opt);
+					gun = back.get(field, cb, opt);
+					gun._.opt = opt;
+					return gun;
 				}
 				field = tmp;
 			}
@@ -1835,12 +1837,15 @@
 				} else {
 					gun = back.get(field[0], cb, opt);
 				}
+				gun._.opt = opt;
 				return gun;
 			}
 			if(!field && 0 != field){
 				return back;
 			}
-			return back.get(''+field, cb, opt);
+			gun = back.get(''+field, cb, opt);
+			gun._.opt = opt;
+			return gun;
 		}
 
 		;(function(){
@@ -2031,7 +2036,7 @@
 		var store = root.localStorage || {setItem: noop, removeItem: noop, getItem: noop};
 
 		function put(at){ var err, id, opt, root = at.gun._.root;
-			(opt = at.opt || {}).prefix = opt.prefix || (at.gun.Back('opt')||{}).prefix || 'gun/';
+			(opt = at.opt || {}).prefix = opt.prefix || at.gun.Back('opt.prefix') || 'gun/';
 			Gun.graph.is(at.put, function(node, soul){
 				//try{store.setItem(opt.prefix + soul, Gun.text.ify(node));
 				try{store.setItem(opt.prefix + soul, Gun.text.ify(root._.graph[soul]||node));
@@ -2043,7 +2048,7 @@
 		function get(at){
 			var gun = at.gun, lex = at.get, soul, data, opt, u;
 			//setTimeout(function(){
-			(opt = at.opt || {}).prefix = opt.prefix || (at.gun.Back('opt')||{}).prefix || 'gun/';
+			(opt = at.opt || {}).prefix = opt.prefix || at.gun.Back('opt.prefix') || 'gun/';
 			if(!lex || !(soul = lex[Gun._.soul])){ return }
 			data = Gun.obj.ify(store.getItem(opt.prefix + soul) || null);
 			if(!data){ return } // localStorage isn't trustworthy to say "not found".

From 1c25b51e41867bdda3aabe1b10c734bac2f8bfde Mon Sep 17 00:00:00 2001
From: Cole Chamberlain <cole.chamberlain@gmail.com>
Date: Mon, 17 Oct 2016 15:11:17 -0700
Subject: [PATCH 06/21] added yarn.lock to gitignore and fixed npm start

---
 .gitignore       | 1 +
 examples/http.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdd7bd32..2cbe713e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules/*
 npm-debug.log
+yarn.lock
 *data.json
 *.db
 .idea/
diff --git a/examples/http.js b/examples/http.js
index a873e1c4..e3476cf9 100644
--- a/examples/http.js
+++ b/examples/http.js
@@ -1,6 +1,6 @@
 var port = process.env.OPENSHIFT_NODEJS_PORT || process.env.VCAP_APP_PORT || process.env.PORT || process.argv[2] || 80;
 
-var Gun = require('gun');
+var Gun = require('../');
 var gun = Gun({ 
 	file: 'data.json',
 	s3: {
@@ -22,4 +22,4 @@ var server = require('http').createServer(function(req, res){
 gun.wsp(server);
 server.listen(port);
 
-console.log('Server started on port ' + port + ' with /gun');
\ No newline at end of file
+console.log('Server started on port ' + port + ' with /gun');

From 23f126f219da9f2f0564c4b8313b2ab6e71c3d63 Mon Sep 17 00:00:00 2001
From: Mark Nadal <mark@accelsor.com>
Date: Tue, 18 Oct 2016 12:05:14 -0700
Subject: [PATCH 07/21] Update gun.js

---
 gun.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gun.js b/gun.js
index 99005afe..6b2a6c02 100644
--- a/gun.js
+++ b/gun.js
@@ -2251,7 +2251,7 @@
 		Tab.on = Gun.on;//Gun.on.create();
 		Tab.peers = require('../polyfill/peer');
 		Gun.on('get', function(at){
-			var gun = at.gun, opt = gun.Back('opt') || {}, peers = opt.peers;
+			var gun = at.gun, opt = at.opt || {}, peers = opt.peers || gun.Back('opt.peers');
 			if(!peers || Gun.obj.empty(peers)){
 				//setTimeout(function(){
 				Gun.log.once('peers', "Warning! You have no peers to connect to!");

From 0aef927eecb7845d1052cb05baa23f9bd736f29d Mon Sep 17 00:00:00 2001
From: Mark Nadal <mark@accelsor.com>
Date: Tue, 18 Oct 2016 12:11:02 -0700
Subject: [PATCH 08/21] Update gun.js

---
 gun.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gun.js b/gun.js
index 6b2a6c02..d51b71ed 100644
--- a/gun.js
+++ b/gun.js
@@ -370,10 +370,18 @@
 				var last = act.on.last, tmp;
 				if(last){
 					if(act.on.map){
+						var map = act.on.map, v;
+						for(var f in map){ v = map[f];
+							if(v[1]){
+								emit(v[1], act, event, v[2]);
+							}
+						}
+						/*
 						Gun.obj.map(act.on.map, function(v,f){ // TODO: BUG! Gun is not available in this module.
 							//emit(v[0], act, event, v[1]); // below enables more control
 							emit(v[1], act, event, v[2]);
 						});
+						*/
 					} else {
 						emit(last, act, event);
 					}

From 6f8c99ccf1d611239919539737aa97d533cce984 Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Tue, 18 Oct 2016 13:54:59 -0600
Subject: [PATCH 09/21] Fix /gun.js route

The `wsp.server` logic was never making it to the /gun.js route. If the
browser is just sending a GET request for a the js file, it won't set
the upgrade property, and the server logic wouldn't let the request pass
if it didn't have that header.
I've simply moved the check below the file serving logic.
---
 lib/wsp.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/wsp.js b/lib/wsp.js
index 09ea2a02..7768fa86 100644
--- a/lib/wsp.js
+++ b/lib/wsp.js
@@ -34,7 +34,7 @@
 					if(msg && msg.headers){ delete msg.headers['ws-rid'] }
 					// TODO: BUG? ^ What if other peers want to ack? Do they use the ws-rid or a gun declared id?
 					try{ws.send(Gun.text.ify(msg));
-					}catch(e){} // juuuust in case. 
+					}catch(e){} // juuuust in case.
 				});
 				gun.wsp.wire(req, res);
 			}, {headers: {'ws-rid': 1, 'gun-sid': 1}});
@@ -67,18 +67,18 @@
 		gun.wsp.server = gun.wsp.server || function(req, res, next){ // http
 			next = next || function(){};
 			if(!req || !res){ return next(), false }
-			if(!req.upgrade){ return next(), false }
-			if(!req.url){ return next(), false }
-			if(!req.method){ return next(), false }
-			var msg = {};
-			msg.url = url.parse(req.url, true);
-			if(!gun.wsp.regex.test(msg.url.pathname)){ return next(), false } // TODO: BUG! If the option isn't a regex then this will fail!
-			if(msg.url.pathname.replace(gun.wsp.regex,'').slice(0,3).toLowerCase() === '.js'){
-				res.writeHead(200, {'Content-Type': 'text/javascript'});
-				res.end(gun.wsp.js = gun.wsp.js || require('fs').readFileSync(__dirname + '/../gun.js')); // gun server is caching the gun library for the client
-				return true;
-			}
-			return http(req, res, function(req, res){
+			if(!req.url){ return next(), false }
+			if(!req.method){ return next(), false }
+			var msg = {};
+			msg.url = url.parse(req.url, true);
+			if(!gun.wsp.regex.test(msg.url.pathname)){ return next(), false } // TODO: BUG! If the option isn't a regex then this will fail!
+			if(msg.url.pathname.replace(gun.wsp.regex,'').slice(0,3).toLowerCase() === '.js'){
+				res.writeHead(200, {'Content-Type': 'text/javascript'});
+				res.end(gun.wsp.js = gun.wsp.js || require('fs').readFileSync(__dirname + '/../gun.js')); // gun server is caching the gun library for the client
+				return true;
+			}
+			if(!req.upgrade){ return next(), false }
+			return http(req, res, function(req, res){
 				if(!req){ return next() }
 				var stream, cb = res = require('./jsonp')(req, res);
 				if(req.headers && (stream = req.headers['gun-sid'])){
@@ -121,7 +121,7 @@
 					Gun.obj.del(gun.wsp.msg.debounce, id);
 				});
 			},500);
-			if(id = gun.wsp.msg.debounce[id]){ 
+			if(id = gun.wsp.msg.debounce[id]){
 				return gun.wsp.msg.debounce[id] = Gun.time.is(), id;
 			}
 			gun.wsp.msg.debounce[id] = Gun.time.is();

From 74b0242682ce549be59911cd324e2b1ef3b171f3 Mon Sep 17 00:00:00 2001
From: Alan Colon <acolon@lifetimefitness.com>
Date: Sun, 23 Oct 2016 16:45:39 -0600
Subject: [PATCH 10/21] Enable .set with node, or new soul. (0.5)

---
 gun.js         |  4 +++-
 test/common.js | 24 ++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/gun.js b/gun.js
index d51b71ed..ea1b67ea 100644
--- a/gun.js
+++ b/gun.js
@@ -2024,8 +2024,10 @@
 
 		;(function(){
 			Gun.chain.set = function(item, cb, opt){
-				var gun = this;
+				var gun = this, soul;
 				cb = cb || function(){};
+				if (soul = Gun.node.soul(item)) return gun.set(gun.get(soul), cb, opt);
+				if (Gun.obj.is(item) && !Gun.is(item)) return gun.set(gun._.root.put(item), cb, opt);
 				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 + '"!')}) }
diff --git a/test/common.js b/test/common.js
index 4bcce18b..d668a814 100644
--- a/test/common.js
+++ b/test/common.js
@@ -6088,12 +6088,19 @@ describe('Gun', function(){
 			var alice = gun.put({name: 'alice', birth: Math.random()}).key('person/alice');
 			var bob = gun.put({name: 'bob', birth: Math.random()}).key('person/bob');
 			var carl = gun.put({name: 'carl', birth: Math.random()}).key('person/carl');
-			var dave = gun.put({name: 'dave', birth: Math.random()}).key('person/dave');
-
+			var dave = gun.put({name: 'dave', birth: Math.random()}).key('person/dave');
+
+			// Test set with new object
+			var alan = users.set({name: 'alan', birth: Math.random()}).key('person/alan');
+			alan.val(function(alan) {
+				// Test set with node
+				dave.path('friends').set(alan);
+			});
+
 			users.set(alice);
 			users.set(bob);
 			users.set(carl);
-			users.set(dave);
+			users.set(dave);
 
 			alice.path('friends').set(bob).back.set(carl);
 			bob.path('friends').set(alice);
@@ -6101,7 +6108,8 @@ describe('Gun', function(){
 
 			var team = gun.get('team/lions').put({name: "Lions"});
 			team.path('members').set(alice);
-			team.path('members').set(bob);
+			team.path('members').set(bob);
+			team.path('members').set(alan); // Test set with set
 
 			alice.path('team').put(team);
 			bob.path('team').put(team);
@@ -6113,10 +6121,14 @@ describe('Gun', function(){
 				} else
 				if('bob' === member.name){
 					done.bob = true;
-				} else {
+				} else
+				if('alan' === member.name){
+					done.alan = true;
+				} else
+				{
 					expect(member).to.not.be.ok();
 				}
-				if(done.alice && done.bob){
+				if(done.alice && done.bob && done.alan){
 					setTimeout(function(){
 						done();
 					},10);

From 281a56292ed1cfa811176ade082ceb1e7f9cb117 Mon Sep 17 00:00:00 2001
From: Alan Colon <acolon@lifetimefitness.com>
Date: Sun, 23 Oct 2016 20:02:28 -0600
Subject: [PATCH 11/21] .off for .on, and .map. (0.5)

---
 gun.js | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/gun.js b/gun.js
index d51b71ed..52d5299e 100644
--- a/gun.js
+++ b/gun.js
@@ -1858,22 +1858,28 @@
 
 		;(function(){
 			Gun.chain.on = function(tag, arg, eas, as){
-				var gun = this, at = gun._, tmp;
+				var gun = this, at = gun._, tmp, act, off;
 				if(!at.on){ at.on = Gun.on }
 				if(typeof tag === 'string'){
 					if(!arg){ return at.on(tag) }
-					at.on(tag, arg, eas || at, as);
+					act = at.on(tag, arg, eas || at, as);
+					off = function() {
+						if (act && act.off) act.off();
+						off.off();
+					};
+					off.off = gun.off.bind(gun) || noop;
+					gun.off = off;
 					return gun;
 				}
 				var opt = arg;
-				opt = (true === opt)? {change: true} : opt || {}; 
+				opt = (true === opt)? {change: true} : opt || {};
 				opt.ok = tag;
 				gun.any(ok, {as: opt, change: opt.change}); // TODO: PERF! Event listener leak!!!????
 				return gun;
 			}
 
 			function ok(cat, ev){ var opt = this;
-				var data = cat.put, tmp; 
+				var data = cat.put, tmp;
 				// TODO: BUG! Need to use at.put > cat.put for merged cache?
 				if(u === data){ return }
 				if(opt.as){
@@ -1973,29 +1979,38 @@
 
 		;(function(){
 			Gun.chain.map = function(cb, opt, t){
-				var gun = this, cat = gun._, chain = cat.map;
+				var gun = this, cat = gun._, chain = cat.map, ons = [], act, off;
 				if(!chain){
 					chain = cat.map = gun.chain();
 					var list = (cat = chain._).list = cat.list || {};
-					chain.on('in').map = {};
-					chain.on('out', function(at){
+					(ons[ons.length] = chain.on('in')).map = {};
+					ons[ons.length] = chain.on('out', function(at){
 						console.debug(8, 'map out', at);
 				 		if(at.get instanceof Function){
-							chain.on('in', at.get, at);
+							ons[ons.length] = chain.on('in', at.get, at);
 							return;
 						} else {
 							console.debug(9, 'map out', at);
-							chain.on('in', gun.get.input, at.gun._);
+							ons[ons.length] = chain.on('in', gun.get.input, at.gun._);
 						}
 					});
 					if(opt !== false){
-						gun.on(map, {change: true, as: cat});
+						ons[ons.length] = gun.on(map, {change: true, as: cat});
 						console.debug(1, 'map');
 					}
 				}
 				if(cb){
-					chain.on(cb);
+					ons[ons.length] = chain.on(cb);
 				}
+				off = function() {
+					while (ons.length) {
+						act = ons.pop();
+						if (act && act.off) act.off();
+					}
+					return off.off();
+				};
+				off.off = chain.off.bind(chain) || noop;
+				chain.off = off;
 				return chain;
 			}
 			function map(at,ev){

From adbea081204c1ebdbda6ff59fa4e72a8826706e9 Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Wed, 26 Oct 2016 14:52:28 -0600
Subject: [PATCH 12/21] Add basic websocket logic

Servers will now try to initiate a connection using websockets if the
`peers` option is set. Currently, it'll either start throwing errors,
or generate a broadcasting storm. Still work to be done...
This marks a milestone of getting the servers to connect to each
other. Now to have those messages make sense. Committing so I
have an easy rollback point.
---
 lib/wsp-client.js | 460 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/wsp.js        | 412 ++++++++++++++++++-----------------------
 2 files changed, 643 insertions(+), 229 deletions(-)
 create mode 100644 lib/wsp-client.js

diff --git a/lib/wsp-client.js b/lib/wsp-client.js
new file mode 100644
index 00000000..8640d917
--- /dev/null
+++ b/lib/wsp-client.js
@@ -0,0 +1,460 @@
+/* eslint-env node*/
+/*
+	eslint-disable
+	require-jsdoc,
+	no-warning-comments,
+	no-underscore-dangle,
+	max-params,
+*/
+'use strict';
+
+var Gun = require('../gun');
+var WS = require('ws');
+
+var Tab = {};
+Tab.on = Gun.on;
+Tab.peers = (function () {
+
+	function Peer (peers) {
+		if (!Peer.is(this)) {
+			return new Peer(peers);
+		}
+
+		this.peers = peers;
+	}
+
+	Peer.is = function (peer) {
+		return peer instanceof Peer;
+	};
+
+	function map (peer, url) {
+		var msg = this.msg;
+		var opt = this.opt || {};
+		opt.out = true;
+		Peer.request(url, msg, null, opt);
+	}
+
+	Peer.prototype.send = function (msg, opt) {
+		Peer.request.each(this.peers, map, {
+			msg: msg,
+			opt: opt,
+		});
+	};
+
+	Peer.request = (function () {
+
+		function request (base, body, cb, opt) {
+
+			var obj = base.length ? { base: base } : {};
+			obj.base = opt.base || base;
+			obj.body = opt.body || body;
+			obj.headers = opt.headers;
+			obj.url = opt.url;
+			obj.out = opt.out;
+			cb = cb || function () {};
+
+			if (!obj.base) {
+				return;
+			}
+
+			request.transport(obj, cb);
+		}
+
+		request.createServer = function (fn) {
+			request.createServer.list.push(fn);
+		};
+
+		request.createServer.ing = function (req, cb) {
+			var index = request.createServer.list.length;
+			var server;
+			while (index) {
+				index -= 1;
+				server = request.createServer.list[index] || function () {};
+				server(req, cb);
+			}
+		};
+
+		request.createServer.list = [];
+		request.back = 2;
+		request.backoff = 2;
+
+		request.transport = function (opt, cb) {
+			if (request.ws(opt, cb)) {
+				return;
+			}
+		};
+
+		request.ws = function (opt, cb, req) {
+			var ws;
+			if (!WS) {
+				return false;
+			}
+
+			ws = request.ws.peers[opt.base];
+			if (ws) {
+				req = req || {};
+				if (opt.headers) {
+					req.headers = opt.headers;
+				}
+				if (opt.body) {
+					req.body = opt.body;
+				}
+
+				if (opt.url) {
+					req.url = opt.url;
+				}
+
+				req.headers = req.headers || {};
+
+				if (!opt.out && !ws.cbs[req.headers['ws-rid']]) {
+					var rid = 'WS' +
+						new Date().getTime() +
+						'.' +
+						Math.floor((Math.random() * 65535) + 1);
+
+					req.headers['ws-rid'] = rid;
+
+					ws.cbs[rid] = function (err, res) {
+						if (!res || res.body || res.end) {
+							delete ws.cbs[req.headers['ws-rid']];
+						}
+
+						cb(err, res);
+					};
+				}
+
+				if (!ws.readyState) {
+					setTimeout(function () {
+						request.ws(opt, cb, req);
+					}, 100);
+
+					return true;
+				}
+
+				ws.sending = true;
+				ws.send(JSON.stringify(req));
+				return true;
+			}
+
+			if (ws === false) {
+				return false;
+			}
+
+			var wsURL = opt.base.replace('http', 'ws');
+
+			ws = request.ws.peers[opt.base] = new WS(wsURL);
+			ws.cbs = {};
+
+			ws.onopen = function () {
+				request.back = 2;
+				request.ws(opt, cb);
+			};
+
+			ws.onclose = function (event) {
+
+				if (!ws || !event) {
+					return;
+				}
+
+				if (ws.close instanceof Function) {
+					ws.close();
+				}
+
+				if (!ws.sending) {
+					ws = request.ws.peers[opt.base] = false;
+					request.transport(opt, cb);
+					return;
+				}
+
+				request.each(ws.cbs, function (cb) {
+					cb({
+						err: 'WebSocket disconnected!',
+						code: ws.sending ? (ws || {}).err || event.code : -1,
+					});
+				});
+
+				// This will make the next request try to reconnect
+				ws = request.ws.peers[opt.base] = null;
+
+				// TODO: Have the driver handle this!
+				setTimeout(function () {
+
+					// opt here is a race condition,
+					// is it not? Does this matter?
+					request.ws(opt, function () {});
+				}, request.back *= request.backoff);
+			};
+
+			ws.onmessage = function (msg) {
+				var res;
+				if (!msg || !msg.data) {
+					return;
+				}
+				try {
+					res = JSON.parse(msg.data);
+				} catch (error) {
+					return;
+				}
+				if (!res) {
+					return;
+				}
+				res.headers = res.headers || {};
+				if (res.headers['ws-rid']) {
+					var cb = ws.cbs[res.headers['ws-rid']] || function () {};
+					cb(null, res);
+					return;
+				}
+
+				// emit extra events.
+				if (res.body) {
+					request.createServer.ing(res, function (res) {
+						res.out = true;
+						request(opt.base, null, null, res);
+					});
+				}
+			};
+
+			ws.onerror = function (error) {
+				(ws || {}).err = error;
+			};
+
+			return true;
+		};
+		request.ws.peers = {};
+		request.ws.cbs = {};
+
+		request.each = function (obj, cb, as) {
+			if (!obj || !cb) {
+				return;
+			}
+
+			for (var key in obj) {
+				if (obj.hasOwnProperty(key)) {
+					cb.call(as, obj[key], key);
+				}
+			}
+		};
+
+		return request;
+	}());
+
+	return Peer;
+}());
+
+// Handle read requests.
+Gun.on('get', function (at) {
+	var gun = at.gun;
+	var opt = at.opt || {};
+	var peers = opt.peers || gun.Back('opt.peers');
+
+	if (!peers || Gun.obj.empty(peers)) {
+		Gun.log.once('peers', 'Warning! You have no peers to connect to!');
+		at.gun.Back(-1).on('in', {'@': at['#']});
+
+		return;
+	}
+
+	// Create a new message.
+	var msg = {
+
+		// msg ID
+		'#': at['#'] || Gun.text.random(9),
+
+		// msg BODY
+		'$': at.get,
+	};
+
+	// Listen for a response.
+	// TODO: ONE? PERF! Clear out listeners, maybe with setTimeout?
+	Tab.on(msg['#'], function (err, data) {
+		var obj = {
+			'@': at['#'],
+			err: err,
+			put: data,
+		};
+
+		if (data) {
+			at.gun.Back(-1).on('out', obj);
+		} else {
+			at.gun.Back(-1).on('in', obj);
+		}
+	});
+
+	// Broadcast to all other peers.
+	Tab.peers(peers).send(msg, {
+		headers: {
+			'gun-sid': Tab.server.sid,
+		},
+	});
+});
+
+// Handle write requests.
+Gun.on('put', function (at) {
+	if (at['@']) {
+		return;
+	}
+	var opt = at.gun.Back('opt') || {}, peers = opt.peers;
+	if (!peers || Gun.obj.empty(peers)) {
+		Gun.log.once('peers', 'Warning! You have no peers to save to!');
+		at.gun.Back(-1).on('in', {'@': at['#']});
+		return;
+	}
+	if (opt.websocket === false || (at.opt && at.opt.websocket === false)) {
+		return;
+	}
+	var msg = {
+
+		// msg ID
+		'#': at['#'] || Gun.text.random(9),
+
+		// msg BODY
+		'$': at.put,
+	};
+
+	// TODO: ONE? PERF! Clear out listeners, maybe with setTimeout?
+	Tab.on(msg['#'], function (err, ok) {
+		at.gun.Back(-1).on('in', {
+			'@': at['#'],
+			err: err,
+			ok: ok,
+		});
+	});
+
+	Tab.peers(peers).send(msg, {
+		headers: {
+			'gun-sid': Tab.server.sid,
+		},
+	});
+});
+
+// REVIEW: Do I need this on a server client?
+// browser/client side Server!
+// TODO: BUG! Does not respect separate instances!!!
+Gun.on('opt', function (at) {
+	if (Tab.server) {
+		return;
+	}
+
+	var gun = at.gun;
+	var server = Tab.server = Tab.server || {};
+	var tmp;
+
+	server.sid = Gun.text.random();
+
+	Tab.peers.request.createServer(function (req, res) {
+
+		// Validate request.
+		if (!req || !res || !req.body || !req.headers) {
+			return;
+		}
+
+		var msg = req.body;
+
+		// AUTH for non-replies.
+		if (server.msg(msg['#'])) {
+			return;
+		}
+
+		// no need to process.
+		if (msg['@']) {
+			if (Tab.ons[tmp = msg['@'] || msg['#']]) {
+				Tab.on(tmp, [msg['!'], msg.$]);
+			}
+			return;
+		}
+
+		if (msg.$ && msg.$['#']) {
+			server.get(req, res);
+			return;
+		}
+
+		server.put(req, res);
+	});
+
+	server.get = function (req, cb) {
+		var body = req.body;
+		var lex = body.$;
+		var graph = gun._.root._.graph;
+		var node;
+
+		// Don't reply to data we don't have it in memory.
+		// TODO: Add localStorage?
+		if (!(node = graph[lex['#']])) {
+			return;
+		}
+
+		cb({
+			body: {
+				'#': server.msg(),
+				'@': body['#'],
+				'$': node,
+			},
+		});
+	};
+
+	server.put = function (req, cb) {
+		var body = req.body, graph = body.$;
+		var __ = gun._.root._;
+
+		// filter out what we don't have in memory.
+		if (!(graph = Gun.obj.map(graph, function (node, soul, map) {
+			if (!__.path[soul]) {
+				return;
+			}
+			map(soul, node);
+		}))) {
+			return;
+		}
+		gun.on('out', {
+			gun: gun,
+			opt: {
+				websocket: false,
+			},
+			put: graph,
+			'#': Gun.on.ask(function (ack, ev) {
+				if (!ack) {
+					return undefined;
+				}
+				ev.off();
+				return cb({
+					body: {
+						'#': server.msg(),
+						'@': body['#'],
+						'$': ack,
+						'!': ack.err,
+					},
+				});
+			}),
+		});
+	};
+
+	server.msg = function (id) {
+		if (!id) {
+			id = Gun.text.random(9);
+			server.msg.debounce[id] = Gun.time.is();
+			return id;
+		}
+
+		clearTimeout(server.msg.clear);
+		server.msg.clear = setTimeout(function () {
+			var now = Gun.time.is();
+			Gun.obj.map(server.msg.debounce, function (time, id) {
+				if ((now - time) < (1000 * 60 * 5)) {
+					return;
+				}
+
+				Gun.obj.del(server.msg.debounce, id);
+			});
+		}, 500);
+
+		if (server.msg.debounce[id]) {
+			server.msg.debounce[id] = Gun.time.is();
+			return id;
+		}
+
+		server.msg.debounce[id] = Gun.time.is();
+		return undefined;
+	};
+
+	server.msg.debounce = server.msg.debounce || {};
+});
diff --git a/lib/wsp.js b/lib/wsp.js
index 7768fa86..7ac4bbac 100644
--- a/lib/wsp.js
+++ b/lib/wsp.js
@@ -1,230 +1,184 @@
-;(function(wsp){
-	/*
-		TODO: SERVER PUSH!
-		TODO: SERVER GET!
-		TODO: SERVER PUSH!
-		TODO: SERVER GET!
-		TODO: SERVER PUSH!
-		TODO: SERVER GET!
-		TODO: SERVER PUSH!
-		TODO: SERVER GET!
-		TODO: SERVER PUSH!
-		TODO: SERVER GET!
-		TODO: SERVER PUSH!
-		TODO: SERVER GET!
-	*/
-	var Gun = require('../gun')
-	, formidable = require('formidable')
-	, ws = require('ws').Server
-	, http = require('./http')
-	, url = require('url');
-	Gun.on('opt', function(at){
-		var gun = at.gun, opt = at.opt;
-		gun.__ = at.root._;
-		gun.__.opt.ws = opt.ws = gun.__.opt.ws || opt.ws || {};
-		function start(server, port, app){
-			if(app && app.use){ app.use(gun.wsp.server) }
-			server = gun.__.opt.ws.server = gun.__.opt.ws.server || opt.ws.server || server;
-			require('./ws')(gun.wsp.ws = gun.wsp.ws || new ws(gun.__.opt.ws), function(req, res){
-				var ws = this;
-				req.headers['gun-sid'] = ws.sid = ws.sid? ws.sid : req.headers['gun-sid'];
-				ws.sub = ws.sub || gun.wsp.on('network', function(msg, ev){
-					if(!ws || !ws.send || !ws._socket || !ws._socket.writable){ return ev.off() }
-					if(!msg || (msg.headers && msg.headers['gun-sid'] === ws.sid)){ return }
-					if(msg && msg.headers){ delete msg.headers['ws-rid'] }
-					// TODO: BUG? ^ What if other peers want to ack? Do they use the ws-rid or a gun declared id?
-					try{ws.send(Gun.text.ify(msg));
-					}catch(e){} // juuuust in case.
-				});
-				gun.wsp.wire(req, res);
-			}, {headers: {'ws-rid': 1, 'gun-sid': 1}});
-			gun.__.opt.ws.port = gun.__.opt.ws.port || opt.ws.port || port || 80;
-		}
-		var wsp = gun.wsp = gun.wsp || function(server){
-			if(!server){ return gun }
-			if(Gun.fns.is(server.address)){
-				if(server.address()){
-					start(server, server.address().port);
-					return gun;
-				}
-			}
-			if(Gun.fns.is(server.get) && server.get('port')){
-				start(server, server.get('port'));
-				return gun;
-			}
-			var listen = server.listen;
-			server.listen = function(port){
-				var serve = listen.apply(server, arguments);
-				start(serve, port, server);
-				return serve;
-			}
-			return gun;
-		}
-		gun.wsp.on = gun.wsp.on || Gun.on;
-		gun.wsp.regex = gun.wsp.regex || opt.route || opt.path || /^\/gun/i;
-		gun.wsp.poll = gun.wsp.poll || opt.poll || 1;
-		gun.wsp.pull = gun.wsp.pull || opt.pull || gun.wsp.poll * 1000;
-		gun.wsp.server = gun.wsp.server || function(req, res, next){ // http
-			next = next || function(){};
-			if(!req || !res){ return next(), false }
-			if(!req.url){ return next(), false }
-			if(!req.method){ return next(), false }
-			var msg = {};
-			msg.url = url.parse(req.url, true);
-			if(!gun.wsp.regex.test(msg.url.pathname)){ return next(), false } // TODO: BUG! If the option isn't a regex then this will fail!
-			if(msg.url.pathname.replace(gun.wsp.regex,'').slice(0,3).toLowerCase() === '.js'){
-				res.writeHead(200, {'Content-Type': 'text/javascript'});
-				res.end(gun.wsp.js = gun.wsp.js || require('fs').readFileSync(__dirname + '/../gun.js')); // gun server is caching the gun library for the client
-				return true;
+/* eslint-disable*/
+var Gun = require('../gun')
+, formidable = require('formidable')
+, http = require('./http')
+, url = require('url')
+, wsp = {}
+, WS = require('ws')
+, ws = WS.Server;
+
+// Handles server to server sync.
+require('./wsp-client.js');
+
+Gun.on('opt', function(at){
+	var gun = at.gun, opt = at.opt;
+	gun.__ = at.root._;
+	gun.__.opt.ws = opt.ws = gun.__.opt.ws || opt.ws || {};
+
+	function start(server, port, app){
+		if(app && app.use){ app.use(gun.wsp.server) }
+		server = gun.__.opt.ws.server = gun.__.opt.ws.server || opt.ws.server || server;
+		require('./ws')(gun.wsp.ws = gun.wsp.ws || new ws(gun.__.opt.ws), function(req, res){
+			var ws = this;
+			req.headers['gun-sid'] = ws.sid = ws.sid? ws.sid : req.headers['gun-sid'];
+			ws.sub = ws.sub || gun.wsp.on('network', function(msg, ev){
+				if(!ws || !ws.send || !ws._socket || !ws._socket.writable){ return ev.off() }
+				if(!msg || (msg.headers && msg.headers['gun-sid'] === ws.sid)){ return }
+				if(msg && msg.headers){ delete msg.headers['ws-rid'] }
+				// TODO: BUG? ^ What if other peers want to ack? Do they use the ws-rid or a gun declared id?
+				try{ws.send(Gun.text.ify(msg));
+				}catch(e){} // juuuust in case.
+			});
+			gun.wsp.wire(req, res);
+		}, {headers: {'ws-rid': 1, 'gun-sid': 1}});
+		gun.__.opt.ws.port = gun.__.opt.ws.port || opt.ws.port || port || 80;
+	}
+	var wsp = gun.wsp = gun.wsp || function(server){
+		if(!server){ return gun }
+		if(Gun.fns.is(server.address)){
+			if(server.address()){
+				start(server, server.address().port);
+				return gun;
 			}
-			if(!req.upgrade){ return next(), false }
-			return http(req, res, function(req, res){
-				if(!req){ return next() }
-				var stream, cb = res = require('./jsonp')(req, res);
-				if(req.headers && (stream = req.headers['gun-sid'])){
-					stream = (gun.wsp.peers = gun.wsp.peers || {})[stream] = gun.wsp.peers[stream] || {sid: stream};
-					stream.drain = stream.drain || function(res){
-						if(!res || !stream || !stream.queue || !stream.queue.length){ return }
-						res({headers: {'gun-sid': stream.sid}, body: stream.queue });
-						stream.off = setTimeout(function(){ stream = null }, gun.wsp.pull);
-						stream.reply = stream.queue = null;
-						return true;
-					}
-					stream.sub = stream.sub || gun.wsp.on('network', function(req, ev){
-						if(!stream){ return ev.off() } // self cleans up after itself!
-						if(!req || (req.headers && req.headers['gun-sid'] === stream.sid)){ return }
-						(stream.queue = stream.queue || []).push(req);
-						stream.drain(stream.reply);
-					});
-					cb = function(r){ (r.headers||{}).poll = gun.wsp.poll; res(r) }
-					clearTimeout(stream.off);
-					if(req.headers.pull){
-						if(stream.drain(cb)){ return }
-						return stream.reply = cb;
-					}
-				}
-				gun.wsp.wire(req, cb);
-			}), true;
-		}
-		if((gun.__.opt.maxSockets = opt.maxSockets || gun.__.opt.maxSockets) !== false){
-			require('https').globalAgent.maxSockets = require('http').globalAgent.maxSockets = gun.__.opt.maxSockets || Infinity;
-		}
-		gun.wsp.msg = gun.wsp.msg || function(id){
-			if(!id){
-				return gun.wsp.msg.debounce[id = Gun.text.random(9)] = Gun.time.is(), id;
-			}
-			clearTimeout(gun.wsp.msg.clear);
-			gun.wsp.msg.clear = setTimeout(function(){
-				var now = Gun.time.is();
-				Gun.obj.map(gun.wsp.msg.debounce, function(t,id){
-					if((now - t) < (1000 * 60 * 5)){ return }
-					Gun.obj.del(gun.wsp.msg.debounce, id);
-				});
-			},500);
-			if(id = gun.wsp.msg.debounce[id]){
-				return gun.wsp.msg.debounce[id] = Gun.time.is(), id;
-			}
-			gun.wsp.msg.debounce[id] = Gun.time.is();
-			return;
-		};
-		gun.wsp.msg.debounce = gun.wsp.msg.debounce || {};
-		gun.wsp.wire = gun.wsp.wire || (function(){
-			// all streams, technically PATCH but implemented as PUT or POST, are forwarded to other trusted peers
-			// except for the ones that are listed in the message as having already been sending to.
-			// all states, implemented with GET, are replied to the source that asked for it.
-			function tran(req, res){
-				if(!req || !res || !req.body || !req.headers){ return }
-				if(req.url){ req.url = url.format(req.url) }
-				var msg = req.body;
-				// AUTH for non-replies.
-				if(gun.wsp.msg(msg['#'])){ return }
-				gun.wsp.on('network', Gun.obj.copy(req));
-				if(msg['@']){ return } // no need to process.
-				if(msg['$'] && msg['$']['#']){ return tran.get(req, res) }
-				//if(Gun.is.lex(msg['$'])){ return tran.get(req, res) }
-				else { return tran.put(req, res) }
-				cb({body: {hello: 'world'}});
-				// TODO: BUG! server put should push.
-			}
-			tran.get = function(req, cb){
-				var body = req.body, lex = body['$'], reply = {headers: {'Content-Type': tran.json}}, opt;
-				gun.on('out', {gun: gun, get: lex, req: 1, '#': Gun.on.ask(function(at, ev){
-					ev.off();
-					var graph = at.put;
-					return cb({headers: reply.headers, body: {
-						'#': gun.wsp.msg(),
-						'@': body['#'],
-						'$': graph,
-						'!': at.err
-					}});
-					return;
-					if(Gun.obj.empty(node)){
-						return cb({headers: reply.headers, body: node});
-					} // we're out of stuff!
-					/*
-					(function(chunks){ // FEATURE! Stream chunks if the nodes are large!
-						var max = 10, count = 0, soul = Gun.is.node.soul(node);
-						if(Object.keys(node).length > max){
-							var n = Gun.is.node.soul.ify({}, soul);
-							Gun.obj.map(node, function(val, field){
-								if(!(++count % max)){
-									cb({headers: reply.headers, chunk: n}); // send node chunks
-									n = Gun.is.node.soul.ify({}, soul);
-								}
-								Gun.is.node.state.ify([n, node], field, val);
-							});
-							if(count % max){ // finish off the last chunk
-								cb({headers: reply.headers, chunk: n});
-							}
-						} else {
-							cb({headers: reply.headers, chunk: node}); // send full node
-						}
-					}([]));
-					*/
-					cb({headers: reply.headers, chunk: node }); // Use this if you don't want streaming chunks feature.
-				})});
-			}
-			tran.put = function(req, cb){
-				//console.log("tran.put", req);
-				// NOTE: It is highly recommended you do your own PUT/POSTs through your own API that then saves to gun manually.
-				// This will give you much more fine-grain control over security, transactions, and what not.
-				var body = req.body, graph = body['$'], reply = {headers: {'Content-Type': tran.json}}, opt;
-				gun.on('out', {gun: gun, put: graph, '#': Gun.on.ask(function(ack, ev){
-				//Gun.on('put', {gun: gun, put: graph, '#': Gun.on.ask(function(ack, ev){
-					ev.off();
-					return cb({headers: reply.headers, body: {
-						'#': gun.wsp.msg(),
-						'@': body['#'],
-						'$': ack,
-						'!': ack.err
-					}});
-				})});
-				return;
-				if(Gun.is.graph(req.body)){
-					if(req.err = Gun.union(gun, req.body, function(err, ctx){ // TODO: BUG? Probably should give me ctx.graph
-						if(err){ return cb({headers: reply.headers, body: {err: err || "Union failed."}}) }
-						var ctx = ctx || {}; ctx.graph = {};
-						Gun.is.graph(req.body, function(node, soul){
-							ctx.graph[soul] = gun.__.graph[soul];
-						});
-						(gun.__.opt.wire.put || function(g,cb){cb("No save.")})(ctx.graph, function(err, ok){
-							if(err){ return cb({headers: reply.headers, body: {err: err || "Failed."}}) } // TODO: err should already be an error object?
-							cb({headers: reply.headers, body: {ok: ok || "Persisted."}});
-							//console.log("tran.put <------------------------", ok);
-						});
-					}).err){ cb({headers: reply.headers, body: {err: req.err || "Union failed."}}) }
-				} else {
-					cb({headers: reply.headers, body: {err: "Not a valid graph!"}});
-				}
-			}
-			gun.wsp.on('network', function(req){
-				// TODO: MARK! You should move the networking events to here, not in WSS only.
-			});
-			tran.json = 'application/json';
-			return tran;
-		}());
-		if(opt.server){
-			wsp(opt.server);
-		}
-	});
-}({}));
+		}
+		if(Gun.fns.is(server.get) && server.get('port')){
+			start(server, server.get('port'));
+			return gun;
+		}
+		var listen = server.listen;
+		server.listen = function(port){
+			var serve = listen.apply(server, arguments);
+			start(serve, port, server);
+			return serve;
+		}
+		return gun;
+	}
+	gun.wsp.on = gun.wsp.on || Gun.on;
+	gun.wsp.regex = gun.wsp.regex || opt.route || opt.path || /^\/gun/i;
+	gun.wsp.poll = gun.wsp.poll || opt.poll || 1;
+	gun.wsp.pull = gun.wsp.pull || opt.pull || gun.wsp.poll * 1000;
+	gun.wsp.server = gun.wsp.server || function(req, res, next){ // http
+		next = next || function(){};
+		if(!req || !res){ return next(), false }
+		if(!req.url){ return next(), false }
+		if(!req.method){ return next(), false }
+		var msg = {};
+		msg.url = url.parse(req.url, true);
+		if(!gun.wsp.regex.test(msg.url.pathname)){ return next(), false } // TODO: BUG! If the option isn't a regex then this will fail!
+		if(msg.url.pathname.replace(gun.wsp.regex,'').slice(0,3).toLowerCase() === '.js'){
+			res.writeHead(200, {'Content-Type': 'text/javascript'});
+			res.end(gun.wsp.js = gun.wsp.js || require('fs').readFileSync(__dirname + '/../gun.js')); // gun server is caching the gun library for the client
+			return true;
+		}
+
+		if(!req.upgrade){
+			next();
+			return false;
+		}
+
+		return http(req, res, function(req, res){
+			if(!req){ return next() }
+			var stream, cb = res = require('./jsonp')(req, res);
+			if(req.headers && (stream = req.headers['gun-sid'])){
+				stream = (gun.wsp.peers = gun.wsp.peers || {})[stream] = gun.wsp.peers[stream] || {sid: stream};
+				stream.drain = stream.drain || function(res){
+					if(!res || !stream || !stream.queue || !stream.queue.length){ return }
+					res({headers: {'gun-sid': stream.sid}, body: stream.queue });
+					stream.off = setTimeout(function(){ stream = null }, gun.wsp.pull);
+					stream.reply = stream.queue = null;
+					return true;
+				}
+				stream.sub = stream.sub || gun.wsp.on('network', function(req, ev){
+					if(!stream){ return ev.off() } // self cleans up after itself!
+					if(!req || (req.headers && req.headers['gun-sid'] === stream.sid)){ return }
+					(stream.queue = stream.queue || []).push(req);
+					stream.drain(stream.reply);
+				});
+				cb = function(r){ (r.headers||{}).poll = gun.wsp.poll; res(r) }
+				clearTimeout(stream.off);
+				if(req.headers.pull){
+					if(stream.drain(cb)){ return }
+					return stream.reply = cb;
+				}
+			}
+			gun.wsp.wire(req, cb);
+		}), true;
+	}
+	if((gun.__.opt.maxSockets = opt.maxSockets || gun.__.opt.maxSockets) !== false){
+		require('https').globalAgent.maxSockets = require('http').globalAgent.maxSockets = gun.__.opt.maxSockets || Infinity;
+	}
+	gun.wsp.msg = gun.wsp.msg || function(id){
+		if(!id){
+			return gun.wsp.msg.debounce[id = Gun.text.random(9)] = Gun.time.is(), id;
+		}
+		clearTimeout(gun.wsp.msg.clear);
+		gun.wsp.msg.clear = setTimeout(function(){
+			var now = Gun.time.is();
+			Gun.obj.map(gun.wsp.msg.debounce, function(t,id){
+				if((now - t) < (1000 * 60 * 5)){ return }
+				Gun.obj.del(gun.wsp.msg.debounce, id);
+			});
+		},500);
+		if(id = gun.wsp.msg.debounce[id]){
+			return gun.wsp.msg.debounce[id] = Gun.time.is(), id;
+		}
+		gun.wsp.msg.debounce[id] = Gun.time.is();
+		return;
+	};
+	gun.wsp.msg.debounce = gun.wsp.msg.debounce || {};
+	gun.wsp.wire = gun.wsp.wire || (function(){
+		// all streams, technically PATCH but implemented as PUT or POST, are forwarded to other trusted peers
+		// except for the ones that are listed in the message as having already been sending to.
+		// all states, implemented with GET, are replied to the source that asked for it.
+		function tran(req, res){
+			if(!req || !res || !req.body || !req.headers){ return }
+			if(req.url){ req.url = url.format(req.url) }
+			var msg = req.body;
+			// AUTH for non-replies.
+			if(gun.wsp.msg(msg['#'])){ return }
+			gun.wsp.on('network', Gun.obj.copy(req));
+			if(msg['@']){ return } // no need to process.
+			if(msg['$'] && msg['$']['#']){ return tran.get(req, res) }
+			//if(Gun.is.lex(msg['$'])){ return tran.get(req, res) }
+			else { return tran.put(req, res) }
+			cb({body: {hello: 'world'}});
+			// TODO: BUG! server put should push.
+		}
+		tran.get = function(req, cb){
+			var body = req.body, lex = body['$'], reply = {headers: {'Content-Type': tran.json}}, opt;
+			gun.on('out', {gun: gun, get: lex, req: 1, '#': Gun.on.ask(function(at, ev){
+				ev.off();
+				var graph = at.put;
+				return cb({headers: reply.headers, body: {
+					'#': gun.wsp.msg(),
+					'@': body['#'],
+					'$': graph,
+					'!': at.err
+				}});
+			})});
+		}
+		tran.put = function(req, cb){
+			// NOTE: It is highly recommended you do your own PUT/POSTs through your own API that then saves to gun manually.
+			// This will give you much more fine-grain control over security, transactions, and what not.
+			var body = req.body, graph = body['$'], reply = {headers: {'Content-Type': tran.json}}, opt;
+			gun.on('out', {gun: gun, put: graph, '#': Gun.on.ask(function(ack, ev){
+			//Gun.on('put', {gun: gun, put: graph, '#': Gun.on.ask(function(ack, ev){
+				ev.off();
+				return cb({headers: reply.headers, body: {
+					'#': gun.wsp.msg(),
+					'@': body['#'],
+					'$': ack,
+					'!': ack.err
+				}});
+			})});
+		}
+		gun.wsp.on('network', function(req){
+			// TODO: MARK! You should move the networking events to here, not in WSS only.
+		});
+		tran.json = 'application/json';
+		return tran;
+	}());
+	if(opt.server){
+		wsp(opt.server);
+	}
+});

From e36e78f532f9be55130b50a04d85936b92106b32 Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Thu, 10 Nov 2016 10:09:18 -0700
Subject: [PATCH 13/21] Isolate websocket logic

WebSocket logic has it's own folder now, `wsp`.
---
 lib/server.js                        |  2 +-
 lib/{wsp-client.js => wsp/client.js} |  2 +-
 lib/{wsp.js => wsp/server.js}        | 12 ++++++------
 lib/{ => wsp}/ws.js                  |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename lib/{wsp-client.js => wsp/client.js} (99%)
 rename lib/{wsp.js => wsp/server.js} (96%)
 rename lib/{ => wsp}/ws.js (92%)

diff --git a/lib/server.js b/lib/server.js
index af0f28b5..a6082d4c 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -3,7 +3,7 @@
 	var Gun = require('../gun');
 	console.log("TODO: MARK! UPDATE S3 DRIVER BEFORE PUBLISHING!")
 	//require('./s3');
-	require('./wsp');
+	require('./wsp/server');
 	require('./file');
 	module.exports = Gun;
 }());
diff --git a/lib/wsp-client.js b/lib/wsp/client.js
similarity index 99%
rename from lib/wsp-client.js
rename to lib/wsp/client.js
index 8640d917..d39a53df 100644
--- a/lib/wsp-client.js
+++ b/lib/wsp/client.js
@@ -8,7 +8,7 @@
 */
 'use strict';
 
-var Gun = require('../gun');
+var Gun = require('../../gun');
 var WS = require('ws');
 
 var Tab = {};
diff --git a/lib/wsp.js b/lib/wsp/server.js
similarity index 96%
rename from lib/wsp.js
rename to lib/wsp/server.js
index 7ac4bbac..2dfdd27c 100644
--- a/lib/wsp.js
+++ b/lib/wsp/server.js
@@ -1,14 +1,14 @@
 /* eslint-disable*/
-var Gun = require('../gun')
+var Gun = require('../../gun')
 , formidable = require('formidable')
-, http = require('./http')
+, http = require('../http')
 , url = require('url')
 , wsp = {}
 , WS = require('ws')
 , ws = WS.Server;
 
 // Handles server to server sync.
-require('./wsp-client.js');
+require('./client.js');
 
 Gun.on('opt', function(at){
 	var gun = at.gun, opt = at.opt;
@@ -67,7 +67,7 @@ Gun.on('opt', function(at){
 		if(!gun.wsp.regex.test(msg.url.pathname)){ return next(), false } // TODO: BUG! If the option isn't a regex then this will fail!
 		if(msg.url.pathname.replace(gun.wsp.regex,'').slice(0,3).toLowerCase() === '.js'){
 			res.writeHead(200, {'Content-Type': 'text/javascript'});
-			res.end(gun.wsp.js = gun.wsp.js || require('fs').readFileSync(__dirname + '/../gun.js')); // gun server is caching the gun library for the client
+			res.end(gun.wsp.js = gun.wsp.js || require('fs').readFileSync(__dirname + '/../../gun.js')); // gun server is caching the gun library for the client
 			return true;
 		}
 
@@ -78,7 +78,7 @@ Gun.on('opt', function(at){
 
 		return http(req, res, function(req, res){
 			if(!req){ return next() }
-			var stream, cb = res = require('./jsonp')(req, res);
+			var stream, cb = res = require('../jsonp')(req, res);
 			if(req.headers && (stream = req.headers['gun-sid'])){
 				stream = (gun.wsp.peers = gun.wsp.peers || {})[stream] = gun.wsp.peers[stream] || {sid: stream};
 				stream.drain = stream.drain || function(res){
@@ -172,7 +172,7 @@ Gun.on('opt', function(at){
 				}});
 			})});
 		}
-		gun.wsp.on('network', function(req){
+		gun.wsp.on('network', function(rq){
 			// TODO: MARK! You should move the networking events to here, not in WSS only.
 		});
 		tran.json = 'application/json';
diff --git a/lib/ws.js b/lib/wsp/ws.js
similarity index 92%
rename from lib/ws.js
rename to lib/wsp/ws.js
index 270ea0b4..45dc100a 100644
--- a/lib/ws.js
+++ b/lib/wsp/ws.js
@@ -1,4 +1,4 @@
-var Gun = require('../gun')
+var Gun = require('../../gun')
 ,	url = require('url');
 module.exports = function(wss, server, opt){
 	wss.on('connection', function(ws){
@@ -27,7 +27,7 @@ module.exports = function(wss, server, opt){
 					(reply.headers = reply.headers || {})['ws-rid'] = msg.headers['ws-rid'];
 				}
 				try{ws.send(Gun.text.ify(reply));
-				}catch(e){} // juuuust in case. 
+				}catch(e){} // juuuust in case.
 			});
 		});
 		ws.off = function(m){

From 4cd2d434d109b71004f9b4ca23e901044c485234 Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Thu, 10 Nov 2016 10:11:01 -0700
Subject: [PATCH 14/21] Add websocket backoff/retry logic

New library handles websocket reconnection logic and queues messages
that were sent while offline.
---
 lib/wsp/Peer.js | 176 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 lib/wsp/Peer.js

diff --git a/lib/wsp/Peer.js b/lib/wsp/Peer.js
new file mode 100644
index 00000000..05f510b3
--- /dev/null
+++ b/lib/wsp/Peer.js
@@ -0,0 +1,176 @@
+var WebSocket = require('ws');
+
+/**
+ * Calculates backoff instances.
+ * @param {Object} [options] - Override the default settings.
+ * @param {Object} options.time=50 - Initial backoff time.
+ * @param {Object} options.factor=2 - How much to multiply the time by.
+ * @class
+ */
+function Backoff (options) {
+	this.options = options || {};
+
+	// Sets the initial backoff settings.
+	this.reset();
+}
+
+/**
+ * Increments the time by the factor.
+ * @return {Number} - The next backoff time.
+ */
+Backoff.prototype.next = function () {
+	this.time *= this.factor;
+
+	return this.time;
+};
+
+/**
+ * Resets the backoff state to it's original condition.
+ * @return {Backoff} - The context.
+ */
+Backoff.prototype.reset = function () {
+	var options = this.options;
+
+	this.time = options.time || 50;
+	this.factor = options.factor || 2;
+
+	return this;
+};
+
+/**
+ * Create a websocket client and handle reconnect backoff logic.
+ * @param {String} url - A preformatted url (starts with ws://)
+ * @param {Object} [options] - Override how the socket is managed.
+ * @param {Object} options.backoff - Backoff options (see the constructor).
+ * @class
+ */
+function Peer (url, options) {
+	if (!(this instanceof Peer)) {
+		return new Peer(url, options);
+	}
+
+	this.options = options || {};
+
+	// Messages sent while offline.
+	this.offline = [];
+
+	this.url = Peer.formatURL(url);
+	this.backoff = new Backoff(this.options.backoff);
+	this.retry(url);
+}
+
+/**
+ * Turns http URLs into WebSocket URLs.
+ * @param  {String} url - The url to format.
+ * @return {String} - A correctly formatted WebSocket URL.
+ */
+Peer.formatURL = function (url) {
+
+	// Works for `https` and `wss` URLs, too.
+	return url.replace('http', 'ws');
+};
+
+var API = Peer.prototype;
+
+/**
+ * Attempts a websocket connection.
+ * @param  {String} url - The websocket URL.
+ * @return {WebSocket} - The new websocket instance.
+ */
+API.retry = function () {
+	var url = this.url;
+
+	var socket = new WebSocket(url);
+	this.socket = socket;
+
+	this.retryOnDisconnect(socket);
+
+	this.sendOnConnection();
+
+	return socket;
+};
+
+/**
+ * Sends the messages that couldn't be sent before once
+ * the connection is open.
+ * @return {Peer} - The context.
+ */
+API.sendOnConnection = function () {
+	var peer = this;
+	var queue = this.offline;
+	var socket = this.socket;
+
+	// Wait for the socket to connect.
+	socket.once('open', function () {
+		queue.forEach(function (msg) {
+			socket.send(msg);
+		});
+
+		peer.offline = [];
+	});
+
+	return this;
+};
+
+/**
+ * Schedules the next retry, according to the backoff.
+ * @param  {Peer} peer - A peer instance.
+ * @return {Timeout} - The timeout value from `setTimeout`.
+ */
+function schedule (peer) {
+	var backoff = peer.backoff;
+	var time = backoff.time;
+	backoff.next();
+
+	return setTimeout(function () {
+		var socket = peer.retry();
+
+		// Successfully reconnected? Reset the backoff.
+		socket.once('open', backoff.reset.bind(backoff));
+	}, time);
+}
+
+/**
+ * Attaches handlers to the socket, attempting reconnection
+ * when it's closed.
+ * @param  {WebSocket} socket - The websocket instance to bind to.
+ * @return {WebSocket} - The same websocket.
+ */
+API.retryOnDisconnect = function (socket) {
+	var peer = this;
+
+	// Listen for socket close events.
+	socket.once('close', function () {
+		schedule(peer);
+	});
+
+	socket.on('error', function (error) {
+		if (error.code === 'ECONNREFUSED') {
+			schedule(peer);
+		}
+	});
+
+	return socket;
+};
+
+/**
+ * Send data through the socket, or add it to a queue
+ * of offline requests if it's not ready yet.
+ * @param  {String} msg - The data to send.
+ * @return {Peer} - The context.
+ */
+API.send = function (msg) {
+	var socket = this.socket;
+	var state = socket.readyState;
+	var ready = socket.OPEN;
+
+	if (state === ready) {
+		socket.send(msg);
+	} else {
+		this.offline.push(msg);
+	}
+
+	return this;
+};
+
+module.exports = Peer;

From e8194887e06e9931292c9929a2823d0110e89eb9 Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Fri, 11 Nov 2016 17:48:56 -0700
Subject: [PATCH 15/21] Add basic server get handling

Servers now dispatch requests to clients and listen for responses,
plugging them into gun.
---
 lib/wsp/server-push.js | 123 +++++++++++++++++++++++++++++++++++++++++
 lib/wsp/server.js      |  13 ++++-
 2 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 lib/wsp/server-push.js

diff --git a/lib/wsp/server-push.js b/lib/wsp/server-push.js
new file mode 100644
index 00000000..ac3efa4d
--- /dev/null
+++ b/lib/wsp/server-push.js
@@ -0,0 +1,123 @@
+'use strict';
+var Gun = require('../../gun.js');
+
+/**
+ * Whether the gun instance is attached to a socket server.
+ * @param  {Gun} gun - The gun instance in question.
+ * @param  {WebSocket.Server} server - A socket server gun might be attached to.
+ * @return {Boolean} - Whether it's attached.
+ */
+function isUsingServer (gun, server) {
+	var servers = gun.Back(-1)._.servers;
+
+	return servers ? servers.indexOf(server) !== -1 : false;
+}
+
+/**
+ * Calls a function when (or if) a socket is ready for messages.
+ * @param  {WebSocket} socket - A websocket connection.
+ * @param  {Function} cb - Called if or when the socket is ready.
+ * @return {Boolean} - Whether the socket is able to take messages.
+ */
+function ready (socket, cb) {
+	var state = socket.readyState;
+
+	// The socket is ready.
+	if (state === socket.OPEN) {
+		cb();
+		return true;
+	}
+
+	// Still opening.
+	if (state === socket.OPENING) {
+		socket.once('open', cb);
+	}
+
+	// Nope, closing or closed.
+	return false;
+}
+
+/**
+ * Send a request to a list of clients.
+ * @param  {Obejct} context - A gun request context.
+ * @param  {Object} clients - IDs mapped to socket instances.
+ * @param  {Function} cb - Called for each response.
+ * @return {Object} - The context object.
+ */
+function request (context, clients, cb) {
+	Gun.obj.map(clients, function (client) {
+		ready(client, function () {
+			var msg = {
+				headers: {},
+				body: {
+					'#': Gun.on.ask(cb),
+					'$': context.get,
+				},
+			};
+
+			var serialized = JSON.stringify(msg);
+			client.send(serialized);
+		});
+	});
+}
+
+/** * Attaches server push middleware to gun.
+ * @param  {Gun} gun - The gun instance to attach to.
+ * @param  {WebSocket.Server} server - A websocket server instance.
+ * @return {server} - The socket server.
+ */
+function attach (gun, server) {
+	var root = gun.Back(-1);
+	root._.servers = root._.servers || [];
+	root._.servers.push(server);
+	var pool = {};
+
+	server.on('connection', function (socket) {
+		socket.id = socket.id || Gun.text.random(10);
+		pool[socket.id] = socket;
+
+		socket.on('message', function (message) {
+			var data = Gun.obj.ify(message);
+
+			if (!data || !data.body) {
+				return;
+			}
+
+			var msg = data.body;
+
+			if (msg['@']) {
+				Gun.on.ack(msg['@'], [msg['!'], msg.$]);
+				return;
+			}
+		});
+
+		socket.once('close', function () {
+			delete pool[socket.id];
+		});
+	});
+
+	Gun.on('get', function (context) {
+		if (!isUsingServer(context.gun, server)) {
+			return;
+		}
+		request(context, pool, function (err, data) {
+			var response = {
+				'@': context['#'],
+				put: data,
+				err: err,
+			};
+
+			var root = context.gun.Back(Infinity);
+
+			root.on(data ? 'out' : 'in', response);
+		});
+	});
+
+	Gun.on('put', function (context) {
+		if (!isUsingServer(context.gun, server)) {
+			return;
+		}
+	});
+}
+
+module.exports = attach;
diff --git a/lib/wsp/server.js b/lib/wsp/server.js
index 2dfdd27c..b4e6fd16 100644
--- a/lib/wsp/server.js
+++ b/lib/wsp/server.js
@@ -1,11 +1,11 @@
-/* eslint-disable*/
 var Gun = require('../../gun')
 , formidable = require('formidable')
 , http = require('../http')
 , url = require('url')
 , wsp = {}
 , WS = require('ws')
-, ws = WS.Server;
+, WSS = WS.Server
+, attach = require('./server-push');
 
 // Handles server to server sync.
 require('./client.js');
@@ -18,7 +18,14 @@ Gun.on('opt', function(at){
 	function start(server, port, app){
 		if(app && app.use){ app.use(gun.wsp.server) }
 		server = gun.__.opt.ws.server = gun.__.opt.ws.server || opt.ws.server || server;
-		require('./ws')(gun.wsp.ws = gun.wsp.ws || new ws(gun.__.opt.ws), function(req, res){
+
+		if (!gun.wsp.ws) {
+			gun.wsp.ws = new WSS(gun.__.opt.ws);
+			attach(gun, gun.wsp.ws);
+		}
+
+		gun.wsp.ws = gun.wsp.ws || new WSS(gun.__.opt.ws);
+		require('./ws')(gun.wsp.ws, function(req, res){
 			var ws = this;
 			req.headers['gun-sid'] = ws.sid = ws.sid? ws.sid : req.headers['gun-sid'];
 			ws.sub = ws.sub || gun.wsp.on('network', function(msg, ev){

From ded9a468c4b1b405133d1cebe0d5c34ab037f4d1 Mon Sep 17 00:00:00 2001
From: hillct <hillct+github.com@gmail.com>
Date: Sat, 12 Nov 2016 16:43:47 -0500
Subject: [PATCH 16/21] * Sanitized /examples dependency management * Added
 Docker deployment support files

---
 .dockerignore           |  4 ++++
 Dockerfile              |  3 +++
 examples/express.js     |  6 +++---
 examples/hello-world.js |  3 ++-
 examples/http.js        |  2 +-
 examples/package.json   | 17 -----------------
 package.json            |  1 +
 7 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 delete mode 100644 examples/package.json

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..0c5d7c58
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+node_modules
+.git
+.gitignore
+*.md
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..09650cd7
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,3 @@
+FROM node:6-onbuild
+ENV NPM_CONFIG_LOGLEVEL warn
+EXPOSE 8080
diff --git a/examples/express.js b/examples/express.js
index ac517fb8..59420e51 100644
--- a/examples/express.js
+++ b/examples/express.js
@@ -1,10 +1,10 @@
 console.log("If modules not found, run `npm install` in /example folder!"); // git subtree push -P examples heroku master // OR // git subtree split -P examples master && git push heroku [['HASH']]:master --force
-var port = process.env.OPENSHIFT_NODEJS_PORT || process.env.VCAP_APP_PORT || process.env.PORT || process.argv[2] || 80;
+var port = process.env.OPENSHIFT_NODEJS_PORT || process.env.VCAP_APP_PORT || process.env.PORT || process.argv[2] || 8080;
 
 var express = require('express');
 var app = express();
 
-var Gun = require('gun');
+var Gun = require('../');
 var gun = Gun({
 	file: 'data.json',
 	s3: {
@@ -17,4 +17,4 @@ var gun = Gun({
 gun.wsp(app);
 app.use(express.static(__dirname)).listen(port);
 
-console.log('Server started on port ' + port + ' with /gun');
\ No newline at end of file
+console.log('Server started on port ' + port + ' with /gun');
diff --git a/examples/hello-world.js b/examples/hello-world.js
index 380c8170..23f3f5a7 100644
--- a/examples/hello-world.js
+++ b/examples/hello-world.js
@@ -1,5 +1,6 @@
-var Gun = require('gun');
+var Gun = require('../');
 var gun = Gun({
+  file: 'data.json',
   s3: {
     key: '', // AWS Access Key
     secret: '', // AWS Secret Token
diff --git a/examples/http.js b/examples/http.js
index e3476cf9..06684eba 100644
--- a/examples/http.js
+++ b/examples/http.js
@@ -1,4 +1,4 @@
-var port = process.env.OPENSHIFT_NODEJS_PORT || process.env.VCAP_APP_PORT || process.env.PORT || process.argv[2] || 80;
+var port = process.env.OPENSHIFT_NODEJS_PORT || process.env.VCAP_APP_PORT || process.env.PORT || process.argv[2] || 8080;
 
 var Gun = require('../');
 var gun = Gun({ 
diff --git a/examples/package.json b/examples/package.json
deleted file mode 100644
index e3eb1358..00000000
--- a/examples/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "examples",
-	"main": "http.js",
-	"description": "Example gun apps"
-,	"version": "0.0.3"
-,	"engines": {
-		"node": "~>0.10.x"
-	}
-,	"dependencies": {
-		"express": "~>4.13.4",
-		"gun": "github:amark/gun#0.5"
-	}
-,	"scripts": {
-        "start": "node http.js",
-        "test": "mocha"
-    }
-}
diff --git a/package.json b/package.json
index 9df20e51..18e8b3f1 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
   },
   "devDependencies": {
     "mocha": "~>1.9.0",
+    "express": "~>4.13.4",
     "panic-server": "~>0.3.0",
     "selenium-webdriver": "~>2.53.2"
   }

From d47f47baec0aeec8e4967a9f74322e26dbffc7b6 Mon Sep 17 00:00:00 2001
From: hillct <hillct@users.noreply.github.com>
Date: Sat, 12 Nov 2016 17:59:15 -0500
Subject: [PATCH 17/21] Add Deployment documentation for Heroku & Docker

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index af561150..fb14d5a6 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,28 @@ Try the [interactive tutorial](http://gun.js.org/think.html) in the browser (**5
 
    If that did not work it is probably because npm installed it to a global directory. To fix that try `mkdir node_modules` in your desired directory and re-run the above commands. You also might have to add `sudo` in front of the commands.
 
+## Quick dev/test Deployments
+
+ - To quickly spin up a Gun test server for your development team, uilize eiher [Heroku](http://heroku.com) or [Docker](http://docker.com) or any variant thereof ([Dokku](http://dokku.viewdocs.io/dokku/), [Flynn.io](http://flynn.io), etc)
+ 
+### Docker
+   ```bash
+   git clone https://github.com/amark/gun.git
+   cd gun
+   docker build -t myrepo/gundb:v1 .
+   docker run -p 8080:8080 myrepo/gundb:v1
+   ```
+   Then visit [http://localhost:8080](http://localhost:8080) in your browser.
+   
+### Hiroku
+   ```bash
+   git clone https://github.com/amark/gun.git
+   cd gun
+   heroku create
+   git push -f heroku HEAD:master
+   ```
+   Then visit the URL in the output of the 'heroku create' step, in your browser.
+   
 ### Videos
  - [Fault tolerance](https://www.youtube.com/watch?v=-i-11T5ZI9o&feature=youtu.be) (01:01)
  - [Saving relational or document based data](https://www.youtube.com/watch?v=cOO6wz1rZVY&feature=youtu.be) (06:59)

From d1e5f932392ec247d93c6b9d7764e861fe1d2f73 Mon Sep 17 00:00:00 2001
From: hillct <hillct@users.noreply.github.com>
Date: Sat, 12 Nov 2016 19:03:16 -0500
Subject: [PATCH 18/21] Added documentation for Now.sh deployment

---
 README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb14d5a6..7449fb4d 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Try the [interactive tutorial](http://gun.js.org/think.html) in the browser (**5
 
 ## Quick dev/test Deployments
 
- - To quickly spin up a Gun test server for your development team, uilize eiher [Heroku](http://heroku.com) or [Docker](http://docker.com) or any variant thereof ([Dokku](http://dokku.viewdocs.io/dokku/), [Flynn.io](http://flynn.io), etc)
+ - To quickly spin up a Gun test server for your development team, uilize eiher [Heroku](http://heroku.com) or [Docker](http://docker.com) or any variant thereof ([Dokku](http://dokku.viewdocs.io/dokku/), [Flynn.io](http://flynn.io), [now.sh](https://zeit.co/now), etc)
  
 ### Docker
    ```bash
@@ -64,6 +64,15 @@ Try the [interactive tutorial](http://gun.js.org/think.html) in the browser (**5
    git push -f heroku HEAD:master
    ```
    Then visit the URL in the output of the 'heroku create' step, in your browser.
+
+### Now.sh
+   ```bash
+   npm install -g now
+   git clone https://github.com/amark/gun.git
+   cd gun
+   now --npm
+   ```
+   Then visit the URL in the output of the 'now --npm' step, in your browser.
    
 ### Videos
  - [Fault tolerance](https://www.youtube.com/watch?v=-i-11T5ZI9o&feature=youtu.be) (01:01)

From ba43dcac17cbf387736e9f2ac11a21c1205af4b4 Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Mon, 14 Nov 2016 13:40:55 -0700
Subject: [PATCH 19/21] Add server push

Pushes graph updates to connected clients, listening for
acknowledgements.
---
 lib/wsp/server-push.js | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/lib/wsp/server-push.js b/lib/wsp/server-push.js
index ac3efa4d..e4c77f7e 100644
--- a/lib/wsp/server-push.js
+++ b/lib/wsp/server-push.js
@@ -42,7 +42,7 @@ function ready (socket, cb) {
  * @param  {Obejct} context - A gun request context.
  * @param  {Object} clients - IDs mapped to socket instances.
  * @param  {Function} cb - Called for each response.
- * @return {Object} - The context object.
+ * @return {undefined}
  */
 function request (context, clients, cb) {
 	Gun.obj.map(clients, function (client) {
@@ -61,6 +61,31 @@ function request (context, clients, cb) {
 	});
 }
 
+/**
+ * Pushes a graph update to a collection of clients.
+ * @param  {Object} context - The context object passed by gun.
+ * @param  {Object} clients - An object mapping URLs to clients.
+ * @param  {Function} cb - Invoked on each client response.
+ * @return {undefined}
+ */
+function update (context, clients, cb) {
+	Gun.obj.map(clients, function (client) {
+		ready(client, function () {
+			var msg = {
+				headers: {},
+				body: {
+					'#': Gun.on.ask(cb),
+					'$': context.put,
+				},
+			};
+
+			var serialized = JSON.stringify(msg);
+
+			client.send(serialized);
+		});
+	});
+}
+
 /** * Attaches server push middleware to gun.
  * @param  {Gun} gun - The gun instance to attach to.
  * @param  {WebSocket.Server} server - A websocket server instance.
@@ -117,6 +142,14 @@ function attach (gun, server) {
 		if (!isUsingServer(context.gun, server)) {
 			return;
 		}
+
+		update(context, pool, function (err, data) {
+			var ack = {
+				'!': err || null,
+				'$': data.$,
+			};
+			Gun.on.ack(context, ack);
+		});
 	});
 }
 

From 3e66aff985ff93022a866b6f2170cde2676e2c50 Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Mon, 14 Nov 2016 16:31:45 -0700
Subject: [PATCH 20/21] Allow opting out of file.json

If the most recent gun options disable the file module, then it
won't try to read/write from the json. Previously it would. Also, now
you can override the behavior by passing `{ file: false }` as the
options in `gun.put`.
---
 lib/file.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/file.js b/lib/file.js
index 51a6ed2c..0ee6a169 100644
--- a/lib/file.js
+++ b/lib/file.js
@@ -6,6 +6,13 @@ var Gun = require('../gun'),
 	fs = require('fs'),
 	file = {};
 
+function isUsingFileJS (context) {
+	var gun = context.gun;
+	var opt = context.opt || gun.Back('opt') || {};
+
+	return opt.file !== false;
+}
+
 // queue writes, adapted from https://github.com/toolness/jsondown/blob/master/jsondown.js
 var isWriting = false, queuedWrites = [];
 function writeFile(path, disk, at){
@@ -24,6 +31,9 @@ function writeFile(path, disk, at){
 }
 
 Gun.on('put', function(at){
+	if (isUsingFileJS(at) === false) {
+		return;
+	}
 	var gun = at.gun, graph = at.put, opt = at.opt || {};
 	var __ = gun._.root._;
 	Gun.obj.map(graph, function(node, soul){
@@ -32,7 +42,10 @@ Gun.on('put', function(at){
 	writeFile(opt.file || file.file, file.disk, at);
 });
 Gun.on('get', function(at){
-	var gun = at.gun, lex = at.get, opt = at.opt;
+	if (isUsingFileJS(at) === false) {
+		return;
+	}
+	var gun = at.gun, lex = at.get;
 	if(!lex){return}
 	gun.Back(-1).on('in', {'@': at['#'], put: Gun.graph.node(file.disk.graph[lex['#']])});
 	//at.cb(null, file.disk.graph[lex['#']]);
@@ -43,7 +56,11 @@ Gun.on('opt', function(at){
 	if ((opts.file === false) || (opts.s3 && opts.s3.key)) {
 		return; // don't use this plugin if S3 is being used.
 	}
-	console.log("WARNING! This `file.js` module for gun is intended only for local development testing!")
+	Gun.log.once(
+		'file-warning',
+		'WARNING! This `file.js` module for gun is ' +
+		'intended only for local development testing!'
+	);
 	file.file = opts.file || file.file || 'data.json';
 	file.raw = file.raw || (fs.existsSync || require('path').existsSync)(opts.file) ? fs.readFileSync(opts.file).toString() : null;
 	file.disk = file.disk || Gun.obj.ify(file.raw || {graph: {}});

From ddf272bbb05f633aca36675044b78858fb7902ad Mon Sep 17 00:00:00 2001
From: Jesse Gibson <Jesse_Gibson@me.com>
Date: Mon, 14 Nov 2016 17:00:06 -0700
Subject: [PATCH 21/21] Allow greeting messages to be opt-out

If you use gun a bunch, you've probably noticed the messages like "Hello
wonderful person :)" and "WARNING: This file.js module...".
This PR allows you to silence them.
Use `Gun.log.off = true` to bring peace back to your workflow.
> **Note:** great when used with file watchers like nodemon."
---
 lib/server.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index a6082d4c..fbe858a1 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,9 +1,13 @@
-;(function(){
-	console.log("Hello wonderful person! :) I'm mark@gunDB.io, message me for help or with hatemail. I want to hear from you! <3");
-	var Gun = require('../gun');
-	console.log("TODO: MARK! UPDATE S3 DRIVER BEFORE PUBLISHING!")
+;(function(){
+	var Gun = require('../gun');
 	//require('./s3');
 	require('./wsp/server');
-	require('./file');
-	module.exports = Gun;
+	require('./file');
+	Gun.log(
+		'Hello wonderful person! :)\n' +
+		'I\'m mark@gunDB.io, message me for help or with hatemail. ' +
+		'I want to hear from you! <3'
+	);
+	Gun.log('TODO: MARK! UPDATE S3 DRIVER BEFORE PUBLISHING!');
+	module.exports = Gun;
 }());