@smithy/fetch-http-handler 2.3.1 → 2.4.0

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

@@ -1,117 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FetchHttpHandler = exports.keepAliveSupport = void 0;
-const protocol_http_1 = require("@smithy/protocol-http");
-const querystring_builder_1 = require("@smithy/querystring-builder");
-const request_timeout_1 = require("./request-timeout");
-exports.keepAliveSupport = {
-    supported: Boolean(typeof Request !== "undefined" && "keepalive" in new Request("https://[::1]")),
-};
-class FetchHttpHandler {
-    static create(instanceOrOptions) {
-        if (typeof (instanceOrOptions === null || instanceOrOptions === void 0 ? void 0 : instanceOrOptions.handle) === "function") {
-            return instanceOrOptions;
-        }
-        return new FetchHttpHandler(instanceOrOptions);
-    }
-    constructor(options) {
-        if (typeof options === "function") {
-            this.configProvider = options().then((opts) => opts || {});
-        }
-        else {
-            this.config = options !== null && options !== void 0 ? options : {};
-            this.configProvider = Promise.resolve(this.config);
-        }
-    }
-    destroy() {
-    }
-    async handle(request, { abortSignal } = {}) {
-        var _a, _b;
-        if (!this.config) {
-            this.config = await this.configProvider;
-        }
-        const requestTimeoutInMs = this.config.requestTimeout;
-        const keepAlive = this.config.keepAlive === true;
-        if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
-            const abortError = new Error("Request aborted");
-            abortError.name = "AbortError";
-            return Promise.reject(abortError);
-        }
-        let path = request.path;
-        const queryString = (0, querystring_builder_1.buildQueryString)(request.query || {});
-        if (queryString) {
-            path += `?${queryString}`;
-        }
-        if (request.fragment) {
-            path += `#${request.fragment}`;
-        }
-        let auth = "";
-        if (request.username != null || request.password != null) {
-            const username = (_a = request.username) !== null && _a !== void 0 ? _a : "";
-            const password = (_b = request.password) !== null && _b !== void 0 ? _b : "";
-            auth = `${username}:${password}@`;
-        }
-        const { port, method } = request;
-        const url = `${request.protocol}//${auth}${request.hostname}${port ? `:${port}` : ""}${path}`;
-        const body = method === "GET" || method === "HEAD" ? undefined : request.body;
-        const requestOptions = { body, headers: new Headers(request.headers), method: method };
-        if (typeof AbortController !== "undefined") {
-            requestOptions["signal"] = abortSignal;
-        }
-        if (exports.keepAliveSupport.supported) {
-            requestOptions["keepalive"] = keepAlive;
-        }
-        const fetchRequest = new Request(url, requestOptions);
-        const raceOfPromises = [
-            fetch(fetchRequest).then((response) => {
-                const fetchHeaders = response.headers;
-                const transformedHeaders = {};
-                for (const pair of fetchHeaders.entries()) {
-                    transformedHeaders[pair[0]] = pair[1];
-                }
-                const hasReadableStream = response.body != undefined;
-                if (!hasReadableStream) {
-                    return response.blob().then((body) => ({
-                        response: new protocol_http_1.HttpResponse({
-                            headers: transformedHeaders,
-                            reason: response.statusText,
-                            statusCode: response.status,
-                            body,
-                        }),
-                    }));
-                }
-                return {
-                    response: new protocol_http_1.HttpResponse({
-                        headers: transformedHeaders,
-                        reason: response.statusText,
-                        statusCode: response.status,
-                        body: response.body,
-                    }),
-                };
-            }),
-            (0, request_timeout_1.requestTimeout)(requestTimeoutInMs),
-        ];
-        if (abortSignal) {
-            raceOfPromises.push(new Promise((resolve, reject) => {
-                abortSignal.onabort = () => {
-                    const abortError = new Error("Request aborted");
-                    abortError.name = "AbortError";
-                    reject(abortError);
-                };
-            }));
-        }
-        return Promise.race(raceOfPromises);
-    }
-    updateHttpClientConfig(key, value) {
-        this.config = undefined;
-        this.configProvider = this.configProvider.then((config) => {
-            config[key] = value;
-            return config;
-        });
-    }
-    httpHandlerConfigs() {
-        var _a;
-        return (_a = this.config) !== null && _a !== void 0 ? _a : {};
-    }
-}
-exports.FetchHttpHandler = FetchHttpHandler;
+module.exports = require("./index.js");

