@constructive-io/s3-streamer 2.17.2 → 2.17.4

package/esm/s3.js

@@ -1,7 +1,5 @@
 import { S3Client } from '@aws-sdk/client-s3';
 export default function getS3(opts) {
-    // Use explicit provider if set, otherwise fall back to checking minioEndpoint for backwards compatibility
-    const isMinio = opts.provider === 'minio' || (opts.provider === undefined && Boolean(opts.minioEndpoint));
     const awsConfig = {
         region: opts.awsRegion,
         ...(opts.awsAccessKey && opts.awsSecretKey
@@ -12,9 +10,9 @@ export default function getS3(opts) {
                 },
             }
             : {}),
-        ...(isMinio && opts.minioEndpoint
+        ...(opts.endpoint
             ? {
-                endpoint: opts.minioEndpoint,
+                endpoint: opts.endpoint,
                 forcePathStyle: true,
             }
             : {}),

package/esm/streamer.js

@@ -4,12 +4,12 @@ import { upload as streamUpload, uploadWithContentType as streamUploadWithConten
 export class Streamer {
     s3;
     defaultBucket;
-    constructor({ awsRegion, awsSecretKey, awsAccessKey, minioEndpoint, provider, defaultBucket }) {
+    constructor({ awsRegion, awsSecretKey, awsAccessKey, endpoint, provider, defaultBucket }) {
         this.s3 = getS3({
             awsRegion,
             awsSecretKey,
             awsAccessKey,
-            minioEndpoint,
+            endpoint,
             provider
         });
         this.defaultBucket = defaultBucket;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/s3-streamer",
-  "version": "2.17.2",
+  "version": "2.17.4",
   "author": "Constructive <developers@constructive.io>",
   "description": "stream files to s3",
   "main": "index.js",
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@constructive-io/s3-utils": "^2.10.2",
-    "@pgpmjs/env": "^2.16.2",
+    "@pgpmjs/env": "^2.17.0",
     "glob": "^13.0.6",
     "makage": "^0.3.0"
   },
@@ -38,7 +38,7 @@
     "@aws-sdk/client-s3": "^3.1009.0",
     "@aws-sdk/lib-storage": "^3.1009.0",
     "@constructive-io/content-type-stream": "^2.11.2",
-    "@pgpmjs/types": "^2.20.2"
+    "@pgpmjs/types": "^2.21.0"
   },
   "keywords": [
     "s3",
@@ -48,5 +48,5 @@
     "minio",
     "constructive"
   ],
-  "gitHead": "baae875effd00af36577612c861d0f6f9a1a792a"
+  "gitHead": "fe60f7b81252eea53dce227bb581d5ae2ef0ec36"
 }

package/s3.d.ts

@@ -4,7 +4,7 @@ interface S3Options {
     awsAccessKey: string;
     awsSecretKey: string;
     awsRegion: string;
-    minioEndpoint?: string;
+    endpoint?: string;
     provider?: BucketProvider;
 }
 export default function getS3(opts: S3Options): S3Client;

package/s3.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getS3;
 const client_s3_1 = require("@aws-sdk/client-s3");
 function getS3(opts) {
-    // Use explicit provider if set, otherwise fall back to checking minioEndpoint for backwards compatibility
-    const isMinio = opts.provider === 'minio' || (opts.provider === undefined && Boolean(opts.minioEndpoint));
     const awsConfig = {
         region: opts.awsRegion,
         ...(opts.awsAccessKey && opts.awsSecretKey
@@ -15,9 +13,9 @@ function getS3(opts) {
                 },
             }
             : {}),
-        ...(isMinio && opts.minioEndpoint
+        ...(opts.endpoint
             ? {
-                endpoint: opts.minioEndpoint,
+                endpoint: opts.endpoint,
                 forcePathStyle: true,
             }
             : {}),

package/streamer.d.ts

@@ -6,7 +6,7 @@ interface StreamerOptions {
     awsRegion: string;
     awsSecretKey: string;
     awsAccessKey: string;
-    minioEndpoint?: string;
+    endpoint?: string;
     provider?: BucketProvider;
     defaultBucket: string;
 }
@@ -29,7 +29,7 @@ interface UploadWithContentTypeParams {
 export declare class Streamer {
     private s3;
     private defaultBucket?;
-    constructor({ awsRegion, awsSecretKey, awsAccessKey, minioEndpoint, provider, defaultBucket }: StreamerOptions);
+    constructor({ awsRegion, awsSecretKey, awsAccessKey, endpoint, provider, defaultBucket }: StreamerOptions);
     upload({ readStream, filename, key, bucket }: UploadParams): Promise<AsyncUploadResult>;
     uploadWithContentType({ readStream, contentType, key, bucket, magic, }: UploadWithContentTypeParams): Promise<AsyncUploadResult>;
     detectContentType({ readStream, filename, peekBytes, }: {

package/streamer.js

@@ -10,12 +10,12 @@ const utils_1 = require("./utils");
 class Streamer {
     s3;
     defaultBucket;
-    constructor({ awsRegion, awsSecretKey, awsAccessKey, minioEndpoint, provider, defaultBucket }) {
+    constructor({ awsRegion, awsSecretKey, awsAccessKey, endpoint, provider, defaultBucket }) {
         this.s3 = (0, s3_1.default)({
             awsRegion,
             awsSecretKey,
             awsAccessKey,
-            minioEndpoint,
+            endpoint,
             provider
         });
         this.defaultBucket = defaultBucket;