have unbuild function wrap to prevent scope leaks & allow RETURN hehe…

…he so I can reject @bmatusiak 's lS change O:) O:) I love you you're a hero! later with @bmatusiak check sea.then for '../gun.js' vs '../' vs ... note: src/index -> core.js TODO: something about WebRTC candidates hitting ack decrement limits?
michaelcassius · Jan 17, 2024 · 638c2c3 · 638c2c3
1 parent 5c52df2
commit 638c2c3
Show file tree

Hide file tree

Showing 48 changed files with 216 additions and 78 deletions.
diff --git a/gun.js b/gun.js
@@ -136,7 +136,7 @@
 		};
 	})(USE, './onto');
 
-	;USE(function(module){ ;(function(){
+	;USE(function(module){
 		// TODO: BUG! Unbuild will make these globals... CHANGE unbuild to wrap files in a function.
 		// Book is a replacement for JS objects, maps, dictionaries.
 		var sT = setTimeout, B = sT.Book || (sT.Book = function(text){
@@ -348,7 +348,6 @@
 		}
 
 		try{module.exports=B}catch(e){}
-		}());//delete later.
 	})(USE, './book');
 
 	;USE(function(module){
@@ -716,7 +715,7 @@
 					tmp = keys.length;
 					console.STAT && console.STAT(S, -(S - (S = +new Date)), 'got copied some');
 					DBG && (DBG.ga = +new Date);
-					root.on('in', {'@': to, '#': id, put: put, '%': (tmp? (id = text_rand(9)) : u), $: root.$, _: faith, DBG: DBG, FOO: 1});
+					root.on('in', {'@': to, '#': id, put: put, '%': (tmp? (id = text_rand(9)) : u), $: root.$, _: faith, DBG: DBG});
 					console.STAT && console.STAT(S, +new Date - S, 'got in');
 					if(!tmp){ return }
 					setTimeout.turn(go);
@@ -1388,6 +1387,7 @@
 		var Gun = USE('./root');
 		USE('./shim');
 		USE('./onto');
+		USE('./book');
 		USE('./valid');
 		USE('./state');
 		USE('./dup');

diff --git a/lib/unbuild.js b/lib/unbuild.js
@@ -110,6 +110,7 @@ var undent = function(code, n){
 		if(rcode != code){
 			console.log("unbuild:","update",file);
 		}
+		code = ";(function(){\n"+code+"\n}());";
 		write(file, code);
 		recurse();
 	}());

diff --git a/sea/aeskey.js b/sea/aeskey.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var shim = require('./shim');
     var S = require('./settings');
@@ -13,4 +14,5 @@
       return await shim.subtle.importKey('jwk', jwkKey, {name:'AES-GCM'}, false, ['encrypt', 'decrypt'])
     }
     module.exports = importGen;
-
+
+}());
diff --git a/sea/array.js b/sea/array.js
@@ -1,3 +1,4 @@
+;(function(){
 
     require('./base64');
     // This is Array extended to have .toString(['utf8'|'hex'|'base64'])
@@ -22,4 +23,5 @@
       }
     }
     module.exports = SeaArray;
-
+
+}());
diff --git a/sea/auth.js b/sea/auth.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var User = require('./user'), SEA = User.SEA, Gun = User.GUN, noop = function(){};
     // now that we have created a user, we want to authenticate them!
@@ -7,7 +8,8 @@
       var pass = (alias || (pair && !(pair.priv && pair.epriv))) && typeof args[1] === 'string' ? args[1] : null;
       var cb = args.filter(arg => typeof arg === 'function')[0] || null; // cb now can stand anywhere, after alias/pass or pair
       var opt = args && args.length > 1 && typeof args[args.length-1] === 'object' ? args[args.length-1] : {}; // opt is always the last parameter which typeof === 'object' and stands after cb
-
+      var retries = typeof opt.retries === 'number' ? opt.retries : 9;
+
       var gun = this, cat = (gun._), root = gun.back(-1);
 
       if(cat.ing){
@@ -30,6 +32,10 @@
         var get = (act.list = (act.list||[]).concat(list||[])).shift();
         if(u === get){
           if(act.name){ return act.err('Your user account is not published for dApps to access, please consider syncing it online, or allowing local access by adding your device as a peer.') }
+          if(alias && retries--){
+            root.get('~@'+alias).once(act.a);
+            return;
+          }
           return act.err('Wrong user or password.') 
         }
         root.get(get).once(act.a);
@@ -74,7 +80,7 @@
         if(SEA.window && ((gun.back('user')._).opt||opt).remember){
           // TODO: this needs to be modular.
           try{var sS = {};
-          sS = window.sessionStorage; // TODO: FIX BUG putting on `.is`!
+          sS = SEA.window.sessionStorage; // TODO: FIX BUG putting on `.is`!
           sS.recall = true;
           sS.pair = JSON.stringify(pair); // auth using pair is more reliable than alias/pass
           }catch(e){}
@@ -154,4 +160,5 @@
       }catch(e){o={}};
       return o;
     }
