From 98080968a483743c5f5bd73617cabdf04ba07bbc Mon Sep 17 00:00:00 2001 From: hatim boufnichel Date: Tue, 14 Sep 2021 18:56:01 +0200 Subject: [PATCH 01/12] unpolished-page --- .env.example | 2 +- src/localHomepage.html | 67 +++++++++++++++++++++++++++++ src/{index.html => obsOverlay.html} | 0 src/routes.js | 66 +++++++++++++++++++++++++++- src/server.js | 12 +++--- utils/protectedRoutes.js | 4 +- 6 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 src/localHomepage.html rename src/{index.html => obsOverlay.html} (100%) diff --git a/.env.example b/.env.example index 9ad5cf8a..371cd77a 100644 --- a/.env.example +++ b/.env.example @@ -19,4 +19,4 @@ TORRENT_SEED_TOKEN=jibberish # "default" or "hosting" DEPLOYMENT_TYPE=hosting # allow to create a user with unlocked lnd -ALLOW_UNLOCKED_LND="true" \ No newline at end of file +ALLOW_UNLOCKED_LND=false \ No newline at end of file diff --git a/src/localHomepage.html b/src/localHomepage.html new file mode 100644 index 00000000..94295c84 --- /dev/null +++ b/src/localHomepage.html @@ -0,0 +1,67 @@ + + + + + + + Document + + +

+
+

Tunnel

+

+
+
+

Access Secret

+

