@middy/service-discovery 5.0.0-alpha.1 → 5.0.0-alpha.2

package/index.js

@@ -1,76 +1,54 @@
-import {
-  canPrefetch,
-  createPrefetchClient,
-  createClient,
-  getCache,
-  getInternal,
-  processCache,
-  modifyCache
-} from '@middy/util'
-import {
-  ServiceDiscoveryClient,
-  DiscoverInstancesCommand
-} from '@aws-sdk/client-servicediscovery'
-
+import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache } from '@middy/util';
+import { ServiceDiscoveryClient, DiscoverInstancesCommand } from '@aws-sdk/client-servicediscovery';
 const defaults = {
-  AwsClient: ServiceDiscoveryClient,
-  awsClientOptions: {},
-  awsClientAssumeRole: undefined,
-  awsClientCapture: undefined,
-  fetchData: {}, // { contextKey: {NamespaceName, ServiceName, HealthStatus} }
-  disablePrefetch: false,
-  cacheKey: 'cloud-map',
-  cacheKeyExpiry: {},
-  cacheExpiry: -1,
-  setToContext: false
-}
-
-const serviceDiscoveryMiddleware = (opts = {}) => {
-  const options = { ...defaults, ...opts }
-
-  const fetch = (request, cachedValues = {}) => {
-    const values = {}
-
-    for (const internalKey of Object.keys(options.fetchData)) {
-      if (cachedValues[internalKey]) continue
-
-      values[internalKey] = client
-        .send(new DiscoverInstancesCommand(options.fetchData[internalKey]))
-        .then((resp) => resp.Instances)
-        .catch((e) => {
-          const value = getCache(options.cacheKey).value ?? {}
-          value[internalKey] = undefined
-          modifyCache(options.cacheKey, value)
-          throw e
-        })
-    }
-
-    return values
-  }
-
-  let client
-  if (canPrefetch(options)) {
-    client = createPrefetchClient(options)
-    processCache(options, fetch)
-  }
-
-  const serviceDiscoveryMiddlewareBefore = 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)
-      if (options.setToContext) Object.assign(request.context, data)
+    AwsClient: ServiceDiscoveryClient,
+    awsClientOptions: {},
+    awsClientAssumeRole: undefined,
+    awsClientCapture: undefined,
+    fetchData: {},
+    disablePrefetch: false,
+    cacheKey: 'cloud-map',
+    cacheKeyExpiry: {},
+    cacheExpiry: -1,
+    setToContext: false
+};
+const serviceDiscoveryMiddleware = (opts = {})=>{
+    const options = {
+        ...defaults,
+        ...opts
+    };
+    const fetch = (request, cachedValues = {})=>{
+        const values = {};
+        for (const internalKey of Object.keys(options.fetchData)){
+            if (cachedValues[internalKey]) continue;
+            values[internalKey] = client.send(new DiscoverInstancesCommand(options.fetchData[internalKey])).then((resp)=>resp.Instances).catch((e)=>{
+                const value = getCache(options.cacheKey).value ?? {};
+                value[internalKey] = undefined;
+                modifyCache(options.cacheKey, value);
+                throw e;
+            });
+        }
+        return values;
+    };
+    let client;
+    if (canPrefetch(options)) {
+        client = createPrefetchClient(options);
+        processCache(options, fetch);
     }
-  }
+    const serviceDiscoveryMiddlewareBefore = 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);
+            if (options.setToContext) Object.assign(request.context, data);
+        }
+    };
+    return {
+        before: serviceDiscoveryMiddlewareBefore
+    };
+};
+export default serviceDiscoveryMiddleware;
 
-  return {
-    before: serviceDiscoveryMiddlewareBefore
-  }
-}
-export default serviceDiscoveryMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/service-discovery",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.2",
   "description": "Service Discovery (Cloud Map) instances middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -59,11 +59,11 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.0-alpha.1"
+    "@middy/util": "5.0.0-alpha.2"
   },
   "devDependencies": {
     "@aws-sdk/client-servicediscovery": "^3.0.0",
-    "@middy/core": "5.0.0-alpha.1",
+    "@middy/core": "5.0.0-alpha.2",
     "@types/aws-lambda": "^8.10.101",
     "aws-xray-sdk": "^3.3.3"
   },