@just-be/deploy 0.3.0 → 0.5.0

package/README.md

@@ -5,9 +5,42 @@ Deploy static sites and setup routing for the wildcard subdomain service.
 ## Requirements
 
 - [Bun](https://bun.sh/) runtime
-- [Wrangler](https://developers.cloudflare.com/workers/wrangler/) CLI configured with Cloudflare credentials
 - A Cloudflare Workers wildcard subdomain service with R2 and KV configured
 
+## Authentication
+
+The script will automatically run `wrangler login` if you're not authenticated with Cloudflare. This will open a browser window for OAuth authentication.
+
+Alternatively, you can set the `CLOUDFLARE_API_TOKEN` environment variable:
+
+```bash
+export CLOUDFLARE_API_TOKEN="your-api-token"
+```
+
+## Configuration
+
+The deploy script requires access to:
+
+- **KV namespace** for routing rules
+- **R2 bucket** for static file storage
+
+### Environment Variables
+
+To use different resources, set these environment variables:
+
+```bash
+export KV_NAMESPACE_ID="your-kv-namespace-id"
+export R2_BUCKET_NAME="your-bucket-name"
+bunx @just-be/deploy
+```
+
+You can find your KV namespace ID and R2 buckets by running:
+
+```bash
+wrangler kv namespace list
+wrangler r2 bucket list
+```
+
 ## Installation
 
 No installation needed! Run directly with `bunx`:
@@ -200,13 +233,14 @@ The package includes a JSON Schema (`deploy.schema.json`) for editor validation
    - Creates a KV entry with the routing configuration
 5. **Configures** the wildcard service to route requests for each subdomain
 
-## Configuration
+## Wildcard Service Requirements
+
+The script works with any wildcard service that has:
 
-The script expects your wildcard service to use:
+- **R2 Bucket**: For storing static files (default: `content-bucket`)
+- **KV Namespace**: For routing rules (default: `6118ae3b937c4883b3c582dfef8a0c05`)
 
-- **R2 Bucket**: `content-bucket`
-- **KV Binding**: `ROUTING_RULES`
-- **Wrangler Config**: `services/wildcard/wrangler.toml`
+No local `wrangler.toml` file is required - the script accesses Cloudflare resources directly via the Wrangler CLI.
 
 ## Validation
 

package/index.ts

@@ -7,6 +7,15 @@
  *   bunx @just-be/deploy                        # Looks for deploy.json in current directory
  *   bunx @just-be/deploy path/to/config.json    # Deploy with specific config file
  *   bunx @just-be/deploy preview <subdomain>    # Preview deploy with branch name suffix
+ *   bunx @just-be/deploy --version              # Show version
+ *
+ * Authentication:
+ *   The script will automatically run 'wrangler login' if you're not authenticated.
+ *   Alternatively, set CLOUDFLARE_API_TOKEN environment variable.
+ *
+ * Environment Variables:
+ *   R2_BUCKET_NAME   # R2 bucket name
+ *   KV_NAMESPACE_ID  # KV namespace ID
  *
  * Example deploy.json:
  *   {
@@ -37,6 +46,7 @@ import { readdir, stat, access } from "fs/promises";
 import { join, relative, resolve } from "path";
 import { intro, outro, spinner } from "@clack/prompts";
 import { z } from "zod";
+import packageJson from "./package.json" with { type: "json" };
 import {
   StaticConfigSchema,
   RedirectConfigSchema,
@@ -45,8 +55,8 @@ import {
   subdomain,
 } from "@just-be/wildcard";
 
-const BUCKET_NAME = "content-bucket";
-const WRANGLER_CONFIG = "services/wildcard/wrangler.toml";
+const BUCKET_NAME = process.env.R2_BUCKET_NAME || "content-bucket";
+const KV_NAMESPACE_ID = process.env.KV_NAMESPACE_ID || "6118ae3b937c4883b3c582dfef8a0c05";
 
 /**
  * Run wrangler command using bunx to ensure it resolves from package dependencies
@@ -172,12 +182,24 @@ async function uploadToR2(localPath: string, r2Key: string): Promise<boolean> {
   }
 }
 
+/**
+ * Check if user is authenticated with wrangler
+ */
+async function validateWranglerAuth(): Promise<boolean> {
+  try {
+    await wrangler`whoami`.quiet();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Validate KV access by attempting to list keys
  */
 async function validateKVAccess(): Promise<boolean> {
   try {
-    await wrangler`kv key list --binding ROUTING_RULES --config ${WRANGLER_CONFIG}`.quiet();
+    await wrangler`kv key list --namespace-id ${KV_NAMESPACE_ID}`.quiet();
     return true;
   } catch {
     return false;
@@ -191,7 +213,7 @@ async function getCurrentBranch(): Promise<string> {
   try {
     const result = await $`git rev-parse --abbrev-ref HEAD`.text();
     return result.trim();
-  } catch (error) {
+  } catch {
     throw new Error("Failed to get current git branch. Are you in a git repository?");
   }
 }
@@ -213,7 +235,7 @@ function sanitizeBranchName(branch: string): string {
  */
 async function createKVEntry(subdomain: string, routeConfig: RouteConfig): Promise<void> {
   const configJson = JSON.stringify(routeConfig);
-  await wrangler`kv key put --binding ROUTING_RULES ${subdomain} ${configJson} --config ${WRANGLER_CONFIG}`;
+  await wrangler`kv key put --namespace-id ${KV_NAMESPACE_ID} ${subdomain} ${configJson}`;
 }
 
 /**
@@ -394,13 +416,50 @@ async function deploy() {
     console.log(`\nFound ${config.rules.length} rule(s) to deploy`);
   }
 
-  // Validate KV access before starting
+  // Check wrangler authentication first
   const s = spinner();
+  s.start("Checking wrangler authentication");
+  const isAuthenticated = await validateWranglerAuth();
+  if (!isAuthenticated) {
+    s.stop("Not authenticated with wrangler");
+    console.log("\nAuthenticating with Cloudflare...");
+    console.log("This will open a browser window for you to authorize access.\n");
+
+    try {
+      await wrangler`login`;
+      console.log("\n✓ Successfully authenticated!");
+
+      // Verify authentication worked
+      s.start("Verifying authentication");
+      const isNowAuthenticated = await validateWranglerAuth();
+      if (!isNowAuthenticated) {
+        s.stop("Error: Authentication verification failed");
+        console.error("\nIf you prefer to use an API token instead:");
+        console.error("  export CLOUDFLARE_API_TOKEN=your-token");
+        process.exit(1);
+      }
+      s.stop("✓ Authentication verified");
+    } catch (error) {
+      console.error("\n❌ Authentication failed");
+      console.error("\nAlternatively, you can set up an API token:");
+      console.error("  export CLOUDFLARE_API_TOKEN=your-token");
+      process.exit(1);
+    }
+  } else {
+    s.stop("✓ Wrangler authenticated");
+  }
+
+  // Validate KV access
   s.start("Validating KV access");
   const hasKVAccess = await validateKVAccess();
   if (!hasKVAccess) {
     s.stop("Error: Cannot access KV namespace");
-    console.error("Check wrangler configuration and permissions.");
+    console.error("\nCheck that you have permission to access the KV namespace.");
+    console.error(`KV Namespace ID: ${KV_NAMESPACE_ID}`);
+    console.error("\nYou may need to:");
+    console.error("  1. Verify the namespace ID is correct");
+    console.error("  2. Ensure your account has access to this KV namespace");
+    console.error("  3. Check wrangler.toml configuration if using one");
     process.exit(1);
   }
   s.stop("✓ KV access validated");
@@ -432,8 +491,16 @@ async function deploy() {
   outro("\n✅ Deployment complete!\n\nDeployed sites:\n" + deployedSubdomains.join("\n"));
 }
 
-// Only run deploy() when this file is executed directly, not when imported
+// Only run when this file is executed directly, not when imported
 if (import.meta.main) {
+  const args = Bun.argv.slice(2);
+
+  // Handle version command
+  if (args[0] === "--version" || args[0] === "-v") {
+    console.log(packageJson.version);
+    process.exit(0);
+  }
+
   deploy().catch((error) => {
     console.error("\n❌ Fatal error:", error);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@just-be/deploy",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Deploy static sites to Cloudflare R2 with subdomain routing",
   "type": "module",
   "bin": {