+
+ + + \ No newline at end of file diff --git a/src/index.html b/src/obsOverlay.html similarity index 100% rename from src/index.html rename to src/obsOverlay.html diff --git a/src/routes.js b/src/routes.js index c5dd90c2..869d066e 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2694,7 +2694,7 @@ module.exports = async ( //this is for OBS notifications, not wired with UI. ap.get('/api/subscribeStream', (req, res) => { try { - res.sendFile(path.join(__dirname, '/index.html')) + res.sendFile(path.join(__dirname, '/obsOverlay.html')) } catch (e) { logger.error(e) res.status(500).json({ @@ -2750,6 +2750,70 @@ module.exports = async ( }) } }) + + ap.get('/', (req, res) => { + try { + res.sendFile(path.join(__dirname, '/localHomepage.html')) + } catch (e) { + logger.error(e) + res.status(500).json({ + errorMessage: e.message + }) + } + }) + + ap.get('/api/accessInfo', async (req, res) => { + if (req.ip !== '127.0.0.1') { + res.json({ + field: 'origin', + message: 'invalid origin, cant serve access info' + }) + return + } + try { + const [relayId, relayUrl, accessSecret] = await Promise.all([ + Storage.getItem('relay/id'), + Storage.getItem('relay/url'), + Storage.getItem('FirstAccessSecret') + ]) + const response = {} + if (config.cliArgs.tunnel) { + if (!relayId || !relayUrl) { + response.relayNotFound = true + } else { + response.relayId = relayId + response.relayUrl = relayUrl + } + } else { + response.tunnelDisabled = true + } + + if (process.env.ALLOW_UNLOCKED_LND !== 'true') { + response.accessSecretDisabled = true + return res.json(response) + } + + if (!accessSecret) { + response.accessCodeNotFound = true + res.json(response) + return + } + const codeUsed = await Storage.getItem( + `UnlockedAccessSecrets/${accessSecret}` + ) + if (codeUsed !== false) { + response.accessCodeUsed = true + return res.json(response) + } + response.accessCode = accessSecret + res.json(response) + } catch (e) { + logger.error(e) + res.status(500).json({ + errorMessage: e.message + }) + } + }) } catch (err) { logger.warn('Unhandled rejection:', err) } diff --git a/src/server.js b/src/server.js index b62c0d34..e8a2a8ca 100644 --- a/src/server.js +++ b/src/server.js @@ -382,7 +382,8 @@ const server = program => { app, { ...defaults, - lndAddress: program.lndAddress + lndAddress: program.lndAddress, + cliArgs: program }, Sockets, { @@ -439,15 +440,16 @@ const server = program => { } }) } - if(process.env.ALLOW_UNLOCKED_LND === 'true'){ const codes = await Storage.valuesWithKeyMatch(/^UnlockedAccessSecrets\//u) if(codes.length === 0){ - const code = generateRandomString(12) + const code = await generateRandomString(12) await Storage.setItem(`UnlockedAccessSecrets/${code}`, false) + await Storage.setItem(`FirstAccessSecret`, code) logger.info("the access code is:"+code) - } else if(codes.length === 1 || codes[0] === false){ - logger.info("the access code is:"+codes[0]) + } else if(codes.length === 1 && codes[0] === false){ + const firstCode = await Storage.getItem("FirstAccessSecret") + logger.info("the access code is:"+firstCode) } } serverInstance.listen(serverPort, serverHost) diff --git a/utils/protectedRoutes.js b/utils/protectedRoutes.js index 24b1f47e..d0e42d0f 100644 --- a/utils/protectedRoutes.js +++ b/utils/protectedRoutes.js @@ -12,6 +12,8 @@ module.exports = { // "/api/gun/auth": true, "/api/subscribeStream":true, + "/":true, + "/api/accessInfo":true, }, POST: { "/api/lnd/connect": true, @@ -33,5 +35,5 @@ module.exports = { PUT: {}, DELETE: {} }, - nonEncryptedRoutes: ['/api/security/exchangeKeys', "/api/encryption/exchange", '/healthz', '/ping', '/tunnel/status', '/api/lnd/wallet/status', '/api/gun/auth',"/api/subscribeStream"] + nonEncryptedRoutes: ['/api/security/exchangeKeys', "/api/encryption/exchange", '/healthz', '/ping', '/tunnel/status', '/api/lnd/wallet/status', '/api/gun/auth',"/api/subscribeStream", "/", "/api/accessInfo"] } \ No newline at end of file From 6aa3fbeec451dea2e5f6e6f43d43b143314ec480 Mon Sep 17 00:00:00 2001 From: emad-salah Date: Wed, 15 Sep 2021 15:34:48 +0100 Subject: [PATCH 02/12] Added GunDB test step to GitHub Actions --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5aa1356..4a64d84a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,8 @@ jobs: repo: ['shocknet/Wizard'] runs-on: ubuntu-latest steps: + - name: Test GunDB + run: yarn test:gun - name: Repository Dispatch uses: peter-evans/repository-dispatch@v1 with: From 1ddf75a9cb8c28a7f929927e81b838bc42b4a171 Mon Sep 17 00:00:00 2001 From: hatim boufnichel Date: Wed, 15 Sep 2021 21:34:38 +0200 Subject: [PATCH 03/12] add QR code --- .eslintignore | 1 + {src => public}/localHomepage.html | 15 +++++++++++++-- {src => public}/obsOverlay.html | 0 public/qrcode.min.js | 1 + src/routes.js | 16 ++++++++++++++-- utils/protectedRoutes.js | 3 ++- 6 files changed, 31 insertions(+), 5 deletions(-) rename {src => public}/localHomepage.html (80%) rename {src => public}/obsOverlay.html (100%) create mode 100644 public/qrcode.min.js diff --git a/.eslintignore b/.eslintignore index 6461deec..72d042d3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,2 @@ *.ts +/public/*.min.js \ No newline at end of file diff --git a/src/localHomepage.html b/public/localHomepage.html similarity index 80% rename from src/localHomepage.html rename to public/localHomepage.html index 94295c84..832973bd 100644 --- a/src/localHomepage.html +++ b/public/localHomepage.html @@ -5,6 +5,7 @@ Document +

@@ -16,6 +17,7 @@

Access Secret

+
diff --git a/src/obsOverlay.html b/public/obsOverlay.html similarity index 100% rename from src/obsOverlay.html rename to public/obsOverlay.html diff --git a/public/qrcode.min.js b/public/qrcode.min.js new file mode 100644 index 00000000..993e88f3 --- /dev/null +++ b/public/qrcode.min.js @@ -0,0 +1 @@ +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); \ No newline at end of file diff --git a/src/routes.js b/src/routes.js index 869d066e..98b3d31f 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2694,7 +2694,7 @@ module.exports = async ( //this is for OBS notifications, not wired with UI. ap.get('/api/subscribeStream', (req, res) => { try { - res.sendFile(path.join(__dirname, '/obsOverlay.html')) + res.sendFile(path.join(__dirname, '../public/obsOverlay.html')) } catch (e) { logger.error(e) res.status(500).json({ @@ -2753,7 +2753,19 @@ module.exports = async ( ap.get('/', (req, res) => { try { - res.sendFile(path.join(__dirname, '/localHomepage.html')) + res.sendFile(path.join(__dirname, '../public/localHomepage.html')) + } catch (e) { + logger.error(e) + res.status(500).json({ + errorMessage: e.message + }) + } + }) + + ap.get('/qrCodeGenerator', (req, res) => { + console.log('qrrerrr') + try { + res.sendFile(path.join(__dirname, '../public/qrcode.min.js')) } catch (e) { logger.error(e) res.status(500).json({ diff --git a/utils/protectedRoutes.js b/utils/protectedRoutes.js index d0e42d0f..8506af51 100644 --- a/utils/protectedRoutes.js +++ b/utils/protectedRoutes.js @@ -14,6 +14,7 @@ module.exports = { "/api/subscribeStream":true, "/":true, "/api/accessInfo":true, + "/qrCodeGenerator":true, }, POST: { "/api/lnd/connect": true, @@ -35,5 +36,5 @@ module.exports = { PUT: {}, DELETE: {} }, - nonEncryptedRoutes: ['/api/security/exchangeKeys', "/api/encryption/exchange", '/healthz', '/ping', '/tunnel/status', '/api/lnd/wallet/status', '/api/gun/auth',"/api/subscribeStream", "/", "/api/accessInfo"] + nonEncryptedRoutes: ['/api/security/exchangeKeys', "/api/encryption/exchange", '/healthz', '/ping', '/tunnel/status', '/api/lnd/wallet/status', '/api/gun/auth',"/api/subscribeStream", "/", "/api/accessInfo","/qrCodeGenerator"] } \ No newline at end of file From 66a312a03fe460a5403407b2cd22201c7855a02d Mon Sep 17 00:00:00 2001 From: emad-salah Date: Thu, 16 Sep 2021 10:34:50 +0100 Subject: [PATCH 04/12] Fix Test CI --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a64d84a..f015ffb1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,11 @@ jobs: repo: ['shocknet/Wizard'] runs-on: ubuntu-latest steps: + - name: Checkout 🛎️ + uses: actions/checkout@v2.3.1 + with: + persist-credentials: false + ref: ${{ github.ref }} - name: Test GunDB run: yarn test:gun - name: Repository Dispatch From c9a70a4111945c19a97f3642c4ecd3b4f7653437 Mon Sep 17 00:00:00 2001 From: emad-salah Date: Thu, 16 Sep 2021 10:39:44 +0100 Subject: [PATCH 05/12] Install dependencies before running test and emojis ;) --- .github/workflows/main.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f015ffb1..3c2453b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,14 +19,19 @@ jobs: repo: ['shocknet/Wizard'] runs-on: ubuntu-latest steps: - - name: Checkout 🛎️ + - name: 🛎️ Checkout uses: actions/checkout@v2.3.1 with: persist-credentials: false ref: ${{ github.ref }} - - name: Test GunDB + + - name: ⚙️ Install Dependencies + run: yarn install + + - name: 📝 Test GunDB run: yarn test:gun - - name: Repository Dispatch + + - name: 📯 Repository Dispatch uses: peter-evans/repository-dispatch@v1 with: token: ${{ secrets.REPO_ACCESS_TOKEN }} From e26c2ab64c70e68ebc91bf0a508d6fcc234e782e Mon Sep 17 00:00:00 2001 From: emad-salah Date: Thu, 16 Sep 2021 13:13:55 +0100 Subject: [PATCH 06/12] Use `yarn test` instead of `yarn test:gun` --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c2453b1..1bb412c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,8 +28,8 @@ jobs: - name: ⚙️ Install Dependencies run: yarn install - - name: 📝 Test GunDB - run: yarn test:gun + - name: 📝 Run Tests + run: yarn test - name: 📯 Repository Dispatch uses: peter-evans/repository-dispatch@v1 From ee9ba63a8cbeaccf6d70252eb5095cd0226ad44d Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Fri, 17 Sep 2021 16:02:45 -0400 Subject: [PATCH 07/12] Remove unneded follows init --- services/gunDB/Mediator/index.js | 70 -------------------------------- 1 file changed, 70 deletions(-) diff --git a/services/gunDB/Mediator/index.js b/services/gunDB/Mediator/index.js index c57091fa..440c9a7a 100644 --- a/services/gunDB/Mediator/index.js +++ b/services/gunDB/Mediator/index.js @@ -14,7 +14,6 @@ require('gun/lib/open') require('gun/lib/load') //@ts-ignore const { encryptedEmit, encryptedOn } = require('../../../utils/ECC/socket') -const Key = require('../contact-api/key') /** @type {import('../contact-api/SimpleGUN').ISEA} */ // @ts-ignore @@ -328,29 +327,6 @@ const authenticate = async (alias, pass, __user) => { // clock skew await new Promise(res => setTimeout(res, 2000)) - await /** @type {Promise} */ (new Promise((res, rej) => { - _user.get(Key.FOLLOWS).put( - { - unused: null - }, - ack => { - if (ack.err && typeof ack.err !== 'number') { - rej( - new Error( - `Error initializing follows: ${JSON.stringify( - ack.err, - null, - 4 - )}` - ) - ) - } else { - res() - } - } - ) - })) - return ack.sea.pub } else { throw new Error('Unknown error.') @@ -367,29 +343,6 @@ const authenticate = async (alias, pass, __user) => { // clock skew await new Promise(res => setTimeout(res, 2000)) - await /** @type {Promise} */ (new Promise((res, rej) => { - _user.get(Key.FOLLOWS).put( - { - unused: null - }, - ack => { - if (ack.err && typeof ack.err !== 'number') { - rej( - new Error( - `Error initializing follows: ${JSON.stringify( - ack.err, - null, - 4 - )}` - ) - ) - } else { - res() - } - } - ) - })) - // move this to a subscription; implement off() ? todo API.Jobs.onOrders(_user, gun, mySEA) API.Jobs.lastSeenNode(_user) @@ -424,29 +377,6 @@ const authenticate = async (alias, pass, __user) => { await new Promise(res => setTimeout(res, 5000)) - await /** @type {Promise} */ (new Promise((res, rej) => { - _user.get(Key.FOLLOWS).put( - { - unused: null - }, - ack => { - if (ack.err && typeof ack.err !== 'number') { - rej( - new Error( - `Error initializing follows: ${JSON.stringify( - ack.err, - null, - 4 - )}` - ) - ) - } else { - res() - } - } - ) - })) - API.Jobs.onOrders(_user, gun, mySEA) API.Jobs.lastSeenNode(_user) From bdcc4a06f3d40daf9b6a6b0b2f29030fd718c362 Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Sun, 19 Sep 2021 12:01:36 -0400 Subject: [PATCH 08/12] Ingore empty object "{}" error acks from gun --- services/gunDB/contact-api/actions.js | 144 +++++++++++++++--- .../gunDB/contact-api/jobs/lastSeenNode.js | 12 +- services/gunDB/contact-api/jobs/onOrders.js | 36 ++++- .../gunDB/contact-api/utils/promisifygun.js | 12 +- services/gunDB/rpc/index.js | 12 +- services/schema/index.js | 6 +- 6 files changed, 183 insertions(+), 39 deletions(-) diff --git a/services/gunDB/contact-api/actions.js b/services/gunDB/contact-api/actions.js index f8800962..5ac9f107 100644 --- a/services/gunDB/contact-api/actions.js +++ b/services/gunDB/contact-api/actions.js @@ -58,7 +58,11 @@ const authenticate = (user, pass, userNode) => } userNode.auth(user, pass, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else if (!userNode.is) { reject(new Error('authentication failed')) @@ -81,7 +85,11 @@ const blacklist = (publicKey, user) => } user.get(Key.BLACKLIST).set(publicKey, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -100,7 +108,11 @@ const generateHandshakeAddress = async () => { await /** @type {Promise} */ (new Promise((res, rej) => { user.get(Key.CURRENT_HANDSHAKE_ADDRESS).put(address, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -113,7 +125,11 @@ const generateHandshakeAddress = async () => { .get(Key.HANDSHAKE_NODES) .get(address) .put({ unused: 0 }, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -150,7 +166,11 @@ const setAvatar = (avatar, user) => .get(Key.PROFILE_BINARY) .get(Key.AVATAR) .put(avatar, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -183,7 +203,11 @@ const setDisplayName = (displayName, user) => .get(Key.PROFILE) .get(Key.DISPLAY_NAME) .put(displayName, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -210,7 +234,11 @@ const setDefaultSeedProvider = (encryptedSeedProvider, user) => user .get('preferencesSeedServiceProvider') .put(encryptedSeedProvider, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -235,7 +263,11 @@ const setSeedServiceData = (encryptedSeedServiceData, user) => user .get('preferencesSeedServiceData') .put(encryptedSeedServiceData, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -258,7 +290,11 @@ const setCurrentStreamInfo = (encryptedCurrentStreamInfo, user) => throw new TypeError() } user.get('currentStreamInfo').put(encryptedCurrentStreamInfo, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -368,7 +404,11 @@ const sendSpontaneousPayment = async ( .get(currOrderAddress) //@ts-ignore .set(order, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej( new Error( `Error writing order to order node: ${currOrderAddress} for pub: ${to}: ${ack.err}` @@ -589,7 +629,11 @@ const generateOrderAddress = user => const address = uuidv1() user.get(Key.CURRENT_ORDER_ADDRESS).put(address, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -622,7 +666,11 @@ const setBio = (bio, user) => } user.get(Key.BIO).put(bio, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -635,7 +683,11 @@ const setBio = (bio, user) => .get(Key.PROFILE) .get(Key.BIO) .put(bio, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { reject(new Error(ack.err)) } else { resolve() @@ -664,7 +716,11 @@ const saveSeedBackup = async (mnemonicPhrase, user, SEA) => { return new Promise((res, rej) => { user.get(Key.SEED_BACKUP).put(encryptedSeed, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -687,7 +743,11 @@ const saveChannelsBackup = async (backups, user, SEA) => { const encryptBackups = await SEA.encrypt(backups, mySecret) return new Promise((res, rej) => { user.get(Key.CHANNELS_BACKUP).put(encryptBackups, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -705,7 +765,11 @@ const setLastSeenApp = () => .getUser() .get(Key.LAST_SEEN_APP) .put(Date.now(), ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -719,7 +783,11 @@ const setLastSeenApp = () => .get(Key.PROFILE) .get(Key.LAST_SEEN_APP) .put(Date.now(), ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -771,7 +839,11 @@ const createPostNew = async (tags, title, content) => { // @ts-expect-error newPost, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res(_n._.get) @@ -798,7 +870,11 @@ const deletePost = async (postId, page) => { .get(Key.POSTS) .get(postId) .put(null, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -827,7 +903,11 @@ const follow = async (publicKey, isPrivate) => { .get(publicKey) // @ts-ignore .put(newFollow, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -847,7 +927,11 @@ const unfollow = publicKey => .get(Key.FOLLOWS) .get(publicKey) .put(null, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -870,7 +954,11 @@ const initWall = async () => { .get(Key.WALL) .get(Key.NUM_OF_PAGES) .put(0, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -891,7 +979,11 @@ const initWall = async () => { unused: null }, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -909,7 +1001,11 @@ const initWall = async () => { .get('0') .get(Key.COUNT) .put(0, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() diff --git a/services/gunDB/contact-api/jobs/lastSeenNode.js b/services/gunDB/contact-api/jobs/lastSeenNode.js index 3c38f4a4..63e13572 100644 --- a/services/gunDB/contact-api/jobs/lastSeenNode.js +++ b/services/gunDB/contact-api/jobs/lastSeenNode.js @@ -42,7 +42,11 @@ const lastSeenNode = user => { } gotLatestUserAck = false user.get(Key.LAST_SEEN_NODE).put(Date.now(), ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { logger.error(`Error inside lastSeenNode user job: ${ack.err}`) } gotLatestUserAck = true @@ -61,7 +65,11 @@ const lastSeenNode = user => { .get(Key.PROFILE) .get(Key.LAST_SEEN_NODE) .put(Date.now(), ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { logger.error(`Error inside lastSeenNode profile job: ${ack.err}`) } gotLatestProfileAck = true diff --git a/services/gunDB/contact-api/jobs/onOrders.js b/services/gunDB/contact-api/jobs/onOrders.js index fac74889..340b9c18 100644 --- a/services/gunDB/contact-api/jobs/onOrders.js +++ b/services/gunDB/contact-api/jobs/onOrders.js @@ -229,7 +229,11 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => { .get(orderID) // @ts-expect-error .put(orderResponse, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej( new Error( `Error saving encrypted invoice to order to response usergraph: ${ack}` @@ -290,7 +294,11 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => { .get(Key.ORDER_TO_RESPONSE) .get(ackNode) .put(ordResponse, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej( new Error( `Error saving encrypted orderAck to order to response usergraph: ${ack}` @@ -378,7 +386,11 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => { .get(Key.ORDER_TO_RESPONSE) .get(ackNode) .put(ordResponse, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej( new Error( `Error saving encrypted orderAck to order to response usergraph: ${ack}` @@ -425,7 +437,11 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => { .get(Key.ORDER_TO_RESPONSE) .get(ackNode) .put(serviceResponse, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej( new Error( `Error saving encrypted orderAck to order to response usergraph: ${ack}` @@ -489,7 +505,11 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => { .get(orderID) // @ts-expect-error .put(orderResponse, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { logger.error( `Error saving encrypted invoice to order to response usergraph: ${ack}` ) @@ -516,7 +536,11 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => { .get(orderID) // @ts-expect-error .put(orderResponse, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { logger.error( `Error saving encrypted invoice to order to response usergraph: ${ack}` ) diff --git a/services/gunDB/contact-api/utils/promisifygun.js b/services/gunDB/contact-api/utils/promisifygun.js index 633626e5..d5944dda 100644 --- a/services/gunDB/contact-api/utils/promisifygun.js +++ b/services/gunDB/contact-api/utils/promisifygun.js @@ -20,7 +20,11 @@ const promisify = node => { pnode.put = data => new Promise((res, rej) => { oldPut(data, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() @@ -31,7 +35,11 @@ const promisify = node => { pnode.set = data => new Promise((res, rej) => { oldSet(data, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res() diff --git a/services/gunDB/rpc/index.js b/services/gunDB/rpc/index.js index 76f58163..9ff9865b 100644 --- a/services/gunDB/rpc/index.js +++ b/services/gunDB/rpc/index.js @@ -205,7 +205,11 @@ const put = async (rawPath, value) => { } /* is primitive */ else { await makePromise((res, rej) => { node.put(/** @type {ValidDataValue} */ (theValue), ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { if (typeof ack.err === 'string') { rej(new Error(ack.err)) } else { @@ -290,7 +294,11 @@ async function set(rawPath, value) { const id = await makePromise((res, rej) => { const subNode = node.set(theValue, ack => { - if (ack.err && typeof ack.err !== 'number') { + if ( + ack.err && + typeof ack.err !== 'number' && + typeof ack.err !== 'object' + ) { rej(new Error(ack.err)) } else { res(subNode._.get) diff --git a/services/schema/index.js b/services/schema/index.js index 5cc57301..4fb0034c 100644 --- a/services/schema/index.js +++ b/services/schema/index.js @@ -201,7 +201,7 @@ const AddTmpChainOrder = async (address, orderInfo) => { .get(Key.TMP_CHAIN_COORDINATE) .get(addressSHA256) .put(encryptedOrderString, ack => { - if (ack.err && typeof ack.err !== 'number') { + if (ack.err && typeof ack.err !== 'number' && typeof ack.err !== 'object') { rej( new Error( `Error saving tmp chain coordinate order to user-graph: ${ack}` @@ -268,7 +268,7 @@ const clearTmpChainOrder = async (address) => { .get(Key.TMP_CHAIN_COORDINATE) .get(addressSHA256) .put(null, ack => { - if (ack.err && typeof ack.err !== 'number') { + if (ack.err && typeof ack.err !== 'number' && typeof ack.err !== 'object') { rej( new Error( `Error nulling tmp chain coordinate order to user-graph: ${ack}` @@ -370,7 +370,7 @@ class SchemaManager { .get(Key.COORDINATES) .get(coordinateSHA256) .put(encryptedOrderString, ack => { - if (ack.err && typeof ack.err !== 'number') { + if (ack.err && typeof ack.err !== 'number' && typeof ack.err !== 'object') { logger.info(ack) rej( new Error( From 119a1d265f998e4b09b22f7ccdbff1d5ccf4108f Mon Sep 17 00:00:00 2001 From: hatim boufnichel Date: Sun, 19 Sep 2021 19:41:58 +0200 Subject: [PATCH 09/12] init as a separate route --- .../windows-2network-alice/docker-compose.yml | 17 +++++++++++++++++ services/gunDB/Mediator/index.js | 12 +----------- services/initializer.js | 12 ++++++++++++ src/routes.js | 17 +++++++++++++++++ 4 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 composers/windows-2network-alice/docker-compose.yml create mode 100644 services/initializer.js diff --git a/composers/windows-2network-alice/docker-compose.yml b/composers/windows-2network-alice/docker-compose.yml new file mode 100644 index 00000000..95c107df --- /dev/null +++ b/composers/windows-2network-alice/docker-compose.yml @@ -0,0 +1,17 @@ +version: "3.8" +networks: + default: + external: true + name: 2_default +services: + web: + image: shockwallet/api:latest + command: -c -h 0.0.0.0 -l polar-n2-alice:10009 -m /root/.lnd/data/chain/bitcoin/regtest/admin.macaroon -d /root/.lnd/tls.cert + restart: on-failure + stop_grace_period: 1m + ports: + - 9835:9835 + volumes: + - C:\Users\boufn\.polar\networks\2\volumes\lnd\alice:/root/.lnd + environment: + TRUSTED_KEYS: 'false' \ No newline at end of file diff --git a/services/gunDB/Mediator/index.js b/services/gunDB/Mediator/index.js index 49b83284..ced3416c 100644 --- a/services/gunDB/Mediator/index.js +++ b/services/gunDB/Mediator/index.js @@ -518,17 +518,7 @@ const register = async (alias, pass) => { // don't work instantiateGun() - return authenticate(alias, pass).then(async pub => { - await API.Actions.setDisplayName('anon' + pub.slice(0, 8), user) - await API.Actions.generateHandshakeAddress() - await API.Actions.generateOrderAddress(user) - await API.Actions.initWall() - await API.Actions.setBio('A little bit about myself.', user) - await API.Actions.setDefaultSeedProvider('', user) - await API.Actions.setSeedServiceData('', user) - await API.Actions.setCurrentStreamInfo('', user) - return pub - }) + return authenticate(alias, pass) } module.exports = { diff --git a/services/initializer.js b/services/initializer.js new file mode 100644 index 00000000..9d12684c --- /dev/null +++ b/services/initializer.js @@ -0,0 +1,12 @@ +const API = require('./gunDB/contact-api') + +module.exports.InitUserData = async (user) => { + await API.Actions.setDisplayName('anon' + user._.sea.pub.slice(0, 8), user) + await API.Actions.generateHandshakeAddress() + await API.Actions.generateOrderAddress(user) + await API.Actions.initWall() + await API.Actions.setBio('A little bit about myself.', user) + await API.Actions.setDefaultSeedProvider('', user) + await API.Actions.setSeedServiceData('', user) + await API.Actions.setCurrentStreamInfo('', user) +} \ No newline at end of file diff --git a/src/routes.js b/src/routes.js index 2660b1d0..78f020cd 100644 --- a/src/routes.js +++ b/src/routes.js @@ -38,6 +38,7 @@ const Key = require('../services/gunDB/contact-api/key') const { startedStream, endStream } = require('../services/streams') const channelRequest = require('../utils/lightningServices/channelRequests') const TipsForwarder = require('../services/tipsCallback') +const UserInitializer = require('../services/initializer') const DEFAULT_MAX_NUM_ROUTES_TO_QUERY = 10 const SESSION_ID = uuid() @@ -2826,6 +2827,22 @@ module.exports = async ( }) } }) + + ap.post('/api/initUserInformation', async (req, res) => { + try { + const user = require('../services/gunDB/Mediator').getUser() + await UserInitializer.InitUserData(user) + } catch (err) { + logger.error(err) + res + .status( + err.message === Common.Constants.ErrorCode.NOT_AUTH ? 401 : 500 + ) + .json({ + errorMessage: err.message + }) + } + }) } catch (err) { logger.warn('Unhandled rejection:', err) } From e94f489b76cd5bd4c73bc7b13fbdf7716e3680a3 Mon Sep 17 00:00:00 2001 From: Version Update Action Date: Sun, 19 Sep 2021 17:59:50 +0000 Subject: [PATCH 10/12] version upgraded to 2021.9.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4224ecb2..5f559b41 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "shockapi", - "version": "2021.9.8", + "version": "2021.9.19", "description": "", "main": "src/server.js", "scripts": { From 4833f8c5d794bf209769eec76e5474cd12bf190a Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Mon, 4 Oct 2021 15:40:29 -0400 Subject: [PATCH 11/12] Log peers in test file --- guntest.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guntest.html b/guntest.html index 4592a96d..09b02bd6 100644 --- a/guntest.html +++ b/guntest.html @@ -25,6 +25,10 @@ axe: false }) + setInterval(() => { + console.log('peers', Object.keys(gun.back('opt').peers)) + },5000) + user = gun.user() node = gun.get('foo').get('bar') From 2de8e7a33a30913137e753233ff1be78ecb51cdd Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Sun, 10 Oct 2021 15:45:05 -0400 Subject: [PATCH 12/12] Check method and path are defined in middleware --- src/routes.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/routes.js b/src/routes.js index 78f020cd..f6b7bd3d 100644 --- a/src/routes.js +++ b/src/routes.js @@ -356,7 +356,21 @@ module.exports = async ( }) app.use(async (req, res, next) => { - if (unprotectedRoutes[req.method][req.path]) { + if (!req.method) { + logger.error( + 'No req.method in unprotected routes middleware.', + 'req.path:', + req.path + ) + next() + } else if (!req.path) { + logger.error( + 'No req.path in unprotected routes middleware.', + 'req.method:', + req.method + ) + next() + } else if (unprotectedRoutes[req.method][req.path]) { next() } else { try {