@redmix/api-server 9.0.0-canary.624 → 9.0.0-canary.627

package/dist/apiCLIConfigHandler.d.ts.map

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

package/dist/apiCLIConfigHandler.js

@@ -33,17 +33,16 @@ __export(apiCLIConfigHandler_exports, {
 module.exports = __toCommonJS(apiCLIConfigHandler_exports);
 var import_chalk = __toESM(require("chalk"));
 var import_fastify_web = require("@redmix/fastify-web");
-var import_cliHelpers = require("./cliHelpers");
 var import_createServer = require("./createServer");
 async function handler(options = {}) {
   const timeStart = Date.now();
   console.log(import_chalk.default.dim.italic("Starting API Server..."));
   options.apiRootPath = (0, import_fastify_web.coerceRootPath)(options.apiRootPath ?? "/");
   const fastify = await (0, import_createServer.createServer)({
-    apiRootPath: options.apiRootPath
+    apiRootPath: options.apiRootPath,
+    apiHost: options.host,
+    apiPort: options.port
   });
-  options.host ??= (0, import_cliHelpers.getAPIHost)();
-  options.port ??= (0, import_cliHelpers.getAPIPort)();
   await fastify.start();
   fastify.log.trace(
     { custom: { ...fastify.initialConfig } },

package/dist/bin.js

@@ -60,19 +60,20 @@ var init_cliHelpers = __esm({
 // src/createServerHelpers.ts
 function resolveOptions(options = {}, args) {
   options.parseArgs ??= true;
-  options.logger ??= DEFAULT_CREATE_SERVER_OPTIONS.logger;
+  const defaults = getDefaultCreateServerOptions();
+  options.logger ??= defaults.logger;
   const resolvedOptions = {
-    apiRootPath: options.apiRootPath ?? DEFAULT_CREATE_SERVER_OPTIONS.apiRootPath,
+    apiRootPath: options.apiRootPath ?? defaults.apiRootPath,
     fastifyServerOptions: options.fastifyServerOptions ?? {
-      requestTimeout: DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.requestTimeout,
-      logger: options.logger ?? DEFAULT_CREATE_SERVER_OPTIONS.logger,
-      bodyLimit: DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.bodyLimit
+      requestTimeout: defaults.fastifyServerOptions.requestTimeout,
+      logger: options.logger ?? defaults.logger,
+      bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
-    configureApiServer: options.configureApiServer ?? DEFAULT_CREATE_SERVER_OPTIONS.configureApiServer,
-    apiHost: getAPIHost(),
-    apiPort: getAPIPort()
+    configureApiServer: options.configureApiServer ?? defaults.configureApiServer,
+    apiHost: options.apiHost ?? defaults.apiHost,
+    apiPort: options.apiPort ?? defaults.apiPort
   };
-  resolvedOptions.fastifyServerOptions.requestTimeout ??= DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.requestTimeout;
+  resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
   resolvedOptions.fastifyServerOptions.logger = options.logger;
   if (options.parseArgs) {
     const { values } = (0, import_util.parseArgs)({
@@ -113,14 +114,14 @@ function resolveOptions(options = {}, args) {
   resolvedOptions.apiRootPath = (0, import_helpers.coerceRootPath)(resolvedOptions.apiRootPath);
   return resolvedOptions;
 }
-var import_util, import_helpers, DEFAULT_CREATE_SERVER_OPTIONS;
+var import_util, import_helpers, getDefaultCreateServerOptions;
 var init_createServerHelpers = __esm({
   "src/createServerHelpers.ts"() {
     "use strict";
     import_util = require("util");
     import_helpers = require("@redmix/fastify-web/dist/helpers");
     init_cliHelpers();
-    DEFAULT_CREATE_SERVER_OPTIONS = {
+    getDefaultCreateServerOptions = () => ({
       apiRootPath: "/",
       logger: {
         level: process.env.LOG_LEVEL ?? (process.env.NODE_ENV === "development" ? "debug" : "warn")
@@ -132,8 +133,10 @@ var init_createServerHelpers = __esm({
       },
       configureApiServer: () => {
       },
-      parseArgs: true
-    };
+      parseArgs: true,
+      apiHost: getAPIHost(),
+      apiPort: getAPIPort()
+    });
   }
 });
 
@@ -639,10 +642,10 @@ async function handler(options = {}) {
   console.log(import_chalk3.default.dim.italic("Starting API Server..."));
   options.apiRootPath = (0, import_fastify_web.coerceRootPath)(options.apiRootPath ?? "/");
   const fastify2 = await createServer({
-    apiRootPath: options.apiRootPath
+    apiRootPath: options.apiRootPath,
+    apiHost: options.host,
+    apiPort: options.port
   });
-  options.host ??= getAPIHost();
-  options.port ??= getAPIPort();
   await fastify2.start();
   fastify2.log.trace(
     { custom: { ...fastify2.initialConfig } },
@@ -667,7 +670,6 @@ var init_apiCLIConfigHandler = __esm({
     "use strict";
     import_chalk3 = __toESM(require("chalk"));
     import_fastify_web = require("@redmix/fastify-web");
-    init_cliHelpers();
     init_createServer();
   }
 });

package/dist/createServerHelpers.d.ts

@@ -4,36 +4,30 @@ export interface Server extends FastifyInstance {
     start: (options?: StartOptions) => Promise<string>;
 }
 export interface CreateServerOptions {
-    /**
-     * The prefix for all routes. Defaults to `/`.
-     */
+    /** The prefix for all routes. Defaults to `/` */
     apiRootPath?: string;
-    /**
-     * Logger instance or options.
-     */
+    /** Logger instance or options */
     logger?: FastifyServerOptions['logger'];
     /**
      * Options for the fastify server instance.
      * Omitting logger here because we move it up.
      */
     fastifyServerOptions?: Omit<FastifyServerOptions, 'logger'>;
-    /**
-     * Customise the API server fastify plugin before it is registered
-     */
+    /** Customise the API server fastify plugin before it is registered */
     configureApiServer?: (server: Server) => void | Promise<void>;
-    /**
-     * Whether to parse args or not. Defaults to `true`.
-     */
+    /** Whether to parse args or not. Defaults to `true` */
     parseArgs?: boolean;
+    /** The port to listen on. Defaults to what's configured in redwood.toml */
+    apiPort?: number;
+    /** The host to bind to. Defaults to what's configured in redwood.toml */
+    apiHost?: string;
 }
 type DefaultCreateServerOptions = Required<Omit<CreateServerOptions, 'fastifyServerOptions'> & {
     fastifyServerOptions: FastifyServerOptions;
 }>;
-export declare const DEFAULT_CREATE_SERVER_OPTIONS: DefaultCreateServerOptions;
+export declare const getDefaultCreateServerOptions: () => DefaultCreateServerOptions;
 export declare function resolveOptions(options?: CreateServerOptions, args?: string[]): Required<Omit<CreateServerOptions, "logger" | "fastifyServerOptions" | "parseArgs"> & {
     fastifyServerOptions: FastifyServerOptions;
-    apiPort: number;
-    apiHost: string;
 }>;
 export {};
 //# sourceMappingURL=createServerHelpers.d.ts.map

package/dist/createServerHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServerHelpers.d.ts","sourceRoot":"","sources":["../src/createServerHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,SAAS,CAAA;AAMhB,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AAEtE,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,MAAM,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IAEvC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;IAE3D;;OAEG;IACH,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE7D;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,KAAK,0BAA0B,GAAG,QAAQ,CACxC,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG;IAClD,oBAAoB,EAAE,oBAAoB,CAAA;CAC3C,CACF,CAAA;AAED,eAAO,MAAM,6BAA6B,EAAE,0BAa3C,CAAA;AAUD,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BARS,oBAAoB;aACjC,MAAM;aACN,MAAM;GA+ElB"}
+{"version":3,"file":"createServerHelpers.d.ts","sourceRoot":"","sources":["../src/createServerHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,SAAS,CAAA;AAMhB,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AAEtE,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,iCAAiC;IACjC,MAAM,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IAEvC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;IAE3D,sEAAsE;IACtE,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE7D,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,KAAK,0BAA0B,GAAG,QAAQ,CACxC,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG;IAClD,oBAAoB,EAAE,oBAAoB,CAAA;CAC3C,CACF,CAAA;AAID,eAAO,MAAM,6BAA6B,EAAE,MAAM,0BAgB9C,CAAA;AAQJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BANS,oBAAoB;GA8E7C"}

package/dist/createServerHelpers.js

@@ -18,14 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createServerHelpers_exports = {};
 __export(createServerHelpers_exports, {
-  DEFAULT_CREATE_SERVER_OPTIONS: () => DEFAULT_CREATE_SERVER_OPTIONS,
+  getDefaultCreateServerOptions: () => getDefaultCreateServerOptions,
   resolveOptions: () => resolveOptions
 });
 module.exports = __toCommonJS(createServerHelpers_exports);
 var import_util = require("util");
 var import_helpers = require("@redmix/fastify-web/dist/helpers");
 var import_cliHelpers = require("./cliHelpers");
-const DEFAULT_CREATE_SERVER_OPTIONS = {
+const getDefaultCreateServerOptions = () => ({
   apiRootPath: "/",
   logger: {
     level: process.env.LOG_LEVEL ?? (process.env.NODE_ENV === "development" ? "debug" : "warn")
@@ -37,23 +37,26 @@ const DEFAULT_CREATE_SERVER_OPTIONS = {
   },
   configureApiServer: () => {
   },
-  parseArgs: true
-};
+  parseArgs: true,
+  apiHost: (0, import_cliHelpers.getAPIHost)(),
+  apiPort: (0, import_cliHelpers.getAPIPort)()
+});
 function resolveOptions(options = {}, args) {
   options.parseArgs ??= true;
-  options.logger ??= DEFAULT_CREATE_SERVER_OPTIONS.logger;
+  const defaults = getDefaultCreateServerOptions();
+  options.logger ??= defaults.logger;
   const resolvedOptions = {
-    apiRootPath: options.apiRootPath ?? DEFAULT_CREATE_SERVER_OPTIONS.apiRootPath,
+    apiRootPath: options.apiRootPath ?? defaults.apiRootPath,
     fastifyServerOptions: options.fastifyServerOptions ?? {
-      requestTimeout: DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.requestTimeout,
-      logger: options.logger ?? DEFAULT_CREATE_SERVER_OPTIONS.logger,
-      bodyLimit: DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.bodyLimit
+      requestTimeout: defaults.fastifyServerOptions.requestTimeout,
+      logger: options.logger ?? defaults.logger,
+      bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
-    configureApiServer: options.configureApiServer ?? DEFAULT_CREATE_SERVER_OPTIONS.configureApiServer,
-    apiHost: (0, import_cliHelpers.getAPIHost)(),
-    apiPort: (0, import_cliHelpers.getAPIPort)()
+    configureApiServer: options.configureApiServer ?? defaults.configureApiServer,
+    apiHost: options.apiHost ?? defaults.apiHost,
+    apiPort: options.apiPort ?? defaults.apiPort
   };
-  resolvedOptions.fastifyServerOptions.requestTimeout ??= DEFAULT_CREATE_SERVER_OPTIONS.fastifyServerOptions.requestTimeout;
+  resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
   resolvedOptions.fastifyServerOptions.logger = options.logger;
   if (options.parseArgs) {
     const { values } = (0, import_util.parseArgs)({
@@ -96,6 +99,6 @@ function resolveOptions(options = {}, args) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DEFAULT_CREATE_SERVER_OPTIONS,
+  getDefaultCreateServerOptions,
   resolveOptions
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redmix/api-server",
-  "version": "9.0.0-canary.624+33697ee95",
+  "version": "9.0.0-canary.627+da923d67a",
   "description": "Redwood's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -31,11 +31,11 @@
   "dependencies": {
     "@fastify/multipart": "8.3.1",
     "@fastify/url-data": "5.4.0",
-    "@redmix/context": "9.0.0-canary.624",
-    "@redmix/fastify-web": "9.0.0-canary.624",
-    "@redmix/internal": "9.0.0-canary.624",
-    "@redmix/project-config": "9.0.0-canary.624",
-    "@redmix/web-server": "9.0.0-canary.624",
+    "@redmix/context": "9.0.0-canary.627",
+    "@redmix/fastify-web": "9.0.0-canary.627",
+    "@redmix/internal": "9.0.0-canary.627",
+    "@redmix/project-config": "9.0.0-canary.627",
+    "@redmix/web-server": "9.0.0-canary.627",
     "chalk": "4.1.2",
     "chokidar": "3.6.0",
     "dotenv-defaults": "5.0.2",
@@ -51,7 +51,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@redmix/framework-tools": "9.0.0-canary.624",
+    "@redmix/framework-tools": "9.0.0-canary.627",
     "@types/aws-lambda": "8.10.145",
     "@types/lodash": "4.17.15",
     "@types/qs": "6.9.16",
@@ -63,12 +63,12 @@
     "vitest": "2.1.9"
   },
   "peerDependencies": {
-    "@redmix/graphql-server": "9.0.0-canary.624"
+    "@redmix/graphql-server": "9.0.0-canary.627"
   },
   "peerDependenciesMeta": {
     "@redmix/graphql-server": {
       "optional": true
     }
   },
-  "gitHead": "33697ee95783d054983eb7599b4a6eeabef73a94"
+  "gitHead": "da923d67aea3c0e3546d988d90db2c084fbcec45"
 }