latest aws-lite

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [ 14.x, 16.x, 18.x ]
+        node-version: [ 14.x, 16.x, 18.x, 20.x ]
         os: [windows-latest, ubuntu-latest, macOS-latest]
 
     # Go
@@ -42,7 +42,7 @@ jobs:
     - name: Notify
       uses: homoluctus/slatify@master
       # Only fire alert once
-      if: github.ref == 'refs/heads/master' && failure() && matrix.node-version == '14.x' && matrix.os == 'ubuntu-latest'
+      if: github.ref == 'refs/heads/master' && failure() && matrix.node-version == '20.x' && matrix.os == 'ubuntu-latest'
       with:
         type: ${{ job.status }}
         job_name: '*Build*'
@@ -67,7 +67,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: lts/*
           registry-url: https://registry.npmjs.org/
 
       - name: Install
@@ -89,7 +89,7 @@ jobs:
       # Set up Node again, this time using GitHub as the publish target
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: lts/*
           registry-url: https://npm.pkg.github.com/
 
       # Change package org (@smallwins on GitHub vs @begin on NPM)

package.json

@@ -1,9 +1,10 @@
 {
   "name": "@begin/data",
-  "version": "4.0.2",
+  "version": "5.0.0-RC.2",
   "description": "Begin Data is a durable and fast key/value document store built on top of DynamoDB",
   "main": "src/index.js",
   "scripts": {
+    "t": "tape test/integration-test.js | tap-spec",
     "lint": "eslint --fix .",
     "test": "npm run lint && tape test/*-test.js | tap-spec",
     "rc": "npm version prerelease --preid RC"
@@ -24,21 +25,20 @@
     "src/*"
   ],
   "dependencies": {
+    "@aws-lite/client": "^0.17.1",
+    "@aws-lite/dynamodb": "^0.3.4",
+    "@aws-lite/ssm": "^0.2.3",
     "@begin/hashid": "^1.0.0",
     "run-parallel": "^1.2.0",
     "run-waterfall": "^1.1.7"
   },
   "devDependencies": {
-    "@architect/eslint-config": "^2.0.1",
-    "@architect/sandbox": "^5.1.0-RC.0",
-    "@aws-sdk/client-dynamodb": "^3.216.0",
-    "@aws-sdk/client-ssm": "^3.216.0",
-    "@aws-sdk/lib-dynamodb": "^3.216.0",
-    "aws-sdk": "^2.1261.0",
-    "eslint": "^8.10.0",
+    "@architect/eslint-config": "^2.1.2",
+    "@architect/sandbox": "^6.0.0-RC.1",
+    "eslint": "^8.56.0",
     "tap-spec": "^5.0.0",
-    "tape": "^5.5.2",
-    "tiny-json-http": "^7.3.1"
+    "tape": "^5.7.4",
+    "tiny-json-http": "^7.5.1"
   },
   "eslintConfig": {
     "extends": "@architect/eslint-config",

src/count.js

@@ -2,9 +2,10 @@
  * @module count
  */
 let waterfall = require('run-waterfall')
+let util = require('util')
 let getTableName = require('./helpers/_get-table-name')
 let getKey = require('./helpers/_get-key')
-let dynamo = require('./helpers/_dynamo').doc
+let dynamo = require('./helpers/_dynamo')
 
 /**
  * Get document count for given table
@@ -36,7 +37,8 @@ module.exports = function count ({ table }, callback) {
       })
     },
     function counts (TableName, doc, callback) {
-      doc.query({
+      let query = util.callbackify(doc.Query)
+      query({
         TableName,
         Select: 'COUNT',
         KeyConditionExpression: '#scopeID = :scopeID and begins_with(#dataID, :dataID)',

src/destroy/batch.js

@@ -2,10 +2,11 @@
  * @private
  * @module destroy/batch
  */
+let util = require('util')
 let waterfall = require('run-waterfall')
 let getTableName = require('../helpers/_get-table-name')
 let getKey = require('../helpers/_get-key')
-let dynamo = require('../helpers/_dynamo').doc
+let dynamo = require('../helpers/_dynamo')
 
 /**
  * Destroy an array of documents
@@ -33,7 +34,8 @@ module.exports = function batch (params, callback) {
       let batch = params.map(getKey).map(req)
       let query = { RequestItems: {} }
       query.RequestItems[TableName] = batch
-      doc.batchWrite(query, callback)
+      let batchWrite = util.callbackify(doc.BatchWriteItem)
+      batchWrite(query, callback)
     }
   ],
   function destroyed (err) {

src/destroy/one.js

@@ -2,10 +2,11 @@
  * @private
  * @module destroy/one
  */
