Enhanced to close the Telnet port after done. Enhanced closePort() to prevent closing a null port.

Author: PropGit

loader.js

@@ -147,16 +147,19 @@ function loadPropeller(sock, portPath, action, payload, debug) {
                 listen(port, false);                                                                                //Disable listener
                 port.mode = (debug !== "none") ? "debug" : "programming";
                 log(notice(nsDownloadSuccessful), mAll, sock);
-                if (sock && debug !== "none") {
+                if (sock && debug !== "none") {                                                                     //If debug needed, open terminal/graph
                     sock.send(JSON.stringify({type:"ui-command", action:(debug === "term") ? "open-terminal" : "open-graph"}));
                     sock.send(JSON.stringify({type:"ui-command", action:"close-compile"}));
+                } else {                                                                                            //Else
+                    if (port.isWireless) closePort(port, false).catch(function(e) {log(e.message, mAll, sock);})    //  Close Telnet port (if wireless)
                 }
             })                                                                                                      //Error? Disable listener and display error
             .catch(function(e) {
                 listen(port, false);
                 log(e.message, mAll, sock);
                 log(notice(neDownloadFailed), mAll, sock);
-                if (port.connId) {changeBaudrate(port, originalBaudrate)}
+                if ((port.isWired && port.connId) || port.isWireless) {changeBaudrate(port, originalBaudrate)}
+                if (port.isWireless) {closePort(port, false)}
             });
     } else {
         // Port not found
@@ -215,8 +218,10 @@ function setPropCommTimer(timeout, timeoutError, command) {
         log("Timed out in " + timeout + " ms", mDbug);
         clearPropCommTimer();                                                              //  Clear timer
         propComm.stage = sgIdle;                                                           //  Reset propComm stage to Idle (ignore incoming data)
-        if (propComm.port.isWireless) {closePort(propComm.port, command)}                  //  Close and/or forget HTTP or Telnet service socket
-        propComm.response.reject(Error(propComm.timeoutError));                            //  And reject with error
+        Promise.resolve()
+            .then(function() {if (propComm.port.isWireless) {return closePort(propComm.port, command)}})    //  Close and/or forget HTTP or Telnet service socket
+            .then(function() {propComm.response.reject(Error(propComm.timeoutError))})                      //  And reject with error
+            .catch(function(e) {propComm.response.reject(Error(propComm.timeoutError))})
     }, timeout);
 }
 

serial.js

@@ -84,21 +84,26 @@ function closePort(port, command) {
             // Nullify port's socket reference
             let sID = port[socket];
             updatePort(port, {[socket]: null});
-            log("Closing socket", mDbug);
-            // Disconnect and/or close socket (if necessary)
-            chrome.sockets.tcp.getInfo(sID, function(info) {
-                if (info.connected) {
-                    chrome.sockets.tcp.disconnect(sID, function() {
+            if (sID) {
+                log("Closing socket", mDbug);
+                // Disconnect and/or close socket (if necessary)
+                chrome.sockets.tcp.getInfo(sID, function(info) {
+                    if (info.connected) {
+                        chrome.sockets.tcp.disconnect(sID, function() {
+                            chrome.sockets.tcp.close(sID, function() {
+                                resolve();
+                            })
+                        })
+                    } else {
                         chrome.sockets.tcp.close(sID, function() {
                             resolve();
                         })
-                    })
-                } else {
-                    chrome.sockets.tcp.close(sID, function() {
-                        resolve();
-                    })
-                }
-            });
+                    }
+                });
+            } else {
+                log("Not closing socket", mDbug);
+                reject(Error(notice(neCanNotClosePort, [port.path])));
+            }
         }
 
         if (port) {
@@ -152,6 +157,9 @@ function changeBaudrate(port, baudrate) {
                 chrome.sockets.tcp.create(function (info) {
                     //Update port record with socket to Propeller's HTTP service
                     updatePort(port, {phSocket: info.socketId});
+                    if (!port.phSocket) {
+                        log("NULL SOCKET!!!", mDbug);
+                    }
                     let postStr = "POST /wx/setting?name=baud-rate&value=" + baudrate + " HTTP/1.1\r\n\r\n";
                     chrome.sockets.tcp.connect(port.phSocket, port.ip, 80, function() {
                         chrome.sockets.tcp.send(port.phSocket, str2ab(postStr), function () {