the-moby-effect 1.48.4 → 1.51.0

package/src/internal/generated/VolumeUsageData.generated.ts

@@ -1,15 +1,14 @@
+import * as EffectSchemas from "effect-schemas";
 import * as Schema from "effect/Schema";
-import * as MobySchemas from "../schemas/index.js";
 
 export class VolumeUsageData extends Schema.Class<VolumeUsageData>("VolumeUsageData")(
     {
-        RefCount: MobySchemas.Int64,
-        Size: MobySchemas.Int64,
+        RefCount: EffectSchemas.Number.I64,
+        Size: EffectSchemas.Number.I64,
     },
     {
         identifier: "VolumeUsageData",
         title: "volume.UsageData",
-        documentation:
-            "https://github.com/moby/moby/blob/a21b1a2d12e2c01542cb191eb526d7bfad0641e3/api/types/volume/volume.go#L56-L75",
+        documentation: "https://pkg.go.dev/github.com/docker/docker@v28.4.0+incompatible/api/types/volume#UsageData",
     }
 ) {}

package/src/internal/generated/VolumeVolume.generated.ts

@@ -0,0 +1,23 @@
+import * as Schema from "effect/Schema";
+import * as VolumeClusterVolume from "./VolumeClusterVolume.generated.js";
+import * as VolumeUsageData from "./VolumeUsageData.generated.js";
+
+export class VolumeVolume extends Schema.Class<VolumeVolume>("VolumeVolume")(
+    {
+        ClusterVolume: Schema.optionalWith(VolumeClusterVolume.VolumeClusterVolume, { nullable: true }),
+        CreatedAt: Schema.optional(Schema.DateFromString),
+        Driver: Schema.String,
+        Labels: Schema.NullOr(Schema.Record({ key: Schema.String, value: Schema.String })),
+        Mountpoint: Schema.String,
+        Name: Schema.String,
+        Options: Schema.NullOr(Schema.Record({ key: Schema.String, value: Schema.String })),
+        Scope: Schema.String,
+        Status: Schema.optionalWith(Schema.Record({ key: Schema.String, value: Schema.Object }), { nullable: true }),
+        UsageData: Schema.optionalWith(VolumeUsageData.VolumeUsageData, { nullable: true }),
+    },
+    {
+        identifier: "VolumeVolume",
+        title: "volume.Volume",
+        documentation: "https://pkg.go.dev/github.com/docker/docker@v28.4.0+incompatible/api/types/volume#Volume",
+    }
+) {}

package/src/internal/generated/index.ts

@@ -1,120 +1,94 @@
-export * from "./BindOptions.generated.js";
-export * from "./BuildCache.generated.js";
-export * from "./ClusterOptions.generated.js";
-export * from "./ClusterVolume.generated.js";
-export * from "./ClusterVolumeSpec.generated.js";
-export * from "./ComponentVersion.generated.js";
+export * from "./ArchiveChange.generated.js";
+export * from "./BlkiodevThrottleDevice.generated.js";
+export * from "./BlkiodevWeightDevice.generated.js";
+export * from "./BuildCacheRecord.generated.js";
 export * from "./ContainerBlkioStatEntry.generated.js";
 export * from "./ContainerBlkioStats.generated.js";
-export * from "./ContainerChange.generated.js";
 export * from "./ContainerConfig.generated.js";
+export * from "./ContainerContainerJSONBase.generated.js";
 export * from "./ContainerCPUStats.generated.js";
 export * from "./ContainerCPUUsage.generated.js";
 export * from "./ContainerCreateRequest.generated.js";
-export * from "./ContainerCreateResponse.generated.js";
+export * from "./ContainerDefaultNetworkSettings.generated.js";
 export * from "./ContainerDeviceMapping.generated.js";
 export * from "./ContainerDeviceRequest.generated.js";
 export * from "./ContainerExecInspect.generated.js";
 export * from "./ContainerExecOptions.generated.js";
-export * from "./ContainerHealthConfig.generated.js";
+export * from "./ContainerExecStartOptions.generated.js";
+export * from "./ContainerHealth.generated.js";
+export * from "./ContainerHealthcheckResult.generated.js";
 export * from "./ContainerHostConfig.generated.js";
 export * from "./ContainerInspectResponse.generated.js";
