mbkbucket 3.8.3 → 4.0.1

package/lib/public/mbkbucket-helper-demo.html

@@ -29,33 +29,13 @@
     body {
       font-family: var(--font);
       font-size: 14px;
-      line-height: 1.6;
+      line-height: 1.5;
       color: var(--text);
-      background:
-        radial-gradient(circle at 12% 14%, rgba(16, 185, 129, 0.1), transparent 44%),
-        radial-gradient(circle at 88% 8%,  rgba(15, 118, 110, 0.08), transparent 40%),
-        linear-gradient(160deg, #eef7f2 0%, #f8fbf7 52%, #eaf2ef 100%);
+      background: var(--body-bg, #f8fafc);
       min-height: 100vh;
       overflow-x: hidden;
-    }
-
-    /* Ambient blobs */
-    body::before, body::after {
-      content: '';
-      position: fixed;
-      border-radius: 50%;
-      pointer-events: none;
-      z-index: 0;
-    }
-    body::before {
-      width: 280px; height: 280px;
-      top: 10vh; left: -80px;
-      background: radial-gradient(circle, rgba(15,118,110,0.14) 0, transparent 70%);
-    }
-    body::after {
-      width: 320px; height: 320px;
-      bottom: 8vh; right: -100px;
-      background: radial-gradient(circle, rgba(16,185,129,0.1) 0, transparent 70%);
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
     }
 
     /* ── Top nav ───────────────────────────────────────────────── */

package/lib/public/mbkbucket-helper.css

@@ -13,55 +13,49 @@
 /* ─── Standalone design tokens (fallbacks via @property-like approach) ──────── */
 :root {
   /* Colours */
-  --mbkh-primary:       var(--primary-color-ml,      #0f766e);
-  --mbkh-primary-lt:    var(--primary-light-color-ml, #d7f4ee);
-  --mbkh-primary-dk:    var(--primary-dark-color-ml,  #0b4f4a);
-  --mbkh-primary-hover: var(--primary-hover,          #0d635c);
+  --mbkh-primary:       var(--primary-color-ml,       #0f766e);
+  --mbkh-primary-lt:    var(--primary-light-color-ml,  #f0fdfa);
+  --mbkh-primary-dk:    var(--primary-dark-color-ml,   #115e59);
+  --mbkh-primary-hover: var(--primary-hover,           #134e4a);
 
-  --mbkh-danger:        var(--danger-color-ml,   #dc2626);
-  --mbkh-success:       var(--success-color-ml,  #16a34a);
-  --mbkh-warning:       var(--warning-color-ml,  #d97706);
+  --mbkh-danger:        var(--danger-color-ml,   #ef4444);
+  --mbkh-success:       var(--success-color-ml,  #10b981);
+  --mbkh-warning:       var(--warning-color-ml,  #f59e0b);
 
   /* Backgrounds */
-  --mbkh-body-bg:       var(--body-bg,                #f4f7f3);
-  --mbkh-surface:       var(--bg-surface,             rgba(255,255,255,0.85));
-  --mbkh-surface2:      var(--bg-surface-secondary,   rgba(244,247,243,0.85));
-  --mbkh-surface3:      var(--bg-surface-tertiary,    #e2ede8);
+  --mbkh-body-bg:       var(--body-bg,                #f8fafc);
+  --mbkh-surface:       var(--bg-surface,             #ffffff);
+  --mbkh-surface2:      var(--bg-surface-secondary,   #f8fafc);
+  --mbkh-surface3:      var(--bg-surface-tertiary,    #f1f5f9);
 
   /* Borders */
-  --mbkh-border:        var(--border-color,            rgba(15,118,110,0.16));
-  --mbkh-border-lt:     var(--border-color-light,      rgba(15,118,110,0.08));
-  --mbkh-border-active: rgba(15,118,110,0.45);
+  --mbkh-border:        var(--border-color,            #e2e8f0);
+  --mbkh-border-lt:     var(--border-color-light,      #f1f5f9);
+  --mbkh-border-active: rgba(15, 118, 110, 0.35);
 
   /* Text */
-  --mbkh-text:          var(--text,          #1f2a2a);
-  --mbkh-text-sec:      var(--text-secondary, #425855);
-  --mbkh-text-muted:    var(--text-muted,    #667c79);
-  --mbkh-text-dim:      var(--text-disabled, #a0b2af);
+  --mbkh-text:          var(--text,          #0f172a);
+  --mbkh-text-sec:      var(--text-secondary, #475569);
+  --mbkh-text-muted:    var(--text-muted,    #64748b);
+  --mbkh-text-dim:      var(--text-disabled, #94a3b8);
 
   /* Typography */
-  --mbkh-font:          var(--font,          "IBM Plex Sans", "Segoe UI", sans-serif);
-  --mbkh-font-heading:  var(--font-headings, "Sora",          "Segoe UI", sans-serif);
-  --mbkh-font-mono:     var(--font-mono,     "JetBrains Mono", Consolas,  monospace);
+  --mbkh-font:          var(--font,          "Segoe UI", -apple-system, BlinkMacSystemFont, system-ui, Roboto, sans-serif);
+  --mbkh-font-heading:  var(--font-headings, "Segoe UI", -apple-system, BlinkMacSystemFont, system-ui, Roboto, sans-serif);
+  --mbkh-font-mono:     var(--font-mono,     "Segoe UI Mono", "Cascadia Code", Consolas, "Courier New", monospace);
 
   /* Shape */
-  --mbkh-radius:        var(--radius-lg, 14px);
+  --mbkh-radius:        var(--radius-lg, 12px);
   --mbkh-radius-md:     var(--radius,     8px);
   --mbkh-radius-sm:     var(--radius-sm,  6px);
 
   /* Shadows */
-  --mbkh-shadow:        var(--shadow-lg,
-                          0 20px 40px rgba(15,118,110,0.12),
-                          0 4px 12px rgba(0,0,0,0.06));
-  --mbkh-shadow-sm:     var(--shadow-md,
-                          0 8px 20px rgba(15,118,110,0.08),
-                          0 2px 6px rgba(0,0,0,0.04));
-  --mbkh-shadow-dropdown: var(--shadow-dropdown,
-                          0 12px 30px rgba(15,42,42,0.14),
-                          0 4px 10px rgba(0,0,0,0.05));
+  --mbkh-shadow:        var(--shadow-dropdown, 0 10px 25px -5px rgba(15, 23, 42, 0.12), 0 8px 10px -6px rgba(15, 23, 42, 0.04));
+  --mbkh-shadow-sm:     var(--shadow-sm, 0 1px 3px rgba(15, 23, 42, 0.06), 0 1px 2px rgba(15, 23, 42, 0.04));
+  --mbkh-shadow-dropdown: var(--shadow-dropdown, 0 10px 25px -5px rgba(15, 23, 42, 0.12), 0 8px 10px -6px rgba(15, 23, 42, 0.04));
 
   /* Transition */
-  --mbkh-transition:    0.15s ease-in-out;
+  --mbkh-transition:    0.12s ease;
 }
 
 /* ─── Reset inside helper components ───────────────────────────────────────── */
@@ -82,14 +76,14 @@
   position: fixed;
   inset: 0;
   z-index: 99990;
-  background: rgba(15, 42, 42, 0.45);
+  background: rgba(15, 23, 42, 0.5);
   backdrop-filter: blur(4px);
   -webkit-backdrop-filter: blur(4px);
   display: flex;
   align-items: center;
   justify-content: center;
   padding: 16px;
-  animation: mbkh-fade-in 0.18s ease;
+  animation: mbkh-fade-in 0.15s ease;
 }
 
 @keyframes mbkh-fade-in { from { opacity: 0; } to { opacity: 1; } }

package/lib/public/mbkbucket-helper.js

@@ -151,9 +151,10 @@
     close:  `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>`,
     search: `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>`,
     grid:   `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>`,
-    list:   `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>`,
-    upload: `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="16 16 12 12 8 16"/><line x1="12" y1="12" x2="12" y2="21"/><path d="M20.39 18.39A5 5 0 0018 9h-1.26A8 8 0 103 16.3"/></svg>`,
-    plus:   `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>`,
+    list:     `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>`,
+    upload:   `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><polyline points="17 8 12 3 7 8"/><line x1="12" y1="3" x2="12" y2="15"/></svg>`,
+    download: `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>`,
+    plus:     `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>`,
     check:  `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>`,
     warn:   `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>`,
     info:   `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>`,

package/lib/src/config/validation.js

@@ -1,6 +1,6 @@
 const TRUE_VALUES = new Set(['true', 't', '1', 'yes', 'y', 'on']);
 const FALSE_VALUES = new Set(['false', 'f', '0', 'no', 'n', 'off']);
-const REQUIRED_BUCKET_FIELDS = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
+const REQUIRED_S3_FIELDS = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
 
 export function normalizeBooleanLike(value) {
   if (typeof value === 'boolean') return value;
@@ -62,12 +62,25 @@ export function parseAndValidateBucketConnection(rawValue) {
       throw new Error(`Bucket '${bucketName}' configuration must be an object, not a string. Remove quotes around the inner JSON object.`);
     }
 
-    const missingFields = REQUIRED_BUCKET_FIELDS.filter(field => !config[field]);
-    if (missingFields.length) {
-      throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
+    const providerType = String(config.type || config.provider || '').toLowerCase();
+
+    if (providerType === 'gdrive' || providerType === 'google-drive' || providerType === 'googledrive') {
+      const hasOAuth = Boolean(config.client_id && config.client_secret && (config.refresh_token || config.access_token || config.code));
+      const hasServiceAccount = Boolean((config.client_email || config.service_account_email) && (config.private_key || config.service_account_key));
+      const hasAccessTokenOnly = Boolean(config.access_token);
+      const hasServiceAccountKeyObj = Boolean(config.service_account && typeof config.service_account === 'object');
+
+      if (!hasOAuth && !hasServiceAccount && !hasAccessTokenOnly && !hasServiceAccountKeyObj) {
+        throw new Error(`Google Drive connection '${bucketName}' requires OAuth credentials (client_id, client_secret, refresh_token) or Service Account credentials (client_email, private_key).`);
+      }
+    } else {
+      // Default is S3-compatible provider
+      const missingFields = REQUIRED_S3_FIELDS.filter(field => !config[field]);
+      if (missingFields.length) {
+        throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
+      }
     }
   }
 
   return parsed;
 }
-

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

@@ -1,5 +1,5 @@
 import { pipeline } from "stream/promises";
-import { listfiles, uploadFile, deleteFile, deleteFiles, deleteFolder, downloadFile, getFileMetadata, fileExists, ensureKeyHasAppPrefix, ensurePrefix, createMultipartUpload, uploadPart, completeMultipartUpload, abortMultipartUpload, listIncompleteMultipartUploads, cleanupIncompleteMultipartUploads } from "../services/s3.service.js";
+import { listfiles, uploadFile, deleteFile, deleteFiles, deleteFolder, createFolder as createStorageFolder, downloadFile, getFileMetadata, fileExists, ensureKeyHasAppPrefix, ensurePrefix, createMultipartUpload, uploadPart, completeMultipartUpload, abortMultipartUpload, listIncompleteMultipartUploads, cleanupIncompleteMultipartUploads, getStorageProvider, copyFile, moveFile, checkHealth } from "../services/storage.service.js";
 import { sendApiError, classifyApiError } from "../utils/errors.js";
 import { getBaseName, isSensitiveTextType, buildKey, normalizeKeyParam, getFolderPath, destroyStream } from "../utils/helpers.js";
 import { createLogger } from "#logger";
@@ -18,6 +18,9 @@ function resolvePrefix(req, res, prefix) {
 async function cleanupFolderMarker(folderPath, bucketName) {
   if (!folderPath) return;
   try {
+    const provider = getStorageProvider(bucketName);
+    if (provider.capabilities.nativeFolders) return;
+
     const meta = await getFileMetadata(folderPath, bucketName);
     if (meta.exists && (meta.ContentLength === 0 || meta.Metadata?.marker === 'true')) {
       await deleteFile(folderPath, bucketName);
@@ -214,6 +217,14 @@ export async function uploadSingleFile(req, res) {
 export async function initiateMultipartUpload(req, res) {
   try {
     const bucketName = req.activeBucket;
+    const provider = getStorageProvider(bucketName);
+    if (!provider.capabilities.multipart) {
+      return res.status(501).json({
+        success: false,
+        error: `Multipart upload is not supported by provider '${provider.type}'. Use single-file direct upload.`
+      });
+    }
+
     const { fileName, prefix = '', contentType = 'application/octet-stream' } = req.body;
     if (!fileName) return res.status(400).json({ success: false, error: 'fileName is required' });
 
@@ -298,21 +309,8 @@ export async function createFolder(req, res) {
       ? `${cleanPrefix}/${cleanName}/`
       : `${cleanName}/`;
 
-    if (await fileExists(folderKey, bucketName)) {
-      return res.status(409).json({ success: false, error: 'Folder already exists' });
-    }
-
-    const existingFiles = await listfiles(folderKey, { maxKeys: 1, bucketName });
-    if (existingFiles.Contents?.length) {
-      return res.json({ success: true, message: 'Folder already exists with content', key: folderKey, skipMarker: true });
-    }
-
-    await uploadFile(folderKey, Buffer.alloc(0), 'application/x-empty', {
-      metadata: { folder: 'true', marker: 'true' },
-      bucketName
-    });
-
-    return res.json({ success: true, message: 'Folder created', key: folderKey });
+    const result = await createStorageFolder(folderKey, bucketName);
+    return res.json({ success: true, message: result.message || 'Folder created', key: result.key || folderKey });
   } catch (err) {
     console.error('Create folder failed:', err);
     return sendApiError(res, err, 'Create folder failed');
@@ -381,7 +379,7 @@ export async function downloadFileHandler(req, res) {
     res.setHeader('Content-Type', contentType);
     if (contentLength) res.setHeader('Content-Length', contentLength);
     if (result.ETag) res.setHeader('ETag', result.ETag);
-    if (result.LastModified) res.setHeader('Last-Modified', result.LastModified.toUTCString());
+    if (result.LastModified) res.setHeader('Last-Modified', new Date(result.LastModified).toUTCString());
 
     const isSensitive = isSensitiveTextType(contentType);
     const isLargeFile = Number(contentLength || 0) > 50 * 1024 * 1024;
@@ -408,3 +406,54 @@ export async function downloadFileHandler(req, res) {
     }
   }
 }
+
+export async function moveItem(req, res) {
+  try {
+    const { sourceKey, destKey } = req.body;
+    if (!sourceKey || !destKey) {
+      return res.status(400).json({ success: false, error: 'sourceKey and destKey are required' });
+    }
+
+    const result = await moveFile(sourceKey, destKey, {}, req.activeBucket);
+    res.json({ success: true, message: `Moved ${sourceKey} to ${destKey}`, ...result });
+  } catch (error) {
+    console.error('[mbkbucket] Move failed:', error);
+    return sendApiError(res, error, 'Move failed');
+  }
+}
+
+export async function copyItem(req, res) {
+  try {
+    const { sourceKey, destKey } = req.body;
+    if (!sourceKey || !destKey) {
+      return res.status(400).json({ success: false, error: 'sourceKey and destKey are required' });
+    }
+
+    const result = await copyFile(sourceKey, destKey, {}, req.activeBucket);
+    res.json({ success: true, message: `Copied ${sourceKey} to ${destKey}`, ...result });
+  } catch (error) {
+    console.error('[mbkbucket] Copy failed:', error);
+    return sendApiError(res, error, 'Copy failed');
+  }
+}
+
+export async function getHealthStatus(req, res) {
+  try {
+    const health = await checkHealth(req.activeBucket);
+    res.json({ success: true, ...health });
+  } catch (error) {
+    return sendApiError(res, error, 'Health check failed');
+  }
+}
+
+export async function getFileInfo(req, res) {
+  try {
+    const key = normalizeKeyParam(req.params.key || req.query.key);
+    if (!key) return res.status(400).json({ success: false, error: 'key is required' });
+
+    const meta = await getFileMetadata(key, req.activeBucket);
+    res.json({ success: true, ...meta });
+  } catch (error) {
+    return sendApiError(res, error, 'Failed to get file info');
+  }
+}

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

@@ -1,14 +1,16 @@
 import fs from "fs";
 import path from "path";
-import { resolveBucketName, getAvailableBucketNames } from "../services/s3.service.js";
+import { resolveStorageName, getAvailableStorageNames, getStorageProvider, getStorageConfig } from "../services/storage.service.js";
+import { storageManager } from "../core/storage/storage-manager.js";
 import { renderPage, mbkautheVar } from "mbkauthe";
 import { commonHandlebarsHelpers } from "../utils/helpers.js";
+import { mbkbucketVar } from "../config/index.js";
 
 /**
- * Render the main bucket dashboard page.
+ * Render the main storage/bucket dashboard page.
  */
 export function renderBucketDashboard(req, res) {
-  const allBuckets = getAvailableBucketNames();
+  const allBuckets = getAvailableStorageNames();
   const configuredDefaultBucket = mbkautheVar?.bucket;
   const isPortal = mbkautheVar?.APP_NAME === "portal";
   const bucketfilePath = isPortal ? "bucketportal.hbs" : "bucket.hbs";
@@ -19,19 +21,34 @@ export function renderBucketDashboard(req, res) {
 
   let selectedBucket;
   let error = req.query.error;
+  let providerType = 's3';
+  let providerCapabilities = {};
 
   try {
-    selectedBucket = resolveBucketName(req.query.bucket);
+    selectedBucket = resolveStorageName(req.query.bucket);
+    const provider = getStorageProvider(selectedBucket);
+    providerType = provider.type;
+    providerCapabilities = provider.capabilities;
   } catch (err) {
     selectedBucket = mbkautheVar?.bucket;
     error ||= err.message;
   }
 
-  const bucketOptions = allBuckets.map(name => ({
-    name,
-    isSelected: name === selectedBucket,
-    isDefault: name === configuredDefaultBucket
-  }));
+  const bucketOptions = allBuckets.map(name => {
+    let type = 's3';
+    try {
+      const cfg = getStorageConfig(name);
+      type = storageManager.inferProviderType(cfg);
+    } catch {}
+    return {
+      name,
+      type,
+      isSelected: name === selectedBucket,
+      isDefault: name === configuredDefaultBucket
+    };
+  });
+
+  const publicViewEnabled = Boolean(mbkbucketVar?.publiView_enabled);
 
   renderPage(req, res, bucketfilePath, Boolean(portalLayout), {
     page: "Admin Bucket",
@@ -40,10 +57,13 @@ export function renderBucketDashboard(req, res) {
     bucketvar: selectedBucket,
     selectedBucket,
     bucketOptions,
+    providerType,
+    providerCapabilities,
     APP_NAME: mbkautheVar?.APP_NAME,
+    publicViewEnabled,
+    publiViewEnabled: publicViewEnabled,
     message: req.query.message,
     error,
     availableBuckets: allBuckets
   });
 }
-

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

@@ -1,5 +1,7 @@
 import { renderPage, mbkautheVar } from "mbkauthe";
-import { packageJson, getLatestVersion } from "../config/index.js";
+import { packageJson, getLatestVersion, appVersion, mbkbucketVar } from "../config/index.js";
+import { getAvailableBucketNames, getStorageProvider } from "../services/storage.service.js";
+import { storageManager } from "../core/storage/storage-manager.js";
 
 async function getInfoData() {
   let latestVersion = 'unknown';
@@ -8,10 +10,38 @@ async function getInfoData() {
   } catch (err) {
     console.error("[mbkbucket] Error fetching latest version:", err);
   }
+
+  const buckets = getAvailableBucketNames();
+  const defaultBucket = storageManager.getDefaultConnectionName() || (buckets[0] ?? '');
+  let providerType = 'S3';
+  if (defaultBucket) {
+    try {
+      const provider = getStorageProvider(defaultBucket);
+      providerType = (provider?.type || 's3').toUpperCase();
+    } catch {}
+  }
+
+  // Safe subset only - strictly prevent leaking passwords, DB connection strings, OAuth secrets, or storage credentials
+  const safeMbkautheVar = {
+    APP_NAME: mbkautheVar?.APP_NAME || mbkautheVar?.app_name || "mbkbucket",
+  };
+
+  const safeMbkbucketVar = {
+    publiView_enabled: Boolean(mbkbucketVar?.publiView_enabled),
+    p_view_inline: Boolean(mbkbucketVar?.p_view_inline)
+  };
+
   return {
     CurrentVersion: packageJson.version,
+    version: packageJson.version,
     latestVersion,
-    APP_NAME: mbkautheVar?.APP_NAME
+    APP_NAME: safeMbkautheVar.APP_NAME,
+    APP_VERSION: appVersion,
+    mbkautheVar: safeMbkautheVar,
+    mbkbucketVar: safeMbkbucketVar,
+    defaultBucket,
+    configuredBucketsCount: buckets.length,
+    providerType
   };
 }
 
@@ -20,7 +50,8 @@ async function getInfoData() {
  */
 export async function infoPage(req, res) {
   renderPage(req, res, "mbkbucket_info.hbs", false, {
-    page: "MBK Bucket Info",
+    pageTitle: "MBKBucket Information",
+    ogUrl: "/mbkbucket/info",
     ...(await getInfoData())
   });
 }

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

@@ -1,4 +1,4 @@
-import { downloadFile, getFileMetadata, ensureKeyHasAppPrefix, generateSignedUrl, resolveBucketName } from "../services/s3.service.js";
+import { downloadFile, getFileMetadata, ensureKeyHasAppPrefix, generateSignedUrl, resolveStorageName, getStorageProvider } from "../services/storage.service.js";
 import { mbkbucketVar } from "../config/index.js";
 import { escapeHtml, getBaseName, getFileExt, getMimeType, normalizeKeyParam, destroyStream, VIEWABLE_TYPES, VIEWABLE_TYPES_SORTED, STATIC_ASSET_TYPES, VIDEO_TYPES, AUDIO_TYPES, buildCacheControl, parseRangeHeader, renderPlayerPage } from "../utils/helpers.js";
 import { createLogger } from "#logger";
@@ -62,7 +62,7 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
 
     if (!meta?.exists) return res.status(404).json({ message: 'File not found', key: keyToUse });
 
-    const etag = `"${meta.LastModified?.getTime() || Date.now()}-${meta.ContentLength || 0}"`;
+    const etag = `"${new Date(meta.LastModified || Date.now()).getTime()}-${meta.ContentLength || 0}"`;
     if (ifNoneMatch === etag) return res.status(304).end();
 
     const total = Number(meta.ContentLength);
@@ -91,7 +91,7 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
         res.setHeader('Accept-Ranges', 'bytes');
         if (noindex) res.setHeader('X-Robots-Tag', 'noindex, nofollow');
         res.setHeader('X-Content-Type-Options', 'nosniff');
-        if (meta.LastModified) res.setHeader('Last-Modified', meta.LastModified.toUTCString());
+        if (meta.LastModified) res.setHeader('Last-Modified', new Date(meta.LastModified).toUTCString());
 
         attachStreamCleanup(req, res, rangeResult.Body);
         return rangeResult.Body.pipe(res);
@@ -114,10 +114,10 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
   try {
     result = await downloadFile(keyToUse, downloadOptions);
   } catch (err) {
-    if (err.name === 'NoSuchKey' || err.name === 'NotFound') {
+    if (err.name === 'NoSuchKey' || err.name === 'NotFound' || err.message?.includes('File not found')) {
       return res.status(404).json({ message: 'File not found', key: keyToUse });
     }
-    if (err.name === 'AccessDenied') {
+    if (err.name === 'AccessDenied' || err.message?.includes('Access denied')) {
       return res.status(403).json({ message: 'Access denied' });
     }
     console.error('[mbkbucket] serveFileInline download error:', err);
@@ -126,7 +126,7 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
 
   if (result?.notModified) return res.status(304).end();
 
-  const etag = `"${result.LastModified?.getTime() || Date.now()}-${result.ContentLength || 0}"`;
+  const etag = `"${new Date(result.LastModified || Date.now()).getTime()}-${result.ContentLength || 0}"`;
   if (ifNoneMatch === etag) return res.status(304).end();
 
   res.setHeader('Content-Type', contentType);
@@ -136,7 +136,7 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
   res.setHeader('X-Frame-Options', 'SAMEORIGIN');
   if (noindex) res.setHeader('X-Robots-Tag', 'noindex, nofollow');
   if (result.ContentLength) res.setHeader('Content-Length', result.ContentLength);
-  if (result.LastModified) res.setHeader('Last-Modified', result.LastModified.toUTCString());
+  if (result.LastModified) res.setHeader('Last-Modified', new Date(result.LastModified).toUTCString());
   if (fileExtension === 'html' || fileExtension === 'htm') {
     res.setHeader('Content-Security-Policy', "default-src 'self'; script-src 'none'; object-src 'none';");
   }
@@ -162,9 +162,9 @@ export async function viewFile(req, res) {
     await serveFileInline(req, res, keyToUse, { noindex: true, bucketName: req.activeBucket, publicCache: false });
   } catch (error) {
     console.error("Error viewing file:", error);
-    if (error.name === 'NoSuchKey' || error.name === 'NotFound') {
+    if (error.name === 'NoSuchKey' || error.name === 'NotFound' || error.message?.includes('File not found')) {
       res.status(404).json({ message: "File not found", key: req.params.key });
-    } else if (error.name === 'AccessDenied') {
+    } else if (error.name === 'AccessDenied' || error.message?.includes('Access denied')) {
       res.status(403).json({ message: "Access denied" });
     } else {
       res.status(500).json({ message: "View failed", error: error.message });
@@ -199,7 +199,7 @@ export async function playerPage(req, res) {
 
 export async function publicView(req, res) {
   try {
-    const bucketName = resolveBucketName();
+    const bucketName = req.query?.bucket ? resolveStorageName(req.query.bucket) : resolveStorageName();
     const key = normalizeKeyParam(req.params.key);
 
     if (!key || key.endsWith('/')) {
@@ -215,11 +215,13 @@ export async function publicView(req, res) {
 
     if (!mbkbucketVar?.p_view_inline) {
       try {
-        const signed = await generateSignedUrl(keyToUse, 'getObject', 3600, bucketName);
-        return res.redirect(302, signed.url);
+        const provider = getStorageProvider(bucketName);
+        if (provider.capabilities.presignedUrls) {
+          const signed = await generateSignedUrl(keyToUse, 'getObject', 3600, bucketName);
+          return res.redirect(302, signed.url);
+        }
       } catch (err) {
-        console.error('[mbkbucket] p_view signed URL error:', err);
-        return res.status(500).json({ message: 'Failed to generate access URL' });
+        debugView('Signed URL redirection failed, falling back to inline serve: %s', err.message);
       }
     }
 

package/lib/src/core/storage/errors.js

@@ -0,0 +1,62 @@
+/**
+ * MBKBucket - Typed Storage Error Hierarchy
+ * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
+ * Licensed under the MIT License.
+ */
+
+export class StorageError extends Error {
+  /**
+   * @param {string} message
+   * @param {number} [status=500]
+   * @param {string} [code='INTERNAL_STORAGE_ERROR']
+   */
+  constructor(message, status = 500, code = 'INTERNAL_STORAGE_ERROR') {
+    super(message);
+    this.name = this.constructor.name;
+    this.status = status;
+    this.code = code;
+    Error.captureStackTrace?.(this, this.constructor);
+  }
+}
+
+export class StorageNotFoundError extends StorageError {
+  constructor(message = 'File or folder not found') {
+    super(message, 404, 'NOT_FOUND');
+  }
+}
+
+export class StorageAccessDeniedError extends StorageError {
+  constructor(message = 'Access denied') {
+    super(message, 403, 'ACCESS_DENIED');
+  }
+}
+
+export class StorageConflictError extends StorageError {
+  constructor(message = 'Resource already exists') {
+    super(message, 409, 'CONFLICT');
+  }
+}
+
+export class StorageValidationError extends StorageError {
+  constructor(message = 'Validation failed') {
+    super(message, 400, 'VALIDATION_ERROR');
+  }
+}
+
+export class StorageConfigError extends StorageError {
+  constructor(message = 'Storage configuration error') {
+    super(message, 503, 'STORAGE_CONFIG_ERROR');
+  }
+}
+
+export class StorageQuotaExceededError extends StorageError {
+  constructor(message = 'Storage quota exceeded') {
+    super(message, 507, 'QUOTA_EXCEEDED');
+  }
+}
+
+export class StorageUnsupportedOperationError extends StorageError {
+  constructor(message = 'Operation not supported by this storage provider') {
+    super(message, 501, 'NOT_IMPLEMENTED');
+  }
+}