@usherlabs/cex-broker 0.2.48 → 0.2.49

package/dist/commands/cli.js

@@ -313534,16 +313534,20 @@ var tslogLogger = new Logger({
   minLevel: process.env.LOG_LEVEL === "debug" ? 0 : 3
 });
 var baseLogger = new LogLayer({
-  transport: [
-    new TsLogTransport({ id: "tslog", logger: tslogLogger }),
-    new OpenTelemetryTransport({
-      id: "otel",
-      enabled: true
-    })
-  ],
+  transport: [new TsLogTransport({ id: "tslog", logger: tslogLogger })],
   plugins: [openTelemetryPlugin()],
   errorSerializer: serializeError
 });
+var OTEL_TRANSPORT_ID = "otel";
+function attachOtelLogTransport() {
+  baseLogger.addTransport(new OpenTelemetryTransport({
+    id: OTEL_TRANSPORT_ID,
+    enabled: true
+  }));
+}
+function detachOtelLogTransport() {
+  baseLogger.removeTransport(OTEL_TRANSPORT_ID);
+}
 if (process.env.LOG_LEVEL !== "debug") {
   baseLogger.setLevel("info");
 }
@@ -317970,11 +317974,14 @@ var import_sdk_metrics = __toESM(require_src12(), 1);
 var DEFAULT_SERVICE = "cex-broker";
 var DEFAULT_OTLP_PORT = 4318;
 var EXPORT_INTERVAL_MS = 5000;
