mbkbucket 3.1.0 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkbucket",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Flexible S3/R2 bucket management — library, Express router, and CLI for mbktech.org applications. Provides upload, download, listing, multipart utilities, signed URLs, and a command-line interface with built-in configuration validation and health checks",
   "author": "Muhammad Bin Khalid",
   "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",

package/src/app.js

@@ -9,6 +9,7 @@ import { notFoundHandler, globalErrorHandler } from "./middleware/error-handler.
 import bucketRoutes from "./routes/index.js";
 import { packageJson } from "./config/index.js";
 import { createLogger } from "./utils/logger.js";
+import { commonHandlebarsHelpers } from "./utils/helpers.js";
 
 const debugServer = createLogger('server');
 
@@ -46,8 +47,7 @@ export function createApp() {
   // Handlebars configuration
   server.engine("handlebars", engine({
     extname: ".handlebars",
-    defaultLayout: "main",
-    layoutsDir: path.join(__dirname, "..", "views", "layouts"),
+    defaultLayout: false,
     partialsDir: [
       path.join(__dirname, "..", "views", "templates"),
       path.join(__dirname, "..", "views", "templates", "notice"),
@@ -58,9 +58,7 @@ export function createApp() {
     ],
     cache: process.env.NODE_ENV === "production",
     helpers: {
-      eq: function (a, b) {
-        return a === b;
-      },
+      ...commonHandlebarsHelpers,
       mbkbucket_cachebuster: function () {
         return "?v=" + packageJson.version;
       }

package/src/controllers/api.controller.js

@@ -425,9 +425,11 @@ export async function downloadFileHandler(req, res) {
 
   try {
     const bucketName = req.activeBucket;
+    const rawKey = req.params.key;
+    const key = Array.isArray(rawKey) ? rawKey.join('/') : (rawKey || '');
     let keyToUse;
     try {
-      keyToUse = ensureKeyHasAppPrefix(req.params.key);
+      keyToUse = ensureKeyHasAppPrefix(key);
     } catch (e) {
       return res.status(400).json({ success: false, error: e.message });
     }

package/src/controllers/dashboard.controller.js

@@ -1,5 +1,7 @@
+import path from "path";
 import { resolveBucketName, getAvailableBucketNames } from "../services/s3.service.js";
 import { renderPage, mbkautheVar } from "mbkauthe";
+import { commonHandlebarsHelpers } from "../utils/helpers.js";
 
 /**
  * Render the main bucket dashboard page.
@@ -7,13 +9,9 @@ import { renderPage, mbkautheVar } from "mbkauthe";
 export function renderBucketDashboard(req, res) {
   const allBuckets = getAvailableBucketNames();
   const configuredDefaultBucket = mbkautheVar?.bucket;
-
-  let bucketfilePath;
-  if (mbkautheVar?.APP_NAME === "portal") {
-    bucketfilePath = "bucketportal.handlebars";
-  } else {
-    bucketfilePath = "bucket.handlebars";
-  }
+  const isPortal = mbkautheVar?.APP_NAME === "portal";
+  const bucketfilePath = isPortal ? "bucketportal.handlebars" : "bucket.handlebars";
+  const portalLayout = isPortal ? path.resolve(process.cwd(), "views", "layouts", "main") : false;
 
   let selectedBucket;
 
@@ -26,9 +24,10 @@ export function renderBucketDashboard(req, res) {
       isSelected: name === fallbackSelected,
       isDefault: name === configuredDefaultBucket
     }));
-    return renderPage(req, res, bucketfilePath, mbkautheVar?.APP_NAME === "portal" ? true : false, {
+    return renderPage(req, res, bucketfilePath, isPortal, {
       page: "Admin Bucket",
-      layout: true,
+      helpers: commonHandlebarsHelpers,
+      ...(isPortal ? { layout: portalLayout } : {}),
       bucketvar: mbkautheVar?.bucket,
       selectedBucket: fallbackSelected,
       bucketOptions,
@@ -45,8 +44,10 @@ export function renderBucketDashboard(req, res) {
     isDefault: name === configuredDefaultBucket
   }));
 
-  renderPage(req, res, bucketfilePath, mbkautheVar?.APP_NAME === "portal" ? true : false, {
+  renderPage(req, res, bucketfilePath, isPortal, {
     page: "Admin Bucket",
+    helpers: commonHandlebarsHelpers,
+    ...(isPortal ? { layout: portalLayout } : {}),
     bucketvar: selectedBucket,
     selectedBucket,
     bucketOptions,

package/src/controllers/view.controller.js

@@ -192,9 +192,11 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
 export async function viewFile(req, res) {
   try {
     const bucketName = req.activeBucket;
+    const rawKey = req.params.key;
+    const key = Array.isArray(rawKey) ? rawKey.join('/') : (rawKey || '');
     let keyToUse;
     try {
-      keyToUse = ensureKeyHasAppPrefix(req.params.key);
+      keyToUse = ensureKeyHasAppPrefix(key);
     } catch (e) {
       return res.status(400).json({ message: e.message });
     }
@@ -216,7 +218,8 @@ export async function viewFile(req, res) {
 export async function playerPage(req, res) {
   try {
     const bucketName = req.activeBucket;
-    const key = req.params.key;
+    const rawKey = req.params.key;
+    const key = Array.isArray(rawKey) ? rawKey.join('/') : (rawKey || '');
     let keyToUse;
     try {
       keyToUse = ensureKeyHasAppPrefix(key);
@@ -240,7 +243,8 @@ export async function playerPage(req, res) {
 export async function publicView(req, res) {
   try {
     const bucketName = resolveBucketName();
-    const key = req.params.key;
+    const rawKey = req.params.key;
+    const key = Array.isArray(rawKey) ? rawKey.join('/') : (rawKey || '');
 
     // No directory indexing
     if (!key || key.endsWith('/')) {

package/src/routes/api.routes.js

@@ -61,6 +61,6 @@ router.post('/create-folder', sessRole('SuperAdmin'), createFolder);
 router.post('/delete', sessRole('SuperAdmin'), deleteItems);
 
 // Download
-router.get('/download/:key(*)', sessRole('SuperAdmin'), downloadFileHandler);
+router.get('/download/*key', sessRole('SuperAdmin'), downloadFileHandler);
 
 export default router;

package/src/routes/view.routes.js

@@ -12,14 +12,14 @@ const router = express.Router();
 router.use(requireBucketView);
 
 // Player page for video/audio
-router.get('/player/:key(*)', sessRole('SuperAdmin'), playerPage);
+router.get('/player/*key', sessRole('SuperAdmin'), playerPage);
 
 // Inline file view
-router.get('/view/:key(*)', sessRole('SuperAdmin'), viewFile);
+router.get('/view/*key', sessRole('SuperAdmin'), viewFile);
 
 // Public view (conditionally enabled)
 if (mbkbucketVar?.publiView_enabled) {
-  router.get('/p_view/:key(*)', pviewRateLimit, pviewSecurity, publicView);
+  router.get('/p_view/*key', pviewRateLimit, pviewSecurity, publicView);
 }
 
 export default router;

package/src/services/s3.service.js

@@ -74,6 +74,9 @@ function isRootModeApp(appName) {
 }
 
 export function ensureKeyHasAppPrefix(key = '') {
+  if (Array.isArray(key)) {
+    key = key.join('/');
+  }
   const app = getAppName();
   if (!key) throw new Error('Key is required');
 
@@ -103,6 +106,9 @@ export function ensureKeyHasAppPrefix(key = '') {
 }
 
 export function ensurePrefix(prefix = '') {
+  if (Array.isArray(prefix)) {
+    prefix = prefix.join('/');
+  }
   const app = getAppName();
 
   if (prefix && (prefix.includes('../') || prefix.includes('..\\') || /\.\.[\\/]/.test(prefix))) {
@@ -369,12 +375,13 @@ export async function downloadFile(key, options = {}) {
       key: keyToDownload,
     };
   } catch (error) {
-    console.error(`Download failed for key ${key}:`, error);
-
-    if (error && error.$metadata && error.$metadata.httpStatusCode === 304) {
+    if (error && (error.$metadata?.httpStatusCode === 304 || error.name === '304' || error.name === 'NotModified')) {
+      debugS3('File not modified (304) for key %s', keyToDownload);
       return { notModified: true, key: keyToDownload };
     }
 
+    console.error(`Download failed for key ${key}:`, error);
+
     if (error.name === 'NoSuchKey') {
       throw new Error(`File not found: ${key}`);
     } else if (error.name === 'AccessDenied') {

package/src/utils/helpers.js

@@ -171,3 +171,27 @@ export function renderPlayerPage(safeFileName, encodedKey, bucketQuery) {
 </body>
 </html>`;
 }
+
+// ---------------------------------------------------------------------------
+// Common Handlebars helpers
+// ---------------------------------------------------------------------------
+
+export const commonHandlebarsHelpers = {
+  eq: (a, b) => a === b,
+  neq: (a, b) => a !== b,
+  or: (...args) => args.slice(0, -1).some(Boolean),
+  and: (...args) => args.slice(0, -1).every(Boolean),
+  not: (val) => !val,
+  gt: (a, b) => a > b,
+  gte: (a, b) => a >= b,
+  lt: (a, b) => a < b,
+  lte: (a, b) => a <= b,
+  includes: (arr, val) => (Array.isArray(arr) ? arr.includes(val) : false),
+  json: (obj) => JSON.stringify(obj, null, 2),
+  jsonStringify: (obj) => JSON.stringify(obj),
+  getInitials: (username) => {
+    if (!username) return '?';
+    const parts = username.split(/[._]/);
+    return parts.map(p => p.charAt(0)).join('').toUpperCase().substring(0, 2);
+  },
+};