fixes tessel#395

HipsterBrown · Dec 3, 2015 · d80cab0 · d80cab0
1 parent 4eaee1d
commit d80cab0
Showing 1 changed file with 33 additions and 12 deletions.
diff --git a/lib/tessel/wifi.js b/lib/tessel/wifi.js
@@ -124,20 +124,41 @@ Tessel.prototype.setWiFiState = function(enable) {
     .then(() => this.simpleExec(commands.ubusListen())
     .then((remoteProcess) => {
       if (enable) {
-        this.receive(remoteProcess)
-          .then(function(data) {
-            if (data.indexOf('ifup') > -1) {
-              logs.info('Successfully connected!');
-            }
-          })
-          .catch(function(error) {
-            logs.err('Error connecting:', error);
-          });
-        setTimeout(() => {
-          logs.info("Timed out waiting to verify connection. Run `t2 wifi` to manually verify connection. If not connected, ensure you have entered the correct network credentials.");
+        var result = {};
+        var timeout = setTimeout(function() {
+          result = {
+            type: 'reject',
+            message: 'Timed out waiting to verify connection. Run `t2 wifi` to manually verify connection. If not connected, ensure you have entered the correct network credentials.'
+          };
           // End the connection
-          return this.connection.end();
+          remoteProcess.close();
         }, 10000);
+        remoteProcess.stdout.on('data', function(data) {
+          if (data.indexOf('ifup') > -1) {
+            logs.info('Successfully connected!');
+            clearTimeout(timeout);
+            result = {
+              type: 'resolve',
+              message: '' // resolve doesn't report messages
+            };
+            remoteProcess.close();
+          }
+        });
+        remoteProcess.stderr.on('data', function(error) {
+          clearTimeout(timeout);
+          result = {
+            type: 'reject',
+            message: error
+          };
+          remoteProcess.close();
+        });
+        remoteProcess.on('close', function() {
+          if (result.type === 'reject') {
+            Promise.reject(result.message);
+          } else {
+            Promise.resolve();
+          }
+        });
       } else {
         return this.connection.end();
       }