ac-support-connector 1.0.0 → 1.0.1

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="1.0.1"></a>
+
+## [1.0.1](https://github.com/admiralcloud/ac-support-connector/compare/v1.0.0..v1.0.1) (2024-08-27 14:05:03)
+
+
+### Bug Fix
+
+* **Connector:** Use ac-sqs | MP | [42dd23f9dde355204eb77a5f546cb2f12a8bb700](https://github.com/admiralcloud/ac-support-connector/commit/42dd23f9dde355204eb77a5f546cb2f12a8bb700)    
+Use our ac-sqs package  
+Related issues: [undefined/undefined#master](undefined/browse/master)
 <a name="1.0.0"></a>
  
 # [1.0.0](https://github.com/admiralcloud/ac-support-connector/compare/v0.1.1..v1.0.0) (2024-08-26 07:17:38)

package/index.js

@@ -1,49 +1,44 @@
-const { SQSClient, SendMessageCommand } = require('@aws-sdk/client-sqs')
 const { STSClient, GetCallerIdentityCommand } = require('@aws-sdk/client-sts')
-const { fromIni } = require("@aws-sdk/credential-providers")
-
-const getLength = require('utf8-byte-length')
-
 const NodeCache = require('node-cache')
 
+const ACSQS = require('ac-sqs')
+
 const functionName = 'ac-support-connector'.padEnd(20)
 
 module.exports = {
 
   aws: {},
 
-  init: async function({ serviceName, instanceId, sqsQueue, redisInstance, region = 'eu-central-1', profile = process.env['profile'], debug } = {}) {
+  init: async function({ serviceName, instanceId, sqsQueue = 'AC-SupportQueue', bucket, redisInstance, region = 'eu-central-1', profile = process.env['profile'], debug } = {}) {
     
-    if (!debug) {
-      const awsConfig = {
-        region
-      }
-      // credentials are determined from  role.
-      // But you can also use a set profile 
-      if (profile) {
-        console.error('%s | Using AWS profile | %s', functionName, profile)
-        awsConfig.credentials = fromIni({ profile })
-      }
+    this.sqsQueue = sqsQueue
+    this.serviceName = serviceName || 'SupportConnector'
+    this.instanceId = instanceId
+    this.redisInstance = redisInstance
+    this.cache = new NodeCache()
+    this.debugMode = debug
 
-      // determine accountId
+    if (!debug) {
       const client = new STSClient(awsConfig)
       const command = new GetCallerIdentityCommand()
       const response = await client.send(command)
       const accountId = response?.Account
-      
-      this.aws = {
-        sqs: new SQSClient(awsConfig),
-        region,
-        accountId
+      const sqsParams = {
+        account: accountId,
+        availableLists: [{
+          name: sqsQueue,
+          fifo: true
+        }]
+      }
+      if (profile) sqsParams.profile = profile // Optional AWS profile, see below
+      if (bucket) {
+        sqsParams.useS3 = { 
+          enabled: true,
+          bucket
+        }
       }
+      this.acsqs = new ACSQS(sqsParams)
     }
-
-    this.serviceName = serviceName || 'SupportConnector'
-    this.instanceId = instanceId
-    this.sqsQueue = sqsQueue || 'AC-SupportQueue'
-    this.redisInstance = redisInstance
-    this.cache = new NodeCache()
-    this.debugMode = debug
   },
 
 
@@ -83,25 +78,11 @@ module.exports = {
       message,
     }
 
-    const maxSize = 256 * 1024 // 256kb 
-    const recordLength = getLength(JSON.stringify(messagePayload))
-    // throw an error if the payload is too big
-    if (recordLength > maxSize) {
-      // text must be truncated
-      throw new Error('maxPayloadExceeded')
-    }  
-  
     if (process.env.NODE_ENV === 'test') {
       return messagePayload
     }
-
-    const awsInput = {
-      QueueUrl: `https://sqs.${this.aws.region}.amazonaws.com/${this.aws.accountId}/${this.sqsQueue}`,
-      MessageBody: JSON.stringify(messagePayload)
-    }
-    const command = new SendMessageCommand(awsInput)
     try {
-      const response = await this.aws.sqs.send(command)
+      await this.acsqs.sendSQSMessage({ name: this.sqsQueue, message: JSON.stringify(messagePayload) })
       if (this.debugMode) console.warn(response)
     }
     catch(e) {

package/package.json

@@ -3,13 +3,10 @@
   "author": "Mark Poepping (https://www.admiralcloud.com)",
   "license": "MIT",
   "repository": "admiralcloud/ac-support-connector",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "dependencies": {
-    "@aws-sdk/client-sqs": "^3.637.0",
-    "@aws-sdk/client-sts": "^3.637.0",
-    "@aws-sdk/credential-providers": "^3.637.0",
-    "node-cache": "^5.1.2",
-    "utf8-byte-length": "^1.0.5"
+    "ac-sqs": "^2.0.4",
+    "node-cache": "^5.1.2"
   },
   "devDependencies": {
     "ac-semantic-release": "^0.4.2",

package/test/test.js

@@ -25,7 +25,7 @@ describe('Basic tests', () => {
     expect(response.message[0]).to.have.property('content', params.text)
   })
 
-  it('Check truncated payload > 256KB - should throw an error', async() => {
+  it('Check truncated payload > 256KB - should not throw an error', async() => {
     let params = {
       subject: 'Failed',
       message: [{
@@ -34,14 +34,11 @@ describe('Basic tests', () => {
       }]
     }
 
-    try {
-      await supCon.createMessage(params)
-      expect.fail('Expected function to throw an error, but it did not')
-    } 
-    catch (error) {
-      expect(error).to.be.an('error')
-      expect(error.message).to.include('maxPayloadExceeded')
-    }
+    let response = await supCon.createMessage(params)
+    expect(response).to.have.property('subject', params.subject)
+    expect(response).to.have.property('message').that.is.an('array').with.lengthOf.at.least(1);
+    expect(response.message[0]).to.have.property('type', 'text')
+    expect(response.message[0]).to.have.property('content', string1001)
   })
 })