+var EXPORT_TIMEOUT_MS = 2000;
+var SHUTDOWN_TIMEOUT_MS = 3000;
 
 class BaseOtelSignal {
   signal;
   provider = null;
   isEnabled = false;
+  closePromise = null;
   serviceName;
   constructor(config, signal) {
     this.signal = signal;
@@ -318006,19 +318013,35 @@ class BaseOtelSignal {
   isOtelEnabled() {
     return this.isEnabled && this.provider !== null;
   }
-  async close() {
-    if (!this.provider) {
-      return;
-    }
-    try {
-      await this.shutdownProvider(this.provider);
-      log.info(`OTel ${this.signal} provider shut down`);
-    } catch (error) {
-      log.error(`Error shutting down OTel ${this.signal} provider:`, error);
-    }
+  close() {
+    if (this.closePromise)
+      return this.closePromise;
+    const provider = this.provider;
     this.provider = null;
     this.isEnabled = false;
     this.onProviderClosed();
+    if (!provider) {
+      this.closePromise = Promise.resolve();
+      return this.closePromise;
+    }
+    const shutdown = Promise.resolve().then(() => this.shutdownProvider(provider)).then(() => {
+      log.info(`OTel ${this.signal} provider shut down`);
+    }, (error) => {
+      log.error(`Error shutting down OTel ${this.signal} provider:`, error);
+    });
+    let deadlineTimer;
+    const deadline = new Promise((resolve) => {
+      deadlineTimer = setTimeout(() => {
+        deadlineTimer = undefined;
+        log.warn(`OTel ${this.signal} provider shutdown exceeded ${SHUTDOWN_TIMEOUT_MS}ms; continuing shutdown`);
+        resolve();
+      }, SHUTDOWN_TIMEOUT_MS);
+    });
+    this.closePromise = Promise.race([shutdown, deadline]).finally(() => {
+      if (deadlineTimer !== undefined)
+        clearTimeout(deadlineTimer);
+    });
+    return this.closePromise;
   }
 }
 function toAttributes(labels, service) {
@@ -318041,11 +318064,13 @@ class OtelMetrics extends BaseOtelSignal {
   }
   createProvider(endpoint, serviceName, appendSignalPath) {
     const exporter = new import_exporter_metrics_otlp_http.OTLPMetricExporter({
-      url: appendOtlpPath(endpoint, "metrics", appendSignalPath)
+      url: appendOtlpPath(endpoint, "metrics", appendSignalPath),
+      timeoutMillis: EXPORT_TIMEOUT_MS
     });
     const reader = new import_sdk_metrics.PeriodicExportingMetricReader({
       exporter,
-      exportIntervalMillis: EXPORT_INTERVAL_MS
+      exportIntervalMillis: EXPORT_INTERVAL_MS,
+      exportTimeoutMillis: EXPORT_TIMEOUT_MS
     });
     const resource = import_resources.resourceFromAttributes({
       "service.name": serviceName
@@ -318166,15 +318191,23 @@ class OtelMetrics extends BaseOtelSignal {
 }
 
 class OtelLogs extends BaseOtelSignal {
-  logger = null;
+  logger;
   constructor(config) {
     super(config, "logs");
+    const provider = this.getProvider();
+    this.logger = provider?.getLogger("cex-broker-logs", "1.0.0") ?? null;
+    if (provider) {
+      attachOtelLogTransport();
+    }
   }
   createProvider(endpoint, serviceName, appendSignalPath) {
     const exporter = new import_exporter_logs_otlp_http.OTLPLogExporter({
-      url: appendOtlpPath(endpoint, "logs", appendSignalPath)
+      url: appendOtlpPath(endpoint, "logs", appendSignalPath),
+      timeoutMillis: EXPORT_TIMEOUT_MS
+    });
+    const processor = new import_sdk_logs.BatchLogRecordProcessor(exporter, {
+      exportTimeoutMillis: EXPORT_TIMEOUT_MS
     });
-    const processor = new import_sdk_logs.BatchLogRecordProcessor(exporter);
     const resource = import_resources.resourceFromAttributes({
       "service.name": serviceName
     });
@@ -318185,12 +318218,12 @@ class OtelLogs extends BaseOtelSignal {
   }
   onProviderCreated(provider) {
     import_api_logs3.logs.setGlobalLoggerProvider(provider);
-    this.logger = provider.getLogger("cex-broker-logs", "1.0.0");
   }
   shutdownProvider(provider) {
-    return provider.forceFlush().then(() => provider.shutdown());
+    return provider.shutdown();
   }
   onProviderClosed() {
+    detachOtelLogTransport();
     this.logger = null;
   }
   emit(record) {
@@ -337587,12 +337620,7 @@ class CEXBroker {
     if (this.brokerArchiver) {
       await this.brokerArchiver.close();
     }
-    if (this.otelMetrics) {
-      await this.otelMetrics.close();
-    }
-    if (this.otelLogs) {
-      await this.otelLogs.close();
-    }
+    await Promise.all([this.otelMetrics?.close(), this.otelLogs?.close()]);
   }
   async run() {
     const marketArchiveState = resolveMarketCaptureArchiveState({
@@ -337717,8 +337745,25 @@ async function startBrokerCommand(policyPath, port, whitelistIps, verityProverUr
   });
   broker.loadEnvConfig();
   await broker.run();
+  return broker;
 }
 
+// src/helpers/logger.ts
+var tslogLogger2 = new Logger({
+  type: "pretty",
+  stylePrettyLogs: true,
+  minLevel: process.env.LOG_LEVEL === "debug" ? 0 : 3
+});
+var baseLogger2 = new LogLayer({
+  transport: [new TsLogTransport({ id: "tslog", logger: tslogLogger2 })],
+  plugins: [openTelemetryPlugin()],
+  errorSerializer: serializeError
+});
+if (process.env.LOG_LEVEL !== "debug") {
+  baseLogger2.setLevel("info");
+}
+var log2 = baseLogger2;
+
 // src/cli.ts
 var program2 = new Command;
 program2.name("cex-broker").description("CLI to start the CEXBroker service").requiredOption("-p, --policy <path>", "Policy JSON file").option("--port <number>", "Port number (default: 8086)", "8086").option("-w, --whitelist <addresses...>", "IPv4 address whitelist (space-separated list)").option("--whitelistAll", "Allow all IPv4 addresses (development mode)").option("--verityProverUrl <url>", "Verity Prover Url").action(async (options) => {
@@ -337728,15 +337773,35 @@ program2.name("cex-broker").description("CLI to start the CEXBroker service").re
       const isValidIPv4 = (ip) => /^(\d{1,3}\.){3}\d{1,3}$/.test(ip) && ip.split(".").every((part) => Number(part) >= 0 && Number(part) <= 255);
       for (const ip of whitelist) {
         if (!isValidIPv4(ip)) {
-          console.error(`\u274C Invalid IPv4 address: ${ip}`);
-          process.exit(1);
+          throw new Error(`Invalid IPv4 address: ${ip}`);
         }
       }
     }
-    await startBrokerCommand(options.policy, parseInt(options.port, 10), whitelist, options.verityProverUrl);
+    const broker = await startBrokerCommand(options.policy, parseInt(options.port, 10), whitelist, options.verityProverUrl);
+    let shutdownPromise;
+    const onSignal = (signal) => {
+      if (shutdownPromise)
+        return;
+      log2.withMetadata({ signal }).info("CEXBroker graceful shutdown requested");
+      shutdownPromise = (async () => {
+        try {
+          await broker.stop();
+          log2.withMetadata({ signal }).info("CEXBroker graceful shutdown complete");
+          process.exitCode = 0;
+        } catch (error48) {
+          log2.withMetadata({ signal, error: error48 }).error("CEXBroker graceful shutdown failed");
+          process.exitCode = 1;
+        } finally {
+          process.off("SIGTERM", onSignal);
+          process.off("SIGINT", onSignal);
+        }
+      })();
+    };
+    process.on("SIGTERM", onSignal);
+    process.on("SIGINT", onSignal);
   } catch (err2) {
     console.error("\u274C Failed to start broker:", err2);
-    process.exit(1);
+    process.exitCode = 1;
   }
 });
-program2.parse(process.argv);
+await program2.parseAsync(process.argv);