mbkbucket 3.6.0 → 3.7.0

package/lib/public/bucketadmin.css

@@ -68,10 +68,18 @@
 }
 
 /* Base Layout & Page Header */
+.page-wrapper,
+.page-wrapper *,
+.page-wrapper *::before,
+.page-wrapper *::after {
+  box-sizing: border-box;
+}
+
 .page-wrapper {
   max-width: 1600px;
   margin: 0 auto;
   width: 100%;
+  max-width: 100%;
 }
 
 .page-header {
@@ -1363,57 +1371,324 @@
 
 /* Mobile & Tablet Responsiveness */
 @media (max-width: 900px) {
+  .page-wrapper {
+    padding: 0;
+    max-width: 100%;
+    overflow-x: hidden;
+  }
+
+  .card.file-manager {
+    border-radius: var(--radius-md);
+    width: 100%;
+    max-width: 100%;
+    overflow: hidden;
+  }
+
   .fm-layout {
-    grid-template-columns: 1fr;
+    grid-template-columns: 100%;
     height: auto;
+    min-height: 0;
     max-height: none;
+    width: 100%;
+    max-width: 100%;
+    overflow: hidden;
   }
 
   .fm-tree-wrap {
+    display: flex;
+    border-right: none;
+    border-bottom: 1px solid var(--border-color);
+    padding: 10px 14px;
+    background: rgba(244, 247, 243, 0.85);
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+  }
+
+  .fm-tree-header,
+  .fm-tree {
     display: none;
   }
 
+  .fm-storage {
+    margin-top: 0;
+    padding: 8px 12px;
+    background: rgba(255, 255, 255, 0.95);
+    border: 1px solid var(--border-color);
+    border-radius: var(--radius-sm);
+    box-shadow: 0 1px 4px rgba(15, 118, 110, 0.05);
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+  }
+
+  .fm-main {
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
+    overflow: hidden;
+  }
+
   .fm-grid-wrap {
     min-height: 400px;
+    padding: 12px;
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+    overflow-x: hidden;
+  }
+
+  .fm-grid.view-grid {
+    grid-template-columns: repeat(auto-fill, minmax(135px, 1fr));
+    gap: 10px;
+    width: 100%;
+    max-width: 100%;
+  }
+
+  .fm-item {
+    -webkit-tap-highlight-color: transparent;
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
+  }
+
+  .fm-item-details {
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
+    overflow: hidden;
+  }
+
+  .fm-item-name {
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .fm-item:active {
+    transform: scale(0.98);
+    background: var(--primary-light-color-ml);
+  }
+
+  .fm-item-menu {
+    opacity: 1;
+    background: rgba(255, 255, 255, 0.92);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  }
+
+  .fm-star.on {
+    opacity: 1;
   }
 }
 
 @media (max-width: 640px) {
+  .page-header {
+    padding: 0.75rem 1rem;
+    margin-bottom: 0.75rem;
+    border-radius: var(--radius);
+    width: 100%;
+    max-width: 100%;
+  }
+
   .page-header-row {
     flex-direction: column;
-    align-items: flex-start;
+    align-items: stretch;
+    gap: 10px;
+    width: 100%;
   }
 
   .page-actions {
     width: 100%;
-    justify-content: flex-start;
+    display: flex;
+    justify-content: stretch;
+    gap: 8px;
+  }
+
+  .page-actions .btn {
+    flex: 1 1 0;
+    min-width: 0;
+    justify-content: center;
+    padding: 7px 8px;
+    font-size: 12px;
   }
 
   .fm-toolbar {
     flex-direction: column;
     align-items: stretch;
+    gap: 8px;
+    padding: 8px 10px;
+    width: 100%;
+    max-width: 100%;
+    overflow: hidden;
+  }
+
+  .fm-breadcrumb {
+    max-width: 100%;
+    overflow-x: auto;
+    white-space: nowrap;
+    padding-bottom: 2px;
+    scrollbar-width: none;
+  }
+
+  .fm-breadcrumb::-webkit-scrollbar {
+    display: none;
   }
 
   .fm-toolbar-actions {
     width: 100%;
-    justify-content: space-between;
-    flex-wrap: wrap;
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    gap: 8px;
+    max-width: 100%;
+  }
+
+  .quick-filter-group {
+    width: 100%;
+    display: flex;
+    overflow-x: auto;
+    scrollbar-width: none;
+    max-width: 100%;
+  }
+
+  .quick-filter-group::-webkit-scrollbar {
+    display: none;
+  }
+
+  .quick-filter-btn {
+    flex: 1 1 0;
+    text-align: center;
+    padding: 5px 6px;
+    font-size: 11.5px;
+    white-space: nowrap;
   }
 
   .search-box {
     width: 100%;
+    max-width: 100%;
+  }
+
+  .search-box input {
+    width: 100%;
+    box-sizing: border-box;
+  }
+
+  /* Grid Mode on Small Phones */
+  .fm-grid.view-grid {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 8px;
+    width: 100%;
+    max-width: 100%;
+  }
+
+  .fm-grid.view-grid .fm-item {
+    padding: 8px;
+    border-radius: var(--radius-md);
+    gap: 6px;
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
+  }
+
+  .fm-grid.view-grid .fm-item-icon {
+    aspect-ratio: 16 / 11;
+    width: 100%;
+  }
+
+  .fm-item-name {
+    font-size: 12px;
+    line-height: 1.35;
+  }
+
+  .fm-item-meta {
+    font-size: 10px;
+  }
+
+  .fm-item-menu {
+    top: 5px;
+    right: 5px;
+    width: 26px;
+    height: 26px;
+  }
+
+  .fm-star {
+    top: 5px;
+    left: 5px;
+    width: 22px;
+    height: 22px;
+  }
+
+  /* List Mode on Mobile */
+  .fm-grid.view-list {
+    gap: 6px;
+    width: 100%;
+    max-width: 100%;
   }
 
   .fm-grid.view-list .fm-item {
-    grid-template-columns: 32px 1fr 32px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 8px 10px;
+    border-radius: var(--radius-md);
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
+  }
+
+  .fm-grid.view-list .fm-item-checkbox {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+  }
+
+  .fm-grid.view-list .fm-item-icon {
+    width: 32px;
+    height: 32px;
+    flex-shrink: 0;
+    border-radius: var(--radius-sm);
+  }
+
+  .fm-grid.view-list .fm-item-name {
+    flex: 1 1 auto;
+    min-width: 0;
+    font-size: 12.5px;
+    font-weight: 600;
+    color: var(--dark-color-ml);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 
   .fm-grid.view-list .fm-item-size,
   .fm-grid.view-list .fm-item-date,
-  .fm-grid.view-list .fm-item-checkbox {
+  .fm-grid.view-list .fm-star-wrap {
     display: none;
   }
 
+  .fm-grid.view-list .fm-item-menu {
+    flex-shrink: 0;
+    width: 28px;
+    height: 28px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 1;
+    color: var(--gray-color-ml);
+    border-radius: 6px;
+    background: transparent;
+    box-shadow: none;
+  }
+
+  .fm-grid.view-list .fm-item-menu:active {
+    background: var(--light-color-ml);
+  }
+
   .fm-list-header {
     display: none;
   }

package/lib/src/cli/auth-helper.js

@@ -56,13 +56,8 @@ export function isLoggedIn() {
   return Boolean(token && server_url);
 }
 
-export function getStoredToken() {
-  return readConfig().token || null;
-}
-
-export function getStoredServerUrl() {
-  return readConfig().server_url || null;
-}
+export const getStoredToken = () => readConfig().token || null;
+export const getStoredServerUrl = () => readConfig().server_url || null;
 
 export async function deviceFlowLogin({ server_url, profile_key }) {
   const baseUrl = String(server_url).replace(/\/+$/, '');
@@ -87,26 +82,21 @@ export async function deviceFlowLogin({ server_url, profile_key }) {
     throw err;
   }
 
-  const verification_url = deviceResp.verification_url;
-  const user_code = deviceResp.user_code;
-  const device_code = deviceResp.device_code;
-  const expires_in = deviceResp.expires_in;
-  const interval = deviceResp.interval;
-  const profile = deviceResp.profile;
+  const { verification_url = '', user_code = '', device_code, expires_in = 900, interval = 5, profile } = deviceResp;
 
   console.log('\n┌─────────────────────────────────────────────────────────┐');
   console.log('│                                                         │');
   console.log('│   🌐 Open this URL in your browser to approve:           │');
-  console.log(`│   ${(verification_url || '').padEnd(53)}│`);
+  console.log(`│   ${verification_url.padEnd(53)}│`);
   console.log('│                                                         │');
-  console.log(`│   🔢 Or enter this code:  ${(user_code || '').padEnd(30)}│`);
+  console.log(`│   🔢 Or enter this code:  ${user_code.padEnd(30)}│`);
   console.log('│                                                         │');
   console.log('└─────────────────────────────────────────────────────────┘\n');
 
   if (profile) console.log(`   Profile: ${profile.name} (scope: ${profile.scope || 'full'})`);
-  console.log(`   Waiting for approval (expires in ${Math.floor((expires_in || 900) / 60)} minutes)...\n`);
+  console.log(`   Waiting for approval (expires in ${Math.floor(expires_in / 60)} minutes)...\n`);
 
-  const pollInterval = (interval || 5) * 1000;
+  const pollInterval = interval * 1000;
   const deadline = Date.now() + MAX_POLL_TIME_MS;
   let attempts = 0;
 
@@ -129,7 +119,7 @@ export async function deviceFlowLogin({ server_url, profile_key }) {
         console.log(`   Token prefix: ${token_prefix}...`);
         return {
           token: pollBody.token,
-          token_prefix: token_prefix,
+          token_prefix,
           username: pollBody.username,
           profile: profile || null,
         };
@@ -148,3 +138,4 @@ export async function deviceFlowLogin({ server_url, profile_key }) {
 
   throw new Error('Login timed out. Please try again.');
 }
+

package/lib/src/config/index.js

@@ -14,7 +14,6 @@ dotenv.config();
 const debugConfig = createLogger('config');
 const require = createRequire(import.meta.url);
 
-// Load mbkbucket package.json
 let packageJson;
 try {
   packageJson = require("mbkbucket/package.json");
@@ -22,7 +21,6 @@ try {
   packageJson = require("../../../package.json");
 }
 
-// Parent project version
 let appVersion = "unknown";
 try {
   appVersion = require("../../../../package.json")?.version ?? require(`${process.cwd()}/package.json`)?.version ?? "unknown";

package/lib/src/config/validation.js

@@ -1,5 +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'];
 
 export function normalizeBooleanLike(value) {
   if (typeof value === 'boolean') return value;
@@ -56,14 +57,12 @@ export function parseAndValidateBucketConnection(rawValue) {
     throw new Error('BucketConnection must be a non-empty object');
   }
 
-  const requiredFields = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
-
   for (const [bucketName, config] of Object.entries(parsed)) {
     if (!config || typeof config !== 'object' || Array.isArray(config)) {
       throw new Error(`Bucket '${bucketName}' configuration must be an object, not a string. Remove quotes around the inner JSON object.`);
     }
 
-    const missingFields = requiredFields.filter(field => !config[field]);
+    const missingFields = REQUIRED_BUCKET_FIELDS.filter(field => !config[field]);
     if (missingFields.length) {
       throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
     }
@@ -71,3 +70,4 @@ export function parseAndValidateBucketConnection(rawValue) {
 
   return parsed;
 }
+

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

@@ -292,7 +292,7 @@ export async function createFolder(req, res) {
     const effectivePrefix = resolvePrefix(req, res, prefix);
     if (effectivePrefix === null) return;
 
-    const cleanName = String(folderName).replace(/^\/+/, '').replace(/\/+$/, '');
+    const cleanName = String(folderName).replace(/^\/+|\/+$/g, '');
     const cleanPrefix = effectivePrefix.replace(/\/+$/, '');
     const folderKey = (effectivePrefix && !cleanName.startsWith(effectivePrefix))
       ? `${cleanPrefix}/${cleanName}/`

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

@@ -15,7 +15,7 @@ export function renderBucketDashboard(req, res) {
 
   const mainLayoutPath = path.resolve(process.cwd(), "views", "layouts", "main");
   const hasMainLayout = fs.existsSync(`${mainLayoutPath}.handlebars`) || fs.existsSync(mainLayoutPath);
-  const portalLayout = (isPortal && hasMainLayout) ? mainLayoutPath : false;
+  const portalLayout = (isPortal && hasMainLayout) && mainLayoutPath;
 
   let selectedBucket;
   let error = req.query.error;
@@ -33,10 +33,10 @@ export function renderBucketDashboard(req, res) {
     isDefault: name === configuredDefaultBucket
   }));
 
-  renderPage(req, res, bucketfilePath, portalLayout ? true : false, {
+  renderPage(req, res, bucketfilePath, Boolean(portalLayout), {
     page: "Admin Bucket",
     helpers: commonHandlebarsHelpers,
-    ...(portalLayout ? { layout: portalLayout } : { layout: false }),
+    layout: portalLayout || false,
     bucketvar: selectedBucket,
     selectedBucket,
     bucketOptions,
@@ -46,3 +46,4 @@ export function renderBucketDashboard(req, res) {
     availableBuckets: allBuckets
   });
 }
+

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

@@ -19,10 +19,9 @@ async function getInfoData() {
  * Render the mbkbucket info page (Handlebars).
  */
 export async function infoPage(req, res) {
-  const data = await getInfoData();
   renderPage(req, res, "mbkbucket_info.handlebars", false, {
     page: "MBK Bucket Info",
-    ...data
+    ...(await getInfoData())
   });
 }
 

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

@@ -60,9 +60,7 @@ async function serveFileInline(req, res, keyToUse, { noindex = true, bucketName,
       return res.status(500).json({ message: 'Failed to fetch file metadata', error: err.message });
     }
 
-    if (!meta?.exists) {
-      return res.status(404).json({ message: 'File not found', key: keyToUse });
-    }
+    if (!meta?.exists) return res.status(404).json({ message: 'File not found', key: keyToUse });
 
     const etag = `"${meta.LastModified?.getTime() || Date.now()}-${meta.ContentLength || 0}"`;
     if (ifNoneMatch === etag) return res.status(304).end();

package/lib/src/middleware/async-handler.js

@@ -2,17 +2,14 @@
  * Wraps an async Express route handler so that any thrown/rejected errors
  * are forwarded to `next(err)` instead of crashing the process.
  */
-export function wrap(handler, onError) {
-  return (req, res, next) => {
-    Promise.resolve(handler(req, res, next)).catch(err => (onError ? onError(err, req, res, next) : next(err)));
-  };
-}
+export const wrap = (handler, onError) => (req, res, next) =>
+  Promise.resolve(handler(req, res, next)).catch(err => onError ? onError(err, req, res, next) : next(err));
 
 /**
  * Combines wrap() with a standard JSON error response for API routes.
  */
-export function wrapApi(handler, fallbackMessage = 'Request failed') {
-  return wrap(handler, (err, _req, res) => {
+export const wrapApi = (handler, fallbackMessage = 'Request failed') =>
+  wrap(handler, (err, _req, res) => {
     console.error(`[mbkbucket] ${err.stack || err.message}`);
     res.status(500).json({
       success: false,
@@ -20,4 +17,3 @@ export function wrapApi(handler, fallbackMessage = 'Request failed') {
       error: err.message || fallbackMessage,
     });
   });
-}

package/lib/src/middleware/error-handler.js

@@ -2,14 +2,11 @@ import { createLogger } from "#logger";
 import { isJsonRequest, sendError, sanitizeErrorDetails } from "mbkauthe";
 
 const debugServer = createLogger('server');
-
 const BASE_ERROR_DATA = { layout: false, pagename: "Home", page: "/" };
 
 export function notFoundHandler(req, res, next) {
   const url = req.originalUrl || req.url || '';
-  if (!url.startsWith('/mbkbucket') && typeof next === 'function') {
-    return next();
-  }
+  if (!url.startsWith('/mbkbucket') && typeof next === 'function') return next();
 
   debugServer("Path not found: %s %s", req.method, req.url);
 
@@ -31,7 +28,6 @@ export function notFoundHandler(req, res, next) {
 
 export function globalErrorHandler(err, req, res, _next) {
   console.error(`[mbkbucket] ${err.stack || err}`);
-
   const statusCode = Number(err.status || err.statusCode || 500);
 
   if (isJsonRequest(req)) {
@@ -49,6 +45,6 @@ export function globalErrorHandler(err, req, res, _next) {
     code: statusCode,
     error: statusCode >= 500 ? "Internal app Error" : (err.name || "Client Error"),
     message: err.message || "An unexpected error occurred on the app.",
-    ...(sanitizedDetails ? { details: sanitizedDetails } : {}),
+    ...(sanitizedDetails && { details: sanitizedDetails }),
   });
 }

package/lib/src/middleware/rate-limiter.js

@@ -1,7 +1,7 @@
 import rateLimit from "express-rate-limit";
 
 export const generalLimiter = rateLimit({
-  windowMs: 2 * 60 * 1000, // 2 minutes
+  windowMs: 2 * 60 * 1000,
   max: 150,
   standardHeaders: true,
   legacyHeaders: false,
@@ -11,7 +11,7 @@ export const generalLimiter = rateLimit({
 });
 
 export const pviewRateLimit = rateLimit({
-  windowMs: 60 * 1000, // 1 minute
+  windowMs: 60 * 1000,
   max: 10,
   standardHeaders: 'draft-7',
   legacyHeaders: false,

package/lib/src/middleware/security.js

@@ -4,12 +4,7 @@
  */
 
 const BLOCKED_UA_PATTERNS = /curl|wget|python-requests|python-urllib|go-http|scrapy|libwww|java\/|bot|crawl|spider|headless|phantom|selenium|puppeteer|playwright|postman|insomnia|httpie/i;
-
-const SUSPICIOUS_HEADERS = [
-  'x-devtools-emulate-network-conditions-client-id',
-  'x-chromedriver-clientid',
-  'x-automated-tool'
-];
+const SUSPICIOUS_HEADERS = ['x-devtools-emulate-network-conditions-client-id', 'x-chromedriver-clientid', 'x-automated-tool'];
 
 export function pviewSecurity(req, res, next) {
   const ua = req.headers['user-agent'] || '';
@@ -22,6 +17,5 @@ export function pviewSecurity(req, res, next) {
   res.setHeader('X-Frame-Options', 'SAMEORIGIN');
   res.setHeader('Referrer-Policy', 'strict-origin-when-cross-origin');
   res.removeHeader('Access-Control-Allow-Origin');
-
   next();
 }

package/lib/src/routes/api.routes.js

@@ -27,13 +27,12 @@ export function createApiRoutes({
   deleteAuthorization,
 } = {}) {
   const apiRouter = express.Router();
-  const defaultAuthorization = authorization || sessRole('superadmin');
-  const viewAuth = viewAuthorization || defaultAuthorization;
-  const uploadAuth = uploadAuthorization || defaultAuthorization;
-  const deleteAuth = deleteAuthorization || defaultAuthorization;
+  const defaultAuth = authorization ?? sessRole('superadmin');
+  const viewAuth = viewAuthorization ?? defaultAuth;
+  const uploadAuth = uploadAuthorization ?? defaultAuth;
+  const deleteAuth = deleteAuthorization ?? defaultAuth;
 
   apiRouter.use(requireBucketApi);
-
   apiRouter.post('/api/cleanup-uploads', deleteAuth, cleanupUploads);
   apiRouter.get('/api/incomplete-uploads', viewAuth, listIncompleteUploads);
   apiRouter.get('/api/files', viewAuth, listFiles);