@bleedingdev/modern-js-app-tools-extensions 3.9.0-ultramodern.23 → 3.9.0-ultramodern.25

package/dist/cjs/templates/cloudflare-entry.001-bootstrap-security.mjs

@@ -3,7 +3,6 @@ const MODERN_WORKER_MANIFEST = p_workerManifest;
 export const modernWorkerManifest = MODERN_WORKER_MANIFEST;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
-const effectBffDispatcherPromises = new Map();
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
 const ASSET_CORS_ENABLED = CORS_POLICY.assets !== false;
@@ -239,6 +238,9 @@ function finalizeResponseForRequest(response, request) {
 
   const headers = new Headers(securedResponse.headers);
   headers.delete('content-length');
+  // A HEAD response sends no body, so release the producer's stream instead of abandoning it:
+  // a stream nobody reads never finishes, and whatever waits for its end never runs.
+  securedResponse.body?.cancel().catch(() => undefined);
 
   return new Response(null, {
     headers,

package/dist/cjs/templates/cloudflare-entry.005-worker-dispatch.mjs

@@ -237,109 +237,112 @@ function createEffectBffDispatcherErrorResponse(bff, error) {
   );
 }
 
-function getEffectBffDispatcher(bff, runtime) {
-  let effectDispatcherPromise = effectBffDispatcherPromises.get(bff.worker);
-
-  if (effectDispatcherPromise) {
-    return effectDispatcherPromise;
+// workerd binds every I/O object (sockets, timers, pending promises) to the request that
+// created it, so an Effect runtime built while serving one request cannot serve the next: a
+// pooled PostgreSQL connection or a cached in-flight effect from an earlier request never
+// completes. Each BFF request therefore builds its own dispatcher and disposes it once the
+// response body has been delivered; platform pools such as Hyperdrive keep connections warm.
+async function createEffectBffDispatcher(bff, runtime) {
+  if (
+    typeof bff.dispatcherExport !== 'string' ||
+    bff.dispatcherExport.length === 0
+  ) {
+    throw new Error('manifest does not declare dispatcherExport');
   }
 
-  effectDispatcherPromise = Promise.resolve().then(async () => {
-    if (
-      typeof bff.dispatcherExport !== 'string' ||
-      bff.dispatcherExport.length === 0
-    ) {
-      throw new Error('manifest does not declare dispatcherExport');
-    }
-
-    const effectDispatcherFactory = runtime[bff.dispatcherExport];
+  const effectDispatcherFactory = runtime[bff.dispatcherExport];
 
-    if (typeof effectDispatcherFactory !== 'function') {
-      throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
-    }
+  if (typeof effectDispatcherFactory !== 'function') {
+    throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
+  }
 
-    const effectConfig = bff.effect;
-    if (
-      !effectConfig ||
-      typeof effectConfig !== 'object' ||
-      Array.isArray(effectConfig)
-    ) {
-      throw new Error('manifest declares invalid Effect BFF runtime config');
-    }
-    const crossProjectPolicy = effectConfig.crossProjectPolicy;
-    if (
-      !crossProjectPolicy ||
-      typeof crossProjectPolicy !== 'object' ||
-      Array.isArray(crossProjectPolicy)
-    ) {
-      throw new Error(
-        'manifest declares invalid Effect BFF cross-project policy',
-      );
-    }
-    for (const field of [
-      'enabled',
-      'requireEnvelope',
-      'requireOperationContext',
-      'requireOperationContextDetails',
-      'requireOperationSchemaHash',
-      'requireOperationVersion',
-      'allowUnknownOperations',
-    ]) {
-      if (typeof crossProjectPolicy[field] !== 'boolean') {
-        throw new Error(
-          `manifest Effect BFF cross-project policy requires boolean ${field}`,
-        );
-      }
-    }
-    if (
-      !crossProjectPolicy.expectedOperationContracts ||
-      typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
-      Array.isArray(crossProjectPolicy.expectedOperationContracts)
-    ) {
+  const effectConfig = bff.effect;
+  if (
+    !effectConfig ||
+    typeof effectConfig !== 'object' ||
+    Array.isArray(effectConfig)
+  ) {
+    throw new Error('manifest declares invalid Effect BFF runtime config');
+  }
+  const crossProjectPolicy = effectConfig.crossProjectPolicy;
+  if (
+    !crossProjectPolicy ||
+    typeof crossProjectPolicy !== 'object' ||
+    Array.isArray(crossProjectPolicy)
+  ) {
+    throw new Error(
+      'manifest declares invalid Effect BFF cross-project policy',
+    );
+  }
+  for (const field of [
+    'enabled',
+    'requireEnvelope',
+    'requireOperationContext',
+    'requireOperationContextDetails',
+    'requireOperationSchemaHash',
+    'requireOperationVersion',
+    'allowUnknownOperations',
+  ]) {
+    if (typeof crossProjectPolicy[field] !== 'boolean') {
       throw new Error(
-        'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+        `manifest Effect BFF cross-project policy requires boolean ${field}`,
       );
     }
+  }
+  if (
+    !crossProjectPolicy.expectedOperationContracts ||
+    typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
+    Array.isArray(crossProjectPolicy.expectedOperationContracts)
+  ) {
+    throw new Error(
+      'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+    );
+  }
 
-    const effectDispatcher = await effectDispatcherFactory({
-      prefix: bff.prefix,
-      ...(effectConfig?.openapi === undefined
-        ? {}
-        : { openapi: effectConfig.openapi }),
-      ...(effectConfig?.dataPlatform === undefined
-        ? {}
-        : { dataPlatform: effectConfig.dataPlatform }),
-      ...(effectConfig?.crossProjectPolicy === undefined
-        ? {}
-        : { crossProjectPolicy }),
-    });
-
-    if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
-      try {
-        await effectDispatcher?.dispose?.();
-      } catch {}
+  const effectDispatcher = await effectDispatcherFactory({
+    prefix: bff.prefix,
+    ...(effectConfig?.openapi === undefined
+      ? {}
+      : { openapi: effectConfig.openapi }),
+    ...(effectConfig?.dataPlatform === undefined
+      ? {}
+      : { dataPlatform: effectConfig.dataPlatform }),
+    ...(effectConfig?.crossProjectPolicy === undefined
+      ? {}
+      : { crossProjectPolicy }),
+  });
 
-      throw new Error(
-        `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
-      );
-    }
+  if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
+    try {
+      await effectDispatcher?.dispose?.();
+    } catch {}
 
-    return effectDispatcher;
-  });
+    throw new Error(
+      `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
+    );
+  }
 
-  effectBffDispatcherPromises.set(bff.worker, effectDispatcherPromise);
-  effectDispatcherPromise.catch(() => {
-    if (
-      effectBffDispatcherPromises.get(bff.worker) === effectDispatcherPromise
-    ) {
-      effectBffDispatcherPromises.delete(bff.worker);
-    }
-  });
+  return effectDispatcher;
+}
 
-  return effectDispatcherPromise;
+function disposeEffectBffDispatcherAfterResponse(response, dispatcher, ctx) {
+  if (response.body === null) {
+    ctx.waitUntil(dispatcher.dispose());
+    return response;
+  }
+  const { readable, writable } = new TransformStream();
+  // The body pipe settles when the client has the whole body or the stream failed; a failure
+  // already reached the client through `readable`, so it only has to release the runtime here.
+  ctx.waitUntil(
+    response.body
+      .pipeTo(writable)
+      .catch(() => undefined)
+      .then(() => dispatcher.dispose()),
+  );
+  return new Response(readable, response);
 }
 
-async function dispatchBffRequest(request, env) {
+async function dispatchBffRequest(request, env, ctx) {
   const bff = MODERN_WORKER_MANIFEST.bff;
 
   const requestUrl = new URL(request.url);
@@ -384,12 +387,23 @@ async function dispatchBffRequest(request, env) {
     let effectDispatcher;
 
     try {
-      effectDispatcher = await getEffectBffDispatcher(bff, runtime);
+      effectDispatcher = await createEffectBffDispatcher(bff, runtime);
     } catch (error) {
       return createEffectBffDispatcherErrorResponse(bff, error);
     }
 
-    return effectDispatcher.dispatch(canonicalRequest, { env });
+    let response;
+    try {
+      response = await effectDispatcher.dispatch(canonicalRequest, { env });
+    } catch (error) {
+      ctx.waitUntil(effectDispatcher.dispose());
+      throw error;
+    }
+    return disposeEffectBffDispatcherAfterResponse(
+      response,
+      effectDispatcher,
+      ctx,
+    );
   }
 
   const directHandler =

package/dist/cjs/templates/cloudflare-entry.006-fetch-handler.mjs

@@ -9,7 +9,7 @@ export default {
       return finalizeResponseForRequest(corsPreflightResponse, request);
     }
 
-    const bffResponse = await dispatchBffRequest(request, env);
+    const bffResponse = await dispatchBffRequest(request, env, ctx);
 
     if (bffResponse) {
       return finalizeResponseForRequest(

package/dist/esm/templates/cloudflare-entry.001-bootstrap-security.mjs

@@ -3,7 +3,6 @@ const MODERN_WORKER_MANIFEST = p_workerManifest;
 export const modernWorkerManifest = MODERN_WORKER_MANIFEST;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
-const effectBffDispatcherPromises = new Map();
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
 const ASSET_CORS_ENABLED = CORS_POLICY.assets !== false;
@@ -239,6 +238,9 @@ function finalizeResponseForRequest(response, request) {
 
   const headers = new Headers(securedResponse.headers);
   headers.delete('content-length');
+  // A HEAD response sends no body, so release the producer's stream instead of abandoning it:
+  // a stream nobody reads never finishes, and whatever waits for its end never runs.
+  securedResponse.body?.cancel().catch(() => undefined);
 
   return new Response(null, {
     headers,

package/dist/esm/templates/cloudflare-entry.005-worker-dispatch.mjs

@@ -237,109 +237,112 @@ function createEffectBffDispatcherErrorResponse(bff, error) {
   );
 }
 
-function getEffectBffDispatcher(bff, runtime) {
-  let effectDispatcherPromise = effectBffDispatcherPromises.get(bff.worker);
-
-  if (effectDispatcherPromise) {
-    return effectDispatcherPromise;
+// workerd binds every I/O object (sockets, timers, pending promises) to the request that
+// created it, so an Effect runtime built while serving one request cannot serve the next: a
+// pooled PostgreSQL connection or a cached in-flight effect from an earlier request never
+// completes. Each BFF request therefore builds its own dispatcher and disposes it once the
+// response body has been delivered; platform pools such as Hyperdrive keep connections warm.
+async function createEffectBffDispatcher(bff, runtime) {
+  if (
+    typeof bff.dispatcherExport !== 'string' ||
+    bff.dispatcherExport.length === 0
+  ) {
+    throw new Error('manifest does not declare dispatcherExport');
   }
 
-  effectDispatcherPromise = Promise.resolve().then(async () => {
-    if (
-      typeof bff.dispatcherExport !== 'string' ||
-      bff.dispatcherExport.length === 0
-    ) {
-      throw new Error('manifest does not declare dispatcherExport');
-    }
-
-    const effectDispatcherFactory = runtime[bff.dispatcherExport];
+  const effectDispatcherFactory = runtime[bff.dispatcherExport];
 
-    if (typeof effectDispatcherFactory !== 'function') {
-      throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
-    }
+  if (typeof effectDispatcherFactory !== 'function') {
+    throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
+  }
 
-    const effectConfig = bff.effect;
-    if (
-      !effectConfig ||
-      typeof effectConfig !== 'object' ||
-      Array.isArray(effectConfig)
-    ) {
-      throw new Error('manifest declares invalid Effect BFF runtime config');
-    }
-    const crossProjectPolicy = effectConfig.crossProjectPolicy;
-    if (
-      !crossProjectPolicy ||
-      typeof crossProjectPolicy !== 'object' ||
-      Array.isArray(crossProjectPolicy)
-    ) {
-      throw new Error(
-        'manifest declares invalid Effect BFF cross-project policy',
-      );
-    }
-    for (const field of [
-      'enabled',
-      'requireEnvelope',
-      'requireOperationContext',
-      'requireOperationContextDetails',
-      'requireOperationSchemaHash',
-      'requireOperationVersion',
-      'allowUnknownOperations',
-    ]) {
-      if (typeof crossProjectPolicy[field] !== 'boolean') {
-        throw new Error(
-          `manifest Effect BFF cross-project policy requires boolean ${field}`,
-        );
-      }
-    }
-    if (
-      !crossProjectPolicy.expectedOperationContracts ||
-      typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
-      Array.isArray(crossProjectPolicy.expectedOperationContracts)
-    ) {
+  const effectConfig = bff.effect;
+  if (
+    !effectConfig ||
+    typeof effectConfig !== 'object' ||
+    Array.isArray(effectConfig)
+  ) {
+    throw new Error('manifest declares invalid Effect BFF runtime config');
+  }
+  const crossProjectPolicy = effectConfig.crossProjectPolicy;
+  if (
+    !crossProjectPolicy ||
+    typeof crossProjectPolicy !== 'object' ||
+    Array.isArray(crossProjectPolicy)
+  ) {
+    throw new Error(
+      'manifest declares invalid Effect BFF cross-project policy',
+    );
+  }
+  for (const field of [
+    'enabled',
+    'requireEnvelope',
+    'requireOperationContext',
+    'requireOperationContextDetails',
+    'requireOperationSchemaHash',
+    'requireOperationVersion',
+    'allowUnknownOperations',
+  ]) {
+    if (typeof crossProjectPolicy[field] !== 'boolean') {
       throw new Error(
-        'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+        `manifest Effect BFF cross-project policy requires boolean ${field}`,
       );
     }
+  }
+  if (
+    !crossProjectPolicy.expectedOperationContracts ||
+    typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
+    Array.isArray(crossProjectPolicy.expectedOperationContracts)
+  ) {
+    throw new Error(
+      'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+    );
+  }
 
-    const effectDispatcher = await effectDispatcherFactory({
-      prefix: bff.prefix,
-      ...(effectConfig?.openapi === undefined
-        ? {}
-        : { openapi: effectConfig.openapi }),
-      ...(effectConfig?.dataPlatform === undefined
-        ? {}
-        : { dataPlatform: effectConfig.dataPlatform }),
-      ...(effectConfig?.crossProjectPolicy === undefined
-        ? {}
-        : { crossProjectPolicy }),
-    });
-
-    if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
-      try {
-        await effectDispatcher?.dispose?.();
-      } catch {}
+  const effectDispatcher = await effectDispatcherFactory({
+    prefix: bff.prefix,
+    ...(effectConfig?.openapi === undefined
+      ? {}
+      : { openapi: effectConfig.openapi }),
+    ...(effectConfig?.dataPlatform === undefined
+      ? {}
+      : { dataPlatform: effectConfig.dataPlatform }),
+    ...(effectConfig?.crossProjectPolicy === undefined
+      ? {}
+      : { crossProjectPolicy }),
+  });
 
-      throw new Error(
-        `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
-      );
-    }
+  if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
+    try {
+      await effectDispatcher?.dispose?.();
+    } catch {}
 
-    return effectDispatcher;
-  });
+    throw new Error(
+      `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
+    );
+  }
 
-  effectBffDispatcherPromises.set(bff.worker, effectDispatcherPromise);
-  effectDispatcherPromise.catch(() => {
-    if (
-      effectBffDispatcherPromises.get(bff.worker) === effectDispatcherPromise
-    ) {
-      effectBffDispatcherPromises.delete(bff.worker);
-    }
-  });
+  return effectDispatcher;
+}
 
-  return effectDispatcherPromise;
+function disposeEffectBffDispatcherAfterResponse(response, dispatcher, ctx) {
+  if (response.body === null) {
+    ctx.waitUntil(dispatcher.dispose());
+    return response;
+  }
+  const { readable, writable } = new TransformStream();
+  // The body pipe settles when the client has the whole body or the stream failed; a failure
+  // already reached the client through `readable`, so it only has to release the runtime here.
+  ctx.waitUntil(
+    response.body
+      .pipeTo(writable)
+      .catch(() => undefined)
+      .then(() => dispatcher.dispose()),
+  );
+  return new Response(readable, response);
 }
 
-async function dispatchBffRequest(request, env) {
+async function dispatchBffRequest(request, env, ctx) {
   const bff = MODERN_WORKER_MANIFEST.bff;
 
   const requestUrl = new URL(request.url);
@@ -384,12 +387,23 @@ async function dispatchBffRequest(request, env) {
     let effectDispatcher;
 
     try {
-      effectDispatcher = await getEffectBffDispatcher(bff, runtime);
+      effectDispatcher = await createEffectBffDispatcher(bff, runtime);
     } catch (error) {
       return createEffectBffDispatcherErrorResponse(bff, error);
     }
 
-    return effectDispatcher.dispatch(canonicalRequest, { env });
+    let response;
+    try {
+      response = await effectDispatcher.dispatch(canonicalRequest, { env });
+    } catch (error) {
+      ctx.waitUntil(effectDispatcher.dispose());
+      throw error;
+    }
+    return disposeEffectBffDispatcherAfterResponse(
+      response,
+      effectDispatcher,
+      ctx,
+    );
   }
 
   const directHandler =

package/dist/esm/templates/cloudflare-entry.006-fetch-handler.mjs

@@ -9,7 +9,7 @@ export default {
       return finalizeResponseForRequest(corsPreflightResponse, request);
     }
 
-    const bffResponse = await dispatchBffRequest(request, env);
+    const bffResponse = await dispatchBffRequest(request, env, ctx);
 
     if (bffResponse) {
       return finalizeResponseForRequest(

package/dist/esm-node/templates/cloudflare-entry.001-bootstrap-security.mjs

@@ -3,7 +3,6 @@ const MODERN_WORKER_MANIFEST = p_workerManifest;
 export const modernWorkerManifest = MODERN_WORKER_MANIFEST;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
-const effectBffDispatcherPromises = new Map();
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
 const ASSET_CORS_ENABLED = CORS_POLICY.assets !== false;
@@ -239,6 +238,9 @@ function finalizeResponseForRequest(response, request) {
 
   const headers = new Headers(securedResponse.headers);
   headers.delete('content-length');
+  // A HEAD response sends no body, so release the producer's stream instead of abandoning it:
+  // a stream nobody reads never finishes, and whatever waits for its end never runs.
+  securedResponse.body?.cancel().catch(() => undefined);
 
   return new Response(null, {
     headers,

package/dist/esm-node/templates/cloudflare-entry.005-worker-dispatch.mjs

@@ -237,109 +237,112 @@ function createEffectBffDispatcherErrorResponse(bff, error) {
   );
 }
 
-function getEffectBffDispatcher(bff, runtime) {
-  let effectDispatcherPromise = effectBffDispatcherPromises.get(bff.worker);
-
-  if (effectDispatcherPromise) {
-    return effectDispatcherPromise;
+// workerd binds every I/O object (sockets, timers, pending promises) to the request that
+// created it, so an Effect runtime built while serving one request cannot serve the next: a
+// pooled PostgreSQL connection or a cached in-flight effect from an earlier request never
+// completes. Each BFF request therefore builds its own dispatcher and disposes it once the
+// response body has been delivered; platform pools such as Hyperdrive keep connections warm.
+async function createEffectBffDispatcher(bff, runtime) {
+  if (
+    typeof bff.dispatcherExport !== 'string' ||
+    bff.dispatcherExport.length === 0
+  ) {
+    throw new Error('manifest does not declare dispatcherExport');
   }
 
-  effectDispatcherPromise = Promise.resolve().then(async () => {
-    if (
-      typeof bff.dispatcherExport !== 'string' ||
-      bff.dispatcherExport.length === 0
-    ) {
-      throw new Error('manifest does not declare dispatcherExport');
-    }
-
-    const effectDispatcherFactory = runtime[bff.dispatcherExport];
+  const effectDispatcherFactory = runtime[bff.dispatcherExport];
 
-    if (typeof effectDispatcherFactory !== 'function') {
-      throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
-    }
+  if (typeof effectDispatcherFactory !== 'function') {
+    throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
+  }
 
-    const effectConfig = bff.effect;
-    if (
-      !effectConfig ||
-      typeof effectConfig !== 'object' ||
-      Array.isArray(effectConfig)
-    ) {
-      throw new Error('manifest declares invalid Effect BFF runtime config');
-    }
-    const crossProjectPolicy = effectConfig.crossProjectPolicy;
-    if (
-      !crossProjectPolicy ||
-      typeof crossProjectPolicy !== 'object' ||
-      Array.isArray(crossProjectPolicy)
-    ) {
-      throw new Error(
-        'manifest declares invalid Effect BFF cross-project policy',
-      );
-    }
-    for (const field of [
-      'enabled',
-      'requireEnvelope',
-      'requireOperationContext',
-      'requireOperationContextDetails',
-      'requireOperationSchemaHash',
-      'requireOperationVersion',
-      'allowUnknownOperations',
-    ]) {
-      if (typeof crossProjectPolicy[field] !== 'boolean') {
-        throw new Error(
-          `manifest Effect BFF cross-project policy requires boolean ${field}`,
-        );
-      }
-    }
-    if (
-      !crossProjectPolicy.expectedOperationContracts ||
-      typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
-      Array.isArray(crossProjectPolicy.expectedOperationContracts)
-    ) {
+  const effectConfig = bff.effect;
+  if (
+    !effectConfig ||
+    typeof effectConfig !== 'object' ||
+    Array.isArray(effectConfig)
+  ) {
+    throw new Error('manifest declares invalid Effect BFF runtime config');
+  }
+  const crossProjectPolicy = effectConfig.crossProjectPolicy;
+  if (
+    !crossProjectPolicy ||
+    typeof crossProjectPolicy !== 'object' ||
+    Array.isArray(crossProjectPolicy)
+  ) {
+    throw new Error(
+      'manifest declares invalid Effect BFF cross-project policy',
+    );
+  }
+  for (const field of [
+    'enabled',
+    'requireEnvelope',
+    'requireOperationContext',
+    'requireOperationContextDetails',
+    'requireOperationSchemaHash',
+    'requireOperationVersion',
+    'allowUnknownOperations',
+  ]) {
+    if (typeof crossProjectPolicy[field] !== 'boolean') {
       throw new Error(
-        'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+        `manifest Effect BFF cross-project policy requires boolean ${field}`,
       );
     }
+  }
+  if (
+    !crossProjectPolicy.expectedOperationContracts ||
+    typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
+    Array.isArray(crossProjectPolicy.expectedOperationContracts)
+  ) {
+    throw new Error(
+      'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+    );
+  }
 
-    const effectDispatcher = await effectDispatcherFactory({
-      prefix: bff.prefix,
-      ...(effectConfig?.openapi === undefined
-        ? {}
-        : { openapi: effectConfig.openapi }),
-      ...(effectConfig?.dataPlatform === undefined
-        ? {}
-        : { dataPlatform: effectConfig.dataPlatform }),
-      ...(effectConfig?.crossProjectPolicy === undefined
-        ? {}
-        : { crossProjectPolicy }),
-    });
-
-    if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
-      try {
-        await effectDispatcher?.dispose?.();
-      } catch {}
+  const effectDispatcher = await effectDispatcherFactory({
+    prefix: bff.prefix,
+    ...(effectConfig?.openapi === undefined
+      ? {}
+      : { openapi: effectConfig.openapi }),
+    ...(effectConfig?.dataPlatform === undefined
+      ? {}
+      : { dataPlatform: effectConfig.dataPlatform }),
+    ...(effectConfig?.crossProjectPolicy === undefined
+      ? {}
+      : { crossProjectPolicy }),
+  });
 
-      throw new Error(
-        `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
-      );
-    }
+  if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
+    try {
+      await effectDispatcher?.dispose?.();
+    } catch {}
 
-    return effectDispatcher;
-  });
+    throw new Error(
+      `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
+    );
+  }
 
-  effectBffDispatcherPromises.set(bff.worker, effectDispatcherPromise);
-  effectDispatcherPromise.catch(() => {
-    if (
-      effectBffDispatcherPromises.get(bff.worker) === effectDispatcherPromise
-    ) {
-      effectBffDispatcherPromises.delete(bff.worker);
-    }
-  });
+  return effectDispatcher;
+}
 
-  return effectDispatcherPromise;
+function disposeEffectBffDispatcherAfterResponse(response, dispatcher, ctx) {
+  if (response.body === null) {
+    ctx.waitUntil(dispatcher.dispose());
+    return response;
+  }
+  const { readable, writable } = new TransformStream();
+  // The body pipe settles when the client has the whole body or the stream failed; a failure
+  // already reached the client through `readable`, so it only has to release the runtime here.
+  ctx.waitUntil(
+    response.body
+      .pipeTo(writable)
+      .catch(() => undefined)
+      .then(() => dispatcher.dispose()),
+  );
+  return new Response(readable, response);
 }
 
-async function dispatchBffRequest(request, env) {
+async function dispatchBffRequest(request, env, ctx) {
   const bff = MODERN_WORKER_MANIFEST.bff;
 
   const requestUrl = new URL(request.url);
@@ -384,12 +387,23 @@ async function dispatchBffRequest(request, env) {
     let effectDispatcher;
 
     try {
-      effectDispatcher = await getEffectBffDispatcher(bff, runtime);
+      effectDispatcher = await createEffectBffDispatcher(bff, runtime);
     } catch (error) {
       return createEffectBffDispatcherErrorResponse(bff, error);
     }
 
-    return effectDispatcher.dispatch(canonicalRequest, { env });
+    let response;
+    try {
+      response = await effectDispatcher.dispatch(canonicalRequest, { env });
+    } catch (error) {
+      ctx.waitUntil(effectDispatcher.dispose());
+      throw error;
+    }
+    return disposeEffectBffDispatcherAfterResponse(
+      response,
+      effectDispatcher,
+      ctx,
+    );
   }
 
   const directHandler =

package/dist/esm-node/templates/cloudflare-entry.006-fetch-handler.mjs

@@ -9,7 +9,7 @@ export default {
       return finalizeResponseForRequest(corsPreflightResponse, request);
     }
 
-    const bffResponse = await dispatchBffRequest(request, env);
+    const bffResponse = await dispatchBffRequest(request, env, ctx);
 
     if (bffResponse) {
       return finalizeResponseForRequest(

package/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/solutions/app-tools-extensions"
   },
   "license": "MIT",
-  "version": "3.9.0-ultramodern.23",
+  "version": "3.9.0-ultramodern.25",
   "files": [
     "dist",
     "src"
@@ -153,16 +153,16 @@
     "@babel/parser": "^8.0.6",
     "@babel/traverse": "^8.0.6",
     "@loadable/component": "5.16.7",
-    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.23",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.23",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.23",
-    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.23",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.23",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.23",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.23",
-    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.23",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.23",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.23",
+    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.25",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.25",
+    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.25",
+    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.25",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.25",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.25",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.25",
+    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.25",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.25",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.25",
     "@swc/helpers": "^0.5.23",
     "@vercel/nft": "^1.11.0",
     "compression-webpack-plugin": "^12.0.0",
@@ -179,10 +179,10 @@
     }
   },
   "devDependencies": {
-    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.23",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.23",
-    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.23",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.23",
+    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.25",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.25",
+    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.25",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.25",
     "@module-federation/modern-js-v3": "2.9.2",
     "@module-federation/runtime-tools": "2.9.2",
     "@rsbuild/core": "2.2.10",

package/src/templates/cloudflare-entry.001-bootstrap-security.mjs

@@ -3,7 +3,6 @@ const MODERN_WORKER_MANIFEST = p_workerManifest;
 export const modernWorkerManifest = MODERN_WORKER_MANIFEST;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
-const effectBffDispatcherPromises = new Map();
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
 const ASSET_CORS_ENABLED = CORS_POLICY.assets !== false;
@@ -239,6 +238,9 @@ function finalizeResponseForRequest(response, request) {
 
   const headers = new Headers(securedResponse.headers);
   headers.delete('content-length');
+  // A HEAD response sends no body, so release the producer's stream instead of abandoning it:
+  // a stream nobody reads never finishes, and whatever waits for its end never runs.
+  securedResponse.body?.cancel().catch(() => undefined);
 
   return new Response(null, {
     headers,

package/src/templates/cloudflare-entry.005-worker-dispatch.mjs

@@ -237,109 +237,112 @@ function createEffectBffDispatcherErrorResponse(bff, error) {
   );
 }
 
-function getEffectBffDispatcher(bff, runtime) {
-  let effectDispatcherPromise = effectBffDispatcherPromises.get(bff.worker);
-
-  if (effectDispatcherPromise) {
-    return effectDispatcherPromise;
+// workerd binds every I/O object (sockets, timers, pending promises) to the request that
+// created it, so an Effect runtime built while serving one request cannot serve the next: a
+// pooled PostgreSQL connection or a cached in-flight effect from an earlier request never
+// completes. Each BFF request therefore builds its own dispatcher and disposes it once the
+// response body has been delivered; platform pools such as Hyperdrive keep connections warm.
+async function createEffectBffDispatcher(bff, runtime) {
+  if (
+    typeof bff.dispatcherExport !== 'string' ||
+    bff.dispatcherExport.length === 0
+  ) {
+    throw new Error('manifest does not declare dispatcherExport');
   }
 
-  effectDispatcherPromise = Promise.resolve().then(async () => {
-    if (
-      typeof bff.dispatcherExport !== 'string' ||
-      bff.dispatcherExport.length === 0
-    ) {
-      throw new Error('manifest does not declare dispatcherExport');
-    }
-
-    const effectDispatcherFactory = runtime[bff.dispatcherExport];
+  const effectDispatcherFactory = runtime[bff.dispatcherExport];
 
-    if (typeof effectDispatcherFactory !== 'function') {
-      throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
-    }
+  if (typeof effectDispatcherFactory !== 'function') {
+    throw new Error(`worker bundle does not export ${bff.dispatcherExport}`);
+  }
 
-    const effectConfig = bff.effect;
-    if (
-      !effectConfig ||
-      typeof effectConfig !== 'object' ||
-      Array.isArray(effectConfig)
-    ) {
-      throw new Error('manifest declares invalid Effect BFF runtime config');
-    }
-    const crossProjectPolicy = effectConfig.crossProjectPolicy;
-    if (
-      !crossProjectPolicy ||
-      typeof crossProjectPolicy !== 'object' ||
-      Array.isArray(crossProjectPolicy)
-    ) {
-      throw new Error(
-        'manifest declares invalid Effect BFF cross-project policy',
-      );
-    }
-    for (const field of [
-      'enabled',
-      'requireEnvelope',
-      'requireOperationContext',
-      'requireOperationContextDetails',
-      'requireOperationSchemaHash',
-      'requireOperationVersion',
-      'allowUnknownOperations',
-    ]) {
-      if (typeof crossProjectPolicy[field] !== 'boolean') {
-        throw new Error(
-          `manifest Effect BFF cross-project policy requires boolean ${field}`,
-        );
-      }
-    }
-    if (
-      !crossProjectPolicy.expectedOperationContracts ||
-      typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
-      Array.isArray(crossProjectPolicy.expectedOperationContracts)
-    ) {
+  const effectConfig = bff.effect;
+  if (
+    !effectConfig ||
+    typeof effectConfig !== 'object' ||
+    Array.isArray(effectConfig)
+  ) {
+    throw new Error('manifest declares invalid Effect BFF runtime config');
+  }
+  const crossProjectPolicy = effectConfig.crossProjectPolicy;
+  if (
+    !crossProjectPolicy ||
+    typeof crossProjectPolicy !== 'object' ||
+    Array.isArray(crossProjectPolicy)
+  ) {
+    throw new Error(
+      'manifest declares invalid Effect BFF cross-project policy',
+    );
+  }
+  for (const field of [
+    'enabled',
+    'requireEnvelope',
+    'requireOperationContext',
+    'requireOperationContextDetails',
+    'requireOperationSchemaHash',
+    'requireOperationVersion',
+    'allowUnknownOperations',
+  ]) {
+    if (typeof crossProjectPolicy[field] !== 'boolean') {
       throw new Error(
-        'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+        `manifest Effect BFF cross-project policy requires boolean ${field}`,
       );
     }
+  }
+  if (
+    !crossProjectPolicy.expectedOperationContracts ||
+    typeof crossProjectPolicy.expectedOperationContracts !== 'object' ||
+    Array.isArray(crossProjectPolicy.expectedOperationContracts)
+  ) {
+    throw new Error(
+      'manifest Effect BFF cross-project policy requires expectedOperationContracts object',
+    );
+  }
 
-    const effectDispatcher = await effectDispatcherFactory({
-      prefix: bff.prefix,
-      ...(effectConfig?.openapi === undefined
-        ? {}
-        : { openapi: effectConfig.openapi }),
-      ...(effectConfig?.dataPlatform === undefined
-        ? {}
-        : { dataPlatform: effectConfig.dataPlatform }),
-      ...(effectConfig?.crossProjectPolicy === undefined
-        ? {}
-        : { crossProjectPolicy }),
-    });
-
-    if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
-      try {
-        await effectDispatcher?.dispose?.();
-      } catch {}
+  const effectDispatcher = await effectDispatcherFactory({
+    prefix: bff.prefix,
+    ...(effectConfig?.openapi === undefined
+      ? {}
+      : { openapi: effectConfig.openapi }),
+    ...(effectConfig?.dataPlatform === undefined
+      ? {}
+      : { dataPlatform: effectConfig.dataPlatform }),
+    ...(effectConfig?.crossProjectPolicy === undefined
+      ? {}
+      : { crossProjectPolicy }),
+  });
 
-      throw new Error(
-        `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
-      );
-    }
+  if (!effectDispatcher || typeof effectDispatcher.dispatch !== 'function') {
+    try {
+      await effectDispatcher?.dispose?.();
+    } catch {}
 
-    return effectDispatcher;
-  });
+    throw new Error(
+      `worker export ${bff.dispatcherExport} did not return a dispatcher with a dispatch function`,
+    );
+  }
 
-  effectBffDispatcherPromises.set(bff.worker, effectDispatcherPromise);
-  effectDispatcherPromise.catch(() => {
-    if (
-      effectBffDispatcherPromises.get(bff.worker) === effectDispatcherPromise
-    ) {
-      effectBffDispatcherPromises.delete(bff.worker);
-    }
-  });
+  return effectDispatcher;
+}
 
-  return effectDispatcherPromise;
+function disposeEffectBffDispatcherAfterResponse(response, dispatcher, ctx) {
+  if (response.body === null) {
+    ctx.waitUntil(dispatcher.dispose());
+    return response;
+  }
+  const { readable, writable } = new TransformStream();
+  // The body pipe settles when the client has the whole body or the stream failed; a failure
+  // already reached the client through `readable`, so it only has to release the runtime here.
+  ctx.waitUntil(
+    response.body
+      .pipeTo(writable)
+      .catch(() => undefined)
+      .then(() => dispatcher.dispose()),
+  );
+  return new Response(readable, response);
 }
 
-async function dispatchBffRequest(request, env) {
+async function dispatchBffRequest(request, env, ctx) {
   const bff = MODERN_WORKER_MANIFEST.bff;
 
   const requestUrl = new URL(request.url);
@@ -384,12 +387,23 @@ async function dispatchBffRequest(request, env) {
     let effectDispatcher;
 
     try {
-      effectDispatcher = await getEffectBffDispatcher(bff, runtime);
+      effectDispatcher = await createEffectBffDispatcher(bff, runtime);
     } catch (error) {
       return createEffectBffDispatcherErrorResponse(bff, error);
     }
 
-    return effectDispatcher.dispatch(canonicalRequest, { env });
+    let response;
+    try {
+      response = await effectDispatcher.dispatch(canonicalRequest, { env });
+    } catch (error) {
+      ctx.waitUntil(effectDispatcher.dispose());
+      throw error;
+    }
+    return disposeEffectBffDispatcherAfterResponse(
+      response,
+      effectDispatcher,
+      ctx,
+    );
   }
 
   const directHandler =

package/src/templates/cloudflare-entry.006-fetch-handler.mjs

@@ -9,7 +9,7 @@ export default {
       return finalizeResponseForRequest(corsPreflightResponse, request);
     }
 
-    const bffResponse = await dispatchBffRequest(request, env);
+    const bffResponse = await dispatchBffRequest(request, env, ctx);
 
     if (bffResponse) {
       return finalizeResponseForRequest(