mbkbucket 1.1.2 → 1.2.1

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

@@ -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,22 @@ const generalLimiter = rateLimit({
 server.use(express.json());
 server.use(express.urlencoded({ extended: 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({
   extname: ".handlebars",

package/lib/bucket.js

@@ -6,6 +6,7 @@ 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() });
@@ -17,7 +18,17 @@ 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) => {
+  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, latestVersion, APP_NAME: mbkautheVar?.APP_NAME });
 });
 
 // API endpoint for fetching files
@@ -34,11 +45,20 @@ router.get('/mbkbucket/api/files', validateSessionAndRole('SuperAdmin'), async (
   }
 
   try {
-    const result = await listfiles(effectivePrefix);
-    let files = result.Contents || [];
+    let files = [];
+    let continuationToken = undefined;
     let usedPrefix = effectivePrefix;
     let legacyFallback = false;
 
+    // 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) {
       try {
@@ -58,8 +78,7 @@ router.get('/mbkbucket/api/files', validateSessionAndRole('SuperAdmin'), async (
     if (search.trim()) {
       const searchLower = search.toLowerCase();
       files = files.filter(file => {
-        const fileName = file.Key.split('/').pop();
-        return fileName.toLowerCase().includes(searchLower);
+        return file.Key.toLowerCase().includes(searchLower);
       });
     }
 
@@ -187,9 +206,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) {

package/lib/s3.js

@@ -216,13 +216,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.1.2",
+  "version": "1.2.1",
   "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"
   },