@aws-sdk/middleware-user-agent 3.178.0 → 3.183.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.183.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.182.0...v3.183.0) (2022-10-03)
+
+**Note:** Version bump only for package @aws-sdk/middleware-user-agent
+
+
+
+
+
 # [3.178.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.177.0...v3.178.0) (2022-09-23)
 
 **Note:** Version bump only for package @aws-sdk/middleware-user-agent

package/dist-es/configurations.js

@@ -1,4 +1,6 @@
-import { __assign } from "tslib";
 export function resolveUserAgentConfig(input) {
-    return __assign(__assign({}, input), { customUserAgent: typeof input.customUserAgent === "string" ? [[input.customUserAgent]] : input.customUserAgent });
+    return {
+        ...input,
+        customUserAgent: typeof input.customUserAgent === "string" ? [[input.customUserAgent]] : input.customUserAgent,
+    };
 }

package/dist-es/constants.js

@@ -1,4 +1,4 @@
-export var USER_AGENT = "user-agent";
-export var X_AMZ_USER_AGENT = "x-amz-user-agent";
-export var SPACE = " ";
-export var UA_ESCAPE_REGEX = /[^\!\#\$\%\&\'\*\+\-\.\^\_\`\|\~\d\w]/g;
+export const USER_AGENT = "user-agent";
+export const X_AMZ_USER_AGENT = "x-amz-user-agent";
+export const SPACE = " ";
+export const UA_ESCAPE_REGEX = /[^\!\#\$\%\&\'\*\+\-\.\^\_\`\|\~\d\w]/g;

package/dist-es/user-agent-middleware.js

@@ -1,64 +1,55 @@
-import { __assign, __awaiter, __generator, __read, __spreadArray } from "tslib";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import { SPACE, UA_ESCAPE_REGEX, USER_AGENT, X_AMZ_USER_AGENT } from "./constants";
-export var userAgentMiddleware = function (options) {
-    return function (next, context) {
-        return function (args) { return __awaiter(void 0, void 0, void 0, function () {
-            var request, headers, userAgent, defaultUserAgent, customUserAgent, sdkUserAgentValue, normalUAValue;
-            var _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        request = args.request;
-                        if (!HttpRequest.isInstance(request))
-                            return [2, next(args)];
-                        headers = request.headers;
-                        userAgent = ((_a = context === null || context === void 0 ? void 0 : context.userAgent) === null || _a === void 0 ? void 0 : _a.map(escapeUserAgent)) || [];
-                        return [4, options.defaultUserAgentProvider()];
-                    case 1:
-                        defaultUserAgent = (_c.sent()).map(escapeUserAgent);
-                        customUserAgent = ((_b = options === null || options === void 0 ? void 0 : options.customUserAgent) === null || _b === void 0 ? void 0 : _b.map(escapeUserAgent)) || [];
-                        sdkUserAgentValue = __spreadArray(__spreadArray(__spreadArray([], __read(defaultUserAgent), false), __read(userAgent), false), __read(customUserAgent), false).join(SPACE);
-                        normalUAValue = __spreadArray(__spreadArray([], __read(defaultUserAgent.filter(function (section) { return section.startsWith("aws-sdk-"); })), false), __read(customUserAgent), false).join(SPACE);
-                        if (options.runtime !== "browser") {
-                            if (normalUAValue) {
-                                headers[X_AMZ_USER_AGENT] = headers[X_AMZ_USER_AGENT]
-                                    ? "".concat(headers[USER_AGENT], " ").concat(normalUAValue)
-                                    : normalUAValue;
-                            }
-                            headers[USER_AGENT] = sdkUserAgentValue;
-                        }
-                        else {
-                            headers[X_AMZ_USER_AGENT] = sdkUserAgentValue;
-                        }
-                        return [2, next(__assign(__assign({}, args), { request: request }))];
-                }
-            });
-        }); };
-    };
+export const userAgentMiddleware = (options) => (next, context) => async (args) => {
+    const { request } = args;
+    if (!HttpRequest.isInstance(request))
+        return next(args);
+    const { headers } = request;
+    const userAgent = context?.userAgent?.map(escapeUserAgent) || [];
+    const defaultUserAgent = (await options.defaultUserAgentProvider()).map(escapeUserAgent);
+    const customUserAgent = options?.customUserAgent?.map(escapeUserAgent) || [];
+    const sdkUserAgentValue = [...defaultUserAgent, ...userAgent, ...customUserAgent].join(SPACE);
+    const normalUAValue = [
+        ...defaultUserAgent.filter((section) => section.startsWith("aws-sdk-")),
+        ...customUserAgent,
+    ].join(SPACE);
+    if (options.runtime !== "browser") {
+        if (normalUAValue) {
+            headers[X_AMZ_USER_AGENT] = headers[X_AMZ_USER_AGENT]
+                ? `${headers[USER_AGENT]} ${normalUAValue}`
+                : normalUAValue;
+        }
+        headers[USER_AGENT] = sdkUserAgentValue;
+    }
+    else {
+        headers[X_AMZ_USER_AGENT] = sdkUserAgentValue;
+    }
+    return next({
+        ...args,
+        request,
+    });
 };
-var escapeUserAgent = function (_a) {
-    var _b = __read(_a, 2), name = _b[0], version = _b[1];
-    var prefixSeparatorIndex = name.indexOf("/");
-    var prefix = name.substring(0, prefixSeparatorIndex);
-    var uaName = name.substring(prefixSeparatorIndex + 1);
+const escapeUserAgent = ([name, version]) => {
+    const prefixSeparatorIndex = name.indexOf("/");
+    const prefix = name.substring(0, prefixSeparatorIndex);
+    let uaName = name.substring(prefixSeparatorIndex + 1);
     if (prefix === "api") {
         uaName = uaName.toLowerCase();
     }
     return [prefix, uaName, version]
-        .filter(function (item) { return item && item.length > 0; })
-        .map(function (item) { return item === null || item === void 0 ? void 0 : item.replace(UA_ESCAPE_REGEX, "_"); })
+        .filter((item) => item && item.length > 0)
+        .map((item) => item?.replace(UA_ESCAPE_REGEX, "_"))
         .join("/");
 };
-export var getUserAgentMiddlewareOptions = {
+export const getUserAgentMiddlewareOptions = {
     name: "getUserAgentMiddleware",
     step: "build",
     priority: "low",
     tags: ["SET_USER_AGENT", "USER_AGENT"],
     override: true,
 };
-export var getUserAgentPlugin = function (config) { return ({
-    applyToStack: function (clientStack) {
+export const getUserAgentPlugin = (config) => ({
+    applyToStack: (clientStack) => {
         clientStack.add(userAgentMiddleware(config), getUserAgentMiddlewareOptions);
     },
-}); };
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-user-agent",
-  "version": "3.178.0",
+  "version": "3.183.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -20,12 +20,12 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/protocol-http": "3.178.0",
-    "@aws-sdk/types": "3.178.0",
+    "@aws-sdk/protocol-http": "3.183.0",
+    "@aws-sdk/types": "3.183.0",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
-    "@aws-sdk/middleware-stack": "3.178.0",
+    "@aws-sdk/middleware-stack": "3.183.0",
     "@tsconfig/recommended": "1.0.1",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",