vedatrace 0.2.1 → 0.3.0

package/dist/index.cjs

@@ -10,40 +10,43 @@ class VedaTraceBatcher {
     this.config = config;
     this.immediateFlush = immediateFlush;
     this.context = config.executionContext;
+    this.waitUntilFn = config.waitUntil;
   }
   queue = [];
   flushTimer = null;
-  flushDebounceTimer = null;
+  flushQueued = false;
   isFlushing = false;
   pendingFlush = null;
   context;
-  /** Attach execution context after initialization */
+  waitUntilFn;
   setContext(ctx) {
     this.context = ctx;
   }
-  /** Get current context */
   getContext() {
     return this.context;
   }
-  /** Add log to queue with context-aware flush */
   add(log) {
     this.queue.push(log);
-    if (!this.flushTimer && !this.immediateFlush) {
+    if (this.context || this.waitUntilFn) {
+      this.debouncedFlush();
+      return;
+    }
+    if (this.immediateFlush) {
+      this.flush();
+      return;
+    }
+    if (!this.flushTimer) {
       this.startFlushTimer();
     }
-    if (this.immediateFlush || this.context) {
-      this.debouncedFlush();
-    } else if (this.queue.length >= this.config.batchSize) {
+    if (this.queue.length >= this.config.batchSize) {
       this.flush();
     }
   }
-  /** Debounced flush - prevents rapid-fire flushes */
   debouncedFlush() {
-    if (this.flushDebounceTimer) {
-      clearTimeout(this.flushDebounceTimer);
-    }
-    this.flushDebounceTimer = setTimeout(() => {
-      this.flushDebounceTimer = null;
+    if (this.flushQueued) return;
+    this.flushQueued = true;
+    queueMicrotask(() => {
+      this.flushQueued = false;
       this.flush().catch((error) => {
         if (this.config.onError) {
           this.config.onError(
@@ -56,12 +59,11 @@ class VedaTraceBatcher {
           );
         }
       });
-    }, 100);
+    });
   }
-  /** Flush logs to all transports with waitUntil protection */
   async flush() {
     if (this.isFlushing) {
-      return this.pendingFlush ?? Promise.resolve();
+      return this.pendingFlush ?? await Promise.resolve();
     }
     if (this.queue.length === 0) {
       return Promise.resolve();
@@ -74,8 +76,10 @@ class VedaTraceBatcher {
       this.pendingFlush = null;
     });
     this.pendingFlush = flushPromise;
-    if (this.context) {
+    if (this.context && typeof this.context.waitUntil === "function") {
       this.context.waitUntil(flushPromise);
+    } else if (typeof this.waitUntilFn === "function") {
+      this.waitUntilFn(flushPromise);
     }
     return flushPromise;
   }
@@ -136,10 +140,7 @@ class VedaTraceBatcher {
       clearInterval(this.flushTimer);
       this.flushTimer = null;
     }
-    if (this.flushDebounceTimer) {
-      clearTimeout(this.flushDebounceTimer);
-      this.flushDebounceTimer = null;
-    }
+    this.flushQueued = false;
   }
   start() {
     if (!this.flushTimer && !this.immediateFlush) {
@@ -546,7 +547,7 @@ function vedatrace(config = {}) {
     const HttpTransport = isBrowserEnv ? transports_index.VedaTraceHttpTransportBrowser : transports_index.VedaTraceHttpTransport;
     const httpConfig = {
       apiKey: config.apiKey,
-      keepalive: isBrowserEnv
+      keepalive: isBrowserEnv || isServerlessEnv
     };
     if (config.endpoint) httpConfig.endpoint = config.endpoint;
     const httpTransport = new HttpTransport(httpConfig);
@@ -571,12 +572,15 @@ function vedatrace(config = {}) {
         unrefTimer: config.unrefTimer ?? shouldUnrefTimer,
         executionContext: config.executionContext,
         onError: config.onError,
-        onSuccess: config.onSuccess
+        onSuccess: config.onSuccess,
+        debug: config.debug,
+        waitUntil: config.waitUntil
       },
       immediateFlush
     );
     logger.setBatcher(batcher);
-    if (typeof process !== "undefined" && isLongRunningEnv) {
+    const isNodeRuntime = typeof process !== "undefined" && process.versions?.node;
+    if (typeof process !== "undefined" && (isLongRunningEnv || isNodeRuntime)) {
       const flushLogs = async () => {
         await batcher.flush();
       };

package/dist/index.d.cts

@@ -1,17 +1,14 @@
-import { b as VedaTraceTransport, B as BatcherConfig, c as VedaTraceEdgeContext, I as InternalLogEntry, V as VedaTraceLoggerInterface, R as RuntimeType$1, a as VedaTraceConfig, L as LogMetadata, d as RedactionConfig } from './types-BU0UESs9.cjs';
-export { e as VedaTraceLevel, f as VedaTraceLog } from './types-BU0UESs9.cjs';
+import { b as VedaTraceTransport, B as BatcherConfig, c as VedaTraceEdgeContext, I as InternalLogEntry, V as VedaTraceLoggerInterface, R as RuntimeType$1, a as VedaTraceConfig, L as LogMetadata, d as RedactionConfig } from './types-CSBzeGyK.cjs';
+export { e as VedaTraceLevel, f as VedaTraceLog } from './types-CSBzeGyK.cjs';
 export { ConsoleFormat, ConsoleTransportConfig, HttpTransportConfig, VedaTraceConsoleTransport, VedaTraceHttpTransport, VedaTraceHttpTransportBrowser } from './transports/index.cjs';
 
 /**
  * VedaTrace Batcher - Context-Aware for Cloudflare Workers
  *
- * Key features:
- * 1. Stores EdgeContext for waitUntil() integration
- * 2. setContext() method for post-initialization context attachment
- * 3. Fire-and-forget flush wrapped in ctx.waitUntil() when context is available
- * 4. Debounced flush to avoid excessive network calls
- * 5. Automatic flush on each log entry when context is present
- * 6. All callbacks moved into BatcherConfig for cleaner API
+ * Three flush modes:
+ * 1. Reliable mode (context or waitUntilFn): debounced flush + waitUntil for guaranteed delivery
+ * 2. Immediate mode: flush() called directly from add() during handler execution
+ * 3. Batch mode: periodic/batch-size flush for long-running environments
  */
 
 declare class VedaTraceBatcher {
@@ -20,20 +17,16 @@ declare class VedaTraceBatcher {
     private immediateFlush;
     private queue;
     private flushTimer;
-    private flushDebounceTimer;
+    private flushQueued;
     private isFlushing;
     private pendingFlush;
     private context;
+    private waitUntilFn;
     constructor(transports: VedaTraceTransport[], config: BatcherConfig, immediateFlush?: boolean);
-    /** Attach execution context after initialization */
     setContext(ctx: VedaTraceEdgeContext): void;
-    /** Get current context */
     getContext(): VedaTraceEdgeContext | undefined;
-    /** Add log to queue with context-aware flush */
     add(log: InternalLogEntry): void;
-    /** Debounced flush - prevents rapid-fire flushes */
     private debouncedFlush;
-    /** Flush logs to all transports with waitUntil protection */
     flush(): Promise<void>;
     private sendWithRetry;
     private startFlushTimer;

package/dist/index.d.mts

@@ -1,17 +1,14 @@
-import { b as VedaTraceTransport, B as BatcherConfig, c as VedaTraceEdgeContext, I as InternalLogEntry, V as VedaTraceLoggerInterface, R as RuntimeType$1, a as VedaTraceConfig, L as LogMetadata, d as RedactionConfig } from './types-BU0UESs9.mjs';
-export { e as VedaTraceLevel, f as VedaTraceLog } from './types-BU0UESs9.mjs';
+import { b as VedaTraceTransport, B as BatcherConfig, c as VedaTraceEdgeContext, I as InternalLogEntry, V as VedaTraceLoggerInterface, R as RuntimeType$1, a as VedaTraceConfig, L as LogMetadata, d as RedactionConfig } from './types-CSBzeGyK.mjs';
+export { e as VedaTraceLevel, f as VedaTraceLog } from './types-CSBzeGyK.mjs';
 export { ConsoleFormat, ConsoleTransportConfig, HttpTransportConfig, VedaTraceConsoleTransport, VedaTraceHttpTransport, VedaTraceHttpTransportBrowser } from './transports/index.mjs';
 
 /**
  * VedaTrace Batcher - Context-Aware for Cloudflare Workers
  *
- * Key features:
- * 1. Stores EdgeContext for waitUntil() integration
- * 2. setContext() method for post-initialization context attachment
- * 3. Fire-and-forget flush wrapped in ctx.waitUntil() when context is available
- * 4. Debounced flush to avoid excessive network calls
- * 5. Automatic flush on each log entry when context is present
- * 6. All callbacks moved into BatcherConfig for cleaner API
+ * Three flush modes:
+ * 1. Reliable mode (context or waitUntilFn): debounced flush + waitUntil for guaranteed delivery
+ * 2. Immediate mode: flush() called directly from add() during handler execution
+ * 3. Batch mode: periodic/batch-size flush for long-running environments
  */
 
 declare class VedaTraceBatcher {
@@ -20,20 +17,16 @@ declare class VedaTraceBatcher {
     private immediateFlush;
     private queue;
     private flushTimer;
-    private flushDebounceTimer;
+    private flushQueued;
     private isFlushing;
     private pendingFlush;
     private context;
+    private waitUntilFn;
     constructor(transports: VedaTraceTransport[], config: BatcherConfig, immediateFlush?: boolean);
-    /** Attach execution context after initialization */
     setContext(ctx: VedaTraceEdgeContext): void;
-    /** Get current context */
     getContext(): VedaTraceEdgeContext | undefined;
-    /** Add log to queue with context-aware flush */
     add(log: InternalLogEntry): void;
-    /** Debounced flush - prevents rapid-fire flushes */
     private debouncedFlush;
-    /** Flush logs to all transports with waitUntil protection */
     flush(): Promise<void>;
     private sendWithRetry;
     private startFlushTimer;

package/dist/index.mjs

@@ -6,40 +6,43 @@ class VedaTraceBatcher {
     this.config = config;
     this.immediateFlush = immediateFlush;
     this.context = config.executionContext;
+    this.waitUntilFn = config.waitUntil;
   }
   queue = [];
   flushTimer = null;
-  flushDebounceTimer = null;
+  flushQueued = false;
   isFlushing = false;
   pendingFlush = null;
   context;
-  /** Attach execution context after initialization */
+  waitUntilFn;
   setContext(ctx) {
     this.context = ctx;
   }
-  /** Get current context */
   getContext() {
     return this.context;
   }
-  /** Add log to queue with context-aware flush */
   add(log) {
     this.queue.push(log);
-    if (!this.flushTimer && !this.immediateFlush) {
+    if (this.context || this.waitUntilFn) {
+      this.debouncedFlush();
+      return;
+    }
+    if (this.immediateFlush) {
+      this.flush();
+      return;
+    }
+    if (!this.flushTimer) {
       this.startFlushTimer();
     }
-    if (this.immediateFlush || this.context) {
-      this.debouncedFlush();
-    } else if (this.queue.length >= this.config.batchSize) {
+    if (this.queue.length >= this.config.batchSize) {
       this.flush();
     }
   }
-  /** Debounced flush - prevents rapid-fire flushes */
   debouncedFlush() {
-    if (this.flushDebounceTimer) {
-      clearTimeout(this.flushDebounceTimer);
-    }
-    this.flushDebounceTimer = setTimeout(() => {
-      this.flushDebounceTimer = null;
+    if (this.flushQueued) return;
+    this.flushQueued = true;
+    queueMicrotask(() => {
+      this.flushQueued = false;
       this.flush().catch((error) => {
         if (this.config.onError) {
           this.config.onError(
@@ -52,12 +55,11 @@ class VedaTraceBatcher {
           );
         }
       });
-    }, 100);
+    });
   }
-  /** Flush logs to all transports with waitUntil protection */
   async flush() {
     if (this.isFlushing) {
-      return this.pendingFlush ?? Promise.resolve();
+      return this.pendingFlush ?? await Promise.resolve();
     }
     if (this.queue.length === 0) {
       return Promise.resolve();
@@ -70,8 +72,10 @@ class VedaTraceBatcher {
       this.pendingFlush = null;
     });
     this.pendingFlush = flushPromise;
-    if (this.context) {
+    if (this.context && typeof this.context.waitUntil === "function") {
       this.context.waitUntil(flushPromise);
+    } else if (typeof this.waitUntilFn === "function") {
+      this.waitUntilFn(flushPromise);
     }
     return flushPromise;
   }
@@ -132,10 +136,7 @@ class VedaTraceBatcher {
       clearInterval(this.flushTimer);
       this.flushTimer = null;
     }
-    if (this.flushDebounceTimer) {
-      clearTimeout(this.flushDebounceTimer);
-      this.flushDebounceTimer = null;
-    }
+    this.flushQueued = false;
   }
   start() {
     if (!this.flushTimer && !this.immediateFlush) {
@@ -542,7 +543,7 @@ function vedatrace(config = {}) {
     const HttpTransport = isBrowserEnv ? VedaTraceHttpTransportBrowser : VedaTraceHttpTransport;
     const httpConfig = {
       apiKey: config.apiKey,
-      keepalive: isBrowserEnv
+      keepalive: isBrowserEnv || isServerlessEnv
     };
     if (config.endpoint) httpConfig.endpoint = config.endpoint;
     const httpTransport = new HttpTransport(httpConfig);
@@ -567,12 +568,15 @@ function vedatrace(config = {}) {
         unrefTimer: config.unrefTimer ?? shouldUnrefTimer,
         executionContext: config.executionContext,
         onError: config.onError,
-        onSuccess: config.onSuccess
+        onSuccess: config.onSuccess,
+        debug: config.debug,
+        waitUntil: config.waitUntil
       },
       immediateFlush
     );
     logger.setBatcher(batcher);
-    if (typeof process !== "undefined" && isLongRunningEnv) {
+    const isNodeRuntime = typeof process !== "undefined" && process.versions?.node;
+    if (typeof process !== "undefined" && (isLongRunningEnv || isNodeRuntime)) {
       const flushLogs = async () => {
         await batcher.flush();
       };

package/dist/integrations/express.d.cts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from 'express';
-import { V as VedaTraceLoggerInterface, a as VedaTraceConfig, L as LogMetadata } from '../types-BU0UESs9.cjs';
+import { V as VedaTraceLoggerInterface, a as VedaTraceConfig, L as LogMetadata } from '../types-CSBzeGyK.cjs';
 
 /**
  * Express.js middleware integration for VedaTrace

package/dist/integrations/express.d.mts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from 'express';
-import { V as VedaTraceLoggerInterface, a as VedaTraceConfig, L as LogMetadata } from '../types-BU0UESs9.mjs';
+import { V as VedaTraceLoggerInterface, a as VedaTraceConfig, L as LogMetadata } from '../types-CSBzeGyK.mjs';
 
 /**
  * Express.js middleware integration for VedaTrace

package/dist/integrations/nextjs.d.cts

@@ -1,4 +1,4 @@
-import { a as VedaTraceConfig, L as LogMetadata, V as VedaTraceLoggerInterface } from '../types-BU0UESs9.cjs';
+import { a as VedaTraceConfig, L as LogMetadata, V as VedaTraceLoggerInterface } from '../types-CSBzeGyK.cjs';
 
 /**
  * Next.js integration for VedaTrace

package/dist/integrations/nextjs.d.mts

@@ -1,4 +1,4 @@
-import { a as VedaTraceConfig, L as LogMetadata, V as VedaTraceLoggerInterface } from '../types-BU0UESs9.mjs';
+import { a as VedaTraceConfig, L as LogMetadata, V as VedaTraceLoggerInterface } from '../types-CSBzeGyK.mjs';
 
 /**
  * Next.js integration for VedaTrace

package/dist/integrations/react.d.cts

@@ -1,5 +1,5 @@
 import { ReactNode, ReactElement } from 'react';
-import { a as VedaTraceConfig, V as VedaTraceLoggerInterface, L as LogMetadata } from '../types-BU0UESs9.cjs';
+import { a as VedaTraceConfig, V as VedaTraceLoggerInterface, L as LogMetadata } from '../types-CSBzeGyK.cjs';
 
 /**
  * React integration for VedaTrace

package/dist/integrations/react.d.mts

@@ -1,5 +1,5 @@
 import { ReactNode, ReactElement } from 'react';
-import { a as VedaTraceConfig, V as VedaTraceLoggerInterface, L as LogMetadata } from '../types-BU0UESs9.mjs';
+import { a as VedaTraceConfig, V as VedaTraceLoggerInterface, L as LogMetadata } from '../types-CSBzeGyK.mjs';
 
 /**
  * React integration for VedaTrace

package/dist/transports/index.d.cts

@@ -1,4 +1,4 @@
-import { e as VedaTraceLevel, b as VedaTraceTransport, I as InternalLogEntry } from '../types-BU0UESs9.cjs';
+import { e as VedaTraceLevel, b as VedaTraceTransport, I as InternalLogEntry } from '../types-CSBzeGyK.cjs';
 
 /**
  * Console transport for development/debugging

package/dist/transports/index.d.mts

@@ -1,4 +1,4 @@
-import { e as VedaTraceLevel, b as VedaTraceTransport, I as InternalLogEntry } from '../types-BU0UESs9.mjs';
+import { e as VedaTraceLevel, b as VedaTraceTransport, I as InternalLogEntry } from '../types-CSBzeGyK.mjs';
 
 /**
  * Console transport for development/debugging

package/dist/{types-BU0UESs9.d.cts → types-CSBzeGyK.d.cts}

@@ -42,6 +42,12 @@ interface VedaTraceConfig {
     runtime?: RuntimeType;
     /** Cloudflare Workers ExecutionContext - enables waitUntil support */
     executionContext?: VedaTraceEdgeContext;
+    /**
+     * Global waitUntil function (e.g. from "cloudflare:workers").
+     * When provided, the SDK uses the reliable debounced-flush+waitUntil path
+     * instead of fire-and-forget, ensuring logs complete before worker termination.
+     */
+    waitUntil?: (promise: Promise<unknown>) => void;
 }
 interface RedactionConfig {
     paths?: string[];
@@ -78,6 +84,8 @@ interface BatcherConfig {
     executionContext?: VedaTraceEdgeContext;
     onError?: (error: Error) => void;
     onSuccess?: () => void;
+    debug?: boolean;
+    waitUntil?: (promise: Promise<unknown>) => void;
 }
 interface VedaTraceLoggerInterface {
     debug(message: string, metadata?: LogMetadata): void;

package/dist/{types-BU0UESs9.d.mts → types-CSBzeGyK.d.mts}

@@ -42,6 +42,12 @@ interface VedaTraceConfig {
     runtime?: RuntimeType;
     /** Cloudflare Workers ExecutionContext - enables waitUntil support */
     executionContext?: VedaTraceEdgeContext;
+    /**
+     * Global waitUntil function (e.g. from "cloudflare:workers").
+     * When provided, the SDK uses the reliable debounced-flush+waitUntil path
+     * instead of fire-and-forget, ensuring logs complete before worker termination.
+     */
+    waitUntil?: (promise: Promise<unknown>) => void;
 }
 interface RedactionConfig {
     paths?: string[];
@@ -78,6 +84,8 @@ interface BatcherConfig {
     executionContext?: VedaTraceEdgeContext;
     onError?: (error: Error) => void;
     onSuccess?: () => void;
+    debug?: boolean;
+    waitUntil?: (promise: Promise<unknown>) => void;
 }
 interface VedaTraceLoggerInterface {
     debug(message: string, metadata?: LogMetadata): void;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vedatrace",
 	"description": "Universal JavaScript logging SDK for VedaTrace - type-safe, lightweight, and developer-friendly",
-	"version": "0.2.1",
+	"version": "0.3.0",
 	"scripts": {
 		"setup": "rm -rf node_modules && npm i && git init && husky",
 		"prepublishOnly": "npm run build",