cynx-lib 1.3.39 → 1.3.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cynx-lib",
-  "version": "1.3.39",
+  "version": "1.3.41",
   "type": "module",
   "main": "./index.js",
   "bin": {

package/utils/utils/storage_manager.js

@@ -367,15 +367,26 @@ export class StorageManager {
       if (!region || !accessKeyId || !secretAccessKey) {
         throw new Error('Неполные данные подключения Amazon S3 (Region, Access Key ID, Secret Access Key)');
       }
+      const reg = (region && region.trim() && region.trim().toLowerCase() !== 'auto') ? region.trim() : 'us-east-1';
       const clientOpts = {
-        region: region.trim(),
+        region: reg,
         credentials: {
           accessKeyId: accessKeyId.trim(),
           secretAccessKey: secretAccessKey.trim(),
         },
       };
       if (endpoint && endpoint.trim()) {
-        clientOpts.endpoint = endpoint.trim();
+        let cleanEndpoint = endpoint.trim();
+        if (!/^https?:\/\//i.test(cleanEndpoint)) {
+          cleanEndpoint = `https://${cleanEndpoint}`;
+        }
+        try {
+          const parsed = new URL(cleanEndpoint);
+          cleanEndpoint = parsed.origin;
+        } catch {
+          cleanEndpoint = cleanEndpoint.replace(/\/+$/, '');
+        }
+        clientOpts.endpoint = cleanEndpoint;
         clientOpts.forcePathStyle = true;
       }
       return new S3Client(clientOpts);
@@ -647,6 +658,10 @@ export class StorageManager {
         let base = publicDomain.trim().replace(/\/+$/, '');
         if (!/^https?:\/\//i.test(base)) base = `https://${base}`;
         cloudUrl = `${base}/${objectKey}`;
+      } else if (endpoint && endpoint.trim()) {
+        let base = endpoint.trim().replace(/\/+$/, '');
+        if (!/^https?:\/\//i.test(base)) base = `https://${base}`;
+        cloudUrl = `${base}/${bucket.trim()}/${objectKey}`;
       } else if (provider === 's3') {
         const reg = region ? region.trim() : 'us-east-1';
         cloudUrl = `https://${bucket.trim()}.s3.${reg}.amazonaws.com/${objectKey}`;