Merge pull request #63 from paulober/develop

v3.0.2 Patch

CHANGELOG.md

@@ -7,10 +7,18 @@ All notable changes to the "pico-w-go" extension will be documented in this file
 ## Known issues
 - Run current file does not include modules that are localy imported and in current workspace, unless you upload the python file containing the module via the upload file or project feature first. (since ever)
 - Mounting virtual workspace causes existing vREPLs to freeze so they need to be disposed manually for some reason. (maybe cauaused by vscode)
-- `autoConnect` is currently not working
 
 ---
 
+## [3.0.2] - 2023-04-11
+
+# Added
+- AutoConnect feature, the extension now detects disconnects and auto reconnects
+
+# Changed
+- Fixed `globalSettings` command
+- Python detection now has a 1sec timeout
+
 ## [3.0.1] - 2023-04-11
 
 # Changed

package.json

@@ -2,7 +2,7 @@
   "name": "pico-w-go",
   "displayName": "Pico-W-Go",
   "description": "Autocompletion, remote Workspace and a REPL console for the Raspberry Pi Pico (W).",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "publisher": "paulober",
   "license": "MPL-2.0",
   "homepage": "https://github.com/paulober/Pico-W-Go/blob/main/README.md",
@@ -424,7 +424,7 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@paulober/pyboard-serial-com": "^1.4.19",
+    "@paulober/pyboard-serial-com": "^1.4.22",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
     "uuid": "^9.0.0"

src/activator.mts

