octane 0.3.0 → 0.3.1

package/dist/cjs/server/streamed-signals.cjs

@@ -117,10 +117,7 @@ function createStreamedRendererFrameStream(frames, options = {}) {
   let totalBytes = 0;
   let finished = false;
   let controller;
-  const timer = setTimeout(
-    () => fail(new Error("Streamed renderer response timed out.")),
-    budget.timeoutMs
-  );
+  let timer;
   const cleanup = () => {
     clearTimeout(timer);
     options.signal?.removeEventListener("abort", abort);
@@ -149,8 +146,13 @@ function createStreamedRendererFrameStream(frames, options = {}) {
       },
       async pull() {
         if (finished) return;
+        timer = setTimeout(
+          () => fail(new Error("Streamed renderer response timed out.")),
+          budget.timeoutMs
+        );
         try {
           const next = await iterator.next();
+          clearTimeout(timer);
           if (finished) return;
           if (next.done) {
             finished = true;
@@ -191,10 +193,15 @@ function streamedSignalSelectionScript(identity, nonce) {
   return `<script ${import_stream_protocol.STREAM_SCRIPT_ATTR}${nonce === void 0 ? "" : ` nonce="${escapeAttribute(nonce)}"`}>(function(g){var k="__octaneStreamedRenderer",e=g[k];if(!e){var q=[];g[k]={version:1,frames:q,receive:function(f){if(q.length>=512){this.overflow=true;return;}q.push(f);}};}var z="__octaneStreamedSignalSelections",v=g[z];if(!v){var a=[];v=g[z]={version:1,identities:a,register:function(i){if(a.length>=256){this.overflow=true;return;}a.push(i);}};}v.register(${encoded});})(globalThis);</script>`;
 }
 function createStreamedSignalInjection(identity, result, options = {}) {
+  return createSignalInjection(identity, result, options, "Streamed renderer injection timed out.");
+}
+function createSignalInjection(identity, result, options, timeoutMessage) {
   const budget = limits(options);
   const iterator = createStreamedSignalResultFrames(identity, result, options)[Symbol.asyncIterator]();
   let queued = options.announceSelection ? streamedSignalSelectionScript(identity, options.nonce) : "";
   let pending = false;
+  let awaitingAcceptance = false;
+  let queuedBytes = queued === "" ? 0 : new TextEncoder().encode(queued).byteLength;
   let finished = false;
   let subscribed = false;
   let totalBytes = 0;
@@ -225,11 +232,13 @@ function createStreamedSignalInjection(identity, result, options = {}) {
     rejectDone(error);
   };
   const pump = () => {
-    if (!subscribed || pending || queued !== "" || finished) return;
+    if (!subscribed || pending || awaitingAcceptance || queued !== "" || finished) return;
     pending = true;
+    timer = setTimeout(() => fail(new Error(timeoutMessage)), budget.timeoutMs);
     void iterator.next().then(
       (next) => {
         pending = false;
+        clearTimeout(timer);
         if (finished) return;
         if (next.done) {
           finished = true;
@@ -245,6 +254,7 @@ function createStreamedSignalInjection(identity, result, options = {}) {
         }
         totalBytes += bytes;
         queued = html;
+        queuedBytes = bytes;
         notify?.();
       },
       (error) => {
@@ -256,17 +266,17 @@ function createStreamedSignalInjection(identity, result, options = {}) {
   const abort = () => {
     fail(options.signal?.reason ?? new DOMException("Aborted", "AbortError"));
   };
-  timer = setTimeout(
-    () => fail(new Error("Streamed renderer injection timed out.")),
-    budget.timeoutMs
-  );
   options.signal?.addEventListener("abort", abort, { once: true });
   if (options.signal?.aborted) abort();
   return {
     streamedRenderer: true,
+    get queuedBytes() {
+      return queuedBytes;
+    },
     take() {
       const html = queued;
       queued = "";
+      if (html !== "") awaitingAcceptance = true;
       return html;
     },
     subscribe(callback) {
@@ -278,6 +288,7 @@ function createStreamedSignalInjection(identity, result, options = {}) {
       };
     },
     accepted() {
+      awaitingAcceptance = false;
       pump();
     },
     cancel: fail,
@@ -296,17 +307,20 @@ function createAutomaticStreamedSignalInjection(options, external) {
   if (!Number.isSafeInteger(selectionGeneration) || selectionGeneration < 0) {
     throw new RangeError("selectionGeneration must be a nonnegative safe integer.");
   }
-  const children = [];
+  const children = /* @__PURE__ */ new Set();
+  const ready = /* @__PURE__ */ new Set();
   const observedAttempts = /* @__PURE__ */ new Set();
   let initialSelections = [];
   let queued = "";
   let active;
+  let awaitingAcceptance = false;
+  let hasSignalAttempts = false;
+  let pumping = false;
   let subscribed = false;
   let renderComplete = false;
   let finished = false;
   let totalBytes = 0;
   let notify;
-  let timer;
   let resolveDone;
   let rejectDone;
   const done = new Promise((resolve, reject) => {
@@ -314,6 +328,8 @@ function createAutomaticStreamedSignalInjection(options, external) {
     rejectDone = reject;
   });
   const cleanupChild = (child) => {
+    if (!children.delete(child)) return;
+    ready.delete(child);
     try {
       child.unsubscribe();
     } catch {
@@ -326,7 +342,6 @@ function createAutomaticStreamedSignalInjection(options, external) {
   const fail = (error) => {
     if (finished) return;
     finished = true;
-    if (timer !== void 0) clearTimeout(timer);
     for (const child of children) {
       try {
         child.source.cancel?.(error);
@@ -337,11 +352,9 @@ function createAutomaticStreamedSignalInjection(options, external) {
     rejectDone(error);
   };
   const maybeDone = () => {
-    if (finished || !renderComplete || active !== void 0 || queued !== "") return;
-    for (const child of children) if (!child.done) return;
+    if (finished || !renderComplete || active !== void 0 || awaitingAcceptance || queued !== "" || children.size !== 0)
+      return;
     finished = true;
-    if (timer !== void 0) clearTimeout(timer);
-    for (const child of children) cleanupChild(child);
     resolveDone();
   };
   const takeInitialSelections = () => {
@@ -363,33 +376,41 @@ function createAutomaticStreamedSignalInjection(options, external) {
     return html;
   };
   const pump = () => {
-    if (!subscribed || finished || active !== void 0 || queued !== "") return;
-    if (initialSelections !== void 0) {
-      try {
-        queued = takeInitialSelections();
-      } catch {
-        return;
+    if (pumping || !subscribed || finished || active !== void 0 || awaitingAcceptance || queued !== "")
+      return;
+    pumping = true;
+    try {
+      if (initialSelections !== void 0) {
+        try {
+          queued = takeInitialSelections();
+        } catch {
+          return;
+        }
+        if (queued !== "") notify?.();
       }
-      if (queued !== "") {
+      for (const child of ready) {
+        if (finished || active !== void 0 || awaitingAcceptance || queued !== "") return;
+        ready.delete(child);
+        const html = child.source.take();
+        if (finished) return;
+        if (html === "") {
+          if (child.done && (child.attempt !== void 0 || renderComplete)) cleanupChild(child);
+          continue;
+        }
+        const bytes = child.attempt === void 0 ? new TextEncoder().encode(html).byteLength : child.source.queuedBytes;
+        if (bytes > budget.maxFrameBytes || totalBytes + bytes > budget.maxTotalBytes) {
+          fail(new Error("Automatic streamed signals exceeded their byte budget."));
+          return;
+        }
+        totalBytes += bytes;
+        active = child;
+        queued = html;
         notify?.();
-        return;
-      }
-    }
-    for (const child of children) {
-      const html = child.source.take();
-      if (html === "") continue;
-      const bytes = new TextEncoder().encode(html).byteLength;
-      if (bytes > budget.maxFrameBytes || totalBytes + bytes > budget.maxTotalBytes) {
-        fail(new Error("Automatic streamed signals exceeded their byte budget."));
-        return;
       }
-      totalBytes += bytes;
-      active = child;
-      queued = html;
-      notify?.();
-      return;
+      maybeDone();
+    } finally {
+      pumping = false;
     }
-    maybeDone();
   };
   const addChild = (source, release, attempt) => {
     const child = {
@@ -400,17 +421,23 @@ function createAutomaticStreamedSignalInjection(options, external) {
       ...attempt === void 0 ? {} : { attempt },
       done: false
     };
-    children.push(child);
-    child.unsubscribe = source.subscribe(pump);
+    children.add(child);
+    const available = () => {
+      if (finished || !children.has(child)) return;
+      ready.add(child);
+      pump();
+    };
+    ready.add(child);
+    child.unsubscribe = source.subscribe(available);
     source.done.then(
       () => {
         child.done = true;
-        pump();
+        available();
       },
       (error) => {
         if (child.attempt !== void 0 && !child.attempt.isCurrent()) {
           child.done = true;
-          pump();
+          available();
         } else fail(error);
       }
     );
@@ -421,7 +448,7 @@ function createAutomaticStreamedSignalInjection(options, external) {
     takeInitialSelections,
     createSignalAttemptObservations: import_signal_query_observation.createServerSignalQueryAttemptObservations,
     get streamedRenderer() {
-      return external?.streamedRenderer === true || children.some((child) => child.attempt !== void 0) ? true : void 0;
+      return external?.streamedRenderer === true || hasSignalAttempts ? true : void 0;
     },
     observeSignalAttempt(attempt, run) {
       if (finished || !attempt.isCurrent()) {
@@ -439,18 +466,13 @@ function createAutomaticStreamedSignalInjection(options, external) {
         attempt.release();
         return;
       }
-      if (children.length >= 256) {
+      if (children.size >= 256) {
         attempt.release();
         fail(new Error("Automatic streamed signals exceeded their channel budget."));
         return;
       }
       observedAttempts.add(attemptKey);
-      if (timer === void 0) {
-        timer = setTimeout(
-          () => fail(new Error("Automatic streamed signals timed out.")),
-          budget.timeoutMs
-        );
-      }
+      hasSignalAttempts = true;
       const identity = {
         protocol: 1,
         buildId: options.buildId,
@@ -463,21 +485,27 @@ function createAutomaticStreamedSignalInjection(options, external) {
         attempt: attempt.attempt
       };
       initialSelections?.push({ identity, attempt });
-      const source = createStreamedSignalInjection(identity, attempt.result, {
-        signal: attempt.signal,
-        run,
-        nonce: options.nonce,
-        announceSelection: initialSelections === void 0,
-        maxFrameBytes: budget.maxFrameBytes,
-        maxTotalBytes: budget.maxTotalBytes,
-        timeoutMs: budget.timeoutMs
-      });
+      const source = createSignalInjection(
+        identity,
+        attempt.result,
+        {
+          signal: attempt.signal,
+          run,
+          nonce: options.nonce,
+          announceSelection: initialSelections === void 0,
+          maxFrameBytes: budget.maxFrameBytes,
+          maxTotalBytes: budget.maxTotalBytes,
+          timeoutMs: budget.timeoutMs
+        },
+        "Automatic streamed signals timed out."
+      );
       addChild(source, attempt.release, attempt);
       pump();
     },
     take() {
       const html = queued;
       queued = "";
+      if (html !== "") awaitingAcceptance = true;
       return html;
     },
     subscribe(callback) {
@@ -490,15 +518,22 @@ function createAutomaticStreamedSignalInjection(options, external) {
     },
     accepted() {
       const child = active;
-      active = void 0;
       child?.source.accepted?.();
+      if (child !== void 0 && children.has(child)) ready.add(child);
+      active = void 0;
+      awaitingAcceptance = false;
       pump();
     },
     cancel: fail,
     done,
     renderComplete() {
       renderComplete = true;
-      for (const child of children) child.source.renderComplete?.();
+      external?.renderComplete?.();
+      for (const child of children) {
+        if (child.attempt !== void 0) child.source.renderComplete?.();
+        if (child.done) ready.add(child);
+      }
+      pump();
       maybeDone();
     }
   };

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.3.0";
+const version = "0.3.1";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version