@fml-inc/fml 0.8.7 → 0.8.10-dev.1

package/dist/observer-server.js

@@ -5,11 +5,11 @@ import {
   isWinShim,
   quoteWinArg,
   resolveBin
-} from "./chunk-XFALHTDL.js";
+} from "./chunk-5SI6S4HW.js";
 import {
   createHookSyncLoop,
   getActiveHookDestinationBinding
-} from "./chunk-PJWMSHHZ.js";
+} from "./chunk-WE7MAWAW.js";
 import {
   OBSERVER_PROTOCOL_VERSION,
   OBSERVER_SERVICE_NAME,
@@ -30,16 +30,16 @@ import {
   removeObserverStateIfOwned,
   retireHookInboxEntry,
   updateObserverState
-} from "./chunk-4YLSKFDU.js";
+} from "./chunk-5PEFBQNX.js";
 import "./chunk-7V7G7NVF.js";
 import {
   ObserverSyncCycleAbortedError,
   runObserverSyncCycleSubprocess
-} from "./chunk-6BTC3S7C.js";
+} from "./chunk-2DGHAVVR.js";
 import {
   createCliRawSync,
   invalidateCliRawSyncDiscoveryCache
-} from "./chunk-5JJQWV4G.js";
+} from "./chunk-JPHN4VKM.js";
 import "./chunk-F57IFY3K.js";
 import {
   FML_OBSERVER_AUTH_TOKEN_FILE,
@@ -58,7 +58,7 @@ import {
   getSyncDestinationAuthBinding,
   getValidToken,
   observerOnlyOverrideWarning
-} from "./chunk-B3H2YWPJ.js";
+} from "./chunk-HDAFEHUY.js";
 import "./chunk-MLKGABMK.js";
 
 // src/observer-server.ts
@@ -225,7 +225,6 @@ var MAX_ERROR_TEXT_BYTES = 1e3;
 var MAX_REJECTION_REASON_BYTES = 3 * 1024;
 var MAX_OTLP_RESPONSE_BYTES = 64 * 1024;
 var MAX_OTLP_UPLOAD_ATTEMPTS = 10;