@@ -39,6 +39,9 @@ export default class Activator {
   private stubs?: Stubs;
   private picoFs?: PicoWFs;
 
+  private autoConnectTimer?: NodeJS.Timer;
+  private comDevice?: string;
+
   constructor() {
     this.logger = new Logger("Activator");
   }
@@ -110,10 +113,10 @@ export default class Activator {
     this.stubs = new Stubs();
     await this.stubs.update();
 
-    let comDevice = await settings.getComDevice();
+    this.comDevice = await settings.getComDevice();
 
-    if (comDevice === undefined || comDevice === "") {
-      comDevice = undefined;
+    if (this.comDevice === undefined || this.comDevice == "") {
+      this.comDevice = undefined;
 
       vscode.window
         .showErrorMessage(
@@ -131,12 +134,14 @@ export default class Activator {
     this.ui.init();
 
     this.pyb = new PyboardRunner(
-      comDevice ?? "default",
+      this.comDevice ?? "default",
       this.pyboardOnError.bind(this),
       this.pyboardOnExit.bind(this),
       pyCommand
     );
 
+    this.setupAutoConnect(settings);
+
     const terminal = new Terminal(async () => {
       if (this.pyb?.isPipeConnected()) {
         const result = await this.pyb?.executeCommand(
@@ -239,7 +244,7 @@ export default class Activator {
 
     if (
       settings.getBoolean(SettingsKey.openOnStart) &&
-      comDevice !== undefined
+      this.comDevice !== undefined
     ) {
       await focusTerminal(terminalOptions);
     }
@@ -273,10 +278,11 @@ export default class Activator {
     disposable = vscode.commands.registerCommand(
       "picowgo.connect",
       async () => {
-        comDevice = await settings.getComDevice();
-        if (comDevice !== undefined) {
+        this.comDevice = await settings.getComDevice();
+        if (this.comDevice !== undefined) {
           await this.ui?.init();
-          this.pyb?.switchDevice(comDevice);
+          this.pyb?.switchDevice(this.comDevice);
+          this.setupAutoConnect(settings);
         }
       }
     );
@@ -286,6 +292,7 @@ export default class Activator {
     disposable = vscode.commands.registerCommand(
       "picowgo.disconnect",
       async () => {
+        clearInterval(this.autoConnectTimer);
         await this.pyb?.disconnect();
       }
     );
@@ -317,7 +324,8 @@ export default class Activator {
       const data = await this.pyb.runFile(file, (data: string) => {
         // only freeze after operation has started
         if (!frozen) {
-          terminal?.freeze();
+          commandExecuting = true;
+          terminal?.clean(true);
           terminal?.write("\r\n");
           this.ui?.userOperationStarted();
           frozen = true;
@@ -329,6 +337,7 @@ export default class Activator {
         const result = data as PyOutCommandResult;
         // TODO: reflect result.result somehow
       }
+      commandExecuting = false;
       terminal?.melt();
       terminal?.write("\r\n");
       terminal?.prompt();
@@ -362,7 +371,8 @@ export default class Activator {
           (data: string) => {
             // only freeze after operation has started
             if (!frozen) {
-              terminal?.freeze();
+              commandExecuting = true;
+              terminal?.clean(true);
               terminal?.write("\r\n");
               this.ui?.userOperationStarted();
               frozen = true;
@@ -372,6 +382,7 @@ export default class Activator {
           true
         );
         this.ui?.userOperationStopped();
+        commandExecuting = false;
         terminal?.melt();
         terminal?.write("\r\n");
         terminal?.prompt();
@@ -401,7 +412,8 @@ export default class Activator {
             (data: string) => {
               // only freeze after operation has started
               if (!frozen) {
-                terminal?.freeze();
+                commandExecuting = true;
+                terminal?.clean(true);
                 terminal?.write("\r\n");
                 this.ui?.userOperationStarted();
                 frozen = true;
@@ -410,6 +422,7 @@ export default class Activator {
             },
             true
           );
+          commandExecuting = false;
           this.ui?.userOperationStopped();
           if (data.type === PyOutType.commandResult) {
             const result = data as PyOutCommandResult;
@@ -627,7 +640,7 @@ export default class Activator {
 
     // [Command] Global settings
     disposable = vscode.commands.registerCommand(
-      "picowgo.globalsettings",
+      "picowgo.globalSettings",
       async () => {
         openSettings();
       }
@@ -639,14 +652,16 @@ export default class Activator {
       "picowgo.toggleConnect",
       async () => {
         if (this.pyb?.isPipeConnected()) {
+          clearInterval(this.autoConnectTimer);
           await this.pyb?.disconnect();
         } else {
-          comDevice = await settings.getComDevice();
-          if (comDevice === undefined) {
+          this.comDevice = await settings.getComDevice();
+          if (this.comDevice == undefined) {
             vscode.window.showErrorMessage("No COM device found!");
           } else {
             await this.ui?.init();
-            this.pyb?.switchDevice(comDevice);
+            this.pyb?.switchDevice(this.comDevice);
+            this.setupAutoConnect(settings);
           }
         }
       }
@@ -772,8 +787,8 @@ export default class Activator {
         });
 
         if (port !== undefined) {
-          comDevice = port;
-          this.pyb?.switchDevice(comDevice);
+          this.comDevice = port;
+          this.pyb?.switchDevice(this.comDevice);
         }
       }
     );
@@ -856,14 +871,54 @@ export default class Activator {
     return this.ui;
   }
 
+  private setupAutoConnect(settings: Settings): void {
+    this.autoConnectTimer = setInterval(async () => {
+      await this.pyb?.checkStatus();
+      if (this.pyb?.isPipeConnected()) {
+        this.ui?.refreshState(true);
+        return;
+      }
+      this.ui?.refreshState(false);
+      const autoPort = settings.getBoolean(SettingsKey.autoConnect);
+
+      const ports = await PyboardRunner.getPorts(settings.pythonExecutable);
+      if (ports.ports.length === 0) {
+        return;
+      }
+
+      // try to connect to previously connected device first
+      if (this.comDevice && ports.ports.includes(this.comDevice)) {
+        // try to reconnect
+        this.pyb?.switchDevice(this.comDevice);
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        if (this.pyb?.isPipeConnected()) {
+          return;
+        }
+      }
+
+      if (autoPort) {
+        const port = ports.ports[0];
+        this.comDevice = port;
+        this.pyb?.switchDevice(port);
+      }
+    }, 2500);
+  }
+
   private pyboardOnError(data: Buffer | undefined) {
-    if (data === undefined) {
-      this.ui?.refreshState(true);
-      this.logger.info("Connection to Pico successfully established");
+    if (
+      data === undefined &&
+      this.comDevice !== undefined &&
+      this.comDevice !== "" &&
+      this.comDevice !== "default"
+    ) {
+      //this.ui?.refreshState(true);
+      this.logger.info("Connection to wrapper successfully established");
 
       return;
     } else {
-      vscode.window.showErrorMessage(data.toString("utf-8"));
+      if (data) {
+        vscode.window.showErrorMessage(data.toString("utf-8"));
+      }
     }
   }
 

src/osHelper.mts

@@ -19,15 +19,19 @@ export async function getPythonCommand(): Promise<string | undefined> {
   const pythonCommand: string | undefined = pythonCommands[currentPlatform];
 
   return new Promise(resolve => {
-    exec(`${pythonCommand} --version`, (error, stdout, stderr) => {
-      if (error) {
-        console.error(`Error executing ${pythonCommand}: ${error.message}`);
-        resolve(undefined);
-      } else {
-        console.debug(`Python version: ${stdout || stderr}`);
-        resolve(pythonCommand);
+    exec(
+      `${pythonCommand} --version`,
+      { timeout: 1000 },
+      (error, stdout, stderr) => {
+        if (error) {
+          console.error(`Error executing ${pythonCommand}: ${error.message}`);
+          resolve(undefined);
+        } else {
+          console.debug(`Python version: ${stdout || stderr}`);
+          resolve(pythonCommand);
+        }
       }
-    });
+    );
   });
 }
 

src/terminal.mts

@@ -58,11 +58,16 @@ export class Terminal implements Pseudoterminal {
   public freeze(): void {
     this.isForzen = true;
 
+    this.clean(false);
+  }
+
+  public clean(waitingForPrompt?: boolean): void {
+    this.waitingForPrompt! != waitingForPrompt;
+
     // TODO: maybe restore current state
     this.buffer = "";
     this.multilineMode = false;
     this.indentation = 0;
-    this.waitingForPrompt = false;
     this.xCursor = 0;
   }
 

src/ui.mts

@@ -81,6 +81,7 @@ export default class UI {
 
   private setButton(name: string, icon: string, text: string): void {
     this.items[name].text = `$(${icon}) ${text}`;
+    this.items[name].show();
   }
 
   private setState(connected: boolean): void {