the-moby-effect 1.51.6 → 1.54.1

package/dist/Promises.d.ts

@@ -3,36 +3,47 @@
  *
  * @since 1.0.0
  */
-import type * as Layer from "effect/Layer";
-import type * as MobySchemas from "./MobySchemas.ts";
-import * as Function from "effect/Function";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import * as Stream from "effect/Stream";
+import type * as MobySchemas from "./MobySchemas.ts";
 import * as DockerEngine from "./DockerEngine.ts";
+import * as MobyConnection from "./MobyConnection.ts";
 /**
  * Create a promise client for the docker engine
  *
  * @since 1.0.0
  * @category Promises
  */
-export declare const promiseClient: <E>(layer: Layer.Layer<Layer.Layer.Success<DockerEngine.DockerLayer>, Layer.Layer.Error<DockerEngine.DockerLayer> | E, Layer.Layer.Context<DockerEngine.DockerLayer>>) => Promise<{
+export declare const promiseClient: <E1, E2>(layer: (connectionOptions: MobyConnection.MobyConnectionOptions) => Layer.Layer<Layer.Success<DockerEngine.DockerLayer>, Layer.Error<DockerEngine.DockerLayer> | E1, Layer.Services<DockerEngine.DockerLayer>>, connectionOptions?: MobyConnection.MobyConnectionOptions | Effect.Effect<MobyConnection.MobyConnectionOptions, E2, never>) => Promise<{
     pull: (a: {
         image: string;
         platform?: string | undefined;
     }) => ReadableStream<MobySchemas.JSONMessage>;
-    build: <E1>(a: {
+    build: <E1_1>(a: {
         tag: string;
         platform?: string | undefined;
         dockerfile?: string | undefined;
-        context: Stream.Stream<Uint8Array, E1, never>;
+        context: Stream.Stream<Uint8Array, E1_1, never>;
         buildargs?: Record<string, string | undefined> | undefined;
     }) => ReadableStream<MobySchemas.JSONMessage>;
     stop: (containerId: string & import("effect/Brand").Brand<"ContainerId">) => Promise<void>;
     start: (containerId: string & import("effect/Brand").Brand<"ContainerId">) => Promise<void>;
     run: (options: Omit<{
         readonly Image: string;
+        readonly Labels?: {
+            readonly [x: string]: string;
+        } | null;
+        readonly User?: string;
         readonly Hostname?: string;
+        readonly Env?: readonly string[] | null;
+        readonly StopSignal?: string | undefined;
+        readonly OpenStdin?: boolean;
+        readonly Healthcheck?: MobySchemas.V1HealthcheckConfig | null | undefined;
+        readonly MacAddress?: string | undefined;
+        readonly Tty?: boolean;
+        readonly HostConfig?: MobySchemas.ContainerHostConfig | null | undefined;
         readonly Domainname?: string;
-        readonly User?: string;
         readonly AttachStdin?: boolean;
         readonly AttachStdout?: boolean;
         readonly AttachStderr?: boolean;
@@ -40,13 +51,9 @@ export declare const promiseClient: <E>(layer: Layer.Layer<Layer.Layer.Success<D
             readonly [x: `${number}`]: object;
             readonly [x: `${number}/tcp`]: object;
             readonly [x: `${number}/udp`]: object;
-        } | undefined;
-        readonly Tty?: boolean;
-        readonly OpenStdin?: boolean;
+        } | null | undefined;
         readonly StdinOnce?: boolean;
-        readonly Env?: readonly string[] | null;
         readonly Cmd?: readonly string[] | null;
-        readonly Healthcheck?: MobySchemas.V1HealthcheckConfig | undefined;
         readonly ArgsEscaped?: boolean | undefined;
         readonly Volumes?: {
             readonly [x: string]: object;
@@ -54,25 +61,19 @@ export declare const promiseClient: <E>(layer: Layer.Layer<Layer.Layer.Success<D
         readonly WorkingDir?: string;
         readonly Entrypoint?: readonly string[] | null;
         readonly NetworkDisabled?: boolean | undefined;
-        readonly MacAddress?: string | undefined;
         readonly OnBuild?: readonly string[] | null | undefined;
-        readonly Labels?: {
-            readonly [x: string]: string;
-        } | null;
-        readonly StopSignal?: string | undefined;
-        readonly StopTimeout?: (bigint & import("effect/Brand").Brand<"I64">) | undefined;
-        readonly Shell?: readonly string[] | undefined;
-        readonly HostConfig?: MobySchemas.ContainerHostConfig | undefined;
-        readonly NetworkingConfig?: MobySchemas.NetworkNetworkingConfig | undefined;
+        readonly StopTimeout?: bigint | null | undefined;
+        readonly Shell?: readonly string[] | null | undefined;
+        readonly NetworkingConfig?: MobySchemas.NetworkNetworkingConfig | null | undefined;
     }, "HostConfig"> & {
         readonly name?: string | undefined;
         readonly platform?: string | undefined;
-        readonly HostConfig?: ConstructorParameters<typeof MobySchemas.ContainerHostConfig>[0] | undefined;
+        readonly HostConfig?: (typeof MobySchemas.ContainerHostConfig)["~type.make.in"] | undefined;
     }) => Promise<MobySchemas.ContainerInspectResponse>;
     exec: (a_0: {
         command: string | Array<string>;
         containerId: MobySchemas.ContainerIdentifier;
-    }) => Promise<[exitCode: bigint & import("effect/Brand").Brand<"I64">, output: string]>;
+    }) => Promise<[exitCode: bigint, output: string]>;
     execNonBlocking: <const T extends boolean = false>(a_0: {
         detach: T;
         command: string | Array<string>;
@@ -86,17 +87,17 @@ export declare const promiseClient: <E>(layer: Layer.Layer<Layer.Layer.Success<D
         command: string | Array<string>;
         containerId: MobySchemas.ContainerIdentifier;
         cwd?: string | undefined;
-    }) => ReadableStream<import("./MobyDemux.ts").MultiplexedChannel<never, import("@effect/platform/Socket").SocketError | import("./internal/endpoints/circular.ts").DockerError, never>>;
+    }) => ReadableStream<import("./MobyDemux.ts").MultiplexedChannel<never, import("effect/unstable/socket/Socket").SocketError | import("./internal/endpoints/circular.ts").DockerError, never>>;
     ps: (options?: {
+        readonly all?: boolean | undefined;
         readonly size?: boolean | undefined;
         readonly limit?: number | undefined;
-        readonly all?: boolean | undefined;
         readonly filters?: {
             readonly identifier?: readonly (string & import("effect/Brand").Brand<"ContainerId">)[] | undefined;
             readonly volume?: string | undefined;
-            readonly exited?: readonly number[] | undefined;
             readonly name?: readonly string[] | undefined;
-            readonly status?: readonly ("created" | "restarting" | "running" | "removing" | "paused" | "exited" | "dead")[] | undefined;
+            readonly status?: readonly ("running" | "paused" | "created" | "restarting" | "removing" | "exited" | "dead")[] | undefined;
+            readonly exited?: readonly number[] | undefined;
             readonly network?: readonly string[] | undefined;
             readonly label?: readonly string[] | undefined;
             readonly ancestor?: readonly string[] | undefined;
@@ -126,19 +127,19 @@ export declare const promiseClient: <E>(layer: Layer.Layer<Layer.Layer.Success<D
         readonly "shared-size"?: boolean | undefined;
     } | undefined) => Promise<readonly MobySchemas.ImageSummary[]>;
     search: (options: {
+        readonly term: string;
         readonly limit?: number | undefined;
         readonly filters?: {
             readonly "is-official"?: boolean | undefined;
             readonly "is-automated"?: boolean | undefined;
             readonly stars?: number | undefined;
         } | undefined;
-        readonly term: string;
     }) => Promise<readonly MobySchemas.RegistrySearchResult[]>;
     version: () => Promise<MobySchemas.TypesVersion>;
     info: () => Promise<MobySchemas.SystemInfo>;
     ping: () => Promise<void>;
     pingHead: () => Promise<void>;
-    followProgressInConsole: (evaluate: Function.LazyArg<ReadableStream<MobySchemas.JSONMessage>>, onError: (error: unknown) => unknown) => Promise<readonly MobySchemas.JSONMessage[]>;
-    waitForProgressToComplete: (evaluate: Function.LazyArg<ReadableStream<MobySchemas.JSONMessage>>, onError: (error: unknown) => unknown) => Promise<readonly MobySchemas.JSONMessage[]>;
+    followProgressInConsole: (readable: ReadableStream<MobySchemas.JSONMessage>) => Promise<MobySchemas.JSONMessage[]>;
+    waitForProgressToComplete: (readable: ReadableStream<MobySchemas.JSONMessage>) => Promise<MobySchemas.JSONMessage[]>;
 }>;
 //# sourceMappingURL=Promises.d.ts.map

package/dist/Promises.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Promises.d.ts","sourceRoot":"","sources":["../src/Promises.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAIrD,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAGlD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAU,CAAC,EACjC,OAAO,KAAK,CAAC,KAAK,CACd,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,EAC7C,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,EAC/C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAChD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuCJ,CAAC"}
+{"version":3,"file":"Promises.d.ts","sourceRoot":"","sources":["../src/Promises.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AAGtD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAU,EAAE,EAAE,EAAE,EACtC,OAAO,CACH,iBAAiB,EAAE,cAAc,CAAC,qBAAqB,KACtD,KAAK,CAAC,KAAK,CACZ,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,EACvC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,EAC1C,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAC3C,EACD,oBACM,cAAc,CAAC,qBAAqB,GACpC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,qBAAqB,EAAE,EAAE,EAAE,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+BAkDgsP,sCAAsC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAD7yP,CAAC"}

package/dist/Promises.js

@@ -3,12 +3,14 @@
  *
  * @since 1.0.0
  */
-import * as Chunk from "effect/Chunk";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
+import * as Layer from "effect/Layer";
 import * as ManagedRuntime from "effect/ManagedRuntime";
+import * as Match from "effect/Match";
 import * as Stream from "effect/Stream";
 import * as DockerEngine from "./DockerEngine.js";
+import * as MobyConnection from "./MobyConnection.js";
 import * as MobyConvey from "./MobyConvey.js";
 /**
  * Create a promise client for the docker engine
@@ -16,29 +18,37 @@ import * as MobyConvey from "./MobyConvey.js";
  * @since 1.0.0
  * @category Promises
  */
-export const promiseClient = async layer => {
-  const managedRuntime = ManagedRuntime.make(layer);
-  const runtime = await managedRuntime.runtime();
+export const promiseClient = async (layer, connectionOptions) => {
+  const connectionOptionsEffect = Match.value(connectionOptions).pipe(Match.when(Match.undefined, () => MobyConnection.connectionOptionsFromPlatformSystemSocketDefault), Match.when(Effect.isEffect, effect => effect), Match.orElse(options => Effect.succeed(options)));
+  const unwrappedLayer = connectionOptionsEffect.pipe(Effect.map(options => layer(options)), Layer.unwrap);
+  const managedRuntime = ManagedRuntime.make(unwrappedLayer);
+  const services = await managedRuntime.context();
   return {
-    pull: Function.compose(DockerEngine.pull, Stream.toReadableStreamRuntime(runtime)),
-    build: Function.compose(DockerEngine.build, Stream.toReadableStreamRuntime(runtime)),
+    pull: Function.compose(DockerEngine.pull, Stream.toReadableStreamWith(services)),
+    build: Function.compose(DockerEngine.build, Stream.toReadableStreamWith(services)),
     stop: Function.flow(DockerEngine.stop, managedRuntime.runPromise),
     start: Function.flow(DockerEngine.start, managedRuntime.runPromise),
     run: Function.flow(DockerEngine.run, managedRuntime.runPromise),
     exec: Function.flow(DockerEngine.exec, managedRuntime.runPromise),
     execNonBlocking: Function.flow(DockerEngine.execNonBlocking, managedRuntime.runPromise),
     execWebsockets: Function.flow(DockerEngine.execWebsockets, managedRuntime.runPromise),
-    execWebsocketsNonBlocking: Function.compose(DockerEngine.execWebsocketsNonBlocking, Stream.toReadableStreamRuntime(runtime)),
+    execWebsocketsNonBlocking: Function.compose(DockerEngine.execWebsocketsNonBlocking, effect => Stream.toReadableStreamWith(Stream.fromEffect(effect), services)),
     ps: Function.flow(DockerEngine.ps, managedRuntime.runPromise),
-    push: Function.flow(DockerEngine.push, Stream.toReadableStreamRuntime(runtime)),
+    push: Function.flow(DockerEngine.push, Stream.toReadableStreamWith(services)),
     images: Function.flow(DockerEngine.images, managedRuntime.runPromise),
     search: Function.flow(DockerEngine.search, managedRuntime.runPromise),
     version: Function.flow(DockerEngine.version, managedRuntime.runPromise),
     info: Function.flow(DockerEngine.info, managedRuntime.runPromise),
     ping: Function.flow(DockerEngine.ping, managedRuntime.runPromise),
     pingHead: Function.flow(DockerEngine.pingHead, managedRuntime.runPromise),
-    followProgressInConsole: Function.flow(Stream.fromReadableStream, MobyConvey.followProgressInConsole, Effect.map(Chunk.toReadonlyArray), managedRuntime.runPromise),
-    waitForProgressToComplete: Function.flow(Stream.fromReadableStream, MobyConvey.waitForProgressToComplete, Effect.map(Chunk.toReadonlyArray), managedRuntime.runPromise)
+    followProgressInConsole: Function.flow(readable => Stream.fromReadableStream({
+      evaluate: () => readable,
+      onError: Function.identity
+    }), MobyConvey.followProgressInConsole, managedRuntime.runPromise),
+    waitForProgressToComplete: Function.flow(readable => Stream.fromReadableStream({
+      evaluate: () => readable,
+      onError: Function.identity
+    }), MobyConvey.waitForProgressToComplete, managedRuntime.runPromise)
   };
 };
 //# sourceMappingURL=Promises.js.map

package/dist/Promises.js.map

@@ -1 +1 @@
-{"version":3,"file":"Promises.js","names":["Chunk","Effect","Function","ManagedRuntime","Stream","DockerEngine","MobyConvey","promiseClient","layer","managedRuntime","make","runtime","pull","compose","toReadableStreamRuntime","build","stop","flow","runPromise","start","run","exec","execNonBlocking","execWebsockets","execWebsocketsNonBlocking","ps","push","images","search","version","info","ping","pingHead","followProgressInConsole","fromReadableStream","map","toReadonlyArray","waitForProgressToComplete"],"sources":["../src/Promises.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Promises.js","names":["Effect","Function","Layer","ManagedRuntime","Match","Stream","DockerEngine","MobyConnection","MobyConvey","promiseClient","layer","connectionOptions","connectionOptionsEffect","value","pipe","when","undefined","connectionOptionsFromPlatformSystemSocketDefault","isEffect","effect","orElse","options","succeed","unwrappedLayer","map","unwrap","managedRuntime","make","services","context","pull","compose","toReadableStreamWith","build","stop","flow","runPromise","start","run","exec","execNonBlocking","execWebsockets","execWebsocketsNonBlocking","fromEffect","ps","push","images","search","version","info","ping","pingHead","followProgressInConsole","readable","fromReadableStream","evaluate","onError","identity","waitForProgressToComplete"],"sources":["../src/Promises.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/internal/convey/sinks.js

@@ -1,12 +1,11 @@
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Match from "effect/Match";
 import * as Predicate from "effect/Predicate";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 /** @internal */
-export const waitForProgressToComplete = stream => Stream.run(stream, Sink.collectAll());
+export const waitForProgressToComplete = stream => Stream.run(stream, Sink.collect());
 /** @internal */
 export const followProgressSink = /*#__PURE__*/Sink.forEach(/*#__PURE__*/Effect.fnUntraced(function* (message) {
   if (Predicate.isNotUndefined(message.status)) {
@@ -17,30 +16,4 @@ export const followProgressSink = /*#__PURE__*/Sink.forEach(/*#__PURE__*/Effect.
 }));
 /** @internal */
 export const followProgressInConsole = stream => Function.pipe(stream, Stream.tapSink(followProgressSink), waitForProgressToComplete);
-/** @internal */
-export const mapError = stream => Stream.mapEffect(stream, message => {
-  if (Predicate.isNotUndefined(message.error)) {
-    const cause = Function.pipe(Match.value(message.errorDetail), Match.when({
-      code: Match.undefined,
-      message: Match.undefined
-    }, () => "Errored with an unknown reason with an unknown code"), Match.when({
-      message: Match.string
-    }, ({
-      message
-    }) => `Errored with ${message} and an unknown code`), Match.when({
-      code: Match.number
-    }, ({
-      code
-    }) => `Errored with an unknown reason and code ${code}`), Match.when({
-      code: Match.number,
-      message: Match.string
-    }, ({
-      code,
-      message
-    }) => `Errored with ${message} and code ${code}`), Match.orElseAbsurd, message => new Error(message));
-    return Effect.fail(cause);
-  } else {
-    return Effect.succeed(message);
-  }
-});
 //# sourceMappingURL=sinks.js.map

package/dist/internal/convey/sinks.js.map

@@ -1 +1 @@
-{"version":3,"file":"sinks.js","names":["Console","Effect","Function","Match","Predicate","Sink","Stream","waitForProgressToComplete","stream","run","collectAll","followProgressSink","forEach","fnUntraced","message","isNotUndefined","status","log","progress","followProgressInConsole","pipe","tapSink","mapError","mapEffect","error","cause","value","errorDetail","when","code","undefined","string","number","orElseAbsurd","Error","fail","succeed"],"sources":["../../../src/internal/convey/sinks.ts"],"sourcesContent":[null],"mappings":"AAIA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,SAAS,MAAM,kBAAkB;AAC7C,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC;AACA,OAAO,MAAMC,yBAAyB,GAClCC,MAAsD,IAEtDF,MAAM,CAACG,GAAG,CAACD,MAAM,EAAEH,IAAI,CAACK,UAAU,EAAE,CAAC;AAEzC;AACA,OAAO,MAAMC,kBAAkB,gBAAGN,IAAI,CAACO,OAAO,cAC1CX,MAAM,CAACY,UAAU,CAAC,WAAWC,OAAO;EAChC,IAAIV,SAAS,CAACW,cAAc,CAACD,OAAO,CAACE,MAAM,CAAC,EAAE;IAC1C,OAAOhB,OAAO,CAACiB,GAAG,CAAC,GAAGH,OAAO,CAACE,MAAM,GAAGF,OAAO,CAACI,QAAQ,GAAG,GAAG,GAAG,EAAE,GAAGJ,OAAO,CAACI,QAAQ,IAAI,EAAE,EAAE,CAAC;EAClG,CAAC,MAAM,IAAId,SAAS,CAACW,cAAc,CAACD,OAAO,CAACN,MAAM,CAAC,EAAE;IACjD,OAAOR,OAAO,CAACiB,GAAG,CAACH,OAAO,CAACN,MAAM,CAAC;EACtC;AACJ,CAAC,CAAC,CACL;AAED;AACA,OAAO,MAAMW,uBAAuB,GAChCX,MAAsD,IAEtDN,QAAQ,CAACkB,IAAI,CAACZ,MAAM,EAAEF,MAAM,CAACe,OAAO,CAACV,kBAAkB,CAAC,EAAEJ,yBAAyB,CAAC;AAExF;AACA,OAAO,MAAMe,QAAQ,GACjBd,MAAsD,IAEtDF,MAAM,CAACiB,SAAS,CAACf,MAAM,EAAGM,OAAO,IAAI;EACjC,IAAIV,SAAS,CAACW,cAAc,CAACD,OAAO,CAACU,KAAK,CAAC,EAAE;IACzC,MAAMC,KAAK,GAAGvB,QAAQ,CAACkB,IAAI,CACvBjB,KAAK,CAACuB,KAAK,CAACZ,OAAO,CAACa,WAAY,CAAC,EACjCxB,KAAK,CAACyB,IAAI,CACN;MAAEC,IAAI,EAAE1B,KAAK,CAAC2B,SAAS;MAAEhB,OAAO,EAAEX,KAAK,CAAC2B;IAAS,CAAE,EACnD,MAAM,qDAAqD,CAC9D,EACD3B,KAAK,CAACyB,IAAI,CAAC;MAAEd,OAAO,EAAEX,KAAK,CAAC4B;IAAM,CAAE,EAAE,CAAC;MAAEjB;IAAO,CAAE,KAAK,gBAAgBA,OAAO,sBAAsB,CAAC,EACrGX,KAAK,CAACyB,IAAI,CAAC;MAAEC,IAAI,EAAE1B,KAAK,CAAC6B;IAAM,CAAE,EAAE,CAAC;MAAEH;IAAI,CAAE,KAAK,2CAA2CA,IAAI,EAAE,CAAC,EACnG1B,KAAK,CAACyB,IAAI,CACN;MAAEC,IAAI,EAAE1B,KAAK,CAAC6B,MAAM;MAAElB,OAAO,EAAEX,KAAK,CAAC4B;IAAM,CAAE,EAC7C,CAAC;MAAEF,IAAI;MAAEf;IAAO,CAAE,KAAK,gBAAgBA,OAAO,aAAae,IAAI,EAAE,CACpE,EACD1B,KAAK,CAAC8B,YAAY,EACjBnB,OAAO,IAAK,IAAIoB,KAAK,CAACpB,OAAO,CAAC,CAClC;IAED,OAAOb,MAAM,CAACkC,IAAI,CAACV,KAAK,CAAC;EAC7B,CAAC,MAAM;IACH,OAAOxB,MAAM,CAACmC,OAAO,CAACtB,OAAO,CAAC;EAClC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"sinks.js","names":["Console","Effect","Function","Predicate","Sink","Stream","waitForProgressToComplete","stream","run","collect","followProgressSink","forEach","fnUntraced","message","isNotUndefined","status","log","progress","followProgressInConsole","pipe","tapSink"],"sources":["../../../src/internal/convey/sinks.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,SAAS,MAAM,kBAAkB;AAC7C,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAIvC;AACA,OAAO,MAAMC,yBAAyB,GAClCC,MAAsD,IACEF,MAAM,CAACG,GAAG,CAACD,MAAM,EAAEH,IAAI,CAACK,OAAO,EAAE,CAAC;AAE9F;AACA,OAAO,MAAMC,kBAAkB,gBAAGN,IAAI,CAACO,OAAO,cAC1CV,MAAM,CAACW,UAAU,CAAC,WAAWC,OAAgC;EACzD,IAAIV,SAAS,CAACW,cAAc,CAACD,OAAO,CAACE,MAAM,CAAC,EAAE;IAC1C,OAAOf,OAAO,CAACgB,GAAG,CAAC,GAAGH,OAAO,CAACE,MAAM,GAAGF,OAAO,CAACI,QAAQ,GAAG,GAAG,GAAG,EAAE,GAAGJ,OAAO,CAACI,QAAQ,IAAI,EAAE,EAAE,CAAC;EAClG,CAAC,MAAM,IAAId,SAAS,CAACW,cAAc,CAACD,OAAO,CAACN,MAAM,CAAC,EAAE;IACjD,OAAOP,OAAO,CAACgB,GAAG,CAACH,OAAO,CAACN,MAAM,CAAC;EACtC;AACJ,CAAC,CAAC,CACL;AAED;AACA,OAAO,MAAMW,uBAAuB,GAChCX,MAAsD,IAEtDL,QAAQ,CAACiB,IAAI,CAACZ,MAAM,EAAEF,MAAM,CAACe,OAAO,CAACV,kBAAkB,CAAC,EAAEJ,yBAAyB,CAAC","ignoreList":[]}

package/dist/internal/convey/streams.js

@@ -1,2 +1,32 @@
-export {};
+import * as Effect from "effect/Effect";
+import * as Function from "effect/Function";
+import * as Match from "effect/Match";
+import * as Predicate from "effect/Predicate";
+import * as Stream from "effect/Stream";
+/** @internal */
+export const mapError = stream => Stream.mapEffect(stream, message => {
+  if (Predicate.isNotUndefined(message.error)) {
+    const cause = Function.pipe(Match.value(message.errorDetail), Match.when({
+      code: Match.undefined,
+      message: Match.undefined
+    }, () => "Errored with an unknown reason with an unknown code"), Match.when({
+      message: Match.string
+    }, ({
+      message
+    }) => `Errored with ${message} and an unknown code`), Match.when({
+      code: Match.number
+    }, ({
+      code
+    }) => `Errored with an unknown reason and code ${code}`), Match.when({
+      code: Match.number,
+      message: Match.string
+    }, ({
+      code,
+      message
+    }) => `Errored with ${message} and code ${code}`), Match.orElseAbsurd);
+    return Effect.fail(cause);
+  } else {
+    return Effect.succeed(message);
+  }
+});
 //# sourceMappingURL=streams.js.map

package/dist/internal/convey/streams.js.map

@@ -1 +1 @@
-{"version":3,"file":"streams.js","names":[],"sources":["../../../src/internal/convey/streams.ts"],"sourcesContent":[null],"mappings":"","ignoreList":[]}
+{"version":3,"file":"streams.js","names":["Effect","Function","Match","Predicate","Stream","mapError","stream","mapEffect","message","isNotUndefined","error","cause","pipe","value","errorDetail","when","code","undefined","string","number","orElseAbsurd","fail","succeed"],"sources":["../../../src/internal/convey/streams.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,SAAS,MAAM,kBAAkB;AAC7C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAIvC;AACA,OAAO,MAAMC,QAAQ,GACjBC,MAAsD,IAEtDF,MAAM,CAACG,SAAS,CAACD,MAAM,EAAGE,OAAO,IAAI;EACjC,IAAIL,SAAS,CAACM,cAAc,CAACD,OAAO,CAACE,KAAK,CAAC,EAAE;IACzC,MAAMC,KAAK,GAAWV,QAAQ,CAACW,IAAI,CAC/BV,KAAK,CAACW,KAAK,CAACL,OAAO,CAACM,WAAY,CAAC,EACjCZ,KAAK,CAACa,IAAI,CACN;MAAEC,IAAI,EAAEd,KAAK,CAACe,SAAS;MAAET,OAAO,EAAEN,KAAK,CAACe;IAAS,CAAE,EACnD,MAAM,qDAAqD,CAC9D,EACDf,KAAK,CAACa,IAAI,CAAC;MAAEP,OAAO,EAAEN,KAAK,CAACgB;IAAM,CAAE,EAAE,CAAC;MAAEV;IAAO,CAAE,KAAK,gBAAgBA,OAAO,sBAAsB,CAAC,EACrGN,KAAK,CAACa,IAAI,CAAC;MAAEC,IAAI,EAAEd,KAAK,CAACiB;IAAM,CAAE,EAAE,CAAC;MAAEH;IAAI,CAAE,KAAK,2CAA2CA,IAAI,EAAE,CAAC,EACnGd,KAAK,CAACa,IAAI,CACN;MAAEC,IAAI,EAAEd,KAAK,CAACiB,MAAM;MAAEX,OAAO,EAAEN,KAAK,CAACgB;IAAM,CAAE,EAC7C,CAAC;MAAEF,IAAI;MAAER;IAAO,CAAE,KAAK,gBAAgBA,OAAO,aAAaQ,IAAI,EAAE,CACpE,EACDd,KAAK,CAACkB,YAAY,CACrB;IAED,OAAOpB,MAAM,CAACqB,IAAI,CAACV,KAAK,CAAC;EAC7B,CAAC,MAAM;IACH,OAAOX,MAAM,CAACsB,OAAO,CAACd,OAAO,CAAC;EAClC;AACJ,CAAC,CAAC","ignoreList":[]}

package/dist/internal/demux/compressed.js.map

@@ -1 +1 @@
-{"version":3,"file":"compressed.js","names":["Predicate","compressDemuxOutput","data","isUndefined","undefined"],"sources":["../../../src/internal/demux/compressed.ts"],"sourcesContent":[null],"mappings":"AAEA,OAAO,KAAKA,SAAS,MAAM,kBAAkB;AAE7C;AACA,OAAO,MAAMC,mBAAmB,GAC5BC,IAA6C,IAE7CF,SAAS,CAACG,WAAW,CAACD,IAAI,CAAC,CAAC,CAAC,CAAC,IAAIF,SAAS,CAACG,WAAW,CAACD,IAAI,CAAC,CAAC,CAAC,CAAC,GACzD,KAAKE,SAAqD,GAC1DF,IAAgD","ignoreList":[]}
+{"version":3,"file":"compressed.js","names":["Predicate","compressDemuxOutput","data","isUndefined","undefined"],"sources":["../../../src/internal/demux/compressed.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,SAAS,MAAM,kBAAkB;AAI7C;AACA,OAAO,MAAMC,mBAAmB,GAC5BC,IAA6C,IAE7CF,SAAS,CAACG,WAAW,CAACD,IAAI,CAAC,CAAC,CAAC,CAAC,IAAIF,SAAS,CAACG,WAAW,CAACD,IAAI,CAAC,CAAC,CAAC,CAAC,GACzD,KAAKE,SAAqD,GAC1DF,IAAgD","ignoreList":[]}

package/dist/internal/demux/demux.d.ts

@@ -1,10 +1,9 @@
-import type * as Socket from "@effect/platform/Socket";
 import type * as Effect from "effect/Effect";
-import type * as ParseResult from "effect/ParseResult";
-import type * as Scope from "effect/Scope";
+import type * as Schema from "effect/Schema";
 import type * as Stream from "effect/Stream";
-import type * as MobyDemux from "../../MobyDemux.js";
+import type * as Socket from "effect/unstable/socket/Socket";
 import * as Sink from "effect/Sink";
+import type * as MobyDemux from "../../MobyDemux.js";
 /**
  * Demux either a raw socket or a multiplexed socket to a single sink.
  *
@@ -13,7 +12,7 @@ import * as Sink from "effect/Sink";
  */
 export declare const demuxToSingleSink: (<A1, L1, E1, E2, R1, R2>(source: Stream.Stream<string | Uint8Array, E1, R1>, sink: Sink.Sink<A1, string, L1, E2, R2>, options?: {
     encoding?: string | undefined;
-} | undefined) => <IE = never, OE = Socket.SocketError, R3 = never>(sockets: MobyDemux.EitherRawInput<E1 | IE, OE, R3> | MobyDemux.EitherMultiplexedInput<E1 | IE, OE, R3>) => Effect.Effect<A1, E1 | E2 | IE | OE | ParseResult.ParseError, Exclude<R1, Scope.Scope> | Exclude<R2, Scope.Scope> | Exclude<R3, Scope.Scope>>) & (<A1, L1, E1, E2, R1, R2, IE = never, OE = Socket.SocketError, R3 = never>(sockets: MobyDemux.EitherRawInput<E1 | IE, OE, R3> | MobyDemux.EitherMultiplexedInput<E1 | IE, OE, R3>, source: Stream.Stream<string | Uint8Array, E1, R1>, sink: Sink.Sink<A1, string, L1, E2, R2>, options?: {
+} | undefined) => <IE = never, OE = Socket.SocketError, R3 = never>(sockets: MobyDemux.EitherRawInput<E1 | IE, OE, R3> | MobyDemux.EitherMultiplexedInput<E1 | IE, OE, R3>) => Effect.Effect<A1, E1 | E2 | IE | OE | Schema.SchemaError, R1 | R2 | R3>) & (<A1, L1, E1, E2, R1, R2, IE = never, OE = Socket.SocketError, R3 = never>(sockets: MobyDemux.EitherRawInput<E1 | IE, OE, R3> | MobyDemux.EitherMultiplexedInput<E1 | IE, OE, R3>, source: Stream.Stream<string | Uint8Array, E1, R1>, sink: Sink.Sink<A1, string, L1, E2, R2>, options?: {
     encoding?: string | undefined;
-} | undefined) => Effect.Effect<A1, E1 | E2 | IE | OE | ParseResult.ParseError, Exclude<R1, Scope.Scope> | Exclude<R2, Scope.Scope> | Exclude<R3, Scope.Scope>>);
+} | undefined) => Effect.Effect<A1, E1 | E2 | IE | OE | Schema.SchemaError, R1 | R2 | R3>);
 //# sourceMappingURL=demux.d.ts.map

package/dist/internal/demux/demux.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"demux.d.ts","sourceRoot":"","sources":["../../../src/internal/demux/demux.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAMpC;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,IAEzB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UACX,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,QAC5C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YAC7B;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,KACtD,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,KAAK,EACjD,OAAO,EAAE,SAAS,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KACrG,MAAM,CAAC,MAAM,CACd,EAAE,EACF,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC,UAAU,EAC1C,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CACjF,MAEA,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,uBAAuB,EAAE,mBACnD,SAAS,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,UAC9F,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,QAC5C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YAC7B;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,KACtD,MAAM,CAAC,MAAM,CACd,EAAE,EACF,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC,UAAU,EAC1C,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CACjF,CAiCJ,CAAC"}
+{"version":3,"file":"demux.d.ts","sourceRoot":"","sources":["../../../src/internal/demux/demux.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAG7D,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAGpC,OAAO,KAAK,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAKrD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,IAEzB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UACX,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,QAC5C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YAC7B;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,KACtD,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,KAAK,EACjD,OAAO,EAAE,SAAS,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KACrG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,MAE3E,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,uBAAuB,EAAE,mBACnD,SAAS,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,UAC9F,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,QAC5C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YAC7B;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,KACtD,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CA6B/E,CAAC"}

package/dist/internal/demux/demux.js

@@ -21,7 +21,7 @@ arguments_ => isRawSocket(arguments_[0]) || isRawChannel(arguments_[0]) || isMul
     return demuxRawToSingleSink(socketOptions, source, sink, options);
   }
   if (isMultiplexedSocket(socketOptions) || isMultiplexedChannel(socketOptions)) {
-    return demuxMultiplexedToSingleSink(socketOptions, source, Sink.mapInput(sink, Tuple.getSecond), options);
+    return demuxMultiplexedToSingleSink(socketOptions, source, Sink.mapInput(sink, Tuple.get(1)), options);
   }
   return Function.absurd(socketOptions);
 });

package/dist/internal/demux/demux.js.map

@@ -1 +1 @@
-{"version":3,"file":"demux.js","names":["Function","Sink","Tuple","demuxMultiplexedToSingleSink","isMultiplexedChannel","isMultiplexedSocket","demuxRawToSingleSink","isRawChannel","isRawSocket","demuxToSingleSink","dual","arguments_","socketOptions","source","sink","options","mapInput","getSecond","absurd"],"sources":["../../../src/internal/demux/demux.ts"],"sourcesContent":[null],"mappings":"AAOA,OAAO,KAAKA,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,SAASC,4BAA4B,EAAEC,oBAAoB,EAAEC,mBAAmB,QAAQ,kBAAkB;AAC1G,SAASC,oBAAoB,EAAEC,YAAY,EAAEC,WAAW,QAAQ,UAAU;AAE1E;;;;;;AAMA,OAAO,MAAMC,iBAAiB,gBAAGT,QAAQ,CAACU,IAAI;AAyB1C;;;;AAICC,UAAU,IACPH,WAAW,CAACG,UAAU,CAAC,CAAC,CAAC,CAAC,IAC1BJ,YAAY,CAACI,UAAU,CAAC,CAAC,CAAC,CAAC,IAC3BN,mBAAmB,CAACM,UAAU,CAAC,CAAC,CAAC,CAAC,IAClCP,oBAAoB,CAACO,UAAU,CAAC,CAAC,CAAC,CAAC;AAEvC;AACA,CACIC,aAA4G,EAC5GC,MAAkD,EAClDC,IAAuC,EACvCC,OAAuD,KAKvD;EACA,IAAIP,WAAW,CAACI,aAAa,CAAC,IAAIL,YAAY,CAAkBK,aAAa,CAAC,EAAE;IAC5E,OAAON,oBAAoB,CAACM,aAAa,EAAEC,MAAM,EAAEC,IAAI,EAAEC,OAAO,CAAC;EACrE;EAEA,IAAIV,mBAAmB,CAACO,aAAa,CAAC,IAAIR,oBAAoB,CAAkBQ,aAAa,CAAC,EAAE;IAC5F,OAAOT,4BAA4B,CAACS,aAAa,EAAEC,MAAM,EAAEZ,IAAI,CAACe,QAAQ,CAACF,IAAI,EAAEZ,KAAK,CAACe,SAAS,CAAC,EAAEF,OAAO,CAAC;EAC7G;EAEA,OAAOf,QAAQ,CAACkB,MAAM,CAACN,aAAa,CAAC;AACzC,CAAC,CACJ","ignoreList":[]}
+{"version":3,"file":"demux.js","names":["Function","Sink","Tuple","demuxMultiplexedToSingleSink","isMultiplexedChannel","isMultiplexedSocket","demuxRawToSingleSink","isRawChannel","isRawSocket","demuxToSingleSink","dual","arguments_","socketOptions","source","sink","options","mapInput","get","absurd"],"sources":["../../../src/internal/demux/demux.ts"],"sourcesContent":[null],"mappings":"AAKA,OAAO,KAAKA,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAIrC,SAASC,4BAA4B,EAAEC,oBAAoB,EAAEC,mBAAmB,QAAQ,kBAAkB;AAC1G,SAASC,oBAAoB,EAAEC,YAAY,EAAEC,WAAW,QAAQ,UAAU;AAE1E;;;;;;AAMA,OAAO,MAAMC,iBAAiB,gBAAGT,QAAQ,CAACU,IAAI;AAiB1C;;;;AAICC,UAAU,IACPH,WAAW,CAACG,UAAU,CAAC,CAAC,CAAC,CAAC,IAC1BJ,YAAY,CAACI,UAAU,CAAC,CAAC,CAAC,CAAC,IAC3BN,mBAAmB,CAACM,UAAU,CAAC,CAAC,CAAC,CAAC,IAClCP,oBAAoB,CAACO,UAAU,CAAC,CAAC,CAAC,CAAC;AAEvC;AACA,CACIC,aAA4G,EAC5GC,MAAkD,EAClDC,IAAuC,EACvCC,OAAuD,KACkB;EACzE,IAAIP,WAAW,CAACI,aAAa,CAAC,IAAIL,YAAY,CAAkBK,aAAa,CAAC,EAAE;IAC5E,OAAON,oBAAoB,CAACM,aAAa,EAAEC,MAAM,EAAEC,IAAI,EAAEC,OAAO,CAAC;EACrE;EAEA,IAAIV,mBAAmB,CAACO,aAAa,CAAC,IAAIR,oBAAoB,CAAkBQ,aAAa,CAAC,EAAE;IAC5F,OAAOT,4BAA4B,CAACS,aAAa,EAAEC,MAAM,EAAEZ,IAAI,CAACe,QAAQ,CAACF,IAAI,EAAEZ,KAAK,CAACe,GAAG,CAAC,CAAC,CAAC,CAAC,EAAEF,OAAO,CAAC;EAC1G;EAEA,OAAOf,QAAQ,CAACkB,MAAM,CAACN,aAAa,CAAC;AACzC,CAAC,CACJ","ignoreList":[]}

package/dist/internal/demux/fan.js

@@ -1,58 +1,44 @@
 import * as Channel from "effect/Channel";
 import * as Effect from "effect/Effect";
-import * as Either from "effect/Either";
-import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
 import * as Function from "effect/Function";
-import * as Option from "effect/Option";
+import * as Pull from "effect/Pull";
 import * as Queue from "effect/Queue";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import { demuxMultiplexedToSeparateSinks, isMultiplexedChannel, isMultiplexedSocket } from "./multiplexed.js";
-import { makeRawChannel, rawFromStreamWith } from "./raw.js";
-/** @internal */
+import { makeRawChannel } from "./raw.js";
+/**
+ * The fan demux driver runs exactly once, forked into the caller's scope, and
+ * the returned channels are pure queue plumbing. This keeps the demux
+ * deterministic - there is no racing over which consumer starts the driver,
+ * and consuming any subset of the returned channels (in any order) observes
+ * all of the data.
+ *
+ * @internal
+ */
 export const fan = /*#__PURE__*/Function.dual(arguments_ => isMultiplexedChannel(arguments_[0]) || isMultiplexedSocket(arguments_[0]), /*#__PURE__*/Effect.fnUntraced(function* (multiplexedInput, options) {
-  const mutex = yield* Effect.makeSemaphore(1);
-  const context = yield* Effect.context();
-  // Internal buffers
+  // Internal buffers. The consumer queues carry the driver's failure so
+  // that a demux error surfaces on whichever channels are being read.
   const capacity = options.requestedCapacity;
   const stdoutConsumerQueue = yield* Queue.bounded(typeof capacity === "number" ? capacity : capacity.stdoutCapacity);
   const stderrConsumerQueue = yield* Queue.bounded(typeof capacity === "number" ? capacity : capacity.stderrCapacity);
   const stdinProducerQueue = yield* Queue.bounded(typeof capacity === "number" ? capacity : capacity.stdinCapacity);
-  // We MUST only touch the underlying once!!! Very important!!!
-  // Demux everything to and fro the correct places. We can touch
-  // this more than once because it is wrapped with a mutex.
-  const motherChannel = demuxMultiplexedToSeparateSinks(multiplexedInput, Function.pipe(Stream.fromQueue(stdinProducerQueue, {
-    shutdown: true
-  }), Stream.map(Either.match({
-    onRight: Exit.succeed,
-    onLeft: Function.flow(Exit.mapBoth({
-      onFailure: Option.some,
-      onSuccess: Function.compose(Option.none, Exit.fail)
-    }), Exit.flatten)
-  })), Stream.flattenExitOption, Stream.flattenChunks), Sink.fromQueue(stdoutConsumerQueue, {
-    shutdown: true
-  }), Sink.fromQueue(stderrConsumerQueue, {
-    shutdown: true
-  }), {
+  // The driver demuxes the multiplexed input into the consumer queues
+  // and pumps the stdin producer queue into it. On completion the
+  // consumer queues are ended; on failure the failure is forwarded to
+  // them so it surfaces on whichever channels are being read.
+  const driver = yield* demuxMultiplexedToSeparateSinks(multiplexedInput, Stream.fromQueue(stdinProducerQueue), Sink.forEachArray(chunk => Queue.offerAll(stdoutConsumerQueue, chunk)), Sink.forEachArray(chunk => Queue.offerAll(stderrConsumerQueue, chunk)), {
     bufferSize: 32,
     encoding: options.encoding
-  }).pipe(mutex.withPermitsIfAvailable(1)).pipe(Effect.asVoid).pipe(Channel.fromEffect).pipe(Channel.provideContext(context));
-  // Any one of these will kick off the mother demux, but only one will
-  const independentStdinChannel = Channel.toQueue(stdinProducerQueue).pipe(Channel.mapInput(Function.constVoid)).pipe(Channel.zipLeft(motherChannel, {
-    concurrent: true
-  })).pipe(makeRawChannel);
-  // Any one of these will kick off the mother demux, but only one will
-  const independentStdoutChannel = Stream.fromQueue(stdoutConsumerQueue).pipe(Stream.encodeText).pipe(rawFromStreamWith()).pipe(({
-    underlying
-  }) => underlying).pipe(Channel.zipLeft(motherChannel, {
-    concurrent: true
-  })).pipe(makeRawChannel);
-  // Any one of these will kick off the mother demux, but only one will
-  const independentStderrChannel = Stream.fromQueue(stderrConsumerQueue).pipe(Stream.encodeText).pipe(rawFromStreamWith()).pipe(({
-    underlying
-  }) => underlying).pipe(Channel.zipLeft(motherChannel, {
-    concurrent: true
-  })).pipe(makeRawChannel);
+  }).pipe(Effect.tap(() => Effect.andThen(Queue.end(stdoutConsumerQueue), Queue.end(stderrConsumerQueue))), Effect.tapCause(cause => Effect.andThen(Queue.failCause(stdoutConsumerQueue, cause), Queue.failCause(stderrConsumerQueue, cause))), Effect.forkScoped);
+  // Forwards the stdin channel's input into the stdin producer queue,
+  // propagating input errors and the end-of-input signal.
+  const feedStdin = upstream => upstream.pipe(Effect.flatMap(chunk => Queue.offerAll(stdinProducerQueue, chunk)), Effect.forever, Pull.catchDone(() => Queue.end(stdinProducerQueue)), Effect.catchCause(cause => Queue.failCause(stdinProducerQueue, cause)), Effect.asVoid);
+  // The stdin channel completes (or fails) with the driver.
+  const independentStdinChannel = Channel.fromEffectDrain(Fiber.join(driver)).pipe(Channel.embedInput(feedStdin), makeRawChannel);
+  const independentStdoutChannel = Stream.fromQueue(stdoutConsumerQueue).pipe(Stream.encodeText, Stream.toChannel, makeRawChannel);
+  const independentStderrChannel = Stream.fromQueue(stderrConsumerQueue).pipe(Stream.encodeText, Stream.toChannel, makeRawChannel);
   return {
     stdin: independentStdinChannel,
     stdout: independentStdoutChannel,

package/dist/internal/demux/fan.js.map

@@ -1 +1 @@
-{"version":3,"file":"fan.js","names":["Channel","Effect","Either","Exit","Function","Option","Queue","Sink","Stream","demuxMultiplexedToSeparateSinks","isMultiplexedChannel","isMultiplexedSocket","makeRawChannel","rawFromStreamWith","fan","dual","arguments_","fnUntraced","multiplexedInput","options","mutex","makeSemaphore","context","capacity","requestedCapacity","stdoutConsumerQueue","bounded","stdoutCapacity","stderrConsumerQueue","stderrCapacity","stdinProducerQueue","stdinCapacity","motherChannel","pipe","fromQueue","shutdown","map","match","onRight","succeed","onLeft","flow","mapBoth","onFailure","some","onSuccess","compose","none","fail","flatten","flattenExitOption","flattenChunks","bufferSize","encoding","withPermitsIfAvailable","asVoid","fromEffect","provideContext","independentStdinChannel","toQueue","mapInput","constVoid","zipLeft","concurrent","independentStdoutChannel","encodeText","underlying","independentStderrChannel","stdin","stdout","stderr"],"sources":["../../../src/internal/demux/fan.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"fan.js","names":["Channel","Effect","Fiber","Function","Pull","Queue","Sink","Stream","demuxMultiplexedToSeparateSinks","isMultiplexedChannel","isMultiplexedSocket","makeRawChannel","fan","dual","arguments_","fnUntraced","multiplexedInput","options","capacity","requestedCapacity","stdoutConsumerQueue","bounded","stdoutCapacity","stderrConsumerQueue","stderrCapacity","stdinProducerQueue","stdinCapacity","driver","fromQueue","forEachArray","chunk","offerAll","bufferSize","encoding","pipe","tap","andThen","end","tapCause","cause","failCause","forkScoped","feedStdin","upstream","flatMap","forever","catchDone","catchCause","asVoid","independentStdinChannel","fromEffectDrain","join","embedInput","independentStdoutChannel","encodeText","toChannel","independentStderrChannel","stdin","stdout","stderr"],"sources":["../../../src/internal/demux/fan.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/internal/demux/hijack.js

@@ -1,18 +1,29 @@
-import * as Socket from "@effect/platform/Socket";
 import * as Effect from "effect/Effect";
+import * as Predicate from "effect/Predicate";
+import * as Socket from "effect/unstable/socket/Socket";
 import { makeMultiplexedSocket, responseIsMultiplexedResponse } from "./multiplexed.js";
 import { makeRawSocket, responseIsRawResponse } from "./raw.js";
 /** @internal */
 export const hijackResponseUnsafe = response => Effect.flatMap(Effect.promise(() => import("@effect/platform-node/NodeSocket")), nodeSocketLazy => {
-  const socket = response.original.source.socket;
+  let current = response;
+  while (Predicate.isNotUndefined(current.original)) current = current.original;
+  const socket = current.source?.socket;
+  if (Predicate.isUndefined(socket)) {
+    return Effect.fail(new Socket.SocketError({
+      reason: new Socket.SocketReadError({
+        cause: "Could not find the underlying tcp socket on the http client response"
+      })
+    }));
+  }
   return nodeSocketLazy.fromDuplex(Effect.sync(() => socket));
 });
 /** @internal */
 export const responseToMultiplexedStreamSocketOrFailUnsafe = response => {
   if (!responseIsMultiplexedResponse(response)) {
-    return Effect.fail(new Socket.SocketGenericError({
-      reason: "Read",
-      cause: `Response with content type "${response.headers["content-type"]}" is not a multiplexed streaming socket`
+    return Effect.fail(new Socket.SocketError({
+      reason: new Socket.SocketReadError({
+        cause: `Response with content type "${response.headers["content-type"]}" is not a multiplexed streaming socket`
+      })
     }));
   }
   return Effect.map(hijackResponseUnsafe(response), makeMultiplexedSocket);
@@ -20,9 +31,10 @@ export const responseToMultiplexedStreamSocketOrFailUnsafe = response => {
 /** @internal */
 export const responseToRawStreamSocketOrFailUnsafe = response => {
   if (!responseIsRawResponse(response)) {
-    return Effect.fail(new Socket.SocketGenericError({
-      reason: "Read",
-      cause: `Response with content type "${response.headers["content-type"]}" is not a raw streaming socket`
+    return Effect.fail(new Socket.SocketError({
+      reason: new Socket.SocketReadError({
+        cause: `Response with content type "${response.headers["content-type"]}" is not a raw streaming socket`
+      })
     }));
   }
   return Effect.map(hijackResponseUnsafe(response), makeRawSocket);
@@ -35,9 +47,10 @@ export const responseToStreamingSocketOrFailUnsafe = response => {
   if (responseIsRawResponse(response)) {
     return responseToRawStreamSocketOrFailUnsafe(response);
   }
-  return Effect.fail(new Socket.SocketGenericError({
-    reason: "Read",
-    cause: "Response is not a streaming socket"
+  return Effect.fail(new Socket.SocketError({
+    reason: new Socket.SocketReadError({
+      cause: "Response is not a streaming socket"
+    })
   }));
 };
 //# sourceMappingURL=hijack.js.map