cloud-bucket 0.4.2 → 0.5.0

package/dist/bucket.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="node" />
+import { S3Client } from '@aws-sdk/client-s3';
 import { Bucket as GoogleBucket } from '@google-cloud/storage';
-import { S3 } from 'aws-sdk';
 import { Readable, Writable } from 'stream';
 import { Driver, ListCloudFilesOptions } from './driver.js';
 import { BucketFile, BucketFileDeleted, BucketType, ListArg, ListOptions, ListResult } from './types.js';
@@ -12,7 +11,7 @@ export declare function newBucket(opts: BucketOptions): BucketImpl<unknown>;
 export interface Bucket {
     type: BucketType;
     name: string;
-    readonly s3?: S3;
+    readonly s3?: S3Client;
     readonly googleBucket?: GoogleBucket;
     exists(path: string): Promise<boolean>;
     /**
@@ -55,7 +54,7 @@ declare class BucketImpl<F> implements Bucket {
     constructor(opts: BucketOptions);
     get type(): BucketType;
     get name(): string;
-    get s3(): S3 | undefined;
+    get s3(): S3Client | undefined;
     get googleBucket(): GoogleBucket | undefined;
     toFile(cf: F): BucketFile;
     exists(path: string): Promise<boolean>;

package/dist/driver-aws.d.ts

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

package/dist/driver-aws.js

@@ -1,11 +1,19 @@
+import { CopyObjectCommand, DeleteObjectCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { Upload } from "@aws-sdk/lib-storage";
 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 S3({ apiVersion: '2006-03-01', credentials });
+    let region = process.env.AWS_REGION || 'us-east-1';
+    const s3 = new S3Client({
+        region,
+        apiVersion: '2006-03-01',
+        credentials: {
+            accessKeyId: cfg.access_key_id,
+            secretAccessKey: cfg.access_key_secret
+        }
+    });
     return new S3Driver(s3, cfg.bucketName);
 }
 /**
@@ -28,6 +36,12 @@ class S3UploadWriteStream extends PassThrough {
     }
 }
 export class S3Driver {
+    get type() {
+        return 's3';
+    }
+    get name() {
+        return this.baseParams.Bucket;
+    }
     constructor(s3, bucketName) {
         Object.defineProperty(this, "s3", {
             enumerable: true,
@@ -44,12 +58,6 @@ export class S3Driver {
         this.s3 = s3;
         this.baseParams = { Bucket: bucketName };
     }
-    get type() {
-        return 's3';
-    }
-    get name() {
-        return this.baseParams.Bucket;
-    }
     toFile(awsFile) {
         if (!awsFile) {
             throw new Error(`No awsFile`);
@@ -71,7 +79,11 @@ export class S3Driver {
     }
     async getCloudFile(path) {
         try {
-            const object = await this.s3.headObject({ ...this.baseParams, ...{ Key: path } }).promise();
+            const command = new HeadObjectCommand({
+                ...this.baseParams,
+                ...{ Key: path }
+            });
+            const object = await this.s3.send(command);
             // bucket: this,
             // 	path,
             // 	updated,
@@ -113,7 +125,8 @@ export class S3Driver {
         const params = { ...this.baseParams, ...listParams };
         // perform the s3 list request
         try {
-            const awsResult = await this.s3.listObjectsV2(params).promise();
+            const command = new ListObjectsV2Command(params);
+            const awsResult = await this.s3.send(command);
             const awsFiles = awsResult.Contents;
             // if glob, filter again the result
             let files = (!glob) ? awsFiles : awsFiles.filter(af => micromatch.isMatch(af.Key, glob));
@@ -142,12 +155,14 @@ export class S3Driver {
             Bucket: dest.bucket.name,
             Key: dest.path
         };
-        await this.s3.copyObject(params).promise();
+        const command = new CopyObjectCommand(params);
+        await this.s3.send(command);
     }
     async downloadCloudFile(rawFile, localPath) {
         const remotePath = rawFile.Key;
         const params = { ...this.baseParams, ...{ Key: remotePath } };
-        const remoteReadStream = this.s3.getObject(params).createReadStream();
+        const command = new GetObjectCommand(params);
+        const remoteReadStream = (await this.s3.send(command)).Body;
         const localWriteStream = createWriteStream(localPath);
         const writePromise = new Promise((resolve, reject) => {
             localWriteStream.once('close', () => {
@@ -162,33 +177,40 @@ export class S3Driver {
     }
     async uploadCloudFile(localPath, remoteFilePath, contentType) {
         const readable = createReadStream(localPath);
-        const awsResult = await this.s3.putObject({ ...this.baseParams, ...{ Key: remoteFilePath, Body: readable, ContentType: contentType } }).promise();
+        const command = new PutObjectCommand({ ...this.baseParams, ...{ Key: remoteFilePath, Body: readable, ContentType: contentType } });
+        const awsResult = await this.s3.send(command);
         // TODO: probably check the awsResult that match remoteFilePath
         return { Key: remoteFilePath };
     }
     async downloadAsText(path) {
         const params = { ...this.baseParams, ...{ Key: path } };
-        const obj = await this.s3.getObject(params).promise();
+        const command = new GetObjectCommand(params);
+        const obj = await await this.s3.send(command);
         const content = obj.Body.toString();
         return content;
     }
     async uploadCloudContent(path, content, contentType) {
-        await this.s3.putObject({ ...this.baseParams, ...{ Key: path, Body: content, ContentType: contentType } }).promise();
+        const command = new PutObjectCommand({ ...this.baseParams, ...{ Key: path, Body: content, ContentType: contentType } });
+        await this.s3.send(command);
     }
     async createReadStream(path) {
         const params = { ...this.baseParams, ...{ Key: path } };
-        const obj = this.s3.getObject(params);
+        const command = new GetObjectCommand(params);
+        const obj = await this.s3.send(command);
         if (!obj) {
             throw new Error(`Object not found for ${path}`);
         }
-        return obj.createReadStream();
+        return obj.Body;
     }
     async createWriteStream(path, contentType) {
         const writable = new S3UploadWriteStream();
         const params = { ...this.baseParams, ...{ Key: path, ContentType: contentType }, Body: writable };
-        const uploadCtrl = this.s3.upload(params);
+        const uploadCtrl = new Upload({
+            client: this.s3,
+            params: params
+        });
         // NOTE: We use the S3UploadWriteStream trigger finish and close stream even when the upload is done
-        uploadCtrl.promise().then(() => {
+        uploadCtrl.done().then(() => {
             writable.triggerFinishAndClose();
         });
         return writable;
@@ -200,7 +222,8 @@ export class S3Driver {
         if (exists) {
             // NOTE: between the first test and this delete, the object might have been deleted, but since s3.deleteObjecct
             //       does not seems to tell if the object exits or not, this is the best can do.
-            await this.s3.deleteObject({ ...this.baseParams, ...{ Key: path } }).promise();
+            const command = new DeleteObjectCommand({ ...this.baseParams, ...{ Key: path } });
+            await this.s3.send(command);
             return true;
         }
         else {

package/dist/driver-gcp.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Bucket as GoogleBucket, File as GoogleFile } from '@google-cloud/storage';
 import { Readable, Writable } from "stream";
 import { Driver, ListCloudFilesOptions, ListCloudFilesResult } from "./driver";

package/dist/driver-gcp.js

@@ -15,6 +15,12 @@ export async function getGsDriver(cfg) {
     return new GcpDriver(googleBucket);
 }
 class GcpDriver {
+    get type() {
+        return 'gs';
+    }
+    get name() {
+        return this.googleBucket.name;
+    }
     constructor(googleBucket) {
         Object.defineProperty(this, "googleBucket", {
             enumerable: true,
@@ -24,12 +30,6 @@ class GcpDriver {
         });
         this.googleBucket = googleBucket;
     }
-    get type() {
-        return 'gs';
-    }
-    get name() {
-        return this.googleBucket.name;
-    }
     toFile(googleFile) {
         if (!googleFile) {
             throw new Error(`No googleFile`);

package/dist/driver-minio.js

@@ -1,13 +1,16 @@
+import { HeadBucketCommand, PutBucketPolicyCommand, S3Client } from '@aws-sdk/client-s3';
 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 S3({
-        accessKeyId: cfg.access_key_id,
-        secretAccessKey: cfg.access_key_secret,
+    let region = process.env.AWS_REGION || 'us-east-1';
+    const s3 = new S3Client({
+        region,
+        credentials: {
+            accessKeyId: cfg.access_key_id,
+            secretAccessKey: cfg.access_key_secret
+        },
         endpoint: cfg.minio_endpoint,
-        s3ForcePathStyle: true,
-        signatureVersion: 'v4'
+        forcePathStyle: true, // needed with minio (otherwise bucket.locahost and get address not found)
     });
     // For Minio, assume mock mode, so, auto create bucket
     if (!(await bucketExists(s3, cfg.bucketName))) {
@@ -22,31 +25,46 @@ class MinioDriver extends S3Driver {
     }
 }
 async function bucketExists(s3, bucketName) {
-    return new Promise((res, rej) => {
-        s3.headBucket({
-            Bucket: bucketName
-        }, (err, data) => {
-            (err) ? res(false) : res(true);
-        });
+    return new Promise(async (res, rej) => {
+        try {
+            const command = new HeadBucketCommand({
+                Bucket: bucketName
+            });
+            const data = await s3.send(command);
+            res(data);
+        }
+        catch (error) {
+            rej(error);
+        }
     });
 }
 async function createBucket(s3, bucketName) {
     // create the bucket
-    await new Promise((res, rej) => {
-        s3.createBucket({
-            // ACL: 'public-read-write', // Does not see have effect on minio, see below
-            Bucket: bucketName
-        }, function (err, data) {
-            (err) ? rej(err) : res(data);
-        });
+    await new Promise(async (res, rej) => {
+        try {
+            const command = new HeadBucketCommand({
+                // ACL: 'public-read-write', // Does not see have effect on minio, see below
+                Bucket: bucketName
+            });
+            const data = await s3.send(command);
+            res(data);
+        }
+        catch (error) {
+            rej(error);
+        }
     });
     // set it public
-    await new Promise((res, rej) => {
-        s3.putBucketPolicy({
-            Bucket: bucketName,
-            Policy: `{ "Version": "2012-10-17", "Statement": [{ "Sid": "MakeItPublic", "Effect": "Allow", "Principal": "*", "Action": "s3:GetObject", "Resource": "arn:aws:s3:::${bucketName}/*" }] }'`
-        }, function (err, data) {
-            (err) ? rej(err) : res(data);
-        });
+    await new Promise(async (res, rej) => {
+        try {
+            const command = new PutBucketPolicyCommand({
+                Bucket: bucketName,
+                Policy: `{ "Version": "2012-10-17", "Statement": [{ "Sid": "MakeItPublic", "Effect": "Allow", "Principal": "*", "Action": "s3:GetObject", "Resource": "arn:aws:s3:::${bucketName}/*" }] }'`
+            });
+            const data = await s3.send(command);
+            res(data);
+        }
+        catch (error) {
+            rej(error);
+        }
     });
 }

package/dist/driver.d.ts

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

package/dist/index.d.ts

@@ -5,7 +5,7 @@ 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 = {
+type GetBucketOptions = {
     log?: boolean;
 } & (GsDriverCfg | S3DriverCfg | MinioDriverCfg);
 export declare function getBucket(options: GetBucketOptions): Promise<Bucket>;

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { Bucket } from './bucket.js';
-export declare type BucketType = 's3' | 'gs' | 'minio';
+export type BucketType = 's3' | 'gs' | 'minio';
 export interface BucketFile {
     bucket: Bucket;
     path: string;
@@ -8,7 +8,7 @@ export interface BucketFile {
     contentType?: string;
     local?: string;
 }
-export declare type BucketFileDeleted = BucketFile & {
+export type BucketFileDeleted = BucketFile & {
     deleted: boolean;
 };
 export interface ListResult {
@@ -27,4 +27,4 @@ export interface ListOptions {
  * - when string means it is the prefix (which can be of glob format)
  * - when ListOptions prefix can be specified as property.
  */
-export declare type ListArg = ListOptions | string;
+export type ListArg = ListOptions | string;

package/dist/url-signer.d.ts

@@ -1,10 +1,10 @@
-declare type CloudSignUrlOptions = {
+type CloudSignUrlOptions = {
     type: 's3' | 'gs';
     expires: number;
     keyName: string;
     key: string;
 };
-export declare type SignUrlOptions = CloudSignUrlOptions | {
+export type SignUrlOptions = CloudSignUrlOptions | {
     type: 'minio';
 };
 export declare function signUrl(url: string, opts: SignUrlOptions): string;

package/dist/url-signer.js

@@ -110,7 +110,7 @@ function gs_urlSigner(baseUrl, opts) {
         const url = base_url + pathFromBaseUrl;
         // URL to sign
         const urlToSign = `${url}?Expires=${opts.expires}&KeyName=${opts.keyName}`;
-        let signature = crypto.createHmac('sha1', su_key_buff).update(urlToSign).digest('base64');
+        let signature = crypto.createHmac('sha1', new Uint8Array(su_key_buff)).update(urlToSign).digest('base64');
         signature = signature.replace(/[+/=]/g, c => GCP_BASE64_REPLACE[c]);
         // Add signature to urlToSign
         return `${urlToSign}&Signature=${signature}`;
@@ -121,7 +121,7 @@ function gs_sign_url(url, opts) {
     const urlToSign = `${url}?Expires=${opts.expires}&KeyName=${opts.keyName}`;
     // Compute signature
     let su_key_buff = Buffer.from(opts.key, 'base64');
-    let signature = crypto.createHmac('sha1', su_key_buff).update(urlToSign).digest('base64');
+    let signature = crypto.createHmac('sha1', new Uint8Array(su_key_buff)).update(urlToSign).digest('base64');
     signature = signature.replace(/[+/=]/g, c => GCP_BASE64_REPLACE[c]);
     // Add signature to urlToSign
     return urlToSign + `&Signature=${signature}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-bucket",
   "type": "module",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Simple multi cloud (Google Storage and AWS S3) bucket API",
   "author": "Jeremy Chone <jeremy.chone@gmail.com>",
   "main": "dist/index.js",
@@ -10,24 +10,25 @@
     "url": "git://github.com/BriteSnow/node-cloud-bucket.git"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=20"
   },
   "dependencies": {
-    "@google-cloud/storage": "^5.18.2",
-    "@types/micromatch": "^4.0.2",
-    "@types/mime-types": "^2.1.1",
-    "aws-sdk": "^2.1090.0",
+    "@google-cloud/storage": "^7.18.0",
+    "@types/micromatch": "^4.0.10",
+    "@types/mime-types": "^3.0.1",
+    "@aws-sdk/client-s3": "^3.964.0",
+    "@aws-sdk/lib-storage": "^3.964.0",
     "fs-extra-plus": "^0.6.0",
-    "micromatch": "^4.0.4",
-    "mime-types": "^2.1.34"
+    "micromatch": "^4.0.8",
+    "mime-types": "^3.0.2"
   },
   "devDependencies": {
-    "@types/js-yaml": "^4.0.5",
-    "@types/mocha": "^9.1.0",
-    "js-yaml": "^4.1.0",
-    "mocha": "^9.2.1",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.2"
+    "@types/js-yaml": "^4.0.9",
+    "@types/mocha": "^10.0.10",
+    "js-yaml": "^4.1.1",
+    "mocha": "^11.7.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3"
   },
   "scripts": {
     "test": "TS_NODE_PROJECT='test/tsconfig.json' ./node_modules/.bin/mocha",

package/src/bucket.ts

@@ -1,5 +1,5 @@
+import { S3Client } from '@aws-sdk/client-s3';
 import { Bucket as GoogleBucket } from '@google-cloud/storage';
-import { S3 } from 'aws-sdk';
 import { glob } from 'fs-extra-plus';
 import { lookup } from 'mime-types';
 import * as Path from 'path';
@@ -21,7 +21,7 @@ export interface Bucket {
 	type: BucketType;
 	name: string;
 
-	readonly s3?: S3;
+	readonly s3?: S3Client;
 	readonly googleBucket?: GoogleBucket;
 
 
@@ -91,9 +91,9 @@ class BucketImpl<F> implements Bucket {
 		return this.driver.name;
 	}
 
-	get s3(): S3 | undefined {
+	get s3(): S3Client | undefined {
 		if (this.driver.type === 's3') {
-			return (<any>this.driver).s3 as S3;
+			return (<any>this.driver).s3 as S3Client;
 		}
 	}
 

package/src/driver-aws.ts

@@ -1,16 +1,15 @@
-import type { S3 as S3_TYPE } from 'aws-sdk';
-import { ListObjectsV2Request } from 'aws-sdk/clients/s3';
+import { CopyObjectCommand, DeleteObjectCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, ListObjectsV2Request, PutObjectCommand, _Object as S3_TYPE, S3Client } from '@aws-sdk/client-s3';
+import { Upload } from "@aws-sdk/lib-storage";
 import { PassThrough, Readable, Writable } from "stream";
 import { Driver, ListCloudFilesOptions, ListCloudFilesResult } from "./driver";
 import { BucketFile, BucketType } from './types';
 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_TYPE.Object & { ContentType?: string };
+type AwsFile = S3_TYPE & { ContentType?: string };
 
 export interface S3DriverCfg {
 	bucketName: string;
@@ -19,9 +18,16 @@ export interface S3DriverCfg {
 }
 
 export async function getS3Driver(cfg: S3DriverCfg) {
-	const credentials = new Credentials(cfg.access_key_id, cfg.access_key_secret);
 	// Create S3 service object
-	const s3 = new S3({ apiVersion: '2006-03-01', credentials });
+	let region = process.env.AWS_REGION || 'us-east-1';
+	const s3 = new S3Client({ 
+		region,
+		apiVersion: '2006-03-01', 
+		credentials: {
+			accessKeyId: cfg.access_key_id,
+			secretAccessKey: cfg.access_key_secret
+		}
+	});
 	return new S3Driver(s3, cfg.bucketName);
 }
 
@@ -46,7 +52,7 @@ class S3UploadWriteStream extends PassThrough {
 }
 
 export class S3Driver implements Driver<AwsFile> {
-	private s3: S3_TYPE;
+	private s3: S3Client;
 	private baseParams: { Bucket: string };
 
 	get type(): BucketType {
@@ -57,7 +63,7 @@ export class S3Driver implements Driver<AwsFile> {
 		return this.baseParams.Bucket;
 	}
 
-	constructor(s3: S3_TYPE, bucketName: string) {
+	constructor(s3: S3Client, bucketName: string) {
 		this.s3 = s3;
 		this.baseParams = { Bucket: bucketName };
 	}
@@ -87,7 +93,12 @@ export class S3Driver implements Driver<AwsFile> {
 
 	async getCloudFile(path: string): Promise<AwsFile | null> {
 		try {
-			const object = await this.s3.headObject({ ...this.baseParams, ...{ Key: path } }).promise();
+			const command = new HeadObjectCommand({
+				...this.baseParams,
+				...{ Key: path }
+			});
+			
+			const object = await this.s3.send(command);
 			// bucket: this,
 			// 	path,
 			// 	updated,
@@ -134,7 +145,8 @@ export class S3Driver implements Driver<AwsFile> {
 
 		// perform the s3 list request
 		try {
-			const awsResult = await this.s3.listObjectsV2(params).promise();
+			const command = new ListObjectsV2Command(params);
+			const awsResult = await this.s3.send(command);
 			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));
@@ -166,14 +178,16 @@ export class S3Driver implements Driver<AwsFile> {
 			Bucket: dest.bucket.name,
 			Key: dest.path
 		}
-		await this.s3.copyObject(params).promise();
+		const command = new CopyObjectCommand(params);
+		await this.s3.send(command);
 	}
 
 
 	async downloadCloudFile(rawFile: AwsFile, localPath: string): Promise<void> {
 		const remotePath = rawFile.Key!;
 		const params = { ...this.baseParams, ...{ Key: remotePath } };
-		const remoteReadStream = this.s3.getObject(params).createReadStream();
+		const command = new GetObjectCommand(params);
+		const remoteReadStream = (await this.s3.send(command)).Body as Readable;
 		const localWriteStream = createWriteStream(localPath);
 		const writePromise = new Promise<void>((resolve, reject) => {
 			localWriteStream.once('close', () => {
@@ -190,7 +204,8 @@ export class S3Driver implements Driver<AwsFile> {
 
 	async uploadCloudFile(localPath: string, remoteFilePath: string, contentType?: string): Promise<AwsFile> {
 		const readable = createReadStream(localPath);
-		const awsResult = await this.s3.putObject({ ...this.baseParams, ...{ Key: remoteFilePath, Body: readable, ContentType: contentType } }).promise();
+		const command = new PutObjectCommand({ ...this.baseParams, ...{ Key: remoteFilePath, Body: readable, ContentType: contentType } });
+		const awsResult = await this.s3.send(command);
 		// TODO: probably check the awsResult that match remoteFilePath
 		return { Key: remoteFilePath };
 
@@ -198,34 +213,39 @@ export class S3Driver implements Driver<AwsFile> {
 
 	async downloadAsText(path: string): Promise<string> {
 		const params = { ...this.baseParams, ...{ Key: path } };
-		const obj = await this.s3.getObject(params).promise();
+		const command = new GetObjectCommand(params);
+		const obj = await await this.s3.send(command);
 		const content = obj.Body!.toString();
 		return content;
 	}
 
 	async uploadCloudContent(path: string, content: string, contentType?: string): Promise<void> {
-
-		await this.s3.putObject({ ...this.baseParams, ...{ Key: path, Body: content, ContentType: contentType } }).promise();
+		const command = new PutObjectCommand({ ...this.baseParams, ...{ Key: path, Body: content, ContentType: contentType } });
+		await this.s3.send(command);
 	}
 
 	async createReadStream(path: string): Promise<Readable> {
 		const params = { ...this.baseParams, ...{ Key: path } };
-		const obj = this.s3.getObject(params);
+		const command = new GetObjectCommand(params);
+		const obj = await this.s3.send(command);
 
 		if (!obj) {
 			throw new Error(`Object not found for ${path}`);
 		}
-		return obj.createReadStream();
+		return obj.Body as Readable;
 	}
 
 	async createWriteStream(path: string, contentType?: string): Promise<Writable> {
 		const writable = new S3UploadWriteStream();
 
 		const params = { ...this.baseParams, ...{ Key: path, ContentType: contentType }, Body: writable };
-		const uploadCtrl = this.s3.upload(params);
+		const uploadCtrl = new Upload({
+        client: this.s3,
+        params: params
+    });
 
 		// NOTE: We use the S3UploadWriteStream trigger finish and close stream even when the upload is done
-		uploadCtrl.promise().then(() => {
+		uploadCtrl.done().then(() => {
 			writable.triggerFinishAndClose();
 		});
 
@@ -239,7 +259,8 @@ export class S3Driver implements Driver<AwsFile> {
 		if (exists) {
 			// NOTE: between the first test and this delete, the object might have been deleted, but since s3.deleteObjecct
 			//       does not seems to tell if the object exits or not, this is the best can do.
-			await this.s3.deleteObject({ ...this.baseParams, ...{ Key: path } }).promise();
+			const command = new DeleteObjectCommand({ ...this.baseParams, ...{ Key: path } });
+			await this.s3.send(command);
 			return true;
 		} else {
 			process.stdout.write(` - Skipped (object not found)\n`);

package/src/driver-minio.ts

@@ -1,7 +1,6 @@
-import type { S3 as S3_TYPE } from 'aws-sdk';
+import { HeadBucketCommand, PutBucketPolicyCommand, S3Client } from '@aws-sdk/client-s3';
 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;
@@ -9,12 +8,15 @@ export interface MinioDriverCfg extends S3DriverCfg {
 
 export async function getMinioDriver(cfg: MinioDriverCfg) {
 	// const credentials = new Credentials(cfg.access_key_id, cfg.access_key_secret);
-	const s3 = new S3({
-		accessKeyId: cfg.access_key_id,
-		secretAccessKey: cfg.access_key_secret,
-		endpoint: cfg.minio_endpoint,
-		s3ForcePathStyle: true, // needed with minio (otherwise bucket.locahost and get address not found)
-		signatureVersion: 'v4'
+	let region = process.env.AWS_REGION || 'us-east-1';
+	const s3 = new S3Client({
+		region,
+		credentials: {
+			accessKeyId: cfg.access_key_id,
+			secretAccessKey: cfg.access_key_secret
+		},
+		endpoint:cfg.minio_endpoint,
+		forcePathStyle: true, // needed with minio (otherwise bucket.locahost and get address not found)
 	});
 
 	// For Minio, assume mock mode, so, auto create bucket
@@ -34,38 +36,48 @@ class MinioDriver extends S3Driver {
 
 
 
-async function bucketExists(s3: S3_TYPE, bucketName: string) {
-
-	return new Promise((res, rej) => {
-		s3.headBucket({
-			Bucket: bucketName
-		}, (err, data) => {
-			(err) ? res(false) : res(true);
-		})
+async function bucketExists(s3: S3Client, bucketName: string) {
+	return new Promise(async (res, rej) => {
+		try {
+			const command = new HeadBucketCommand({
+				Bucket: bucketName
+			});
+			const data = await s3.send(command);
+			res(data);
+		} catch (error) {
+			rej(error);
+		}
 	});
-
 }
 
-async function createBucket(s3: S3_TYPE, bucketName: string) {
+async function createBucket(s3: S3Client, bucketName: string) {
 
 	// create the bucket
-	await new Promise((res, rej) => {
-		s3.createBucket({
-			// ACL: 'public-read-write', // Does not see have effect on minio, see below
-			Bucket: bucketName
-		}, function (err, data) {
-			(err) ? rej(err) : res(data);
-		});
+	await new Promise(async (res, rej) => {
+		try {
+			const command = new HeadBucketCommand({
+				// ACL: 'public-read-write', // Does not see have effect on minio, see below
+				Bucket: bucketName
+			});
+			const data = await s3.send(command);
+			res(data);
+		} catch (error) {
+			rej(error);
+		}
 	});
 
 	// set it public
-	await new Promise((res, rej) => {
-		s3.putBucketPolicy({
-			Bucket: bucketName,
-			Policy: `{ "Version": "2012-10-17", "Statement": [{ "Sid": "MakeItPublic", "Effect": "Allow", "Principal": "*", "Action": "s3:GetObject", "Resource": "arn:aws:s3:::${bucketName}/*" }] }'`
-		}, function (err, data) {
-			(err) ? rej(err) : res(data);
-		});
+	await new Promise(async (res, rej) => {
+		try {
+			const command = new PutBucketPolicyCommand({
+				Bucket: bucketName,
+				Policy: `{ "Version": "2012-10-17", "Statement": [{ "Sid": "MakeItPublic", "Effect": "Allow", "Principal": "*", "Action": "s3:GetObject", "Resource": "arn:aws:s3:::${bucketName}/*" }] }'`
+			});
+			const data = await s3.send(command);
+			res(data);
+		} catch (error) {
+			rej(error);
+		}
 	})
 
 }

package/src/url-signer.ts

@@ -133,7 +133,7 @@ function gs_urlSigner(baseUrl: string, opts: CloudSignUrlOptions): (pathFromBase
 		const url = base_url + pathFromBaseUrl;
 		// URL to sign
 		const urlToSign = `${url}?Expires=${opts.expires}&KeyName=${opts.keyName}`;
-		let signature = crypto.createHmac('sha1', su_key_buff).update(urlToSign).digest('base64');
+		let signature = crypto.createHmac('sha1', new Uint8Array(su_key_buff)).update(urlToSign).digest('base64');
 		signature = signature.replace(/[+/=]/g, c => (<any>GCP_BASE64_REPLACE)[c]);
 		// Add signature to urlToSign
 		return `${urlToSign}&Signature=${signature}`;
@@ -147,7 +147,7 @@ function gs_sign_url(url: string, opts: CloudSignUrlOptions) {
 
 	// Compute signature
 	let su_key_buff = Buffer.from(opts.key, 'base64');
-	let signature = crypto.createHmac('sha1', su_key_buff).update(urlToSign).digest('base64');
+	let signature = crypto.createHmac('sha1', new Uint8Array(su_key_buff)).update(urlToSign).digest('base64');
 	signature = signature.replace(/[+/=]/g, c => (<any>GCP_BASE64_REPLACE)[c]);
 
 	// Add signature to urlToSign