✨ Update types + optional server and metrics fields

.changeset/real-dots-love.md

@@ -0,0 +1,5 @@
+---
+"@konfeature/erpc-config-generator": patch
+---
+
+Optional `server` and `metrics` field in the root config object + generation info

.changeset/serious-hornets-sin.md

@@ -0,0 +1,5 @@
+---
+"@konfeature/erpc-config-generator": patch
+---
+
+Update erpc types for erpc `v0.0.18`

src/cli/commands/generate.ts

@@ -49,6 +49,26 @@ export async function generateCmd({ print, parameters }: GluegunToolbox) {
     print.info("Config:");
     print.info(` - Projects: ${stats.projects}`);
     print.info(` - Rate limiters: ${stats.rateLimiters}`);
+    if (stats.server) {
+        print.info(
+            ` - Server IPv4: ${stats.server.hostV4}:${stats.server.port}`
+        );
+        print.info(
+            ` - Server IPv6: ${stats.server.hostV6}:${stats.server.port}`
+        );
+    } else {
+        print.info(" - Server: Will use default from eRPC config");
+    }
+    if (stats.metrics) {
+        print.info(
+            ` - Metrics IPv4: ${stats.metrics.hostV4}:${stats.metrics.port}`
+        );
+        print.info(
+            ` - Metrics IPv6: ${stats.metrics.hostV6}:${stats.metrics.port}`
+        );
+    } else {
+        print.info(" - Metrics: Not enable or not set in the config");
+    }
 
     // Write the erpc config
     spinner.text = "Writing eRPC config file";

src/cli/utils/assertion/index.ts

@@ -11,6 +11,16 @@ type ConfigCheckResult = {
     stats: {
         projects: number;
         rateLimiters: number;
+        server?: {
+            port: number;
+            hostV4: string;
+            hostV6: string;
+        };
+        metrics?: {
+            port: number;
+            hostV4: string;
+            hostV6: string;
+        };
     };
 };
 
@@ -64,6 +74,20 @@ export function checkConfigValidity(config: Config): ConfigCheckResult {
     // Update our stats object
     stats.projects = config.projects.length;
     stats.rateLimiters = config.rateLimiters?.budgets?.length ?? 0;
+    stats.server = config.server
+        ? {
+              port: config.server.httpPort,
+              hostV4: config.server.httpHostV4,
+              hostV6: config.server.httpHostV6,
+          }
+        : undefined;
+    stats.metrics = config.metrics?.enabled
+        ? {
+              port: config.metrics.port,
+              hostV4: config.metrics.hostV4,
+              hostV6: config.metrics.hostV6,
+          }
+        : undefined;
 
     // Check for projects duplication
     errors.push(...checkProjectsDuplication(config));

src/config.ts

@@ -1,8 +1,43 @@
-import type { Config } from "./generatedTypes/erpcTypes";
+import type {
+    Config,
+    MetricsConfig,
+    ServerConfig,
+} from "./generatedTypes/erpcTypes";
+import type { OptionalField } from "./types/utils";
+
+type ConfigWithOptionalServer = Omit<Config, "server" | "metrics"> & {
+    server?: OptionalField<
+        ServerConfig,
+        "httpPort" | "httpHostV4" | "httpHostV6"
+    >;
+    metrics?: OptionalField<MetricsConfig, "port" | "hostV4" | "hostV6">;
+};
+
+// Default config for metrics and server
+const defaultServerConfig = {
+    httpPort: 4000,
+    httpHostV4: "0.0.0.0",
+    httpHostV6: "[::]",
+};
+const defaultMetricsCofnig = {
+    port: 4001,
+    hostV4: "0.0.0.0",
+    hostV6: "[::]",
+};
 
 /**
  * Build the globel erpc config
  */
-export function buildErpcConfig({ config }: { config: Config }) {
-    return config;
+export function buildErpcConfig({
+    config,
+}: { config: ConfigWithOptionalServer }) {
+    return {
+        ...config,
+        server: config?.server
+            ? { ...defaultServerConfig, ...config.server }
+            : undefined,
+        metrics: config?.metrics
+            ? { ...defaultMetricsCofnig, ...config.metrics }
+            : undefined,
+    };
 }

src/generatedTypes/erpcTypes.ts

@@ -16,7 +16,8 @@ export interface Config {
   admin?: AdminConfig;
 }
 export interface ServerConfig {
-  httpHost: string;
+  httpHostV4: string;
+  httpHostV6: string;
   httpPort: number /* int */;
   maxTimeout: string;
 }
@@ -216,7 +217,8 @@ export interface NetworkStrategyConfig {
 }
 export interface MetricsConfig {
   enabled: boolean;
-  host: string;
+  hostV4: string;
+  hostV6: string;
   port: number /* int */;
 }
 
@@ -243,6 +245,8 @@ export type Network = any;
 export type UpstreamType = string;
 export const UpstreamTypeEvm: UpstreamType = "evm";
 export const UpstreamTypeEvmAlchemy: UpstreamType = "evm+alchemy";
+export const UpstreamTypeEvmDrpc: UpstreamType = "evm+drpc";
+export const UpstreamTypeEvmBlastapi: UpstreamType = "evm+blastapi";
 export const UpstreamTypeEvmEnvio: UpstreamType = "evm+envio";
 export const UpstreamTypeEvmPimlico: UpstreamType = "evm+pimlico";
 export const UpstreamTypeEvmThirdweb: UpstreamType = "evm+thirdweb";