-export * from "./ContainerJSONBase.generated.js";
-export * from "./ContainerListResponseItem.generated.js";
 export * from "./ContainerLogConfig.generated.js";
-export * from "./ContainerLogsOptions.generated.js";
 export * from "./ContainerMemoryStats.generated.js";
+export * from "./ContainerMountPoint.generated.js";
+export * from "./ContainerNetworkSettings.generated.js";
+export * from "./ContainerNetworkSettingsBase.generated.js";
+export * from "./ContainerNetworkSettingsSummary.generated.js";
 export * from "./ContainerNetworkStats.generated.js";
-export * from "./ContainerNode.generated.js";
 export * from "./ContainerPathStat.generated.js";
 export * from "./ContainerPidsStats.generated.js";
-export * from "./ContainerPruneResponse.generated.js";
+export * from "./ContainerPort.generated.js";
 export * from "./ContainerResources.generated.js";
 export * from "./ContainerRestartPolicy.generated.js";
 export * from "./ContainerState.generated.js";
-export * from "./ContainerStats.generated.js";
 export * from "./ContainerStatsResponse.generated.js";
-export * from "./ContainerStopOptions.generated.js";
 export * from "./ContainerStorageStats.generated.js";
+export * from "./ContainerSummary.generated.js";
 export * from "./ContainerThrottlingData.generated.js";
 export * from "./ContainerTopResponse.generated.js";
-export * from "./ContainerUlimit.generated.js";
-export * from "./ContainerUpdateResponse.generated.js";
 export * from "./ContainerWaitExitError.generated.js";
 export * from "./ContainerWaitResponse.generated.js";
-export * from "./DefaultNetworkSettings.generated.js";
-export * from "./Descriptor.generated.js";
-export * from "./DiskUsage.generated.js";
-export * from "./Driver.generated.js";
-export * from "./EventActor.generated.js";
-export * from "./EventMessage.generated.js";
-export * from "./GraphDriverData.generated.js";
-export * from "./Health.generated.js";
-export * from "./HealthcheckResult.generated.js";
-export * from "./IDResponse.generated.js";
+export * from "./EventsActor.generated.js";
+export * from "./EventsMessage.generated.js";
+export * from "./ImageAttestationProperties.generated.js";
 export * from "./ImageDeleteResponse.generated.js";
 export * from "./ImageHistoryResponseItem.generated.js";
+export * from "./ImageImageProperties.generated.js";
 export * from "./ImageInspectResponse.generated.js";
-export * from "./ImageLoadResponse.generated.js";
+export * from "./ImageManifestSummary.generated.js";
 export * from "./ImageMetadata.generated.js";
-export * from "./ImagePruneResponse.generated.js";
+export * from "./ImageRootFS.generated.js";
 export * from "./ImageSummary.generated.js";
-export * from "./JSONError.generated.js";
 export * from "./JSONMessage.generated.js";
-export * from "./JSONProgress.generated.js";
-export * from "./Mount.generated.js";
-export * from "./MountPoint.generated.js";
+export * from "./JsonmessageJSONError.generated.js";
+export * from "./JsonmessageJSONProgress.generated.js";
+export * from "./MountBindOptions.generated.js";
+export * from "./MountClusterOptions.generated.js";
+export * from "./MountDriver.generated.js";
+export * from "./MountImageOptions.generated.js";
+export * from "./MountMount.generated.js";
+export * from "./MountTmpfsOptions.generated.js";
+export * from "./MountVolumeOptions.generated.js";
+export * from "./NetworkAddress.generated.js";
 export * from "./NetworkConfigReference.generated.js";
 export * from "./NetworkConnectOptions.generated.js";
 export * from "./NetworkCreateOptions.generated.js";
 export * from "./NetworkCreateRequest.generated.js";
-export * from "./NetworkCreateResponse.generated.js";
-export * from "./NetworkDisconnectOptions.generated.js";
 export * from "./NetworkEndpointIPAMConfig.generated.js";
 export * from "./NetworkEndpointResource.generated.js";
 export * from "./NetworkEndpointSettings.generated.js";
+export * from "./NetworkInspect.generated.js";
 export * from "./NetworkIPAM.generated.js";
 export * from "./NetworkIPAMConfig.generated.js";
 export * from "./NetworkNetworkingConfig.generated.js";
 export * from "./NetworkPeerInfo.generated.js";
