cloud-bucket 0.3.13 → 0.4.0-SNAPSHOT.1

package/dist/bucket.d.ts

@@ -2,8 +2,8 @@
 import { Bucket as GoogleBucket } from '@google-cloud/storage';
 import { S3 } from 'aws-sdk';
 import { Readable, Writable } from 'stream';
-import { Driver, ListCloudFilesOptions } from './driver';
-import { BucketFile, BucketFileDeleted, BucketType, ListArg, ListOptions, ListResult } from './types';
+import { Driver, ListCloudFilesOptions } from './driver.js';
+import { BucketFile, BucketFileDeleted, BucketType, ListArg, ListOptions, ListResult } from './types.js';
 export interface BucketOptions {
     driver: Driver;
     log: boolean;

package/dist/bucket.js

@@ -1,34 +1,23 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePrefixOrGlob = exports.parseListOptions = exports.getContentType = exports.buildFullDestPath = exports.newBucket = void 0;
-const fs_extra_plus_1 = require("fs-extra-plus");
-const mime_types_1 = require("mime-types");
-const Path = __importStar(require("path"));
-function newBucket(opts) {
+import { glob, mkdirp } from 'fs-extra-plus';
+import { lookup } from 'mime-types';
+import * as Path from 'path';
+export function newBucket(opts) {
     return new BucketImpl(opts);
 }
-exports.newBucket = newBucket;
 class BucketImpl {
     constructor(opts) {
+        Object.defineProperty(this, "driver", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "log", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.driver = opts.driver;
         this.log = opts.log;
     }
@@ -135,7 +124,7 @@ class BucketImpl {
             const remotePath = this.driver.getPath(cf);
             const localFilePath = (isLocalPathDir) ? getDestPath(baseDir, remotePath, localPath) : localPath;
             const localPathDir = Path.dirname(localFilePath);
-            await fs_extra_plus_1.mkdirp(localPathDir);
+            await mkdirp(localPathDir);
             if (this.log) {
                 process.stdout.write(`Downloading ${this.type}://${this.name}/${remotePath} to ${localFilePath}`);
             }
@@ -167,7 +156,7 @@ class BucketImpl {
         }
         const isLocalGlob = localPath.includes('*');
         const { baseDir } = parsePrefixOrGlob(localPath);
-        const localFiles = await fs_extra_plus_1.glob(localPath);
+        const localFiles = await glob(localPath);
         for (const localPath of localFiles) {
             // if we have an localFileExpression (globs), then, we build the fullDestPath relative to the baseDir of the glob (last / before the first *)
             const fullDestPath = (isLocalGlob) ? getDestPath(baseDir, localPath, remotePath) : buildFullDestPath(localPath, remotePath);
@@ -256,7 +245,7 @@ function getDestPath(baseDir, remotePath, destPathDir) {
  *
  * @throws exception if destPath is not present.
  */
-function buildFullDestPath(localPath, destPath) {
+export function buildFullDestPath(localPath, destPath) {
     // we do not have a dest path, throw error
     if (!destPath) {
         throw new Error('No depthPath');
@@ -273,14 +262,12 @@ function buildFullDestPath(localPath, destPath) {
     }
     return fullDestPath;
 }
-exports.buildFullDestPath = buildFullDestPath;
-function getContentType(path) {
-    let ct = mime_types_1.lookup(path);
+export function getContentType(path) {
+    let ct = lookup(path);
     let contentType = (ct) ? ct : undefined;
     return contentType;
 }
-exports.getContentType = getContentType;
-function parseListOptions(optsOrPrefix) {
+export function parseListOptions(optsOrPrefix) {
     if (optsOrPrefix == null) {
         optsOrPrefix = ''; // for now, default
     }
@@ -289,7 +276,6 @@ function parseListOptions(optsOrPrefix) {
     const { directory, limit, marker } = opts;
     return { prefix, glob, directory, limit, marker };
 }
-exports.parseListOptions = parseListOptions;
 /**
  * Return a clean prefix and glob when defined in the string. Clean prefix, meaning, glob less one,
  * that can be passed to most cloud storage api.
@@ -300,7 +286,7 @@ exports.parseListOptions = parseListOptions;
  * 					- glob is prefixOrGlob value if it is a glob, otherwise undefined.
  * 					- baseDir is the eventual longest directory path without any glob char (ending with '/')
  */
-function parsePrefixOrGlob(prefixOrGlob) {
+export function parsePrefixOrGlob(prefixOrGlob) {
     let glob;
     let prefix;
     let baseDir;
@@ -324,5 +310,4 @@ function parsePrefixOrGlob(prefixOrGlob) {
     }
     return { prefix, glob, baseDir };
 }
-exports.parsePrefixOrGlob = parsePrefixOrGlob;
 //#endregion ---------- /Utils ----------

package/dist/driver-aws.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { S3 } from 'aws-sdk';
+import type { S3 as S3_TYPE } from 'aws-sdk';
 import { Readable, Writable } from "stream";
 import { Driver, ListCloudFilesOptions, ListCloudFilesResult } from "./driver";
 import { BucketFile, BucketType } from './types';
-declare type AwsFile = S3.Object & {
+declare type AwsFile = S3_TYPE.Object & {
     ContentType?: string;
 };
 export interface S3DriverCfg {
@@ -17,7 +17,7 @@ export declare class S3Driver implements Driver<AwsFile> {
     private baseParams;
     get type(): BucketType;
     get name(): string;
-    constructor(s3: S3, bucketName: string);
+    constructor(s3: S3_TYPE, bucketName: string);
     toFile(awsFile: AwsFile): Omit<BucketFile, 'bucket'>;
     getPath(obj: AwsFile): string;
     exists(path: string): Promise<boolean>;

package/dist/driver-aws.js

@@ -1,22 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.S3Driver = exports.getS3Driver = void 0;
-const aws_sdk_1 = require("aws-sdk");
-const fs_extra_plus_1 = require("fs-extra-plus");
-const stream_1 = require("stream");
-const micromatch = require("micromatch");
-async function getS3Driver(cfg) {
-    const credentials = new aws_sdk_1.Credentials(cfg.access_key_id, cfg.access_key_secret);
+import { PassThrough } from "stream";
+const micromatch = (await import('micromatch')).default;
+const { createReadStream, createWriteStream } = (await import('fs-extra')).default;
+const { Credentials, S3 } = (await import('aws-sdk')).default;
+export async function getS3Driver(cfg) {
+    const credentials = new Credentials(cfg.access_key_id, cfg.access_key_secret);
     // Create S3 service object
-    const s3 = new aws_sdk_1.S3({ apiVersion: '2006-03-01', credentials });
+    const s3 = new S3({ apiVersion: '2006-03-01', credentials });
     return new S3Driver(s3, cfg.bucketName);
 }
-exports.getS3Driver = getS3Driver;
 /**
  * Custom Writable to trigger finish/close event manually on upload
  * TODO: Needs to check if this create some side effect.
  */
-class S3UploadWriteStream extends stream_1.PassThrough {
+class S3UploadWriteStream extends PassThrough {
     emit(event) {
         if (event !== 'finish' && event !== 'close') {
             super.emit(event);
@@ -31,8 +27,20 @@ class S3UploadWriteStream extends stream_1.PassThrough {
         super.emit('close');
     }
 }
-class S3Driver {
+export class S3Driver {
     constructor(s3, bucketName) {
+        Object.defineProperty(this, "s3", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "baseParams", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.s3 = s3;
         this.baseParams = { Bucket: bucketName };
     }
@@ -87,7 +95,6 @@ class S3Driver {
         }
     }
     async listCloudFiles(opts) {
-        var _a;
         const { prefix, glob, directory, limit, marker } = opts;
         // build the list params
         let listParams = {};
@@ -101,24 +108,24 @@ class S3Driver {
             listParams.MaxKeys = limit;
         }
         if (marker != null) {
-            listParams.Marker = marker;
+            listParams.ContinuationToken = marker;
         }
         const params = { ...this.baseParams, ...listParams };
         // perform the s3 list request
         try {
-            const awsResult = await this.s3.listObjects(params).promise();
+            const awsResult = await this.s3.listObjectsV2(params).promise();
             const awsFiles = awsResult.Contents;
             // if glob, filter again the result
             let files = (!glob) ? awsFiles : awsFiles.filter(af => micromatch.isMatch(af.Key, glob));
             let dirs = undefined;
             if (directory && awsResult.CommonPrefixes) {
                 // Note: for now, match the gcp driver, undefined if empty
-                const prefixes = (_a = awsResult.CommonPrefixes) === null || _a === void 0 ? void 0 : _a.map(cp => cp.Prefix);
+                const prefixes = awsResult.CommonPrefixes?.map(cp => cp.Prefix);
                 if (prefixes != null && prefixes.length > 0) {
                     dirs = prefixes;
                 }
             }
-            const nextMarker = awsResult.NextMarker;
+            const nextMarker = awsResult.NextContinuationToken;
             return { files, dirs, nextMarker };
         }
         catch (ex) {
@@ -141,7 +148,7 @@ class S3Driver {
         const remotePath = rawFile.Key;
         const params = { ...this.baseParams, ...{ Key: remotePath } };
         const remoteReadStream = this.s3.getObject(params).createReadStream();
-        const localWriteStream = fs_extra_plus_1.createWriteStream(localPath);
+        const localWriteStream = createWriteStream(localPath);
         const writePromise = new Promise((resolve, reject) => {
             localWriteStream.once('close', () => {
                 resolve();
@@ -154,7 +161,7 @@ class S3Driver {
         await writePromise;
     }
     async uploadCloudFile(localPath, remoteFilePath, contentType) {
-        const readable = fs_extra_plus_1.createReadStream(localPath);
+        const readable = createReadStream(localPath);
         const awsResult = await this.s3.putObject({ ...this.baseParams, ...{ Key: remoteFilePath, Body: readable, ContentType: contentType } }).promise();
         // TODO: probably check the awsResult that match remoteFilePath
         return { Key: remoteFilePath };
@@ -202,4 +209,3 @@ class S3Driver {
         }
     }
 }
-exports.S3Driver = S3Driver;

package/dist/driver-gcp.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGsDriver = void 0;
-const storage_1 = require("@google-cloud/storage");
-const stream_1 = require("stream");
-const micromatch = require("micromatch");
-async function getGsDriver(cfg) {
+import { Storage as GoogleStorage } from '@google-cloud/storage';
+import { Readable } from "stream";
+const micromatch = (await import('micromatch')).default;
+export async function getGsDriver(cfg) {
     // TODO: valid cfg
     const googleStorageConf = {
         projectId: cfg.project_id,
@@ -13,13 +10,18 @@ async function getGsDriver(cfg) {
             private_key: cfg.private_key
         }
     };
-    const storage = new storage_1.Storage(googleStorageConf);
+    const storage = new GoogleStorage(googleStorageConf);
     const googleBucket = storage.bucket(cfg.bucketName);
     return new GcpDriver(googleBucket);
 }
-exports.getGsDriver = getGsDriver;
 class GcpDriver {
     constructor(googleBucket) {
+        Object.defineProperty(this, "googleBucket", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.googleBucket = googleBucket;
     }
     get type() {
@@ -87,7 +89,7 @@ class GcpDriver {
         // get the dirs
         const dirs = (directory && meta.prefixes) ? meta.prefixes : undefined;
         // get pageToken (nextMarker)
-        const nextMarker = info === null || info === void 0 ? void 0 : info.pageToken;
+        const nextMarker = info?.pageToken;
         // if glob, filter the data further
         let files = (!glob) ? gfList : gfList.filter(gf => micromatch.isMatch(gf.name, glob));
         return { files, dirs, nextMarker };
@@ -139,7 +141,7 @@ class GcpDriver {
     }
     async uploadCloudContent(path, content, contentType) {
         const googleFile = this.googleBucket.file(path);
-        const uploadReadable = new stream_1.Readable();
+        const uploadReadable = new Readable();
         return new Promise(function (resolve, reject) {
             uploadReadable
                 .pipe(googleFile.createWriteStream({ contentType }))

package/dist/driver-minio.d.ts

@@ -1,5 +1,5 @@
-import { S3Driver, S3DriverCfg } from './driver-aws';
-import { BucketType } from './types';
+import { S3Driver, S3DriverCfg } from './driver-aws.js';
+import { BucketType } from './types.js';
 export interface MinioDriverCfg extends S3DriverCfg {
     minio_endpoint: string;
 }

package/dist/driver-minio.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinioDriver = void 0;
-const aws_sdk_1 = require("aws-sdk");
-const driver_aws_1 = require("./driver-aws");
-async function getMinioDriver(cfg) {
+import { S3Driver } from './driver-aws.js';
+const { S3 } = (await import('aws-sdk')).default;
+export async function getMinioDriver(cfg) {
     // const credentials = new Credentials(cfg.access_key_id, cfg.access_key_secret);
-    const s3 = new aws_sdk_1.S3({
+    const s3 = new S3({
         accessKeyId: cfg.access_key_id,
         secretAccessKey: cfg.access_key_secret,
         endpoint: cfg.minio_endpoint,
@@ -19,8 +16,7 @@ async function getMinioDriver(cfg) {
     // Create S3 service object
     return new MinioDriver(s3, cfg.bucketName);
 }
-exports.getMinioDriver = getMinioDriver;
-class MinioDriver extends driver_aws_1.S3Driver {
+class MinioDriver extends S3Driver {
     get type() {
         return 'minio';
     }

package/dist/driver.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Readable, Writable } from 'stream';
-import { BucketFile, BucketType } from './types';
+import { BucketFile, BucketType } from './types.js';
 export interface Driver<F = any> {
     type: BucketType;
     name: string;

package/dist/driver.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { Bucket } from './bucket';
-import { S3DriverCfg } from './driver-aws';
-import { GsDriverCfg } from './driver-gcp';
-import { MinioDriverCfg } from './driver-minio';
-import { BucketFile, ListOptions, ListResult } from './types';
-export { signUrl, SignUrlOptions, urlSigner } from './url-signer';
+import { Bucket } from './bucket.js';
+import { S3DriverCfg } from './driver-aws.js';
+import { GsDriverCfg } from './driver-gcp.js';
+import { MinioDriverCfg } from './driver-minio.js';
+import { BucketFile, ListOptions, ListResult } from './types.js';
+export { signUrl, SignUrlOptions, urlSigner } from './url-signer.js';
 export { Bucket, BucketFile, ListOptions, ListResult };
 declare type GetBucketOptions = {
     log?: boolean;

package/dist/index.js

@@ -1,34 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBucket = exports.urlSigner = exports.signUrl = void 0;
-const bucket_1 = require("./bucket");
-const driver_aws_1 = require("./driver-aws");
-const driver_gcp_1 = require("./driver-gcp");
-const driver_minio_1 = require("./driver-minio");
-var url_signer_1 = require("./url-signer");
-Object.defineProperty(exports, "signUrl", { enumerable: true, get: function () { return url_signer_1.signUrl; } });
-Object.defineProperty(exports, "urlSigner", { enumerable: true, get: function () { return url_signer_1.urlSigner; } });
-async function getBucket(options) {
-    var _a;
+import { newBucket } from './bucket.js';
+import { getS3Driver } from './driver-aws.js';
+import { getGsDriver } from './driver-gcp.js';
+import { getMinioDriver } from './driver-minio.js';
+export { signUrl, urlSigner } from './url-signer.js';
+export async function getBucket(options) {
     if (options == null) {
         throw new Error(`ERROR - cloud-bucket - Cannot getBucket with options ${options}`);
     }
-    const log = (_a = options.log) !== null && _a !== void 0 ? _a : false; // by default, false. 
+    const log = options.log ?? false; // by default, false. 
     // if has .project_id, assume GcpBucket
     const driver = await getDriver(options);
-    const bucket = bucket_1.newBucket({ driver, log });
+    const bucket = newBucket({ driver, log });
     return bucket;
 }
-exports.getBucket = getBucket;
 async function getDriver(driverCfg) {
     if (isGsDriverCfg(driverCfg)) {
-        return driver_gcp_1.getGsDriver(driverCfg);
+        return getGsDriver(driverCfg);
     }
     else if (isMinioDriverCfg(driverCfg)) { // IMPORTANT MUST be before S3Driver, because same access_key... 
-        return driver_minio_1.getMinioDriver(driverCfg);
+        return getMinioDriver(driverCfg);
     }
     else if (isS3DriverCfg(driverCfg)) {
-        return driver_aws_1.getS3Driver(driverCfg);
+        return getS3Driver(driverCfg);
     }
     else {
         throw new Error(`bucket config does not seem to be valid (only support Gcp and Aws for now)`);

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { Bucket } from './bucket';
+import type { Bucket } from './bucket.js';
 export declare type BucketType = 's3' | 'gs' | 'minio';
 export interface BucketFile {
     bucket: Bucket;

package/dist/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/url-signer.js

@@ -1,27 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.urlSigner = exports.signUrl = void 0;
-const crypto = __importStar(require("crypto"));
-function signUrl(url, opts) {
+import * as crypto from 'crypto';
+export function signUrl(url, opts) {
     if (opts.type === 's3') {
         return s3_sign_url(url, opts);
     }
@@ -35,7 +13,6 @@ function signUrl(url, opts) {
         throw new Error(`cdnSign does not support type ${opts.type} for now`);
     }
 }
-exports.signUrl = signUrl;
 /**
  * Return a path signer based on a baseUrl and the sign option. This is the optimal way to sign many urls and should be typically used over the signUrl method.
  *
@@ -49,7 +26,7 @@ exports.signUrl = signUrl;
  * - s3 - This takes full advantage of the aws 'directory signing' like urlSigner('https://.../some/dir/*', opts) will create one signature for the folder and apply it to each sub path.
  * - gs - While google storage does not have the same capability, there are small benefits as well on some base64 object creation (not much though). However, because of GCP small key, the signature is much faster than s3 (about 10x)
  */
-function urlSigner(baseUrl, opts) {
+export function urlSigner(baseUrl, opts) {
     if (opts.type === 's3') {
         return s3_urlSigner(baseUrl, opts);
     }
@@ -66,7 +43,6 @@ function urlSigner(baseUrl, opts) {
         throw new Error('urlSigner only supported for s3');
     }
 }
-exports.urlSigner = urlSigner;
 //#region    ---------- S3 Signer ---------- 
 function s3_urlSigner(baseUrl, opts) {
     const isWildPolicy = baseUrl.endsWith('*');

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "cloud-bucket",
-  "version": "0.3.13",
+  "type": "module",
+  "version": "0.4.0-SNAPSHOT.1",
   "description": "Simple multi cloud (Google Storage and AWS S3) bucket API",
   "author": "Jeremy Chone <jeremy.chone@gmail.com>",
   "main": "dist/index.js",
@@ -12,24 +13,24 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@google-cloud/storage": "^5.8.0",
-    "@types/micromatch": "^4.0.1",
-    "@types/mime-types": "^2.1.0",
-    "aws-sdk": "^2.851.0",
-    "fs-extra-plus": "^0.5.21",
-    "micromatch": "^4.0.2",
-    "mime-types": "^2.1.29"
+    "@google-cloud/storage": "^5.16.0",
+    "@types/micromatch": "^4.0.2",
+    "@types/mime-types": "^2.1.1",
+    "aws-sdk": "^2.1037.0",
+    "fs-extra-plus": "^0.5.23",
+    "micromatch": "^4.0.4",
+    "mime-types": "^2.1.34"
   },
   "devDependencies": {
-    "@types/js-yaml": "^4.0.0",
-    "@types/mocha": "^8.2.1",
-    "js-yaml": "^4.0.0",
-    "mocha": "^8.3.0",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.2.2"
+    "@types/js-yaml": "^4.0.5",
+    "@types/mocha": "^9.0.0",
+    "js-yaml": "^4.1.0",
+    "mocha": "^9.1.3",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.5.2"
   },
   "scripts": {
-    "test": "TS_NODE_FILES=true ./node_modules/.bin/mocha",
+    "test": "TS_NODE_PROJECT='test/tsconfig.json' ./node_modules/.bin/mocha",
     "testw": "TS_NODE_FILES=true ./node_modules/.bin/mocha --watch",
     "testd": "TS_NODE_FILES=true ./node_modules/.bin/mocha --inspect-brk",
     "prepare": "rm -Rf dist/ && ./node_modules/.bin/tsc"

package/src/bucket.ts

@@ -4,8 +4,8 @@ import { glob, mkdirp } from 'fs-extra-plus';
 import { lookup } from 'mime-types';
 import * as Path from 'path';
 import { Readable, Writable } from 'stream';
-import { Driver, ListCloudFilesOptions } from './driver';
-import { BucketFile, BucketFileDeleted, BucketType, ListArg, ListOptions, ListResult } from './types';
+import { Driver, ListCloudFilesOptions } from './driver.js';
+import { BucketFile, BucketFileDeleted, BucketType, ListArg, ListOptions, ListResult } from './types.js';
 
 export interface BucketOptions {
 	driver: Driver;

package/src/driver-aws.ts

@@ -1,16 +1,16 @@
-import { Credentials, S3 } from 'aws-sdk';
-import { ListObjectsRequest } from 'aws-sdk/clients/s3';
-import { createReadStream, createWriteStream } from 'fs-extra-plus';
+import type { S3 as S3_TYPE } from 'aws-sdk';
+import { ListObjectsV2Request } from 'aws-sdk/clients/s3';
 import { PassThrough, Readable, Writable } from "stream";
 import { Driver, ListCloudFilesOptions, ListCloudFilesResult } from "./driver";
 import { BucketFile, BucketType } from './types';
-
-import micromatch = require('micromatch');
+const micromatch = (await import('micromatch')).default;
+const { createReadStream, createWriteStream } = (await import('fs-extra')).default;
+const { Credentials, S3 } = (await import('aws-sdk')).default;
 
 // import {Object as AwsFile} from 'aws-sdk';
 
 // type S3 = AWS.S3;
-type AwsFile = S3.Object & { ContentType?: string };
+type AwsFile = S3_TYPE.Object & { ContentType?: string };
 
 export interface S3DriverCfg {
 	bucketName: string;
@@ -46,7 +46,7 @@ class S3UploadWriteStream extends PassThrough {
 }
 
 export class S3Driver implements Driver<AwsFile> {
-	private s3: S3;
+	private s3: S3_TYPE;
 	private baseParams: { Bucket: string };
 
 	get type(): BucketType {
@@ -57,7 +57,7 @@ export class S3Driver implements Driver<AwsFile> {
 		return this.baseParams.Bucket;
 	}
 
-	constructor(s3: S3, bucketName: string) {
+	constructor(s3: S3_TYPE, bucketName: string) {
 		this.s3 = s3;
 		this.baseParams = { Bucket: bucketName };
 	}
@@ -99,7 +99,7 @@ export class S3Driver implements Driver<AwsFile> {
 
 			const awsFile: AwsFile = { Key, Size, LastModified, ETag, ContentType };
 			return awsFile;
-		} catch (ex) {
+		} catch (ex: any) {
 			//  if NotFound, return false
 			if (ex.code === 'NotFound') {
 				return null;
@@ -117,7 +117,7 @@ export class S3Driver implements Driver<AwsFile> {
 		const { prefix, glob, directory, limit, marker } = opts;
 
 		// build the list params
-		let listParams: Partial<ListObjectsRequest> = {};
+		let listParams: Partial<ListObjectsV2Request> = {};
 		if (prefix) {
 			listParams.Prefix = prefix;
 		}
@@ -128,13 +128,13 @@ export class S3Driver implements Driver<AwsFile> {
 			listParams.MaxKeys = limit;
 		}
 		if (marker != null) {
-			listParams.Marker = marker;
+			listParams.ContinuationToken = marker;
 		}
 		const params = { ...this.baseParams, ...listParams };
 
 		// perform the s3 list request
 		try {
-			const awsResult = await this.s3.listObjects(params).promise();
+			const awsResult = await this.s3.listObjectsV2(params).promise();
 			const awsFiles = awsResult.Contents as AwsFile[];
 			// if glob, filter again the result
 			let files: AwsFile[] = (!glob) ? awsFiles : awsFiles.filter(af => micromatch.isMatch(af.Key!, glob));
@@ -147,7 +147,7 @@ export class S3Driver implements Driver<AwsFile> {
 					dirs = prefixes;
 				}
 			}
-			const nextMarker = awsResult.NextMarker;
+			const nextMarker = awsResult.NextContinuationToken;
 
 			return { files, dirs, nextMarker };
 		} catch (ex) {

package/src/driver-gcp.ts

@@ -2,7 +2,7 @@ import { Bucket as GoogleBucket, File as GoogleFile, GetFilesOptions, Storage as
 import { Readable, Writable } from "stream";
 import { Driver, ListCloudFilesOptions, ListCloudFilesResult } from "./driver";
 import { BucketFile, BucketType } from './types';
-import micromatch = require('micromatch');
+const micromatch = (await import('micromatch')).default;
 
 export async function getGsDriver(cfg: GsDriverCfg) {
 	// TODO: valid cfg
@@ -68,7 +68,7 @@ class GcpDriver implements Driver<GoogleFile> {
 		const googleFile = this.googleBucket.file(path);
 		try {
 			return (await googleFile.get())[0];
-		} catch (ex) {
+		} catch (ex: any) {
 			// not found return null, as per getFile design.
 			if (ex.code === 404) {
 				return null;
@@ -143,7 +143,7 @@ class GcpDriver implements Driver<GoogleFile> {
 		if (googleFile) {
 			try {
 				await googleFile.delete();
-			} catch (ex) {
+			} catch (ex: any) {
 				// if not found, just return false.
 				if (ex.code === 404) {
 					process.stdout.write(` - Skipped (object not found)\n`);

package/src/driver-minio.ts

@@ -1,6 +1,7 @@
-import { S3 } from 'aws-sdk';
-import { S3Driver, S3DriverCfg } from './driver-aws';
-import { BucketType } from './types';
+import type { S3 as S3_TYPE } from 'aws-sdk';
+import { S3Driver, S3DriverCfg } from './driver-aws.js';
+import { BucketType } from './types.js';
+const { S3 } = (await import('aws-sdk')).default;
 
 export interface MinioDriverCfg extends S3DriverCfg {
 	minio_endpoint: string;
@@ -33,7 +34,7 @@ class MinioDriver extends S3Driver {
 
 
 
-async function bucketExists(s3: S3, bucketName: string) {
+async function bucketExists(s3: S3_TYPE, bucketName: string) {
 
 	return new Promise((res, rej) => {
 		s3.headBucket({
@@ -45,7 +46,7 @@ async function bucketExists(s3: S3, bucketName: string) {
 
 }
 
-async function createBucket(s3: S3, bucketName: string) {
+async function createBucket(s3: S3_TYPE, bucketName: string) {
 
 	// create the bucket
 	await new Promise((res, rej) => {

package/src/driver.ts

@@ -1,5 +1,5 @@
 import { Readable, Writable } from 'stream';
-import { BucketFile, BucketType } from './types';
+import { BucketFile, BucketType } from './types.js';
 
 
 

package/src/index.ts

@@ -1,11 +1,11 @@
-import { Bucket, newBucket } from './bucket';
-import { Driver } from './driver';
-import { getS3Driver, S3DriverCfg } from './driver-aws';
-import { getGsDriver, GsDriverCfg } from './driver-gcp';
-import { getMinioDriver, MinioDriverCfg } from './driver-minio';
-import { BucketFile, ListOptions, ListResult } from './types';
-
-export { signUrl, SignUrlOptions, urlSigner } from './url-signer';
+import { Bucket, newBucket } from './bucket.js';
+import { getS3Driver, S3DriverCfg } from './driver-aws.js';
+import { getGsDriver, GsDriverCfg } from './driver-gcp.js';
+import { getMinioDriver, MinioDriverCfg } from './driver-minio.js';
+import { Driver } from './driver.js';
+import { BucketFile, ListOptions, ListResult } from './types.js';
+
+export { signUrl, SignUrlOptions, urlSigner } from './url-signer.js';
 export { Bucket, BucketFile, ListOptions, ListResult };
 
 type GetBucketOptions = { log?: boolean } & (GsDriverCfg | S3DriverCfg | MinioDriverCfg);

package/src/types.ts

@@ -1,5 +1,5 @@
 
-import type { Bucket } from './bucket';
+import type { Bucket } from './bucket.js';
 
 /////////////////////
 // Those are the common types to avoid uncessary cyclic module reference. (best practice)

package/CHANGELOG.md

@@ -1,24 +0,0 @@
-> Legend: `!` change; `+` enhancement; `-` fix; `.` minor
-
-> Note: Minor updates with dependency only update are not recorded here (but still tagged)
-
-### [v0.3.5](https://github.com/BriteSnow/node-cloud-bucket/compare/v0.3.3...v0.3.5) July 19, 2020
-
-- `+` minio - Added support for minio (for dev/mock only for now)
-
-### [v0.3.3](https://github.com/BriteSnow/node-cloud-bucket/compare/v0.3.2...v0.3.3) June 12, 2020
-
-- `+` stream - add content type support for createStream
-
-### [v0.3.2](https://github.com/BriteSnow/node-cloud-bucket/compare/v0.3.0...v0.3.2) June 9, 2020
-
-- `!` log - removed console.log by default, added .log: boolean
-
-### [v0.3.0](https://github.com/BriteSnow/node-cloud-bucket/compare/v0.2.16...v0.3.0) May 21, 2020
-
-- `!` Rename `bucket.list` to `bucket.listFiles` and change the `bucket.list` to return `ListResult` (allow full pagination and other metadata information)
-
-### [v0.2.16](https://github.com/BriteSnow/node-cloud-bucket/compare/v0.2.15...v0.2.16) Apr 16 2020
-
-- s3 upload - move to stream to upload to s3
-- refactoring to driver pattern