+let util = require('util')
 let waterfall = require('run-waterfall')
 let getTableName = require('../helpers/_get-table-name')
 let getKey = require('../helpers/_get-key')
-let dynamo = require('../helpers/_dynamo').doc
+let dynamo = require('../helpers/_dynamo')
 
 /**
  * Destroy a document
@@ -22,8 +23,9 @@ module.exports = function one (params, callback) {
       })
     },
     function destroys (TableName, doc, callback) {
+      let del = util.callbackify(doc.DeleteItem)
       let Key = getKey(params)
-      doc.delete({
+      del({
         TableName,
         Key,
       }, callback)

src/get/batch.js

@@ -2,11 +2,12 @@
  * @private
  * @module get/batch
  */
+let util = require('util')
 let waterfall = require('run-waterfall')
 let getTableName = require('../helpers/_get-table-name')
 let getKey = require('../helpers/_get-key')
 let unfmt = require('../helpers/_unfmt')
-let dynamo = require('../helpers/_dynamo').doc
+let dynamo = require('../helpers/_dynamo')
 
 let badKey = i => !(i['table'] && i['key'])
 
@@ -39,9 +40,10 @@ module.exports = function batch (Keys, callback) {
         })
       },
       function gets (table, doc, callback) {
+        let batchGet = util.callbackify(doc.BatchGetItem)
         let query = { RequestItems: {} }
         query.RequestItems[table] = { Keys: Keys.map(getKey) }
-        doc.batchGet(query, function gots (err, result) {
+        batchGet(query, function gots (err, result) {
           if (err) callback(err)
           else {
             callback(null, result.Responses[table].map(unfmt))

src/get/one.js

@@ -6,7 +6,8 @@ let waterfall = require('run-waterfall')
 let getTableName = require('../helpers/_get-table-name')
 let getKey = require('../helpers/_get-key')
 let unfmt = require('../helpers/_unfmt')
-let dynamo = require('../helpers/_dynamo').doc
+let dynamo = require('../helpers/_dynamo')
+let util = require('util')
 
 /**
  * Read a document
@@ -32,8 +33,9 @@ module.exports = function one (params, callback) {
       })
     },
     function gets (TableName, doc, callback) {
+      let getItem = util.callbackify(doc.GetItem)
       let Key = getKey(params)
-      doc.get({
+      getItem({
         TableName,
         Key
       }, callback)

src/get/page.js

@@ -6,7 +6,8 @@ let waterfall = require('run-waterfall')
 let getTableName = require('../helpers/_get-table-name')
 let getKey = require('../helpers/_get-key')
 let unfmt = require('../helpers/_unfmt')
-let dynamo = require('../helpers/_dynamo').doc
+let dynamo = require('../helpers/_dynamo')
+let util = require('util')
 
 /**
  * Read documents
@@ -55,16 +56,18 @@ module.exports = function page (params, callback) {
       if (params.cursor) {
         query.ExclusiveStartKey = JSON.parse(Buffer.from(params.cursor, 'base64').toString('utf8'))
       }
-      doc.query(query, callback)
+      let runQuery = util.callbackify(doc.Query)
+      runQuery(query, callback)
     },
   ],
   function paged (err, result) {
     if (err) callback(err)
     else {
       let exact = item => item.table === params.table
       let returns = result.Items.map(unfmt).filter(exact)
-      if (result.LastEvaluatedKey)
+      if (result.LastEvaluatedKey) {
         returns.cursor = Buffer.from(JSON.stringify(result.LastEvaluatedKey)).toString('base64')
+      }
       callback(null, returns)
     }
   })

src/helpers/_atomic-counters.js

@@ -4,7 +4,8 @@
  * @module decr
  */
 let waterfall = require('run-waterfall')
-let dynamo = require('./_dynamo').doc
+let util = require('util')
+let dynamo = require('./_dynamo')
 let getTableName = require('./_get-table-name')
 let getKey = require('./_get-key')
 let unfmt = require('./_unfmt')
@@ -41,9 +42,10 @@ function atomic (isIncr, params, callback) {
         else callback(null, TableName, doc)
       })
     },
-    function update (TableName, doc, callback) {
+    function _update (TableName, doc, callback) {
       // perform the atomic update and callback w the updated values
-      doc.update({
+      let update = util.callbackify(doc.UpdateItem)
+      update({
         TableName,
         Key: getKey({ table, key }),
         UpdateExpression: `SET ${prop} = if_not_exists(${prop}, :zero) ${isIncr ? '+' : '-'} :val`,

src/helpers/_create-key.js

@@ -4,8 +4,9 @@
  */
 let waterfall = require('run-waterfall')
 let getTableName = require('./_get-table-name')
-let dynamo = require('./_dynamo').db
+let dynamo = require('./_dynamo')
 let Hashids = require('@begin/hashid')
+let util = require('util')
 let hash = new Hashids
 
 module.exports = function createKey (table, callback) {
@@ -19,27 +20,27 @@ module.exports = function createKey (table, callback) {
       })
     },
     function update (TableName, db, callback) {
-      db.updateItem({
+      let updateItem = util.callbackify(db.UpdateItem)
+      let query = {
         TableName,
         Key: {
-          'scopeID': { S: BEGIN_DATA_SCOPE_ID || ARC_APP_NAME },
-          'dataID': { S: `${table}-seq` }
+          'scopeID': BEGIN_DATA_SCOPE_ID || ARC_APP_NAME,
+          'dataID': `${table}-seq`
         },
-        AttributeUpdates: {
-          idx: {
-            Action: 'ADD',
-            Value: { N: '1' }
-          }
+        UpdateExpression: `SET idx = if_not_exists(idx, :one) + :one`,
+        ExpressionAttributeValues: {
+          ':one': 1
         },
-        ReturnValues: 'UPDATED_NEW'
-      }, callback)
+        ReturnValues: 'ALL_NEW'
+      }
+      updateItem(query, callback)
     }
   ],
   function done (err, result) {
     if (err) callback(err)
     else {
       let epoc = Date.now() - 1544909702376 // hbd
-      let seed = Number(result.Attributes.idx.N)
+      let seed = Number(result.Attributes.idx)
       let val = hash.encode([ epoc, seed ])
       callback(null, val)
     }

src/helpers/_dynamo.js

@@ -1,70 +1,52 @@
-let https = require('https')
 let getPorts = require('./_get-ports')
-let isNode18 = require('./_is-node-18')
-let db, doc
+let util = require('util')
+let awsLite = require('@aws-lite/client')
+let aws = util.callbackify(awsLite)
+let db = false
 
 /**
  * Instantiates Dynamo service interfaces
  */
-function getDynamo (type, callback) {
+module.exports = function getDynamo (callback) {
 
   let { ARC_ENV, AWS_REGION, ARC_LOCAL } = process.env
 
-  if (db && type === 'db') {
-    return callback(null, db)
-  }
-
-  if (doc && type === 'doc') {
-    return callback(null, doc)
-  }
-
-  let DB, Doc
-  if (isNode18) {
-    let dynamo = require('@aws-sdk/client-dynamodb')
-    let docclient = require('@aws-sdk/lib-dynamodb')
-    DB = dynamo.DynamoDB
-    Doc = docclient.DynamoDBDocument
-  }
-  else {
-    let dynamo = require('aws-sdk/clients/dynamodb')
-    DB = dynamo
-    Doc = dynamo.DocumentClient
-  }
+  if (db) return callback(null, db)
 
   let local = ARC_ENV === 'testing' || ARC_LOCAL
   if (!local) {
-    let config = {
-      agent: new https.Agent({
-        keepAlive: true,
-        maxSockets: 50, // Node can set to Infinity; AWS maxes at 50
-        rejectUnauthorized: true,
-      })
-    }
-    db = isNode18 ? new DB : new DB(config)
-    doc = isNode18 ? Doc.from(db) : new Doc(config)
-    return callback(null, type === 'db' ? db : doc)
+    let plugins = [ import('@aws-lite/dynamodb') ]
+    aws({ plugins }, function gotClient (err, { ddb }) {
+      if (err) callback(err)
+      else {
+        db = ddb
+        callback(null, db)
+      }
+    })
   }
   else {
-    getPorts((err, ports) => {
+    getPorts(function gotPorts (err, ports) {
       if (err) callback(err)
       else {
         let port = ports.tables
         if (!port) {
           return callback(ReferenceError('Sandbox tables port not found'))
         }
-        let config = {
-          endpoint: `http://localhost:${port}`,
-          region: AWS_REGION || 'us-west-2' // Do not assume region is set!
-        }
-        db = new DB(config)
-        doc = isNode18 ? Doc.from(db) : new Doc(config)
-        return callback(null, type === 'db' ? db : doc)
+        aws({
+          protocol: 'http',
+          host: 'localhost',
+          port,
+          plugins: [ import('@aws-lite/dynamodb') ],
+          region: AWS_REGION || 'us-west-2'
+        },
+        function gotClient (err, client) {
+          if (err) callback(err)
+          else {
+            db = client.dynamodb
+            callback(null, db)
+          }
+        })
       }
     })
   }
 }
-
-module.exports = {
-  db: getDynamo.bind({}, 'db'),
-  doc: getDynamo.bind({}, 'doc'),
-}