-export * from "./NetworkPruneResponse.generated.js";
 export * from "./NetworkServiceInfo.generated.js";
-export * from "./NetworkSettings.generated.js";
-export * from "./NetworkSettingsBase.generated.js";
-export * from "./NetworkSummary.generated.js";
 export * from "./NetworkTask.generated.js";
-export * from "./Platform.generated.js";
-export * from "./Plugin.generated.js";
-export * from "./PluginConfig.generated.js";
-export * from "./PluginConfigArgs.generated.js";
-export * from "./PluginConfigInterface.generated.js";
-export * from "./PluginConfigLinux.generated.js";
-export * from "./PluginConfigNetwork.generated.js";
-export * from "./PluginConfigRootfs.generated.js";
-export * from "./PluginConfigUser.generated.js";
-export * from "./PluginDevice.generated.js";
-export * from "./PluginEnv.generated.js";
-export * from "./PluginInterfaceType.generated.js";
-export * from "./PluginMount.generated.js";
-export * from "./PluginPrivilege.generated.js";
-export * from "./PluginSettings.generated.js";
-export * from "./PluginSpec.generated.js";
-export * from "./Port.generated.js";
 export * from "./RegistryAuthConfig.generated.js";
 export * from "./RegistryAuthenticateOKBody.generated.js";
 export * from "./RegistryDistributionInspect.generated.js";
 export * from "./RegistryIndexInfo.generated.js";
-export * from "./RegistrySearchResponse.generated.js";
+export * from "./RegistrySearchResult.generated.js";
 export * from "./RegistryServiceConfig.generated.js";
-export * from "./RootFS.generated.js";
-export * from "./SummaryNetworkSettings.generated.js";
-export * from "./Swarm.generated.js";
+export * from "./RuntimePluginPrivilege.generated.js";
+export * from "./RuntimePluginSpec.generated.js";
+export * from "./StorageDriverData.generated.js";
 export * from "./SwarmAnnotations.generated.js";
 export * from "./SwarmAppArmorOpts.generated.js";
 export * from "./SwarmCAConfig.generated.js";
 export * from "./SwarmClusterInfo.generated.js";
 export * from "./SwarmConfig.generated.js";
-export * from "./SwarmConfigCreateResponse.generated.js";
 export * from "./SwarmConfigReference.generated.js";
 export * from "./SwarmConfigReferenceFileTarget.generated.js";
 export * from "./SwarmConfigReferenceRuntimeTarget.generated.js";
@@ -173,27 +147,23 @@ export * from "./SwarmResources.generated.js";
 export * from "./SwarmRestartPolicy.generated.js";
 export * from "./SwarmSeccompOpts.generated.js";
 export * from "./SwarmSecret.generated.js";
-export * from "./SwarmSecretCreateResponse.generated.js";
 export * from "./SwarmSecretReference.generated.js";
 export * from "./SwarmSecretReferenceFileTarget.generated.js";
 export * from "./SwarmSecretSpec.generated.js";
 export * from "./SwarmSELinuxContext.generated.js";
 export * from "./SwarmService.generated.js";
-export * from "./SwarmServiceCreateResponse.generated.js";
 export * from "./SwarmServiceMode.generated.js";
 export * from "./SwarmServiceSpec.generated.js";
 export * from "./SwarmServiceStatus.generated.js";
-export * from "./SwarmServiceUpdateResponse.generated.js";
 export * from "./SwarmSpec.generated.js";
 export * from "./SwarmSpreadOver.generated.js";
+export * from "./SwarmSwarm.generated.js";
 export * from "./SwarmTask.generated.js";
 export * from "./SwarmTaskDefaults.generated.js";
 export * from "./SwarmTaskSpec.generated.js";
 export * from "./SwarmTaskStatus.generated.js";
 export * from "./SwarmTLSInfo.generated.js";
 export * from "./SwarmTopology.generated.js";
-export * from "./SwarmUnlockKeyResponse.generated.js";
-export * from "./SwarmUnlockRequest.generated.js";
 export * from "./SwarmUpdateConfig.generated.js";
 export * from "./SwarmUpdateStatus.generated.js";
 export * from "./SwarmVersion.generated.js";
