@crossdelta/cloudevents 0.7.17 → 0.7.19

package/bin/cli.js

@@ -661,14 +661,12 @@ var init_errors = __esm({
 });
 
 // src/infrastructure/logging.ts
-var LOG_PREFIX, createLogger, logger;
+var createLogger, logger;
 var init_logging = __esm({
   "src/infrastructure/logging.ts"() {
-    LOG_PREFIX = "cloudevents";
     createLogger = (enabled) => {
       const logWithArgs = (consoleFn, message, args) => {
-        const formattedMessage = `[${LOG_PREFIX}] ${message}`;
-        args !== void 0 ? consoleFn(formattedMessage, args) : consoleFn(formattedMessage);
+        args !== void 0 ? consoleFn(message, args) : consoleFn(message);
       };
       return {
         log: (message, args) => enabled && logWithArgs(console.log, message, args),

package/dist/index.cjs

@@ -84,14 +84,12 @@ var init_errors = __esm({
 });
 
 // src/infrastructure/logging.ts
-var LOG_PREFIX, createLogger, logger;
+var createLogger, logger;
 var init_logging = __esm({
   "src/infrastructure/logging.ts"() {
-    LOG_PREFIX = "cloudevents";
     createLogger = (enabled) => {
       const logWithArgs = (consoleFn, message, args) => {
-        const formattedMessage = `[${LOG_PREFIX}] ${message}`;
-        args !== void 0 ? consoleFn(formattedMessage, args) : consoleFn(formattedMessage);
+        args !== void 0 ? consoleFn(message, args) : consoleFn(message);
       };
       return {
         log: (message, args) => enabled && logWithArgs(console.log, message, args),
@@ -2188,7 +2186,7 @@ function cloudEvents(options = {}) {
 // package.json
 var package_default = {
   name: "@crossdelta/cloudevents",
-  version: "0.7.17",
+  version: "0.7.19",
   description: "CloudEvents toolkit for TypeScript - Zod validation, handler discovery, NATS JetStream & Core"};
 
 // src/plugin.ts
@@ -2433,6 +2431,7 @@ var SHORT_LIVED_DEFAULTS = {
 };
 var INITIAL_RETRY_DELAY_MS = 1e3;
 var MAX_RETRY_DELAY_MS = 3e4;
+var ESCALATE_AFTER_MS = 5 * 60 * 1e3;
 var CONNECTION_REGISTRY_KEY = "__crossdelta_nats_connections__";
 var global = globalThis;
 var buildConnectOptions = (config, mode) => {
@@ -2450,11 +2449,14 @@ var getConnectionRegistry = () => {
 };
 var connectWithRetry = async (options, label) => {
   let delay = INITIAL_RETRY_DELAY_MS;
+  const startedAt = Date.now();
   while (true) {
     try {
       return await nats.connect(options);
     } catch (error) {
-      logger.warn(`[${label}] NATS connect failed, retrying in ${delay}ms...`, error);
+      const elapsed = Date.now() - startedAt;
+      const logLevel = elapsed >= ESCALATE_AFTER_MS ? "error" : "warn";
+      logger[logLevel](`[${label}] NATS connect failed, retrying in ${delay}ms...`, error);
       await new Promise((resolve) => setTimeout(resolve, delay));
       delay = Math.min(delay * 2, MAX_RETRY_DELAY_MS);
     }
@@ -2614,7 +2616,7 @@ async function ensureConsumer(jsm, streamName, consumerName, options) {
       // Filter subjects at consumer level (optional)
       filter_subjects: options.filterSubjects
     });
-    logger.info(`[jetstream] created durable consumer ${consumerName} on stream ${streamName}`);
+    logger.debug(`[jetstream] created durable consumer ${consumerName} on stream ${streamName}`);
   }
 }
 async function consumeJetStreamEvents(options) {
@@ -2625,7 +2627,7 @@ async function consumeJetStreamEvents(options) {
   const handlerConstructors = await discoverHandlers(options.discover);
   const processedHandlers = handlerConstructors.map(processHandler).filter((h) => h !== null);
   const handlerNames = processedHandlers.map((h) => h.name).join(", ");
-  logger.info(`[${name}] discovered ${processedHandlers.length} handler(s): ${handlerNames}`);
+  logger.info(`[${name}] discovered ${processedHandlers.length} handler${processedHandlers.length === 1 ? "" : "s"}: ${handlerNames}`);
   const nc = await connectWithRetry(
     {
       servers,
@@ -2643,7 +2645,7 @@ async function consumeJetStreamEvents(options) {
   const messages = await consumer.consume({
     max_messages: options.maxMessages ?? 100
   });
-  logger.info(`[${name}] consuming from stream ${options.stream}`);
+  logger.info(`[${name}] consuming from stream: ${options.stream}`);
   const dlqEnabled = Boolean(options.quarantineTopic || options.errorTopic);
   const idempotencyStore = options.idempotencyStore === false ? null : options.idempotencyStore ?? getDefaultIdempotencyStore();
   const idempotencyTtl = options.idempotencyTtl;
@@ -2698,7 +2700,7 @@ async function consumeJetStreamStreams(options) {
   const handlerConstructors = await discoverHandlers(options.discover);
   const processedHandlers = handlerConstructors.map(processHandler).filter((h) => h !== null);
   const handlerNames = processedHandlers.map((h) => h.name).join(", ");
-  logger.info(`[${name}] discovered ${processedHandlers.length} handler(s): ${handlerNames}`);
+  logger.info(`[${name}] discovered ${processedHandlers.length} handler${processedHandlers.length === 1 ? "" : "s"}: ${handlerNames}`);
   const nc = await connectWithRetry(
     {
       servers,
@@ -2755,7 +2757,6 @@ async function consumeJetStreamStreams(options) {
     const messages = await consumer.consume({
       max_messages: options.maxMessages ?? 100
     });
-    logger.info(`[${name}] consuming from stream ${stream}`);
     (async () => {
       try {
         for await (const msg of messages) {
@@ -2767,6 +2768,9 @@ async function consumeJetStreamStreams(options) {
     })();
     allMessages.push(messages);
   }
+  const streamList = options.streams.join(", ");
+  const streamLabel = options.streams.length === 1 ? "stream" : "streams";
+  logger.info(`[${name}] consuming from ${streamLabel}: ${streamList}`);
   return allMessages;
 }
 var ensureJetStreams = ensureJetStreamStreams;
@@ -2847,7 +2851,8 @@ async function consumeNatsEvents(options) {
   const handlerConstructors = await discoverHandlers(options.discover);
   const processedHandlers = handlerConstructors.map(processHandler).filter((h) => h !== null);
   const handlerNames = processedHandlers.map((h) => h.name).join(", ");
-  logger.info(`[${name}] discovered ${processedHandlers.length} handler(s): ${handlerNames}`);
+  const handlerLabel = processedHandlers.length === 1 ? "handler" : "handlers";
+  logger.info(`[${name}] discovered ${processedHandlers.length} ${handlerLabel}: ${handlerNames}`);
   const nc = await connectWithRetry(
     {
       servers,

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { Context } from 'hono';
 import { CloudEventV1 } from 'cloudevents';
-import { ZodTypeAny, z } from 'zod';
+import { ZodType, z } from 'zod';
 import { ChangeResult, FlowContext, FsContextMixin, GenerationContextMixin, FlowStep } from '@crossdelta/flowcore';
 import { ConsumerMessages, Subscription } from 'nats';
 
@@ -413,7 +413,7 @@ interface EventHandler<T = unknown> {
  */
 type HandlerConstructor<T = unknown> = (new (...args: unknown[]) => EventHandler<T>) & {
     __eventarcMetadata?: {
-        schema: ZodTypeAny;
+        schema: ZodType;
         declaredType?: string;
         match?: (event: EnrichedEvent<T>) => boolean;
         safeParse?: boolean;
@@ -455,7 +455,7 @@ interface ChannelConfig {
  * Note: In Zod v4, we use a more relaxed schema constraint to allow
  * contracts defined in external packages to work correctly.
  */
-interface HandleEventOptions<S = ZodTypeAny> {
+interface HandleEventOptions<S = ZodType> {
     schema: S;
     type?: string;
     match?: MatchFn<unknown>;
@@ -491,7 +491,7 @@ interface IdempotencyStore {
  * Type helper to extract data type from a Zod schema
  * Handles both data-only schemas and full CloudEvent schemas with a 'data' field
  */
-type InferEventData<S extends ZodTypeAny> = S['_output'] extends {
+type InferEventData<S extends ZodType> = S['_output'] extends {
     data: infer D;
 } ? D : S['_output'];
 
@@ -542,7 +542,7 @@ type InferEventData<S extends ZodTypeAny> = S['_output'] extends {
  * })
  * ```
  */
-declare function createContract<TSchema extends ZodTypeAny>(options: {
+declare function createContract<TSchema extends ZodType>(options: {
     type: string;
     schema: TSchema;
     match?: HandleEventOptions['match'];
@@ -594,15 +594,15 @@ declare function createContract<TSchema extends ZodTypeAny>(options: {
  * })
  * ```
  */
-declare function handleEvent<TSchema extends ZodTypeAny>(schemaOrOptions: TSchema | HandleEventOptions<TSchema> | HandleEventOptions, handler: (payload: TSchema['_output'], context?: EventContext) => Promise<unknown> | unknown, eventType?: string): HandlerConstructor;
+declare function handleEvent<TSchema extends ZodType>(schemaOrOptions: TSchema | HandleEventOptions<TSchema> | HandleEventOptions, handler: (payload: TSchema['_output'], context?: EventContext) => Promise<unknown> | unknown, eventType?: string): HandlerConstructor;
 /**
  * Creates an event schema with type inference
  * Automatically enforces the presence of a 'type' field
  */
-declare function eventSchema<T extends Record<string, ZodTypeAny>>(schema: T & {
-    type: ZodTypeAny;
+declare function eventSchema<T extends Record<string, ZodType>>(schema: T & {
+    type: ZodType;
 }): z.ZodObject<T & {
-    type: ZodTypeAny;
+    type: ZodType;
 } extends infer T_1 ? { -readonly [P in keyof T_1]: T_1[P]; } : never, z.core.$strip>;
 
 /**
@@ -797,7 +797,7 @@ declare const normalizeSubject: (eventType: string) => string;
  * @param schema - Zod schema to extract type from
  * @returns Event type string or undefined if not found
  */
-declare const extractTypeFromSchema: (schema: ZodTypeAny) => string | undefined;
+declare const extractTypeFromSchema: (schema: ZodType) => string | undefined;
 
 /**
  * Create Event Flow
@@ -1354,7 +1354,7 @@ declare const __resetNatsPublisher: () => Promise<void>;
 declare const deriveSubjectFromType: (eventType: string, config?: RoutingConfig) => string;
 declare const deriveStreamFromType: (eventType: string, config?: RoutingConfig) => string | undefined;
 declare const publishNatsRawEvent: (subjectName: string, eventType: string, eventData: unknown, options?: PublishNatsEventOptions) => Promise<string>;
-declare const publishNatsEvent: <T extends ZodTypeAny>(subjectName: string, schema: T, eventData: unknown, options?: PublishNatsEventOptions) => Promise<string>;
+declare const publishNatsEvent: <T extends ZodType>(subjectName: string, schema: T, eventData: unknown, options?: PublishNatsEventOptions) => Promise<string>;
 declare const publish: (eventTypeOrContract: string | {
     type: string;
     channel?: {

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Context } from 'hono';
 import { CloudEventV1 } from 'cloudevents';
-import { ZodTypeAny, z } from 'zod';
+import { ZodType, z } from 'zod';
 import { ChangeResult, FlowContext, FsContextMixin, GenerationContextMixin, FlowStep } from '@crossdelta/flowcore';
 import { ConsumerMessages, Subscription } from 'nats';
 
@@ -413,7 +413,7 @@ interface EventHandler<T = unknown> {
  */
 type HandlerConstructor<T = unknown> = (new (...args: unknown[]) => EventHandler<T>) & {
     __eventarcMetadata?: {
-        schema: ZodTypeAny;
+        schema: ZodType;
         declaredType?: string;
         match?: (event: EnrichedEvent<T>) => boolean;
         safeParse?: boolean;
@@ -455,7 +455,7 @@ interface ChannelConfig {
  * Note: In Zod v4, we use a more relaxed schema constraint to allow
  * contracts defined in external packages to work correctly.
  */
-interface HandleEventOptions<S = ZodTypeAny> {
+interface HandleEventOptions<S = ZodType> {
     schema: S;
     type?: string;
     match?: MatchFn<unknown>;
@@ -491,7 +491,7 @@ interface IdempotencyStore {
  * Type helper to extract data type from a Zod schema
  * Handles both data-only schemas and full CloudEvent schemas with a 'data' field
  */
-type InferEventData<S extends ZodTypeAny> = S['_output'] extends {
+type InferEventData<S extends ZodType> = S['_output'] extends {
     data: infer D;
 } ? D : S['_output'];
 
@@ -542,7 +542,7 @@ type InferEventData<S extends ZodTypeAny> = S['_output'] extends {
  * })
  * ```
  */
-declare function createContract<TSchema extends ZodTypeAny>(options: {
+declare function createContract<TSchema extends ZodType>(options: {
     type: string;
     schema: TSchema;
     match?: HandleEventOptions['match'];
@@ -594,15 +594,15 @@ declare function createContract<TSchema extends ZodTypeAny>(options: {
  * })
  * ```
  */
-declare function handleEvent<TSchema extends ZodTypeAny>(schemaOrOptions: TSchema | HandleEventOptions<TSchema> | HandleEventOptions, handler: (payload: TSchema['_output'], context?: EventContext) => Promise<unknown> | unknown, eventType?: string): HandlerConstructor;
+declare function handleEvent<TSchema extends ZodType>(schemaOrOptions: TSchema | HandleEventOptions<TSchema> | HandleEventOptions, handler: (payload: TSchema['_output'], context?: EventContext) => Promise<unknown> | unknown, eventType?: string): HandlerConstructor;
 /**
  * Creates an event schema with type inference
  * Automatically enforces the presence of a 'type' field
  */
-declare function eventSchema<T extends Record<string, ZodTypeAny>>(schema: T & {
-    type: ZodTypeAny;
+declare function eventSchema<T extends Record<string, ZodType>>(schema: T & {
+    type: ZodType;
 }): z.ZodObject<T & {
-    type: ZodTypeAny;
+    type: ZodType;
 } extends infer T_1 ? { -readonly [P in keyof T_1]: T_1[P]; } : never, z.core.$strip>;
 
 /**
@@ -797,7 +797,7 @@ declare const normalizeSubject: (eventType: string) => string;
  * @param schema - Zod schema to extract type from
  * @returns Event type string or undefined if not found
  */
-declare const extractTypeFromSchema: (schema: ZodTypeAny) => string | undefined;
+declare const extractTypeFromSchema: (schema: ZodType) => string | undefined;
 
 /**
  * Create Event Flow
@@ -1354,7 +1354,7 @@ declare const __resetNatsPublisher: () => Promise<void>;
 declare const deriveSubjectFromType: (eventType: string, config?: RoutingConfig) => string;
 declare const deriveStreamFromType: (eventType: string, config?: RoutingConfig) => string | undefined;
 declare const publishNatsRawEvent: (subjectName: string, eventType: string, eventData: unknown, options?: PublishNatsEventOptions) => Promise<string>;
-declare const publishNatsEvent: <T extends ZodTypeAny>(subjectName: string, schema: T, eventData: unknown, options?: PublishNatsEventOptions) => Promise<string>;
+declare const publishNatsEvent: <T extends ZodType>(subjectName: string, schema: T, eventData: unknown, options?: PublishNatsEventOptions) => Promise<string>;
 declare const publish: (eventTypeOrContract: string | {
     type: string;
     channel?: {

package/dist/index.js

@@ -59,14 +59,12 @@ var init_errors = __esm({
 });
 
 // src/infrastructure/logging.ts
-var LOG_PREFIX, createLogger, logger;
+var createLogger, logger;
 var init_logging = __esm({
   "src/infrastructure/logging.ts"() {
-    LOG_PREFIX = "cloudevents";
     createLogger = (enabled) => {
       const logWithArgs = (consoleFn, message, args) => {
-        const formattedMessage = `[${LOG_PREFIX}] ${message}`;
-        args !== void 0 ? consoleFn(formattedMessage, args) : consoleFn(formattedMessage);
+        args !== void 0 ? consoleFn(message, args) : consoleFn(message);
       };
       return {
         log: (message, args) => enabled && logWithArgs(console.log, message, args),
@@ -2163,7 +2161,7 @@ function cloudEvents(options = {}) {
 // package.json
 var package_default = {
   name: "@crossdelta/cloudevents",
-  version: "0.7.17",
+  version: "0.7.19",
   description: "CloudEvents toolkit for TypeScript - Zod validation, handler discovery, NATS JetStream & Core"};
 
 // src/plugin.ts
@@ -2408,6 +2406,7 @@ var SHORT_LIVED_DEFAULTS = {
 };
 var INITIAL_RETRY_DELAY_MS = 1e3;
 var MAX_RETRY_DELAY_MS = 3e4;
+var ESCALATE_AFTER_MS = 5 * 60 * 1e3;
 var CONNECTION_REGISTRY_KEY = "__crossdelta_nats_connections__";
 var global = globalThis;
 var buildConnectOptions = (config, mode) => {
@@ -2425,11 +2424,14 @@ var getConnectionRegistry = () => {
 };
 var connectWithRetry = async (options, label) => {
   let delay = INITIAL_RETRY_DELAY_MS;
+  const startedAt = Date.now();
   while (true) {
     try {
       return await connect(options);
     } catch (error) {
-      logger.warn(`[${label}] NATS connect failed, retrying in ${delay}ms...`, error);
+      const elapsed = Date.now() - startedAt;
+      const logLevel = elapsed >= ESCALATE_AFTER_MS ? "error" : "warn";
+      logger[logLevel](`[${label}] NATS connect failed, retrying in ${delay}ms...`, error);
       await new Promise((resolve) => setTimeout(resolve, delay));
       delay = Math.min(delay * 2, MAX_RETRY_DELAY_MS);
     }
@@ -2589,7 +2591,7 @@ async function ensureConsumer(jsm, streamName, consumerName, options) {
       // Filter subjects at consumer level (optional)
       filter_subjects: options.filterSubjects
     });
-    logger.info(`[jetstream] created durable consumer ${consumerName} on stream ${streamName}`);
+    logger.debug(`[jetstream] created durable consumer ${consumerName} on stream ${streamName}`);
   }
 }
 async function consumeJetStreamEvents(options) {
@@ -2600,7 +2602,7 @@ async function consumeJetStreamEvents(options) {
   const handlerConstructors = await discoverHandlers(options.discover);
   const processedHandlers = handlerConstructors.map(processHandler).filter((h) => h !== null);
   const handlerNames = processedHandlers.map((h) => h.name).join(", ");
-  logger.info(`[${name}] discovered ${processedHandlers.length} handler(s): ${handlerNames}`);
+  logger.info(`[${name}] discovered ${processedHandlers.length} handler${processedHandlers.length === 1 ? "" : "s"}: ${handlerNames}`);
   const nc = await connectWithRetry(
     {
       servers,
@@ -2618,7 +2620,7 @@ async function consumeJetStreamEvents(options) {
   const messages = await consumer.consume({
     max_messages: options.maxMessages ?? 100
   });
-  logger.info(`[${name}] consuming from stream ${options.stream}`);
+  logger.info(`[${name}] consuming from stream: ${options.stream}`);
   const dlqEnabled = Boolean(options.quarantineTopic || options.errorTopic);
   const idempotencyStore = options.idempotencyStore === false ? null : options.idempotencyStore ?? getDefaultIdempotencyStore();
   const idempotencyTtl = options.idempotencyTtl;
@@ -2673,7 +2675,7 @@ async function consumeJetStreamStreams(options) {
   const handlerConstructors = await discoverHandlers(options.discover);
   const processedHandlers = handlerConstructors.map(processHandler).filter((h) => h !== null);
   const handlerNames = processedHandlers.map((h) => h.name).join(", ");
-  logger.info(`[${name}] discovered ${processedHandlers.length} handler(s): ${handlerNames}`);
+  logger.info(`[${name}] discovered ${processedHandlers.length} handler${processedHandlers.length === 1 ? "" : "s"}: ${handlerNames}`);
   const nc = await connectWithRetry(
     {
       servers,
@@ -2730,7 +2732,6 @@ async function consumeJetStreamStreams(options) {
     const messages = await consumer.consume({
       max_messages: options.maxMessages ?? 100
     });
-    logger.info(`[${name}] consuming from stream ${stream}`);
     (async () => {
       try {
         for await (const msg of messages) {
@@ -2742,6 +2743,9 @@ async function consumeJetStreamStreams(options) {
     })();
     allMessages.push(messages);
   }
+  const streamList = options.streams.join(", ");
+  const streamLabel = options.streams.length === 1 ? "stream" : "streams";
+  logger.info(`[${name}] consuming from ${streamLabel}: ${streamList}`);
   return allMessages;
 }
 var ensureJetStreams = ensureJetStreamStreams;
@@ -2822,7 +2826,8 @@ async function consumeNatsEvents(options) {
   const handlerConstructors = await discoverHandlers(options.discover);
   const processedHandlers = handlerConstructors.map(processHandler).filter((h) => h !== null);
   const handlerNames = processedHandlers.map((h) => h.name).join(", ");
-  logger.info(`[${name}] discovered ${processedHandlers.length} handler(s): ${handlerNames}`);
+  const handlerLabel = processedHandlers.length === 1 ? "handler" : "handlers";
+  logger.info(`[${name}] discovered ${processedHandlers.length} ${handlerLabel}: ${handlerNames}`);
   const nc = await connectWithRetry(
     {
       servers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/cloudevents",
-  "version": "0.7.17",
+  "version": "0.7.19",
   "description": "CloudEvents toolkit for TypeScript - Zod validation, handler discovery, NATS JetStream & Core",
   "author": "crossdelta",
   "license": "MIT",