pxt-common-packages 9.3.8 → 9.3.12

package/libs/wifi---esp32/controller.ts

@@ -50,13 +50,12 @@ namespace net {
 
         public connectAP(ssid: string, pass: string) {
             control.dmesg(`connecting to [${ssid}]...`)
+            this._ssid = ssid
             const res = _wifi.connect(ssid, pass)
             if (res != 0)
                 return false
             pauseUntil(() => this.isConnected, 15000)
             control.dmesg(`${this.isConnected ? "" : "not "}connected to [${ssid}]`)
-            if (this.isConnected)
-                this._ssid = ssid
             return this.isConnected
         }
 
@@ -108,7 +107,7 @@ namespace net {
         get isIdle(): boolean { return true; }
         get MACaddress(): Buffer { return control.deviceLongSerialNumber().slice(1, 6); }
         get IPaddress(): Buffer { return this.isConnected ? _wifi.ipInfo().slice(0, 4) : undefined; }
-        get ssid(): string { return this._ssid }
+        get ssid(): string { return this.isConnected ? this._ssid : "" }
         get rssi(): number { return _wifi.rssi() }
         public ping(dest: string, ttl: number = 250): number { return -1; }
 

package/libs/wifi---esp32/socket.cpp

@@ -273,7 +273,6 @@ static void worker_close(socket_t *sock) {
         esp_tls_conn_destroy(sock->ssl);
         sock->ssl = NULL;
     }
-    free(sock);
 }
 
 /** Close the socket if open */
@@ -282,7 +281,10 @@ int socketClose(int fd) {
     GET_SOCK();
     sockets[fd] = NULL;
     worker_run(worker, (TaskFunction_t)worker_close, sock);
-    // don't wait for the actual close
+    // wait for the actual close - we only really have memory for one open SSL socket...
+    while (sock->ssl)
+        vTaskDelay(5);
+    free(sock);
     return 0;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-common-packages",
-  "version": "9.3.8",
+  "version": "9.3.12",
   "description": "Microsoft MakeCode (PXT) common packages",
   "keywords": [
     "MakeCode",