easy-cms 1.5.0 → 1.7.0

package/dist/bin.js

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

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

@@ -9,6 +9,7 @@ import {
   ConfigError,
   createEasyCMS as createEasyCMS2,
   EasyCMSError,
+  jsonLogger,
   loadConfig,
   ValidationError,
   warnDeprecated
@@ -17,6 +18,7 @@ import {
   copyDatabase,
   decryptBackup,
   generateTypes,
+  logFormat,
   writeBackupFile
 } from "@easy-cms/core/internal";
 
@@ -30,7 +32,11 @@ import {
   createEasyCMS,
   createRestHandler
 } from "@easy-cms/core";
-import { createRootEndpointHandler, forwardedClientIp } from "@easy-cms/core/internal";
+import {
+  createRootEndpointHandler,
+  forwardedClientIp,
+  healthResponse
+} from "@easy-cms/core/internal";
 function createStandaloneHandler(cms, options = {}) {
   const config = cms.config;
   const adminPath = `/${config.admin.path.replace(/^\/+|\/+$/g, "")}`;
@@ -47,8 +53,8 @@ function createStandaloneHandler(cms, options = {}) {
       return api(request);
     }
     if (under(pathname, adminPath)) return admin(request);
-    if (pathname === "/healthz")
-      return new Response("ok", { headers: { "cache-control": "no-store" } });
+    if (pathname === "/healthz" || pathname === "/readyz")
+      return healthResponse(pathname === "/healthz" ? "healthz" : "readyz", cms);
     clientIps.set(request, clientIp);
     const endpoint = await rootEndpoints(request);
     if (endpoint) return endpoint;
@@ -113,7 +119,7 @@ async function startServer(options) {
         await handler(toWebRequest(req, trustProxy), clientIpOf(req, trustProxy))
       );
     } catch (error) {
-      logger.error(`Request failed: ${error.message}`);
+      logger.error(`Request failed: ${error.message}`, { error });
       if (!res.headersSent) {
         res.statusCode = 500;
         res.setHeader("content-type", "application/json; charset=utf-8");
@@ -273,7 +279,7 @@ for a cron job where no server process keeps running. Servers do this every minu
   serve: `Usage: easy-cms serve [--port <n>] [--host <host>] [--watch] [--trust-proxy] [options]
 
 Runs Easy CMS without Nuxt or Next.js: the admin at /admin, the REST API at /api/cms and
-/healthz for load balancers. Frontends on other origins need \`cors\` in the config.
+/healthz and /readyz for load balancers. Frontends on other origins need \`cors\` in the config.
 
   --port <n>       Port (default: PORT, then 4000)
   --host <host>    Interface to listen on (default: HOST, then all interfaces)
@@ -570,23 +576,34 @@ async function serve(values, cwd, logger, load, io) {
     return 1;
   }
   const host = values.host ?? process.env.HOST;
+  const config = await load();
+  const json = logFormat(config.logs) === "json";
+  const serverLogger = json ? jsonLogger() : logger;
   const server = await startServer({
     port,
     ...host ? { host } : {},
     cwd,
-    logger,
+    logger: serverLogger,
     loadConfig: load,
     watch: values.watch ?? false,
     trustProxy: values["trust-proxy"] ?? false
   });
-  const config = await load();
-  io.out(`Easy CMS running at ${server.url}`);
-  io.out(`  admin  ${server.url}/${config.admin.path.replace(/^\/+|\/+$/g, "")}`);
-  io.out(`  API    ${server.url}${config.routes.api}`);
-  if (values.watch) io.out("  watching for changes");
+  const admin = `${server.url}/${config.admin.path.replace(/^\/+|\/+$/g, "")}`;
+  if (json) {
+    serverLogger.info(`Easy CMS running at ${server.url}`, {
+      admin,
+      api: `${server.url}${config.routes.api}`
+    });
+  } else {
+    io.out(`Easy CMS running at ${server.url}`);
+    io.out(`  admin  ${admin}`);
+    io.out(`  API    ${server.url}${config.routes.api}`);
+    if (values.watch) io.out("  watching for changes");
+  }
   await new Promise((resolveStop) => {
     const stop = (signal) => {
-      io.out(`
+      if (json) serverLogger.info(`${signal} received, shutting down`);
+      else io.out(`
 ${signal} received, shutting down\u2026`);
       resolveStop();
     };

package/dist/index.d.ts

@@ -8,7 +8,7 @@ interface StandaloneOptions {
 type Handler = (request: Request, clientIp?: string) => Promise<Response>;
 /**
  * One Web-standard handler for the whole standalone server: the REST API at `routes.api`, the
- * admin at `admin.path`, `/healthz` for load balancers, and endpoints marked `root` (such as a
+ * admin at `admin.path`, `/healthz` and `/readyz` 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>, options?: {

package/dist/index.js

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

package/package.json

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