package/dist-cjs/index.js

@@ -1,5 +1,218 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./fetch-http-handler"), exports);
-tslib_1.__exportStar(require("./stream-collector"), exports);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  FetchHttpHandler: () => FetchHttpHandler,
+  keepAliveSupport: () => keepAliveSupport,
+  streamCollector: () => streamCollector
+});
+module.exports = __toCommonJS(src_exports);
+
+// src/fetch-http-handler.ts
+var import_protocol_http = require("@smithy/protocol-http");
+var import_querystring_builder = require("@smithy/querystring-builder");
+
+// src/request-timeout.ts
+function requestTimeout(timeoutInMs = 0) {
+  return new Promise((resolve, reject) => {
+    if (timeoutInMs) {
+      setTimeout(() => {
+        const timeoutError = new Error(`Request did not complete within ${timeoutInMs} ms`);
+        timeoutError.name = "TimeoutError";
+        reject(timeoutError);
+      }, timeoutInMs);
+    }
+  });
+}
+__name(requestTimeout, "requestTimeout");
+
+// src/fetch-http-handler.ts
+var keepAliveSupport = {
+  supported: Boolean(typeof Request !== "undefined" && "keepalive" in new Request("https://[::1]"))
+};
+var _FetchHttpHandler = class _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") {
+      return instanceOrOptions;
+    }
+    return new _FetchHttpHandler(instanceOrOptions);
+  }
+  constructor(options) {
+    if (typeof options === "function") {
+      this.configProvider = options().then((opts) => opts || {});
+    } else {
+      this.config = options ?? {};
+      this.configProvider = Promise.resolve(this.config);
+    }
+  }
+  destroy() {
+  }
+  async handle(request, { abortSignal } = {}) {
+    if (!this.config) {
+      this.config = await this.configProvider;
+    }
+    const requestTimeoutInMs = this.config.requestTimeout;
+    const keepAlive = this.config.keepAlive === true;
+    if (abortSignal == null ? void 0 : abortSignal.aborted) {
+      const abortError = new Error("Request aborted");
+      abortError.name = "AbortError";
+      return Promise.reject(abortError);
+    }
+    let path = request.path;
+    const queryString = (0, import_querystring_builder.buildQueryString)(request.query || {});
+    if (queryString) {
+      path += `?${queryString}`;
+    }
+    if (request.fragment) {
+      path += `#${request.fragment}`;
+    }
+    let auth = "";
+    if (request.username != null || request.password != null) {
+      const username = request.username ?? "";
+      const password = request.password ?? "";
+      auth = `${username}:${password}@`;
+    }
+    const { port, method } = request;
+    const url = `${request.protocol}//${auth}${request.hostname}${port ? `:${port}` : ""}${path}`;
+    const body = method === "GET" || method === "HEAD" ? void 0 : request.body;
+    const requestOptions = { body, headers: new Headers(request.headers), method };
+    if (typeof AbortController !== "undefined") {
+      requestOptions["signal"] = abortSignal;
+    }
+    if (keepAliveSupport.supported) {
+      requestOptions["keepalive"] = keepAlive;
+    }
+    const fetchRequest = new Request(url, requestOptions);
+    const raceOfPromises = [
+      fetch(fetchRequest).then((response) => {
+        const fetchHeaders = response.headers;
+        const transformedHeaders = {};
+        for (const pair of fetchHeaders.entries()) {
+          transformedHeaders[pair[0]] = pair[1];
+        }
+        const hasReadableStream = response.body != void 0;
+        if (!hasReadableStream) {
+          return response.blob().then((body2) => ({
+            response: new import_protocol_http.HttpResponse({
+              headers: transformedHeaders,
+              reason: response.statusText,
+              statusCode: response.status,
+              body: body2
+            })
+          }));
+        }
+        return {
+          response: new import_protocol_http.HttpResponse({
+            headers: transformedHeaders,
+            reason: response.statusText,
+            statusCode: response.status,
+            body: response.body
+          })
+        };
+      }),
+      requestTimeout(requestTimeoutInMs)
+    ];
+    if (abortSignal) {
+      raceOfPromises.push(
+        new Promise((resolve, reject) => {
+          abortSignal.onabort = () => {
+            const abortError = new Error("Request aborted");
+            abortError.name = "AbortError";
+            reject(abortError);
+          };
+        })
+      );
+    }
+    return Promise.race(raceOfPromises);
+  }
+  updateHttpClientConfig(key, value) {
+    this.config = void 0;
+    this.configProvider = this.configProvider.then((config) => {
+      config[key] = value;
+      return config;
+    });
+  }
+  httpHandlerConfigs() {
+    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((stream) => {
+  if (typeof Blob === "function" && stream instanceof Blob) {
+    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) {
+  let res = new Uint8Array(0);
+  const reader = stream.getReader();
+  let isDone = false;
+  while (!isDone) {
+    const { done, value } = await reader.read();
+    if (value) {
+      const prior = res;
+      res = new Uint8Array(prior.length + value.length);
+      res.set(prior);
+      res.set(value, prior.length);
+    }
+    isDone = done;
+  }
+  return res;
+}
+__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 = {
+  FetchHttpHandler,
+  keepAliveSupport,
+  streamCollector
+});

package/dist-cjs/request-timeout.js

@@ -1,15 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestTimeout = void 0;
-function requestTimeout(timeoutInMs = 0) {
-    return new Promise((resolve, reject) => {
-        if (timeoutInMs) {
-            setTimeout(() => {
-                const timeoutError = new Error(`Request did not complete within ${timeoutInMs} ms`);
-                timeoutError.name = "TimeoutError";
-                reject(timeoutError);
-            }, timeoutInMs);
-        }
-    });
-}
-exports.requestTimeout = requestTimeout;
+module.exports = require("./index.js");

package/dist-cjs/stream-collector.js

@@ -1,50 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamCollector = void 0;
-const util_base64_1 = require("@smithy/util-base64");
-const streamCollector = (stream) => {
-    if (typeof Blob === "function" && stream instanceof Blob) {
-        return collectBlob(stream);
-    }
-    return collectStream(stream);
-};
-exports.streamCollector = streamCollector;
-async function collectBlob(blob) {
-    const base64 = await readToBase64(blob);
-    const arrayBuffer = (0, util_base64_1.fromBase64)(base64);
-    return new Uint8Array(arrayBuffer);
-}
-async function collectStream(stream) {
-    let res = new Uint8Array(0);
-    const reader = stream.getReader();
-    let isDone = false;
-    while (!isDone) {
-        const { done, value } = await reader.read();
-        if (value) {
-            const prior = res;
-            res = new Uint8Array(prior.length + value.length);
-            res.set(prior);
-            res.set(value, prior.length);
-        }
-        isDone = done;
-    }
-    return res;
-}
-function readToBase64(blob) {
-    return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onloadend = () => {
-            var _a;
-            if (reader.readyState !== 2) {
-                return reject(new Error("Reader aborted too early"));
-            }
-            const result = ((_a = reader.result) !== null && _a !== void 0 ? _a : "");
-            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);
-    });
-}
+module.exports = require("./index.js");

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@smithy/fetch-http-handler",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Provides a way to make requests",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
-    "build:cjs": "yarn g:tsc -p tsconfig.cjs.json",
+    "build:cjs": "node ../../scripts/inline fetch-http-handler",
     "build:es": "yarn g:tsc -p tsconfig.es.json",
     "build:types": "yarn g:tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
@@ -24,14 +24,14 @@
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "dependencies": {
-    "@smithy/protocol-http": "^3.0.11",
-    "@smithy/querystring-builder": "^2.0.15",
-    "@smithy/types": "^2.7.0",
-    "@smithy/util-base64": "^2.0.1",
+    "@smithy/protocol-http": "^3.1.0",
+    "@smithy/querystring-builder": "^2.1.0",
+    "@smithy/types": "^2.9.0",
+    "@smithy/util-base64": "^2.1.0",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@smithy/abort-controller": "^2.0.15",
+    "@smithy/abort-controller": "^2.1.0",
     "@tsconfig/recommended": "1.0.1",
     "@types/chai-as-promised": "^7.1.2",
     "chai": "^4.2.0",