@acms-subir/core 0.0.1 → 0.0.2

package/cli.mjs

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 // `acms` — tiny maintenance CLI installed with @acms-subir/core.
-//   acms update   check the registry, install the latest core, print what's new
-//   acms doctor   sanity-check the project setup
+//   acms update           check the registry, install the latest core, print what's new
+//   acms doctor           sanity-check the project setup
+//   acms add cloudflare   retrofit Workers deployment (wrangler.jsonc, deps, D1/R2)
+//   acms add docker       retrofit self-hosting (Dockerfile, compose.yml)
 import { spawnSync } from 'node:child_process';
-import { readFileSync, existsSync } from 'node:fs';
+import { readFileSync, writeFileSync, existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { join } from 'node:path';
 
@@ -44,6 +46,185 @@ if (cmd === 'update') {
 ✓ Updated to ${latest}. What's new: https://github.com/zurielbm/acms-subir/releases
   Deploy when ready:  npm run deploy
   (the database migrates itself on the first request — no manual steps)`);
+} else if (cmd === 'add') {
+  // Retrofit a deployment target onto an existing project. Both targets share
+  // one codebase — astro.config picks the adapter via DEPLOY_TARGET — so
+  // "adding" one is only config files + deps. Content moves between backends
+  // with a backup ZIP (admin → Backup, then admin → Restore on the new host).
+  const what = process.argv[3];
+  if (!existsSync('package.json')) {
+    console.error("✗ No package.json here — run this from your site's folder.");
+    process.exit(1);
+  }
+  const pkg = JSON.parse(readFileSync('package.json', 'utf8'));
+  const slug = (pkg.name || 'my-site').toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 50) || 'my-site';
+  const writeNew = (file, body) => {
+    if (existsSync(file)) { console.log(`• ${file} already exists — left untouched`); return false; }
+    writeFileSync(file, body);
+    console.log(`✓ wrote ${file}`);
+    return true;
+  };
+  const setScript = (name, value) => {
+    pkg.scripts ??= {};
+    if (pkg.scripts[name]) return;
+    pkg.scripts[name] = value;
+    console.log(`✓ added "${name}" script`);
+  };
+
+  if (what === 'cloudflare') {
+    writeNew('wrangler.jsonc', `{
+  "$schema": "node_modules/wrangler/config-schema.json",
+  "name": "${slug}",
+  "main": "./dist/_worker.js/index.js",
+  "compatibility_date": "2025-07-01",
+  "compatibility_flags": ["nodejs_compat"],
+  "assets": {
+    "binding": "ASSETS",
+    "directory": "./dist"
+  },
+  "observability": {
+    "enabled": true
+  },
+  // Scheduled publishing: flips due scheduled posts to published every 5
+  // minutes, independent of site traffic.
+  "triggers": {
+    "crons": ["*/5 * * * *"]
+  },
+  // If the id below is still zeros, create the real database with
+  //   npx wrangler d1 create ${slug}-db
+  // and paste the returned database_id here. Local dev (wrangler dev /
+  // astro dev) uses a local simulator and works with the placeholder.
+  "d1_databases": [
+    {
+      "binding": "DB",
+      "database_name": "${slug}-db",
+      "database_id": "00000000-0000-0000-0000-000000000000"
+    }
+  ],
+  // If missing, create the real bucket with:
+  //   npx wrangler r2 bucket create ${slug}-media
+  // Local dev uses a local simulator and works without creating anything.
+  "r2_buckets": [
+    {
+      "binding": "MEDIA",
+      "bucket_name": "${slug}-media"
+    }
+  ]
+}
+`);
+    setScript('preview', 'npm run build && wrangler dev');
+    setScript('deploy', 'npm run build && wrangler deploy');
+    writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+    if (!pkg.devDependencies?.wrangler && !pkg.dependencies?.wrangler) {
+      console.log('Installing wrangler…');
+      const res = spawnSync('npm', ['install', '-D', 'wrangler', '--no-audit', '--no-fund'], { stdio: 'inherit' });
+      if (res.status !== 0) console.error('✗ npm install -D wrangler failed — install it manually.');
+    }
+    if (process.argv.includes('--provision')) {
+      console.log(`Creating D1 database ${slug}-db…`);
+      const d1 = spawnSync('npx', ['--no-install', 'wrangler', 'd1', 'create', `${slug}-db`], { encoding: 'utf8' });
+      const id = (d1.stdout || '').match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/)?.[0];
+      if (d1.status === 0 && id) {
+        writeFileSync('wrangler.jsonc', readFileSync('wrangler.jsonc', 'utf8').replace('00000000-0000-0000-0000-000000000000', id));
+        console.log(`✓ D1 created (${id})`);
+      } else {
+        console.error(`✗ D1 creation failed — create it later with: npx wrangler d1 create ${slug}-db`);
+      }
+      const r2 = spawnSync('npx', ['--no-install', 'wrangler', 'r2', 'bucket', 'create', `${slug}-media`], { encoding: 'utf8' });
+      console.log(r2.status === 0 ? '✓ R2 bucket created' : `✗ R2 creation failed — create it later with: npx wrangler r2 bucket create ${slug}-media`);
+    }
+    console.log(`
+✓ Cloudflare target ready. Next:
+  npx wrangler d1 create ${slug}-db          # unless --provision did it; paste the id into wrangler.jsonc
+  npx wrangler secret put ADMIN_PASSWORD
+  npx wrangler secret put SESSION_SECRET
+  npm run deploy
+  Moving existing content? Admin → Backup on the old host, Admin → Restore on the new one.`);
+  } else if (what === 'docker') {
+    writeNew('Dockerfile', `# Self-hosted Node target. Build/run via compose.yml, or directly:
+#   docker build -t ${slug} . && docker run -p 4321:4321 -v acms_data:/app/data ${slug}
+FROM node:22-slim AS build
+WORKDIR /app
+COPY package.json package-lock.json* *.tgz* ./
+RUN npm install --no-audit --no-fund
+# self-heal npm/cli#4828: a lockfile updated on macOS can omit the Linux
+# platform binaries (rollup, libsql) while still "installing" cleanly
+RUN node -e "require('rollup')" >/dev/null 2>&1 || \\
+    (rm -rf node_modules package-lock.json && npm install --no-audit --no-fund)
+COPY . .
+RUN DEPLOY_TARGET=node npm run build:node
+
+FROM node:22-slim
+# WORKDIR must stay stable: SQLITE_URL and the media store resolve ./data
+# against the process CWD
+WORKDIR /app
+ENV NODE_ENV=production HOST=0.0.0.0 PORT=4321
+# the standalone bundle in dist/ contains all app code; the only runtime
+# import left in node_modules is @libsql/client (dynamically imported so it
+# stays out of the Workers bundle) — installing just that keeps the image
+# ~300MB instead of ~2GB
+RUN npm install --no-save --no-audit --no-fund "@libsql/client@^0.15.0"
+COPY --from=build /app/dist ./dist
+# ./data holds the SQLite database and uploaded media — mount a volume here.
+# Only data/ needs to be writable (a chown -R of /app would copy-on-write
+# duplicate every node_modules file into a fresh layer)
+RUN mkdir -p data && chown node:node data
+USER node
+EXPOSE 4321
+CMD ["node", "./dist/server/entry.mjs"]
+`);
+    writeNew('compose.yml', `# Self-hosting on your own server. A reverse proxy you already run (Coolify,
+# Dokploy, Traefik, nginx, Caddy) terminates TLS and routes to port 4321.
+# Secrets come from .env in this directory (compose reads it automatically).
+services:
+  site:
+    build: .
+    restart: unless-stopped
+    expose:
+      - "4321"
+    # No reverse proxy? Publish the port directly instead:
+    # ports:
+    #   - "4321:4321"
+    volumes:
+      # one volume covers everything: SQLite database + uploaded media
+      - data:/app/data
+    environment:
+      - HOST=0.0.0.0
+      - PORT=4321
+      - ADMIN_PASSWORD=\${ADMIN_PASSWORD:?set ADMIN_PASSWORD in .env}
+      - SESSION_SECRET=\${SESSION_SECRET:?set SESSION_SECRET in .env}
+      - SQLITE_URL=file:./data/acms.db
+    healthcheck:
+      # also serves as the scheduled-publish heartbeat: each probe is a real
+      # request, which triggers the middleware publish sweep
+      test: ["CMD", "node", "-e", "fetch('http://127.0.0.1:4321/').then((r)=>process.exit(r.ok?0:1),()=>process.exit(1))"]
+      interval: 300s
+      start_period: 15s
+
+volumes:
+  data:
+`);
+    writeNew('.dockerignore', `node_modules
+dist
+.astro
+data
+.env
+.dev.vars
+.wrangler
+.git
+`);
+    setScript('build:node', 'DEPLOY_TARGET=node astro build');
+    writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+    console.log(`
+✓ Docker target ready. Next (on your server):
+  set real ADMIN_PASSWORD / SESSION_SECRET in .env
+  docker compose up -d --build     # or point Coolify/Dokploy/Railway at the repo
+  data lives in the volume at /app/data (SQLite + media)
+  Moving existing content? Admin → Backup on the old host, Admin → Restore on the new one.`);
+  } else {
+    console.error('Usage: acms add <cloudflare|docker> [--provision]');
+    process.exit(1);
+  }
 } else if (cmd === 'doctor') {
   let bad = 0;
   const check = (ok, label, hint) => {
@@ -69,7 +250,9 @@ if (cmd === 'update') {
   console.log(`acms — maintenance CLI for @acms-subir/core
 
 Usage:
-  acms update   Update the CMS core to the latest release
-  acms doctor   Check this project's setup`);
+  acms update           Update the CMS core to the latest release
+  acms doctor           Check this project's setup
+  acms add cloudflare   Add Workers deployment to this project (--provision creates D1 + R2)
+  acms add docker       Add Docker self-hosting to this project`);
   process.exit(cmd ? 1 : 0);
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "publishConfig": {
     "access": "public"
   },
-  "description": "Widget-based CMS for Astro on Cloudflare Workers \u2014 admin UI, content storage, themes, and APIs shipped as one integration.",
+  "description": "Widget-based CMS for Astro on Cloudflare Workers — admin UI, content storage, themes, and APIs shipped as one integration.",
   "type": "module",
   "license": "MIT",
   "homepage": "https://acms.subir.dev",

package/src/lib/repo/sql.ts

@@ -584,9 +584,11 @@ export class SqlRepository implements ContentRepository {
       ...['posts', 'pages', 'media', 'links', 'tags', 'nav_items', 'users', 'post_authors', 'redirects'].map((t) => ({
         sql: `DELETE FROM ${t}`,
       })),
+      // p.locale defaults to '' via the zod schema, so pre-v20 backups
+      // restore cleanly as default-locale pages
       ...content.pages.map((p) => ({
-        sql: 'INSERT INTO pages (id, slug, title, status, is_home, blocks, body_json, body_html, seo_title, seo_desc, template, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [p.id, p.slug, p.title, p.status, p.isHome ? 1 : 0, JSON.stringify(p.blocks), p.bodyJson, p.bodyHtml, p.seoTitle, p.seoDesc, p.template, p.createdAt, p.updatedAt],
+        sql: 'INSERT INTO pages (id, slug, title, status, is_home, locale, blocks, body_json, body_html, seo_title, seo_desc, template, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [p.id, p.slug, p.title, p.status, p.isHome ? 1 : 0, p.locale, JSON.stringify(p.blocks), p.bodyJson, p.bodyHtml, p.seoTitle, p.seoDesc, p.template, p.createdAt, p.updatedAt],
       })),
       // p.collection defaults to 'posts' via the zod schema, so pre-v19
       // backups restore cleanly into the built-in collection

package/src/lib/repo/sqlite.ts

@@ -37,7 +37,9 @@ export class SqliteRepository extends SqlRepository {
         const { mkdirSync } = await import(/* @vite-ignore */ 'node:fs');
         mkdirSync('./data', { recursive: true });
       }
-      return new LibsqlDriver(createClient({ url }));
+      // remote libSQL (Turso, sqld) needs a token; local files don't
+      const authToken = env('SQLITE_AUTH_TOKEN', '');
+      return new LibsqlDriver(createClient(authToken ? { url, authToken } : { url }));
     });
   }
 }