@shiftapi/vite-plugin 0.0.3 → 0.0.5

package/README.md

@@ -1,5 +1,8 @@
 <p align="center">
-	<img src="https://raw.githubusercontent.com/fcjr/shiftapi/main/assets/logo.svg" alt="ShiftAPI Logo">
+	<picture>
+		<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/fcjr/shiftapi/main/assets/logo-dark.svg">
+		<img src="https://raw.githubusercontent.com/fcjr/shiftapi/main/assets/logo.svg" alt="ShiftAPI Logo">
+	</picture>
 </p>
 
 # @shiftapi/vite-plugin

package/dist/index.js

@@ -7,6 +7,7 @@ import {
   existsSync
 } from "fs";
 import { spawn } from "child_process";
+import { createServer as createTcpServer } from "net";
 
 // src/extract.ts
 import { execFileSync } from "child_process";
@@ -17,7 +18,7 @@ function extractSpec(serverEntry, goRoot) {
   const tempDir = mkdtempSync(join(tmpdir(), "shiftapi-"));
   const specPath = join(tempDir, "openapi.json");
   try {
-    execFileSync("go", ["run", serverEntry], {
+    execFileSync("go", ["run", "-tags", "shiftapidev", serverEntry], {
       cwd: goRoot,
       env: {
         ...process.env,
@@ -76,6 +77,22 @@ export { createClient };
 // src/index.ts
 var MODULE_ID = "@shiftapi/client";
 var RESOLVED_MODULE_ID = "\0" + MODULE_ID;
+function isPortFree(port) {
+  return new Promise((resolve2) => {
+    const server = createTcpServer();
+    server.once("error", () => resolve2(false));
+    server.once("listening", () => {
+      server.close(() => resolve2(true));
+    });
+    server.listen(port);
+  });
+}
+async function findFreePort(startPort) {
+  for (let port = startPort; port < startPort + 20; port++) {
+    if (await isPortFree(port)) return port;
+  }
+  return startPort;
+}
 function shiftapiPlugin(options) {
   const {
     server: serverEntry,
@@ -83,6 +100,9 @@ function shiftapiPlugin(options) {
     goRoot = process.cwd(),
     url = "http://localhost:8080"
   } = options;
+  const parsedUrl = new URL(url);
+  const basePort = parseInt(parsedUrl.port || "8080");
+  let goPort = basePort;
   let virtualModuleSource = "";
   let generatedDts = "";
   let cachedSpec = null;
@@ -111,7 +131,7 @@ function shiftapiPlugin(options) {
     return true;
   }
   function writeDtsFile() {
-    const outDir = resolve("node_modules", ".shiftapi");
+    const outDir = resolve(projectRoot, ".shiftapi");
     if (!existsSync(outDir)) {
       mkdirSync(outDir, { recursive: true });
     }
@@ -136,7 +156,7 @@ ${generatedDts.split("\n").map((line) => line ? "  " + line : line).join("\n")}
     if (!tsconfig.compilerOptions) tsconfig.compilerOptions = {};
     if (!tsconfig.compilerOptions.paths) tsconfig.compilerOptions.paths = {};
     tsconfig.compilerOptions.paths[MODULE_ID] = [
-      "./node_modules/.shiftapi/client.d.ts"
+      "./.shiftapi/client.d.ts"
     ];
     const indent = raw.match(/^[ \t]+/m)?.[0] ?? "  ";
     writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, indent) + "\n");
@@ -145,9 +165,14 @@ ${generatedDts.split("\n").map((line) => line ? "  " + line : line).join("\n")}
     );
   }
   function startGoServer() {
-    goProcess = spawn("go", ["run", serverEntry], {
+    goProcess = spawn("go", ["run", "-tags", "shiftapidev", serverEntry], {
       cwd: resolve(goRoot),
-      stdio: ["ignore", "inherit", "inherit"]
+      stdio: ["ignore", "inherit", "inherit"],
+      detached: true,
+      env: {
+        ...process.env,
+        SHIFTAPI_PORT: String(goPort)
+      }
     });
     goProcess.on("error", (err) => {
       console.error("[shiftapi] Failed to start Go server:", err.message);
@@ -158,13 +183,23 @@ ${generatedDts.split("\n").map((line) => line ? "  " + line : line).join("\n")}
       }
       goProcess = null;
     });
-    console.log(`[shiftapi] Go server starting: go run ${serverEntry}`);
+    console.log(
+      `[shiftapi] Go server starting on port ${goPort}: go run ${serverEntry}`
+    );
   }
   function stopGoServer() {
-    if (goProcess) {
-      goProcess.kill();
-      goProcess = null;
-    }
+    const proc = goProcess;
+    if (!proc || !proc.pid) return Promise.resolve();
+    const pid = proc.pid;
+    goProcess = null;
+    return new Promise((resolve2) => {
+      proc.on("exit", () => resolve2());
+      try {
+        process.kill(-pid, "SIGTERM");
+      } catch {
+        resolve2();
+      }
+    });
   }
   return {
     name: "@shiftapi/vite-plugin",
@@ -172,13 +207,22 @@ ${generatedDts.split("\n").map((line) => line ? "  " + line : line).join("\n")}
       projectRoot = config.root;
       patchTsConfig();
     },
-    config() {
+    async config(_, env) {
+      if (env.command === "serve") {
+        goPort = await findFreePort(basePort);
+        if (goPort !== basePort) {
+          console.log(
+            `[shiftapi] Port ${basePort} is in use, using ${goPort}`
+          );
+        }
+      }
       const spec = getSpec();
       const paths = spec.paths;
       if (!paths) return;
+      const targetUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}:${goPort}`;
       const proxy = {};
       for (const path of Object.keys(paths)) {
-        proxy[path] = url;
+        proxy[path] = targetUrl;
       }
       return {
         server: { proxy }
@@ -189,6 +233,15 @@ ${generatedDts.split("\n").map((line) => line ? "  " + line : line).join("\n")}
       server.watcher.add(resolve(goRoot));
       startGoServer();
       server.httpServer?.on("close", stopGoServer);
+      process.on("exit", stopGoServer);
+      process.on("SIGINT", () => {
+        stopGoServer();
+        process.exit();
+      });
+      process.on("SIGTERM", () => {
+        stopGoServer();
+        process.exit();
+      });
     },
     async buildStart() {
       await regenerate();
@@ -215,7 +268,7 @@ ${generatedDts.split("\n").map((line) => line ? "  " + line : line).join("\n")}
       if (debounceTimer) clearTimeout(debounceTimer);
       debounceTimer = setTimeout(async () => {
         try {
-          stopGoServer();
+          await stopGoServer();
           startGoServer();
           const changed = await regenerate();
           if (changed && devServer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shiftapi/vite-plugin",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Vite plugin for fully-typed TypeScript clients from shiftapi Go servers",
   "author": "Frank Chiarulli Jr. <frank@frankchiarulli.com>",
   "license": "MIT",