Add support for @aws-sdk version 3

lib/Open/index.js

@@ -1,100 +1,134 @@
-const fs = require('graceful-fs');
-const directory = require('./directory');
-const Stream = require('stream');
+const fs = require("graceful-fs");
+const directory = require("./directory");
+const Stream = require("stream");
 
 module.exports = {
-  buffer: function(buffer, options) {
+  buffer: function (buffer, options) {
     const source = {
-      stream: function(offset, length) {
+      stream: function (offset, length) {
         const stream = Stream.PassThrough();
         const end = length ? offset + length : undefined;
         stream.end(buffer.slice(offset, end));
         return stream;
       },
-      size: function() {
+      size: function () {
         return Promise.resolve(buffer.length);
-      }
+      },
     };
     return directory(source, options);
   },
-  file: function(filename, options) {
+  file: function (filename, options) {
     const source = {
-      stream: function(start, length) {
+      stream: function (start, length) {
         const end = length ? start + length : undefined;
-        return fs.createReadStream(filename, {start, end});
+        return fs.createReadStream(filename, { start, end });
       },
-      size: function() {
-        return new Promise(function(resolve, reject) {
-          fs.stat(filename, function(err, d) {
-            if (err)
-              reject(err);
-            else
-              resolve(d.size);
+      size: function () {
+        return new Promise(function (resolve, reject) {
+          fs.stat(filename, function (err, d) {
+            if (err) reject(err);
+            else resolve(d.size);
           });
         });
-      }
+      },
     };
     return directory(source, options);
   },
 
-  url: function(request, params, options) {
-    if (typeof params === 'string')
-      params = {url: params};
-    if (!params.url)
-      throw 'URL missing';
+  url: function (request, params, options) {
+    if (typeof params === "string") params = { url: params };
+    if (!params.url) throw "URL missing";
     params.headers = params.headers || {};
 
     const source = {
-      stream : function(offset, length) {
+      stream: function (offset, length) {
         const options = Object.create(params);
-        const end = length ? offset + length : '';
+        const end = length ? offset + length : "";
         options.headers = Object.create(params.headers);
-        options.headers.range = 'bytes='+offset+'-' + end;
+        options.headers.range = "bytes=" + offset + "-" + end;
         return request(options);
       },
-      size: function() {
-        return new Promise(function(resolve, reject) {
+      size: function () {
+        return new Promise(function (resolve, reject) {
           const req = request(params);
-          req.on('response', function(d) {
-            req.abort();
-            if (!d.headers['content-length'])
-              reject(new Error('Missing content length header'));
-            else
-              resolve(d.headers['content-length']);
-          }).on('error', reject);
+          req
+            .on("response", function (d) {
+              req.abort();
+              if (!d.headers["content-length"])
+                reject(new Error("Missing content length header"));
+              else resolve(d.headers["content-length"]);
+            })
+            .on("error", reject);
         });
-      }
+      },
     };
 
     return directory(source, options);
   },
 
-  s3 : function(client, params, options) {
+  s3: function (client, params, options) {
     const source = {
-      size: function() {
-        return new Promise(function(resolve, reject) {
-          client.headObject(params, function(err, d) {
-            if (err)
-              reject(err);
-            else
-              resolve(d.ContentLength);
+      size: function () {
+        return new Promise(function (resolve, reject) {
+          client.headObject(params, function (err, d) {
+            if (err) reject(err);
+            else resolve(d.ContentLength);
           });
         });
       },
-      stream: function(offset, length) {
+      stream: function (offset, length) {
         const d = {};
-        for (const key in params)
-          d[key] = params[key];
-        const end = length ? offset + length : '';
-        d.Range = 'bytes='+offset+'-' + end;
+        for (const key in params) d[key] = params[key];
+        const end = length ? offset + length : "";
+        d.Range = "bytes=" + offset + "-" + end;
         return client.getObject(d).createReadStream();
-      }
+      },
     };
 
     return directory(source, options);
   },
+  s3_v3: function (client, params, options) {
+    const {
+      GetObjectCommand,
+      HeadObjectCommand,
+    } = require("@aws-sdk/client-s3");
 
-  custom: function(source, options) {
+    const source = {
+      size: async () => {
+        const head = await client.send(
+          new HeadObjectCommand({
+            Bucket: params.Bucket,
+            Key: params.Key,
+          })
+        );
+
+        return head.ContentLength ?? 0;
+      },
+      stream: (offset, length) => {
+        const stream = Stream.PassThrough();
+        const end = length ? offset + length : "";
+        client
+          .send(
+            new GetObjectCommand({
+              Bucket: params.Bucket,
+              Key: params.Key,
+              Range: `bytes=${offset}-${end}`,
+            })
+          )
+          .then((response) => {
+            response.Body.pipe(stream);
+          })
+          .catch((error) => {
+            stream.emit("error", error);
+          });
+
+        return stream;
+      },
+    };
+
+    return directory(source, options);
+  },
+  custom: function (source, options) {
     return directory(source, options);
-  }
+  },
 };

package.json

@@ -41,6 +41,9 @@
     "tap": "^12.7.0",
     "temp": ">= 0.4.0 < 1"
   },
+  "optionalDependencies": {
+    "@aws-sdk/client-s3": "^3.0.0"
+  },
   "directories": {
     "example": "examples",
     "test": "test"