chore: some code cleanup

Author: marcelkottmann

components/esp32-javascript/modules/esp32-javascript/global.js

@@ -21,4 +21,5 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
+// make `global` available for compatibility reasons. For new features use globalThis instead.
 globalThis.global = globalThis;

components/esp32-javascript/modules/esp32-javascript/global.ts

@@ -24,4 +24,5 @@ SOFTWARE.
 
 /* eslint-disable no-var */
 declare var global: any;
-(globalThis as any).global = globalThis;
+// make `global` available for compatibility reasons. For new features use globalThis instead.
+(globalThis as any).global = globalThis;

components/esp32-javascript/modules/esp32-js-eventloop/index.js

@@ -125,18 +125,16 @@ function el_select_next() {
 function start() {
     var nextfuncs = [main];
     for (;;) {
-        if (Array.isArray(nextfuncs)) {
-            nextfuncs.forEach(function (nf) {
-                if (typeof nf === "function") {
-                    try {
-                        nf();
-                    }
-                    catch (error) {
-                        internalErrorHandler(error);
-                    }
+        nextfuncs.forEach(function (nf) {
+            if (typeof nf === "function") {
+                try {
+                    nf();
                 }
-            });
-        }
+                catch (error) {
+                    internalErrorHandler(error);
+                }
+            }
+        });
         nextfuncs = el_select_next();
     }
 }

components/esp32-javascript/modules/esp32-js-eventloop/index.ts

@@ -175,17 +175,15 @@ function el_select_next() {
 export function start(): void {
   let nextfuncs: (() => void)[] = [main];
   for (;;) {
-    if (Array.isArray(nextfuncs)) {
-      nextfuncs.forEach(function (nf) {
-        if (typeof nf === "function") {
-          try {
-            nf();
-          } catch (error) {
-            internalErrorHandler(error);
-          }
+    nextfuncs.forEach(function (nf) {
+      if (typeof nf === "function") {
+        try {
+          nf();
+        } catch (error) {
+          internalErrorHandler(error);
         }
-      });
-    }
+      }
+    });
     nextfuncs = el_select_next();
   }
 }

components/socket-events/modules/socket-events/index.js

@@ -158,7 +158,9 @@ var Socket = /** @class */ (function () {
         this.clearReadTimeoutTimer();
         if (this.readTimeout > 0) {
             this.readTimeoutHandle = setTimeout(function () {
-                console.debug("Close socket because of read timeout.");
+                if (console.isDebug) {
+                    console.debug("Close socket because of read timeout.");
+                }
                 closeSocket(_this);
             }, this.readTimeout);
         }

components/socket-events/modules/socket-events/index.ts

@@ -188,7 +188,9 @@ class Socket implements Esp32JsSocket {
     this.clearReadTimeoutTimer();
     if (this.readTimeout > 0) {
       this.readTimeoutHandle = setTimeout(() => {
-        console.debug("Close socket because of read timeout.");
+        if (console.isDebug) {
+          console.debug("Close socket because of read timeout.");
+        }
         closeSocket(this);
       }, this.readTimeout);
     }

components/socket-events/socket-events.c

@@ -238,9 +238,7 @@ void select_task_it()
         if (dataAvailable > 0)
         {
             char msg[dataAvailable];
-            struct sockaddr_in remaddr;
-            socklen_t addrlen = sizeof(remaddr);
-            if (recvfrom(selectServerSocket, msg, dataAvailable, 0, (struct sockaddr *)&remaddr, &addrlen) < 0)
+            if (recv(selectServerSocket, msg, dataAvailable, 0) < 0)
             {
                 jslog(ERROR, "READ self-socket FAILED: %d", errno);
             }

components/socket-events/tcp.c

@@ -37,13 +37,37 @@ SOFTWARE.
 #include "esp32-js-log.h"
 #include "esp32-javascript.h"
 
-#define BUFSIZE 1024
 #define LISTEN_BACKLOG 50
 
+int setNonBlocking(int sockfd)
+{
+    int opt = 1;
+    int ret = lwip_ioctl(sockfd, FIONBIO, &opt);
+
+    if (ret >= 0)
+    {
+        struct timeval tv;
+        tv.tv_sec = 0;
+        tv.tv_usec = 1;
+
+        if (lwip_setsockopt(sockfd,
+                            SOL_SOCKET,
+                            SO_RCVTIMEO,
+                            &tv,
+                            sizeof(struct timeval)) < 0)
+        {
+            jslog(ERROR, "Cannot set timeout opt.");
+            return -1;
+        }
+    }
+
+    return ret;
+}
+
 int createNonBlockingSocket(int domain, int type, int protocol, bool nonblocking)
 {
     int sockfd;
-    int opt;
+
     int ret;
 
     /* socket: create the socket */
@@ -56,8 +80,7 @@ int createNonBlockingSocket(int domain, int type, int protocol, bool nonblocking
 
     if (nonblocking)
     {
-        opt = 1;
-        ret = lwip_ioctl(sockfd, FIONBIO, &opt);
+        int ret = setNonBlocking(sockfd);
         if (ret < 0)
         {
             jslog(ERROR, "Cannot set non-blocking opt.");
@@ -78,7 +101,7 @@ int connectNonBlocking(int sockfd, const char *hostname, int portno)
     server = gethostbyname(hostname);
     if (server == NULL)
     {
-        jslog(ERROR, "ERROR, no such host as %s", hostname);
+        jslog(ERROR, "ERROR, no such host %s", hostname);
         return -1;
     }
 
@@ -107,8 +130,7 @@ int acceptIncoming(int sockfd)
         int one = 1;
         setsockopt(cfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
-        int opt = 1;
-        int ret = lwip_ioctl(cfd, FIONBIO, &opt);
+        int ret = setNonBlocking(sockfd);
         if (ret < 0)
         {
             jslog(ERROR, "ERROR while accepting and setting non blocking: %d", errno);
@@ -183,34 +205,16 @@ int writeSocket(int sockfd, const char *msg, int len, SSL *ssl)
 
 int readSocket(int sockfd, char *msg, int len)
 {
-    struct sockaddr_in remaddr;
-    socklen_t addrlen = sizeof(remaddr);
-
     int result = 0;
 
-    int opt = 1;
-    int ret = lwip_ioctl(sockfd, FIONBIO, &opt);
+    int ret = setNonBlocking(sockfd);
     if (ret < 0)
     {
         jslog(ERROR, "Cannot set non-blocking opt.");
         return -1;
     }
 
-    struct timeval tv;
-    tv.tv_sec = 1;
-    tv.tv_usec = 0;
-
-    if (lwip_setsockopt(sockfd,
-                        SOL_SOCKET,
-                        SO_RCVTIMEO,
-                        &tv,
-                        sizeof(struct timeval)) < 0)
-    {
-        jslog(ERROR, "Cannot set timeout opt.");
-        return -1;
-    }
-
-    result = recvfrom(sockfd, msg, len, MSG_DONTWAIT, (struct sockaddr *)&remaddr, &addrlen);
+    result = recv(sockfd, msg, len, MSG_DONTWAIT);
     return result;
 }
 

examples/repl.js

@@ -12,8 +12,8 @@
  * After that you can type every JS expression, which then gets
  * evaluated in esp32-javascript and the result is printed.
  *
- * This is only considered as demo. If you want to use it in production 
- * please change the ssl flag to true, otherwise credentials 
+ * This is only considered as demo. If you want to use it in production
+ * please change the ssl flag to true, otherwise credentials
  * are visible for "persons in the middle".
  */
 var configManager = require("esp32-javascript/config");
@@ -78,7 +78,7 @@ require("socket-events").sockListen(
                   logOutput.push("ERROR|" + msg + "\n");
                 },
               };
-              _ = eval(data);
+              _ = eval.call(globalThis, data);
             } finally {
               console = _console;
             }

sdkconfig.defaults

@@ -665,7 +665,7 @@ CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 CONFIG_LWIP_IRAM_OPTIMIZATION=y
 CONFIG_LWIP_TIMERS_ONDEMAND=y
-CONFIG_LWIP_MAX_SOCKETS=10
+CONFIG_LWIP_MAX_SOCKETS=12
 CONFIG_LWIP_USE_ONLY_LWIP_SELECT=y
 # CONFIG_LWIP_SO_LINGER is not set
 CONFIG_LWIP_SO_REUSE=y