mbkbucket 2.0.0 → 2.1.1

package/lib/s3.js

@@ -1,8 +1,10 @@
 import { S3Client, ListObjectsV2Command, PutObjectCommand, GetObjectCommand, DeleteObjectCommand, DeleteObjectsCommand, HeadObjectCommand, CreateMultipartUploadCommand, UploadPartCommand, CompleteMultipartUploadCommand, AbortMultipartUploadCommand, ListMultipartUploadsCommand } from '@aws-sdk/client-s3';
 import dotenv from "dotenv";
 import { mbkautheVar } from "mbkauthe";
+import { createLogger } from "./debug.js";
 
 dotenv.config();
+const debugS3 = createLogger('s3');
 
 function parseJsonEnv(envVar, fallback = {}) {
     if (!envVar) return fallback;
@@ -18,9 +20,15 @@ function parseJsonEnv(envVar, fallback = {}) {
 
 // Parse BucketConnection JSON that contains all bucket configurations
 const allBucketConfigs = parseJsonEnv(process.env.BucketConnection, {});
+const availableBucketNames = Object.freeze(Object.keys(allBucketConfigs || {}));
+const hasBucketConfigs = availableBucketNames.length > 0;
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 
 export function getAvailableBucketNames() {
-  return Object.keys(allBucketConfigs || {});
+  return availableBucketNames;
 }
 
 // Helper to get default bucket name
@@ -31,9 +39,8 @@ function getDefaultBucketName() {
   }
   
   // Second priority: use first bucket in BucketConnection
-  const buckets = Object.keys(allBucketConfigs);
-  if (buckets.length > 0) {
-    return buckets[0];
+  if (availableBucketNames.length > 0) {
+    return availableBucketNames[0];
   }
   
   // Fallback: return null (will cause error in getBucketConfig)
@@ -49,12 +56,12 @@ export function resolveBucketName(bucketName) {
     throw new Error('No bucket selected. Provide ?bucket=<name> or configure a default bucket in mbkautheVar.bucket.');
   }
 
-  if (!allBucketConfigs || Object.keys(allBucketConfigs).length === 0) {
+  if (!hasBucketConfigs) {
     throw new Error('BucketConnection environment variable is not set or empty. Please configure it with your bucket connections.');
   }
 
   if (!allBucketConfigs[candidate]) {
-    throw new Error(`Bucket '${candidate}' not found in BucketConnection. Available buckets: ${Object.keys(allBucketConfigs).join(', ')}`);
+    throw new Error(`Bucket '${candidate}' not found in BucketConnection. Available buckets: ${availableBucketNames.join(', ')}`);
   }
 
   return candidate;
@@ -69,7 +76,9 @@ export function getAppName() {
 }
 
 function isRootModeApp(appName) {
-  return String(appName || '').trim().toLowerCase() === 'portal';
+  const app = String(appName || '').toLowerCase();
+  const isRootApp = app === 'portal' || app === 'mbkbucket';
+  return isRootApp;
 }
 
 export function ensureKeyHasAppPrefix(key = '') {
@@ -96,7 +105,7 @@ export function ensureKeyHasAppPrefix(key = '') {
   if (!app) throw new Error('APP_NAME is not configured; set mbkautheVar.APP_NAME or MBKAUTHE_APP_NAME');
 
   // Collapse repeated app prefixes (app/app/... -> app/...)
-  const appPrefixRegex = new RegExp(`^(?:${app}\/)+`);
+  const appPrefixRegex = new RegExp(`^(?:${escapeRegExp(app)}\/)+`);
   if (!cleaned.startsWith(`${app}/`)) {
     cleaned = `${app}/${cleaned}`;
   } else {
@@ -137,7 +146,7 @@ export function ensurePrefix(prefix = '') {
 
   if (p.startsWith(`${app}/`)) {
     // collapse repeated app/ sequences
-    const appPrefixRegex = new RegExp(`^(?:${app}\/)+`);
+    const appPrefixRegex = new RegExp(`^(?:${escapeRegExp(app)}\/)+`);
     return p.replace(appPrefixRegex, `${app}/`);
   }
   return `${app}/${p}`;
@@ -157,7 +166,7 @@ export function getBucketConfig(bucketName) {
   if (_configCache.has(cacheKey)) return _configCache.get(cacheKey);
 
   // Look up bucket config from BucketConnection JSON
-  if (!allBucketConfigs || Object.keys(allBucketConfigs).length === 0) {
+  if (!hasBucketConfigs) {
     console.error(`[mbkbucket] ❌ BucketConnection is not configured or failed to parse`);
     console.error(`[mbkbucket] Please set BucketConnection in your .env file with this format:`);
     console.error(`[mbkbucket] BucketConnection={"r2":{"BUCKET_NAME":"...","ACCESS_KEY_ID":"...","SECRET_ACCESS_KEY":"...","ENDPOINT":"https://..."}}`);
@@ -170,7 +179,7 @@ export function getBucketConfig(bucketName) {
   const cfg = allBucketConfigs[bucketName];
   
   if (!cfg) {
-    throw new Error(`Bucket '${bucketName}' not found in BucketConnection. Available buckets: ${Object.keys(allBucketConfigs).join(', ')}`);
+    throw new Error(`Bucket '${bucketName}' not found in BucketConnection. Available buckets: ${availableBucketNames.join(', ')}`);
   }
 
   _configCache.set(cacheKey, cfg);
@@ -250,10 +259,10 @@ async function checkHealth() {
 // Quick diagnostics at startup
 (async () => {
   try {
-    console.log('[mbkbucket] mbkautheVar snapshot:', { APP_NAME: mbkautheVar?.APP_NAME, bucket: mbkautheVar?.bucket });
+    debugS3('mbkautheVar snapshot: %O', { APP_NAME: mbkautheVar?.APP_NAME, bucket: mbkautheVar?.bucket });
     const health = await checkHealth();
     if (health.status === 'healthy') {
-      console.log(`[mbkbucket] Connected to bucket: ${health.bucket} (${health.responseTime}ms)`);
+      debugS3('Connected to bucket: %s (%sms)', health.bucket, health.responseTime);
     } else {
       console.error(`[mbkbucket] S3 connection failed:`, health.error);
     }
@@ -286,11 +295,12 @@ export async function uploadFile(key, fileBuffer, contentType, options = {}) {
     const config = getBucketConfig(bucketName);
     const bucket = config.BUCKET_NAME;
 
-    console.log(`[mbkbucket] Uploading file to bucket=${bucket} key=${keyToUpload}`);
+    debugS3('Uploading file to bucket=%s key=%s', bucket, keyToUpload);
 
     // Add default metadata (supports metadata)
+    const uploadedAt = new Date().toISOString();
     const defaultMetadata = {
-      'uploaded-at': new Date().toISOString(),
+      'uploaded-at': uploadedAt,
       'file-size': fileBuffer.length.toString(),
       'upload-source': 'web-portal',
       ...metadata
@@ -321,7 +331,7 @@ export async function uploadFile(key, fileBuffer, contentType, options = {}) {
       fileSize: fileBuffer.length,
       key: keyToUpload,
       contentType,
-      uploadedAt: new Date().toISOString()
+      uploadedAt
     }; 
   } catch (error) {
     console.error(`Upload failed for key ${key}:`, error);
@@ -361,7 +371,7 @@ export async function downloadFile(key, options = {}) {
 
     // Log range requests for debugging
     if (range) {
-      console.log(`[mbkbucket] Range request for ${keyToDownload}: ${range}`);
+      debugS3('Range request for %s: %s', keyToDownload, range);
     }
 
     const command = new GetObjectCommand({
@@ -374,9 +384,7 @@ export async function downloadFile(key, options = {}) {
       ...(responseContentType && { ResponseContentType: responseContentType }),
     });
     
-    const startTime = Date.now();
     const result = await client.send(command);
-    const downloadTime = Date.now() - startTime;
     
     return {
       ...result,
@@ -446,6 +454,8 @@ export async function deleteFiles(keys, bucketName) {
     // S3 allows max 1000 objects per delete request
     const maxBatchSize = 1000;
     const results = [];
+    let deletedCount = 0;
+    const errors = [];
 
     for (let i = 0; i < keys.length; i += maxBatchSize) {
       const batch = keys.slice(i, i + maxBatchSize).map(k => ({ Key: ensureKeyHasAppPrefix(k) }));
@@ -460,12 +470,14 @@ export async function deleteFiles(keys, bucketName) {
 
       const result = await client.send(command);
       results.push(result);
+      deletedCount += result.Deleted?.length || 0;
+      if (result.Errors?.length) errors.push(...result.Errors);
     }
 
     return {
       results,
-      deletedCount: results.reduce((acc, result) => acc + (result.Deleted?.length || 0), 0),
-      errors: results.reduce((acc, result) => acc.concat(result.Errors || []), []),
+      deletedCount,
+      errors,
       deletedAt: new Date().toISOString()
     };
   } catch (error) {
@@ -600,19 +612,21 @@ export async function getFileMetadata(key, bucketName) {
     });
     
     const result = await client.send(command);
+    const queriedAt = new Date().toISOString();
     
     return {
       ...result,
       key: keyToCheck,
       exists: true,
-      queriedAt: new Date().toISOString()
+      queriedAt
     };
   } catch (error) {
+    const queriedAt = new Date().toISOString();
     if (error.name === 'NotFound' || error.name === 'NoSuchKey') {
       return {
         key,
         exists: false,
-        queriedAt: new Date().toISOString()
+        queriedAt
       };
     }
     
@@ -655,13 +669,14 @@ export async function createMultipartUpload(key, contentType = 'application/octe
   const keyToUse = ensureKeyHasAppPrefix(key);
   const cfg = getBucketConfig(bucketName);
   const client = getBucketClient(bucketName);
+  const uploadedAt = new Date().toISOString();
   const command = new CreateMultipartUploadCommand({
     Bucket: cfg.BUCKET_NAME,
     Key: keyToUse,
     ContentType: contentType,
     Metadata: {
       'upload-source': 'web-portal',
-      'uploaded-at': new Date().toISOString(),
+      'uploaded-at': uploadedAt,
       ...metadata
     }
   });
@@ -803,7 +818,7 @@ export async function cleanupIncompleteMultipartUploads(olderThanDays = 7, prefi
     const uploads = await listIncompleteMultipartUploads(prefix, bucketName);
     
     if (!uploads.length) {
-      console.log('[mbkbucket] No incomplete multipart uploads found');
+      debugS3('No incomplete multipart uploads found');
       return { abortedCount: 0, uploads: [] };
     }
     
@@ -815,22 +830,22 @@ export async function cleanupIncompleteMultipartUploads(olderThanDays = 7, prefi
     });
     
     if (!uploadsToAbort.length) {
-      console.log(`[mbkbucket] No incomplete uploads older than ${olderThanDays} days`);
+      debugS3('No incomplete uploads older than %s days', olderThanDays);
       return { abortedCount: 0, uploads: [] };
     }
     
-    console.log(`[mbkbucket] Found ${uploadsToAbort.length} incomplete uploads to clean up`);
+    debugS3('Found %s incomplete uploads to clean up', uploadsToAbort.length);
     
     const aborted = [];
     for (const upload of uploadsToAbort) {
       try {
-        await abortMultipartUpload(upload.Key, upload.UploadId);
+        await abortMultipartUpload(upload.Key, upload.UploadId, bucketName);
         aborted.push({
           key: upload.Key,
           uploadId: upload.UploadId,
           initiated: upload.Initiated
         });
-        console.log(`[mbkbucket] Aborted incomplete upload: ${upload.Key} (initiated: ${upload.Initiated})`);
+        debugS3('Aborted incomplete upload: %s (initiated: %s)', upload.Key, upload.Initiated);
       } catch (err) {
         console.error(`[mbkbucket] Failed to abort upload ${upload.Key}:`, err);
       }

package/package.json

@@ -1,32 +1,38 @@
 {
   "name": "mbkbucket",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "Flexible S3/R2 bucket management library and Express router for mbktech.org applications, providing upload, download, listing, and multipart utilities with built-in configuration validation and health checks",
   "author": "Muhammad Bin Khalid",
   "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",
-  "license": "GPL-2.0",
+  "license": "LGPL-3.0-only",
   "main": "index.js",
   "type": "module",
   "types": "index.d.ts",
   "scripts": {
-    "dev": "cross-env mbkbucket_test=dev nodemon index.js",
+    "dev": "cross-env NODE_ENV=dev nodemon index.js",
     "test": "node --test"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.968.0",
     "@aws-sdk/s3-request-presigner": "^3.1000.0",
     "compression": "^1.8.0",
+    "debug": "^2.6.9",
     "dotenv": "^16.6.1",
     "express": "^4.22.1",
     "express-handlebars": "^8.0.3",
     "express-rate-limit": "^7.0.1",
-    "mbkauthe": "latest",
+    "mbkauthe": "5.1.1",
     "multer": "^2.0.2",
     "pg": "^8.16.3"
   },
   "devDependencies": {
-    "nodemon": "^2.0.22",
+    "nodemon": "^3.1.14",
     "cross-env": "^7.0.3"
+  },
+    "overrides": {
+    "csurf": {
+      "cookie": "^0.7.0"
+    }
   },
   "repository": {
     "type": "git",
@@ -49,4 +55,4 @@
     "mbkauthe",
     "mbktech.org"
   ]
-}
+}

package/public/bucketadmin.css

@@ -731,9 +731,18 @@
     align-items: center;
     gap: 0.5rem;
     font-size: 0.9rem;
+    min-width: 0;
+}
+
+.breadcrumb-nav .breadcrumb-item::before {
+    display: none !important;
+    content: none !important;
 }
 
 .breadcrumb-link {
+    background: transparent;
+    border: 0;
+    padding: 0;
     color: var(--primary-color-ml);
     cursor: pointer;
     transition: all 0.2s ease;
@@ -754,6 +763,8 @@
 .breadcrumb-current {
     color: var(--dark-color-ml);
     font-weight: 600;
+    min-width: 0;
+    overflow-wrap: anywhere;
 }
 
 .file-icon {
@@ -2048,6 +2059,19 @@
     .breadcrumb-nav {
         padding: 0.5rem 1rem;
         font-size: 0.85rem;
+        gap: 0.35rem;
+        overflow: visible;
+    }
+
+    .breadcrumb-item {
+        max-width: 100%;
+    }
+
+    .breadcrumb-current,
+    .breadcrumb-link {
+        max-width: calc(100vw - 4rem);
+        white-space: normal;
+        overflow-wrap: anywhere;
     }
 
     .file-size {
@@ -2172,4 +2196,103 @@
     .dtm {
         display: block;
     }
-}
+}
+
+.table-cell-center {
+    text-align: center;
+}
+
+.table-select-col {
+    width: 48px;
+    text-align: center;
+}
+
+.file-name-cell,
+.file-name-heading {
+    padding-left: 1.5rem;
+}
+
+.file-row-main {
+    display: flex;
+    align-items: center;
+}
+
+.folder-name {
+    font-weight: 700;
+}
+
+.folder-leading-icon {
+    margin-right: 0.5rem;
+    color: #f59e0b;
+}
+
+.muted-cell-value {
+    color: var(--gray-color-ml);
+}
+
+.path-display-icon {
+    margin-right: 4px;
+    opacity: 0.5;
+}
+
+.copy-btn {
+    color: #fff;
+}
+
+.view-btn.is-disabled {
+    opacity: 0.5;
+}
+
+.sortable-heading {
+    cursor: pointer;
+}
+
+.bulk-actions-controls {
+    float: right;
+}
+
+.toast-icon {
+    font-size: 1.25rem;
+}
+
+.toast-message {
+    flex: 1;
+}
+
+.empty-state-error-icon {
+    color: var(--danger-color-ml);
+}
+
+.empty-state-folder-icon {
+    font-size: 4rem;
+    color: #cbd5e0;
+}
+
+.upload-progress-cell {
+    min-width: 220px;
+}
+
+.upload-progress-track {
+    height: 8px;
+    margin-bottom: 6px;
+}
+
+.upload-progress-bar {
+    height: 8px;
+}
+
+.progress-bar-empty {
+    width: 0%;
+}
+
+.is-hidden {
+    display: none !important;
+}
+
+.bucket-switcher-status:not(.is-hidden) {
+    display: inline;
+}
+
+.file-list-card-body {
+    padding: 0;
+}