@graphrefly/graphrefly 0.47.1 → 0.48.0

package/dist/utils/resilience/index.cjs

@@ -342,9 +342,11 @@ function _retrySource(source, opts, emitState) {
       const merged = makeMergedOptsMirror(opts);
       const getCfg = () => resolveRetryConfig(merged.current());
       const inner = _runRetryStateMachine(getCfg, () => source, a, emitState);
-      return () => {
-        inner();
-        merged.unsub();
+      return {
+        onDeactivation: () => {
+          inner();
+          merged.unsub();
+        }
       };
     },
     {
@@ -368,9 +370,11 @@ function _retryFactory(factory, opts, emitState) {
       const merged = makeMergedOptsMirror(opts);
       const getCfg = () => resolveRetryConfig(merged.current());
       const inner = _runRetryStateMachine(getCfg, factory, a, emitState);
-      return () => {
-        inner();
-        merged.unsub();
+      return {
+        onDeactivation: () => {
+          inner();
+          merged.unsub();
+        }
       };
     },
     {
@@ -435,7 +439,7 @@ function withStatus(src, options) {
           } else a.down([m]);
         }
       });
-      return unsub;
+      return { onDeactivation: unsub };
     },
     {
       ...operatorOpts(),
@@ -617,11 +621,13 @@ function withTimeout(source, opts, extraOpts) {
       if (latestOpts != null) {
         attachSource();
       }
-      return () => {
-        stopped = true;
-        timer.cancel();
-        if (srcUnsub) srcUnsub();
-        if (optsUnsub) optsUnsub();
+      return {
+        onDeactivation: () => {
+          stopped = true;
+          timer.cancel();
+          if (srcUnsub) srcUnsub();
+          if (optsUnsub) optsUnsub();
+        }
       };
     },
     {
@@ -831,7 +837,7 @@ function withBreaker(breaker, options) {
           }
         });
         syncState();
-        return unsub;
+        return { onDeactivation: unsub };
       },
       {
         ...operatorOpts(),
@@ -984,8 +990,10 @@ function budgetGate(source, constraints, opts) {
           })
         );
       }
-      return () => {
-        for (const u of unsubs) u();
+      return {
+        onDeactivation: () => {
+          for (const u of unsubs) u();
+        }
       };
     },
     {
@@ -1114,9 +1122,11 @@ function fallback(source, fb, options) {
           } else a.down([m]);
         }
       });
-      return () => {
-        sourceUnsub?.();
-        fallbackUnsub?.();
+      return {
+        onDeactivation: () => {
+          sourceUnsub?.();
+          fallbackUnsub?.();
+        }
       };
     },
     {
@@ -1419,31 +1429,40 @@ var RATE_LIMITER_INITIAL_STATE = Object.freeze({
   pendingCount: 0,
   paused: false
 });
+function validateRateLimiterOpts(o) {
+  if (o.maxEvents <= 0) throw new RangeError("maxEvents must be > 0");
+  if (o.windowNs <= 0) throw new RangeError("windowNs must be > 0");
+  if (o.maxBuffer === void 0) {
+    throw new RangeError(
+      "rateLimiter requires explicit maxBuffer (use Infinity to opt in to unbounded)"
+    );
+  }
+  const isUnbounded = o.maxBuffer === Infinity;
+  if (!isUnbounded && (!Number.isInteger(o.maxBuffer) || o.maxBuffer < 1)) {
+    throw new RangeError("maxBuffer must be a positive integer (or Infinity for unbounded)");
+  }
+}
+function resolveInitialReactiveOpts(optsNode) {
+  const cached = optsNode.cache;
+  if (cached === void 0) {
+    throw new RangeError(
+      "rateLimiter: reactive (Node-form) opts must carry a cached value at construction \u2014 seed the opts Node with `initial`. Mode (bounded vs unbounded) and the initial cap are LOCKED from `.cache` at construction and the swap handler rejects mode toggles; an un-seeded Node would silently lock bounded `maxBuffer: 1` (D4)."
+    );
+  }
+  return cached;
+}
 function rateLimiter(source, opts) {
   const isReactive = isNode(opts);
-  if (!isReactive) {
-    const o = opts;
-    if (o.maxEvents <= 0) throw new RangeError("maxEvents must be > 0");
-    if (o.windowNs <= 0) throw new RangeError("windowNs must be > 0");
-    if (o.maxBuffer === void 0) {
-      throw new RangeError(
-        "rateLimiter requires explicit maxBuffer (use Infinity to opt in to unbounded)"
-      );
-    }
-    const isUnbounded0 = o.maxBuffer === Infinity;
-    if (!isUnbounded0 && (!Number.isInteger(o.maxBuffer) || o.maxBuffer < 1)) {
-      throw new RangeError("maxBuffer must be a positive integer (or Infinity for unbounded)");
-    }
-  }
-  const initialOpts = isReactive ? opts.cache : opts;
-  const initialMaxBuffer = initialOpts?.maxBuffer;
+  const initialOpts = isReactive ? resolveInitialReactiveOpts(opts) : opts;
+  validateRateLimiterOpts(initialOpts);
+  const initialMaxBuffer = initialOpts.maxBuffer;
   const isUnbounded = initialMaxBuffer === Infinity;
   const out = (0, import_core9.node)(
     (_data, a) => {
-      let maxEvents = initialOpts?.maxEvents ?? 1;
-      let windowNs = initialOpts?.windowNs ?? NS_PER_SEC;
-      let maxBuffer = initialMaxBuffer ?? 1;
-      let onOverflow = initialOpts?.onOverflow ?? "drop-newest";
+      let maxEvents = initialOpts.maxEvents;
+      let windowNs = initialOpts.windowNs;
+      let maxBuffer = initialMaxBuffer;
+      let onOverflow = initialOpts.onOverflow ?? "drop-newest";
       let refillPerSec = maxEvents * NS_PER_SEC / windowNs;
       let tokenTimeNs = NS_PER_SEC / refillPerSec;
       let bucket = tokenBucket(maxEvents, refillPerSec);
@@ -1566,11 +1585,13 @@ function rateLimiter(source, opts) {
           } else a.down([m]);
         }
       });
-      return () => {
-        terminated = true;
-        timer.cancel();
-        unsub();
-        optMirror.unsub();
+      return {
+        onDeactivation: () => {
+          terminated = true;
+          timer.cancel();
+          unsub();
+          optMirror.unsub();
+        }
       };
     },
     {