@just-be/deploy 0.1.1 → 0.2.0

package/README.md

@@ -33,6 +33,7 @@ bunx @just-be/deploy
 ```
 
 The interactive mode will ask you for:
+
 - Subdomain name
 - R2 path prefix
 - Local directory to upload
@@ -58,11 +59,13 @@ bunx @just-be/deploy --subdomain=NAME --path=PATH --dir=DIR [--spa] [--fallback=
 ### Examples
 
 **Interactive deployment:**
+
 ```bash
 bunx @just-be/deploy
 ```
 
 **Deploy a static site:**
+
 ```bash
 bunx @just-be/deploy \
   --subdomain=portfolio \
@@ -71,6 +74,7 @@ bunx @just-be/deploy \
 ```
 
 **Deploy a single-page application:**
+
 ```bash
 bunx @just-be/deploy \
   --subdomain=myapp \
@@ -80,6 +84,7 @@ bunx @just-be/deploy \
 ```
 
 **Deploy with custom 404 page:**
+
 ```bash
 bunx @just-be/deploy \
   --subdomain=docs \
@@ -90,9 +95,9 @@ bunx @just-be/deploy \
 
 ## How It Works
 
-1. **Parses arguments** using Node's `util.parseArgs` API
+1. **Parses arguments** using a custom argument parser
 2. **Prompts for missing values** if any required arguments are not provided
-3. **Validates configuration** using Zod schemas from `@just-be/wildcard-schemas`
+3. **Validates configuration** using Zod schemas from `@just-be/wildcard`
 4. **Scans** the target directory for all files
 5. **Uploads** each file to R2 at `content-bucket/{path}/{relative-path}`
 6. **Creates** a KV entry with routing configuration for the subdomain
@@ -101,6 +106,7 @@ bunx @just-be/deploy \
 ## Configuration
 
 The script expects your wildcard service to use:
+
 - **R2 Bucket**: `content-bucket`
 - **KV Binding**: `ROUTING_RULES`
 - **Wrangler Config**: `services/wildcard/wrangler.toml`
@@ -108,13 +114,14 @@ The script expects your wildcard service to use:
 ## Validation
 
 Configuration is validated using Zod schemas to ensure:
+
 - SPA mode and fallback file are not used together
 - R2 path is not empty
 - All required fields are present
 
 ## Related Packages
 
-- [`@just-be/wildcard-schemas`](../wildcard-schemas) - Shared Zod schemas for configuration validation
+- [`@just-be/wildcard`](../wildcard) - Shared Zod schemas and routing handlers for wildcard subdomain configuration
 
 ## License
 

package/index.ts

@@ -15,13 +15,21 @@
 import { $ } from "bun";
 import { readdir, stat } from "fs/promises";
 import { join, relative } from "path";
-import { createInterface } from "readline";
+import { confirm, intro, outro, spinner, text } from "@clack/prompts";
 import { z } from "zod";
 import { StaticConfigSchema, type StaticConfig, isValidSubdomain } from "@just-be/wildcard";
 
 const BUCKET_NAME = "content-bucket";
 const WRANGLER_CONFIG = "services/wildcard/wrangler.toml";
 
+/**
+ * Run wrangler command using bunx to ensure it resolves from package dependencies
+ */
+function wrangler(command: TemplateStringsArray, ...values: unknown[]) {
+  const cmd = String.raw(command, ...values);
+  return $`bunx wrangler ${cmd}`;
+}
+
 /**
  * Schema for CLI arguments
  */
