improvements based on @rwaldron's review

tessel · Nov 25, 2015 · 68cb254 · 68cb254
1 parent 1fb583e
commit 68cb254
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/lib/tessel/wifi.js b/lib/tessel/wifi.js
@@ -94,7 +94,7 @@ Tessel.prototype.connectToNetwork = function(opts) {
       })
       .then(function() {
         // Then make sure wireless is enabled
-        return self.setWiFiState(true);
+        return self.simpleExec(commands.turnOnWifi(true));
       })
       .then(function() {
         // Then set the new credientials
@@ -111,20 +111,16 @@ Tessel.prototype.connectToNetwork = function(opts) {
                 logs.info('Credentials set. Checking connection...');
                 self.connection.exec(commands.ubusListen())
                   .then(function(remoteProcess) {
-                    remoteProcess.stdout.on('data', function(data) {
-                      if (data.toString().indexOf('ifup') > -1) {
-                        logs.info('Successfully connected!');
-                        // End the connection
-                        return self.connection.end()
-                          .then(resolve);
-                      }
-                    });
-                    remoteProcess.stderr.on('data', function(data) {
-                      logs.info('Error connecting:', data.toString());
-                      // End the connection
-                      return self.connection.end()
-                        .then(resolve);
-                    });
+                    self.receive(remoteProcess).then(function(data) {
+                        if (data.indexOf('ifup') > -1) {
+                          logs.info('Successfully connected!');
+                          return resolve();
+                        }
+                      })
+                      .catch(function(error) {
+                        logs.err('Error connecting:', error);
+                        return resolve();
+                      });
                     setTimeout(function() {
                       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.');
                       // End the connection