@middy/appconfig 5.1.0 → 5.2.1

package/index.js

@@ -1,85 +1,129 @@
-import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache, jsonSafeParse } from '@middy/util';
-import { StartConfigurationSessionCommand, GetLatestConfigurationCommand, AppConfigDataClient } from '@aws-sdk/client-appconfigdata';
+import {
+  canPrefetch,
+  createPrefetchClient,
+  createClient,
+  getCache,
+  getInternal,
+  processCache,
+  modifyCache,
+  jsonSafeParse,
+  catchInvalidSignatureException
+} from '@middy/util'
+import {
+  StartConfigurationSessionCommand,
+  GetLatestConfigurationCommand,
+  AppConfigDataClient
+} from '@aws-sdk/client-appconfigdata'
+
 const defaults = {
-    AwsClient: AppConfigDataClient,
-    awsClientOptions: {},
-    awsClientAssumeRole: undefined,
-    awsClientCapture: undefined,
-    fetchData: {},
-    disablePrefetch: false,
-    cacheKey: 'appconfig',
-    cacheKeyExpiry: {},
-    cacheExpiry: -1,
-    setToContext: false
-};
-const contentTypePattern = /^application\/(.+\+)?json($|;.+)/;
-const appConfigMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const configurationTokenCache = {};
-    const configurationCache = {};
-    function fetchLatestConfiguration(configToken, internalKey) {
-        return client.send(new GetLatestConfigurationCommand({
-            ConfigurationToken: configToken
-        })).then((configResp)=>{
-            configurationTokenCache[internalKey] = configResp.NextPollConfigurationToken;
-            if (configResp.Configuration.length === 0) {
-                return configurationCache[internalKey];
-            }
-            let value = String.fromCharCode.apply(null, configResp.Configuration);
-            if (contentTypePattern.test(configResp.ContentType)) {
-                value = jsonSafeParse(value);
-            }
-            configurationCache[internalKey] = value;
-            return value;
-        }).catch((e)=>{
-            const value = getCache(options.cacheKey).value ?? {};
-            value[internalKey] = undefined;
-            modifyCache(options.cacheKey, value);
-            throw e;
-        });
-    }
-    const fetch = (request, cachedValues = {})=>{
-        const values = {};
-        for (const internalKey of Object.keys(options.fetchData)){
-            if (cachedValues[internalKey]) continue;
-            if (configurationTokenCache[internalKey] == null) {
-                values[internalKey] = client.send(new StartConfigurationSessionCommand(options.fetchData[internalKey])).then((configSessionResp)=>fetchLatestConfiguration(configSessionResp.InitialConfigurationToken, internalKey)).catch((e)=>{
-                    const value = getCache(options.cacheKey).value ?? {};
-                    value[internalKey] = undefined;
-                    modifyCache(options.cacheKey, value);
-                    throw e;
-                });
-                continue;
-            }
-            values[internalKey] = fetchLatestConfiguration(configurationTokenCache[internalKey], internalKey);
-        }
-        return values;
-    };
-    let client;
-    if (canPrefetch(options)) {
-        client = createPrefetchClient(options);
-        processCache(options, fetch);
-    }
-    const appConfigMiddlewareBefore = async (request)=>{
-        if (!client) {
-            client = await createClient(options, request);
+  AwsClient: AppConfigDataClient,
+  awsClientOptions: {},
+  awsClientAssumeRole: undefined,
+  awsClientCapture: undefined,
+  fetchData: {},
+  disablePrefetch: false,
+  cacheKey: 'appconfig',
+  cacheKeyExpiry: {},
+  cacheExpiry: -1,
+  setToContext: false
+}
+const contentTypePattern = /^application\/(.+\+)?json($|;.+)/
+const appConfigMiddleware = (opts = {}) => {
+  const options = {
+    ...defaults,
+    ...opts
+  }
+  const configurationTokenCache = {}
+  const configurationCache = {}
+
+  function fetchLatestConfiguration (configToken, internalKey) {
+    const command = new GetLatestConfigurationCommand({
+      ConfigurationToken: configToken
+    })
+    return client
+      .send(command)
+      .catch((e) => catchInvalidSignatureException(e, client, command))
+      .then((configResp) => {
+        configurationTokenCache[internalKey] =
+          configResp.NextPollConfigurationToken
+
+        if (configResp.Configuration.length === 0) {
+          return configurationCache[internalKey]
         }
-        const { value } = processCache(options, fetch, request);
-        Object.assign(request.internal, value);
-        if (options.setToContext) {
-            const data = await getInternal(Object.keys(options.fetchData), request);
-            Object.assign(request.context, data);
+
+        let value = String.fromCharCode.apply(null, configResp.Configuration)
+        if (contentTypePattern.test(configResp.ContentType)) {
+          value = jsonSafeParse(value)
         }
-    };
-    return {
-        before: appConfigMiddlewareBefore
-    };
-};
-export default appConfigMiddleware;
-export function appConfigReq(req) {
-    return req;
+        configurationCache[internalKey] = value
+        return value
+      })
+      .catch((e) => {
+        const value = getCache(options.cacheKey).value ?? {}
+        value[internalKey] = undefined
+        modifyCache(options.cacheKey, value)
+        throw e
+      })
+  }
+
+  const fetch = (request, cachedValues = {}) => {
+    const values = {}
+    for (const internalKey of Object.keys(options.fetchData)) {
+      if (cachedValues[internalKey]) continue
+      if (configurationTokenCache[internalKey] == null) {
+        const command = new StartConfigurationSessionCommand(
+          options.fetchData[internalKey]
+        )
+        values[internalKey] = client
+          .send(command)
+          .catch((e) => catchInvalidSignatureException(e, client, command))
+          .then((configSessionResp) =>
+            fetchLatestConfiguration(
+              configSessionResp.InitialConfigurationToken,
+              internalKey
+            )
+          )
+          .catch((e) => {
+            const value = getCache(options.cacheKey).value ?? {}
+            value[internalKey] = undefined
+            modifyCache(options.cacheKey, value)
+            throw e
+          })
+
+        continue
+      }
+      values[internalKey] = fetchLatestConfiguration(
+        configurationTokenCache[internalKey],
+        internalKey
+      )
+    }
+    return values
+  }
+  let client
+  if (canPrefetch(options)) {
+    client = createPrefetchClient(options)
+    processCache(options, fetch)
+  }
+  const appConfigMiddlewareBefore = async (request) => {
+    if (!client) {
+      client = await createClient(options, request)
+    }
+    const { value } = processCache(options, fetch, request)
+    Object.assign(request.internal, value)
+    if (options.setToContext) {
+      const data = await getInternal(Object.keys(options.fetchData), request)
+      Object.assign(request.context, data)
+    }
+  }
+  return {
+    before: appConfigMiddlewareBefore
+  }
+}
+export default appConfigMiddleware
+
+// used for TS type inference (see index.d.ts)
+export function appConfigReq (req) {
+  return req
 }
 
+// # sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/appconfig",
-  "version": "5.1.0",
+  "version": "5.2.1",
   "description": "AppConfig middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -58,13 +58,13 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.1.0"
+    "@middy/util": "5.2.1"
   },
   "devDependencies": {
     "@aws-sdk/client-appconfigdata": "^3.0.0",
-    "@middy/core": "5.1.0",
+    "@middy/core": "5.2.1",
     "@types/aws-lambda": "^8.10.101",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "bbdaf5843914921804ba085dd58117273febe6b5"
+  "gitHead": "4d55da221b9165b4b3e59a12632fd40a149a1e92"
 }