mbkbucket 4.4.0 → 4.4.2

package/lib/src/controllers/view.controller.js

@@ -128,52 +128,48 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
     const etag = meta.ETag || `"${new Date(meta.LastModified || Date.now()).getTime()}-${meta.ContentLength || 0}"`;
     if (ifNoneMatch && (ifNoneMatch === etag || ifNoneMatch === '*')) return res.status(304).end();
 
-    const ifRangeSatisfied = !ifRange || isIfRangeValid(ifRange, etag, meta.LastModified);
-
-    if (ifRangeSatisfied) {
-      const total = Number(meta.ContentLength);
-      if (total) {
-        const range = parseRangeHeader(rangeHeader, total);
-        if (!range) {
-          res.status(416).setHeader('Content-Range', `bytes */${total}`);
-          return res.end();
+    const total = Number(meta.ContentLength);
+    if (total) {
+      const range = parseRangeHeader(rangeHeader, total);
+      if (!range) {
+        res.status(416).setHeader('Content-Range', `bytes */${total}`);
+        return res.end();
+      }
+
+      const { start, end, size: chunksize } = range;
+      try {
+        const rangeResult = await downloadFile(keyToUse, { range: `bytes=${start}-${end}`, bucketName });
+        if (typeof rangeResult.ContentLength === 'number' && rangeResult.ContentLength !== chunksize) {
+          debugView('Range size mismatch for %s: expected=%s got=%s', keyToUse, chunksize, rangeResult.ContentLength);
         }
 
-        const { start, end, size: chunksize } = range;
-        try {
-          const rangeResult = await downloadFile(keyToUse, { range: `bytes=${start}-${end}`, bucketName });
-          if (typeof rangeResult.ContentLength === 'number' && rangeResult.ContentLength !== chunksize) {
-            debugView('Range size mismatch for %s: expected=%s got=%s', keyToUse, chunksize, rangeResult.ContentLength);
-          }
-
-          debugView('Serving range bytes %s-%s/%s (%s bytes) for %s', start, end, total, chunksize, fileName);
-
-          res.status(206);
-          res.setHeader('Content-Range', `bytes ${start}-${end}/${total}`);
-          res.setHeader('Content-Length', chunksize);
-          res.setHeader('Content-Type', contentType);
-          res.setHeader('Content-Disposition', `${dispositionType}; filename="${safeAsciiName}"; filename*=UTF-8''${encodedName}`);
-          res.setHeader('Cache-Control', buildCacheControl(contentType, { supportsRanges: true, publicCache }));
-          if (publicCache) {
-            res.setHeader('CDN-Cache-Control', 'public, s-maxage=31536000, stale-while-revalidate=86400');
-            res.setHeader('Vercel-CDN-Cache-Control', 'public, s-maxage=31536000, stale-while-revalidate=86400');
-          }
-          res.setHeader('ETag', etag);
-          res.setHeader('Accept-Ranges', 'bytes');
-          res.setHeader('Vary', 'Accept-Encoding, Range');
-          res.setHeader('X-Frame-Options', 'SAMEORIGIN');
-          if (noindex) res.setHeader('X-Robots-Tag', 'noindex, nofollow');
-          res.setHeader('X-Content-Type-Options', 'nosniff');
-          const stream = rangeResult.Body || rangeResult.stream;
-          attachStreamCleanup(req, res, stream);
-          return stream.pipe(res);
-        } catch (rangeError) {
-          console.error('[mbkbucket] Range request failed for %s:', keyToUse, rangeError);
-          if (!res.headersSent) {
-            return res.status(500).json({ message: 'Range stream failed', error: rangeError.message });
-          }
-          return;
+        debugView('Serving range bytes %s-%s/%s (%s bytes) for %s', start, end, total, chunksize, fileName);
+
+        res.status(206);
+        res.setHeader('Content-Range', `bytes ${start}-${end}/${total}`);
+        res.setHeader('Content-Length', chunksize);
+        res.setHeader('Content-Type', contentType);
+        res.setHeader('Content-Disposition', `${dispositionType}; filename="${safeAsciiName}"; filename*=UTF-8''${encodedName}`);
+        res.setHeader('Cache-Control', buildCacheControl(contentType, { supportsRanges: true, publicCache }));
+        if (publicCache) {
+          res.setHeader('CDN-Cache-Control', 'public, s-maxage=31536000, stale-while-revalidate=86400');
+          res.setHeader('Vercel-CDN-Cache-Control', 'public, s-maxage=31536000, stale-while-revalidate=86400');
+        }
+        res.setHeader('ETag', etag);
+        res.setHeader('Accept-Ranges', 'bytes');
+        res.setHeader('Vary', 'Accept-Encoding, Range');
+        res.setHeader('X-Frame-Options', 'SAMEORIGIN');
+        if (noindex) res.setHeader('X-Robots-Tag', 'noindex, nofollow');
+        res.setHeader('X-Content-Type-Options', 'nosniff');
+        const stream = rangeResult.Body || rangeResult.stream;
+        attachStreamCleanup(req, res, stream);
+        return stream.pipe(res);
+      } catch (rangeError) {
+        console.error('[mbkbucket] Range request failed for %s:', keyToUse, rangeError);
+        if (!res.headersSent) {
+          return res.status(500).json({ message: 'Range stream failed', error: rangeError.message });
         }
+        return;
       }
     }
   }

package/lib/src/core/storage/s3-provider.js

@@ -19,7 +19,12 @@ export class S3StorageProvider extends StorageProvider {
   constructor(name, config = {}) {
     super(name, config);
     this.bucket = config.BUCKET_NAME;
-    this.region = config.region || 'auto';
+    this.region = config.region || config.Region || 'auto';
+
+    const connectionTimeout = Number(config.connectionTimeout ?? config.CONNECTION_TIMEOUT ?? process.env.S3_CONNECTION_TIMEOUT ?? 15000);
+    const requestTimeout = Number(config.requestTimeout ?? config.REQUEST_TIMEOUT ?? process.env.S3_REQUEST_TIMEOUT ?? 120000);
+    const keepAlive = config.keepAlive ?? true;
+
     this.client = new S3Client({
       region: this.region,
       endpoint: config.ENDPOINT,
@@ -29,12 +34,13 @@ export class S3StorageProvider extends StorageProvider {
       },
       maxAttempts: 3,
       retryMode: 'adaptive',
-      requestTimeout: 120000,
+      requestTimeout,
       requestHandler: {
-        connectionTimeout: 5000,
-        socketTimeout: 120000,
+        connectionTimeout,
+        requestTimeout,
+        socketTimeout: requestTimeout,
         maxSockets: 50,
-        keepAlive: true,
+        keepAlive,
         keepAliveMsecs: 1000,
       },
       useAccelerateEndpoint: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkbucket",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "description": "Flexible S3/R2/Google Drive/Local bucket management — library, Express router, and standalone server CLI for mbktech.org applications. Provides upload, download, listing, multipart utilities, and a standalone server runner with built-in configuration validation and health checks",
   "author": "Muhammad Bin Khalid",
   "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",