fix: reuse existing simdeck services

Author: DjDeveloperr

packages/vscode-extension/README.md

@@ -1,6 +1,6 @@
 # SimDeck VS Code Extension
 
-This extension opens the local SimDeck browser client inside a VS Code webview panel. It starts or reuses the project daemon through `simdeck ui`.
+This extension opens the local SimDeck browser client inside a VS Code webview panel. It uses the configured server URL when available, falls back to the default always-on service at `http://127.0.0.1:4310`, and starts or reuses a project daemon through `simdeck ui` only when needed.
 
 ## Commands
 

packages/vscode-extension/extension.js

@@ -8,6 +8,8 @@ const { spawn } = require("node:child_process");
 let outputChannel;
 let simulatorPanel;
 
+const DEFAULT_SERVICE_URL = "http://127.0.0.1:4310";
+
 function activate(context) {
   outputChannel = vscode.window.createOutputChannel("SimDeck");
 
@@ -49,17 +51,39 @@ async function resolveSimulatorUrl(context) {
     return serverUrl;
   }
 
+  const serviceUrl = await resolveExistingServiceUrl(serverUrl);
+  if (serviceUrl) {
+    outputChannel.appendLine(`Using existing SimDeck service at ${serviceUrl}`);
+    return serviceUrl;
+  }
+
   const config = vscode.workspace.getConfiguration("simdeck");
   const autoStart = getAutoStartDaemon(config);
   if (!autoStart) {
     throw new Error(
-      `SimDeck is not reachable at ${serverUrl}. Enable auto-start or launch the daemon manually.`,
+      `SimDeck is not reachable at ${serverUrl} or ${DEFAULT_SERVICE_URL}. Enable auto-start or launch the daemon manually.`,
     );
   }
 
   return await startProjectDaemon(context);
 }
 
+async function resolveExistingServiceUrl(preferredUrl) {
+  for (const serviceUrl of serviceUrlCandidates(preferredUrl)) {
+    if (await isServerHealthy(serviceUrl)) {
+      return serviceUrl;
+    }
+  }
+  return "";
+}
+
+function serviceUrlCandidates(preferredUrl) {
+  if (sameOrigin(preferredUrl, DEFAULT_SERVICE_URL)) {
+    return [];
+  }
+  return [DEFAULT_SERVICE_URL];
+}
+
 function getAutoStartDaemon(config) {
   const daemonSetting = config.inspect("autoStartDaemon");
   if (
@@ -300,6 +324,14 @@ function getOrigin(value) {
   return `${url.protocol}//${url.host}`;
 }
 
+function sameOrigin(left, right) {
+  try {
+    return getOrigin(left) === getOrigin(right);
+  } catch {
+    return false;
+  }
+}
+
 function escapeHtml(value) {
   return value
     .replaceAll("&", "&")

packages/vscode-extension/package.json

@@ -44,7 +44,7 @@
         "simdeck.serverUrl": {
           "type": "string",
           "default": "http://127.0.0.1:4310",
-          "description": "Preferred URL loaded inside the simulator webview. If auto-start launches a daemon on a different port, the extension uses the daemon URL returned by the CLI."
+          "description": "Preferred URL loaded inside the simulator webview. If this URL is not reachable, the extension tries the default always-on service URL before auto-starting a project daemon."
         },
         "simdeck.cliPath": {
           "type": "string",
@@ -66,7 +66,7 @@
         "simdeck.autoStartDaemon": {
           "type": "boolean",
           "default": true,
-          "description": "Start or reuse the project daemon with `simdeck ui` when opening the simulator view if the preferred URL is not already reachable."
+          "description": "Start or reuse a daemon with `simdeck ui` when opening the simulator view if neither the preferred URL nor the default service URL is already reachable."
         },
         "simdeck.autoStartServer": {
           "type": "boolean",

server/src/service.rs

@@ -9,6 +9,8 @@ use std::time::{Duration, Instant};
 
 const SERVICE_LABEL: &str = "org.nativescript.simdeck";
 const LEGACY_SERVICE_LABELS: &[&str] = &["dev.nativescript.simdeck"];
+const SERVICE_SHUTDOWN_GRACE: Duration = Duration::from_millis(750);
+const SERVICE_KILL_GRACE: Duration = Duration::from_millis(500);
 
 #[derive(Clone, Debug)]
 pub struct ServiceInstallResult {
@@ -25,6 +27,9 @@ pub struct ServiceInstallResult {
 
 pub fn enable(mut options: ServiceOptions) -> anyhow::Result<()> {
     preserve_or_create_credentials(&mut options);
+    if let Some(result) = reuse_running_service_if_matching(&options)? {
+        return print_install_result(&result);
+    }
     let result = install(options)?;
     print_install_result(&result)
 }
@@ -257,7 +262,9 @@ fn reuse_running_service_if_matching(
         Some(path) => path.clone(),
         None => default_client_root()?,
     };
-    if !service_options_match_arguments(&arguments, options, &client_root) {
+    if enable_action_for_installed_arguments(Some(&arguments), options, &client_root)
+        != ServiceEnableAction::Reuse
+    {
         return Ok(None);
     }
     let plist_path = plist_path()?;
@@ -275,6 +282,25 @@ fn reuse_running_service_if_matching(
     }))
 }
 
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+enum ServiceEnableAction {
+    Reuse,
+    Install,
+}
+
+fn enable_action_for_installed_arguments(
+    arguments: Option<&[String]>,
+    options: &ServiceOptions,
+    client_root: &Path,
+) -> ServiceEnableAction {
+    match arguments {
+        Some(arguments) if service_options_match_arguments(arguments, options, client_root) => {
+            ServiceEnableAction::Reuse
+        }
+        _ => ServiceEnableAction::Install,
+    }
+}
+
 fn service_options_match_arguments(
     arguments: &[String],
     options: &ServiceOptions,
@@ -418,7 +444,7 @@ fn unload_existing_services(domain: &str) -> anyhow::Result<()> {
                 .output();
         }
         if let Some(pid) = old_pid {
-            terminate_process_group(pid, Duration::from_secs(5));
+            terminate_process_group(pid, SERVICE_SHUTDOWN_GRACE);
         }
     }
     Ok(())
@@ -470,7 +496,7 @@ fn terminate_process_group(pid: u32, timeout: Duration) {
     }
     signal_process_group(pid, "KILL");
     signal_process(pid, "KILL");
-    let _ = wait_for_process_exit(pid, Duration::from_secs(2));
+    let _ = wait_for_process_exit(pid, SERVICE_KILL_GRACE);
 }
 
 fn signal_process(pid: u32, signal: &str) {
@@ -801,4 +827,27 @@ mod tests {
             Path::new("/tmp/client")
         ));
     }
+
+    #[test]
+    fn enable_action_reuses_matching_installed_service() {
+        let mut options = service_options_for_test();
+        options.access_token = Some("token".to_owned());
+        options.pairing_code = Some("123456".to_owned());
+        let arguments = service_arguments_for_test(&options);
+
+        assert_eq!(
+            enable_action_for_installed_arguments(
+                Some(&arguments),
+                &options,
+                Path::new("/tmp/client")
+            ),
+            ServiceEnableAction::Reuse
+        );
+    }
+
+    #[test]
+    fn service_shutdown_grace_period_stays_short() {
+        assert!(SERVICE_SHUTDOWN_GRACE <= Duration::from_secs(1));
+        assert!(SERVICE_KILL_GRACE <= Duration::from_secs(1));
+    }
 }