From eff27d6387b1cad2ef9901fa03dbee2ea86c786a Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Fri, 25 May 2018 11:53:24 +0200
Subject: js: use version operation for connection checks

--

* src/Connection.js: isConnected was renamed to checkConnection, that
  returns a promise with either version information or Boolean
* Connection checks have been adapted to reflect that checkConnection
  returns a Promise
* BrowsertestExtension: tests/signTest.js was missing from my last
  commit
---
 lang/js/src/index.js | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'lang/js/src/index.js')

diff --git a/lang/js/src/index.js b/lang/js/src/index.js
index 8527b3f3..7f969fee 100644
--- a/lang/js/src/index.js
+++ b/lang/js/src/index.js
@@ -34,20 +34,16 @@ function init(config){
     }
     return new Promise(function(resolve, reject){
         let connection = new Connection;
-        // TODO: Delayed reaction is ugly. We need to listen to the port's
-        // event listener in isConnected, but in some cases this takes some
-        // time (<5ms) to disconnect if there is no successfull connection.
-        let delayedreaction = function(){
-            if (connection === undefined) {
+        connection.checkConnection(false).then(
+            function(result){
+                if (result === true) {
+                    resolve(new GpgME(connection, _conf));
+                } else {
+                    reject(gpgme_error('CONN_NO_CONNECT'));
+                }
+            }, function(error){
                 reject(gpgme_error('CONN_NO_CONNECT'));
-            }
-            if (connection.isConnected === true){
-                resolve(new GpgME(connection, _conf));
-            } else {
-                reject(gpgme_error('CONN_NO_CONNECT'));
-            }
-        };
-        setTimeout(delayedreaction, 5);
+        });
     });
 }
 
-- 
cgit v1.2.3