@@ -201,22 +171,42 @@ export * from "./SwarmVolumeAttachment.generated.js";
 export * from "./SystemCommit.generated.js";
 export * from "./SystemContainerdInfo.generated.js";
 export * from "./SystemContainerdNamespaces.generated.js";
-export * from "./SystemInfoResponse.generated.js";
+export * from "./SystemDeviceInfo.generated.js";
+export * from "./SystemFirewallInfo.generated.js";
+export * from "./SystemInfo.generated.js";
 export * from "./SystemNetworkAddressPool.generated.js";
 export * from "./SystemPluginsInfo.generated.js";
 export * from "./SystemRuntime.generated.js";
 export * from "./SystemRuntimeWithStatus.generated.js";
-export * from "./SystemVersionResponse.generated.js";
-export * from "./ThrottleDevice.generated.js";
-export * from "./TmpfsOptions.generated.js";
-export * from "./Volume.generated.js";
+export * from "./TypesComponentVersion.generated.js";
+export * from "./TypesDiskUsage.generated.js";
+export * from "./TypesPlugin.generated.js";
+export * from "./TypesPluginConfig.generated.js";
+export * from "./TypesPluginConfigArgs.generated.js";
+export * from "./TypesPluginConfigInterface.generated.js";
+export * from "./TypesPluginConfigLinux.generated.js";
+export * from "./TypesPluginConfigNetwork.generated.js";
+export * from "./TypesPluginConfigRootfs.generated.js";
+export * from "./TypesPluginConfigUser.generated.js";
+export * from "./TypesPluginDevice.generated.js";
+export * from "./TypesPluginEnv.generated.js";
+export * from "./TypesPluginInterfaceType.generated.js";
+export * from "./TypesPluginMount.generated.js";
+export * from "./TypesPluginSettings.generated.js";
+export * from "./TypesVersion.generated.js";
+export * from "./UnitsUlimit.generated.js";
+export * from "./V1Descriptor.generated.js";
+export * from "./V1DockerOCIImageConfig.generated.js";
+export * from "./V1DockerOCIImageConfigExt.generated.js";
+export * from "./V1HealthcheckConfig.generated.js";
+export * from "./V1ImageConfig.generated.js";
+export * from "./V1Platform.generated.js";
 export * from "./VolumeAccessMode.generated.js";
 export * from "./VolumeCapacityRange.generated.js";
+export * from "./VolumeClusterVolume.generated.js";
+export * from "./VolumeClusterVolumeSpec.generated.js";
 export * from "./VolumeCreateOptions.generated.js";
 export * from "./VolumeInfo.generated.js";
-export * from "./VolumeListResponse.generated.js";
-export * from "./VolumeOptions.generated.js";
-export * from "./VolumePruneResponse.generated.js";
 export * from "./VolumePublishStatus.generated.js";
 export * from "./VolumeSecret.generated.js";
 export * from "./VolumeTopology.generated.js";
@@ -224,4 +214,4 @@ export * from "./VolumeTopologyRequirement.generated.js";
 export * from "./VolumeTypeBlock.generated.js";
 export * from "./VolumeTypeMount.generated.js";
 export * from "./VolumeUsageData.generated.js";
-export * from "./WeightDevice.generated.js";
+export * from "./VolumeVolume.generated.js";

package/src/internal/platforms/agnostic.ts

@@ -1,119 +1,96 @@
-import type * as HttpClientError from "@effect/platform/HttpClientError";
-import type * as Types from "effect/Types";
+import type * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import type * as MobyConnection from "../../MobyConnection.js";
 
 import * as HttpClient from "@effect/platform/HttpClient";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
-import * as Socket from "@effect/platform/Socket";
-import * as UrlParams from "@effect/platform/UrlParams";
-import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Predicate from "effect/Predicate";
+import * as Stream from "effect/Stream";
+import * as String from "effect/String";
 import * as internalConnection from "./connection.js";
 
 /** @internal */
-const makeVersionPath = (connectionOptions: MobyConnection.MobyConnectionOptions): string =>
+export const makeVersionPath = (connectionOptions: MobyConnection.MobyConnectionOptions): string =>
     Predicate.isNotUndefined(connectionOptions.version) ? `/v${connectionOptions.version}` : "";
 
 /** @internal */
