apiforge-analyzer 1.3.5 → 1.3.7

package/dist/cjs/cli.js

@@ -205,7 +205,9 @@ async function main() {
                     return `${yellow('◌')} Already configured — no changes made`;
                 }
                 return [
-                    `${green('✓')} Patched ${bold(entryFile)}  ${dim(`+${linesAdded} lines`)}`,
+                    result.updated
+                        ? `${green('✓')} Updated ${bold(entryFile)}  ${dim('(project name/API key changed since last run)')}`
+                        : `${green('✓')} Patched ${bold(entryFile)}  ${dim(`+${linesAdded} lines`)}`,
                     `   ${green('✓')} API key saved to ${bold('.env.local')}  ${dim('(gitignored)')}`,
                 ].join('\n');
             },
@@ -668,6 +670,7 @@ async function microservicesFlow(config, opts) {
         // Kill service process (and its full descendant tree — see killProcessTree)
         if (child.pid)
             killProcessTree(child.pid);
+        await killOrphanFromEaddrinuse(output);
         tryUnlink((0, path_1.join)(cwd, statusFile));
         if (routes && routes.length > 0) {
             const prefix = gatewayPrefixes[svc.name];
@@ -796,6 +799,46 @@ function killProcessTree(pid) {
         catch { }
     }
 }
+/**
+ * nodemon manages its own child process in a way that doesn't always show
+ * up as a descendant of the shell pid `killProcessTree` targets —
+ * `taskkill /T` walks the OS-reported parent/child tree, but nodemon's
+ * actual worker sometimes isn't linked into that tree on Windows, so it
+ * survives our kill and keeps holding its port. That port then collides
+ * with the very next run (EADDRINUSE), which gets killed the same
+ * incomplete way, and orphans keep piling up across retries.
+ *
+ * Rather than guess at process relationships, read the actual port back
+ * out of "EADDRINUSE...:<port>" in the crashed server's own output (Node
+ * always includes it) and kill whatever OS-level listener currently holds
+ * that port — this is exact, not a heuristic, and clears the pileup so the
+ * next run isn't born already colliding with the previous one.
+ */
+function killOrphanFromEaddrinuse(serverOutput) {
+    return new Promise(resolve => {
+        if (process.platform !== 'win32')
+            return resolve();
+        const match = serverOutput.match(/EADDRINUSE.*?:(\d+)\b/);
+        if (!match)
+            return resolve();
+        const port = match[1];
+        const script = `Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`;
+        try {
+            // Must be awaited (not fire-and-forget) — the CLI process exits right
+            // after calling this, and an un-awaited spawn() can get cut off
+            // before PowerShell finishes actually killing anything, silently
+            // undoing the whole point of this cleanup.
+            const ps = (0, child_process_1.spawn)('powershell', ['-NoProfile', '-Command', script], { stdio: 'ignore' });
+            ps.on('exit', () => resolve());
+            ps.on('error', () => resolve());
+            // Don't let a hung PowerShell block the CLI from ever exiting.
+            setTimeout(resolve, 5000);
+        }
+        catch {
+            resolve();
+        }
+    });
+}
 const NODEMON_IGNORE_PATTERNS = ['.apiforge-status.json', '.apiforge-last-run.json', '.env.local'];
 /**
  * If the project depends on nodemon, make sure it won't watch our own
@@ -875,7 +918,9 @@ function startAndWaitForAnalysis(command, timeoutMs) {
             clearTimeout(timeout);
             if (child.pid)
                 killProcessTree(child.pid);
-            resolve({ ...result, serverOutput: serverOutput.trim() });
+            killOrphanFromEaddrinuse(serverOutput).then(() => {
+                resolve({ ...result, serverOutput: serverOutput.trim() });
+            });
         }
         // Poll for the status file every 500 ms
         const poller = setInterval(() => {
@@ -1228,11 +1273,37 @@ function detectScripts() {
         return [];
     }
 }
+/** Reads `field: 'value'` out of an already-injected APIForge block. */
+function extractInjectedField(block, field) {
+    const m = new RegExp(`${field}:\\s*'([^']*)'`).exec(block);
+    return m?.[1];
+}
 function injectCode(filePath, projectName, apiKey, baseUrl, backendUrl, architectureType, collectionOpts) {
     const fullPath = (0, path_1.join)(process.cwd(), filePath);
-    const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-    if (content.includes('apiforge-analyzer')) {
-        return { alreadyInjected: true };
+    let content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
+    const startIdx = content.indexOf('// APIForge');
+    let wasStale = false;
+    if (startIdx !== -1) {
+        const afterStart = content.slice(startIdx);
+        const endMatch = /\.catch\s*\(\s*\(\s*\)\s*=>\s*\{?\s*\}?\s*\)\s*\n?/.exec(afterStart);
+        const block = endMatch ? afterStart.slice(0, endMatch.index + endMatch[0].length) : afterStart;
+        const existingKey = extractInjectedField(block, 'apiKey');
+        const existingName = extractInjectedField(block, 'projectName');
+        // Same project name and API key as last time — nothing to do.
+        if (existingKey === apiKey && existingName === projectName) {
+            return { alreadyInjected: true };
+        }
+        // Prompt answers changed since this file was last configured. Silently
+        // keeping the old block meant a stale (sometimes since-deleted) API key
+        // stayed hardcoded forever — every later run kept uploading with it no
+        // matter what was typed at the prompt. Re-inject fresh instead.
+        if (endMatch) {
+            const endIdx = startIdx + endMatch.index + endMatch[0].length;
+            content = (content.slice(0, startIdx) + content.slice(endIdx))
+                .replace(/\n{3,}/g, '\n\n')
+                .trimEnd() + '\n';
+            wasStale = true;
+        }
     }
     const isESM = detectESM(filePath, content);
     const appVar = detectAppVariable(content) ?? 'app';
@@ -1258,7 +1329,7 @@ function injectCode(filePath, projectName, apiKey, baseUrl, backendUrl, architec
         injectionPoint = 'end of file';
     }
     (0, fs_1.writeFileSync)(fullPath, newContent, 'utf-8');
-    return { alreadyInjected: false, injectionPoint, linesAdded: snippet.split('\n').length };
+    return { alreadyInjected: false, injectionPoint, linesAdded: snippet.split('\n').length, updated: wasStale };
 }
 /**
  * Write (or overwrite) the API key in .env.local.

package/dist/esm/cli.js

@@ -200,7 +200,9 @@ async function main() {
                     return `${yellow('◌')} Already configured — no changes made`;
                 }
                 return [
-                    `${green('✓')} Patched ${bold(entryFile)}  ${dim(`+${linesAdded} lines`)}`,
+                    result.updated
+                        ? `${green('✓')} Updated ${bold(entryFile)}  ${dim('(project name/API key changed since last run)')}`
+                        : `${green('✓')} Patched ${bold(entryFile)}  ${dim(`+${linesAdded} lines`)}`,
                     `   ${green('✓')} API key saved to ${bold('.env.local')}  ${dim('(gitignored)')}`,
                 ].join('\n');
             },
@@ -663,6 +665,7 @@ async function microservicesFlow(config, opts) {
         // Kill service process (and its full descendant tree — see killProcessTree)
         if (child.pid)
             killProcessTree(child.pid);
+        await killOrphanFromEaddrinuse(output);
         tryUnlink(join(cwd, statusFile));
         if (routes && routes.length > 0) {
             const prefix = gatewayPrefixes[svc.name];
@@ -791,6 +794,46 @@ function killProcessTree(pid) {
         catch { }
     }
 }
+/**
+ * nodemon manages its own child process in a way that doesn't always show
+ * up as a descendant of the shell pid `killProcessTree` targets —
+ * `taskkill /T` walks the OS-reported parent/child tree, but nodemon's
+ * actual worker sometimes isn't linked into that tree on Windows, so it
+ * survives our kill and keeps holding its port. That port then collides
+ * with the very next run (EADDRINUSE), which gets killed the same
+ * incomplete way, and orphans keep piling up across retries.
+ *
+ * Rather than guess at process relationships, read the actual port back
+ * out of "EADDRINUSE...:<port>" in the crashed server's own output (Node
+ * always includes it) and kill whatever OS-level listener currently holds
+ * that port — this is exact, not a heuristic, and clears the pileup so the
+ * next run isn't born already colliding with the previous one.
+ */
+function killOrphanFromEaddrinuse(serverOutput) {
+    return new Promise(resolve => {
+        if (process.platform !== 'win32')
+            return resolve();
+        const match = serverOutput.match(/EADDRINUSE.*?:(\d+)\b/);
+        if (!match)
+            return resolve();
+        const port = match[1];
+        const script = `Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`;
+        try {
+            // Must be awaited (not fire-and-forget) — the CLI process exits right
+            // after calling this, and an un-awaited spawn() can get cut off
+            // before PowerShell finishes actually killing anything, silently
+            // undoing the whole point of this cleanup.
+            const ps = spawn('powershell', ['-NoProfile', '-Command', script], { stdio: 'ignore' });
+            ps.on('exit', () => resolve());
+            ps.on('error', () => resolve());
+            // Don't let a hung PowerShell block the CLI from ever exiting.
+            setTimeout(resolve, 5000);
+        }
+        catch {
+            resolve();
+        }
+    });
+}
 const NODEMON_IGNORE_PATTERNS = ['.apiforge-status.json', '.apiforge-last-run.json', '.env.local'];
 /**
  * If the project depends on nodemon, make sure it won't watch our own
@@ -870,7 +913,9 @@ function startAndWaitForAnalysis(command, timeoutMs) {
             clearTimeout(timeout);
             if (child.pid)
                 killProcessTree(child.pid);
-            resolve({ ...result, serverOutput: serverOutput.trim() });
+            killOrphanFromEaddrinuse(serverOutput).then(() => {
+                resolve({ ...result, serverOutput: serverOutput.trim() });
+            });
         }
         // Poll for the status file every 500 ms
         const poller = setInterval(() => {
@@ -1223,11 +1268,37 @@ function detectScripts() {
         return [];
     }
 }
+/** Reads `field: 'value'` out of an already-injected APIForge block. */
+function extractInjectedField(block, field) {
+    const m = new RegExp(`${field}:\\s*'([^']*)'`).exec(block);
+    return m?.[1];
+}
 function injectCode(filePath, projectName, apiKey, baseUrl, backendUrl, architectureType, collectionOpts) {
     const fullPath = join(process.cwd(), filePath);
-    const content = readFileSync(fullPath, 'utf-8');
-    if (content.includes('apiforge-analyzer')) {
-        return { alreadyInjected: true };
+    let content = readFileSync(fullPath, 'utf-8');
+    const startIdx = content.indexOf('// APIForge');
+    let wasStale = false;
+    if (startIdx !== -1) {
+        const afterStart = content.slice(startIdx);
+        const endMatch = /\.catch\s*\(\s*\(\s*\)\s*=>\s*\{?\s*\}?\s*\)\s*\n?/.exec(afterStart);
+        const block = endMatch ? afterStart.slice(0, endMatch.index + endMatch[0].length) : afterStart;
+        const existingKey = extractInjectedField(block, 'apiKey');
+        const existingName = extractInjectedField(block, 'projectName');
+        // Same project name and API key as last time — nothing to do.
+        if (existingKey === apiKey && existingName === projectName) {
+            return { alreadyInjected: true };
+        }
+        // Prompt answers changed since this file was last configured. Silently
+        // keeping the old block meant a stale (sometimes since-deleted) API key
+        // stayed hardcoded forever — every later run kept uploading with it no
+        // matter what was typed at the prompt. Re-inject fresh instead.
+        if (endMatch) {
+            const endIdx = startIdx + endMatch.index + endMatch[0].length;
+            content = (content.slice(0, startIdx) + content.slice(endIdx))
+                .replace(/\n{3,}/g, '\n\n')
+                .trimEnd() + '\n';
+            wasStale = true;
+        }
     }
     const isESM = detectESM(filePath, content);
     const appVar = detectAppVariable(content) ?? 'app';
@@ -1253,7 +1324,7 @@ function injectCode(filePath, projectName, apiKey, baseUrl, backendUrl, architec
         injectionPoint = 'end of file';
     }
     writeFileSync(fullPath, newContent, 'utf-8');
-    return { alreadyInjected: false, injectionPoint, linesAdded: snippet.split('\n').length };
+    return { alreadyInjected: false, injectionPoint, linesAdded: snippet.split('\n').length, updated: wasStale };
 }
 /**
  * Write (or overwrite) the API key in .env.local.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiforge-analyzer",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Universal API documentation generator for Express, Next.js, Vite, React Router, and Node.js",
   "type": "module",
   "main": "./dist/cjs/index.js",