@effect-aws/commons 0.2.1 → 0.3.1

package/HttpHandler/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../dist/cjs/HttpHandler.js",
+  "module": "../dist/esm/HttpHandler.js",
+  "types": "../dist/dts/HttpHandler.d.ts",
+  "sideEffects": []
+}

package/dist/cjs/HttpHandler.d.ts

@@ -0,0 +1,36 @@
+/**
+ * @since 0.3.0
+ */
+import type { HttpRequest, HttpResponse } from "@smithy/protocol-http";
+import type { HttpHandlerOptions, RequestHandler as ClientRequestHandler, RequestHandlerOutput } from "@smithy/types";
+import type { Cause, Effect } from "effect";
+import { Context, Scope } from "effect";
+import type { RuntimeOptions } from "./internal/httpHandler.js";
+declare const TypeId: unique symbol;
+type RequestHandlerConstructorProps = {
+    readonly handle: (request: HttpRequest, handlerOptions?: HttpHandlerOptions) => Effect.Effect<RequestHandlerOutput<HttpResponse>, Cause.TimeoutException, Scope.Scope>;
+};
+/**
+ * @since 0.3.0
+ * @category model
+ */
+export interface RequestHandler extends RequestHandlerConstructorProps {
+    readonly [TypeId]: typeof TypeId;
+}
+/**
+ * @since 0.3.0
+ * @category tag
+ */
+export declare const RequestHandler: Context.Tag<RequestHandler, RequestHandler>;
+/**
+ * @since 0.3.0
+ * @category constructors
+ */
+export declare const make: (options: RequestHandlerConstructorProps) => RequestHandler;
+/**
+ * @since 0.3.0
+ * @category adapters
+ */
+export declare const toClientRequestHandler: (requestHandler: RequestHandler, config: RuntimeOptions) => ClientRequestHandler<HttpRequest, HttpResponse, HttpHandlerOptions>;
+export {};
+//# sourceMappingURL=HttpHandler.d.ts.map

package/dist/cjs/HttpHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpHandler.d.ts","sourceRoot":"","sources":["../../src/HttpHandler.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,IAAI,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACtH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAW,KAAK,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,QAAA,MAAM,MAAM,eAAmD,CAAC;AAEhE,KAAK,8BAA8B,GAAG;IACpC,QAAQ,CAAC,MAAM,EAAE,CACf,OAAO,EAAE,WAAW,EACpB,cAAc,CAAC,EAAE,kBAAkB,KAChC,MAAM,CAAC,MAAM,CAChB,oBAAoB,CAAC,YAAY,CAAC,EAClC,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,KAAK,CACZ,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,8BAA8B;IACpE,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;CAClC;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,6CAA2E,CAAC;AAMvG;;;GAGG;AACH,eAAO,MAAM,IAAI,YAAa,8BAA8B,KAAG,cACjB,CAAC;AAE/C;;;GAGG;AACH,eAAO,MAAM,sBAAsB,mBACjB,cAAc,UACtB,cAAc,KACrB,qBAAqB,WAAW,EAAE,YAAY,EAAE,kBAAkB,CAcpE,CAAC"}

package/dist/cjs/HttpHandler.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toClientRequestHandler = exports.make = exports.RequestHandler = void 0;
+const effect_1 = require("effect");
+const TypeId = Symbol.for("@effect-aws/commons/RequestHandler");
+/**
+ * @since 0.3.0
+ * @category tag
+ */
+exports.RequestHandler = effect_1.Context.GenericTag("@effect-aws/commons/RequestHandler");
+const proto = {
+    [TypeId]: TypeId,
+};
+/**
+ * @since 0.3.0
+ * @category constructors
+ */
+const make = (options) => Object.assign(Object.create(proto), options);
+exports.make = make;
+/**
+ * @since 0.3.0
+ * @category adapters
+ */
+const toClientRequestHandler = (requestHandler, config) => {
+    const runPromise = effect_1.Runtime.runPromise(config.runtime);
+    const scoped = effect_1.Scope.extend(config.scope);
+    class HttpHandler {
+        handle(request, options = {}) {
+            return runPromise(requestHandler.handle(request, options).pipe(scoped), { signal: options.abortSignal });
+        }
+    }
+    return new HttpHandler();
+};
+exports.toClientRequestHandler = toClientRequestHandler;
+//# sourceMappingURL=HttpHandler.js.map

package/dist/cjs/HttpHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpHandler.js","sourceRoot":"","sources":["../../src/HttpHandler.ts"],"names":[],"mappings":";;;AAMA,mCAAiD;AAGjD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAqBhE;;;GAGG;AACU,QAAA,cAAc,GAAG,gBAAO,CAAC,UAAU,CAAiB,oCAAoC,CAAC,CAAC;AAEvG,MAAM,KAAK,GAAG;IACZ,CAAC,MAAM,CAAC,EAAE,MAAM;CACjB,CAAC;AAEF;;;GAGG;AACI,MAAM,IAAI,GAAG,CAAC,OAAuC,EAAkB,EAAE,CAC9E,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AADlC,QAAA,IAAI,QAC8B;AAE/C;;;GAGG;AACI,MAAM,sBAAsB,GAAG,CACpC,cAA8B,EAC9B,MAAsB,EAC+C,EAAE;IACvE,MAAM,UAAU,GAAG,gBAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,cAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE1C,MAAM,WAAW;QACf,MAAM,CAAC,OAAoB,EAAE,UAA8B,EAAE;YAC3D,OAAO,UAAU,CACf,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EACpD,EAAE,MAAM,EAAE,OAAO,CAAC,WAA0B,EAAE,CAC/C,CAAC;QACJ,CAAC;KACF;IAED,OAAO,IAAI,WAAW,EAAE,CAAC;AAC3B,CAAC,CAAC;AAjBW,QAAA,sBAAsB,0BAiBjC"}

package/dist/cjs/Service.d.ts

@@ -1,14 +1,30 @@
 /**
  * @since 0.1.0
  */