-const makeHttpRequestUrl: (connectionOptions: MobyConnection.MobyConnectionOptions) => string =
+export const makeHttpRequestUrl: (connectionOptions: MobyConnection.MobyConnectionOptions) => string =
     internalConnection.MobyConnectionOptions.$match({
-        ssh: (options) => `http://0.0.0.0${makeVersionPath(options)}` as const,
-        socket: (options) => `http://0.0.0.0${makeVersionPath(options)}` as const,
-        http: (options) =>
-            `http://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}` as const,
-        https: (options) =>
-            `https://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}` as const,
+        ssh: (options) => `http://0.0.0.0${makeVersionPath(options)}`,
+        socket: (options) => `http://0.0.0.0${makeVersionPath(options)}`,
+        http: (options) => `http://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}`,
+        https: (options) => `https://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}`,
     });
 
 /** @internal */
-const makeWebsocketRequestUrl: (connectionOptions: MobyConnection.MobyConnectionOptions) => string =
+export const makeWebsocketRequestUrl: (connectionOptions: MobyConnection.MobyConnectionOptions) => string =
     internalConnection.MobyConnectionOptions.$match({
-        ssh: (options) => `ws://0.0.0.0${makeVersionPath(options)}` as const,
-        socket: (options) => `ws+unix://${options.socketPath}${makeVersionPath(options)}:` as const,
-        http: (options) =>
-            `ws://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}` as const,
-        https: (options) =>
-            `wss://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}` as const,
-    });
-
-/** @internal */
-const HttpClientMobyConnectionOptions: unique symbol = Symbol.for(
-    "@the-moby-effect/platforms/Agnostic/HttpClientMobyConnectionOptions"
-);
-
-/** @internal */
-interface HttpClientExtension<E = HttpClientError.HttpClientError, R = never> extends HttpClient.HttpClient.With<E, R> {
-    readonly [HttpClientMobyConnectionOptions]: MobyConnection.MobyConnectionOptions;
-}
-
-/** @internal */
-export const websocketRequest = (
-    request: HttpClientRequest.HttpClientRequest
-): Effect.Effect<Socket.Socket, Error, Socket.WebSocketConstructor | HttpClient.HttpClient> =>
-    Effect.gen(function* () {
-        const client = yield* HttpClient.HttpClient;
-
-        const { hash, url, urlParams } = request;
-        const { [HttpClientMobyConnectionOptions]: connectionOptions } = client as HttpClientExtension;
-        if (Predicate.isUndefined(connectionOptions)) {
-            return yield* Effect.dieMessage("What happened to the connection options?");
-        }
-
-        const websocketUrl = yield* UrlParams.makeUrl(
-            `${makeWebsocketRequestUrl(connectionOptions)}${url}`,
-            urlParams,
-            hash
-        );
-
-        return yield* Socket.makeWebSocket(websocketUrl.toString());
+        ssh: (options) => `ws://0.0.0.0${makeVersionPath(options)}`,
+        socket: (options) => `ws+unix://${options.socketPath}${makeVersionPath(options)}:`,
+        http: (options) => `ws://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}`,
+        https: (options) => `wss://${options.host}:${options.port}${options.path ?? ""}${makeVersionPath(options)}`,
     });
 
 /** @internal */
 export const makeAgnosticHttpClientLayer = (
     connectionOptions: MobyConnection.MobyConnectionOptions
 ): Layer.Layer<HttpClient.HttpClient, never, HttpClient.HttpClient> =>