-var MAX_OTLP_RETRY_AGE_MS = 24 * 60 * 6e4;
 var OUTBOX_BATCH_SIZE = 1;
 var DRAIN_INTERVAL_MS = 25;
 function combineWarnings(...warnings) {
@@ -675,6 +674,7 @@ async function runOtlpSyncCycle(opts) {
   if (totalPending === 0) {
     return { kind: "drained", pending: 0, uploaded: 0 };
   }
+  const maxAgeMs = opts.database.getOtlpSpoolStatus().maxAgeMs;
   const destinationResolution = await resolveDestination();
   if (destinationResolution.kind !== "ready") {
     return {
@@ -736,7 +736,7 @@ async function runOtlpSyncCycle(opts) {
   };
   for (const envelope of envelopes) {
     if (opts.signal?.aborted) throw opts.signal.reason;
-    if (cycleStartedAtMs - envelope.capturedAtMs >= MAX_OTLP_RETRY_AGE_MS) {
+    if (cycleStartedAtMs - envelope.capturedAtMs >= maxAgeMs) {
       dropped += opts.database.dropOtlpEnvelopes(
         destination,
         [
@@ -1046,6 +1046,17 @@ function parseOtlpSpoolMaxBytes(configured) {
   }
   return bytes;
 }
+function parseOtlpSpoolMaxAgeMs(configured) {
+  if (configured === void 0) return void 0;
+  const value = configured.trim();
+  const milliseconds = Number(value) * 60 * 60 * 1e3;
+  if (!POSITIVE_INTEGER_PATTERN.test(value) || !Number.isSafeInteger(milliseconds)) {
+    throw new Error(
+      "FML_OTLP_SPOOL_MAX_AGE_HOURS must be a positive safe integer number of hours"
+    );
+  }
+  return milliseconds;
+}
 
 // src/observer/sync-loop.ts
 var OBSERVER_IDLE_INTERVAL_MS = 5 * 6e4;
@@ -1348,7 +1359,8 @@ var HOOK_INBOX_DRAIN_INTERVAL_MS = 15e3;
 var HOOK_INBOX_DRAIN_BUDGET_MS = 5e3;
 var HOOK_INBOX_DRAIN_ENTRIES = 100;
 var HOOK_INBOX_DRAIN_BULK_ENTRIES = 1e3;
-var HOOK_QUARANTINE_PRUNE_INTERVAL_MS = 5 * 60 * 1e3;
+var SPOOL_CLEANUP_INTERVAL_MS = 5 * 60 * 1e3;
+var OTLP_CLEANUP_BATCH_DELAY_MS = 100;
 var OBSERVER_DIRECTORY_LEASE = {
   stateFile: FML_OBSERVER_STATE_FILE,
   lockFile: FML_OBSERVER_LOCK_FILE
@@ -1452,6 +1464,9 @@ var hookQuarantineMaxAgeMs = parseHookQuarantineMaxAgeMs(
 var otlpSpoolMaxBytes = parseOtlpSpoolMaxBytes(
   process.env.FML_OTLP_SPOOL_MAX_BYTES
 );
+var otlpSpoolMaxAgeMs = parseOtlpSpoolMaxAgeMs(
+  process.env.FML_OTLP_SPOOL_MAX_AGE_HOURS
+);
 ensureDirs();
 var isolationWarning = observerOnlyOverrideWarning();
 if (isolationWarning) console.warn(isolationWarning);
@@ -1486,6 +1501,7 @@ var fatalShutdownScheduled = false;
 var heartbeatTimer = null;
 var hookInboxDrainTimer = null;
 var hookInboxDrainPromise = null;
+var otlpPruneTimer = null;
 var hookQuarantinePruneTimer = null;
 var stateUpdateRetryTimer = null;
 var syncLoop = null;
@@ -1510,9 +1526,10 @@ try {
     // FML_STATE_DIR can be caller-managed. Keep SQLite payload files private
     // without changing permissions on the shared parent directory.
     restrictDatabaseDirectory: false,
+    maxOtlpSpoolAgeMs: otlpSpoolMaxAgeMs,
+    maxOtlpSpoolBytes: otlpSpoolMaxBytes,
     ...hookSpoolMaxBytes === void 0 ? {} : { maxHookSpoolBytes: hookSpoolMaxBytes },
-    ...hookQuarantineMaxAgeMs === void 0 ? {} : { maxHookQuarantineAgeMs: hookQuarantineMaxAgeMs },
-    ...otlpSpoolMaxBytes === void 0 ? {} : { maxOtlpSpoolBytes: otlpSpoolMaxBytes }
+    ...hookQuarantineMaxAgeMs === void 0 ? {} : { maxHookQuarantineAgeMs: hookQuarantineMaxAgeMs }
   });
 } catch (error) {
   removeInitialLeasesBestEffort(initial.instanceId);
@@ -1546,7 +1563,7 @@ var hookRejectionStatus = () => ({
   ...lastRejectedReason !== void 0 ? { lastRejectedReason } : {},
   ...lastRejectedTarget !== void 0 ? { lastRejectedTarget } : {}
 });
-var packageVersion = true ? "0.8.7+af45d2af" : "dev";
+var packageVersion = true ? "0.8.10-dev.1+09fae5b6" : "dev";
 var health = () => ({
   status: "ok",
   service: OBSERVER_SERVICE_NAME,
@@ -1611,6 +1628,7 @@ var shutdown = async () => {
   if (heartbeatTimer) clearInterval(heartbeatTimer);
   if (hookInboxDrainTimer) clearInterval(hookInboxDrainTimer);
   if (hookQuarantinePruneTimer) clearInterval(hookQuarantinePruneTimer);
+  if (otlpPruneTimer) clearTimeout(otlpPruneTimer);
   if (stateUpdateRetryTimer) clearTimeout(stateUpdateRetryTimer);
   sessionEndSyncWakeScheduler.stop();
   autoUpdater?.stop();
@@ -1866,8 +1884,30 @@ try {
     } catch (error) {
       scheduleFatalShutdown(error);
     }
-  }, HOOK_QUARANTINE_PRUNE_INTERVAL_MS);
+  }, SPOOL_CLEANUP_INTERVAL_MS);
   hookQuarantinePruneTimer.unref();
+  let nextOtlpAgeCheckAtMs = 0;
+  const pruneOtlp = () => {
+    if (shuttingDown) return;
+    try {
+      const nowMs = Date.now();
+      let removed = 0;
+      if (nowMs >= nextOtlpAgeCheckAtMs) {
+        removed = database.pruneExpiredOtlpEnvelopes(nowMs);
+        if (removed < 100)
+          nextOtlpAgeCheckAtMs = nowMs + SPOOL_CLEANUP_INTERVAL_MS;
+      }
+      if (removed === 0) removed = database.pruneOtlpCapacity(nowMs);
+      otlpPruneTimer = setTimeout(
+        pruneOtlp,
+        removed > 0 ? OTLP_CLEANUP_BATCH_DELAY_MS : SPOOL_CLEANUP_INTERVAL_MS
+      );
+      otlpPruneTimer.unref();
+    } catch (error) {
+      scheduleFatalShutdown(error);
+    }
+  };
+  pruneOtlp();
   hookSyncLoop = createHookSyncLoop({
     database,
     version: packageVersion