Package Updates + Detect safe mode and notify when restarting

.github/workflows/build.yaml

@@ -9,7 +9,7 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-node@v6
         with:
           node-version: 22

.github/workflows/publish.yaml

@@ -27,7 +27,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-node@v6
         with:
           node-version: 22

index.html

@@ -186,6 +186,13 @@
             <button id="usb-workflow" class="purple-button files-button" value="usb">USB<i class="fa-brands fa-usb"></i></button>
         </div>
     </div>
+    <div class="popup-modal shadow prompt closable" data-popup-modal="ok-cancel">
+        <div id="message"></div>
+        <div class="buttons centered">
+            <button class="purple-button ok-button" value="ok">OK</button>
+            <button class="purple-button cancel-button" value="cancel">Cancel</button>
+        </div>
+    </div>
     <div class="popup-modal shadow prompt closable" data-popup-modal="message">
         <div id="message"></div>
         <div class="buttons centered">

js/common/file_dialog.js

@@ -291,8 +291,9 @@ class FileDialog extends GenericModal {
         } else if (clickedItem.getAttribute("data-type") != "folder") {
             this._getElement('fileNameField').value = clickedItem.querySelector("span").innerHTML;
         }
-
-        this._lastSelectedNode = clickedItem;
+        if (this._lastSelectedNode == null || !modifierKeys.includes(MODIFIER_SHIFT)) {
+            this._lastSelectedNode = clickedItem;
+        }
         this._setElementEnabled('okButton', !this._multipleItemsSelected() && clickedItem.getAttribute("data-type") != "bin");
         this._updateToolbar();
     }

js/common/utilities.js

@@ -53,7 +53,7 @@ function isIp() {
 
 // Check if the current url is a Web Workflow, IP, or Test Address and current path is /code/
 function isLocal() {
-    return (isMdns() || location.hostname == "localhost" || isIp()) && (location.pathname == "/code/");
+    return location.hostname == "localhost" || ((isMdns() || isIp()) && location.pathname == "/code/");
 }
 
 // Test to see if browser is running on Microsoft Windows OS
@@ -67,7 +67,7 @@ function isMicrosoftWindows() {
     return false;
 }
 
-// Test to see if browser is running on Microsoft Windows OS
+// Test to see if browser is running on Chrome OS
 function isChromeOs() {
     if (navigator.userAgent.includes("CrOS")) {
         return true;

js/script.js

@@ -229,6 +229,7 @@ async function checkConnected() {
             await workflow.showInfo(getDocState());
         }
     }
+
     return true;
 }
 
@@ -491,7 +492,7 @@ async function saveFileContents(path) {
         if (currentTimeout != null) {
             clearTimeout(currentTimeout);
         }
-        currentTimeout = setTimeout(saveFileContents, 2000);
+        currentTimeout = setTimeout(await saveFileContents(path), 2000);
     }
 }
 
@@ -621,7 +622,6 @@ document.addEventListener('DOMContentLoaded', async (event) => {
             }
         }
     } else {
-        //await showMessage("USB Workflow is currently experiencing issues. See <a href=\"https://github.com/circuitpython/web-editor/issues/203\">GitHub issue #203</a> for more details. Please use Web Workflow.");
         await checkConnected();
     }
 });

js/workflows/workflow.js

@@ -1,7 +1,8 @@
 import {REPL} from '@adafruit/circuitpython-repl-js';
+//import {REPL} from '../../../circuitpython-repl-js/repl.js';
 
 import {FileHelper} from '../common/file.js';
-import {UnsavedDialog} from '../common/dialogs.js';
+import {ButtonValueDialog, UnsavedDialog} from '../common/dialogs.js';
 import {FileDialog, FILE_DIALOG_OPEN, FILE_DIALOG_SAVE} from '../common/file_dialog.js';
 import {CONNTYPE, CONNSTATE} from '../constants.js';
 import {plotValues} from '../common/plotter.js'
@@ -42,6 +43,7 @@ class Workflow {
         this.disconnectCallback = null;
         this.loadEditor = null;
         this.connectDialog = null;
+        this._okCancelDialog = new ButtonValueDialog("ok-cancel");
         this._connected = false;
         this.currentFilename = null;
         this.fileHelper = null;
@@ -91,9 +93,27 @@ class Workflow {
     }
 
     async restartDevice() {
+        if (await this.safeMode()) {
+            let result = await this._okCancelDialog.open("Device is currently in safe mode. Reboot device?");
+            if (result === "ok") {
+                console.log("Rebooting device from safe mode");
+                await this.rebootDevice();
+            }
+        }
         await this.repl.softRestart();
     }
 
+    async rebootDevice() {
+        let code = `
+try:
+    import microcontroller
+    microcontroller.reset()
+except ImportError:
+    pass
+`;
+        await this.showBusy(this.repl.runCode(code));
+    }
+
     async haltScript() {
         await this.repl.interruptCode();
     }
@@ -311,6 +331,20 @@ class Workflow {
         return false;
     }
 
+    async safeMode() {
+        let code = `
+try:
+    import supervisor
+    print(supervisor.runtime.safe_mode_reason is not supervisor.SafeModeReason.NONE)
+except ImportError:
+    print(False)
+`;
+        let result = await this.showBusy(this.repl.runCode(code));
+        let isSafeMode = result.match("True") != null;
+
+        return isSafeMode;
+    }
+
     async parseParams() {
         return true;
     }