@aws-sdk/client-sns / aws-sdk/clients/sns → @aws-lite/sns

`@aws-sdk/client-sqs` / `aws-sdk/clients/sqs` → `@aws-lite/sqs`
Cache port gets
Fix SSM calls in AWS

Author: ryanblock

package.json

@@ -27,6 +27,8 @@
   "dependencies": {
     "@aws-lite/client": "^0.8.1",
     "@aws-lite/dynamodb": "^0.2.1",
+    "@aws-lite/sns": "^0.0.0",
+    "@aws-lite/sqs": "^0.0.0",
     "@aws-lite/ssm": "^0.1.0",
     "cookie": "^0.5.0",
     "cookie-signature": "^1.2.1",
@@ -43,8 +45,6 @@
     "@architect/sandbox": "^5.8.2",
     "@aws-sdk/client-apigatewaymanagementapi": "^3.319.0",
     "@aws-sdk/client-dynamodb": "^3.319.0",
-    "@aws-sdk/client-sns": "^3.319.0",
-    "@aws-sdk/client-sqs": "^3.319.0",
     "@aws-sdk/lib-dynamodb": "^3.319.0",
     "@smithy/node-http-handler": "^2.1.7",
     "@types/aws-lambda": "^8.10.119",

src/discovery/index.js

@@ -18,7 +18,8 @@ module.exports = function lookup (callback) {
     app = 'arc-app'
   }
 
-  let config = {}
+  let plugins = [ '@aws-lite/ssm' ]
+  let config = { plugins }
   if (local) {
     let port = 2222
     if (ARC_SANDBOX) {
@@ -34,15 +35,15 @@ module.exports = function lookup (callback) {
       port,
       protocol: 'http',
       region: AWS_REGION || 'us-west-2',
-      plugins: [ '@aws-lite/ssm' ],
+      plugins,
     }
   }
 
   getAwsClient(config, (err, client) => {
     if (err) callback(err)
     else {
       let Path = `/${stack || toLogicalID(`${app}-${env}`)}`
-      client.ssm.GetParametersByPath({ Path, paginate: true })
+      client.ssm.GetParametersByPath({ Path, Recursive: true, paginate: true })
         .then(result => {
           let services = result.Parameters.reduce((a, b) => {
             let hierarchy = b.Name.split('/')

src/events/publish.js

@@ -1,7 +1,7 @@
 let http = require('http')
-let { getPorts, isNode18, useAWS } = require('../lib')
+let { getAwsClient, getPorts, useAWS } = require('../lib')
 let ledger = { events: {}, queues: {} }
-let sns, snsClient, sqs, sqsClient, port
+let client, port
 
 /**
  * Invoke
@@ -10,7 +10,6 @@ let sns, snsClient, sqs, sqsClient, port
  */
 module.exports = function publishFactory (arc, type) {
   let factory = type === 'events' ? eventFactory : queueFactory
-  let publishAWS = factory(arc)
   return function publish (params, callback) {
     if (!params.name) {
       throw ReferenceError('missing params.name')
@@ -44,9 +43,24 @@ module.exports = function publishFactory (arc, type) {
         }
       })
     }
-    else {
+    else if (client) {
+      let publishAWS = factory(arc)
       publishAWS(params, callback)
     }
+    else {
+      let { AWS_REGION } = process.env
+      getAwsClient({
+        region: AWS_REGION || 'us-west-2',
+        plugins: [ '@aws-lite/sns', '@aws-lite/sqs' ],
+      }, (err, _client) => {
+        if (err) callback(err)
+        else {
+          client = _client
+          let publishAWS = factory(arc)
+          publishAWS(params, callback)
+        }
+      })
+    }
 
     return promise
   }
@@ -75,25 +89,14 @@ function _publishSandbox (type, params, callback) {
 
 function eventFactory (arc) {
   return function live ({ name, payload }, callback) {
-    if (!snsClient) {
-      if (isNode18) {
-        let { SNS } = require('@aws-sdk/client-sns')
-        sns = new SNS
-      }
-      else {
-        let SNS = require('aws-sdk/clients/sns')
-        sns = new SNS
-      }
-    }
-    snsClient = (params, callback) => {
-      return sns.publish(params, callback)
-    }
 
     function publish (arn, payload, callback) {
-      snsClient({
+      client.sns.Publish({
         TopicArn: arn,
         Message: JSON.stringify(payload)
-      }, callback)
+      })
+        .then(result => callback(null, result))
+        .catch(callback)
     }
 
     function cacheLedgerAndPublish (serviceMap) {
@@ -115,42 +118,31 @@ function eventFactory (arc) {
 
 function queueFactory (arc) {
   return function live ({ name, payload, delaySeconds, groupID }, callback) {
-    if (!sqsClient) {
-      if (isNode18) {
-        let { SQS } = require('@aws-sdk/client-sqs')
-        sqs = new SQS
-      }
-      else {
-        let SQS = require('aws-sdk/clients/sqs')
-        sqs = new SQS
-      }
-    }
-    sqsClient = (params, callback) => {
-      return sqs.sendMessage(params, callback)
-    }
 
-    function publish (arn, payload, callback) {
+    function publish (url, payload, callback) {
       let params = {
-        QueueUrl: arn,
+        QueueUrl: url,
         DelaySeconds: delaySeconds || 0,
         MessageBody: JSON.stringify(payload)
       }
-      if (arn.endsWith('.fifo')) {
+      if (url.endsWith('.fifo')) {
         params.MessageGroupId = groupID || name
       }
-      sqsClient(params, callback)
+      client.sqs.SendMessage(params)
+        .then(result => callback(null, result))
+        .catch(callback)
     }
 
     function cacheLedgerAndPublish (serviceMap) {
       ledger.queues = serviceMap.queues
-      arn = ledger.queues[name]
-      if (!arn) callback(ReferenceError(`${name} queue not found`))
-      else publish(arn, payload, callback)
+      url = ledger.queues[name]
+      if (!url) callback(ReferenceError(`${name} queue not found`))
+      else publish(url, payload, callback)
     }
 
-    let arn = ledger.queues[name]
-    if (arn) {
-      publish(arn, payload, callback)
+    let url = ledger.queues[name]
+    if (url) {
+      publish(url, payload, callback)
     }
     else {
       arc.services().then(cacheLedgerAndPublish).catch(callback)

src/lib/_get-ports.js

@@ -1,12 +1,17 @@
+let cache
 module.exports = function getPorts (callback) {
   let { ARC_SANDBOX } = process.env
   let notFound = ReferenceError('Sandbox internal port not found')
+  if (cache) {
+    return callback(null, cache)
+  }
   // Sandbox env var is the happy path for Lambda runs
   if (ARC_SANDBOX) {
     let { ports } = JSON.parse(ARC_SANDBOX)
     if (!ports) {
       return callback(notFound)
     }
+    cache = ports
     callback(null, ports)
   }
   // Fall back to an internal SSM query in case Functions is running as a bare module
@@ -21,6 +26,7 @@ module.exports = function getPorts (callback) {
           return callback(notFound)
         }
         let ports = JSON.parse(services.ARC_SANDBOX.ports)
+        cache = ports
         callback(null, ports)
       }
     })