@cedarjs/api-server 6.0.0-canary.2832 → 6.0.0-canary.2834

package/dist/apiCLIConfigHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/apiCLIConfigHandler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,wBAAsB,OAAO,CAAC,OAAO,GAAE,gBAAqB,iBAoC3D"}
+{"version":3,"file":"apiCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/apiCLIConfigHandler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,wBAAsB,OAAO,CAAC,OAAO,GAAE,gBAAqB,iBA4C3D"}

package/dist/apiCLIConfigHandler.js

@@ -1,7 +1,12 @@
 import ansis from "ansis";
 import { coerceRootPath } from "@cedarjs/fastify-web";
 import { createServer } from "./createServer.js";
+import { apiDistServerFileExists, runApiDistServerFile } from "./serverFile.js";
 async function handler(options = {}) {
+  if (apiDistServerFileExists()) {
+    await runApiDistServerFile(options);
+    return;
+  }
   const timeStart = Date.now();
   console.log(ansis.dim.italic("Starting API Server..."));
   options.apiRootPath = coerceRootPath(options.apiRootPath ?? "/");

package/dist/bin.js

@@ -651,8 +651,8 @@ async function cedarFastifyGraphQLServer(fastify2, options) {
     throw e;
   }
 }
-function trimSlashes(path5) {
-  return path5.replace(/^\/|\/$/g, "");
+function trimSlashes(path6) {
+  return path6.replace(/^\/|\/$/g, "");
 }
 function createFetchRequest(req, reply) {
   const controller = new AbortController();
@@ -792,10 +792,51 @@ var init_createServer = __esm({
   }
 });
 
+// src/serverFile.ts
+import { spawn } from "node:child_process";
+import fs3 from "node:fs";
+import path4 from "node:path";
+import { getPaths as getPaths5 } from "@cedarjs/project-config";
+function apiDistServerFilePath() {
+  return path4.join(getPaths5().api.dist, "server.js");
+}
+function apiDistServerFileExists() {
+  return fs3.existsSync(apiDistServerFilePath());
+}
+async function runApiDistServerFile(options = {}) {
+  const args = ["--apiRootPath", options.apiRootPath ?? "/"];
+  if (options.port !== void 0) {
+    args.push("--apiPort", String(options.port));
+  }
+  await new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [apiDistServerFilePath(), ...args], {
+      cwd: getPaths5().api.dist,
+      stdio: "inherit"
+    });
+    child.on("error", reject);
+    child.on("exit", (code, signal) => {
+      if (signal || code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`api/dist/server.js exited with code ${code}`));
+    });
+  });
+}
+var init_serverFile = __esm({
+  "src/serverFile.ts"() {
+    "use strict";
+  }
+});
+
 // src/apiCLIConfigHandler.ts
 import ansis3 from "ansis";
 import { coerceRootPath as coerceRootPath4 } from "@cedarjs/fastify-web";
 async function handler(options = {}) {
+  if (apiDistServerFileExists()) {
+    await runApiDistServerFile(options);
+    return;
+  }
   const timeStart = Date.now();
   console.log(ansis3.dim.italic("Starting API Server..."));
   options.apiRootPath = coerceRootPath4(options.apiRootPath ?? "/");
@@ -826,6 +867,7 @@ var init_apiCLIConfigHandler = __esm({
   "src/apiCLIConfigHandler.ts"() {
     "use strict";
     init_createServer();
+    init_serverFile();
   }
 });
 
@@ -833,6 +875,11 @@ var init_apiCLIConfigHandler = __esm({
 import ansis4 from "ansis";
 import { redwoodFastifyWeb, coerceRootPath as coerceRootPath5 } from "@cedarjs/fastify-web";
 async function handler2(options) {
+  if (apiDistServerFileExists()) {
+    throw new Error(
+      "api/dist/server.js was found, but a custom server file is not supported when serving both sides from one process (`cedarjs-server` / `cedar serve`). It is a Fastify concept. Anything registered there (Realtime, custom plugins, custom middleware) would silently be skipped if this continued.\n\nRun the api and web sides as separate processes instead, so the api side goes through `cedarjs-server api`, which does run your server file:\n\n  cedarjs-server api\n  cedarjs-server web"
+    );
+  }
   const timeStart = Date.now();
   console.log(ansis4.dim.italic("Starting API and Web Servers..."));
   options.webHost ??= getWebHost({ isPublicSide: true });
@@ -903,15 +950,16 @@ var init_bothCLIConfigHandler = __esm({
     init_cliHelpers();
     init_createServer();
     init_fastify();
+    init_serverFile();
   }
 });
 
 // src/bin.ts
-import path4 from "path";
+import path5 from "path";
 import { config as config2 } from "dotenv-defaults";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs/yargs";
-import { getPaths as getPaths5 } from "@cedarjs/project-config";
+import { getPaths as getPaths6 } from "@cedarjs/project-config";
 import {
   description as webDescription,
   builder as webBuilder,
@@ -986,8 +1034,8 @@ function builder2(yargs2) {
 init_bothCLIConfigHandler();
 if (!process.env.CEDAR_ENV_FILES_LOADED) {
   config2({
-    path: path4.join(getPaths5().base, ".env"),
-    defaults: path4.join(getPaths5().base, ".env.defaults"),
+    path: path5.join(getPaths6().base, ".env"),
+    defaults: path5.join(getPaths6().base, ".env.defaults"),
     multiline: true
   });
   process.env.CEDAR_ENV_FILES_LOADED = "true";

package/dist/bothCLIConfigHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bothCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/bothCLIConfigHandler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBAsEvD"}
+{"version":3,"file":"bothCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/bothCLIConfigHandler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBA0FvD"}

package/dist/bothCLIConfigHandler.js

@@ -3,7 +3,13 @@ import { redwoodFastifyWeb, coerceRootPath } from "@cedarjs/fastify-web";
 import { getWebHost, getWebPort, getAPIHost, getAPIPort } from "./cliHelpers.js";
 import { createServer as createApiServer } from "./createServer.js";
 import { createFastifyInstance } from "./fastify.js";
+import { apiDistServerFileExists } from "./serverFile.js";
 async function handler(options) {
+  if (apiDistServerFileExists()) {
+    throw new Error(
+      "api/dist/server.js was found, but a custom server file is not supported when serving both sides from one process (`cedarjs-server` / `cedar serve`). It is a Fastify concept. Anything registered there (Realtime, custom plugins, custom middleware) would silently be skipped if this continued.\n\nRun the api and web sides as separate processes instead, so the api side goes through `cedarjs-server api`, which does run your server file:\n\n  cedarjs-server api\n  cedarjs-server web"
+    );
+  }
   const timeStart = Date.now();
   console.log(ansis.dim.italic("Starting API and Web Servers..."));
   options.webHost ??= getWebHost({ isPublicSide: true });

package/dist/serverFile.d.ts

@@ -0,0 +1,23 @@
+import type { APIParsedOptions } from './types.js';
+/**
+ * Path to a project's built custom server file, if it has one.
+ *
+ * This checks `api/dist/server.js` — the built output — not
+ * `api/src/server.{ts,js}`, which is what `@cedarjs/cli`'s own
+ * `serverFileExists()` checks. A production install typically ships only
+ * `api/dist`, so checking source would return false in exactly the
+ * situation this needs to catch.
+ */
+export declare function apiDistServerFilePath(): string;
+export declare function apiDistServerFileExists(): boolean;
+/**
+ * Run a project's custom `api/dist/server.js` instead of the default Fastify
+ * server.
+ *
+ * Reimplements what `@cedarjs/cli`'s `apiServerFileHandler` does for
+ * `cedar serve api`, rather than importing it — `@cedarjs/cli` pulls in its
+ * whole build/dev toolchain, which is exactly what a production install of
+ * this package needs to stay clear of.
+ */
+export declare function runApiDistServerFile(options?: APIParsedOptions): Promise<void>;
+//# sourceMappingURL=serverFile.d.ts.map

package/dist/serverFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverFile.d.ts","sourceRoot":"","sources":["../src/serverFile.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

package/dist/serverFile.js

@@ -0,0 +1,35 @@
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { getPaths } from "@cedarjs/project-config";
+function apiDistServerFilePath() {
+  return path.join(getPaths().api.dist, "server.js");
+}
+function apiDistServerFileExists() {
+  return fs.existsSync(apiDistServerFilePath());
+}
+async function runApiDistServerFile(options = {}) {
+  const args = ["--apiRootPath", options.apiRootPath ?? "/"];
+  if (options.port !== void 0) {
+    args.push("--apiPort", String(options.port));
+  }
+  await new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [apiDistServerFilePath(), ...args], {
+      cwd: getPaths().api.dist,
+      stdio: "inherit"
+    });
+    child.on("error", reject);
+    child.on("exit", (code, signal) => {
+      if (signal || code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`api/dist/server.js exited with code ${code}`));
+    });
+  });
+}
+export {
+  apiDistServerFileExists,
+  apiDistServerFilePath,
+  runApiDistServerFile
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "6.0.0-canary.2832",
+  "version": "6.0.0-canary.2834",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -92,11 +92,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/api": "6.0.0-canary.2832",
-    "@cedarjs/context": "6.0.0-canary.2832",
-    "@cedarjs/fastify-web": "6.0.0-canary.2832",
-    "@cedarjs/project-config": "6.0.0-canary.2832",
-    "@cedarjs/web-server": "6.0.0-canary.2832",
+    "@cedarjs/api": "6.0.0-canary.2834",
+    "@cedarjs/context": "6.0.0-canary.2834",
+    "@cedarjs/fastify-web": "6.0.0-canary.2834",
+    "@cedarjs/project-config": "6.0.0-canary.2834",
+    "@cedarjs/web-server": "6.0.0-canary.2834",
     "@fastify/multipart": "9.4.0",
     "@fastify/url-data": "6.0.3",
     "ansis": "4.3.1",
@@ -113,7 +113,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2832",
+    "@cedarjs/framework-tools": "6.0.0-canary.2834",
     "@types/aws-lambda": "8.10.162",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/split2": "4.2.3",
@@ -128,7 +128,7 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "6.0.0-canary.2832"
+    "@cedarjs/graphql-server": "6.0.0-canary.2834"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {