presidium 0.16.15 → 0.16.17

package/.eslintrc.js

@@ -210,7 +210,7 @@ module.exports = {
         'no-sequences': 'off',
         'no-shadow': 'off',
         'no-spaced-func': 'error',
-        'no-sync': 'error',
+        'no-sync': 'off',
         'no-tabs': 'error',
         'no-template-curly-in-string': 'error',
         'no-ternary': 'off',
@@ -269,7 +269,7 @@ module.exports = {
             'single'
         ],
         'radix': 'error',
-        'require-atomic-updates': 'error',
+        'require-atomic-updates': 'off',
         'require-await': 'off',
         'require-jsdoc': 'error',
         'require-unicode-regexp': 'off',

package/AwsCredentials.js

@@ -0,0 +1,61 @@
+require('rubico/global')
+const fs = require('fs')
+const nodePath = require('path')
+const pathResolve = require('./internal/pathResolve')
+
+/**
+ * @name AwsCredentials
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * AwsCredentials(options {
+ *   profile?: string,
+ *   credentialsFileDir?: string,
+ * }) -> awsCreds {
+ *   accessKeyId: string,
+ *   secretAccessKey: string,
+ * }
+ *
+ * AwsCredentials(profile string) -> awsCreds {
+ *   accessKeyId: string,
+ *   secretAccessKey: string,
+ * }
+ * ```
+ */
+
+const AwsCredentials = async function (options = {}) {
+  const profile = (
+    typeof options == 'string' ? options : options.profile
+  ) ?? 'default'
+
+  let credentialsFileDir =
+    options.credentialsFileDir ?? pathResolve(process.cwd())
+  let lines = ''
+  while (credentialsFileDir != '/') {
+    const credentialsFilePath =
+      pathResolve(credentialsFileDir, '.aws/credentials')
+    if (fs.existsSync(credentialsFilePath)) {
+      lines = await (
+        fs.promises.readFile(credentialsFilePath)
+        .then(buffer => `${buffer}`.split('\n'))
+      )
+      break
+    }
+    credentialsFileDir = pathResolve(credentialsFileDir, '..')
+  }
+
+  const startingLineNumber = lines.findIndex(line => line == `[${profile}]`)
+
+  const accessKeyId = lines.find(
+    (line, index) => index > startingLineNumber
+    && line.startsWith('aws_access_key_id')
+  ).split(' = ')[1]
+  const secretAccessKey = lines.find(
+    (line, index) => index > startingLineNumber
+    && line.startsWith('aws_secret_access_key')
+  ).split(' = ')[1]
+
+  return { accessKeyId, secretAccessKey }
+}
+
+module.exports = AwsCredentials

package/AwsCredentials.test.js

@@ -0,0 +1,45 @@
+const Test = require('thunk-test')
+const assert = require('assert')
+const fs = require('fs')
+const AwsCredentials = require('./AwsCredentials')
+
+const test = new Test('AwsCredentials', async function () {
+  try {
+    await fs.promises.mkdir(`${__dirname}/.aws`)
+  } catch {
+    await fs.promises.rm(`${__dirname}/.aws`, { recursive: true })
+    await fs.promises.mkdir(`${__dirname}/.aws`)
+  }
+
+  await fs.promises.writeFile(`${__dirname}/.aws/credentials`, `
+[default]
+aws_access_key_id = AAA
+aws_secret_access_key = FFF
+  `.trim())
+
+  {
+    const awsCreds = await AwsCredentials('default')
+    assert.equal(awsCreds.accessKeyId, 'AAA')
+    assert.equal(awsCreds.secretAccessKey, 'FFF')
+  }
+
+  {
+    const awsCreds = await AwsCredentials({ profile: 'default' })
+    assert.equal(awsCreds.accessKeyId, 'AAA')
+    assert.equal(awsCreds.secretAccessKey, 'FFF')
+  }
+
+  {
+    const awsCreds = await AwsCredentials()
+    assert.equal(awsCreds.accessKeyId, 'AAA')
+    assert.equal(awsCreds.secretAccessKey, 'FFF')
+  }
+
+  await fs.promises.rm(`${__dirname}/.aws`, { recursive: true })
+}).case()
+
+if (process.argv[1] == __filename) {
+  test()
+}
+
+module.exports = test

package/DynamoStream.js

@@ -150,7 +150,16 @@ DynamoStream.prototype.getRecords = async function* getRecords(
   let records = await this.client.getRecords({
     ShardIterator: startingShardIterator,
     Limit: this.getRecordsLimit
-  }).promise()
+  }).promise().catch(error => {
+    if (error.retryable) {
+      return this.client.getRecords({
+        ShardIterator: startingShardIterator,
+        Limit: this.getRecordsLimit
+      }).promise()
+    }
+    throw error
+  })
+
   if (records.Records.length > 0) {
     yield* records.Records.map(assign({
       table: always(this.table),
@@ -163,7 +172,16 @@ DynamoStream.prototype.getRecords = async function* getRecords(
     records = await this.client.getRecords({
       ShardIterator: records.NextShardIterator,
       Limit: this.getRecordsLimit
-    }).promise()
+    }).promise().catch(error => {
+      if (error.retryable) {
+        return this.client.getRecords({
+          ShardIterator: records.NextShardIterator,
+          Limit: this.getRecordsLimit
+        }).promise()
+      }
+      throw error
+    })
+
     if (records.Records.length > 0) {
       yield* records.Records.map(assign({
         table: always(this.table),

package/DynamoStream.test.js

@@ -38,6 +38,7 @@ const test = Test('DynamoStream', DynamoStream)
   table: 'my-table',
   endpoint: 'http://localhost:8000',
   shardIteratorType: 'TRIM_HORIZON',
+  shardUpdatePeriod: 1000,
 }, async function (myStream) {
   await myStream.ready
 
@@ -83,7 +84,7 @@ const test = Test('DynamoStream', DynamoStream)
   endpoint: 'http://localhost:8000',
   getRecordsLimit: 1,
   getRecordsInterval: 1000,
-  shardUpdatePeriod: 5000,
+  shardUpdatePeriod: 1000,
   shardIteratorType: 'TRIM_HORIZON',
 }, async function (myStream) {
   await myStream.ready
@@ -129,6 +130,7 @@ const test = Test('DynamoStream', DynamoStream)
   table: 'my-table',
   endpoint: 'http://localhost:8000',
   getRecordsLimit: 1,
+  shardUpdatePeriod: 1000,
   shardIteratorType: 'TRIM_HORIZON',
 }, async function (myStream) {
   await myStream.ready
@@ -183,6 +185,7 @@ const test = Test('DynamoStream', DynamoStream)
   listStreamsLimit: 1,
   shardIteratorType: 'TRIM_HORIZON',
   debug: true,
+  shardUpdatePeriod: 1000,
 }, async function (myStream) {
   await myStream.ready
 
@@ -223,6 +226,82 @@ const test = Test('DynamoStream', DynamoStream)
   myStream.close()
 })
 
+.case({
+  table: 'my-table',
+  endpoint: 'http://localhost:8000',
+  listStreamsLimit: 1,
+  shardIteratorType: 'TRIM_HORIZON',
+  debug: true,
+  shardUpdatePeriod: 1000,
+}, async function (myStream) {
+  await myStream.ready
+
+  const originalClient = myStream.client
+  const alternatingErrorClient = {
+    listStreams(options) {
+      return originalClient.listStreams(options)
+    },
+    describeStream(options) {
+      return originalClient.describeStream(options)
+    },
+    getShardIterator(options) {
+      return originalClient.getShardIterator(options)
+    },
+    getRecordsCount: 0,
+    getRecords(options) {
+      return {
+        async promise() {
+          if (alternatingErrorClient.getRecordsCount % 2 == 0) {
+            const error = new Error('stub error')
+            error.retryable = true
+            alternatingErrorClient.getRecordsCount += 1
+            throw error
+          }
+          alternatingErrorClient.getRecordsCount += 1
+          return originalClient.getRecords(options).promise()
+        },
+      }
+    },
+  }
+  myStream.client = alternatingErrorClient
+
+  const table = this.table
+  await table.putItem({
+    id: '1',
+    status: 'waitlist',
+    createTime: 1000,
+    name: 'George',
+  })
+  await table.putItem({
+    id: '2',
+    status: 'waitlist',
+    createTime: 1001,
+    name: 'geo',
+  })
+  await table.putItem({
+    id: '3',
+    status: 'waitlist',
+    createTime: 1002,
+    name: 'john',
+  })
+  await table.putItem({
+    id: '4',
+    status: 'approved',
+    createTime: 1003,
+    name: 'sally',
+  })
+  await table.putItem({
+    id: '5',
+    status: 'approved',
+    createTime: 1004,
+    name: 'sally',
+  })
+
+  const first5 = await asyncIterableTake(5)(myStream)
+  assert.strictEqual(first5.length, 5)
+  myStream.close()
+})
+
 .case({
   table: 'my-table',
   endpoint: 'http://localhost:8000',

package/SecretsManager.js

@@ -52,7 +52,7 @@ client.getSecretValue({SecretId: secretName}, function(err, data) {
             decodedBinarySecret = buff.toString('ascii');
         }
     }
-    
-    // Your code goes here. 
+
+    // Your code goes here.
 });
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.16.15",
+  "version": "0.16.17",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",