-
+
+}());
diff --git a/sea/base64.js b/sea/base64.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var u;
     if(u+''== typeof btoa){
@@ -7,4 +8,5 @@
       global.btoa = function(data){ return Buffer.from(data, "binary").toString("base64") };
       global.atob = function(data){ return Buffer.from(data, "base64").toString("binary") };
     }
-
+
+}());
diff --git a/sea/buffer.js b/sea/buffer.js
@@ -1,3 +1,4 @@
+;(function(){
 
     require('./base64');
     // This is Buffer implementation used in SEA. Functionality is mostly
@@ -76,4 +77,5 @@
     SafeBuffer.prototype.toString = SeaArray.prototype.toString
 
     module.exports = SafeBuffer;
-
+
+}());
diff --git a/sea/certify.js b/sea/certify.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var SEA = require('./root');
     // This is to certify that a group of "certificants" can "put" anything at a group of matched "paths" to the certificate authority's graph
@@ -69,4 +70,5 @@
     }});
 
     module.exports = SEA.certify;
-
+
+}());
diff --git a/sea/create.js b/sea/create.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var User = require('./user'), SEA = User.SEA, Gun = User.GUN, noop = function(){};
 
@@ -94,11 +95,12 @@
       }
       if(SEA.window){
         try{var sS = {};
-        sS = window.sessionStorage;
+        sS = SEA.window.sessionStorage;
         delete sS.recall;
         delete sS.pair;
         }catch(e){};
       }
       return gun;
     }
-
+
+}());
diff --git a/sea/decrypt.js b/sea/decrypt.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var SEA = require('./root');
     var shim = require('./shim');
@@ -39,4 +40,5 @@
     }});
 
     module.exports = SEA.decrypt;
-
+
+}());
diff --git a/sea/encrypt.js b/sea/encrypt.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var SEA = require('./root');
     var shim = require('./shim');
@@ -37,4 +38,5 @@
     }});
 
     module.exports = SEA.encrypt;
