mbkbucket 1.1.1 → 1.2.0

package/index.d.ts

@@ -73,6 +73,14 @@ export function deleteFiles(keys: string[], bucketName?: string): Promise<{
   deletedAt: string;
 }>;
 
+export function deleteFolder(prefix: string, bucketName?: string): Promise<{
+  results?: any[];
+  deletedCount: number;
+  errors?: any[];
+  deletedAt: string;
+  prefix?: string;
+}>;
+
 export function listfiles(
   prefix?: string,
   options?: {
@@ -186,6 +194,14 @@ declare module "mbkbucket/lib/s3" {
     errors: any[];
     deletedAt: string;
   }>;
+
+  export function deleteFolder(prefix: string, bucketName?: string): Promise<{
+    results?: any[];
+    deletedCount: number;
+    errors?: any[];
+    deletedAt: string;
+    prefix?: string;
+  }>;
   export function listfiles(
     prefix?: string,
     options?: {

package/index.js

@@ -8,16 +8,22 @@ import compression from "compression";
 import rateLimit from 'express-rate-limit';
 import bucket from "./lib/bucket.js";
 import { checkVersion } from "./lib/config/index.js";
+import { appVersion } from "./lib/config/index.js";
 
 dotenv.config();
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const assetVersion = appVersion;
 
 const server = express();
 server.set('trust proxy', 1);
 
 server.use(compression());
+server.use((req, res, next) => {
+  res.locals.assetVersion = assetVersion;
+  next();
+});
 
 // Rate limiting: general limiter for typical browsing/API usage and a stricter
 // limiter for dashboard (admin) routes.
@@ -34,6 +40,9 @@ 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 }));
+
 // Configure Handlebars (single setup)
 server.engine("handlebars", engine({
   extname: ".handlebars",
@@ -44,6 +53,7 @@ server.engine("handlebars", engine({
     path.join(__dirname, "views"),
     path.join(__dirname, "views/partial"),
     path.join(__dirname, "node_modules/mbkauthe/views"),
+    path.join(__dirname, "../mbkauthe/views")
   ],
   cache: process.env.NODE_ENV === "production",
   helpers: {
@@ -132,13 +142,14 @@ server.set("view engine", "handlebars");
 server.set("views", [
   path.join(__dirname, "views"),
   path.join(__dirname, "node_modules/mbkauthe/views"),
+  path.join(__dirname, "../mbkauthe/views")
 ]);
 
 server.use(mbkauthe);
 server.use(generalLimiter);
 server.use(bucket);
 
-if (process.env.mbkbucket_testl === "dev") {
+if (process.env.mbkbucket_test === "dev") {
 
   console.log("[mbkbucket] Dev mode is enabled. Starting server in dev mode.");
 

package/lib/bucket.js

@@ -1,11 +1,12 @@
 import express from "express";
 import { validateSessionAndRole, renderPage, mbkautheVar } from "mbkauthe";
-import { listfiles, uploadFile, deleteFile, deleteFiles, downloadFile, getFileMetadata, fileExists, ensureKeyHasAppPrefix, ensurePrefix, getAppName, getBucketConfig } from "./s3.js"
+import { listfiles, uploadFile, deleteFile, deleteFiles, deleteFolder, downloadFile, getFileMetadata, fileExists, ensureKeyHasAppPrefix, ensurePrefix, getAppName, getBucketConfig } from "./s3.js";
 import multer from "multer";
 import path from "path";
 import fs from 'fs';
 import os from 'os';
 import crypto from 'crypto';
+import { appVersion, getLatestVersion } from "./config/index.js";
 
 const router = express.Router();
 const upload = multer({ storage: multer.memoryStorage() });
@@ -20,6 +21,16 @@ 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 });
 });
 
+router.get(['/mbkbucket/info', "/mbkbucket/i"], validateSessionAndRole('SuperAdmin'), async (req, res) => {
+  let latestVersion = 'unknown';
+  try {
+    latestVersion = await getLatestVersion();
+  } 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 });
+});
+
 // API endpoint for fetching files
 router.get('/mbkbucket/api/files', validateSessionAndRole('SuperAdmin'), async (req, res) => {
   //mock response for testing
@@ -187,9 +198,9 @@ router.post('/mbkbucket/upload-complete', validateSessionAndRole('SuperAdmin'),
 
     // Cleanup chunks
     for (const f of files) {
-      await fs.promises.unlink(path.join(dir, f)).catch(() => {});
+      await fs.promises.unlink(path.join(dir, f)).catch(() => { });
     }
-    await fs.promises.rmdir(dir).catch(() => {});
+    await fs.promises.rmdir(dir).catch(() => { });
 
     return res.json({ success: true, message: 'File uploaded successfully (assembled)', key });
   } catch (err) {
@@ -225,7 +236,7 @@ router.post('/mbkbucket/create-folder', validateSessionAndRole('SuperAdmin'), as
 
 router.post('/mbkbucket/delete', validateSessionAndRole('SuperAdmin'), async (req, res) => {
   try {
-    const { key, keys } = req.body;
+    const { key, keys, folder } = req.body;
 
     if (keys && Array.isArray(keys) && keys.length) {
       // Bulk delete
@@ -238,6 +249,12 @@ router.post('/mbkbucket/delete', validateSessionAndRole('SuperAdmin'), async (re
     let keyToDelete;
     try { keyToDelete = ensureKeyHasAppPrefix(key); } catch (e) { return res.status(400).json({ success: false, error: e.message }); }
 
+    // If caller indicates it's a folder (or key ends with '/'), delete all objects under the prefix
+    if (folder === true || String(keyToDelete).endsWith('/')) {
+      await deleteFolder(keyToDelete);
+      return res.json({ success: true, message: 'Folder deleted successfully' });
+    }
+
     await deleteFile(keyToDelete);
     res.json({ success: true, message: 'File deleted successfully' });
   } catch (error) {

package/lib/s3.js

@@ -359,6 +359,69 @@ export async function deleteFiles(keys, bucketName = 'r2') {
   }
 }
 
+// List files with enhanced pagination and filtering
+/**
+ * Delete all objects under a folder prefix (recursive).
+ * Accepts either a folder key (may include trailing slash) or a relative prefix.
+ * Normalizes the prefix to include the configured APP_NAME and ensures trailing slash.
+ */
+export async function deleteFolder(prefix, bucketName = 'r2') {
+  try {
+    if (!prefix) {
+      throw new Error('Prefix is required');
+    }
+
+    const cleaned = String(prefix).replace(/^\/+/, '').replace(/\/+$/g, '');
+    const effectivePrefix = ensurePrefix(cleaned) + '/';
+
+    const client = getBucketClient(bucketName);
+    const config = getBucketConfig(bucketName);
+    const bucket = config.BUCKET_NAME;
+
+    const keysToDelete = [];
+    let continuationToken = null;
+
+    // Paginate through all objects under the prefix
+    do {
+      const listCmd = new ListObjectsV2Command({
+        Bucket: bucket,
+        Prefix: effectivePrefix,
+        ContinuationToken: continuationToken,
+        MaxKeys: 1000
+      });
+      const resp = await client.send(listCmd);
+      const contents = resp.Contents || [];
+      for (const obj of contents) {
+        if (obj.Key) keysToDelete.push(obj.Key);
+      }
+      continuationToken = resp.IsTruncated ? resp.NextContinuationToken : null;
+    } while (continuationToken);
+
+    if (!keysToDelete.length) {
+      // Nothing found under this prefix; attempt to remove a zero-byte folder marker if present
+      const folderMarkerKey = effectivePrefix;
+      const exists = await fileExists(folderMarkerKey, bucketName);
+      if (exists) {
+        await deleteFile(folderMarkerKey, bucketName);
+        return { deletedCount: 1, deletedAt: new Date().toISOString(), prefix: effectivePrefix };
+      }
+      return { deletedCount: 0, deletedAt: new Date().toISOString(), prefix: effectivePrefix };
+    }
+
+    // Use the existing deleteFiles helper which handles batching and error aggregation
+    const result = await deleteFiles(keysToDelete, bucketName);
+
+    return {
+      ...result,
+      prefix: effectivePrefix,
+      deletedAt: new Date().toISOString()
+    };
+  } catch (error) {
+    console.error('Delete folder failed:', error);
+    throw new Error(`Delete folder failed: ${error.message}`);
+  }
+}
+
 // List files with enhanced pagination and filtering
 export async function listfiles(prefix = '', options = {}) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkbucket",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "S3 Bucket manager for mbktech.org apps",
   "author": "Muhammad Bin Khalid",
   "homepage": "https://github.com/MIbnEKhalid/mbkbucket#readme",