@spotpatch/vite 1.2.0 → 1.2.2

package/dist/index.js

@@ -481,7 +481,7 @@ import path2 from "path";
 // package.json
 var package_default = {
   name: "@spotpatch/vite",
-  version: "1.2.0",
+  version: "1.2.2",
   description: "Vite development plugin for SpotPatch.",
   license: "MIT",
   repository: {
@@ -1818,37 +1818,89 @@ async function handleAgentRequest(request, response, options, route, writeSucces
 }
 
 // src/server/editor.ts
+import { spawn } from "child_process";
 import launchEditor from "launch-editor";
-var EDITOR_STARTUP_GRACE_MS = 150;
-function editorCommand(editor) {
-  if (editor === "vscode") {
-    return "code";
-  }
-  if (editor === "cursor") {
+var EDITOR_STARTUP_GRACE_MS = 300;
+function normalizedEditorEnvironment(environment) {
+  return [
+    environment.TERM_PROGRAM,
+    environment.VSCODE_GIT_ASKPASS_NODE,
+    environment.VSCODE_GIT_ASKPASS_MAIN,
+    environment.GIT_ASKPASS
+  ].filter((value) => typeof value === "string").join("\n").replaceAll("\\", "/").toLowerCase();
+}
+function detectIntegratedEditor(environment) {
+  const signature = normalizedEditorEnvironment(environment);
+  if (signature === "cursor" || signature.includes("/cursor")) {
     return "cursor";
   }
+  if (signature === "vscode" || signature.includes("visual studio code") || /(^|\/)(code|code-insiders)(\.exe)?($|\/)/u.test(signature)) {
+    return "vscode";
+  }
   return void 0;
 }
-var launchConfiguredEditor = (target, editor) => new Promise((resolve, reject) => {
-  let settled = false;
-  const startupTimer = setTimeout(() => {
-    settled = true;
-    resolve();
-  }, EDITOR_STARTUP_GRACE_MS);
-  const rejectStartup = () => {
-    if (settled) {
-      return;
-    }
-    settled = true;
-    clearTimeout(startupTimer);
-    reject(new Error("The configured editor could not be started."));
-  };
-  try {
-    launchEditor(target, editorCommand(editor), rejectStartup);
-  } catch {
-    rejectStartup();
-  }
+function editorCommand(editor) {
+  return editor === "cursor" ? "cursor" : "code";
+}
+var DEFAULT_DEPENDENCIES2 = Object.freeze({
+  environment: process.env,
+  fallbackLauncher: launchEditor,
+  processSpawner: (command, arguments_, options) => spawn(command, [...arguments_], options),
+  startupGraceMs: EDITOR_STARTUP_GRACE_MS
 });
+function createEditorLauncher(dependencies = DEFAULT_DEPENDENCIES2) {
+  return (target, configuredEditor) => {
+    const integratedEditor = detectIntegratedEditor(dependencies.environment);
+    const resolvedEditor = configuredEditor === "auto" ? integratedEditor : configuredEditor;
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      const settle = (error, editor = resolvedEditor ?? "auto") => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        clearTimeout(startupTimer);
+        if (error === void 0) {
+          resolve(editor);
+        } else {
+          reject(error);
+        }
+      };
+      const startupTimer = setTimeout(settle, dependencies.startupGraceMs);
+      const rejectStartup = () => {
+        settle(new Error("The configured editor could not be started."));
+      };
+      try {
+        if (resolvedEditor === void 0) {
+          dependencies.fallbackLauncher(target, void 0, rejectStartup);
+          return;
+        }
+        const child = dependencies.processSpawner(
+          editorCommand(resolvedEditor),
+          ["--goto", target],
+          {
+            env: dependencies.environment,
+            stdio: "ignore",
+            windowsHide: true
+          }
+        );
+        child.once("error", rejectStartup);
+        child.once("exit", (code, signal) => {
+          if (code === 0) {
+            settle(void 0, resolvedEditor);
+            return;
+          }
+          if (code !== null || signal !== null) {
+            rejectStartup();
+          }
+        });
+      } catch {
+        rejectStartup();
+      }
+    });
+  };
+}
+var launchConfiguredEditor = createEditorLauncher();
 
 // src/server/request-security.ts
 import { timingSafeEqual } from "crypto";
@@ -2031,7 +2083,8 @@ async function handleOpenEditor(request, options) {
   const target = `${sourcePath}:${String(body.line)}:${String(body.column)}`;
   const editorLauncher = options.editorLauncher ?? launchConfiguredEditor;
   try {
-    await editorLauncher(target, options.options.editor);
+    const editor = await editorLauncher(target, options.options.editor);
+    return Object.freeze({ editor });
   } catch (error) {
     options.logger?.warn(
       `[spotpatch:server] ${options.options.editor === "auto" ? "The detected editor" : options.options.editor} rejected an editor request.`
@@ -2040,7 +2093,6 @@ async function handleOpenEditor(request, options) {
       cause: error
     });
   }
-  return Object.freeze({ editor: options.options.editor });
 }
 function createSpotPatchMiddleware(options) {
   return (request, response, next) => {