caplyr 0.2.4 → 0.3.0

package/dist/index.js

@@ -36,20 +36,32 @@ var LogShipper = class {
   constructor(config) {
     this.buffer = [];
     this.timer = null;
+    // Store bound handlers so we can remove them on shutdown
+    this.processHandlers = [];
     this.endpoint = config.endpoint ?? "https://api.caplyr.com";
     this.apiKey = config.apiKey;
     this.batchSize = config.batchSize ?? 10;
     this.flushInterval = config.flushInterval ?? 3e4;
+    this.maxBufferSize = 1e3;
     this.onError = config.onError;
     this.timer = setInterval(() => this.flush(), this.flushInterval);
+    this.timer.unref?.();
     if (typeof process !== "undefined" && process.on) {
-      const flushAndExit = () => {
+      const onBeforeExit = () => {
+        this.flush();
+      };
+      const onSignal = () => {
         this.flush().finally(() => {
         });
       };
-      process.on("beforeExit", () => this.flush());
-      process.on("SIGTERM", flushAndExit);
-      process.on("SIGINT", flushAndExit);
+      process.on("beforeExit", onBeforeExit);
+      process.on("SIGTERM", onSignal);
+      process.on("SIGINT", onSignal);
+      this.processHandlers = [
+        { event: "beforeExit", handler: onBeforeExit },
+        { event: "SIGTERM", handler: onSignal },
+        { event: "SIGINT", handler: onSignal }
+      ];
     }
   }
   /**
@@ -57,6 +69,10 @@ var LogShipper = class {
    * Auto-flushes when batch size is reached.
    */
   push(log) {
+    if (this.buffer.length >= this.maxBufferSize) {
+      const excess = this.buffer.length - this.maxBufferSize + 1;
+      this.buffer.splice(0, excess);
+    }
     this.buffer.push(log);
     if (this.buffer.length >= this.batchSize) {
       this.flush();
@@ -88,7 +104,18 @@ var LogShipper = class {
     }
   }
   /**
-   * Stop the periodic flush timer.
+   * Remove process signal handlers registered in the constructor.
+   */
+  removeProcessHandlers() {
+    if (typeof process !== "undefined" && process.removeListener) {
+      for (const { event, handler } of this.processHandlers) {
+        process.removeListener(event, handler);
+      }
+    }
+    this.processHandlers = [];
+  }
+  /**
+   * Stop the periodic flush timer and remove signal handlers.
    * Call this when tearing down the SDK.
    */
   destroy() {
@@ -96,13 +123,19 @@ var LogShipper = class {
       clearInterval(this.timer);
       this.timer = null;
     }
+    this.removeProcessHandlers();
     this.flush();
   }
+  /**
+   * Await the final log flush, stop timers, and remove signal handlers.
+   * Preferred over destroy() for clean shutdown.
+   */
   async shutdown() {
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
     }
+    this.removeProcessHandlers();
     await this.flush();
   }
 };
@@ -187,6 +220,7 @@ var Heartbeat = class {
   start() {
     this.beat();
     this.timer = setInterval(() => this.beat(), this.interval);
+    this.timer.unref?.();
   }
   /**
    * Send a single heartbeat and update local state.
@@ -206,21 +240,20 @@ var Heartbeat = class {
         throw new Error(`Heartbeat failed: ${res.status}`);
       }
       const data = await res.json();
-      const localDailyUsed = this.budgetStatus.daily_used;
-      const localMonthlyUsed = this.budgetStatus.monthly_used;
       const serverDailyUsed = Number(data.daily_used) || 0;
       const serverMonthlyUsed = Number(data.monthly_used) || 0;
       const serverDailyLimit = data.daily_limit != null ? Number(data.daily_limit) : null;
       const serverMonthlyLimit = data.monthly_limit != null ? Number(data.monthly_limit) : null;
-      this.budgetStatus = {
-        ...data,
-        // Use whichever spend is higher — server or local tracking
-        daily_used: Math.max(serverDailyUsed, localDailyUsed),
-        monthly_used: Math.max(serverMonthlyUsed, localMonthlyUsed),
-        // Use the stricter (lower) limit — local config takes priority if lower
-        daily_limit: this.pickStricterLimit(serverDailyLimit, this.localDailyLimit),
-        monthly_limit: this.pickStricterLimit(serverMonthlyLimit, this.localMonthlyLimit)
-      };
+      const snapshotDaily = this.budgetStatus.daily_used;
+      const snapshotMonthly = this.budgetStatus.monthly_used;
+      const mergedDaily = Math.max(serverDailyUsed, snapshotDaily);
+      const mergedMonthly = Math.max(serverMonthlyUsed, snapshotMonthly);
+      this.budgetStatus.daily_used = mergedDaily + (this.budgetStatus.daily_used - snapshotDaily);
+      this.budgetStatus.monthly_used = mergedMonthly + (this.budgetStatus.monthly_used - snapshotMonthly);
+      this.budgetStatus.daily_limit = this.pickStricterLimit(serverDailyLimit, this.localDailyLimit);
+      this.budgetStatus.monthly_limit = this.pickStricterLimit(serverMonthlyLimit, this.localMonthlyLimit);
+      this.budgetStatus.status = data.status;
+      this.budgetStatus.kill_switch_active = data.kill_switch_active;
       this.consecutiveFailures = 0;
       const newStatus = data.kill_switch_active ? "OFF" : data.status;
       if (newStatus !== this.status) {
@@ -765,6 +798,7 @@ function protect(client, config) {
     ...config
   };
   let shared = instances.get(resolvedConfig.apiKey);
+  const isExisting = !!shared;
   if (!shared) {
     const shipper2 = new LogShipper(resolvedConfig);
     const heartbeat2 = new Heartbeat(resolvedConfig);
@@ -774,7 +808,19 @@ function protect(client, config) {
   }
   const { shipper, heartbeat } = shared;
   if (resolvedConfig.budget) {
-    const budgetConfig = typeof resolvedConfig.budget === "number" ? { monthly: resolvedConfig.budget } : resolvedConfig.budget;
+    const raw = typeof resolvedConfig.budget === "number" ? { monthly: resolvedConfig.budget } : resolvedConfig.budget;
+    const budgetConfig = { ...raw };
+    if (isExisting) {
+      const current = heartbeat.budgetStatus;
+      if (budgetConfig.daily !== void 0) {
+        const existing = current.daily_limit;
+        budgetConfig.daily = existing !== null ? Math.min(existing, budgetConfig.daily) : budgetConfig.daily;
+      }
+      if (budgetConfig.monthly !== void 0) {
+        const existing = current.monthly_limit;
+        budgetConfig.monthly = existing !== null ? Math.min(existing, budgetConfig.monthly) : budgetConfig.monthly;
+      }
+    }
     heartbeat.applyLocalLimits(budgetConfig);
   }
   const provider = detectProvider(client);
@@ -816,14 +862,16 @@ async function shutdown(apiKey) {
     const shared = instances.get(apiKey);
     if (shared) {
       shared.heartbeat.destroy();
-      shared.shipper.destroy();
+      await shared.shipper.shutdown();
       instances.delete(apiKey);
     }
   } else {
+    const shutdowns = [];
     for (const [key, shared] of instances) {
       shared.heartbeat.destroy();
-      shared.shipper.destroy();
+      shutdowns.push(shared.shipper.shutdown());
     }
+    await Promise.all(shutdowns);
     instances.clear();
   }
 }

package/dist/index.mjs

@@ -3,20 +3,32 @@ var LogShipper = class {
   constructor(config) {
     this.buffer = [];
     this.timer = null;
+    // Store bound handlers so we can remove them on shutdown
+    this.processHandlers = [];
     this.endpoint = config.endpoint ?? "https://api.caplyr.com";
     this.apiKey = config.apiKey;
     this.batchSize = config.batchSize ?? 10;
     this.flushInterval = config.flushInterval ?? 3e4;
+    this.maxBufferSize = 1e3;
     this.onError = config.onError;
     this.timer = setInterval(() => this.flush(), this.flushInterval);
+    this.timer.unref?.();
     if (typeof process !== "undefined" && process.on) {
-      const flushAndExit = () => {
+      const onBeforeExit = () => {
+        this.flush();
+      };
+      const onSignal = () => {
         this.flush().finally(() => {
         });
       };
-      process.on("beforeExit", () => this.flush());
-      process.on("SIGTERM", flushAndExit);
-      process.on("SIGINT", flushAndExit);
+      process.on("beforeExit", onBeforeExit);
+      process.on("SIGTERM", onSignal);
+      process.on("SIGINT", onSignal);
+      this.processHandlers = [
+        { event: "beforeExit", handler: onBeforeExit },
+        { event: "SIGTERM", handler: onSignal },
+        { event: "SIGINT", handler: onSignal }
+      ];
     }
   }
   /**
@@ -24,6 +36,10 @@ var LogShipper = class {
    * Auto-flushes when batch size is reached.
    */
   push(log) {
+    if (this.buffer.length >= this.maxBufferSize) {
+      const excess = this.buffer.length - this.maxBufferSize + 1;
+      this.buffer.splice(0, excess);
+    }
     this.buffer.push(log);
     if (this.buffer.length >= this.batchSize) {
       this.flush();
@@ -55,7 +71,18 @@ var LogShipper = class {
     }
   }
   /**
-   * Stop the periodic flush timer.
+   * Remove process signal handlers registered in the constructor.
+   */
+  removeProcessHandlers() {
+    if (typeof process !== "undefined" && process.removeListener) {
+      for (const { event, handler } of this.processHandlers) {
+        process.removeListener(event, handler);
+      }
+    }
+    this.processHandlers = [];
+  }
+  /**
+   * Stop the periodic flush timer and remove signal handlers.
    * Call this when tearing down the SDK.
    */
   destroy() {
@@ -63,13 +90,19 @@ var LogShipper = class {
       clearInterval(this.timer);
       this.timer = null;
     }
+    this.removeProcessHandlers();
     this.flush();
   }
+  /**
+   * Await the final log flush, stop timers, and remove signal handlers.
+   * Preferred over destroy() for clean shutdown.
+   */
   async shutdown() {
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
     }
+    this.removeProcessHandlers();
     await this.flush();
   }
 };
@@ -154,6 +187,7 @@ var Heartbeat = class {
   start() {
     this.beat();
     this.timer = setInterval(() => this.beat(), this.interval);
+    this.timer.unref?.();
   }
   /**
    * Send a single heartbeat and update local state.
@@ -173,21 +207,20 @@ var Heartbeat = class {
         throw new Error(`Heartbeat failed: ${res.status}`);
       }
       const data = await res.json();
-      const localDailyUsed = this.budgetStatus.daily_used;
-      const localMonthlyUsed = this.budgetStatus.monthly_used;
       const serverDailyUsed = Number(data.daily_used) || 0;
       const serverMonthlyUsed = Number(data.monthly_used) || 0;
       const serverDailyLimit = data.daily_limit != null ? Number(data.daily_limit) : null;
       const serverMonthlyLimit = data.monthly_limit != null ? Number(data.monthly_limit) : null;
-      this.budgetStatus = {
-        ...data,
-        // Use whichever spend is higher — server or local tracking
-        daily_used: Math.max(serverDailyUsed, localDailyUsed),
-        monthly_used: Math.max(serverMonthlyUsed, localMonthlyUsed),
-        // Use the stricter (lower) limit — local config takes priority if lower
-        daily_limit: this.pickStricterLimit(serverDailyLimit, this.localDailyLimit),
-        monthly_limit: this.pickStricterLimit(serverMonthlyLimit, this.localMonthlyLimit)
-      };
+      const snapshotDaily = this.budgetStatus.daily_used;
+      const snapshotMonthly = this.budgetStatus.monthly_used;
+      const mergedDaily = Math.max(serverDailyUsed, snapshotDaily);
+      const mergedMonthly = Math.max(serverMonthlyUsed, snapshotMonthly);
+      this.budgetStatus.daily_used = mergedDaily + (this.budgetStatus.daily_used - snapshotDaily);
+      this.budgetStatus.monthly_used = mergedMonthly + (this.budgetStatus.monthly_used - snapshotMonthly);
+      this.budgetStatus.daily_limit = this.pickStricterLimit(serverDailyLimit, this.localDailyLimit);
+      this.budgetStatus.monthly_limit = this.pickStricterLimit(serverMonthlyLimit, this.localMonthlyLimit);
+      this.budgetStatus.status = data.status;
+      this.budgetStatus.kill_switch_active = data.kill_switch_active;
       this.consecutiveFailures = 0;
       const newStatus = data.kill_switch_active ? "OFF" : data.status;
       if (newStatus !== this.status) {
@@ -732,6 +765,7 @@ function protect(client, config) {
     ...config
   };
   let shared = instances.get(resolvedConfig.apiKey);
+  const isExisting = !!shared;
   if (!shared) {
     const shipper2 = new LogShipper(resolvedConfig);
     const heartbeat2 = new Heartbeat(resolvedConfig);
@@ -741,7 +775,19 @@ function protect(client, config) {
   }
   const { shipper, heartbeat } = shared;
   if (resolvedConfig.budget) {
-    const budgetConfig = typeof resolvedConfig.budget === "number" ? { monthly: resolvedConfig.budget } : resolvedConfig.budget;
+    const raw = typeof resolvedConfig.budget === "number" ? { monthly: resolvedConfig.budget } : resolvedConfig.budget;
+    const budgetConfig = { ...raw };
+    if (isExisting) {
+      const current = heartbeat.budgetStatus;
+      if (budgetConfig.daily !== void 0) {
+        const existing = current.daily_limit;
+        budgetConfig.daily = existing !== null ? Math.min(existing, budgetConfig.daily) : budgetConfig.daily;
+      }
+      if (budgetConfig.monthly !== void 0) {
+        const existing = current.monthly_limit;
+        budgetConfig.monthly = existing !== null ? Math.min(existing, budgetConfig.monthly) : budgetConfig.monthly;
+      }
+    }
     heartbeat.applyLocalLimits(budgetConfig);
   }
   const provider = detectProvider(client);
@@ -783,14 +829,16 @@ async function shutdown(apiKey) {
     const shared = instances.get(apiKey);
     if (shared) {
       shared.heartbeat.destroy();
-      shared.shipper.destroy();
+      await shared.shipper.shutdown();
       instances.delete(apiKey);
     }
   } else {
+    const shutdowns = [];
     for (const [key, shared] of instances) {
       shared.heartbeat.destroy();
-      shared.shipper.destroy();
+      shutdowns.push(shared.shipper.shutdown());
     }
+    await Promise.all(shutdowns);
     instances.clear();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caplyr",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "AI Cost Control Plane — budget guardrails, auto-downgrade, and kill switch for AI API calls",
   "main": "dist/index.js",
   "module": "dist/index.mjs",