@beechcms/cli 0.4.0-preview.11 → 0.4.0-preview.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beechcms/cli",
-  "version": "0.4.0-preview.11",
+  "version": "0.4.0-preview.13",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -11,7 +11,7 @@
     "dev": "esbuild src/index.ts --bundle --packages=external --platform=node --format=esm --outfile=dist/index.js --watch"
   },
   "dependencies": {
-    "@beechcms/core": "^0.4.0-preview.11",
+    "@beechcms/core": "^0.4.0-preview.13",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {

package/src/commands/deploy.ts

@@ -0,0 +1,122 @@
+import pc from 'picocolors'
+import { spawnSync } from 'node:child_process'
+import { readFileSync } from 'node:fs'
+import { findWranglerConfig } from '../lib/wrangler.js'
+
+export interface DeployOptions {
+  skipSeed?: boolean
+  skipCheck?: boolean
+}
+
+function readWorkerName(configPath: string | null): string | null {
+  if (!configPath) return null
+  try {
+    const raw = readFileSync(configPath, 'utf-8')
+    const stripped = raw
+      .replace(/\/\/[^\n]*/g, '')
+      .replace(/\/\*[\s\S]*?\*\//g, '')
+    const parsed = JSON.parse(stripped)
+    return (parsed?.name as string) ?? null
+  } catch {
+    return null
+  }
+}
+
+// Extracts the first workers.dev URL from wrangler deploy stdout.
+// wrangler writes progress to stderr (shown live) and the summary to stdout (captured).
+function extractWorkerUrl(output: string): string | null {
+  const match = output.match(/https:\/\/[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+\.workers\.dev\b/)
+  return match?.[0] ?? null
+}
+
+async function checkAdmin(url: string): Promise<{ ok: boolean; status: number | null }> {
+  try {
+    const res = await fetch(`${url}/admin`, {
+      method: 'HEAD',
+      redirect: 'follow',
+      signal: AbortSignal.timeout(12_000),
+    })
+    return { ok: res.status < 500, status: res.status }
+  } catch {
+    return { ok: false, status: null }
+  }
+}
+
+export async function deploy(args: DeployOptions): Promise<void> {
+  console.log(pc.cyan('\n  beech deploy\n'))
+
+  // Step 1: wrangler deploy via npm run deploy.
+  // stdout captured to extract the deployed URL; stderr stays on the terminal for live progress.
+  console.log(pc.dim('  [1/3] Deploying Worker…\n'))
+  const deployResult = spawnSync('npm', ['run', 'deploy'], {
+    stdio: ['inherit', 'pipe', 'inherit'],
+    encoding: 'utf-8',
+    cwd: process.cwd(),
+    shell: true,
+  })
+
+  const deployStdout = deployResult.stdout ?? ''
+  if (deployStdout) process.stdout.write(deployStdout)
+
+  if (deployResult.status !== 0) {
+    console.log(pc.red('\n  ✗ Worker deploy failed\n'))
+    console.log(pc.dim('  Check the output above for wrangler errors.'))
+    console.log(pc.dim('  Common causes:'))
+    console.log(pc.dim('    - Not logged in to Cloudflare  →  npx wrangler login'))
+    console.log(pc.dim('    - Wrong database_id in wrangler.jsonc\n'))
+    process.exit(1)
+  }
+
+  const deployedUrl = extractWorkerUrl(deployStdout)
+  console.log(pc.green('\n  ✓ Worker deployed'))
+
+  // Step 2: seed:load --remote as a subprocess so that wrangler failures
+  // (which call process.exit internally) don't abort our own process.
+  if (args.skipSeed) {
+    console.log(pc.dim('\n  [2/3] Skipping seed:load (--skip-seed)'))
+  } else {
+    console.log(pc.dim('\n  [2/3] Syncing content schema to remote D1…\n'))
+    const seedResult = spawnSync('npx', ['beech', 'seed:load'], {
+      stdio: 'inherit',
+      cwd: process.cwd(),
+      shell: true,
+    })
+    if (seedResult.status !== 0) {
+      console.log(pc.yellow('\n  ⚠ seed:load failed — run manually: npx beech seed:load'))
+    } else {
+      console.log(pc.green('\n  ✓ Content schema synced'))
+    }
+  }
+
+  // Step 3: check /admin reachability.
+  // Use URL extracted from deploy output; fall back to worker name from wrangler.jsonc.
+  if (args.skipCheck) {
+    console.log(pc.dim('\n  [3/3] Skipping admin check (--skip-check)\n'))
+    return
+  }
+
+  const adminBase = deployedUrl ?? (() => {
+    const workerName = readWorkerName(findWranglerConfig())
+    // We can't reliably construct the full workers.dev subdomain without knowing the account,
+    // so only use the name-based URL as a fallback when nothing better is available.
+    return workerName ? `https://${workerName}.workers.dev` : null
+  })()
+
+  if (!adminBase) {
+    console.log(pc.dim('\n  [3/3] Could not determine worker URL — skipping admin check\n'))
+    console.log(pc.dim('  The deployed URL is printed by wrangler above. Open <url>/admin to verify.\n'))
+    return
+  }
+
+  console.log(pc.dim(`\n  [3/3] Checking ${adminBase}/admin…\n`))
+  const { ok, status } = await checkAdmin(adminBase)
+
+  if (ok) {
+    console.log(pc.green(`  ✓ Admin reachable at: ${adminBase}/admin\n`))
+  } else {
+    const statusStr = status != null ? ` (HTTP ${status})` : ''
+    console.log(pc.yellow(`  ⚠ Admin returned an error${statusStr} at: ${adminBase}/admin\n`))
+    console.log(pc.dim('  The database may not be fully initialized.'))
+    console.log(pc.cyan('  → Run: npx beech init --db --remote\n'))
+  }
+}

package/src/commands/init.ts

@@ -0,0 +1,400 @@
+import pc from 'picocolors'
+import { existsSync, readFileSync } from 'node:fs'
+import { resolve, basename } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { findWranglerConfig, resolveDbName, executeD1File, queryD1, type WranglerOptions } from '../lib/wrangler.js'
+
+// System tables created by the base schema migration (0000_v040_base.sql).
+// Used to detect whether the DB has been initialised.
+const SYSTEM_TABLES = [
+  'users',
+  'refresh_tokens',
+  'password_reset_tokens',
+  'public_idempotency_keys',
+  'analytics',
+  'system_stats',
+  'activity_logs',
+  'notifications',
+  'media_objects',
+  'content_event_log',
+]
+
+// Embedded copy of 0000_v040_base.sql — all DDL uses CREATE TABLE IF NOT EXISTS,
+// so this is safe to re-run against an already-initialised database.
+const BASE_SCHEMA_SQL = `
+CREATE TABLE IF NOT EXISTS users (
+    id                  TEXT    NOT NULL PRIMARY KEY,
+    email               TEXT    NOT NULL UNIQUE,
+    password_hash       TEXT    NOT NULL,
+    role                TEXT    NOT NULL DEFAULT 'editor' CHECK (role IN ('admin', 'editor')),
+    name                TEXT,
+    avatar_url          TEXT,
+    notification_prefs  TEXT    NOT NULL DEFAULT '{}',
+    created_at          INTEGER NOT NULL DEFAULT (unixepoch())
+);
+
+CREATE TABLE IF NOT EXISTS refresh_tokens (
+    id          TEXT    NOT NULL PRIMARY KEY,
+    user_id     TEXT    NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    token_hash  TEXT    NOT NULL,
+    expires_at  INTEGER NOT NULL,
+    created_at  INTEGER NOT NULL DEFAULT (unixepoch()),
+    revoked_at  INTEGER DEFAULT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_refresh_user    ON refresh_tokens(user_id);
+CREATE INDEX IF NOT EXISTS idx_refresh_hash    ON refresh_tokens(token_hash);
+CREATE INDEX IF NOT EXISTS idx_refresh_expires ON refresh_tokens(expires_at);
+
+CREATE TABLE IF NOT EXISTS password_reset_tokens (
+    id          TEXT    NOT NULL PRIMARY KEY,
+    user_id     TEXT    NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    token_hash  TEXT    NOT NULL,
+    expires_at  INTEGER NOT NULL,
+    created_at  INTEGER NOT NULL DEFAULT (unixepoch()),
+    used_at     INTEGER DEFAULT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_prt_hash ON password_reset_tokens(token_hash);
+CREATE INDEX IF NOT EXISTS idx_prt_user ON password_reset_tokens(user_id);
+
+CREATE TABLE IF NOT EXISTS public_idempotency_keys (
+    idempotency_key     TEXT    NOT NULL PRIMARY KEY,
+    request_fingerprint TEXT    NOT NULL,
+    response_status     INTEGER NOT NULL,
+    response_body       TEXT    NOT NULL,
+    created_at          INTEGER NOT NULL,
+    expires_at          INTEGER NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_idempotency_expires ON public_idempotency_keys(expires_at);
+
+CREATE TABLE IF NOT EXISTS analytics (
+    id      INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    day_ts  INTEGER NOT NULL,
+    metric  TEXT    NOT NULL,
+    seed    TEXT    NOT NULL DEFAULT '',
+    value   INTEGER NOT NULL DEFAULT 0,
+    UNIQUE(day_ts, metric, seed)
+);
+
+CREATE INDEX IF NOT EXISTS idx_analytics_day  ON analytics(day_ts);
+CREATE INDEX IF NOT EXISTS idx_analytics_seed ON analytics(seed, day_ts);
+
+CREATE TABLE IF NOT EXISTS system_stats (
+    id    TEXT NOT NULL PRIMARY KEY,
+    value TEXT NOT NULL
+);
+
+INSERT OR IGNORE INTO system_stats (id, value) VALUES ('total_storage_bytes', '0');
+
+CREATE TABLE IF NOT EXISTS activity_logs (
+    id          TEXT    NOT NULL PRIMARY KEY,
+    user_id     TEXT    NOT NULL,
+    user_email  TEXT    NOT NULL,
+    user_name   TEXT,
+    action      TEXT    NOT NULL,
+    entity_type TEXT    NOT NULL,
+    entity_id   TEXT    NOT NULL,
+    entity_slug TEXT,
+    details     TEXT,
+    created_at  INTEGER NOT NULL DEFAULT (unixepoch())
+);
+
+CREATE INDEX IF NOT EXISTS idx_activity_user    ON activity_logs(user_id);
+CREATE INDEX IF NOT EXISTS idx_activity_created ON activity_logs(created_at);
+
+CREATE TABLE IF NOT EXISTS notifications (
+    id         TEXT    NOT NULL PRIMARY KEY,
+    title      TEXT    NOT NULL,
+    message    TEXT    NOT NULL,
+    type       TEXT    NOT NULL DEFAULT 'info' CHECK (type IN ('info', 'warning', 'error')),
+    is_read    INTEGER NOT NULL DEFAULT 0 CHECK (is_read IN (0, 1)),
+    created_at INTEGER NOT NULL DEFAULT (unixepoch())
+);
+
+CREATE INDEX IF NOT EXISTS idx_notifications_created ON notifications(created_at);
+CREATE INDEX IF NOT EXISTS idx_notifications_unread  ON notifications(is_read);
+
+CREATE TABLE IF NOT EXISTS media_objects (
+    key         TEXT    NOT NULL PRIMARY KEY,
+    filename    TEXT    NOT NULL,
+    mime_type   TEXT    NOT NULL,
+    size_bytes  INTEGER NOT NULL,
+    uploaded_by TEXT    NOT NULL DEFAULT '',
+    created_at  INTEGER NOT NULL DEFAULT (unixepoch())
+);
+
+CREATE INDEX IF NOT EXISTS idx_media_user    ON media_objects(uploaded_by);
+CREATE INDEX IF NOT EXISTS idx_media_created ON media_objects(created_at DESC);
+
+CREATE TABLE IF NOT EXISTS content_event_log (
+    id          TEXT    NOT NULL PRIMARY KEY,
+    schema_slug TEXT    NOT NULL,
+    entry_id    TEXT    NOT NULL,
+    action      TEXT    NOT NULL CHECK (action IN ('create', 'update', 'delete')),
+    user_id     TEXT,
+    details     TEXT,
+    created_at  INTEGER NOT NULL DEFAULT (unixepoch())
+);
+
+CREATE INDEX IF NOT EXISTS idx_event_log_schema_slug ON content_event_log(schema_slug);
+CREATE INDEX IF NOT EXISTS idx_event_log_created_at  ON content_event_log(created_at DESC);
+CREATE INDEX IF NOT EXISTS idx_event_log_entry_id    ON content_event_log(entry_id);
+`.trim()
+
+const PLACEHOLDER_DB_IDS = [
+  'INCOLLA_QUI_IL_TUO_ID_D1',
+  'FILL_IN_YOUR_D1_DATABASE_ID',
+  'YOUR_D1_DATABASE_ID',
+]
+
+export interface InitOptions {
+  initDb: boolean
+  local: boolean
+  db?: string
+}
+
+function checkWranglerAuth(): boolean {
+  const result = spawnSync('npx', ['wrangler', 'whoami', '--json'], {
+    encoding: 'utf-8',
+    cwd: process.cwd(),
+    shell: true,
+  })
+  return result.status === 0
+}
+
+function checkWranglerPlaceholders(configPath: string): string[] {
+  try {
+    const raw = readFileSync(configPath, 'utf-8')
+    const stripped = raw
+      .replace(/\/\/[^\n]*/g, '')
+      .replace(/\/\*[\s\S]*?\*\//g, '')
+    const parsed = JSON.parse(stripped)
+    const bindings: { database_id?: string; database_name?: string }[] = parsed?.d1_databases ?? []
+    const issues: string[] = []
+    for (const b of bindings) {
+      const id = b.database_id ?? ''
+      if (!id || PLACEHOLDER_DB_IDS.includes(id)) {
+        issues.push(`d1_databases[0].database_id is "${id || '(empty)'}"`)
+      }
+    }
+    return issues
+  } catch {
+    return []
+  }
+}
+
+function echoApiKeys(configPath: string | null | undefined): void {
+  if (!configPath) return
+  try {
+    const raw = readFileSync(configPath, 'utf-8')
+    const stripped = raw
+      .replace(/\/\/[^\n]*/g, '')
+      .replace(/\/\*[\s\S]*?\*\//g, '')
+    const parsed = JSON.parse(stripped)
+    const vars: Record<string, string> = parsed?.vars ?? {}
+    const readKey = vars['PUBLIC_READ_API_KEY']
+    const writeKey = vars['PUBLIC_WRITE_API_KEY']
+    if (!readKey && !writeKey) return
+    console.log(pc.dim('  API keys detected in wrangler.jsonc:\n'))
+    if (readKey) {
+      const masked = readKey.length > 8 ? readKey.slice(0, 4) + '****' + readKey.slice(-4) : '****'
+      console.log(pc.dim(`    PUBLIC_READ_API_KEY  = ${masked}`))
+    }
+    if (writeKey) {
+      const masked = writeKey.length > 8 ? writeKey.slice(0, 4) + '****' + writeKey.slice(-4) : '****'
+      console.log(pc.dim(`    PUBLIC_WRITE_API_KEY = ${masked}`))
+    }
+    console.log(pc.dim('\n  Use these in your frontend as the X-API-Key header.\n'))
+  } catch {
+    // wrangler.jsonc may be missing or malformed — skip silently
+  }
+}
+
+function checkFiles(cwd: string, checkDevVars: boolean): boolean {
+  let ok = true
+
+  const workerExists = existsSync(resolve(cwd, 'worker.ts')) || existsSync(resolve(cwd, 'worker.js'))
+  if (!workerExists) {
+    console.log(pc.red('  ✗ worker.ts        — missing (required)'))
+    ok = false
+  } else {
+    console.log(pc.green('  ✓ worker.ts'))
+  }
+
+  const configPath = findWranglerConfig()
+  const configInCwd = configPath &&
+    (configPath === resolve(cwd, 'wrangler.jsonc') ||
+     configPath === resolve(cwd, 'wrangler.json') ||
+     configPath === resolve(cwd, 'wrangler.toml'))
+
+  if (!configInCwd) {
+    console.log(pc.red('  ✗ wrangler.jsonc   — missing (required)'))
+    ok = false
+  } else {
+    console.log(pc.green(`  ✓ ${basename(configPath!)}`))
+  }
+
+  const seedsExists =
+    existsSync(resolve(cwd, 'seeds.ts')) ||
+    existsSync(resolve(cwd, 'seeds.js')) ||
+    existsSync(resolve(cwd, 'seed.ts')) ||
+    existsSync(resolve(cwd, 'seed.js'))
+
+  if (!seedsExists) {
+    console.log(pc.yellow('  ⚠ seeds.ts         — missing (create it, then run beech seed:load)'))
+  } else {
+    console.log(pc.green('  ✓ seeds.ts'))
+  }
+
+  if (checkDevVars) {
+    if (!existsSync(resolve(cwd, '.dev.vars'))) {
+      console.log(pc.dim('  ○ .dev.vars        — not found (optional: only needed for production R2 credentials)'))
+    } else {
+      console.log(pc.green('  ✓ .dev.vars'))
+    }
+  }
+
+  return ok
+}
+
+function printNextSteps(local: boolean): void {
+  const localFlag = local ? ' --local' : ''
+  console.log(pc.dim('  Next steps:'))
+  console.log(pc.cyan(`  1. npx beech seed:load${localFlag}`))
+  console.log(pc.dim('      → create content tables from seeds.ts'))
+  console.log(pc.cyan('  2. npx wrangler dev'))
+  console.log(pc.dim('      → start API + dashboard'))
+  console.log(pc.dim('  3. Open http://localhost:8789/admin\n'))
+}
+
+function getExistingTables(options: WranglerOptions): string[] | null {
+  try {
+    const rows = queryD1<{ name: string }>(
+      `SELECT name FROM sqlite_master WHERE type='table'`,
+      options
+    )
+    return rows.map(r => r.name)
+  } catch {
+    return null
+  }
+}
+
+export async function init(args: InitOptions): Promise<void> {
+  const cwd = process.cwd()
+
+  console.log(pc.cyan('\n  beech init — project check\n'))
+
+  const filesOk = checkFiles(cwd, args.local)
+
+  if (!filesOk) {
+    console.log(pc.red('\n  ✗ Required files missing. Fix the errors above before initialising the database.\n'))
+    process.exit(1)
+  }
+
+  console.log(pc.green('\n  All required files present.\n'))
+
+  if (!args.initDb) {
+    echoApiKeys(findWranglerConfig())
+    const localFlag = args.local ? ' --local' : ''
+    console.log(pc.dim('  Next steps:'))
+    console.log(pc.dim(`  1. npx beech init --db${localFlag}     # initialise D1 database`))
+    console.log(pc.dim(`  2. npx beech seed:load${localFlag}     # create content tables`))
+    console.log(pc.dim('  3. npx wrangler dev                 # start API + dashboard'))
+    console.log(pc.dim('  4. Open http://localhost:8789/admin\n'))
+    return
+  }
+
+  // --- Database initialisation ---
+  const configPath = findWranglerConfig()
+
+  // Check for placeholder database_id before touching the DB
+  if (configPath) {
+    const placeholders = checkWranglerPlaceholders(configPath)
+    if (placeholders.length > 0) {
+      console.log(pc.yellow('  ⚠ wrangler.jsonc contains placeholder values:\n'))
+      for (const issue of placeholders) {
+        console.log(pc.yellow(`    - ${issue}`))
+      }
+      console.log(pc.dim('\n  Update your D1 database_id in wrangler.jsonc,'))
+      console.log(pc.dim('  or create a new database with:'))
+      console.log(pc.cyan('\n    npx wrangler d1 create my-project-db\n'))
+      console.log(pc.dim('  Then retry: npx beech init --db\n'))
+      process.exit(1)
+    }
+  }
+
+  // For remote operations, verify Cloudflare auth before attempting any wrangler calls
+  if (!args.local) {
+    const authed = checkWranglerAuth()
+    if (!authed) {
+      console.log(pc.red('  ✗ Not logged in to Cloudflare\n'))
+      console.log(pc.dim('  BeechCMS needs access to your Cloudflare account to manage the D1 database.\n'))
+      console.log(pc.cyan('  → Run:  npx wrangler login'))
+      console.log(pc.cyan('  → Then: npx beech init --db\n'))
+      process.exit(1)
+    }
+  }
+
+  const db = args.db ?? resolveDbName(configPath)
+  const options: WranglerOptions = { db, local: args.local, configPath }
+
+  console.log(pc.cyan(`  Checking database "${db}" (${args.local ? 'local' : 'remote'})…\n`))
+
+  const existingTables = getExistingTables(options)
+  const missingTables = SYSTEM_TABLES.filter(t => !existingTables?.includes(t))
+
+  // Remote mode: verification only — do not auto-apply schema.
+  // In production, system tables are created by `wrangler deploy` migrations.
+  if (!args.local) {
+    if (existingTables === null) {
+      console.log(pc.red('  ✗ Remote database unreachable\n'))
+      console.log(pc.dim('  Most likely causes:'))
+      console.log(pc.dim('    - Wrong database_id in wrangler.jsonc'))
+      console.log(pc.dim('    - Worker not yet deployed\n'))
+      console.log(pc.dim('  Fix the configuration and re-deploy:\n'))
+      console.log(pc.cyan('    1. Update d1_databases.database_id in wrangler.jsonc'))
+      console.log(pc.cyan('    2. npm run deploy\n'))
+      process.exit(1)
+    }
+
+    if (missingTables.length > 0) {
+      console.log(pc.yellow(`  ⚠ Missing system tables: ${missingTables.join(', ')}\n`))
+      console.log(pc.dim('  Most likely causes:'))
+      console.log(pc.dim('    - Wrong database_id in wrangler.jsonc'))
+      console.log(pc.dim('    - Migrations did not run during deploy\n'))
+      console.log(pc.dim('  Fix the configuration and re-deploy:\n'))
+      console.log(pc.cyan('    1. Update d1_databases.database_id in wrangler.jsonc'))
+      console.log(pc.cyan('    2. npm run deploy\n'))
+      process.exit(1)
+    }
+
+    for (const table of SYSTEM_TABLES) {
+      console.log(pc.green(`  ✓ ${table}`))
+    }
+    console.log(pc.green('\n  All system tables present. Remote database is initialized.\n'))
+    return
+  }
+
+  // Local mode: apply schema if tables are missing.
+  if (existingTables === null) {
+    console.log(pc.yellow('  Database unreachable or not yet created — applying base schema…\n'))
+  } else if (missingTables.length === 0) {
+    console.log(pc.green('  ✓ All system tables present. Database already initialised.\n'))
+    printNextSteps(args.local)
+    return
+  } else {
+    console.log(pc.yellow(`  Missing system tables: ${missingTables.join(', ')}`))
+    console.log(pc.cyan('\n  Applying base schema…\n'))
+  }
+
+  executeD1File(BASE_SCHEMA_SQL, options)
+
+  console.log(pc.green('\n  ✓ worker.ts'))
+  console.log(pc.green(`  ✓ ${configPath ? basename(configPath) : 'wrangler.jsonc'}`))
+  console.log(pc.green('  ✓ seeds.ts'))
+  console.log(pc.green('  ✓ Local D1 system tables ready\n'))
+  echoApiKeys(configPath)
+  printNextSteps(args.local)
+}