mbkbucket 4.0.1 → 4.2.0

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

@@ -1,52 +1,15 @@
-import { createLogger } from "#logger";
-import { isJsonRequest, sendError, sanitizeErrorDetails, renderPage } 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();
-
-  debugServer("Path not found: %s %s", req.method, req.url);
-
-  if (isJsonRequest(req)) {
-    return sendError(res, "The requested API route was not found.", {
-      statusCode: 404,
-      code: "ROUTE_NOT_FOUND",
-      req,
-    });
-  }
-
-  res.status(404);
-  return renderPage(req, res, "Error/dError.hbs", false, {
-    ...BASE_ERROR_DATA,
-    code: 404,
-    error: "Not Found",
-    message: "The requested page was not found.",
-  });
-}
-
-export function globalErrorHandler(err, req, res, _next) {
-  console.error(`[mbkbucket] ${err.stack || err}`);
-  const statusCode = Number(err.status || err.statusCode || 500);
-
-  if (isJsonRequest(req)) {
-    return sendError(res, err, {
-      statusCode,
-      req,
-      details: process.env.NODE_ENV !== 'production' ? err.stack : undefined,
-    });
-  }
-
-  const sanitizedDetails = err.message ? sanitizeErrorDetails(err.message) : undefined;
-
-  res.status(statusCode);
-  return renderPage(req, res, "Error/dError.hbs", false, {
-    ...BASE_ERROR_DATA,
-    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 }),
-  });
-}
+import { createNotFoundHandler, createErrorHandler } from "mbkutils";
+
+export const notFoundHandler = createNotFoundHandler({
+  appName: "mbkbucket",
+  defaultPage: "/",
+  defaultPageName: "Home",
+});
+
+export const globalErrorHandler = createErrorHandler({
+  appName: "mbkbucket",
+  defaultPage: "/",
+  defaultPageName: "Home",
+});
+
+export default { notFoundHandler, globalErrorHandler };

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

@@ -1,5 +1,5 @@
 import rateLimit from "express-rate-limit";
