cloud-bucket 0.3.12 → 0.3.16

package/dist/bucket.js

@@ -135,7 +135,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 (0, fs_extra_plus_1.mkdirp)(localPathDir);
             if (this.log) {
                 process.stdout.write(`Downloading ${this.type}://${this.name}/${remotePath} to ${localFilePath}`);
             }
@@ -167,7 +167,7 @@ class BucketImpl {
         }
         const isLocalGlob = localPath.includes('*');
         const { baseDir } = parsePrefixOrGlob(localPath);
-        const localFiles = await fs_extra_plus_1.glob(localPath);
+        const localFiles = await (0, fs_extra_plus_1.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);
@@ -275,7 +275,7 @@ function buildFullDestPath(localPath, destPath) {
 }
 exports.buildFullDestPath = buildFullDestPath;
 function getContentType(path) {
-    let ct = mime_types_1.lookup(path);
+    let ct = (0, mime_types_1.lookup)(path);
     let contentType = (ct) ? ct : undefined;
     return contentType;
 }

package/dist/driver-aws.js

@@ -101,12 +101,12 @@ 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));
@@ -118,7 +118,7 @@ class S3Driver {
                     dirs = prefixes;
                 }
             }
-            const nextMarker = awsResult.NextMarker;
+            const nextMarker = awsResult.NextContinuationToken;
             return { files, dirs, nextMarker };
         }
         catch (ex) {
@@ -141,7 +141,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 = (0, fs_extra_plus_1.createWriteStream)(localPath);
         const writePromise = new Promise((resolve, reject) => {
             localWriteStream.once('close', () => {
                 resolve();
@@ -154,7 +154,7 @@ class S3Driver {
         await writePromise;
     }
     async uploadCloudFile(localPath, remoteFilePath, contentType) {
-        const readable = fs_extra_plus_1.createReadStream(localPath);
+        const readable = (0, fs_extra_plus_1.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 };

package/dist/index.js

@@ -16,19 +16,19 @@ async function getBucket(options) {
     const log = (_a = options.log) !== null && _a !== void 0 ? _a : false; // by default, false. 
     // if has .project_id, assume GcpBucket
     const driver = await getDriver(options);
-    const bucket = bucket_1.newBucket({ driver, log });
+    const bucket = (0, bucket_1.newBucket)({ driver, log });
     return bucket;
 }
 exports.getBucket = getBucket;
 async function getDriver(driverCfg) {
     if (isGsDriverCfg(driverCfg)) {
-        return driver_gcp_1.getGsDriver(driverCfg);
+        return (0, driver_gcp_1.getGsDriver)(driverCfg);
     }
     else if (isMinioDriverCfg(driverCfg)) { // IMPORTANT MUST be before S3Driver, because same access_key... 
-        return driver_minio_1.getMinioDriver(driverCfg);
+        return (0, driver_minio_1.getMinioDriver)(driverCfg);
     }
     else if (isS3DriverCfg(driverCfg)) {
-        return driver_aws_1.getS3Driver(driverCfg);
+        return (0, driver_aws_1.getS3Driver)(driverCfg);
     }
     else {
         throw new Error(`bucket config does not seem to be valid (only support Gcp and Aws for now)`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-bucket",
-  "version": "0.3.12",
+  "version": "0.3.16",
   "description": "Simple multi cloud (Google Storage and AWS S3) bucket API",
   "author": "Jeremy Chone <jeremy.chone@gmail.com>",
   "main": "dist/index.js",
@@ -12,21 +12,21 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@google-cloud/storage": "^5.7.4",
-    "@types/micromatch": "^4.0.1",
-    "@types/mime-types": "^2.1.0",
-    "aws-sdk": "^2.843.0",
-    "fs-extra-plus": "^0.5.21",
-    "micromatch": "^4.0.2",
-    "mime-types": "^2.1.28"
+    "@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.0",
-    "js-yaml": "^4.0.0",
-    "mocha": "^8.3.0",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.5"
+    "@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",

package/src/driver-aws.ts

@@ -1,5 +1,5 @@
 import { Credentials, S3 } from 'aws-sdk';
-import { ListObjectsRequest } from 'aws-sdk/clients/s3';
+import { ListObjectsV2Request } from 'aws-sdk/clients/s3';
 import { createReadStream, createWriteStream } from 'fs-extra-plus';
 import { PassThrough, Readable, Writable } from "stream";
 import { Driver, ListCloudFilesOptions, ListCloudFilesResult } from "./driver";
@@ -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

@@ -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/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