@aws-sdk/s3 / aws-sdk/clients/s3 → @aws-lite/s3

Remove Node.js >= 18 conditional checks for a bunch of unit tests broken by AWS SDK v3

package.json

@@ -24,6 +24,10 @@
   "files": [
     "src/*"
   ],
+  "dependencies": {
+    "@aws-lite/client": "~0.12.2",
+    "@aws-lite/s3": "~0.1.4"
+  },
   "devDependencies": {
     "@architect/eslint-config": "~2.1.2",
     "@architect/req-res-fixtures": "git+https://github.com/architect/req-res-fixtures.git",

src/lib/get-s3.js

@@ -0,0 +1,13 @@
+let s3
+
+module.exports = async function getS3 () {
+  if (s3) return s3
+  // eslint-disable-next-line
+  let awsLite = require('@aws-lite/client')
+  s3 = await awsLite({
+    autoloadPlugins: false,
+    region: process.env.AWS_REGION || 'us-west-2',
+    plugins: [ '@aws-lite/s3' ],
+  })
+  return s3
+}

src/read/_pretty.js

@@ -1,15 +1,8 @@
-let _isNode18 = require('../lib/is-node-18')
 let { existsSync, readdirSync, readFileSync, statSync } = require('fs')
 let { join, parse } = require('path')
+let getS3 = require('../lib/get-s3')
 let { httpError } = require('../lib/error')
 
-let s3
-if (process.env.__TESTING__) {
-  // eslint-disable-next-line
-  let S3 = require('aws-sdk/clients/s3')
-  s3 = new S3
-}
-
 /**
  * Peek into a dir without a trailing slash to see if it's got an index.html file
  *   If not, look for a custom 404.html
@@ -31,8 +24,7 @@ module.exports = async function pretty (params) {
     return Key
   }
 
-  // eslint-disable-next-line
-  async function getLocal (file) {
+  async function getLocal ({ Key: file }) {
     if (!file.startsWith(sandboxPath)) {
       file = join(sandboxPath, file)
     }
@@ -53,30 +45,13 @@ module.exports = async function pretty (params) {
     }
   }
 
-  async function getS3 (Key) {
-    if (_isNode18) {
-      // eslint-disable-next-line
-      let { S3 } = require('@aws-sdk/client-s3')
-      let s3 = new S3({ region: process.env.AWS_REGION || 'us-west-2' })
-      return s3.getObject({ Bucket, Key })
-    }
-    else {
-      if (!process.env.__TESTING__) {
-        // eslint-disable-next-line
-        let S3 = require('aws-sdk/clients/s3')
-        s3 = new S3
-      }
-      return s3.getObject({ Bucket, Key }).promise()
-    }
-  }
-
-  async function get (file) {
-    let getter = local ? getLocal : getS3
+  async function get (Key) {
+    let getter = local ? getLocal : await getS3()
     try {
-      return await getter(file)
+      return await getter({ Bucket, Key })
     }
     catch (err) {
-      if (err.name === 'NoSuchKey') {
+      if (err.name === 'NoSuchKey' || err.code === 'NoSuchKey') {
         err.statusCode = 404
         return err
       }

src/read/_s3.js

@@ -1,7 +1,7 @@
 let { existsSync, readFileSync } = require('fs')
 let { extname, join } = require('path')
 
-let _isNode18 = require('../lib/is-node-18')
+let getS3 = require('../lib/get-s3')
 let _isHTMLorJSON = require('../lib/is-html-json')
 let binaryTypes = require('../lib/binary-types')
 let binaryExts = require('../lib/binary-extensions')
@@ -74,38 +74,14 @@ module.exports = async function readS3 (params) {
       options.IfNoneMatch = IfNoneMatch
     }
 
-    let method
-    if (_isNode18) {
-      // eslint-disable-next-line
-      let { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3')
-      let client = new S3Client({ region: process.env.AWS_REGION || 'us-west-2' })
-      method = async params => {
-        let command = new GetObjectCommand(params)
-        let res = await client.send(command)
-        let streamToString = stream => new Promise((resolve, reject) => {
-          let chunks = []
-          stream.on('data', chunk => chunks.push(chunk))
-          stream.on('error', reject)
-          stream.on('end', () => resolve(Buffer.concat(chunks)))
-        })
-        let Body = await streamToString(res.Body)
-        return { ...res, ...{ Body } }
-      }
-    }
-    else {
-      // eslint-disable-next-line
-      let S3 = require('aws-sdk/clients/s3')
-      let s3 = new S3
-      method = params => s3.getObject(params).promise()
-    }
-
+    let s3 = await getS3()
     let result
     try {
-      result = await method(options)
+      result = await s3(options)
     }
     catch (err) {
       // ETag matches (getObject error code of NotModified), so don't transit the whole file
-      if (err.code === 'NotModified' || err['$metadata']?.httpStatusCode === 304) {
+      if (err.code === 'NotModified' || err.statusCode === 304) {
         matchedETag = true
         headers.etag = IfNoneMatch
         response = {