easy-ping 0.6.0 → 0.7.0

package/dist/index.cjs

@@ -206,15 +206,16 @@ function createScopedSigner(secret, pluginId, purposes, onViolation) {
 }
 
 // src/core/handler.ts
+var STREAM_HIGH_WATER_MARK = 256;
 var MAX_BODY_BYTES = 64 * 1024;
 var MAX_READ_IDS = 200;
 var PRIVATE_HEADERS = {
   "cache-control": "private, no-store",
   "x-content-type-options": "nosniff"
 };
-var json = (body, status = 200) => new Response(JSON.stringify(body), {
+var json = (body, status = 200, headers = {}) => new Response(JSON.stringify(body), {
   status,
-  headers: { "content-type": "application/json", ...PRIVATE_HEADERS }
+  headers: { "content-type": "application/json", ...PRIVATE_HEADERS, ...headers }
 });
 var empty = (status) => new Response(null, { status, headers: PRIVATE_HEADERS });
 function harden(response) {
@@ -380,7 +381,14 @@ function createHandler(deps) {
     if (userId === "error") return empty(500);
     if (userId === null) return empty(401);
     if (request.method === "GET" && path === "/events") {
-      return deps.events ? events(request, userId, deps.events) : empty(404);
+      if (!deps.events) return empty(404);
+      if ((openStreams.get(userId) ?? 0) >= deps.events.maxStreamsPerUser) {
+        return json({ error: "too many open event streams" }, 429, { "retry-after": "30" });
+      }
+      if (totalStreams >= deps.events.maxStreams) {
+        return json({ error: "event streams unavailable" }, 503, { "retry-after": "30" });
+      }
+      return events(request, userId, deps.events);
     }
     if (request.method === "GET" && path === "/") {
       const limitParam = Number(url.searchParams.get("limit") ?? 20);
@@ -428,6 +436,18 @@ function createHandler(deps) {
     }
     return empty(404);
   }
+  const openStreams = /* @__PURE__ */ new Map();
+  let totalStreams = 0;
+  const trackStream = (userId) => {
+    openStreams.set(userId, (openStreams.get(userId) ?? 0) + 1);
+    totalStreams += 1;
+    return () => {
+      const remaining = (openStreams.get(userId) ?? 1) - 1;
+      if (remaining > 0) openStreams.set(userId, remaining);
+      else openStreams.delete(userId);
+      totalStreams -= 1;
+    };
+  };
   async function fingerprint(userId) {
     const [page, unseen] = await Promise.all([
       deps.adapter.listNotifications({ userId, limit: 1 }),
@@ -436,63 +456,92 @@ function createHandler(deps) {
     const newest = page.notifications[0];
     return `${newest?.id ?? ""}|${newest?.readAt ? 1 : 0}|${unseen}`;
   }
+  const probes = /* @__PURE__ */ new Map();
+  function subscribeProbe(userId, onChanged, intervalMs) {
+    let probe = probes.get(userId);
+    if (!probe) {
+      const created = {
+        listeners: /* @__PURE__ */ new Set(),
+        timer: setInterval(() => {
+          fingerprint(userId).then((value) => {
+            if (created.last !== void 0 && value !== created.last) {
+              for (const listener of created.listeners) listener();
+            }
+            created.last = value;
+          }).catch((error) => deps.logger.error("events probe failed", { error }));
+        }, intervalMs)
+      };
+      probe = created;
+      probes.set(userId, created);
+      fingerprint(userId).then((value) => {
+        if (created.last === void 0) created.last = value;
+      }).catch(() => {
+      });
+    }
+    probe.listeners.add(onChanged);
+    return () => {
+      const current = probes.get(userId);
+      if (!current) return;
+      current.listeners.delete(onChanged);
+      if (current.listeners.size === 0) {
+        clearInterval(current.timer);
+        probes.delete(userId);
+      }
+    };
+  }
   function events(request, userId, settings) {
     const encoder3 = new TextEncoder();
     const timers = [];
-    let unsubscribe;
+    const unsubscribes = [];
     let closed = false;
     let cleanup = () => {
     };
-    const stream = new ReadableStream({
-      start(controller) {
-        const write = (text) => {
-          if (closed) return;
-          try {
-            controller.enqueue(encoder3.encode(text));
-          } catch {
-            cleanup();
+    const stream = new ReadableStream(
+      {
+        start(controller) {
+          const write = (text) => {
+            if (closed) return;
+            if (controller.desiredSize !== null && controller.desiredSize <= 0) {
+              cleanup();
+              return;
+            }
+            try {
+              controller.enqueue(encoder3.encode(text));
+            } catch {
+              cleanup();
+            }
+          };
+          cleanup = () => {
+            if (closed) return;
+            closed = true;
+            for (const unsubscribe of unsubscribes) unsubscribe();
+            for (const timer of timers) clearInterval(timer);
+            try {
+              controller.close();
+            } catch {
+            }
+          };
+          const changed = () => write("event: changed\ndata: {}\n\n");
+          unsubscribes.push(trackStream(userId));
+          write("retry: 3000\n\nevent: ready\ndata: {}\n\n");
+          unsubscribes.push(deps.signals.subscribe(inboxChannel(userId), changed));
+          timers.push(setInterval(() => write(": keepalive\n\n"), settings.heartbeatMs));
+          if (!deps.signals.crossProcess && settings.probeIntervalMs > 0) {
+            unsubscribes.push(subscribeProbe(userId, changed, settings.probeIntervalMs));
           }
-        };
-        cleanup = () => {
-          if (closed) return;
-          closed = true;
-          unsubscribe?.();
-          for (const timer of timers) clearInterval(timer);
-          try {
-            controller.close();
-          } catch {
+          if (settings.maxDurationMs > 0) {
+            timers.push(
+              setTimeout(cleanup, settings.maxDurationMs)
+            );
           }
-        };
-        const changed = () => write("event: changed\ndata: {}\n\n");
-        write("retry: 3000\n\nevent: ready\ndata: {}\n\n");
-        unsubscribe = deps.signals.subscribe(inboxChannel(userId), changed);
-        timers.push(setInterval(() => write(": keepalive\n\n"), settings.heartbeatMs));
-        if (!deps.signals.crossProcess && settings.probeIntervalMs > 0) {
-          let last;
-          fingerprint(userId).then((value) => {
-            last = value;
-          }).catch(() => {
-          });
-          timers.push(
-            setInterval(() => {
-              fingerprint(userId).then((value) => {
-                if (last !== void 0 && value !== last) changed();
-                last = value;
-              }).catch((error) => deps.logger.error("events probe failed", { error }));
-            }, settings.probeIntervalMs)
-          );
-        }
-        if (settings.maxDurationMs > 0) {
-          timers.push(
-            setTimeout(cleanup, settings.maxDurationMs)
-          );
+          request.signal?.addEventListener("abort", cleanup, { once: true });
+        },
+        cancel() {
+          cleanup();
         }
-        request.signal?.addEventListener("abort", cleanup, { once: true });
       },
-      cancel() {
-        cleanup();
-      }
-    });
+      { highWaterMark: STREAM_HIGH_WATER_MARK }
+    );
     return new Response(stream, {
       headers: {
         "content-type": "text/event-stream; charset=utf-8",
@@ -504,13 +553,15 @@ function createHandler(deps) {
     });
   }
   async function handle(request) {
+    let response;
     try {
-      return await route(request);
+      response = await route(request);
+      return response;
     } catch (error) {
       deps.logger.error("request failed", { url: request.url, error });
       return empty(500);
     } finally {
-      deps.sweepOnRequest?.();
+      if (response && response.status < 400) deps.sweepOnRequest?.();
     }
   }
   return {
@@ -1295,7 +1346,9 @@ function easyPing(config) {
   const events = config.events === false ? false : {
     heartbeatMs: config.events?.heartbeatMs ?? 25e3,
     probeIntervalMs: config.events?.probeIntervalMs ?? 3e4,
-    maxDurationMs: config.events?.maxDurationMs ?? 0
+    maxDurationMs: config.events?.maxDurationMs ?? 0,
+    maxStreamsPerUser: config.events?.maxStreamsPerUser ?? 10,
+    maxStreams: config.events?.maxStreams ?? 5e3
   };
   const sweepConfig = config.delivery?.sweepOnRequest;
   let lastRequestSweep = 0;