Merge branch 'master' of https://github.com/rikkuness/EspruinoTools into typescript

Author: rikkuness

core/flasher.js

@@ -362,7 +362,7 @@
       console.log("Downloaded "+binary.byteLength+" bytes");
       flashBinaryToDevice(binary, flashOffset, callback, statusCallback);
     });
-  };
+  }
 
 
   function resetDevice(callback) {

core/flasherESP8266.js

@@ -13,7 +13,7 @@
 (function(){
 
   const BLOCK_SIZE = 0x400;
-  var uart;
+  // var uart;
   var uartLine = "";
   var packetHandler;
 
@@ -180,7 +180,7 @@ function unsetupEspruino(options) {
 function cmdSync(options) {
   console.log("Syncing...");
   return new Promise((resolve,reject)=>{
-    var success = false;
+    // var success = false;
     var interval;
     packetHandler = function(d) {
       if (d.cmd==8) {

core/modules.js

@@ -126,20 +126,20 @@
     console.log("loadModule("+fullModuleName+")");
 
     var urls = []; // Array of where to look for this module
-    var modName; // Simple name of the module
+    // var modName; // Simple name of the module
     if(Espruino.Core.Utils.isURL(fullModuleName)) {
-      modName = fullModuleName.substr(fullModuleName.lastIndexOf("/") + 1).split(".")[0];
+      // modName = fullModuleName.substr(fullModuleName.lastIndexOf("/") + 1).split(".")[0];
       urls = [ fullModuleName ];
     } else {
-      modName = fullModuleName;
+      // modName = fullModuleName;
       Espruino.Config.MODULE_URL.split("|").forEach(function (url) {
         url = url.trim();
         if (url.length!=0)
         Espruino.Config.MODULE_EXTENSIONS.split("|").forEach(function (extension) {
           urls.push(url + "/" + fullModuleName + extension);
         })
       });
-    };
+    }
 
     // Recursively go through all the urls
     (function download(urls) {
@@ -234,7 +234,7 @@
         callback(loadedModuleData.join("\n") + "\n" + code);
       });
     }
-  };
+  }
 
 
   Espruino.Core.Modules = {

core/serial.js

@@ -268,20 +268,6 @@ To add a new serial device, you must add an object to
     });
   };
 
-  var str2ab=function(str) {
-    var buf=new ArrayBuffer(str.length);
-    var bufView=new Uint8Array(buf);
-    for (var i=0; i<str.length; i++) {
-      var ch = str.charCodeAt(i);
-      if (ch>=256) {
-        console.warn("serial> Attempted to send non-8 bit character - code "+ch);
-        ch = "?".charCodeAt(0);
-      }
-      bufView[i] = ch;
-    }
-    return buf;
-  };
-
   var closeSerial=function() {
     if (currentDevice) {
       currentDevice.close();

core/serial_chrome_serial.js

@@ -30,7 +30,7 @@ Author: Gordon Williams ([email protected])
   }
 
   var connectionInfo;
-  var connectedPort; // unused?
+  // var connectedPort; // unused?
   var connectionDisconnectCallback;
   var connectionReadCallback;
 
@@ -65,7 +65,7 @@ Author: Gordon Williams ([email protected])
           openCallback(undefined);
         } else {
           connectionInfo = cInfo;
-          connectedPort = serialPort;
+          // connectedPort = serialPort;
           console.log(cInfo);
           openCallback(cInfo);
         }

core/serial_web_serial.js

@@ -109,9 +109,11 @@
         flowControl: "none",
         rtscts: false });
     }).then(function () {
+      var getReaderSuccess = false;
       function readLoop() {
         serialPortReader = serialPort.readable.getReader();
         serialPortReader.read().then(function ({ value, done }) {
+          getReaderSuccess = true;
           serialPortReader.releaseLock();
           serialPortReader = undefined;
           if (value) {
@@ -130,8 +132,19 @@
             readLoop();
           }
         }).catch(function(e) {
-          serialPortReader.releaseLock();
-          console.log("Serial> serialPortReader rejected", e);
+          if (getReaderSuccess == false && e == "BreakError: Break received") {
+            // This fixes a longstanding issue (since 2017) that affected ESP32 devices.
+            // Espruino Web IDE, sometimes did not connect to an ESP32 device, especially the first time you tried. 
+            // The workaround was to use another tool to connect to the ESP32, like minicom or cutecom
+            // and once connected using one of these tools, you tried again using Espruino Web IDE.
+            console.log("Condition break received and ignored");
+            console.log("Retrying the read loop...");
+            getReaderSuccess = true;
+            readLoop();
+          } else {
+            serialPortReader.releaseLock();
+            console.log("Serial> serialPortReader rejected", e);
+          }
         });
       }
       serialPort.addEventListener("disconnect", (event) => {

core/terminal.js

@@ -334,7 +334,7 @@
       callback(data);
     });
 
-  };
+  }
 
   /* check for any terminal-inline-image and if they are still BMP
   then convert them to PNG using canvas */
@@ -429,7 +429,7 @@
       if (i in elements)
         elements[i].remove();
     // now write this to the screen
-    var t = [];
+    // var t = [];
     for (var y in termText) {
       var line = termText[y];
       if (y == termCursorY) {
@@ -484,7 +484,7 @@
       var x = Math.min(pos.left, terminal.offsetWidth);
       var y = Math.min(pos.top-tPos.top, terminal.height-terminalfocus.offsetHeight);
       terminalfocus.style.left=x+"px";
-      terminalfocus.style.top=(pos.top-tPos.top)+"px";
+      terminalfocus.style.top=y+"px";
     }
   };
 
