@aws-sdk/middleware-recursion-detection 3.862.0 → 3.886.0

package/dist-cjs/index.js

@@ -16,57 +16,39 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  addRecursionDetectionMiddlewareOptions: () => addRecursionDetectionMiddlewareOptions,
-  getRecursionDetectionPlugin: () => getRecursionDetectionPlugin,
-  recursionDetectionMiddleware: () => recursionDetectionMiddleware
+  getRecursionDetectionPlugin: () => getRecursionDetectionPlugin
 });
 module.exports = __toCommonJS(index_exports);
-var import_protocol_http = require("@smithy/protocol-http");
-var TRACE_ID_HEADER_NAME = "X-Amzn-Trace-Id";
-var ENV_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME";
-var ENV_TRACE_ID = "_X_AMZN_TRACE_ID";
-var recursionDetectionMiddleware = /* @__PURE__ */ __name((options) => (next) => async (args) => {
-  const { request } = args;
-  if (!import_protocol_http.HttpRequest.isInstance(request) || options.runtime !== "node") {
-    return next(args);
-  }
-  const traceIdHeader = Object.keys(request.headers ?? {}).find((h) => h.toLowerCase() === TRACE_ID_HEADER_NAME.toLowerCase()) ?? TRACE_ID_HEADER_NAME;
-  if (request.headers.hasOwnProperty(traceIdHeader)) {
-    return next(args);
-  }
-  const functionName = process.env[ENV_LAMBDA_FUNCTION_NAME];
-  const traceId = process.env[ENV_TRACE_ID];
-  const nonEmptyString = /* @__PURE__ */ __name((str) => typeof str === "string" && str.length > 0, "nonEmptyString");
-  if (nonEmptyString(functionName) && nonEmptyString(traceId)) {
-    request.headers[TRACE_ID_HEADER_NAME] = traceId;
-  }
-  return next({
-    ...args,
-    request
-  });
-}, "recursionDetectionMiddleware");
-var addRecursionDetectionMiddlewareOptions = {
+
+// src/configuration.ts
+var recursionDetectionMiddlewareOptions = {
   step: "build",
   tags: ["RECURSION_DETECTION"],
   name: "recursionDetectionMiddleware",
   override: true,
   priority: "low"
 };
+
+// src/getRecursionDetectionPlugin.ts
+var import_recursionDetectionMiddleware = require("././recursionDetectionMiddleware");
 var getRecursionDetectionPlugin = /* @__PURE__ */ __name((options) => ({
   applyToStack: /* @__PURE__ */ __name((clientStack) => {
-    clientStack.add(recursionDetectionMiddleware(options), addRecursionDetectionMiddlewareOptions);
+    clientStack.add((0, import_recursionDetectionMiddleware.recursionDetectionMiddleware)(), recursionDetectionMiddlewareOptions);
   }, "applyToStack")
 }), "getRecursionDetectionPlugin");
+
+// src/index.ts
+__reExport(index_exports, require("././recursionDetectionMiddleware"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 
 0 && (module.exports = {
-  recursionDetectionMiddleware,
-  addRecursionDetectionMiddlewareOptions,
-  getRecursionDetectionPlugin
+  getRecursionDetectionPlugin,
+  recursionDetectionMiddleware
 });
 

package/dist-cjs/recursionDetectionMiddleware.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recursionDetectionMiddleware = void 0;
+const lambda_invoke_store_1 = require("@aws/lambda-invoke-store");
+const protocol_http_1 = require("@smithy/protocol-http");
+const TRACE_ID_HEADER_NAME = "X-Amzn-Trace-Id";
+const ENV_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME";
+const ENV_TRACE_ID = "_X_AMZN_TRACE_ID";
+const recursionDetectionMiddleware = () => (next) => async (args) => {
+    const { request } = args;
+    if (!protocol_http_1.HttpRequest.isInstance(request)) {
+        return next(args);
+    }
+    const traceIdHeader = Object.keys(request.headers ?? {}).find((h) => h.toLowerCase() === TRACE_ID_HEADER_NAME.toLowerCase()) ??
+        TRACE_ID_HEADER_NAME;
+    if (request.headers.hasOwnProperty(traceIdHeader)) {
+        return next(args);
+    }
+    const functionName = process.env[ENV_LAMBDA_FUNCTION_NAME];
+    const traceIdFromEnv = process.env[ENV_TRACE_ID];
+    const traceIdFromInvokeStore = lambda_invoke_store_1.InvokeStore.getXRayTraceId();
+    const traceId = traceIdFromInvokeStore ?? traceIdFromEnv;
+    const nonEmptyString = (str) => typeof str === "string" && str.length > 0;
+    if (nonEmptyString(functionName) && nonEmptyString(traceId)) {
+        request.headers[TRACE_ID_HEADER_NAME] = traceId;
+    }
+    return next({
+        ...args,
+        request,
+    });
+};
+exports.recursionDetectionMiddleware = recursionDetectionMiddleware;

package/dist-cjs/recursionDetectionMiddleware.native.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recursionDetectionMiddleware = void 0;
+const recursionDetectionMiddleware = () => (next) => async (args) => next(args);
+exports.recursionDetectionMiddleware = recursionDetectionMiddleware;

package/dist-es/configuration.js

@@ -0,0 +1,7 @@
+export const recursionDetectionMiddlewareOptions = {
+    step: "build",
+    tags: ["RECURSION_DETECTION"],
+    name: "recursionDetectionMiddleware",
+    override: true,
+    priority: "low",
+};

package/dist-es/getRecursionDetectionPlugin.js

@@ -0,0 +1,7 @@
+import { recursionDetectionMiddlewareOptions } from "./configuration";
+import { recursionDetectionMiddleware } from "./recursionDetectionMiddleware";
+export const getRecursionDetectionPlugin = (options) => ({
+    applyToStack: (clientStack) => {
+        clientStack.add(recursionDetectionMiddleware(), recursionDetectionMiddlewareOptions);
+    },
+});

package/dist-es/index.js

@@ -1,37 +1,2 @@
-import { HttpRequest } from "@smithy/protocol-http";
-const TRACE_ID_HEADER_NAME = "X-Amzn-Trace-Id";
-const ENV_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME";
-const ENV_TRACE_ID = "_X_AMZN_TRACE_ID";
-export const recursionDetectionMiddleware = (options) => (next) => async (args) => {
-    const { request } = args;
-    if (!HttpRequest.isInstance(request) || options.runtime !== "node") {
-        return next(args);
-    }
-    const traceIdHeader = Object.keys(request.headers ?? {}).find((h) => h.toLowerCase() === TRACE_ID_HEADER_NAME.toLowerCase()) ??
-        TRACE_ID_HEADER_NAME;
-    if (request.headers.hasOwnProperty(traceIdHeader)) {
-        return next(args);
-    }
-    const functionName = process.env[ENV_LAMBDA_FUNCTION_NAME];
-    const traceId = process.env[ENV_TRACE_ID];
-    const nonEmptyString = (str) => typeof str === "string" && str.length > 0;
-    if (nonEmptyString(functionName) && nonEmptyString(traceId)) {
-        request.headers[TRACE_ID_HEADER_NAME] = traceId;
-    }
-    return next({
-        ...args,
-        request,
-    });
-};
-export const addRecursionDetectionMiddlewareOptions = {
-    step: "build",
-    tags: ["RECURSION_DETECTION"],
-    name: "recursionDetectionMiddleware",
-    override: true,
-    priority: "low",
-};
-export const getRecursionDetectionPlugin = (options) => ({
-    applyToStack: (clientStack) => {
-        clientStack.add(recursionDetectionMiddleware(options), addRecursionDetectionMiddlewareOptions);
-    },
-});
+export * from "./getRecursionDetectionPlugin";
+export * from "./recursionDetectionMiddleware";

package/dist-es/recursionDetectionMiddleware.browser.js

@@ -0,0 +1 @@
+export const recursionDetectionMiddleware = () => (next) => async (args) => next(args);

package/dist-es/recursionDetectionMiddleware.js

@@ -0,0 +1,28 @@
+import { InvokeStore } from "@aws/lambda-invoke-store";
+import { HttpRequest } from "@smithy/protocol-http";
+const TRACE_ID_HEADER_NAME = "X-Amzn-Trace-Id";
+const ENV_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME";
+const ENV_TRACE_ID = "_X_AMZN_TRACE_ID";
+export const recursionDetectionMiddleware = () => (next) => async (args) => {
+    const { request } = args;
+    if (!HttpRequest.isInstance(request)) {
+        return next(args);
+    }
+    const traceIdHeader = Object.keys(request.headers ?? {}).find((h) => h.toLowerCase() === TRACE_ID_HEADER_NAME.toLowerCase()) ??
+        TRACE_ID_HEADER_NAME;
+    if (request.headers.hasOwnProperty(traceIdHeader)) {
+        return next(args);
+    }
+    const functionName = process.env[ENV_LAMBDA_FUNCTION_NAME];
+    const traceIdFromEnv = process.env[ENV_TRACE_ID];
+    const traceIdFromInvokeStore = InvokeStore.getXRayTraceId();
+    const traceId = traceIdFromInvokeStore ?? traceIdFromEnv;
+    const nonEmptyString = (str) => typeof str === "string" && str.length > 0;
+    if (nonEmptyString(functionName) && nonEmptyString(traceId)) {
+        request.headers[TRACE_ID_HEADER_NAME] = traceId;
+    }
+    return next({
+        ...args,
+        request,
+    });
+};

package/dist-es/recursionDetectionMiddleware.native.js

@@ -0,0 +1 @@
+export const recursionDetectionMiddleware = () => (next) => async (args) => next(args);

package/dist-types/configuration.d.ts

@@ -0,0 +1,5 @@
+import { AbsoluteLocation, BuildHandlerOptions } from "@smithy/types";
+/**
+ * @internal
+ */
+export declare const recursionDetectionMiddlewareOptions: BuildHandlerOptions & AbsoluteLocation;

package/dist-types/getRecursionDetectionPlugin.d.ts

@@ -0,0 +1,5 @@
+import { Pluggable } from "@smithy/types";
+/**
+ * @internal
+ */
+export declare const getRecursionDetectionPlugin: (options: any) => Pluggable<any, any>;

package/dist-types/index.d.ts

@@ -1,18 +1,2 @@
-import { AbsoluteLocation, BuildHandlerOptions, BuildMiddleware, Pluggable } from "@smithy/types";
-interface PreviouslyResolved {
-    runtime: string;
-}
-/**
- * Inject to trace ID to request header to detect recursion invocation in Lambda.
- * @internal
- */
-export declare const recursionDetectionMiddleware: (options: PreviouslyResolved) => BuildMiddleware<any, any>;
-/**
- * @internal
- */
-export declare const addRecursionDetectionMiddlewareOptions: BuildHandlerOptions & AbsoluteLocation;
-/**
- * @internal
- */
-export declare const getRecursionDetectionPlugin: (options: PreviouslyResolved) => Pluggable<any, any>;
-export {};
+export * from "./getRecursionDetectionPlugin";
+export * from "./recursionDetectionMiddleware";

package/dist-types/recursionDetectionMiddleware.browser.d.ts

@@ -0,0 +1,6 @@
+import { BuildMiddleware } from "@smithy/types";
+/**
+ * No-op middleware for runtimes outside of Node.js
+ * @internal
+ */
+export declare const recursionDetectionMiddleware: () => BuildMiddleware<any, any>;

package/dist-types/recursionDetectionMiddleware.d.ts

@@ -0,0 +1,6 @@
+import { BuildMiddleware } from "@smithy/types";
+/**
+ * Inject to trace ID to request header to detect recursion invocation in Lambda.
+ * @internal
+ */
+export declare const recursionDetectionMiddleware: () => BuildMiddleware<any, any>;

package/dist-types/recursionDetectionMiddleware.native.d.ts

@@ -0,0 +1,6 @@
+import { BuildMiddleware } from "@smithy/types";
+/**
+ * No-op middleware for runtimes outside of Node.js
+ * @internal
+ */
+export declare const recursionDetectionMiddleware: () => BuildMiddleware<any, any>;

package/dist-types/ts3.4/configuration.d.ts

@@ -0,0 +1,3 @@
+import { AbsoluteLocation, BuildHandlerOptions } from "@smithy/types";
+export declare const recursionDetectionMiddlewareOptions: BuildHandlerOptions &
+  AbsoluteLocation;

package/dist-types/ts3.4/getRecursionDetectionPlugin.d.ts

@@ -0,0 +1,4 @@
+import { Pluggable } from "@smithy/types";
+export declare const getRecursionDetectionPlugin: (
+  options: any
+) => Pluggable<any, any>;

package/dist-types/ts3.4/index.d.ts

@@ -1,18 +1,2 @@
-import {
-  AbsoluteLocation,
-  BuildHandlerOptions,
-  BuildMiddleware,
-  Pluggable,
-} from "@smithy/types";
-interface PreviouslyResolved {
-  runtime: string;
-}
-export declare const recursionDetectionMiddleware: (
-  options: PreviouslyResolved
-) => BuildMiddleware<any, any>;
-export declare const addRecursionDetectionMiddlewareOptions: BuildHandlerOptions &
-  AbsoluteLocation;
-export declare const getRecursionDetectionPlugin: (
-  options: PreviouslyResolved
-) => Pluggable<any, any>;
-export {};
+export * from "./getRecursionDetectionPlugin";
+export * from "./recursionDetectionMiddleware";

package/dist-types/ts3.4/recursionDetectionMiddleware.browser.d.ts

@@ -0,0 +1,5 @@
+import { BuildMiddleware } from "@smithy/types";
+export declare const recursionDetectionMiddleware: () => BuildMiddleware<
+  any,
+  any
+>;

package/dist-types/ts3.4/recursionDetectionMiddleware.d.ts

@@ -0,0 +1,5 @@
+import { BuildMiddleware } from "@smithy/types";
+export declare const recursionDetectionMiddleware: () => BuildMiddleware<
+  any,
+  any
+>;

package/dist-types/ts3.4/recursionDetectionMiddleware.native.d.ts

@@ -0,0 +1,5 @@
+import { BuildMiddleware } from "@smithy/types";
+export declare const recursionDetectionMiddleware: () => BuildMiddleware<
+  any,
+  any
+>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-recursion-detection",
-  "version": "3.862.0",
+  "version": "3.886.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline middleware-recursion-detection",
@@ -10,9 +10,9 @@
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
     "test": "yarn g:vitest run",
-    "test:integration": "yarn g:vitest run -c vitest.config.integ.ts",
+    "test:integration": "yarn g:vitest run -c vitest.config.integ.mts",
     "test:watch": "yarn g:vitest watch",
-    "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.ts"
+    "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -24,6 +24,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-sdk/types": "3.862.0",
+    "@aws/lambda-invoke-store": "^0.0.1",
     "@smithy/protocol-http": "^5.1.3",
     "@smithy/types": "^4.3.2",
     "tslib": "^2.6.2"
@@ -53,5 +54,9 @@
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",
     "typescript": "~5.8.3"
-  }
+  },
+  "browser": {
+    "./dist-es/recursionDetectionMiddleware": "./dist-es/recursionDetectionMiddleware.browser"
+  },
+  "react-native": {}
 }