@smithy/fetch-http-handler 4.1.2 → 5.0.0

package/dist-cjs/index.js

@@ -54,13 +54,16 @@ __name(requestTimeout, "requestTimeout");
 var keepAliveSupport = {
   supported: void 0
 };
-var _FetchHttpHandler = class _FetchHttpHandler {
+var FetchHttpHandler = class _FetchHttpHandler {
+  static {
+    __name(this, "FetchHttpHandler");
+  }
   /**
    * @returns the input if it is an HttpHandler of any class,
    * or instantiates a new instance of this handler.
    */
   static create(instanceOrOptions) {
-    if (typeof (instanceOrOptions == null ? void 0 : instanceOrOptions.handle) === "function") {
+    if (typeof instanceOrOptions?.handle === "function") {
       return instanceOrOptions;
     }
     return new _FetchHttpHandler(instanceOrOptions);
@@ -81,14 +84,13 @@ var _FetchHttpHandler = class _FetchHttpHandler {
   destroy() {
   }
   async handle(request, { abortSignal } = {}) {
-    var _a;
     if (!this.config) {
       this.config = await this.configProvider;
     }
     const requestTimeoutInMs = this.config.requestTimeout;
     const keepAlive = this.config.keepAlive === true;
     const credentials = this.config.credentials;
-    if (abortSignal == null ? void 0 : abortSignal.aborted) {
+    if (abortSignal?.aborted) {
       const abortError = new Error("Request aborted");
       abortError.name = "AbortError";
       return Promise.reject(abortError);
@@ -116,7 +118,7 @@ var _FetchHttpHandler = class _FetchHttpHandler {
       method,
       credentials
     };
-    if ((_a = this.config) == null ? void 0 : _a.cache) {
+    if (this.config?.cache) {
       requestOptions.cache = this.config.cache;
     }
     if (body) {
@@ -194,17 +196,24 @@ var _FetchHttpHandler = class _FetchHttpHandler {
     return this.config ?? {};
   }
 };
-__name(_FetchHttpHandler, "FetchHttpHandler");
-var FetchHttpHandler = _FetchHttpHandler;
 
 // src/stream-collector.ts
+var import_util_base64 = require("@smithy/util-base64");
 var streamCollector = /* @__PURE__ */ __name(async (stream) => {
-  var _a;
-  if (typeof Blob === "function" && stream instanceof Blob || ((_a = stream.constructor) == null ? void 0 : _a.name) === "Blob") {
-    return new Uint8Array(await stream.arrayBuffer());
+  if (typeof Blob === "function" && stream instanceof Blob || stream.constructor?.name === "Blob") {
+    if (Blob.prototype.arrayBuffer !== void 0) {
+      return new Uint8Array(await stream.arrayBuffer());
+    }
+    return collectBlob(stream);
   }
   return collectStream(stream);
 }, "streamCollector");
+async function collectBlob(blob) {
+  const base64 = await readToBase64(blob);
+  const arrayBuffer = (0, import_util_base64.fromBase64)(base64);
+  return new Uint8Array(arrayBuffer);
+}
+__name(collectBlob, "collectBlob");
 async function collectStream(stream) {
   const chunks = [];
   const reader = stream.getReader();
@@ -227,6 +236,24 @@ async function collectStream(stream) {
   return collected;
 }
 __name(collectStream, "collectStream");
+function readToBase64(blob) {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onloadend = () => {
+      if (reader.readyState !== 2) {
+        return reject(new Error("Reader aborted too early"));
+      }
+      const result = reader.result ?? "";
+      const commaIndex = result.indexOf(",");
+      const dataOffset = commaIndex > -1 ? commaIndex + 1 : result.length;
+      resolve(result.substring(dataOffset));
+    };
+    reader.onabort = () => reject(new Error("Read aborted"));
+    reader.onerror = () => reject(reader.error);
+    reader.readAsDataURL(blob);
+  });
+}
+__name(readToBase64, "readToBase64");
 // Annotate the CommonJS export names for ESM import in node:
 
 0 && (module.exports = {

package/dist-es/stream-collector.js

@@ -1,9 +1,18 @@
+import { fromBase64 } from "@smithy/util-base64";
 export const streamCollector = async (stream) => {
     if ((typeof Blob === "function" && stream instanceof Blob) || stream.constructor?.name === "Blob") {
-        return new Uint8Array(await stream.arrayBuffer());
+        if (Blob.prototype.arrayBuffer !== undefined) {
+            return new Uint8Array(await stream.arrayBuffer());
+        }
+        return collectBlob(stream);
     }
     return collectStream(stream);
 };
+async function collectBlob(blob) {
+    const base64 = await readToBase64(blob);
+    const arrayBuffer = fromBase64(base64);
+    return new Uint8Array(arrayBuffer);
+}
 async function collectStream(stream) {
     const chunks = [];
     const reader = stream.getReader();
@@ -25,3 +34,20 @@ async function collectStream(stream) {
     }
     return collected;
 }
+function readToBase64(blob) {
+    return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onloadend = () => {
+            if (reader.readyState !== 2) {
+                return reject(new Error("Reader aborted too early"));
+            }
+            const result = (reader.result ?? "");
+            const commaIndex = result.indexOf(",");
+            const dataOffset = commaIndex > -1 ? commaIndex + 1 : result.length;
+            resolve(result.substring(dataOffset));
+        };
+        reader.onabort = () => reject(new Error("Read aborted"));
+        reader.onerror = () => reject(reader.error);
+        reader.readAsDataURL(blob);
+    });
+}

package/dist-types/fetch-http-handler.d.ts

@@ -1,8 +1,10 @@
 import { HttpHandler, HttpRequest, HttpResponse } from "@smithy/protocol-http";
 import type { FetchHttpHandlerOptions } from "@smithy/types";
 import { HttpHandlerOptions, Provider } from "@smithy/types";
+/**
+ * @public
+ */
 export { FetchHttpHandlerOptions };
-type FetchHttpHandlerConfig = FetchHttpHandlerOptions;
 /**
  * @internal
  * Detection of keepalive support. Can be overridden for testing.
@@ -21,7 +23,7 @@ export type AdditionalRequestParameters = {
  *
  * HttpHandler implementation using browsers' `fetch` global function.
  */
-export declare class FetchHttpHandler implements HttpHandler<FetchHttpHandlerConfig> {
+export declare class FetchHttpHandler implements HttpHandler<FetchHttpHandlerOptions> {
     private config?;
     private configProvider;
     /**
@@ -34,6 +36,6 @@ export declare class FetchHttpHandler implements HttpHandler<FetchHttpHandlerCon
     handle(request: HttpRequest, { abortSignal }?: HttpHandlerOptions): Promise<{
         response: HttpResponse;
     }>;
-    updateHttpClientConfig(key: keyof FetchHttpHandlerConfig, value: FetchHttpHandlerConfig[typeof key]): void;
-    httpHandlerConfigs(): FetchHttpHandlerConfig;
+    updateHttpClientConfig(key: keyof FetchHttpHandlerOptions, value: FetchHttpHandlerOptions[typeof key]): void;
+    httpHandlerConfigs(): FetchHttpHandlerOptions;
 }

package/dist-types/ts3.4/fetch-http-handler.d.ts

@@ -1,8 +1,10 @@
 import { HttpHandler, HttpRequest, HttpResponse } from "@smithy/protocol-http";
 import { FetchHttpHandlerOptions } from "@smithy/types";
 import { HttpHandlerOptions, Provider } from "@smithy/types";
+/**
+ * @public
+ */
 export { FetchHttpHandlerOptions };
-type FetchHttpHandlerConfig = FetchHttpHandlerOptions;
 /**
  * @internal
  * Detection of keepalive support. Can be overridden for testing.
@@ -21,7 +23,7 @@ export type AdditionalRequestParameters = {
  *
  * HttpHandler implementation using browsers' `fetch` global function.
  */
-export declare class FetchHttpHandler implements HttpHandler<FetchHttpHandlerConfig> {
+export declare class FetchHttpHandler implements HttpHandler<FetchHttpHandlerOptions> {
     private config?;
     private configProvider;
     /**
@@ -34,6 +36,6 @@ export declare class FetchHttpHandler implements HttpHandler<FetchHttpHandlerCon
     handle(request: HttpRequest, { abortSignal }?: HttpHandlerOptions): Promise<{
         response: HttpResponse;
     }>;
-    updateHttpClientConfig(key: keyof FetchHttpHandlerConfig, value: FetchHttpHandlerConfig[typeof key]): void;
-    httpHandlerConfigs(): FetchHttpHandlerConfig;
+    updateHttpClientConfig(key: keyof FetchHttpHandlerOptions, value: FetchHttpHandlerOptions[typeof key]): void;
+    httpHandlerConfigs(): FetchHttpHandlerOptions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/fetch-http-handler",
-  "version": "4.1.2",
+  "version": "5.0.0",
   "description": "Provides a way to make requests",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
@@ -27,14 +27,14 @@
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "dependencies": {
-    "@smithy/protocol-http": "^4.1.8",
-    "@smithy/querystring-builder": "^3.0.11",
-    "@smithy/types": "^3.7.2",
-    "@smithy/util-base64": "^3.0.0",
+    "@smithy/protocol-http": "^5.0.0",
+    "@smithy/querystring-builder": "^4.0.0",
+    "@smithy/types": "^4.0.0",
+    "@smithy/util-base64": "^4.0.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@smithy/abort-controller": "^3.1.9",
+    "@smithy/abort-controller": "^4.0.0",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",
@@ -61,5 +61,8 @@
   },
   "publishConfig": {
     "directory": ".release/package"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }