extract-from-sitemap 0.0.1 → 0.0.2

package/cli.ts

@@ -12,6 +12,7 @@ import {
 } from "fs";
 import { join, dirname, resolve } from "path";
 import { extractFromSitemap } from "./mod.js";
+import { secrets } from "bun";
 
 interface Config {
   outDir: string;
@@ -30,10 +31,14 @@ interface Manifest {
   timestamp: string;
 }
 
+const SECRETS_SERVICE = "extract-from-sitemap-cli";
+const SECRETS_KEY = "parallel-api-key";
+
 class OAuth {
   private clientId: string;
   private redirectUri: string;
   private scope: string;
+  private server?: Bun.Server;
 
   constructor() {
     this.clientId = "extract-from-sitemap-cli";
@@ -57,8 +62,10 @@ class OAuth {
     authUrl.searchParams.set("code_challenge_method", "S256");
     authUrl.searchParams.set("state", Math.random().toString(36));
 
-    console.log(`\n📖 Please visit this URL to authorize the application:`);
-    console.log(`${authUrl.toString()}\n`);
+    console.log(`\n📖 Opening browser for authorization...`);
+
+    // Open browser automatically
+    await this.openBrowser(authUrl.toString());
 
     // Start simple HTTP server to catch the callback
     const code = await this.startCallbackServer();
@@ -90,6 +97,33 @@ class OAuth {
     return access_token;
   }
 
+  private async openBrowser(url: string): Promise<void> {
+    try {
+      const { spawn } = require("child_process");
+      const platform = process.platform;
+
+      let command: string;
+      let args: string[];
+
+      if (platform === "darwin") {
+        command = "open";
+        args = [url];
+      } else if (platform === "win32") {
+        command = "start";
+        args = ["", url];
+      } else {
+        // Linux/Unix
+        command = "xdg-open";
+        args = [url];
+      }
+
+      spawn(command, args, { detached: true, stdio: "ignore" });
+    } catch (error) {
+      console.log(`\n📖 Please visit this URL to authorize the application:`);
+      console.log(`${url}\n`);
+    }
+  }
+
   private async generatePKCE(): Promise<{
     codeVerifier: string;
     codeChallenge: string;
@@ -111,9 +145,9 @@ class OAuth {
 
   private async startCallbackServer(): Promise<string> {
     return new Promise((resolve, reject) => {
-      const server = Bun.serve({
+      this.server = Bun.serve({
         port: 3737,
-        fetch(req) {
+        fetch: (req) => {
           const url = new URL(req.url);
 
           if (url.pathname === "/callback") {
@@ -130,9 +164,14 @@ class OAuth {
 
             if (code) {
               resolve(code);
-              server.stop();
+              // Don't stop server here - let the cleanup happen in the finally block
               return new Response(
-                "✅ Authorization successful! You can close this window and return to the terminal."
+                "✅ Authorization successful! You can close this window and return to the terminal.",
+                {
+                  headers: {
+                    "Content-Type": "text/html",
+                  },
+                }
               );
             }
           }
@@ -143,11 +182,21 @@ class OAuth {
 
       // Timeout after 5 minutes
       setTimeout(() => {
-        server.stop();
+        this.stopServer();
         reject(new Error("OAuth flow timed out"));
       }, 300000);
+    }).finally(() => {
+      // Ensure server is stopped after promise resolves or rejects
+      this.stopServer();
     });
   }
+
+  private stopServer(): void {
+    if (this.server) {
+      this.server.stop();
+      this.server = undefined;
+    }
+  }
 }
 
 async function loadConfig(): Promise<Config> {
@@ -195,7 +244,22 @@ async function loadConfig(): Promise<Config> {
 }
 
 async function getApiKey(): Promise<string> {
-  // Check environment variables first
+  // Check if we have a stored API key in the keychain
+  try {
+    const storedKey = await secrets.get({
+      service: SECRETS_SERVICE,
+      name: SECRETS_KEY,
+    });
+
+    if (storedKey) {
+      console.log("🔑 Using stored API key from keychain");
+      return storedKey;
+    }
+  } catch (error) {
+    console.warn("⚠️  Could not access keychain:", error.message);
+  }
+
+  // Check environment variables as fallback
   let apiKey = process.env.PARALLEL_API_KEY;
 
   if (!apiKey && existsSync(".env")) {
@@ -207,13 +271,43 @@ async function getApiKey(): Promise<string> {
     }
   }
 
-  if (!apiKey) {
-    console.log("🔑 No API key found in environment or .env file.");
-    const oauth = new OAuth();
-    apiKey = await oauth.getApiKey();
+  if (apiKey) {
+    console.log("🔑 Using API key from environment");
+    // Store it in keychain for future use
+    try {
+      await secrets.set({
+        service: SECRETS_SERVICE,
+        name: SECRETS_KEY,
+        value: apiKey,
+      });
+      console.log("💾 API key stored in keychain for future use");
+    } catch (error) {
+      console.warn("⚠️  Could not store API key in keychain:", error.message);
+    }
+    return apiKey;
+  }
+
+  // No API key found, start OAuth flow
+  console.log("🔑 No API key found. Starting OAuth flow...");
+  const oauth = new OAuth();
+  const newApiKey = await oauth.getApiKey();
+
+  // Store the new API key in keychain
+  try {
+    await secrets.set({
+      service: SECRETS_SERVICE,
+      name: SECRETS_KEY,
+      value: newApiKey,
+    });
+    console.log("💾 API key stored securely in keychain");
+  } catch (error) {
+    console.warn("⚠️  Could not store API key in keychain:", error.message);
+    console.log(
+      "💡 You may need to set PARALLEL_API_KEY environment variable for future runs"
+    );
   }
 
-  return apiKey;
+  return newApiKey;
 }
 
 function loadManifest(outDir: string): Manifest {
@@ -311,9 +405,34 @@ async function processCustomUrls(
   return files;
 }
 
+// Add command for clearing stored credentials
+async function clearCredentials(): Promise<void> {
+  try {
+    const deleted = await secrets.delete({
+      service: SECRETS_SERVICE,
+      name: SECRETS_KEY,
+    });
+
+    if (deleted) {
+      console.log("✅ Cleared stored API key from keychain");
+    } else {
+      console.log("ℹ️  No stored API key found to clear");
+    }
+  } catch (error) {
+    console.error("❌ Error clearing credentials:", error.message);
+  }
+}
+
 async function main() {
   console.log("🚀 Extract from Sitemap CLI");
 
+  // Check for special commands
+  const args = process.argv.slice(2);
+  if (args.includes("--clear-credentials")) {
+    await clearCredentials();
+    return;
+  }
+
   try {
     const config = await loadConfig();
     const apiKey = await getApiKey();
@@ -423,6 +542,7 @@ async function main() {
       console.log(`⚠️  Errors: ${totalErrors}`);
     }
     console.log(`📁 Output directory: ${resolve(config.outDir)}`);
+    console.log(`\n💡 Use --clear-credentials to remove stored API key`);
   } catch (error) {
     console.error("💥 Fatal error:", error.message);
     process.exit(1);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "extract-from-sitemap",
   "bin": "cli.ts",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "mod.js",
   "description": "A module and CLI that allows extracting all pages from a sitemap into markdown and a llms.txt, using Parallel.ai APIs.",
   "files": [