easy-cms 0.63.0 → 0.65.0

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   run
-} from "./chunk-GX6RYPUR.js";
+} from "./chunk-WCISVCEZ.js";
 
 // src/bin.ts
 process.exitCode = await run(process.argv.slice(2));

package/dist/{chunk-GX6RYPUR.js → chunk-WCISVCEZ.js}

@@ -13,7 +13,12 @@ import {
   ValidationError,
   warnDeprecated
 } from "@easy-cms/core";
-import { copyDatabase, generateTypes, writeBackupFile } from "@easy-cms/core/internal";
+import {
+  copyDatabase,
+  decryptBackup,
+  generateTypes,
+  writeBackupFile
+} from "@easy-cms/core/internal";
 
 // src/serve.ts
 import { watch } from "fs";
@@ -26,12 +31,12 @@ import {
   createRestHandler
 } from "@easy-cms/core";
 import { createRootEndpointHandler, forwardedClientIp } from "@easy-cms/core/internal";
-function createStandaloneHandler(cms) {
+function createStandaloneHandler(cms, options = {}) {
   const config = cms.config;
   const adminPath = `/${config.admin.path.replace(/^\/+|\/+$/g, "")}`;
   const clientIps = /* @__PURE__ */ new WeakMap();
   const getClientIp = (request) => clientIps.get(request);
-  const api = createRestHandler(cms, { getClientIp });
+  const api = createRestHandler(cms, { getClientIp, trustProxy: options.trustProxy === true });
   const rootEndpoints = createRootEndpointHandler(cms, { getClientIp });
   const admin = adminHandlerFor(config, {});
   const under = (path, base) => path === base || path.startsWith(`${base}/`);
@@ -100,7 +105,7 @@ async function startServer(options) {
   const { logger, cwd } = options;
   const trustProxy = options.trustProxy ?? false;
   let cms = await createEasyCMS(await options.loadConfig(), { cwd, logger });
-  let handler = createStandaloneHandler(cms);
+  let handler = createStandaloneHandler(cms, { trustProxy });
   const server = createServer(async (req, res) => {
     try {
       await sendWebResponse(
@@ -126,7 +131,7 @@ async function startServer(options) {
           const next = await createEasyCMS(await options.loadConfig(), { cwd, logger });
           const previous = cms;
           cms = next;
-          handler = createStandaloneHandler(next);
+          handler = createStandaloneHandler(next, { trustProxy });
           await previous.destroy();
           logger.info("Config reloaded.");
         } catch (error) {
@@ -200,6 +205,7 @@ Commands:
   serve                   Run the CMS as its own server (admin + REST API)
   jobs:run                Run due scheduled publishes, jobs, webhook and email retries (also: run-scheduled)
   backup <file>           Copy the database to a SQLite file while the CMS runs
+  backup:decrypt <file>   Decrypt a backup made with backups.encryptionKey
   copy --from <config>    Copy all content from another config's database into this one
   <plugin command>        Commands from your config's plugins, e.g. nested:rebuild
 
@@ -242,6 +248,11 @@ yet. Postgres needs backups: { sqlite } in the config. Uploads are not included:
 uploads folder or bucket separately.
 
 Postgres: use pg_dump, e.g. pg_dump --format=custom --file=cms.dump "$DATABASE_URL".
+`,
+  "backup:decrypt": `Usage: easy-cms backup:decrypt <file> [--out <file>] [options]
+
+Decrypts a backup the admin made with backups.encryptionKey (a .db.gz.enc file, e.g. copied from
+the backup bucket) into a .db.gz file, with the key from the config. The database isn't opened.
 `,
   copy: `Usage: easy-cms copy --from <config> [options]
 
@@ -322,6 +333,25 @@ async function run(argv, io = defaultIO) {
       return 0;
     }
     if (command === "copy") return await copy(values.from, config, cwd, logger, io);
+    if (command === "backup:decrypt") {
+      const source = rest.join(" ").trim();
+      const key = config.backups?.encryptionKey;
+      if (!source || !key) {
+        io.err(source ? "Set backups.encryptionKey in the config.\n" : "Missing backup file.\n");
+        io.err(COMMAND_HELP["backup:decrypt"]);
+        return 1;
+      }
+      const input = isAbsolute(source) ? source : resolve(cwd, source);
+      const target = values.out ?? input.replace(/\.enc$/, "");
+      const out = isAbsolute(target) ? target : resolve(cwd, target);
+      if (out === input || existsSync(out)) {
+        io.err(`${out} already exists; choose another name with --out.`);
+        return 1;
+      }
+      await writeFile(out, decryptBackup(await readFile(input), key));
+      io.out(`Decrypted ${input} to ${out}`);
+      return 0;
+    }
     const schema = command === "admin:create" && process.env.NODE_ENV !== "production" ? "push" : "skip";
     const cms = await createEasyCMS2(config, {
       cwd,

package/dist/index.d.ts

@@ -11,7 +11,9 @@ type Handler = (request: Request, clientIp?: string) => Promise<Response>;
  * admin at `admin.path`, `/healthz` for load balancers, and endpoints marked `root` (such as a
  * plugin's `/robots.txt`). `/` redirects to the admin.
  */
-declare function createStandaloneHandler<C extends Config>(cms: EasyCMS<C>): Handler;
+declare function createStandaloneHandler<C extends Config>(cms: EasyCMS<C>, options?: {
+    trustProxy?: boolean;
+}): Handler;
 interface StartOptions extends StandaloneOptions {
     readonly port: number;
     readonly host?: string;

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   createStandaloneHandler,
   run,
   startServer
-} from "./chunk-GX6RYPUR.js";
+} from "./chunk-WCISVCEZ.js";
 export {
   createStandaloneHandler,
   run,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-cms",
-  "version": "0.63.0",
+  "version": "0.65.0",
   "description": "Command line tool for Easy CMS",
   "license": "MIT",
   "type": "module",
@@ -21,11 +21,11 @@
     "node": ">=22.12"
   },
   "dependencies": {
-    "@easy-cms/core": "^0.63.0",
-    "@easy-cms/admin": "^0.63.0"
+    "@easy-cms/core": "^0.65.0",
+    "@easy-cms/admin": "^0.65.0"
   },
   "devDependencies": {
-    "@easy-cms/db-sqlite": "^0.63.0"
+    "@easy-cms/db-sqlite": "^0.65.0"
   },
   "publishConfig": {
     "access": "public"