-    Function.pipe(
-        Layer.function(
-            HttpClient.HttpClient,
-            HttpClient.HttpClient,
+    Layer.function(
+        HttpClient.HttpClient,
+        HttpClient.HttpClient,
+        Function.flow(
             HttpClient.mapRequest((request) => {
                 const httpUrl = makeHttpRequestUrl(connectionOptions);
                 const urlPrepended = HttpClientRequest.prependUrl(request, httpUrl);
                 return urlPrepended;
-            })
-        ),
-        Layer.map((context) => {
-            const tag = HttpClient.HttpClient;
-            const oldClient = Context.get(context, tag);
-            (oldClient as Types.Mutable<HttpClientExtension>)[HttpClientMobyConnectionOptions] = connectionOptions;
-            return Context.make(tag, oldClient);
-        })
-    );
+            }),
+            HttpClient.transformResponse(
+                Effect.map((response) => {
+                    const handler: ProxyHandler<HttpClientResponse.HttpClientResponse> = {
+                        get: (target, prop, receiver) => {
+                            const replacer = (str: string): string =>
+                                str.replace(/\b\d{16,}\b/g, (numStr) =>
+                                    Number.isSafeInteger(Number(numStr)) ? numStr : `"${numStr}"`
+                                );
 
-/** @internal */
-export const makeAgnosticWebsocketLayer = (
-    connectionOptions: MobyConnection.MobyConnectionOptions
-): Layer.Layer<Socket.WebSocketConstructor, never, never> =>
-    Layer.effect(
-        Socket.WebSocketConstructor,
-        Effect.gen(function* () {
-            // Only the ws package supports unix socket connection options
-            if (internalConnection.MobyConnectionOptions.$is("socket")(connectionOptions)) {
-                const ws = yield* Effect.promise(() => import("ws"));
-                return (url, protocols) => new ws.WebSocket(url, protocols) as unknown as globalThis.WebSocket;
-            }
-            return (url, protocols) => new WebSocket(url, protocols);
-        })
-    );
+                            if (prop === "text") {
+                                const ogText = Reflect.get(target, prop, receiver);
+                                return Function.pipe(ogText, Effect.map(replacer));
+                            }
 
-/** @internal */
-export const makeAgnosticLayer = (
-    connectionOptions: MobyConnection.MobyConnectionOptions
-): Layer.Layer<Socket.WebSocketConstructor | HttpClient.HttpClient, never, HttpClient.HttpClient> => {
-    const httpClientLayer = makeAgnosticHttpClientLayer(connectionOptions);
-    const websocketLayer = makeAgnosticWebsocketLayer(connectionOptions);
-    return Layer.merge(websocketLayer, httpClientLayer);
-};
+                            if (prop === "arrayBuffer") {
+                                const ogArrayBuffer = Reflect.get(target, prop, receiver);
+                                return Function.pipe(
+                                    ogArrayBuffer,
+                                    Effect.map((ab) => new TextDecoder().decode(ab)),
+                                    Effect.map(replacer),
+                                    Effect.map((str) => new TextEncoder().encode(str))
+                                );
+                            }
+
+                            if (prop === "stream") {
+                                const ogStream = Reflect.get(target, prop, receiver);
+                                return Function.pipe(
+                                    ogStream,
+                                    Stream.decodeText(),
+                                    Stream.splitLines,
+                                    Stream.map(replacer),
+                                    Stream.map(String.concat("\n")),
+                                    Stream.encodeText
+                                );
+                            }
+
+                            return Reflect.get(target, prop, receiver);
+                        },
+                        set: (target, prop, value, receiver) => {
+                            return Reflect.set(target, prop, value, receiver);
+                        },
+                    };
+
+                    return new Proxy(response, handler);
+                })
+            )
+        )
+    );

package/src/internal/platforms/fetch.ts

@@ -1,8 +1,8 @@
 import type * as HttpClient from "@effect/platform/HttpClient";
-import type * as Socket from "@effect/platform/Socket";
 import type * as MobyConnection from "../../MobyConnection.js";
 
 import * as FetchHttpClient from "@effect/platform/FetchHttpClient";
+import * as Socket from "@effect/platform/Socket";
 import * as Layer from "effect/Layer";
 import * as internalAgnostic from "./agnostic.js";
 
@@ -10,4 +10,7 @@ import * as internalAgnostic from "./agnostic.js";
 export const makeFetchHttpClientLayer = (
     connectionOptions: MobyConnection.HttpConnectionOptionsTagged | MobyConnection.HttpsConnectionOptionsTagged
 ): Layer.Layer<HttpClient.HttpClient | Socket.WebSocketConstructor, never, never> =>
-    Layer.provide(internalAgnostic.makeAgnosticLayer(connectionOptions), FetchHttpClient.layer);
+    internalAgnostic
+        .makeAgnosticHttpClientLayer(connectionOptions)
+        .pipe(Layer.merge(Socket.layerWebSocketConstructorGlobal))
+        .pipe(Layer.provide(FetchHttpClient.layer));