-
+
+}());
diff --git a/sea/https.js b/sea/https.js
@@ -1,12 +1,16 @@
+;(function(){
 
     var SEA = require('./root');
     try{ if(SEA.window){
       if(location.protocol.indexOf('s') < 0
       && location.host.indexOf('localhost') < 0
       && ! /^127\.\d+\.\d+\.\d+$/.test(location.hostname)
-      && location.protocol.indexOf('file:') < 0){
+      && location.protocol.indexOf('blob:') < 0
+      && location.protocol.indexOf('file:') < 0
+      && location.origin != 'null'){
         console.warn('HTTPS needed for WebCrypto in SEA, redirecting...');
         location.protocol = 'https:'; // WebCrypto does NOT work without HTTPS!
       }
     } }catch(e){}
-
+
+}());
diff --git a/sea/index.js b/sea/index.js
@@ -1,6 +1,7 @@
+;(function(){
 
     var SEA = require('./sea'), S = require('./settings'), noop = function() {}, u;
-    var Gun = (''+u != typeof window)? (window.Gun||{on:noop}) : require((''+u === typeof MODULE?'.':'')+'./gun', 1);
+    var Gun = (SEA.window||'').GUN || require((''+u === typeof MODULE?'.':'')+'./gun', 1);
     // After we have a GUN extension to make user registration/login easy, we then need to handle everything else.
 
     // We do this with a GUN adapter, we first listen to when a gun instance is created (and when its options change)
@@ -66,7 +67,7 @@
       check.any(eve, msg, val, key, soul, at, no, at.user||''); return;
       eve.to.next(msg); // not handled
     }
-    check.hash = function(eve, msg, val, key, soul, at, no){
+    check.hash = function(eve, msg, val, key, soul, at, no){ // mark unbuilt @i001962 's epic hex contrib!
       SEA.work(val, null, function(data){
         function hexToBase64(hexStr) {
           let base64 = "";
@@ -246,3 +247,4 @@
     // TODO: Potential bug? If pub/priv key starts with `-`? IDK how possible.
 
 
+}());
diff --git a/sea/pair.js b/sea/pair.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var SEA = require('./root');
     var shim = require('./shim');
@@ -70,4 +71,5 @@
     }});
 
     module.exports = SEA.pair;
-
+
+}());
diff --git a/sea/recall.js b/sea/recall.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var User = require('./user'), SEA = User.SEA, Gun = User.GUN;
     User.prototype.recall = function(opt, cb){
@@ -7,7 +8,7 @@
         if(SEA.window){
           try{
             var sS = {};
-            sS = window.sessionStorage; // TODO: FIX BUG putting on `.is`!
+            sS = SEA.window.sessionStorage; // TODO: FIX BUG putting on `.is`!
             if(sS){
               (root._).opt.remember = true;
               ((gun.back('user')._).opt||opt).remember = true;
@@ -24,4 +25,5 @@
       */
       return gun;
     }
-
+
+}());
diff --git a/sea/root.js b/sea/root.js
@@ -1,9 +1,11 @@
+;(function(){
 
     // Security, Encryption, and Authorization: SEA.js
     // MANDATORY READING: https://gun.eco/explainers/data/security.html
     // IT IS IMPLEMENTED IN A POLYFILL/SHIM APPROACH.
     // THIS IS AN EARLY ALPHA!
 
+    if(typeof self !== "undefined"){ module.window = self } // should be safe for at least browser/worker/nodejs, need to check other envs like RN etc.
     if(typeof window !== "undefined"){ module.window = window }
 
     var tmp = module.window || module, u;
@@ -13,4 +15,5 @@
 
     try{ if(u+'' !== typeof MODULE){ MODULE.exports = SEA } }catch(e){}
     module.exports = SEA;
-
+
+}());
diff --git a/sea/sea.js b/sea/sea.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var shim = require('./shim');
     // Practical examples about usage found in tests.
@@ -16,7 +17,7 @@
     // For documentation see https://nodejs.org/api/buffer.html
     SEA.Buffer = SEA.Buffer || require('./buffer');
 
-    // These SEA functions support now only Promises or
+    // These SEA functions support now ony Promises or
     // async/await (compatible) code, use those like Promises.
     //
     // Creates a wrapper library around Web Crypto API
@@ -45,7 +46,7 @@
     // Obviously it is missing MANY necessary features. This is only an alpha release.
     // Please experiment with it, audit what I've done so far, and complain about what needs to be added.
     // SEA should be a full suite that is easy and seamless to use.
-    // Again, scroll near the top, where I provide an EXAMPLE of how to create a user and sign in.
+    // Again, scroll naer the top, where I provide an EXAMPLE of how to create a user and sign in.
     // Once logged in, the rest of the code you just read handled automatically signing/validating data.
     // But all other behavior needs to be equally easy, like opinionated ways of
     // Adding friends (trusted public keys), sending private messages, etc.
@@ -55,4 +56,5 @@
     module.exports = SEA
     // -------------- END SEA MODULES --------------------
     // -- BEGIN SEA+GUN MODULES: BUNDLED BY DEFAULT UNTIL OTHERS USE SEA ON OWN -------
-
+
+}());
diff --git a/sea/secret.js b/sea/secret.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var SEA = require('./root');
     var shim = require('./shim');
@@ -50,4 +51,5 @@
     }
 
     module.exports = SEA.secret;
-
+
+}());
diff --git a/sea/settings.js b/sea/settings.js
@@ -1,3 +1,4 @@
+;(function(){
 
     var SEA = require('./root');
     var shim = require('./shim');
@@ -41,4 +42,5 @@
 
     SEA.opt = s;
     module.exports = s
-
+
+}());
diff --git a/sea/sha1.js b/sea/sha1.js
@@ -1,8 +1,10 @@
+;(function(){
 
     // This internal func returns SHA-1 hashed data for KeyID generation
     const __shim = require('./shim')
     const subtle = __shim.subtle
     const ossl = __shim.ossl ? __shim.ossl : subtle
     const sha1hash = (b) => ossl.digest({name: 'SHA-1'}, new ArrayBuffer(b))
     module.exports = sha1hash
-
+
+}());
diff --git a/sea/sha256.js b/sea/sha256.js
@@ -1,8 +1,10 @@
+;(function(){
 
     var shim = require('./shim');
     module.exports = async function(d, o){
       var t = (typeof d == 'string')? d : await shim.stringify(d);
       var hash = await shim.subtle.digest({name: o||'SHA-256'}, new shim.TextEncoder().encode(t));
       return shim.Buffer.from(hash);
     }
-
+
+}());