@smithy/fetch-http-handler 3.2.9 → 4.1.0

package/dist-cjs/create-request.js

@@ -0,0 +1 @@
+module.exports = require("./index.js");

package/dist-cjs/index.js

@@ -30,6 +30,12 @@ module.exports = __toCommonJS(src_exports);
 var import_protocol_http = require("@smithy/protocol-http");
 var import_querystring_builder = require("@smithy/querystring-builder");
 
+// src/create-request.ts
+function createRequest(url, requestOptions) {
+  return new Request(url, requestOptions);
+}
+__name(createRequest, "createRequest");
+
 // src/request-timeout.ts
 function requestTimeout(timeoutInMs = 0) {
   return new Promise((resolve, reject) => {
@@ -68,7 +74,7 @@ var _FetchHttpHandler = class _FetchHttpHandler {
     }
     if (keepAliveSupport.supported === void 0) {
       keepAliveSupport.supported = Boolean(
-        typeof Request !== "undefined" && "keepalive" in new Request("https://[::1]")
+        typeof Request !== "undefined" && "keepalive" in createRequest("https://[::1]")
       );
     }
   }
@@ -127,7 +133,7 @@ var _FetchHttpHandler = class _FetchHttpHandler {
     }
     let removeSignalEventListener = /* @__PURE__ */ __name(() => {
     }, "removeSignalEventListener");
-    const fetchRequest = new Request(url, requestOptions);
+    const fetchRequest = createRequest(url, requestOptions);
     const raceOfPromises = [
       fetch(fetchRequest).then((response) => {
         const fetchHeaders = response.headers;
@@ -192,19 +198,13 @@ __name(_FetchHttpHandler, "FetchHttpHandler");
 var FetchHttpHandler = _FetchHttpHandler;
 
 // src/stream-collector.ts
-var import_util_base64 = require("@smithy/util-base64");
-var streamCollector = /* @__PURE__ */ __name((stream) => {
-  if (typeof Blob === "function" && stream instanceof Blob) {
-    return collectBlob(stream);
+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());
   }
   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,24 +227,6 @@ 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/create-request.js

@@ -0,0 +1,3 @@
+export function createRequest(url, requestOptions) {
+    return new Request(url, requestOptions);
+}

package/dist-es/fetch-http-handler.js

@@ -1,5 +1,6 @@
 import { HttpResponse } from "@smithy/protocol-http";
 import { buildQueryString } from "@smithy/querystring-builder";
+import { createRequest } from "./create-request";
 import { requestTimeout } from "./request-timeout";
 export const keepAliveSupport = {
     supported: undefined,
@@ -20,7 +21,7 @@ export class FetchHttpHandler {
             this.configProvider = Promise.resolve(this.config);
         }
         if (keepAliveSupport.supported === undefined) {
-            keepAliveSupport.supported = Boolean(typeof Request !== "undefined" && "keepalive" in new Request("https://[::1]"));
+            keepAliveSupport.supported = Boolean(typeof Request !== "undefined" && "keepalive" in createRequest("https://[::1]"));
         }
     }
     destroy() {
@@ -76,7 +77,7 @@ export class FetchHttpHandler {
             Object.assign(requestOptions, this.config.requestInit(request));
         }
         let removeSignalEventListener = () => { };
-        const fetchRequest = new Request(url, requestOptions);
+        const fetchRequest = createRequest(url, requestOptions);
         const raceOfPromises = [
             fetch(fetchRequest).then((response) => {
                 const fetchHeaders = response.headers;

package/dist-es/stream-collector.js

@@ -1,15 +1,9 @@
-import { fromBase64 } from "@smithy/util-base64";
-export const streamCollector = (stream) => {
-    if (typeof Blob === "function" && stream instanceof Blob) {
-        return collectBlob(stream);
+export const streamCollector = async (stream) => {
+    if ((typeof Blob === "function" && stream instanceof Blob) || stream.constructor?.name === "Blob") {
+        return new Uint8Array(await stream.arrayBuffer());
     }
     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();
@@ -31,20 +25,3 @@ 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/create-request.d.ts

@@ -0,0 +1,6 @@
+import { AdditionalRequestParameters } from "./fetch-http-handler";
+/**
+ * @internal
+ * For mocking/interception.
+ */
+export declare function createRequest(url: string, requestOptions?: RequestInit & AdditionalRequestParameters): Request;

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

@@ -10,6 +10,12 @@ type FetchHttpHandlerConfig = FetchHttpHandlerOptions;
 export declare const keepAliveSupport: {
     supported: boolean | undefined;
 };
+/**
+ * @internal
+ */
+export type AdditionalRequestParameters = {
+    duplex?: "half";
+};
 /**
  * @public
  *

package/dist-types/ts3.4/create-request.d.ts

@@ -0,0 +1,6 @@
+import { AdditionalRequestParameters } from "./fetch-http-handler";
+/**
+ * @internal
+ * For mocking/interception.
+ */
+export declare function createRequest(url: string, requestOptions?: RequestInit & AdditionalRequestParameters): Request;

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

@@ -10,6 +10,12 @@ type FetchHttpHandlerConfig = FetchHttpHandlerOptions;
 export declare const keepAliveSupport: {
     supported: boolean | undefined;
 };
+/**
+ * @internal
+ */
+export type AdditionalRequestParameters = {
+    duplex?: "half";
+};
 /**
  * @public
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/fetch-http-handler",
-  "version": "3.2.9",
+  "version": "4.1.0",
   "description": "Provides a way to make requests",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
@@ -13,7 +13,10 @@
     "lint": "eslint -c ../../.eslintrc.js \"src/**/*.ts\"",
     "format": "prettier --config ../../prettier.config.js --ignore-path ../.prettierignore --write \"**/*.{ts,md,json}\"",
     "extract:docs": "api-extractor run --local",
-    "test": "yarn g:jest --coverage --forceExit && yarn g:karma start karma.conf.js"
+    "test": "yarn g:vitest run && yarn test:browser",
+    "test:watch": "yarn g:vitest watch",
+    "test:browser": "yarn g:vitest run -c vitest.config.browser.ts",
+    "test:browser:watch": "yarn g:vitest watch -c vitest.config.browser.ts"
   },
   "author": {
     "name": "AWS SDK for JavaScript Team",
@@ -24,14 +27,14 @@
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "dependencies": {
-    "@smithy/protocol-http": "^4.1.4",
-    "@smithy/querystring-builder": "^3.0.7",
-    "@smithy/types": "^3.5.0",
+    "@smithy/protocol-http": "^4.1.6",
+    "@smithy/querystring-builder": "^3.0.9",
+    "@smithy/types": "^3.7.0",
     "@smithy/util-base64": "^3.0.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@smithy/abort-controller": "^3.1.5",
+    "@smithy/abort-controller": "^3.1.7",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",