-import { renderPage } from "mbkauthe";
+import { renderPage } from "mbkutils";
 
 export const generalLimiter = rateLimit({
   windowMs: 2 * 60 * 1000,

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

@@ -2,7 +2,7 @@ import express from "express";
 import { sessRole } from "mbkauthe";
 import multer from "multer";
 import { requireBucketApi } from "../middleware/bucket-resolver.js";
-import { cleanupUploads, listIncompleteUploads, listFiles, uploadSingleFile, initiateMultipartUpload, uploadChunk, completeUpload, abortUpload, createFolder, deleteItems, downloadFileHandler, moveItem, copyItem, getHealthStatus, getFileInfo } from "../controllers/api.controller.js";
+import { cleanupUploads, listIncompleteUploads, listFiles, uploadSingleFile, initiateMultipartUpload, uploadChunk, completeUpload, abortUpload, createFolder, deleteItems, downloadFileHandler, moveItem, copyItem, getHealthStatus, getFileInfo, getMetricsHandler } from "../controllers/api.controller.js";
 
 const MAX_CHUNK_SIZE = 50 * 1024 * 1024; // 50 MB
 const upload = multer({ storage: multer.memoryStorage(), limits: { fileSize: MAX_CHUNK_SIZE } });
@@ -38,6 +38,8 @@ export function createApiRoutes({
   apiRouter.get('/api/files', viewAuth, listFiles);
   apiRouter.get('/api/health', viewAuth, getHealthStatus);
   apiRouter.get('/api/file-info/*key', viewAuth, getFileInfo);
+  apiRouter.get('/api/metrics', viewAuth, getMetricsHandler);
+  apiRouter.get('/metrics', viewAuth, getMetricsHandler);
   apiRouter.post('/upload', uploadAuth, upload.single('file'), uploadSingleFile);
   apiRouter.post('/upload-init', uploadAuth, initiateMultipartUpload);
   apiRouter.post('/upload-chunk', uploadAuth, uploadChunkMiddleware, uploadChunk);
@@ -52,6 +54,7 @@ export function createApiRoutes({
   return apiRouter;
 }
 
+
 const router = createApiRoutes();
 
 export default router;

package/lib/src/services/s3.service.js

@@ -7,9 +7,9 @@
  */
 
 import { storageManager } from "../core/storage/storage-manager.js";
-import { getAvailableBucketNames, resolveBucketName, getAppName, ensureKeyHasAppPrefix, ensurePrefix, uploadFile, downloadFile, deleteFile, deleteFiles, deleteFolder, listfiles, getFileMetadata, fileExists, getFileSize, generateSignedUrl, createMultipartUpload, uploadPart, completeMultipartUpload, abortMultipartUpload, listIncompleteMultipartUploads, cleanupIncompleteMultipartUploads, checkHealth, runHealthCheck } from "./storage.service.js";
+import { getAvailableBucketNames, resolveBucketName, getAppName, ensureKeyHasAppPrefix, ensurePrefix, uploadFile, downloadFile, deleteFile, deleteFiles, deleteFolder, listfiles, getFileMetadata, fileExists, getFileSize, createMultipartUpload, uploadPart, completeMultipartUpload, abortMultipartUpload, listIncompleteMultipartUploads, cleanupIncompleteMultipartUploads, checkHealth, runHealthCheck } from "./storage.service.js";
 
-export { getAvailableBucketNames, resolveBucketName, getAppName, ensureKeyHasAppPrefix, ensurePrefix, uploadFile, downloadFile, deleteFile, deleteFiles, deleteFolder, listfiles, getFileMetadata, fileExists, getFileSize, generateSignedUrl, createMultipartUpload, uploadPart, completeMultipartUpload, abortMultipartUpload, listIncompleteMultipartUploads, cleanupIncompleteMultipartUploads, checkHealth, runHealthCheck };
+export { getAvailableBucketNames, resolveBucketName, getAppName, ensureKeyHasAppPrefix, ensurePrefix, uploadFile, downloadFile, deleteFile, deleteFiles, deleteFolder, listfiles, getFileMetadata, fileExists, getFileSize, createMultipartUpload, uploadPart, completeMultipartUpload, abortMultipartUpload, listIncompleteMultipartUploads, cleanupIncompleteMultipartUploads, checkHealth, runHealthCheck };
 
 export function getBucketConfig(bucketName) {
   return storageManager.getConnectionConfig(bucketName);

package/lib/src/services/storage.service.js

@@ -8,8 +8,9 @@ import dotenv from "dotenv";
 import { storageManager } from "../core/storage/storage-manager.js";
 import { PathStrategy } from "../core/storage/path-strategy.js";
 import { StorageValidationError } from "../core/storage/errors.js";
+import { metricsRegistry } from "../core/metrics.js";
 import { createLogger } from "#logger";
-import { trimSlashes } from "#helpers";
+import { trimSlashes } from "mbkutils";
 
 dotenv.config();
 const debugStorage = createLogger('storage-service');
@@ -64,22 +65,55 @@ export async function runHealthCheck(connectionName) {
 export async function uploadFile(key, fileBuffer, contentType, options = {}) {
   if (!key || !fileBuffer) throw new StorageValidationError('Key and file buffer are required');
   const keyToUpload = ensureKeyHasAppPrefix(key);
-  const provider = getStorageProvider(options.bucketName || options.connectionName);
-  return provider.uploadFile(keyToUpload, fileBuffer, contentType, options);
+  const connName = options.bucketName || options.connectionName;
+  const provider = getStorageProvider(connName);
+  const start = Date.now();
+  try {
+    const result = await provider.uploadFile(keyToUpload, fileBuffer, contentType, options);
+    const duration = Date.now() - start;
+    const size = Buffer.isBuffer(fileBuffer) ? fileBuffer.length : (result.size || 0);
+    metricsRegistry.recordOperation('upload', { provider: provider.type, status: 'success', durationMs: duration, bytes: size });
+    storageManager.emit('file:uploaded', { key: keyToUpload, provider: provider.type, connectionName: connName, size, timestamp: new Date().toISOString() });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('upload', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('upload', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function downloadFile(key, options = {}) {
   if (!key) throw new StorageValidationError('Key is required');
   const keyToDownload = ensureKeyHasAppPrefix(key);
-  const provider = getStorageProvider(options.bucketName || options.connectionName);
-  return provider.downloadFile(keyToDownload, options);
+  const connName = options.bucketName || options.connectionName;
+  const provider = getStorageProvider(connName);
+  const start = Date.now();
+  try {
+    const result = await provider.downloadFile(keyToDownload, options);
+    metricsRegistry.recordOperation('download', { provider: provider.type, status: 'success', durationMs: Date.now() - start, bytes: result.ContentLength || 0 });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('download', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('download', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function deleteFile(key, connectionName) {
   if (!key) throw new StorageValidationError('Key is required');
   const keyToDelete = ensureKeyHasAppPrefix(key);
   const provider = getStorageProvider(connectionName);
-  return provider.deleteFile(keyToDelete);
+  const start = Date.now();
+  try {
+    const result = await provider.deleteFile(keyToDelete);
+    metricsRegistry.recordOperation('delete', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    storageManager.emit('file:deleted', { key: keyToDelete, provider: provider.type, connectionName, timestamp: new Date().toISOString() });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('delete', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('delete', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function deleteFiles(keys, connectionName) {
@@ -88,33 +122,82 @@ export async function deleteFiles(keys, connectionName) {
   }
   const keysToDelete = keys.map(k => ensureKeyHasAppPrefix(k));
   const provider = getStorageProvider(connectionName);
-  return provider.deleteFiles(keysToDelete);
+  const start = Date.now();
+  try {
+    const result = await provider.deleteFiles(keysToDelete);
+    metricsRegistry.recordOperation('deleteBatch', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    storageManager.emit('files:deleted', { keys: keysToDelete, provider: provider.type, connectionName, timestamp: new Date().toISOString() });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('deleteBatch', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('deleteBatch', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function deleteFolder(prefix, connectionName) {
   if (!prefix) throw new StorageValidationError('Prefix is required');
   const effectivePrefix = `${ensurePrefix(trimSlashes(prefix))}/`;
   const provider = getStorageProvider(connectionName);
-  return provider.deleteFolder(effectivePrefix);
+  const start = Date.now();
+  try {
+    const result = await provider.deleteFolder(effectivePrefix);
+    metricsRegistry.recordOperation('deleteFolder', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    storageManager.emit('folder:deleted', { prefix: effectivePrefix, provider: provider.type, connectionName, timestamp: new Date().toISOString() });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('deleteFolder', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('deleteFolder', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function createFolder(prefix, connectionName, options = {}) {
   const effectivePrefix = ensurePrefix(prefix);
   const provider = getStorageProvider(connectionName);
-  return provider.createFolder(effectivePrefix, options);
+  const start = Date.now();
+  try {
+    const result = await provider.createFolder(effectivePrefix, options);
+    metricsRegistry.recordOperation('createFolder', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    storageManager.emit('folder:created', { prefix: effectivePrefix, provider: provider.type, connectionName, timestamp: new Date().toISOString() });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('createFolder', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('createFolder', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function listfiles(prefix = '', options = {}) {
   const effectivePrefix = ensurePrefix(prefix);
-  const provider = getStorageProvider(options.bucketName || options.connectionName);
-  return provider.listFiles(effectivePrefix, options);
+  const connName = options.bucketName || options.connectionName;
+  const provider = getStorageProvider(connName);
+  const start = Date.now();
+  try {
+    const result = await provider.listFiles(effectivePrefix, options);
+    metricsRegistry.recordOperation('list', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('list', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('list', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function getFileMetadata(key, connectionName) {
   if (!key) throw new StorageValidationError('Key is required');
   const keyToCheck = ensureKeyHasAppPrefix(key);
   const provider = getStorageProvider(connectionName);
-  return provider.getFileMetadata(keyToCheck);
+  const start = Date.now();
+  try {
+    const result = await provider.getFileMetadata(keyToCheck);
+    metricsRegistry.recordOperation('metadata', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('metadata', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('metadata', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function fileExists(key, connectionName) {
@@ -135,26 +218,41 @@ export async function getFileSize(key, connectionName) {
   }
 }
 
-export async function generateSignedUrl(key, operation = 'getObject', expiresIn = 3600, connectionName) {
-  const keyToUse = ensureKeyHasAppPrefix(key);
-  const provider = getStorageProvider(connectionName);
-  return provider.generateSignedUrl(keyToUse, operation, expiresIn);
-}
-
 export async function copyFile(sourceKey, destKey, options = {}, connectionName) {
   const src = ensureKeyHasAppPrefix(sourceKey);
   const dst = ensureKeyHasAppPrefix(destKey);
   const provider = getStorageProvider(connectionName);
-  return provider.copyFile(src, dst, options);
+  const start = Date.now();
+  try {
+    const result = await provider.copyFile(src, dst, options);
+    metricsRegistry.recordOperation('copy', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    storageManager.emit('file:copied', { sourceKey: src, destKey: dst, provider: provider.type, connectionName, timestamp: new Date().toISOString() });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('copy', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('copy', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
 export async function moveFile(sourceKey, destKey, options = {}, connectionName) {
   const src = ensureKeyHasAppPrefix(sourceKey);
   const dst = ensureKeyHasAppPrefix(destKey);
   const provider = getStorageProvider(connectionName);
-  return provider.moveFile(src, dst, options);
+  const start = Date.now();
+  try {
+    const result = await provider.moveFile(src, dst, options);
+    metricsRegistry.recordOperation('move', { provider: provider.type, status: 'success', durationMs: Date.now() - start });
+    storageManager.emit('file:moved', { sourceKey: src, destKey: dst, provider: provider.type, connectionName, timestamp: new Date().toISOString() });
+    return result;
+  } catch (err) {
+    metricsRegistry.recordOperation('move', { provider: provider?.type || 'unknown', status: 'error', durationMs: Date.now() - start });
+    metricsRegistry.recordError('move', provider?.type || 'unknown', err.constructor?.name || 'Error');
+    throw err;
+  }
 }
 
+
 // ---------------------------------------------------------------------------
 // Multipart Upload Helpers (For S3 / compatible providers)
 // ---------------------------------------------------------------------------

package/lib/src/utils/cleanup-scheduler.js

@@ -0,0 +1,91 @@
+/**
+ * MBKBucket - Incomplete Multipart Upload Cleanup Scheduler
+ * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
+ * Licensed under the MIT License.
+ */
+
+import { cleanupIncompleteMultipartUploads, getAvailableStorageNames } from "../services/storage.service.js";
+import { createLogger } from "#logger";
+
+const debugCleanup = createLogger('cleanup-scheduler');
+
+export class CleanupScheduler {
+  constructor() {
+    this._timer = null;
+    this._running = false;
+    this._lastRun = null;
+    this._lastStats = null;
+  }
+
+  async runOnce({ olderThanDays = 7, connectionNames = null } = {}) {
+    const targets = connectionNames && Array.isArray(connectionNames) && connectionNames.length > 0
+      ? connectionNames
+      : getAvailableStorageNames();
+
+    const summary = {
+      startedAt: new Date().toISOString(),
+      connectionsProcessed: 0,
+      totalAborted: 0,
+      errors: []
+    };
+
+    for (const name of targets) {
+      try {
+        const result = await cleanupIncompleteMultipartUploads(olderThanDays, '', name);
+        summary.connectionsProcessed++;
+        summary.totalAborted += (result.abortedCount || 0);
+      } catch (err) {
+        debugCleanup('Cleanup error for connection %s: %s', name, err.message);
+        summary.errors.push({ connection: name, error: err.message });
+      }
+    }
+
+    summary.finishedAt = new Date().toISOString();
+    this._lastRun = summary.finishedAt;
+    this._lastStats = summary;
+    debugCleanup('Cleanup cycle completed: %d uploads aborted across %d connections', summary.totalAborted, summary.connectionsProcessed);
+    return summary;
+  }
+
+  start({ intervalHours = 24, olderThanDays = 7, connectionNames = null } = {}) {
+    if (this._running) return;
+    this._running = true;
+
+    const intervalMs = Math.max(60000, Number(intervalHours) * 3600 * 1000);
+    debugCleanup('Starting cleanup scheduler every %s hour(s)', intervalHours);
+
+    // Run first pass asynchronously
+    this.runOnce({ olderThanDays, connectionNames }).catch(err => {
+      debugCleanup('Initial cleanup run error: %s', err.message);
+    });
+
+    this._timer = setInterval(() => {
+      this.runOnce({ olderThanDays, connectionNames }).catch(err => {
+        debugCleanup('Scheduled cleanup run error: %s', err.message);
+      });
+    }, intervalMs);
+
+    if (this._timer.unref) {
+      this._timer.unref();
+    }
+  }
+
+  stop() {
+    if (this._timer) {
+      clearInterval(this._timer);
+      this._timer = null;
+    }
+    this._running = false;
+    debugCleanup('Cleanup scheduler stopped');
+  }
+
+  getStatus() {
+    return {
+      running: this._running,
+      lastRun: this._lastRun,
+      lastStats: this._lastStats
+    };
+  }
+}
+
+export const cleanupScheduler = new CleanupScheduler();

package/lib/src/utils/helpers.js

@@ -2,24 +2,9 @@
  * Shared helper utilities used across controllers, services, and CLI.
  */
 
-const HTML_ESCAPE_MAP = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' };
+import { trimSlashes, trimLeadingSlashes, getFileExt, nowIso, formatDate } from "mbkutils";
 
-export const escapeHtml = (value = '') => String(value ?? '').replace(/[&<>"']/g, c => HTML_ESCAPE_MAP[c]);
-
-export function getBaseName(path = '') {
-  const value = String(path ?? '');
-  const lastSlash = value.lastIndexOf('/');
-  return lastSlash === -1 ? value : value.slice(lastSlash + 1);
-}
-
-export function getFileExt(fileName = '') {
-  const name = getBaseName(fileName);
-  const dotIndex = name.lastIndexOf('.');
-  return dotIndex === -1 ? '' : name.slice(dotIndex + 1).toLowerCase();
-}
-
-export const trimSlashes = (str = '') => String(str ?? '').replace(/^\/+|\/+$/g, '');
-export const trimLeadingSlashes = (str = '') => String(str ?? '').replace(/^\/+/, '');
+export { nowIso, formatDate };
 
 export function getFolderPath(key = '') {
   const s = String(key ?? '');
@@ -35,8 +20,6 @@ export function buildKey(prefix, fileName) {
   return cleanPrefix ? `${cleanPrefix}/${cleanName}` : cleanName;
 }
 
-export const nowIso = () => new Date().toISOString();
-
 export function formatBytes(bytes) {
   if (!bytes) return '0 B';
   const units = ['B', 'KB', 'MB', 'GB', 'TB'];
@@ -44,14 +27,6 @@ export function formatBytes(bytes) {
   return `${(bytes / 1024 ** i).toFixed(i > 0 ? 1 : 0)} ${units[i]}`;
 }
 
-export function formatDate(iso) {
-  try {
-    return new Date(iso).toLocaleString();
-  } catch {
-    return iso || '—';
-  }
-}
-
 export async function streamToBuffer(stream) {
   if (Buffer.isBuffer(stream)) return stream;
   const chunks = [];
@@ -67,12 +42,14 @@ export async function streamToBuffer(stream) {
 }
 
 export function destroyStream(stream) {
-  if (typeof stream?.destroy === 'function') {
-    stream.removeAllListeners?.();
-    stream.destroy();
+  if (stream && typeof stream.destroy === 'function' && !stream.destroyed) {
+    try {
+      stream.destroy();
+    } catch {}
   }
 }
 
+
 // ---------------------------------------------------------------------------
 // MIME type & file extension constants
 // ---------------------------------------------------------------------------
@@ -136,8 +113,6 @@ export function buildCacheControl(contentType, { isStaticAsset = false, supports
 // Range header parsing
 // ---------------------------------------------------------------------------
 
-const DEFAULT_CHUNK_SIZE = 8 * 1024 * 1024; // 8 MB
-
 export function parseRangeHeader(rangeHeader, totalSize) {
   if (!totalSize || totalSize <= 0) return null;
 
@@ -156,7 +131,7 @@ export function parseRangeHeader(rangeHeader, totalSize) {
   } else {
     start = parseInt(startStr, 10);
     if (isNaN(start) || start < 0) return null;
-    end = endStr === '' ? Math.min(start + DEFAULT_CHUNK_SIZE - 1, totalSize - 1) : parseInt(endStr, 10);
+    end = endStr === '' ? totalSize - 1 : parseInt(endStr, 10);
     if (isNaN(end) || end < start) return null;
   }
 
@@ -192,22 +167,4 @@ export const renderPlayerPage = (safeFileName, encodedKey, bucketQuery) => `<!do
 </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),
-  json: obj => JSON.stringify(obj, null, 2),
-  jsonStringify: obj => JSON.stringify(obj),
-  getInitials: username => username ? username.split(/[._]/).map(p => p.charAt(0)).join('').toUpperCase().slice(0, 2) : '?',
-};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mbkbucket",
-  "version": "4.0.1",
-  "description": "Flexible S3/R2 bucket management — library, Express router, and standalone server CLI for mbktech.org applications. Provides upload, download, listing, multipart utilities, signed URLs, and a standalone server runner with built-in configuration validation and health checks",
+  "version": "4.2.0",
+  "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",
   "license": "MIT",
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1127.0",
-    "@aws-sdk/s3-request-presigner": "^3.1127.0",
     "compression": "^1.8.2",
     "debug": "^4.4.3",
     "dotenv": "^18.0.5",
     "express": "^5.2.1",
     "express-handlebars": "^9.0.1",
     "express-rate-limit": "^7.5.1",
-    "mbkauthe": "^6.2.3",
+    "mbkauthe": "latest",
+    "mbkutils": "latest",
     "multer": "^2.4.0"
   },
   "devDependencies": {

package/views/bucket.hbs

@@ -12,12 +12,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{#if page}}{{page}} - {{/if}}Web Portal</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=IBM+Plex+Sans:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
     <script src="/mbkauthe/main.js" defer></script>
-    <script src="https://portal.mbktech.org/qssets/js/auto-ids.js" defer></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
     <link rel="icon" type="image/x-icon" href="/icon.svg">
     <style>
         :root {

package/views/bucketadmin_preview_modal.hbs

@@ -71,7 +71,7 @@
                   <div class="info-label">Public View URL</div>
                   <div class="info-value font-mono text-break d-flex align-items-center justify-content-between gap-2">
                     <span id="infoPublicUrl" class="text-truncate" style="user-select: all;">—</span>
-                    <button type="button" class="btn btn-outline btn-sm flex-shrink-0" onclick="copyCurrentPreviewPublicLink()" title="Copy Public URL">
+                    <button type="button" class="btn btn-outline btn-sm flex-shrink-0" onclick="copyCurrentPreviewPublicLink(this)" title="Copy Public URL">
                       <svg width="12" height="12" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M5 2h8a1 1 0 011 1v8M3 5h8a1 1 0 011 1v8a1 1 0 01-1 1H3a1 1 0 01-1-1V6a1 1 0 011-1z"/></svg>
                       Copy
                     </button>
@@ -84,11 +84,11 @@
       </div>
       <div class="modal-footer preview-footer">
         <div class="preview-actions">
-          <button type="button" class="btn btn-outline btn-sm" id="previewCopyLinkBtn" onclick="copyCurrentPreviewLink()">
+          <button type="button" class="btn btn-outline btn-sm" id="previewCopyLinkBtn" onclick="copyCurrentPreviewLink(this)">
             <svg width="13" height="13" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M5 2h8a1 1 0 011 1v8M3 5h8a1 1 0 011 1v8a1 1 0 01-1 1H3a1 1 0 01-1-1V6a1 1 0 011-1z"/></svg>
             Copy Link
           </button>
-          <button type="button" class="btn btn-outline btn-sm" id="previewCopyPublicLinkBtn" onclick="copyCurrentPreviewPublicLink()" title="Copy publicly accessible link" style="{{#unless publicViewEnabled}}display: none;{{/unless}}">
+          <button type="button" class="btn btn-outline btn-sm" id="previewCopyPublicLinkBtn" onclick="copyCurrentPreviewPublicLink(this)" title="Copy publicly accessible link" style="{{#unless publicViewEnabled}}display: none;{{/unless}}">
             <svg width="13" height="13" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5"><circle cx="8" cy="8" r="6.25"/><path d="M1.75 8h12.5M8 1.75a10.5 10.5 0 010 12.5 10.5 10.5 0 010-12.5z"/></svg>
             Copy Public Link
           </button>