mbkbucket 1.2.0 → 1.3.0

package/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for mbkbucket 1.1.0
+// Type definitions for mbkbucket 1.2.1
 // Project: https://github.com/MIbnEKhalid/mbkbucket
 // Definitions by: Muhammad Bin Khalid <https://github.com/MIbnEKhalid">
 

package/index.js

@@ -40,8 +40,22 @@ const generalLimiter = rateLimit({
 server.use(express.json());
 server.use(express.urlencoded({ extended: true }));
 
-// Serve static assets from /public (CSS/JS/images)
-server.use(express.static(path.join(__dirname, 'public'), { maxAge: '365d', etag: true }));
+// Serve only specific static assets (limit exposure): CSS and JS used by the dashboard
+// This replaces serving the entire /public directory.
+const staticMaxAgeSeconds = 90 * 24 * 60 * 60; // 90 days
+server.get('/mbkbucket/bucketadmin.css', (req, res) => {
+  res.set('Cache-Control', `public, max-age=${staticMaxAgeSeconds}, immutable`);
+  res.sendFile(path.join(__dirname, 'public', 'bucketadmin.css'), (err) => {
+    if (err) res.status(err.status || 404).end();
+  });
+});
+
+server.get('/mbkbucket/bucketadmin.js', (req, res) => {
+  res.set('Cache-Control', `public, max-age=${staticMaxAgeSeconds}, immutable`);
+  res.sendFile(path.join(__dirname, 'public', 'bucketadmin.js'), (err) => {
+    if (err) res.status(err.status || 404).end();
+  });
+});
 
 // Configure Handlebars (single setup)
 server.engine("handlebars", engine({

package/lib/bucket.js

@@ -18,7 +18,7 @@ fs.mkdirSync(CHUNKS_DIR, { recursive: true });
 // Key/prefix helpers are provided by `s3.js`: `ensurePrefix`, `ensureKeyHasAppPrefix`, `getAppName`.
 
 router.get('/mbkbucket', validateSessionAndRole('SuperAdmin'), async (req, res) => {
-  renderPage(req, res, "bucket.handlebars", false, { page: "Admin Bucket", bucketvar: mbkautheVar?.bucket, message: req.query.message, error: req.query.error });
+  renderPage(req, res, "bucket.handlebars", false, { page: "Admin Bucket", bucketvar: mbkautheVar?.bucket, APP_NAME: mbkautheVar?.APP_NAME, message: req.query.message, error: req.query.error });
 });
 
 router.get(['/mbkbucket/info', "/mbkbucket/i"], validateSessionAndRole('SuperAdmin'), async (req, res) => {
@@ -28,14 +28,12 @@ router.get(['/mbkbucket/info', "/mbkbucket/i"], validateSessionAndRole('SuperAdm
   } catch (err) {
     console.error("[mbkauthe] Error fetching package-lock.json:", err);
   }
-  renderPage(req, res, "info.handlebars", false, { page: "MBK Bucket Info", appVersion: appVersion, latestVersion, APP_NAME: mbkautheVar.APP_NAME });
+  renderPage(req, res, "info.handlebars", false, { page: "MBK Bucket Info", appVersion, latestVersion, APP_NAME: mbkautheVar?.APP_NAME });
 });
 
 // API endpoint for fetching files
 router.get('/mbkbucket/api/files', validateSessionAndRole('SuperAdmin'), async (req, res) => {
-  //mock response for testing
-  //return res.json({success: true,files: [],prefix: getAppName(),search: '',bucket: '',currentPage: 1,totalPages: 1,hasNextPage: false,hasPrevPage: false,nextPage: 2,prevPage: 1,totalFiles: 1});
-  const { prefix = '', page = '1', search = '' } = req.query;
+  const { prefix = '', page = '1', search = '', recursive = 'true', token = '' } = req.query;
   const pageSize = 100;
   let effectivePrefix;
   try {
@@ -44,56 +42,121 @@ router.get('/mbkbucket/api/files', validateSessionAndRole('SuperAdmin'), async (
     return res.status(400).json({ success: false, error: e.message });
   }
 
+  // Determine mode: Optimized (Folder View, No Search) vs Legacy/Deep (Flat View or Search)
+  const isSearch = search && search.trim().length > 0;
+  // If recursive is explicitly 'false', we respect it. Default to true if missing (though frontend should send it)
+  // Logic: Optimization works only if NOT recursive and NOT searching.
+  const isRecursive = recursive === 'true'; 
+  const useOptimizedListing = !isSearch && !isRecursive;
+
   try {
-    const result = await listfiles(effectivePrefix);
-    let files = result.Contents || [];
+    let files = [];
+    let folders = []; // For CommonPrefixes (subfolders)
+    let nextContinuationToken = null;
     let usedPrefix = effectivePrefix;
     let legacyFallback = false;
 
-    // If no files found under the app prefixed path, try root as a legacy fallback
-    if (!files.length) {
-      try {
-        const rootResult = await listfiles('');
-        if ((rootResult.Contents || []).length) {
-          files = rootResult.Contents || [];
-          usedPrefix = '';
-          legacyFallback = true;
+    if (useOptimizedListing) {
+      // --- OPTIMIZED PATH: S3 Delimiter (Folder View) ---
+      // We process only one page from S3. This reduces API calls significantly.
+      
+      // FIX: Ensure root listing uses trailing slash to prevent "app-name" matching "app-name-backup"
+      // and ensure directory browsing works correctly if ensurePrefix didn't append slash (which it now does if present in input).
+      // But for root, input is empty, ensurePrefix returns "app", so we force "app/" here.
+      let listPrefix = effectivePrefix;
+      if (listPrefix === getAppName() && !listPrefix.endsWith('/')) {
+        listPrefix += '/';
+      }
+
+      const result = await listfiles(listPrefix, { 
+        continuationToken: token || undefined, // Use token from query if provided
+        delimiter: '/', 
+        maxKeys: 1000 // Fetch a healthy batch.
+      });
+      
+      files = result.Contents || [];
+      // S3 returns CommonPrefixes for folders when delimiter is used
+      folders = (result.CommonPrefixes || []).map(p => p.Prefix).filter(p => p !== effectivePrefix); 
+      nextContinuationToken = result.NextContinuationToken;
+
+      // Note: In optimized mode, totalFiles is unknown without scanning everything.
+    } else {
+      // --- LEGACY PATH: Recursive Scan (Search or Flat View) ---
+      let continuationToken = undefined;
+
+      // Fetch all files recursively (handling S3 pagination)
+      do {
+        const result = await listfiles(effectivePrefix, { continuationToken });
+        if (result.Contents) {
+          files = files.concat(result.Contents);
+        }
+        continuationToken = result.nextToken;
+      } while (continuationToken);
+
+      // If no files found under the app prefixed path, try root as a legacy fallback
+      if (!files.length && !search) {
+        try {
+          const rootResult = await listfiles('');
+          if ((rootResult.Contents || []).length) {
+            files = rootResult.Contents || [];
+            usedPrefix = '';
+            legacyFallback = true;
+          }
+        } catch (fallbackErr) {
+          console.warn('Fallback root listing failed:', fallbackErr.message);
         }
-      } catch (fallbackErr) {
-        // ignore fallback errors and continue with empty files
-        console.warn('Fallback root listing failed:', fallbackErr.message);
+      }
+      
+      // Apply search filter if provided
+      if (isSearch) {
+        const searchLower = search.toLowerCase();
+        files = files.filter(file => {
+          return file.Key.toLowerCase().includes(searchLower);
+        });
       }
     }
 
-    // Apply search filter if provided
-    if (search.trim()) {
-      const searchLower = search.toLowerCase();
-      files = files.filter(file => {
-        const fileName = file.Key.split('/').pop();
-        return fileName.toLowerCase().includes(searchLower);
-      });
+    // Response Construction
+    if (useOptimizedListing) {
+       res.json({
+         success: true,
+         files: files,
+         folders: folders, 
+         prefix: effectivePrefix,
+         search: search,
+         // In optimized mode, we don't support random access "Page X". We support "Next".
+         currentPage: 1, 
+         totalPages: nextContinuationToken ? 9999 : 1, 
+         hasNextPage: !!nextContinuationToken,
+         nextContinuationToken: nextContinuationToken,
+         mode: 'optimized',
+         totalFiles: -1 
+       });
+       
+    } else {
+       // Legacy Pagination Logic (In-Memory)
+       const totalFiles = files.length;
+       const totalPages = Math.max(1, Math.ceil(totalFiles / pageSize));
+       const currentPage = Math.max(1, parseInt(page, 10) || 1);
+       const startIndex = (currentPage - 1) * pageSize;
+       const paginatedFiles = files.slice(startIndex, startIndex + pageSize);
+
+       res.json({
+         success: true,
+         files: paginatedFiles,
+         folders: [], // In recursive mode, frontend calculates folders from file paths
+         prefix: effectivePrefix,
+         search: search,
+         currentPage: currentPage,
+         totalPages,
+         hasNextPage: currentPage < totalPages,
+         hasPrevPage: currentPage > 1,
+         nextPage: currentPage + 1,
+         prevPage: Math.max(1, currentPage - 1),
+         totalFiles
+       });
     }
 
-    // Pagination logic
-    const totalFiles = files.length;
-    const totalPages = Math.max(1, Math.ceil(totalFiles / pageSize));
-    const currentPage = Math.max(1, parseInt(page, 10) || 1);
-    const startIndex = (currentPage - 1) * pageSize;
-    const paginatedFiles = files.slice(startIndex, startIndex + pageSize);
-
-    res.json({
-      success: true,
-      files: paginatedFiles,
-      prefix: effectivePrefix,
-      search: search,
-      currentPage: currentPage,
-      totalPages,
-      hasNextPage: currentPage < totalPages,
-      hasPrevPage: currentPage > 1,
-      nextPage: currentPage + 1,
-      prevPage: Math.max(1, currentPage - 1),
-      totalFiles
-    });
   } catch (error) {
     console.error("Error listing files:", error);
     res.status(500).json({
@@ -120,7 +183,7 @@ router.post('/mbkbucket/upload', validateSessionAndRole('SuperAdmin'), upload.si
       return res.status(400).json({ success: false, error: e.message });
     }
 
-    const key = `${effectivePrefix}/${req.file.originalname}`;
+    const key = `${effectivePrefix.replace(/\/+$/, '')}/${req.file.originalname}`;
 
     // Check if file already exists
     const exists = await fileExists(key);
@@ -188,7 +251,7 @@ router.post('/mbkbucket/upload-complete', validateSessionAndRole('SuperAdmin'),
     // Upload to bucket
     let effectivePrefix;
     try { effectivePrefix = ensurePrefix(prefix); } catch (e) { return res.status(400).json({ success: false, error: e.message }); }
-    const key = `${effectivePrefix}/${fileName}`;
+    const key = `${effectivePrefix.replace(/\/+$/, '')}/${fileName}`;
 
     // Check existence
     const exists = await fileExists(key);
@@ -218,7 +281,7 @@ router.post('/mbkbucket/create-folder', validateSessionAndRole('SuperAdmin'), as
     let effectivePrefix;
     try { effectivePrefix = ensurePrefix(prefix); } catch (e) { return res.status(400).json({ success: false, error: e.message }); }
 
-    const folderKey = `${effectivePrefix}/${folderName}/`;
+    const folderKey = `${effectivePrefix.replace(/\/+$/, '')}/${folderName}/`;
 
     // Check if exists
     const exists = await fileExists(folderKey);

package/lib/s3.js

@@ -66,10 +66,15 @@ export function ensureKeyHasAppPrefix(key = '') {
 export function ensurePrefix(prefix = '') {
   const app = getAppName();
   if (!app) throw new Error('APP_NAME is not configured; set mbkautheVar.APP_NAME or MBKAUTHE_APP_NAME');
-  let p = String(prefix || '').replace(/^\/+/, '').replace(/\/+$/g, '');
+  // Only strip LEADING slashes. Preserve trailing slashes for directory listing.
+  let p = String(prefix || '').replace(/^\/+/, '');
+  
   if (!p) return `${app}`;
+  
   // If prefix already equals app or already starts with app/, normalize and return single app prefix
-  if (p === app) return app;
+  if (p === app) return app; // If p is exactly "app", we return "app". (Caller should append / if listing root)
+  if (p === `${app}/`) return `${app}/`;
+
   if (p.startsWith(`${app}/`)) {
     // collapse repeated app/ sequences
     const appPrefixRegex = new RegExp(`^(?:${app}\/)+`);
@@ -216,13 +221,14 @@ export async function uploadFile(key, fileBuffer, contentType, options = {}) {
 
 // Download file with enhanced features
 export async function downloadFile(key, options = {}) {
+  let keyToDownload;
   try {
     if (!key) {
       throw new Error('Key is required');
     }
 
     // Ensure key is app-prefixed
-    const keyToDownload = ensureKeyHasAppPrefix(key);
+    keyToDownload = ensureKeyHasAppPrefix(key);
 
     const {
       range = null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkbucket",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "S3 Bucket manager for mbktech.org apps",
   "author": "Muhammad Bin Khalid",
   "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",
@@ -19,7 +19,7 @@
     "express": "^4.22.1",
     "express-handlebars": "^8.0.3",
     "express-rate-limit": "^7.0.1",
-    "mbkauthe": "^4.3.0",
+    "mbkauthe": "latest",
     "multer": "^2.0.2",
     "pg": "^8.16.3"
   },