@@ -36,7 +44,7 @@ const CliArgsSchema = z.object({
 type CliArgs = z.infer<typeof CliArgsSchema>;
 
 /**
- * Parse command-line arguments from Bun.argv
+ * Parse command-line arguments from Bun.argv using a custom parser
  */
 function parseCliArgs(): CliArgs {
   const args: Record<string, string | boolean> = {};
@@ -61,32 +69,6 @@ interface DeployConfig extends Omit<StaticConfig, "type"> {
   dir: string;
 }
 
-/**
- * Prompt user for input
- */
-async function prompt(question: string, defaultValue?: string): Promise<string> {
-  const rl = createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  return new Promise((resolve) => {
-    const promptText = defaultValue ? `${question} (${defaultValue}): ` : `${question}: `;
-    rl.question(promptText, (answer) => {
-      rl.close();
-      resolve(answer.trim() || defaultValue || "");
-    });
-  });
-}
-
-/**
- * Prompt user for confirmation
- */
-async function confirm(question: string): Promise<boolean> {
-  const answer = await prompt(`${question} (y/n)`, "n");
-  return answer.toLowerCase() === "y" || answer.toLowerCase() === "yes";
-}
-
 /**
  * Parse command-line arguments
  */
@@ -97,33 +79,64 @@ async function getConfig(): Promise<DeployConfig> {
   const needsInteractive = !values.subdomain || !values.path || !values.dir;
 
   if (needsInteractive) {
-    console.log("🚀 Interactive deployment setup\n");
+    intro("Interactive deployment setup");
   }
 
   let subdomain =
-    values.subdomain || (await prompt("Subdomain name (e.g., 'myapp' for myapp.just-be.dev)"));
-
-  // Validate subdomain format
+    values.subdomain ||
+    ((await text({
+      message: "Subdomain name (e.g., 'myapp' for myapp.just-be.dev)",
+      validate: (value) => {
+        if (!value) return "Subdomain is required";
+        if (!isValidSubdomain(value as string)) {
+          return "Invalid subdomain format. Must be alphanumeric with hyphens, 1-63 characters.";
+        }
+      },
+    })) as string);
+
+  // Validate subdomain format (in case it came from CLI args)
   if (!isValidSubdomain(subdomain)) {
     console.error(
-      "\n❌ Invalid subdomain format. Must be alphanumeric with hyphens, 1-63 characters."
+      "\nInvalid subdomain format. Must be alphanumeric with hyphens, 1-63 characters."
     );
     process.exit(1);
   }
 
-  const path = values.path || (await prompt("R2 path prefix (e.g., 'apps/myapp')"));
-  const dir = values.dir || (await prompt("Local directory to upload", "./dist"));
+  const path =
+    values.path ||
+    ((await text({
+      message: "R2 path prefix (e.g., 'apps/myapp')",
+      validate: (value) => {
+        if (!value) return "Path is required";
+      },
+    })) as string);
+
+  const dir =
+    values.dir ||
+    ((await text({
+      message: "Local directory to upload",
+      placeholder: "./dist",
+      defaultValue: "./dist",
+    })) as string);
 
   let spa = values.spa;
   let fallback = values.fallback;
 
   // Only prompt for spa/fallback if not provided
   if (needsInteractive && spa === undefined && fallback === undefined) {
-    spa = await confirm("Enable SPA mode? (all routes serve index.html)");
+    spa = (await confirm({
+      message: "Enable SPA mode? (all routes serve index.html)",
+    })) as boolean;
     if (!spa) {
-      const useFallback = await confirm("Use a custom fallback file for 404s?");
+      const useFallback = (await confirm({
+        message: "Use a custom fallback file for 404s?",
+      })) as boolean;
       if (useFallback) {
-        fallback = await prompt("Fallback file name", "404.html");
+        fallback = (await text({
+          message: "Fallback file name",
+          placeholder: "404.html",
+          defaultValue: "404.html",
+        })) as string;
       }
     }
   }
@@ -138,7 +151,7 @@ async function getConfig(): Promise<DeployConfig> {
 
   const result = StaticConfigSchema.safeParse(staticConfig);
   if (!result.success) {
-    console.error("\n❌ Invalid configuration:");
+    console.error("\nInvalid configuration:");
     console.error(result.error.format());
     process.exit(1);
   }
@@ -176,9 +189,28 @@ async function findFiles(dir: string): Promise<string[]> {
 
 /**
  * Upload a file to R2
+ * @returns true if upload succeeded, false otherwise
  */
-async function uploadToR2(localPath: string, r2Key: string): Promise<void> {
-  await $`wrangler r2 object put ${BUCKET_NAME}/${r2Key} --file ${localPath}`;
+async function uploadToR2(localPath: string, r2Key: string): Promise<boolean> {
+  try {
+    await wrangler`r2 object put ${BUCKET_NAME}/${r2Key} --file ${localPath}`;
+    return true;
+  } catch (error) {
+    console.error(`\nFailed to upload ${localPath}:`, error);
+    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();
+    return true;
+  } catch {
+    return false;
+  }
 }
 
 /**
@@ -194,7 +226,7 @@ async function createKVEntry(subdomain: string, config: DeployConfig): Promise<v
 
   const configJson = JSON.stringify(routingConfig);
 
-  await $`wrangler kv key put --binding ROUTING_RULES ${subdomain} ${configJson} --config ${WRANGLER_CONFIG}`;
+  await wrangler`kv key put --binding ROUTING_RULES ${subdomain} ${configJson} --config ${WRANGLER_CONFIG}`;
 }
 
 /**
@@ -203,7 +235,7 @@ async function createKVEntry(subdomain: string, config: DeployConfig): Promise<v
 async function deploy() {
   const config = await getConfig();
 
-  console.log("\n📦 Deploy Configuration:");
+  console.log("\nDeploy Configuration:");
   console.log(`  Subdomain: ${config.subdomain}.just-be.dev`);
   console.log(`  R2 Path: ${config.path}`);
   console.log(`  Local Directory: ${config.dir}`);
@@ -218,46 +250,83 @@ async function deploy() {
   try {
     const dirStat = await stat(config.dir);
     if (!dirStat.isDirectory()) {
-      console.error(`❌ Error: ${config.dir} is not a directory`);
+      console.error(`Error: ${config.dir} is not a directory`);
       process.exit(1);
     }
   } catch {
-    console.error(`❌ Error: Directory ${config.dir} does not exist`);
+    console.error(`Error: Directory ${config.dir} does not exist`);
     process.exit(1);
   }
 
   // Find all files to upload
-  console.log(`📂 Scanning files in: ${config.dir}\n`);
+  const s = spinner();
+  s.start(`Scanning files in: ${config.dir}`);
   const filePaths = await findFiles(config.dir);
-  console.log(`Found ${filePaths.length} files to upload\n`);
+  s.stop(`Found ${filePaths.length} files to upload`);
 
   if (filePaths.length === 0) {
-    console.error("❌ No files found to upload");
+    console.error("No files found to upload");
     process.exit(1);
   }
 
+  // Validate KV access before starting uploads
+  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.");
+    process.exit(1);
+  }
+  s.stop("KV access validated");
+
   // Upload files to R2
   let uploadCount = 0;
+  const failedUploads: string[] = [];
+
   for (const filePath of filePaths) {
     const relativePath = relative(config.dir, filePath);
     const r2Key = `${config.path}/${relativePath}`;
 
-    console.log(`⬆️  ${relativePath} → ${r2Key}`);
-    await uploadToR2(filePath, r2Key);
-    uploadCount++;
+    s.start(`Uploading ${relativePath}`);
+    const success = await uploadToR2(filePath, r2Key);
+
+    if (success) {
+      uploadCount++;
+      s.stop(`Uploaded ${relativePath}`);
+    } else {
+      s.stop(`Failed to upload ${relativePath}`);
+      failedUploads.push(relativePath);
+    }
+  }
+
+  // Report upload results
+  if (failedUploads.length > 0) {
+    console.error(`\nFailed to upload ${failedUploads.length} file(s):`);
+    for (const file of failedUploads) {
+      console.error(`   - ${file}`);
+    }
+    process.exit(1);
   }
 
-  console.log(`\n✅ Uploaded ${uploadCount} files to R2\n`);
+  console.log(`\nUploaded ${uploadCount} files to R2\n`);
 
   // Create KV entry for routing
-  console.log(`🔧 Creating KV routing entry for subdomain: ${config.subdomain}`);
-  await createKVEntry(config.subdomain, config);
+  s.start(`Creating KV routing entry for subdomain: ${config.subdomain}`);
+  try {
+    await createKVEntry(config.subdomain, config);
+    s.stop("KV routing entry created");
+  } catch (error) {
+    s.stop("Error: Failed to create KV entry");
+    console.error("Files were uploaded but routing is not configured.");
+    console.error(`Uploaded files location: ${config.path}`);
+    console.error(`Error:`, error);
+    process.exit(1);
+  }
 
-  console.log(`\n✅ Deployment complete!`);
-  console.log(`\n🌐 Your site is available at: https://${config.subdomain}.just-be.dev`);
+  outro(`Your site is available at: https://${config.subdomain}.just-be.dev`);
 }
 
 deploy().catch((error) => {
-  console.error("\n❌ Fatal error:", error);
+  console.error("\nFatal error:", error);
   process.exit(1);
 });

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@just-be/deploy",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Deploy static files to Cloudflare R2 and configure subdomain routing",
   "type": "module",
-  "bin": "./index.ts",
+  "bin": {
+    "deploy": "index.ts"
+  },
   "files": [
     "index.ts"
   ],
@@ -17,13 +19,18 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/justbejyk/just-be.dev.git",
+    "url": "git+https://github.com/just-be-dev/just-be.dev.git",
     "directory": "packages/deploy"
   },
   "engines": {
     "bun": ">=1.0.0"
   },
   "dependencies": {
-    "@just-be/wildcard": "0.1.0"
+    "@clack/prompts": "^0.11.0",
+    "@just-be/wildcard": "0.1.1",
+    "wrangler": "4.48.0"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }