Master into RAD

.travis.yml

@@ -3,8 +3,6 @@ branches:
   except:
     - debug
 node_js:
-  - 4
-  - 6
   - 8
   - 10
 cache:

as.js

@@ -80,12 +80,11 @@
 			}, wait || 200);
 		}
 	}
-	as.sort = function(sort, el) {
-		var vs = $(el).find('.sort');
-		vs = (vs[0] && u === vs[0].value)? vs.text() : vs.val();
-		var id = sort;
-		var test = id >= vs;
-		return test ? el : as.sort(sort, el.prev());
+	as.sort = function sort(id, li){
+		var num = parseFloat(id);
+		var id = $(li).find('.sort').text() || -Infinity;
+		var at = num >= parseFloat(id);
+		return at ? li : sort(id, li.prev());
 	}
 	$(document).on('keyup', 'input, textarea, [contenteditable]', as.wait(function(){
 		var el = $(this);

axe.js

@@ -0,0 +1,99 @@
+;(function(){
+
+  /* UNBUILD */
+  var root;
+  if(typeof window !== "undefined"){ root = window }
+  if(typeof global !== "undefined"){ root = global }
+  root = root || {};
+  var console = root.console || {log: function(){}};
+  function USE(arg, req){
+    return req? require(arg) : arg.slice? USE[R(arg)] : function(mod, path){
+      arg(mod = {exports: {}});
+      USE[R(path)] = mod.exports;
+    }
+    function R(p){
+      return p.split('/').slice(-1).toString().replace('.js','');
+    }
+  }
+  if(typeof module !== "undefined"){ var common = module }
+  /* UNBUILD */
+
+  ;USE(function(module){
+    if(typeof window !== "undefined"){ module.window = window }
+    var tmp = module.window || module;
+    var AXE = tmp.AXE || function(){};
+
+    if(AXE.window = module.window){ try{
+      AXE.window.AXE = AXE;
+      tmp = document.createEvent('CustomEvent');
+      tmp.initCustomEvent('extension', false, false, {type: "AXE"});
+      (window.dispatchEvent || window.fireEvent)(tmp);
+      window.postMessage({type: "AXE"}, '*');
+    } catch(e){} }
+
+    try{ if(typeof common !== "undefined"){ common.exports = AXE } }catch(e){}
+    module.exports = AXE;
+  })(USE, './root');
+
+  ;USE(function(module){
+
+    var AXE = USE('./root'), Gun = (AXE.window||{}).Gun || USE('./gun', 1);
+    (Gun.AXE = AXE).GUN = AXE.Gun = Gun;
+
+    Gun.on('opt', function(at){
+      if(!at.axe){
+        at.axe = {};
+        var p = at.opt.peers, tmp;
+        // 1. If any remembered peers or from last cache or extension
+        // 2. Fallback to use hard coded peers from dApp
+        // 3. Or any offered peers.
+        //if(Gun.obj.empty(p)){
+        //  Gun.obj.map(['http://localhost:8765/gun'/*, 'https://guntest.herokuapp.com/gun'*/], function(url){
+        //    p[url] = {url: url, axe: {}};
+        //  });
+        //}
+        // Our current hypothesis is that it is most optimal
+        // to take peers in a common network, and align
+        // them in a line, where you only have left and right
+        // peers, so messages propagate left and right in
+        // a linear manner with reduced overlap, and
+        // with one common superpeer (with ready failovers)
+        // in case the p2p linear latency is high.
+        // Or there could be plenty of other better options.
+        console.log("axe", at.opt);
+        if(at.opt.super){
+          function verify(msg, send, at) {
+            var peers = Object.keys(p), puts = Object.keys(msg.put), i, j, peer;
+            var soul = puts[0]; /// TODO: verify all souls in puts. Copy the msg only with subscribed souls?
+            for (i=0; i < peers.length; ++i) {
+              peer = p[peers[i]];
+              //if (peer.url) {console.log('AXE do not reject superpeers'); send(msg, peer); continue;} /// always send to superpeers?
+              if (!peer.id) {console.log('AXE peer without id: ', peer); continue;}
+              if (!Gun.subscribe[soul] || !Gun.subscribe[soul][peer.id]) { console.log('AXE SAY reject msg to peer: %s, soul: %s', peer.id, soul); continue; }
+              send(msg, peer);
+            }
+          }
+          AXE.say = function(msg, send, at) {
+            if (!msg.put) { send(msg); return; }
+            console.log('AXE HOOK!! ', msg);
+            verify(msg, send, at);
+          };
+          /// TODO: remove peer from all Gun.subscribe. On `mesh.bye` event?
+        }
+        if(at.opt.super){
+          at.on('in', USE('./lib/super', 1), at);
+        } else {
+          //at.on('in', input, at);
+        }
+      }
+      this.to.next(at); // make sure to call the "next" middleware adapter.
+    });
+
+    function input(msg){
+      var at = this.as, to = this.to;
+    }
+
+    module.exports = AXE;
+  })(USE, './axe');
+
+}());

examples/axe.html

@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<html>
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
+  <title>Testing AXE</title>
+</head>
+
+<body>
+  <script src="../gun.js"></script>
+  <!-- <script src="../axe.js"></script> -->
+  <!-- <script src="../sea.js"></script> -->
+  <script>
+  var pid = location.hash.slice(1);
+
+  var opt = ({
+    peers: [`${location.origin}/gun`]
+  });
+
+  if (pid) { opt.pid = pid; }
+
+  Gun.on('opt', function(ctx) {
+    this.to.next(ctx);
+    ctx.on('hi', function(opt) {
+      console.log('HI!! PEER', new Date(), opt.pid);
+    });
+    if (pid) {
+    ctx.on('out', function(msg) {
+      msg.pid = pid;
+      this.to.next(msg);
+    });
+    }
+  });
+
+  var gun = Gun(opt);
+  //var user = gun.user();
+  </script>
+</body>
+</html>

test/tmp/li.html → examples/basic/private.html

@@ -73,7 +73,6 @@ <h1>Profile</h1>
 <script src="https://cdn.jsdelivr.net/npm/gun/examples/jquery.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/gun/gun.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/gun/sea.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/gun/lib/open.js"></script>
 
 <script>
 //var gun = Gun();
@@ -104,7 +103,6 @@ <h1>Profile</h1>
 $('#profile input').on('keyup', function(e){
   if(!user.is){ return }
   var id = LI.busy = $(this).attr('id');
-  console.log("Huh?", id, user);
   user.get('profile').get(id).secret($(this).val());
 }).on('blur', function(){ LI.busy = false })
 

examples/basic/space.html

@@ -0,0 +1,50 @@
+<h1>Search</h1>
+
+<form id="ask">
+  <input id="search" placeholder="search..." autocomplete="off">
+</form>
+
+<div id="answer"></div>
+<ul></ul>
+
+<small>Note: No data is indexed by default, you need to add some!</small>
+
+<script src="../../examples/jquery.js"></script>
+<script src="../../gun.js"></script>
+<script src="../../sea.js"></script>
+<script src="../../lib/space.js"></script>
+
+<script>
+var gun = Gun();
+var ask = {};
+
+$('#search').on('keyup', function(e){
+	ask.now = (this.value||'').toLowerCase().replace(/[\W_]+/g,"");
+  if(ask.last === ask.now){ return }
+  ask.last = ask.now;
+  clearTimeout(ask.to);
+  ask.to = setTimeout(search, 20);
+});
+
+function search(){
+  var key = ask.now;
+  gun.get('Q').space(key, function(ack){
+    if(!ack || key !== ask.now){ return }
+    UI(ack)
+  });
+}
+
+function UI(ack){
+  $('#answer').text(ack.data || '');
+  var $ul = $('ul').empty(), tree = ack.tree;
+  Gun.obj.map(tree, function(v,k){
+    $('<li>').text(k +' - ' + v).appendTo($ul);
+  });
+};
+
+function load(DATA){
+  Gun.obj.map(DATA, function(v,k){
+    gun.get('Q').space(k, v); 
+  });
+}
+</script>

test/tmp/user.html → examples/basic/user.html

@@ -5,40 +5,42 @@ <h1>User</h1>
   <input id="pass" type="password" placeholder="passphrase">
   <input id="in" type="submit" value="sign in">
   <input id="up" type="button" value="sign up">
+  <input id="mask" type="button" value="Identifi Login">
 </form>
 
 <ul></ul>
 
 <form id="said">
     <input id="say">
-    <input id="speak" type="button" value="speak">
+    <input id="speak" type="submit" value="speak">
 </form>
 
-<script src="../../examples/jquery.js"></script>
-<script src="../../gun.js"></script>
-<script src="../../sea.js"></script>
+<script src="../jquery.js"></script>
+<script src="../../../gun/gun.js"></script>
+<script src="../../../gun/sea.js"></script>
 
 <script>
-var gun = Gun();
-var user = gun.user();
+var gun = Gun(); //Gun(['http://localhost:8765/gun', 'https://guntest.herokuapp.com/gun']);
+var user = gun.user().recall({sessionStorage: true});
 
 $('#up').on('click', function(e){
-	user.create($('#alias').val(), $('#pass').val());
+  user.create($('#alias').val(), $('#pass').val(), login);
 });
-
-$('#sign').on('submit', function(e){
-	e.preventDefault();
+function login(e){
 	user.auth($('#alias').val(), $('#pass').val());
-});
+  return false; // e.preventDefault();
+};
+$('#sign').on('submit', login);
+$('#mask').on('click', login);
 
 gun.on('auth', function(){
 	$('#sign').hide();
-	user.get('said').map().val(UI);
+	user.get('said').map().on(UI);
 });
 
 $('#said').on('submit', function(e){
 	e.preventDefault();
-  if(!user.is){ return }
+  //if(!user.is){ return }
   user.get('said').set($('#say').val());
   $('#say').val("");
 });

examples/express.js

@@ -2,12 +2,16 @@ console.log("If module not found, install express globally `npm i express -g`!")
 var port    = process.env.OPENSHIFT_NODEJS_PORT || process.env.VCAP_APP_PORT || process.env.PORT || process.argv[2] || 8765;
 var express = require('express');
 var Gun     = require('..');
+require('../axe');
 
 var app    = express();
 app.use(Gun.serve);
 app.use(express.static(__dirname));
 
 var server = app.listen(port);
-Gun({	file: 'data.json', web: server });
+var gun = Gun({	file: 'data', web: server });
+
+global.Gun = Gun; /// make global to `node --inspect` - debug only
+global.gun = gun; /// make global to `node --inspect` - debug only
 
 console.log('Server started on port ' + port + ' with /gun');

examples/game/space.html

@@ -7,13 +7,15 @@
 			<div class="laser"></div>
 		</div>
 	</div>
+	<p id="debug" style="position: fixed; bottom: 0px; color: white; height: 1em;"></p>
 	<script src="../jquery.js"></script>
-	<script src="/gun.js"></script>
-	<script src="/gun/nts.js"></script>
+	<script src="../../../gun/gun.js"></script>
+	<script src="../../../gun/nts.js"></script>
+	<script src="../../../gun/lib/webrtc.js"></script>
 	<script>
 		// Thanks to https://github.com/dmcinnes/HTML5-Asteroids
 		//var gun = Gun();
-		var gun = Gun(location.origin+'/gun'); 
+		var gun = Gun(location.host? location.origin+'/gun' : 'http://localhost:8765/gun');
 		var game = {gun: gun.get('example/game/space'), area: {}, ships: {}};
 		game.keys = {38: 'up', 37: 'left', 39: 'right', 40: 'down', 32: 'space'};
 		$(document).on('keydown', function(e){
@@ -178,14 +180,14 @@
 		game.start = function(){
 			game.now = Gun.state();
 			game.resize();
+			game.ship();
 			game.gun.get('players').map().on(function(data, id){
 				data = Gun.obj.copy(data);
 				data.x = data.x * game.area.x;
 				data.y = data.y * game.area.y;
 				data.id = data.id || id;
 				game.ship(data);
 			});
-			game.ship();
 			var frame = game.frame, ships = game.ships;
 			var last = game.now, now, diff, delta;
 			setInterval(game.sync, 99);
@@ -203,6 +205,27 @@
 		$(function(){
 			game.start();
 		});
+
+		// test WebRTC
+		gun.on('hi', function(peer){
+			console.log("hi!", peer);
+			if(peer.url){ return }
+			Gun.obj.map(gun.back('opt.peers'), function(peer){
+				if(!peer.url || !peer.wire){ return }
+				peer.wire._send = peer.wire.send;
+				peer.wire.send = send;
+				var tmp = 'GOBBLE GOBBLE: Not sending any non-WebRTC messages to ' + peer.url;
+				console.log(tmp);
+				$('#debug').text(tmp);
+			});
+		});
+		function send(raw){
+			if(!raw){ return }
+			if(raw.indexOf('webrtc') >= 0){
+				if(!this._send){ return }
+				return this._send(raw);
+			}
+		}
 	</script>
 	<style>
 		html, body {