From 735dd6b1f1086188e7ad5f95b1d6010cf6ee7589 Mon Sep 17 00:00:00 2001
From: Leo Conforti <leoconforti@ltgk.net>
Date: Tue, 22 Oct 2024 13:42:48 +0000
Subject: [PATCH] fix undici

---
 src/engines/Dind.ts     | 4 ++--
 src/platforms/Undici.ts | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/engines/Dind.ts b/src/engines/Dind.ts
index 22dc14f0..f4f4225c 100644
--- a/src/engines/Dind.ts
+++ b/src/engines/Dind.ts
@@ -285,7 +285,7 @@ export const makeDindLayerFromPlatformConstructor =
 
             // Building a layer here instead of providing it to the final effect
             // prevents conflicting services with the same tag in the final layer
-            const hostDocker = platformLayerConstructorCasted(options.connectionOptionsToHost);
+            const hostDocker = yield* Layer.build(platformLayerConstructorCasted(options.connectionOptionsToHost));
             yield* DockerEngine.pingHead().pipe(Effect.provide(hostDocker));
 
             // Build the docker image for the dind container
@@ -296,7 +296,7 @@ export const makeDindLayerFromPlatformConstructor =
                 buildArgs: { DIND_BASE_IMAGE: options.dindBaseImage },
                 tag: `the-moby-effect-${options.exposeDindContainerBy}-${dindTag}:latest`,
                 context: Convey.packBuildContextIntoTarballStream(HashMap.make(["Dockerfile", dindBlob] as const)),
-            }).pipe(Stream.provideSomeLayer(hostDocker));
+            }).pipe(Stream.provideContext(hostDocker));
 
             // Wait for the image to be built
             yield* Convey.waitForProgressToComplete(buildStream);
diff --git a/src/platforms/Undici.ts b/src/platforms/Undici.ts
index fda344ea..a9058cc2 100644
--- a/src/platforms/Undici.ts
+++ b/src/platforms/Undici.ts
@@ -121,13 +121,12 @@ export const getUndiciDispatcher = (
 export const makeUndiciHttpClientLayer = (
     connectionOptions: MobyConnectionOptions
 ): Layer.Layer<HttpClient.HttpClient, never, never> => {
-    const undiciDispatcher = getUndiciDispatcher(connectionOptions);
     const undiciLayer = Function.pipe(
         Effect.promise(() => import("@effect/platform-node/NodeHttpClient")),
         Effect.map((nodeHttpClientLazy) =>
             Layer.provide(
                 nodeHttpClientLazy.layerUndiciWithoutDispatcher,
-                Layer.scoped(nodeHttpClientLazy.Dispatcher, undiciDispatcher)
+                Layer.scoped(nodeHttpClientLazy.Dispatcher, getUndiciDispatcher(connectionOptions))
             )
         ),
         Layer.unwrapEffect