-import { ServiceException } from "@smithy/smithy-client";
-import type { Client } from "@smithy/types";
+import type { CommandImpl, SmithyResolvedConfiguration } from "@smithy/smithy-client";
+import type { Client, HandlerOptions, Logger, RequestHandler } from "@smithy/types";
 import type { Array } from "effect";
 import { Effect } from "effect";
-import type { TaggedException } from "./Errors.js";
-import { SdkError } from "./Errors.js";
-import type { BaseResolvedConfig, CommandCtor, LoggerResolvedConfig } from "./internal/service.js";
 import type { HttpHandlerOptions } from "./Types.js";
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export interface LoggerResolvedConfig {
+    logger?: Logger;
+}
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export interface BaseResolvedConfig extends Required<LoggerResolvedConfig>, SmithyResolvedConfiguration<HandlerOptions> {
+    requestHandler: RequestHandler<any, any, any>;
+}
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export type CommandCtor<I> = new (input: I, ...args: Array<any>) => CommandImpl<I, any, BaseResolvedConfig>;
 type ServiceFnOptions = {
     errorTags?: Array.NonEmptyReadonlyArray<string>;
     resolveClientConfig: Effect.Effect<LoggerResolvedConfig>;
@@ -17,21 +33,21 @@ type ServiceFnOptions = {
  * @since 0.1.0
  * @category errors
  */
-export declare const catchServiceExceptions: (errorTags?: Array.NonEmptyReadonlyArray<string>) => (e: unknown) => SdkError | TaggedException<ServiceException>;
+export declare const catchServiceExceptions: (errorTags?: Array.NonEmptyReadonlyArray<string>) => (e: unknown) => unknown;
 /**
  * @since 0.1.0
  * @category constructors
  */
-export declare const makeServiceFn: (client: Client<any, any, BaseResolvedConfig>, CommandCtor: CommandCtor<any>, fnOptions: ServiceFnOptions) => (args: any, options?: HttpHandlerOptions) => Effect.Effect<any, SdkError | TaggedException<ServiceException>, never>;
+export declare const makeServiceFn: (client: Client<any, any, BaseResolvedConfig>, CommandCtor: CommandCtor<any>, fnOptions: ServiceFnOptions) => (args: any, options?: HttpHandlerOptions) => Effect.Effect<any, unknown, never>;
 /**
  * @since 0.1.0
  * @category constructors
  */
-export declare const fromCommandsAndServiceFn: <Service>(commands: Record<string, CommandCtor<any>>, serviceFnMaker: (CommandCtor: CommandCtor<any>) => ReturnType<typeof makeServiceFn>) => Service;
+export declare const fromCommandsAndServiceFn: <Service>(commands: Record<string, CommandCtor<any>>, serviceFnMaker: (CommandCtor: CommandCtor<any>) => ReturnType<typeof makeServiceFn>) => Effect.Effect<Service>;
 /**
  * @since 0.1.0
  * @category constructors
  */
-export declare const fromClientAndCommands: <Service>(client: Client<any, any, BaseResolvedConfig>, commands: Record<string, CommandCtor<any>>, options: ServiceFnOptions) => Service;
+export declare const fromClientAndCommands: <Service>(client: Client<any, any, BaseResolvedConfig>, commands: Record<string, CommandCtor<any>>, options: ServiceFnOptions) => Effect.Effect<Service>;
 export {};
 //# sourceMappingURL=Service.d.ts.map

package/dist/cjs/Service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAQ,MAAM,EAAkB,MAAM,QAAQ,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,KAAK,gBAAgB,GAAG;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAChD,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,eAAgB,MAAM,qBAAqB,CAAC,MAAM,CAAC,SAAS,OAAO,iDAUrG,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,WAChB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,eAC/B,YAAY,GAAG,CAAC,aAClB,gBAAgB,YAEb,GAAG,YAAY,kBAAkB,4EAQhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,sBACzB,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,kBAC1B,CAAC,aAAa,YAAY,GAAG,CAAC,KAAK,WAAW,oBAAoB,CAAC,KAClF,OAoBY,CAAC;AAEhB;;;GAGG;AACH,eAAO,MAAM,qBAAqB,oBACxB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,YAClC,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,WACjC,gBAAgB,KACxB,OAA2G,CAAC"}
+{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAEtF,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAmB,cAAc,EAAE,MAAM,eAAe,CAAC;AACrG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAe,MAAM,EAAgD,MAAM,QAAQ,CAAC;AAK3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,kBACf,SAAQ,QAAQ,CAAC,oBAAoB,CAAC,EAAE,2BAA2B,CAAC,cAAc,CAAC;IAEnF,cAAc,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAC/C;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,KAAI,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;AAE3G,KAAK,gBAAgB,GAAG;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAChD,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,eAAgB,MAAM,qBAAqB,CAAC,MAAM,CAAC,SAAS,OAAO,YAgBrG,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,WAChB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,eAC/B,YAAY,GAAG,CAAC,aAClB,gBAAgB,YAEb,GAAG,YAAY,kBAAkB,uCAgBhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,sBACzB,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,kBAC1B,CAAC,aAAa,YAAY,GAAG,CAAC,KAAK,WAAW,oBAAoB,CAAC,KAClF,OAAO,MAAM,CAAC,OAAO,CAoCpB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB,oBACxB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,YAClC,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,WACjC,gBAAgB,KACxB,OAAO,MAAM,CAAC,OAAO,CAC0E,CAAC"}

package/dist/cjs/Service.js

@@ -1,12 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromClientAndCommands = exports.fromCommandsAndServiceFn = exports.makeServiceFn = exports.catchServiceExceptions = void 0;
-/**
- * @since 0.1.0
- */
 const smithy_client_1 = require("@smithy/smithy-client");
 const effect_1 = require("effect");
 const Errors_js_1 = require("./Errors.js");
+const HttpHandler = __importStar(require("./HttpHandler.js"));
 /**
  * @since 0.1.0
  * @category errors
@@ -17,6 +38,12 @@ const catchServiceExceptions = (errorTags) => (e) => {
         return ServiceException({ ...e, message: e.message, stack: e.stack });
     }
     if (e instanceof Error) {
+        if (effect_1.Runtime.isFiberFailure(e) && effect_1.Cause.isFailType(e[effect_1.Runtime.FiberFailureCauseId])) {
+            return e[effect_1.Runtime.FiberFailureCauseId].error;
+        }
+        if (e.name === "TimeoutError") {
+            return new effect_1.Cause.TimeoutException(e.message);
+        }
         return (0, Errors_js_1.SdkError)({ ...e, name: "SdkError", message: e.message, stack: e.stack });
     }
     throw e;
@@ -29,10 +56,11 @@ exports.catchServiceExceptions = catchServiceExceptions;
 const makeServiceFn = (client, CommandCtor, fnOptions) => {
     return (args, options) => effect_1.Effect.gen(function* () {
         const config = yield* fnOptions.resolveClientConfig;
-        return yield* effect_1.Effect.tryPromise({
-            try: (abortSignal) => client.send(new CommandCtor(args, config), { ...(options ?? {}), abortSignal }),
+        const runtime = yield* effect_1.Effect.runtime();
+        return yield* effect_1.Effect.acquireUseRelease(effect_1.Scope.make(), (scope) => effect_1.Effect.tryPromise({
+            try: (abortSignal) => client.send(new CommandCtor(args, config, { runtime, scope }), { ...(options ?? {}), abortSignal }),
             catch: (0, exports.catchServiceExceptions)(fnOptions.errorTags),
-        });
+        }), effect_1.Scope.close);
     });
 };
 exports.makeServiceFn = makeServiceFn;
@@ -40,21 +68,30 @@ exports.makeServiceFn = makeServiceFn;
  * @since 0.1.0
  * @category constructors
  */
-const fromCommandsAndServiceFn = (commands, serviceFnMaker) => effect_1.Record.mapEntries(commands, (CommandCtor, command) => {
-    const ExtendedCommand = class extends CommandCtor {
-        config;
-        constructor(args, config) {
-            super(args);
-            this.config = config;
-        }
-        resolveMiddleware(stack, configuration, options) {
-            return this.config?.logger
-                ? super.resolveMiddleware(stack, { ...configuration, logger: this.config.logger }, options)
-                : super.resolveMiddleware(stack, configuration, options);
-        }
-    };
-    const serviceFnName = effect_1.String.uncapitalize(command).replace(/Command$/, "");
-    return [serviceFnName, serviceFnMaker(ExtendedCommand)];
+const fromCommandsAndServiceFn = (commands, serviceFnMaker) => effect_1.Effect.gen(function* () {
+    const maybeRequestHandler = yield* effect_1.Effect.serviceOption(HttpHandler.RequestHandler);
+    return (0, effect_1.pipe)(commands, effect_1.Record.filter(Boolean), effect_1.Record.mapEntries((CommandCtor, command) => {
+        const ExtendedCommand = class extends CommandCtor {
+            config;
+            runtimeOptions;
+            constructor(args, config, runtimeOptions) {
+                super(args);
+                this.config = config;
+                this.runtimeOptions = runtimeOptions;
+            }
+            resolveMiddleware(stack, configuration, options) {
+                return super.resolveMiddleware(stack, {
+                    ...configuration,
+                    ...(this.config.logger ? { logger: this.config.logger } : {}),
+                    ...(effect_1.Option.isSome(maybeRequestHandler)
+                        ? { requestHandler: HttpHandler.toClientRequestHandler(maybeRequestHandler.value, this.runtimeOptions) }
+                        : {}),
+                }, options);
+            }
+        };
+        const serviceFnName = effect_1.String.uncapitalize(command).replace(/Command$/, "");
+        return [serviceFnName, serviceFnMaker(ExtendedCommand)];
+    }));
 });
 exports.fromCommandsAndServiceFn = fromCommandsAndServiceFn;
 /**

package/dist/cjs/Service.js.map

@@ -1 +1 @@
-{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"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"}

package/dist/cjs/index.d.ts

@@ -14,4 +14,8 @@ export * from "./Errors.js";
  * @since 0.1.0
  */
 export * from "./Types.js";
+/**
+ * @since 0.3.0
+ */
+export * as HttpHandler from "./HttpHandler.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,cAAc,YAAY,CAAC;AAE3B;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC"}

package/dist/cjs/index.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceLogger = exports.Service = void 0;
+exports.HttpHandler = exports.ServiceLogger = exports.Service = void 0;
 /**
  * @since 0.1.0
  */
@@ -43,4 +43,8 @@ __exportStar(require("./Errors.js"), exports);
  * @since 0.1.0
  */
 __exportStar(require("./Types.js"), exports);
+/**
+ * @since 0.3.0
+ */
+exports.HttpHandler = __importStar(require("./HttpHandler.js"));
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,wDAAwC;AAExC;;GAEG;AACH,oEAAoD;AAEpD;;GAEG;AACH,8CAA4B;AAE5B;;GAEG;AACH,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,wDAAwC;AAExC;;GAEG;AACH,oEAAoD;AAEpD;;GAEG;AACH,8CAA4B;AAE5B;;GAEG;AACH,6CAA2B;AAE3B;;GAEG;AACH,gEAAgD"}

package/dist/cjs/internal/httpHandler.d.ts

@@ -0,0 +1,6 @@
+import type { Runtime, Scope } from "effect";
+export interface RuntimeOptions {
+    runtime: Runtime.Runtime<never>;
+    scope: Scope.Scope;
+}
+//# sourceMappingURL=httpHandler.d.ts.map

package/dist/cjs/internal/httpHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpHandler.d.ts","sourceRoot":"","sources":["../../../src/internal/httpHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE7C,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;CACpB"}

package/dist/cjs/internal/{service.js → httpHandler.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=service.js.map
+//# sourceMappingURL=httpHandler.js.map

package/dist/cjs/internal/httpHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpHandler.js","sourceRoot":"","sources":["../../../src/internal/httpHandler.ts"],"names":[],"mappings":""}

package/dist/dts/HttpHandler.d.ts

@@ -0,0 +1,36 @@
+/**
+ * @since 0.3.0
+ */
+import type { HttpRequest, HttpResponse } from "@smithy/protocol-http";
+import type { HttpHandlerOptions, RequestHandler as ClientRequestHandler, RequestHandlerOutput } from "@smithy/types";
+import type { Cause, Effect } from "effect";
+import { Context, Scope } from "effect";
+import type { RuntimeOptions } from "./internal/httpHandler.js";
+declare const TypeId: unique symbol;
+type RequestHandlerConstructorProps = {
+    readonly handle: (request: HttpRequest, handlerOptions?: HttpHandlerOptions) => Effect.Effect<RequestHandlerOutput<HttpResponse>, Cause.TimeoutException, Scope.Scope>;
+};
+/**
+ * @since 0.3.0
+ * @category model
+ */
+export interface RequestHandler extends RequestHandlerConstructorProps {
+    readonly [TypeId]: typeof TypeId;
+}
+/**
+ * @since 0.3.0
+ * @category tag
+ */
+export declare const RequestHandler: Context.Tag<RequestHandler, RequestHandler>;
+/**
+ * @since 0.3.0
+ * @category constructors
+ */
+export declare const make: (options: RequestHandlerConstructorProps) => RequestHandler;
+/**
+ * @since 0.3.0
+ * @category adapters
+ */
+export declare const toClientRequestHandler: (requestHandler: RequestHandler, config: RuntimeOptions) => ClientRequestHandler<HttpRequest, HttpResponse, HttpHandlerOptions>;
+export {};
+//# sourceMappingURL=HttpHandler.d.ts.map

package/dist/dts/HttpHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpHandler.d.ts","sourceRoot":"","sources":["../../src/HttpHandler.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,IAAI,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACtH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAW,KAAK,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,QAAA,MAAM,MAAM,eAAmD,CAAC;AAEhE,KAAK,8BAA8B,GAAG;IACpC,QAAQ,CAAC,MAAM,EAAE,CACf,OAAO,EAAE,WAAW,EACpB,cAAc,CAAC,EAAE,kBAAkB,KAChC,MAAM,CAAC,MAAM,CAChB,oBAAoB,CAAC,YAAY,CAAC,EAClC,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,KAAK,CACZ,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,8BAA8B;IACpE,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;CAClC;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,6CAA2E,CAAC;AAMvG;;;GAGG;AACH,eAAO,MAAM,IAAI,YAAa,8BAA8B,KAAG,cACjB,CAAC;AAE/C;;;GAGG;AACH,eAAO,MAAM,sBAAsB,mBACjB,cAAc,UACtB,cAAc,KACrB,qBAAqB,WAAW,EAAE,YAAY,EAAE,kBAAkB,CAcpE,CAAC"}

package/dist/dts/Service.d.ts

@@ -1,14 +1,30 @@
 /**
  * @since 0.1.0
  */
-import { ServiceException } from "@smithy/smithy-client";
-import type { Client } from "@smithy/types";
+import type { CommandImpl, SmithyResolvedConfiguration } from "@smithy/smithy-client";
+import type { Client, HandlerOptions, Logger, RequestHandler } from "@smithy/types";
 import type { Array } from "effect";
 import { Effect } from "effect";
-import type { TaggedException } from "./Errors.js";
-import { SdkError } from "./Errors.js";
-import type { BaseResolvedConfig, CommandCtor, LoggerResolvedConfig } from "./internal/service.js";
 import type { HttpHandlerOptions } from "./Types.js";
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export interface LoggerResolvedConfig {
+    logger?: Logger;
+}
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export interface BaseResolvedConfig extends Required<LoggerResolvedConfig>, SmithyResolvedConfiguration<HandlerOptions> {
+    requestHandler: RequestHandler<any, any, any>;
+}
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export type CommandCtor<I> = new (input: I, ...args: Array<any>) => CommandImpl<I, any, BaseResolvedConfig>;
 type ServiceFnOptions = {
     errorTags?: Array.NonEmptyReadonlyArray<string>;
     resolveClientConfig: Effect.Effect<LoggerResolvedConfig>;
@@ -17,21 +33,21 @@ type ServiceFnOptions = {
  * @since 0.1.0
  * @category errors
  */
-export declare const catchServiceExceptions: (errorTags?: Array.NonEmptyReadonlyArray<string>) => (e: unknown) => SdkError | TaggedException<ServiceException>;
+export declare const catchServiceExceptions: (errorTags?: Array.NonEmptyReadonlyArray<string>) => (e: unknown) => unknown;
 /**
  * @since 0.1.0
  * @category constructors
  */
-export declare const makeServiceFn: (client: Client<any, any, BaseResolvedConfig>, CommandCtor: CommandCtor<any>, fnOptions: ServiceFnOptions) => (args: any, options?: HttpHandlerOptions) => Effect.Effect<any, SdkError | TaggedException<ServiceException>, never>;
+export declare const makeServiceFn: (client: Client<any, any, BaseResolvedConfig>, CommandCtor: CommandCtor<any>, fnOptions: ServiceFnOptions) => (args: any, options?: HttpHandlerOptions) => Effect.Effect<any, unknown, never>;
 /**
  * @since 0.1.0
  * @category constructors
  */
-export declare const fromCommandsAndServiceFn: <Service>(commands: Record<string, CommandCtor<any>>, serviceFnMaker: (CommandCtor: CommandCtor<any>) => ReturnType<typeof makeServiceFn>) => Service;
+export declare const fromCommandsAndServiceFn: <Service>(commands: Record<string, CommandCtor<any>>, serviceFnMaker: (CommandCtor: CommandCtor<any>) => ReturnType<typeof makeServiceFn>) => Effect.Effect<Service>;
 /**
  * @since 0.1.0
  * @category constructors
  */
-export declare const fromClientAndCommands: <Service>(client: Client<any, any, BaseResolvedConfig>, commands: Record<string, CommandCtor<any>>, options: ServiceFnOptions) => Service;
+export declare const fromClientAndCommands: <Service>(client: Client<any, any, BaseResolvedConfig>, commands: Record<string, CommandCtor<any>>, options: ServiceFnOptions) => Effect.Effect<Service>;
 export {};
 //# sourceMappingURL=Service.d.ts.map

package/dist/dts/Service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAQ,MAAM,EAAkB,MAAM,QAAQ,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,KAAK,gBAAgB,GAAG;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAChD,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,eAAgB,MAAM,qBAAqB,CAAC,MAAM,CAAC,SAAS,OAAO,iDAUrG,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,WAChB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,eAC/B,YAAY,GAAG,CAAC,aAClB,gBAAgB,YAEb,GAAG,YAAY,kBAAkB,4EAQhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,sBACzB,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,kBAC1B,CAAC,aAAa,YAAY,GAAG,CAAC,KAAK,WAAW,oBAAoB,CAAC,KAClF,OAoBY,CAAC;AAEhB;;;GAGG;AACH,eAAO,MAAM,qBAAqB,oBACxB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,YAClC,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,WACjC,gBAAgB,KACxB,OAA2G,CAAC"}
+{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAEtF,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAmB,cAAc,EAAE,MAAM,eAAe,CAAC;AACrG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAe,MAAM,EAAgD,MAAM,QAAQ,CAAC;AAK3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,kBACf,SAAQ,QAAQ,CAAC,oBAAoB,CAAC,EAAE,2BAA2B,CAAC,cAAc,CAAC;IAEnF,cAAc,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAC/C;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,KAAI,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;AAE3G,KAAK,gBAAgB,GAAG;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAChD,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,eAAgB,MAAM,qBAAqB,CAAC,MAAM,CAAC,SAAS,OAAO,YAgBrG,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,WAChB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,eAC/B,YAAY,GAAG,CAAC,aAClB,gBAAgB,YAEb,GAAG,YAAY,kBAAkB,uCAgBhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,sBACzB,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,kBAC1B,CAAC,aAAa,YAAY,GAAG,CAAC,KAAK,WAAW,oBAAoB,CAAC,KAClF,OAAO,MAAM,CAAC,OAAO,CAoCpB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,qBAAqB,oBACxB,OAAO,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,YAClC,OAAO,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,WACjC,gBAAgB,KACxB,OAAO,MAAM,CAAC,OAAO,CAC0E,CAAC"}

package/dist/dts/index.d.ts

@@ -14,4 +14,8 @@ export * from "./Errors.js";
  * @since 0.1.0
  */
 export * from "./Types.js";
+/**
+ * @since 0.3.0
+ */
+export * as HttpHandler from "./HttpHandler.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/dts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,cAAc,YAAY,CAAC;AAE3B;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC"}

package/dist/dts/internal/httpHandler.d.ts

@@ -0,0 +1,6 @@
+import type { Runtime, Scope } from "effect";
+export interface RuntimeOptions {
+    runtime: Runtime.Runtime<never>;
+    scope: Scope.Scope;
+}
+//# sourceMappingURL=httpHandler.d.ts.map

package/dist/dts/internal/httpHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpHandler.d.ts","sourceRoot":"","sources":["../../../src/internal/httpHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE7C,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;CACpB"}

package/dist/esm/HttpHandler.js

@@ -0,0 +1,30 @@
+import { Context, Runtime, Scope } from "effect";
+const TypeId = Symbol.for("@effect-aws/commons/RequestHandler");
+/**
+ * @since 0.3.0
+ * @category tag
+ */
+export const RequestHandler = Context.GenericTag("@effect-aws/commons/RequestHandler");
+const proto = {
+    [TypeId]: TypeId,
+};
+/**
+ * @since 0.3.0
+ * @category constructors
+ */
+export const make = (options) => Object.assign(Object.create(proto), options);
+/**
+ * @since 0.3.0
+ * @category adapters
+ */
+export const toClientRequestHandler = (requestHandler, config) => {
+    const runPromise = Runtime.runPromise(config.runtime);
+    const scoped = Scope.extend(config.scope);
+    class HttpHandler {
+        handle(request, options = {}) {
+            return runPromise(requestHandler.handle(request, options).pipe(scoped), { signal: options.abortSignal });
+        }
+    }
+    return new HttpHandler();
+};
+//# sourceMappingURL=HttpHandler.js.map

package/dist/esm/HttpHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpHandler.js","sourceRoot":"","sources":["../../src/HttpHandler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGjD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAqBhE;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAiB,oCAAoC,CAAC,CAAC;AAEvG,MAAM,KAAK,GAAG;IACZ,CAAC,MAAM,CAAC,EAAE,MAAM;CACjB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,OAAuC,EAAkB,EAAE,CAC9E,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AAE/C;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,cAA8B,EAC9B,MAAsB,EAC+C,EAAE;IACvE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE1C,MAAM,WAAW;QACf,MAAM,CAAC,OAAoB,EAAE,UAA8B,EAAE;YAC3D,OAAO,UAAU,CACf,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EACpD,EAAE,MAAM,EAAE,OAAO,CAAC,WAA0B,EAAE,CAC/C,CAAC;QACJ,CAAC;KACF;IAED,OAAO,IAAI,WAAW,EAAE,CAAC;AAC3B,CAAC,CAAC"}

package/dist/esm/Service.js

@@ -1,9 +1,7 @@
-/**
- * @since 0.1.0
- */
 import { ServiceException } from "@smithy/smithy-client";
-import { Data, Effect, Record, String } from "effect";
+import { Cause, Data, Effect, Option, pipe, Record, Runtime, Scope, String } from "effect";
 import { SdkError } from "./Errors.js";
+import * as HttpHandler from "./HttpHandler.js";
 /**
  * @since 0.1.0
  * @category errors
@@ -14,6 +12,12 @@ export const catchServiceExceptions = (errorTags) => (e) => {
         return ServiceException({ ...e, message: e.message, stack: e.stack });
     }
     if (e instanceof Error) {
+        if (Runtime.isFiberFailure(e) && Cause.isFailType(e[Runtime.FiberFailureCauseId])) {
+            return e[Runtime.FiberFailureCauseId].error;
+        }
+        if (e.name === "TimeoutError") {
+            return new Cause.TimeoutException(e.message);
+        }
         return SdkError({ ...e, name: "SdkError", message: e.message, stack: e.stack });
     }
     throw e;
@@ -25,31 +29,41 @@ export const catchServiceExceptions = (errorTags) => (e) => {
 export const makeServiceFn = (client, CommandCtor, fnOptions) => {
     return (args, options) => Effect.gen(function* () {
         const config = yield* fnOptions.resolveClientConfig;
-        return yield* Effect.tryPromise({
-            try: (abortSignal) => client.send(new CommandCtor(args, config), { ...(options ?? {}), abortSignal }),
+        const runtime = yield* Effect.runtime();
+        return yield* Effect.acquireUseRelease(Scope.make(), (scope) => Effect.tryPromise({
+            try: (abortSignal) => client.send(new CommandCtor(args, config, { runtime, scope }), { ...(options ?? {}), abortSignal }),
             catch: catchServiceExceptions(fnOptions.errorTags),
-        });
+        }), Scope.close);
     });
 };
 /**
  * @since 0.1.0
  * @category constructors
  */
-export const fromCommandsAndServiceFn = (commands, serviceFnMaker) => Record.mapEntries(commands, (CommandCtor, command) => {
-    const ExtendedCommand = class extends CommandCtor {
-        config;
-        constructor(args, config) {
-            super(args);
-            this.config = config;
-        }
-        resolveMiddleware(stack, configuration, options) {
-            return this.config?.logger
-                ? super.resolveMiddleware(stack, { ...configuration, logger: this.config.logger }, options)
-                : super.resolveMiddleware(stack, configuration, options);
-        }
-    };
-    const serviceFnName = String.uncapitalize(command).replace(/Command$/, "");
-    return [serviceFnName, serviceFnMaker(ExtendedCommand)];
+export const fromCommandsAndServiceFn = (commands, serviceFnMaker) => Effect.gen(function* () {
+    const maybeRequestHandler = yield* Effect.serviceOption(HttpHandler.RequestHandler);
+    return pipe(commands, Record.filter(Boolean), Record.mapEntries((CommandCtor, command) => {
+        const ExtendedCommand = class extends CommandCtor {
+            config;
+            runtimeOptions;
+            constructor(args, config, runtimeOptions) {
+                super(args);
+                this.config = config;
+                this.runtimeOptions = runtimeOptions;
+            }
+            resolveMiddleware(stack, configuration, options) {
+                return super.resolveMiddleware(stack, {
+                    ...configuration,
+                    ...(this.config.logger ? { logger: this.config.logger } : {}),
+                    ...(Option.isSome(maybeRequestHandler)
+                        ? { requestHandler: HttpHandler.toClientRequestHandler(maybeRequestHandler.value, this.runtimeOptions) }
+                        : {}),
+                }, options);
+            }
+        };
+        const serviceFnName = String.uncapitalize(command).replace(/Command$/, "");
+        return [serviceFnName, serviceFnMaker(ExtendedCommand)];
+    }));
 });
 /**
  * @since 0.1.0

package/dist/esm/Service.js.map

@@ -1 +1 @@
-{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/Service.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.js

@@ -14,4 +14,8 @@ export * from "./Errors.js";
  * @since 0.1.0
  */
 export * from "./Types.js";
+/**
+ * @since 0.3.0
+ */
+export * as HttpHandler from "./HttpHandler.js";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,cAAc,YAAY,CAAC;AAE3B;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC"}

package/dist/esm/internal/httpHandler.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=httpHandler.js.map

package/dist/esm/internal/httpHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpHandler.js","sourceRoot":"","sources":["../../../src/internal/httpHandler.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-aws/commons",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Effectful AWS common library",
   "license": "MIT",
   "repository": {
@@ -15,8 +15,9 @@
   },
   "homepage": "https://floydspace.github.io/effect-aws/docs/commons",
   "dependencies": {
-    "@smithy/smithy-client": "^4.1.6",
-    "@smithy/types": "^4.1.0"
+    "@smithy/protocol-http": "^5.3.5",
+    "@smithy/smithy-client": "^4.9.9",
+    "@smithy/types": "^4.9.0"
   },
   "peerDependencies": {
     "effect": ">=3.0.4 <4.0.0"
@@ -36,6 +37,11 @@
       "import": "./dist/esm/Errors.js",
       "default": "./dist/cjs/Errors.js"
     },
+    "./HttpHandler": {
+      "types": "./dist/dts/HttpHandler.d.ts",
+      "import": "./dist/esm/HttpHandler.js",
+      "default": "./dist/cjs/HttpHandler.js"
+    },
     "./Service": {
       "types": "./dist/dts/Service.d.ts",
       "import": "./dist/esm/Service.js",
@@ -57,6 +63,9 @@
       "Errors": [
         "./dist/dts/Errors.d.ts"
       ],
+      "HttpHandler": [
+        "./dist/dts/HttpHandler.d.ts"
+      ],
       "Service": [
         "./dist/dts/Service.d.ts"
       ],

package/src/HttpHandler.ts

@@ -0,0 +1,69 @@
+/**
+ * @since 0.3.0
+ */
+import type { HttpRequest, HttpResponse } from "@smithy/protocol-http";
+import type { HttpHandlerOptions, RequestHandler as ClientRequestHandler, RequestHandlerOutput } from "@smithy/types";
+import type { Cause, Effect } from "effect";
+import { Context, Runtime, Scope } from "effect";
+import type { RuntimeOptions } from "./internal/httpHandler.js";
+
+const TypeId = Symbol.for("@effect-aws/commons/RequestHandler");
+
+type RequestHandlerConstructorProps = {
+  readonly handle: (
+    request: HttpRequest,
+    handlerOptions?: HttpHandlerOptions,
+  ) => Effect.Effect<
+    RequestHandlerOutput<HttpResponse>,
+    Cause.TimeoutException,
+    Scope.Scope
+  >;
+};
+
+/**
+ * @since 0.3.0
+ * @category model
+ */
+export interface RequestHandler extends RequestHandlerConstructorProps {
+  readonly [TypeId]: typeof TypeId;
+}
+
+/**
+ * @since 0.3.0
+ * @category tag
+ */
+export const RequestHandler = Context.GenericTag<RequestHandler>("@effect-aws/commons/RequestHandler");
+
+const proto = {
+  [TypeId]: TypeId,
+};
+
+/**
+ * @since 0.3.0
+ * @category constructors
+ */
+export const make = (options: RequestHandlerConstructorProps): RequestHandler =>
+  Object.assign(Object.create(proto), options);
+
+/**
+ * @since 0.3.0
+ * @category adapters
+ */
+export const toClientRequestHandler = (
+  requestHandler: RequestHandler,
+  config: RuntimeOptions,
+): ClientRequestHandler<HttpRequest, HttpResponse, HttpHandlerOptions> => {
+  const runPromise = Runtime.runPromise(config.runtime);
+  const scoped = Scope.extend(config.scope);
+
+  class HttpHandler implements ClientRequestHandler<HttpRequest, HttpResponse, HttpHandlerOptions> {
+    handle(request: HttpRequest, options: HttpHandlerOptions = {}) {
+      return runPromise(
+        requestHandler.handle(request, options).pipe(scoped),
+        { signal: options.abortSignal as AbortSignal },
+      );
+    }
+  }
+
+  return new HttpHandler();
+};

package/src/Service.ts

@@ -1,15 +1,41 @@
 /**
  * @since 0.1.0
  */
+import type { CommandImpl, SmithyResolvedConfiguration } from "@smithy/smithy-client";
 import { ServiceException } from "@smithy/smithy-client";
-import type { Client, MiddlewareStack } from "@smithy/types";
+import type { Client, HandlerOptions, Logger, MiddlewareStack, RequestHandler } from "@smithy/types";
 import type { Array } from "effect";
-import { Data, Effect, Record, String } from "effect";
+import { Cause, Data, Effect, Option, pipe, Record, Runtime, Scope, String } from "effect";
 import type { TaggedException } from "./Errors.js";
 import { SdkError } from "./Errors.js";
-import type { BaseResolvedConfig, CommandCtor, LoggerResolvedConfig } from "./internal/service.js";
+import * as HttpHandler from "./HttpHandler.js";
+import type { RuntimeOptions } from "./internal/httpHandler.js";
 import type { HttpHandlerOptions } from "./Types.js";
 
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export interface LoggerResolvedConfig {
+  logger?: Logger;
+}
+
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export interface BaseResolvedConfig
+  extends Required<LoggerResolvedConfig>, SmithyResolvedConfiguration<HandlerOptions>
+{
+  requestHandler: RequestHandler<any, any, any>;
+}
+
+/**
+ * @since 0.3.0
+ * @category models
+ */
+export type CommandCtor<I> = new(input: I, ...args: Array<any>) => CommandImpl<I, any, BaseResolvedConfig>;
+
 type ServiceFnOptions = {
   errorTags?: Array.NonEmptyReadonlyArray<string>;
   resolveClientConfig: Effect.Effect<LoggerResolvedConfig>;
@@ -26,6 +52,12 @@ export const catchServiceExceptions = (errorTags?: Array.NonEmptyReadonlyArray<s
     return ServiceException({ ...e, message: e.message, stack: e.stack });
   }
   if (e instanceof Error) {
+    if (Runtime.isFiberFailure(e) && Cause.isFailType(e[Runtime.FiberFailureCauseId])) {
+      return e[Runtime.FiberFailureCauseId].error;
+    }
+    if (e.name === "TimeoutError") {
+      return new Cause.TimeoutException(e.message);
+    }
     return SdkError({ ...e, name: "SdkError", message: e.message, stack: e.stack });
   }
   throw e;
@@ -43,10 +75,18 @@ export const makeServiceFn = (
   return (args: any, options?: HttpHandlerOptions) =>
     Effect.gen(function*() {
       const config = yield* fnOptions.resolveClientConfig;
-      return yield* Effect.tryPromise({
-        try: (abortSignal) => client.send(new CommandCtor(args, config), { ...(options ?? {}), abortSignal }),
-        catch: catchServiceExceptions(fnOptions.errorTags),
-      });
+      const runtime = yield* Effect.runtime();
+
+      return yield* Effect.acquireUseRelease(
+        Scope.make(),
+        (scope) =>
+          Effect.tryPromise({
+            try: (abortSignal) =>
+              client.send(new CommandCtor(args, config, { runtime, scope }), { ...(options ?? {}), abortSignal }),
+            catch: catchServiceExceptions(fnOptions.errorTags),
+          }),
+        Scope.close,
+      );
     });
 };
 
@@ -57,27 +97,43 @@ export const makeServiceFn = (
 export const fromCommandsAndServiceFn = <Service>(
   commands: Record<string, CommandCtor<any>>,
   serviceFnMaker: (CommandCtor: CommandCtor<any>) => ReturnType<typeof makeServiceFn>,
-): Service =>
-  Record.mapEntries(commands, (CommandCtor, command) => {
-    const ExtendedCommand = class extends CommandCtor {
-      constructor(args: any, private config?: LoggerResolvedConfig) {
-        super(args);
-      }
+): Effect.Effect<Service> =>
+  Effect.gen(function*() {
+    const maybeRequestHandler = yield* Effect.serviceOption(HttpHandler.RequestHandler);
+
+    return pipe(
+      commands,
+      Record.filter(Boolean),
+      Record.mapEntries((CommandCtor, command) => {
+        const ExtendedCommand = class extends CommandCtor {
+          constructor(
+            args: any,
+            private config: LoggerResolvedConfig,
+            private runtimeOptions: RuntimeOptions,
+          ) {
+            super(args);
+          }
 
-      resolveMiddleware(
-        stack: MiddlewareStack<any, any>,
-        configuration: BaseResolvedConfig,
-        options: any,
-      ) {
-        return this.config?.logger
-          ? super.resolveMiddleware(stack, { ...configuration, logger: this.config.logger }, options)
-          : super.resolveMiddleware(stack, configuration, options);
-      }
-    };
+          resolveMiddleware(
+            stack: MiddlewareStack<any, any>,
+            configuration: BaseResolvedConfig,
+            options: any,
+          ) {
+            return super.resolveMiddleware(stack, {
+              ...configuration,
+              ...(this.config.logger ? { logger: this.config.logger } : {}),
+              ...(Option.isSome(maybeRequestHandler)
+                ? { requestHandler: HttpHandler.toClientRequestHandler(maybeRequestHandler.value, this.runtimeOptions) }
+                : {}),
+            }, options);
+          }
+        };
 
-    const serviceFnName = String.uncapitalize(command).replace(/Command$/, "");
-    return [serviceFnName, serviceFnMaker(ExtendedCommand)];
-  }) as Service;
+        const serviceFnName = String.uncapitalize(command).replace(/Command$/, "");
+        return [serviceFnName, serviceFnMaker(ExtendedCommand)];
+      }),
+    ) as Service;
+  });
 
 /**
  * @since 0.1.0
@@ -87,4 +143,5 @@ export const fromClientAndCommands = <Service>(
   client: Client<any, any, BaseResolvedConfig>,
   commands: Record<string, CommandCtor<any>>,
   options: ServiceFnOptions,
-): Service => fromCommandsAndServiceFn(commands, (CommandCtor) => makeServiceFn(client, CommandCtor, options));
+): Effect.Effect<Service> =>
+  fromCommandsAndServiceFn(commands, (CommandCtor) => makeServiceFn(client, CommandCtor, options));

package/src/index.ts

@@ -17,3 +17,8 @@ export * from "./Errors.js";
  * @since 0.1.0
  */
 export * from "./Types.js";
+
+/**
+ * @since 0.3.0
+ */
+export * as HttpHandler from "./HttpHandler.js";

package/src/internal/httpHandler.ts

@@ -0,0 +1,6 @@
+import type { Runtime, Scope } from "effect";
+
+export interface RuntimeOptions {
+  runtime: Runtime.Runtime<never>;
+  scope: Scope.Scope;
+}

package/dist/cjs/internal/service.d.ts

@@ -1,10 +0,0 @@
-import type { CommandImpl, SmithyResolvedConfiguration } from "@smithy/smithy-client";
-import type { HandlerOptions, Logger, RequestHandler } from "@smithy/types";
-export interface LoggerResolvedConfig {
-    logger?: Logger;
-}
-export interface BaseResolvedConfig extends Required<LoggerResolvedConfig>, SmithyResolvedConfiguration<HandlerOptions> {
-    requestHandler: RequestHandler<any, any, any>;
-}
-export type CommandCtor<I> = new (input: I, ...args: Array<any>) => CommandImpl<I, any, BaseResolvedConfig>;
-//# sourceMappingURL=service.d.ts.map

package/dist/cjs/internal/service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/internal/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBACf,SAAQ,QAAQ,CAAC,oBAAoB,CAAC,EAAE,2BAA2B,CAAC,cAAc,CAAC;IAEnF,cAAc,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAC/C;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,KAAI,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC"}

package/dist/cjs/internal/service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/internal/service.ts"],"names":[],"mappings":""}

package/dist/dts/internal/service.d.ts

@@ -1,10 +0,0 @@
-import type { CommandImpl, SmithyResolvedConfiguration } from "@smithy/smithy-client";
-import type { HandlerOptions, Logger, RequestHandler } from "@smithy/types";
-export interface LoggerResolvedConfig {
-    logger?: Logger;
-}
-export interface BaseResolvedConfig extends Required<LoggerResolvedConfig>, SmithyResolvedConfiguration<HandlerOptions> {
-    requestHandler: RequestHandler<any, any, any>;
-}
-export type CommandCtor<I> = new (input: I, ...args: Array<any>) => CommandImpl<I, any, BaseResolvedConfig>;
-//# sourceMappingURL=service.d.ts.map

package/dist/dts/internal/service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/internal/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBACf,SAAQ,QAAQ,CAAC,oBAAoB,CAAC,EAAE,2BAA2B,CAAC,cAAc,CAAC;IAEnF,cAAc,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAC/C;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,KAAI,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC"}

package/dist/esm/internal/service.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=service.js.map

package/dist/esm/internal/service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/internal/service.ts"],"names":[],"mappings":""}

package/src/internal/service.ts

@@ -1,14 +0,0 @@
-import type { CommandImpl, SmithyResolvedConfiguration } from "@smithy/smithy-client";
-import type { HandlerOptions, Logger, RequestHandler } from "@smithy/types";
-
-export interface LoggerResolvedConfig {
-  logger?: Logger;
-}
-
-export interface BaseResolvedConfig
-  extends Required<LoggerResolvedConfig>, SmithyResolvedConfiguration<HandlerOptions>
-{
-  requestHandler: RequestHandler<any, any, any>;
-}
-
-export type CommandCtor<I> = new(input: I, ...args: Array<any>) => CommandImpl<I, any, BaseResolvedConfig>;