@@ -494,8 +494,6 @@
     return str.substr(0,s+1);
   }
 
-
-
   var handleReceivedCharacter = function (/*char*/ch) {
     function isUTF8StartChar(ch) {
       return (ch>=0xC2) && (ch<=0xF4);
@@ -611,7 +609,7 @@
     var old = onInputData;
     onInputData = callback;
     return old;
-  };
+  }
 
   /// Called when data comes OUT of Espruino INTO the terminal
   function outputDataHandler(readData) {
@@ -631,7 +629,7 @@
         displayData = [];
         displayTimeout = null;
       }, 50);
-  };
+  }
 
   var receivedData = "";
   function searchData(bytes){
@@ -659,36 +657,36 @@
     });
     // Ensure that data from Espruino goes to this terminal
     Espruino.Core.Serial.startListening(Espruino.Core.Terminal.outputDataHandler);
-  };
+  }
 
   /// Get the current terminal line that we're on
   function getCurrentLine() {
     return termText.length-1;
-  };
+  }
 
   /// Set extra text to display before a certain terminal line
   function setExtraText(line, text) {
     if (termExtraText[line] != text) {
       termExtraText[line] = text;
       updateTerminal();
     }
-  };
+  }
 
   /// Clear all extra text that is to be displayed
   function clearExtraText() {
     termExtraText = {};
     updateTerminal();
-  };
+  }
 
   /// Does the terminal have focus?
   function hasFocus() {
     return document.querySelector("#terminal").classList.contains("focus");
-  };
+  }
 
   /// Give the terminal focus
   function focus() {
     document.getElementById("terminalfocus").focus();
-  };
+  }
 
   // Is the terminal actually visible, or is it so small it can't be seen?
   function isVisible() {
@@ -711,15 +709,15 @@
     while (line < termText.length && termText[line].substr(0,1)==":")
       text += "\n"+termText[line++].substr(1);
     return { line : startLine, text : text };
-  };
+  }
 
   /** Get the Nth from latest line of text in the terminal (unlike getInputLine) */
   function getTerminalLine(n) {
     if (n===undefined) n=0;
     var line = termText.length-(1+n);
     if (line<0) return undefined;
     return termText[line];
-  };
+  }
 
   /** Add a notification to the terminal (as HTML). If options.buttonclick is set
   then the first <button> inside the notification text

core/utils.js

@@ -19,14 +19,6 @@
 
   }
 
-  function decodeBase64(d) {
-    return Buffer.from(d,'base64').toString('binary');
-  }
-
-  function encodeBase64(d) {
-    return Buffer.from(d,'binary').toString('base64');
-  }
-
   function isWindows() {
     return (typeof navigator!="undefined") && navigator.userAgent.indexOf("Windows")>=0;
   }
@@ -244,7 +236,7 @@
             if (ch=="\\") { // handle escape characters
               nextCh();
               var escape = '\\'+ch;
-              var escapeExtra = 0;
+              // var escapeExtra = 0;
               if (ch=="x") {
                 nextCh();escape += ch;
                 nextCh();escape += ch;
@@ -268,7 +260,7 @@
               value += ch;
             }
             nextCh();
-          };
+          }
           if (ch!==undefined) s+=ch;
           nextCh();
         }
@@ -907,10 +899,10 @@ while (d!==undefined) {console.log(btoa(d));d=f.read(${CHUNKSIZE});}
   }
 
   /**
-   * @param {string} str
+   * @param {string} dv
    * @returns {ArrayBuffer}
    */
-  function dataViewToArrayBuffer(str) {
+  function dataViewToArrayBuffer(dv) {
     var bufView = new Uint8Array(dv.byteLength);
     for (var i = 0; i < bufView.length; i++) {
       bufView[i] = dv.getUint8(i);

plugins/assembler.js

@@ -480,7 +480,7 @@
              code;
     }
     callback(code);
-  };
+  }
 
 
   Espruino.Plugins.Assembler = {

plugins/compiler.js

@@ -49,28 +49,33 @@
     });
   }
 
-  /* Replace this node with the given text, and
-  update node start/end positions of other nodes
-  we're interested in */
-  function replaceNode(node, newCode) {
-    code = code.substr(0,node.start) + newCode + code.substr(node.end);
-    var offs = newCode.length - (node.end-node.start); // offset for future code snippets
-    for (var i in tasks)
-      if (tasks[i].node.start > node.start) {
-        tasks[i].node.start += offs;
-        tasks[i].node.end += offs;
-      }
-  }
-
+  /** Given a string containing code, this parses it using acorn
+   * then attempts to find functions with the string "compiled"
+   * in them and sends them off to the compiler.
+   */
   function compileCode(code, description, callback) {
+    var tasks = [];
+
+    /* Replace this node with the given text, and
+    update node start/end positions of other nodes
+    we're interested in */
+    function replaceNode(node, newCode) {
+      code = code.substr(0,node.start) + newCode + code.substr(node.end);
+      var offs = newCode.length - (node.end-node.start); // offset for future code snippets
+      for (var i in tasks)
+        if (tasks[i].node.start > node.start) {
+          tasks[i].node.start += offs;
+          tasks[i].node.end += offs;
+        }
+    }
+
     if (!Espruino.Config.COMPILATION)
       return callback(code);
 
     var board = Espruino.Core.Env.getBoardData();
-    var tasks = 0;
     try {
-      var ast = acorn.parse(code);
-      var tasks = [];
+      var ast = acorn.parse(code, {ecmaVersion: 2020});
+      tasks = [];
       // function xyz() { "compiled" ... }
       ast.body.forEach(function(node) {
         if (node.type=="FunctionDeclaration") {