@aztec/aztec-node 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

package/src/bin/index.ts

@@ -1,11 +1,23 @@
 #!/usr/bin/env -S node --no-warnings
+import {
+  type NamespacedApiHandlers,
+  createNamespacedSafeJsonRpcServer,
+  startHttpRpcServer,
+} from '@aztec/foundation/json-rpc/server';
 import { createLogger } from '@aztec/foundation/log';
-import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
-import { createTracedJsonRpcServer } from '@aztec/telemetry-client';
+import { getRpcCorsAllowedOrigins } from '@aztec/stdlib/config';
+import {
+  getOtelJsonRpcDiagnosticsMiddleware,
+  getOtelJsonRpcPropagationMiddleware,
+  getOtelJsonRpcServerMetricsMiddleware,
+} from '@aztec/telemetry-client';
 
-import http from 'http';
-
-import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '../index.js';
+import {
+  type AztecNodeConfig,
+  createAztecNodeService,
+  getConfigEnvVars,
+  registerAztecNodeRpcHandlers,
+} from '../index.js';
 
 const { AZTEC_NODE_PORT = 8081, API_PREFIX = '' } = process.env;
 
@@ -14,10 +26,8 @@ const logger = createLogger('node');
 /**
  * Creates the node from provided config
  */
-async function createAndDeployAztecNode() {
-  const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars() };
-
-  return await AztecNodeService.createAndSync(aztecNodeConfig);
+async function createAndDeployAztecNode(aztecNodeConfig: AztecNodeConfig) {
+  return await createAztecNodeService(aztecNodeConfig);
 }
 
 /**
@@ -26,7 +36,8 @@ async function createAndDeployAztecNode() {
 async function main() {
   logger.info(`Setting up Aztec Node...`);
 
-  const aztecNode = await createAndDeployAztecNode();
+  const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars() };
+  const aztecNode = await createAndDeployAztecNode(aztecNodeConfig);
 
   const shutdown = async () => {
     logger.info('Shutting down...');
@@ -39,12 +50,24 @@ async function main() {
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   process.once('SIGTERM', shutdown);
 
-  const rpcServer = createTracedJsonRpcServer(aztecNode, AztecNodeApiSchema);
-  const app = rpcServer.getApp(API_PREFIX);
-
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  const httpServer = http.createServer(app.callback());
-  httpServer.listen(+AZTEC_NODE_PORT);
+  const services: NamespacedApiHandlers = {};
+  registerAztecNodeRpcHandlers(aztecNode, services, undefined, {
+    p2pHealthMinPeers: aztecNodeConfig.p2pHealthMinPeers,
+  });
+  const rpcServer = createNamespacedSafeJsonRpcServer(services, {
+    diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
+    middlewares: [getOtelJsonRpcServerMetricsMiddleware(), getOtelJsonRpcPropagationMiddleware()],
+    maxBatchSize: aztecNodeConfig.rpcMaxBatchSize,
+    maxBodySizeBytes: aztecNodeConfig.rpcMaxBodySize,
+    corsAllowedHeaders: aztecNodeConfig.rpcCorsAllowedHeaders ?? [],
+    corsAllowedOrigins: getRpcCorsAllowedOrigins(aztecNodeConfig),
+  });
+  await startHttpRpcServer(rpcServer, {
+    port: +AZTEC_NODE_PORT,
+    apiPrefix: API_PREFIX,
+    keepAliveTimeoutMs: aztecNodeConfig.rpcHttpKeepAliveTimeoutMs,
+    headersTimeoutMs: aztecNodeConfig.rpcHttpHeadersTimeoutMs,
+  });
   logger.info(`Aztec Node JSON-RPC Server listening on port ${AZTEC_NODE_PORT}`);
 }