hotfix: proxy connection on failed (#727)

pocketnetteam · Nov 3, 2022 · 16fe8cc · 16fe8cc
1 parent 9f3aa22
commit 16fe8cc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/components/registration/templates/captcha.html b/components/registration/templates/captcha.html
@@ -1,5 +1,5 @@
 <div class="ucaptcha">
-    <div class="subcaption"><%=e('e13109')%></div>
+    <div class="subcaption"><%= app.pkoindisable ? e('e13109lg') : e('e13109')%></div>
 
 
 

diff --git a/js/lib/client/api.js b/js/lib/client/api.js
@@ -371,6 +371,7 @@ var Proxy16 = function(meta, app, api){
                 self.ping = rdate.addSeconds(60)
                 self.successping = true
                 self.session = r.session
+                delete self.pingerror
 
                 if (r.height && self.currentBlock < r.height){
                     self.currentBlock = r.height
@@ -388,6 +389,7 @@ var Proxy16 = function(meta, app, api){
                 var rdate = new Date()
 
                 self.ping = rdate.addSeconds(10)
+                self.pingerror = true
 
                 return Promise.reject(e)
             })
@@ -397,11 +399,20 @@ var Proxy16 = function(meta, app, api){
 
             var promise = null
 
+
             if(!freshping()){
                 promise = self.api.ping()
             }
             else{
-                promise = Promise.resolve(true)
+
+                if(self.pingerror){
+                    promise = Promise.reject()
+
+                }
+                else{
+                    promise = Promise.resolve(true)
+
+                }
             }
 
             return promise.catch(e => {
@@ -1320,14 +1331,19 @@ var Api = function(app){
         var pr = getproxyas()
         var promise = null
 
+
+
         if (pr){
-            promise = pr.api.actualping()
+            promise = pr.api.actualping().catch(e => {
+                return Promise.resolve(false)
+            })
         }
         else {
             promise = Promise.resolve(false)
         }
 
         return promise.then(r => {
+
             if(r){
                 return Promise.resolve(1)
             }

diff --git a/js/satolist.js b/js/satolist.js
@@ -24394,7 +24394,7 @@ Platform = function (app, listofnodes) {
         //var FirebasePlugin = new FakeFirebasePlugin()
 
         var using = typeof window != 'undefined' && window.cordova && typeof FirebasePlugin != 'undefined';
-        var usingWeb = typeof window != 'undefined' && typeof _Electron === 'undefined' && !window.cordova && typeof firebase != 'undefined'
+        var usingWeb = false // typeof window != 'undefined' && typeof _Electron === 'undefined' && !window.cordova && typeof firebase != 'undefined'
 
         var currenttoken = null;
 
@@ -24934,7 +24934,7 @@ Platform = function (app, listofnodes) {
 
             if(clbk) clbk()
 
-            /*app.user.isState(function (state) {
+            app.user.isState(function (state) {
 
                 if(state){
                     self.prepare(function(token){
@@ -24948,7 +24948,7 @@ Platform = function (app, listofnodes) {
                 }
 
 
-            })*/
+            })
 
         }
 
@@ -29194,7 +29194,7 @@ Platform = function (app, listofnodes) {
         initOnlineListener() // /remove for test
 
 
-        self.app.api.wait.ready('use', 10000).then(r => {
+        self.app.api.wait.ready('use', 6000).then(r => {
 
 
             return new Promise((resolve, reject) => {