mbkbucket 3.3.1 → 3.4.0

package/lib/public/bucketadmin.js

@@ -1,5 +1,5 @@
 /**
- * MBKBucket File Manager - Gentelella v4 UI & Client Logic
+ * MBKBucket File Manager - UI & Client Logic
  */
 
 (function () {

package/lib/src/app.js

@@ -1,5 +1,6 @@
 import express from "express";
 import path from "path";
+import fs from "fs";
 import { fileURLToPath } from "url";
 import { engine } from "express-handlebars";
 import compression from "compression";
@@ -8,34 +9,25 @@ import { generalLimiter } from "./middleware/rate-limiter.js";
 import { notFoundHandler, globalErrorHandler } from "./middleware/error-handler.js";
 import bucketRoutes from "./routes/index.js";
 import { packageJson } from "./config/index.js";
-import { createLogger } from "./utils/logger.js";
+import { createLogger } from "#logger";
 import { commonHandlebarsHelpers } from "./utils/helpers.js";
 
 const debugServer = createLogger('server');
-
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const isDevMode = process.env.NODE_ENV === "dev";
 
-/**
- * Creates and configures the Express application.
- * @returns {express.Application}
- */
 export function createApp() {
   const server = express();
   server.set('trust proxy', 1);
 
-  // Compression
   server.use(compression());
-
-  // Body parsing
   server.use(express.json({ limit: '10mb' }));
   server.use(express.urlencoded({ extended: true, limit: '10mb' }));
 
-  // Static assets (CSS/JS for dashboard)
-  const dashboardAssetCacheControl = 'public, max-age=300, must-revalidate';
-  const serveAsset = (filename) => (req, res) => {
-    res.set('Cache-Control', dashboardAssetCacheControl);
+  // Static dashboard & helper assets
+  const serveAsset = (filename) => (_req, res) => {
+    res.set('Cache-Control', 'public, max-age=300, must-revalidate');
     res.sendFile(path.join(__dirname, '..', 'public', filename), (err) => {
       if (err) res.status(err.status || 404).end();
     });
@@ -43,71 +35,66 @@ export function createApp() {
 
   server.get('/mbkbucket/bucketadmin.css', serveAsset('bucketadmin.css'));
   server.get('/mbkbucket/bucketadmin.js', serveAsset('bucketadmin.js'));
-
-  // Frontend helper utilities (drop-in for any HTML page)
   server.get('/mbkbucket/mbkbucket-helper.css', serveAsset('mbkbucket-helper.css'));
   server.get('/mbkbucket/mbkbucket-helper.js', serveAsset('mbkbucket-helper.js'));
-
-  // Helper component demo page (no auth — purely static HTML)
   server.get('/mbkbucket/helper-demo', serveAsset('mbkbucket-helper-demo.html'));
 
-  // Handlebars configuration
+  const rootDir = path.resolve(__dirname, "..", "..");
+  const libDir = path.resolve(__dirname, "..");
+  const cwd = process.cwd();
+
+  const viewDirs = [
+    path.join(rootDir, "views"),
+    path.join(libDir, "views"),
+    path.join(rootDir, "node_modules", "mbkauthe", "views"),
+    path.resolve(cwd, "views"),
+    path.resolve(cwd, "node_modules", "mbkauthe", "views"),
+  ].filter(dir => fs.existsSync(dir));
+
+  const partialsDir = [
+    path.join(rootDir, "views", "templates"),
+    path.join(rootDir, "views", "templates", "notice"),
+    path.join(rootDir, "views"),
+    path.join(rootDir, "views", "partial"),
+    path.join(libDir, "views", "templates"),
+    path.join(libDir, "views", "templates", "notice"),
+    path.join(libDir, "views"),
+    path.join(libDir, "views", "partial"),
+    path.join(rootDir, "node_modules", "mbkauthe", "views"),
+    path.resolve(cwd, "node_modules", "mbkauthe", "views"),
+  ].filter(dir => fs.existsSync(dir));
+
+  // Handlebars template engine
   server.engine("handlebars", engine({
     extname: ".handlebars",
     defaultLayout: false,
-    partialsDir: [
-      path.join(__dirname, "..", "views", "templates"),
-      path.join(__dirname, "..", "views", "templates", "notice"),
-      path.join(__dirname, "..", "views"),
-      path.join(__dirname, "..", "views", "partial"),
-      path.join(__dirname, "..", "node_modules", "mbkauthe", "views"),
-      path.join(__dirname, "..", "..", "mbkauthe", "views")
-    ],
+    partialsDir: [...new Set(partialsDir)],
     cache: process.env.NODE_ENV === "production",
     helpers: {
       ...commonHandlebarsHelpers,
-      mbkbucket_cachebuster: function () {
-        return "?v=" + packageJson.version;
-      }
+      mbkbucket_cachebuster: () => `?v=${packageJson.version}`
     }
   }));
 
   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.set("views", [...new Set(viewDirs)]);
 
-  // Auth routes
   server.use(mbkautheRoutes);
-
-  // Rate limiting
   server.use(generalLimiter);
-
-  // Bucket routes
   server.use(bucketRoutes);
 
-  // Dev-mode request timing
   if (isDevMode) {
-    debugServer("Dev mode is enabled. Starting server in dev mode.");
-
     server.use((req, res, next) => {
-      const start = process.hrtime();
+      const start = Date.now();
       res.on('finish', () => {
-        const diff = process.hrtime(start);
-        const ms = diff[0] * 1000 + diff[1] / 1e6;
-        debugServer("[%s] %s %s %s - %s ms", new Date().toISOString(), req.method, req.originalUrl, res.statusCode, ms.toFixed(3));
+        debugServer('%s %s %s (%sms)', req.method, req.originalUrl, res.statusCode, Date.now() - start);
       });
       next();
     });
 
-    server.get("/", async (req, res) => {
-      res.redirect("/mbkbucket");
-    });
+    server.get("/", (_req, res) => res.redirect("/mbkbucket"));
   }
 
-  // Error handlers
   server.use(notFoundHandler);
   server.use(globalErrorHandler);
 

package/lib/src/cli/auth-helper.js

@@ -1,6 +1,5 @@
 /**
  * CLI Authentication Helper
- *
  * Handles mbkauthe device-flow login for the mbkbucket CLI.
  * Stores credentials in ~/.mbkbucket/config.json
  */
@@ -8,39 +7,27 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
-import { createLogger } from '../utils/logger.js';
+import { createLogger } from '#logger';
 
 const debugCli = createLogger('cli:auth');
 
 export const CONFIG_DIR = path.join(os.homedir(), '.mbkbucket');
 export const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
-const POLL_INTERVAL_MS = 5000;
 const MAX_POLL_TIME_MS = 15 * 60 * 1000; // 15 minutes
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 
-/**
- * Read the stored CLI config.
- * @returns {{ token?: string, tokenPrefix?: string, username?: string, serverUrl?: string, profile?: object }}
- */
 export function readConfig() {
   try {
-    if (!fs.existsSync(CONFIG_FILE)) return {};
-    const raw = fs.readFileSync(CONFIG_FILE, 'utf-8');
-    return JSON.parse(raw);
+    return fs.existsSync(CONFIG_FILE) ? JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8')) : {};
   } catch (err) {
     debugCli('Failed to read config: %s', err.message);
     return {};
   }
 }
 
-/**
- * Write config to disk.
- * @param {object} config
- */
 export function writeConfig(config) {
   try {
-    if (!fs.existsSync(CONFIG_DIR)) {
-      fs.mkdirSync(CONFIG_DIR, { recursive: true });
-    }
+    if (!fs.existsSync(CONFIG_DIR)) fs.mkdirSync(CONFIG_DIR, { recursive: true });
     fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), { mode: 0o600 });
   } catch (err) {
     console.error(`❌ Failed to write config: ${err.message}`);
@@ -48,14 +35,9 @@ export function writeConfig(config) {
   }
 }
 
-/**
- * Clear stored credentials (logout).
- */
 export function clearConfig() {
   try {
-    if (fs.existsSync(CONFIG_FILE)) {
-      fs.unlinkSync(CONFIG_FILE);
-    }
+    if (fs.existsSync(CONFIG_FILE)) fs.unlinkSync(CONFIG_FILE);
     return true;
   } catch (err) {
     debugCli('Failed to clear config: %s', err.message);
@@ -63,49 +45,27 @@ export function clearConfig() {
   }
 }
 
-/**
- * Merge partial config into stored config.
- * @param {object} partial
- */
 export function updateConfig(partial) {
-  const current = readConfig();
-  const updated = { ...current, ...partial };
+  const updated = { ...readConfig(), ...partial };
   writeConfig(updated);
   return updated;
 }
 
-/**
- * Check if the user is logged in (has a stored token).
- */
 export function isLoggedIn() {
-  const cfg = readConfig();
-  return !!(cfg.token && cfg.serverUrl);
+  const { token, server_url } = readConfig();
+  return Boolean(token && server_url);
 }
 
-/**
- * Get the stored API token.
- */
 export function getStoredToken() {
   return readConfig().token || null;
 }
 
-/**
- * Get the stored server URL.
- */
 export function getStoredServerUrl() {
-  return readConfig().serverUrl || null;
+  return readConfig().server_url || null;
 }
 
-/**
- * Perform a device-flow login against an mbkauthe-powered server.
- *
- * @param {{ serverUrl: string, profileKey?: string }} options
- * @returns {Promise<{ token: string, tokenPrefix: string, username: string, profile: object }>}
- */
-export async function deviceFlowLogin({ serverUrl, profileKey }) {
-  const baseUrl = String(serverUrl).replace(/\/+$/, '');
-
-  // --- Step 1: Request a device code ---
+export async function deviceFlowLogin({ server_url, profile_key }) {
+  const baseUrl = String(server_url).replace(/\/+$/, '');
   console.log(`🔑 Requesting device login from ${baseUrl} ...`);
 
   let deviceResp;
@@ -114,54 +74,38 @@ export async function deviceFlowLogin({ serverUrl, profileKey }) {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
-        clientName: `mbkbucket-cli-${os.hostname()}`,
-        ...(profileKey ? { profileKey } : {}),
+        client_name: `mbkbucket-cli-${os.hostname()}`,
+        ...(profile_key && { profile_key }),
       }),
     });
-
     deviceResp = await res.json();
-
-    if (!deviceResp.success) {
-      throw new Error(deviceResp.message || 'Failed to initiate device login');
-    }
+    if (!deviceResp.success) throw new Error(deviceResp.message || 'Failed to initiate device login');
   } catch (err) {
     if (err.message.includes('Failed to initiate') || err.message.includes('fetch')) {
-      throw new Error(
-        `Could not reach mbkauthe server at ${baseUrl}/api/cli/device.\n` +
-        `Verify the server URL and that CLI_AUTH_ENABLED=true on the server.`
-      );
+      throw new Error(`Could not reach mbkauthe server at ${baseUrl}/api/cli/device.\nVerify the server URL and that CLI_AUTH_ENABLED=true on the server.`);
     }
     throw err;
   }
 
-  const {
-    verificationUrl,
-    userCode,
-    deviceCode,
-    expiresIn,
-    interval,
-    profile,
-  } = deviceResp;
-
-  // --- Step 2: Prompt user to approve ---
-  console.log('');
-  console.log('┌─────────────────────────────────────────────────────────┐');
+  const verification_url = deviceResp.verification_url;
+  const user_code = deviceResp.user_code;
+  const device_code = deviceResp.device_code;
+  const expires_in = deviceResp.expires_in;
+  const interval = deviceResp.interval;
+  const profile = deviceResp.profile;
+
+  console.log('\n┌─────────────────────────────────────────────────────────┐');
+  console.log('│                                                         │');
+  console.log('│   🌐 Open this URL in your browser to approve:           │');
+  console.log(`│   ${(verification_url || '').padEnd(53)}│`);
   console.log('│                                                         │');
-  console.log(`│   🌐 Open this URL in your browser to approve:           │`);
-  console.log(`│   ${verificationUrl.padEnd(53)}│`);
-  console.log(`│                                                         │`);
-  console.log(`│   🔢 Or enter this code:  ${userCode.padEnd(30)}│`);
+  console.log(`│   🔢 Or enter this code:  ${(user_code || '').padEnd(30)}│`);
   console.log('│                                                         │');
-  console.log('└─────────────────────────────────────────────────────────┘');
-  console.log('');
+  console.log('└─────────────────────────────────────────────────────────┘\n');
 
-  if (profile) {
-    console.log(`   Profile: ${profile.name} (scope: ${profile.scope || 'full'})`);
-  }
-  console.log(`   Waiting for approval (expires in ${Math.floor(expiresIn / 60)} minutes)...`);
-  console.log('');
+  if (profile) console.log(`   Profile: ${profile.name} (scope: ${profile.scope || 'full'})`);
+  console.log(`   Waiting for approval (expires in ${Math.floor((expires_in || 900) / 60)} minutes)...\n`);
 
-  // --- Step 3: Poll for token ---
   const pollInterval = (interval || 5) * 1000;
   const deadline = Date.now() + MAX_POLL_TIME_MS;
   let attempts = 0;
@@ -174,50 +118,33 @@ export async function deviceFlowLogin({ serverUrl, profileKey }) {
       const pollRes = await fetch(`${baseUrl}/api/cli/device/token`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ deviceCode }),
+        body: JSON.stringify({ device_code }),
       });
 
       const pollBody = await pollRes.json();
 
       if (pollBody.status === 'approved' && pollBody.success) {
+        const token_prefix = pollBody.token_prefix || '';
         console.log(`✅ Login approved! Welcome, ${pollBody.username}.`);
-        console.log(`   Token prefix: ${pollBody.tokenPrefix}...`);
+        console.log(`   Token prefix: ${token_prefix}...`);
         return {
           token: pollBody.token,
-          tokenPrefix: pollBody.tokenPrefix,
+          token_prefix: token_prefix,
           username: pollBody.username,
           profile: profile || null,
         };
       }
 
-      if (pollBody.status === 'denied') {
-        throw new Error('Login request was denied.');
-      }
+      if (pollBody.status === 'denied') throw new Error('Login request was denied.');
+      if (pollBody.status === 'expired') throw new Error('Login request expired. Please try again.');
+      if (pollBody.status === 'completed') throw new Error('This login session has already been completed.');
 
-      if (pollBody.status === 'expired') {
-        throw new Error('Login request expired. Please try again.');
-      }
-
-      if (pollBody.status === 'completed') {
-        throw new Error('This login session has already been completed.');
-      }
-
-      // Still pending — show a dot every 5 polls
-      if (attempts % 5 === 0) {
-        process.stdout.write('.');
-      }
+      if (attempts % 5 === 0) process.stdout.write('.');
     } catch (err) {
-      if (err.message.includes('denied') || err.message.includes('expired') || err.message.includes('completed')) {
-        throw err;
-      }
-      // Network errors during poll — retry
+      if (['denied', 'expired', 'completed'].some(k => err.message.includes(k))) throw err;
       debugCli('Poll error (will retry): %s', err.message);
     }
   }
 
   throw new Error('Login timed out. Please try again.');
 }
-
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}

package/lib/src/config/index.js

@@ -1,133 +1,105 @@
 import { createRequire } from "module";
 import dotenv from "dotenv";
 import { parseAndValidateMbkbucketVar, parseAndValidateBucketConnection } from "./validation.js";
-import { createLogger } from "../utils/logger.js";
+import { createLogger } from "#logger";
 
 dotenv.config();
 const debugConfig = createLogger('config');
-
-// Load package.json from mbkbucket package (not parent project)
 const require = createRequire(import.meta.url);
+
+// Load mbkbucket package.json
 let packageJson;
 try {
-    // Try to load from mbkbucket package directory
-    packageJson = require("mbkbucket/package.json");
+  packageJson = require("mbkbucket/package.json");
 } catch {
-    // Fallback to relative path (for development/testing)
-    packageJson = require("../../../package.json");
+  packageJson = require("../../../package.json");
 }
 
 // Parent project version
-let appVersion;
+let appVersion = "unknown";
 try {
-    appVersion = require("../../../../package.json")?.version || "unknown";
+  appVersion = require("../../../../package.json")?.version ?? require(`${process.cwd()}/package.json`)?.version ?? "unknown";
 } catch {
-    // Fallback if path doesn't work
-    try {
-        appVersion = require(process.cwd() + "/package.json")?.version || "unknown";
-    } catch {
-        appVersion = "unknown";
-    }
+  try {
+    appVersion = require(`${process.cwd()}/package.json`)?.version ?? "unknown";
+  } catch {}
 }
 
-function compareVersions(a, b) {
-    const left = String(a || '').split(/[.-]/).map((part) => parseInt(part, 10) || 0);
-    const right = String(b || '').split(/[.-]/).map((part) => parseInt(part, 10) || 0);
-    const length = Math.max(left.length, right.length);
+export function compareVersions(a = '', b = '') {
+  const left = String(a).split(/[.-]/).map(p => parseInt(p, 10) || 0);
+  const right = String(b).split(/[.-]/).map(p => parseInt(p, 10) || 0);
+  const len = Math.max(left.length, right.length);
 
-    for (let i = 0; i < length; i += 1) {
-        const diff = (left[i] || 0) - (right[i] || 0);
-        if (diff !== 0) return diff;
-    }
-    return 0;
+  for (let i = 0; i < len; i++) {
+    const diff = (left[i] || 0) - (right[i] || 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
 }
 
-// Fetch latest version from GitHub
-async function getLatestVersion() {
+export async function getLatestVersion() {
   try {
-    const response = await fetch('https://raw.githubusercontent.com/MIbnEKhalid/mbkbucket/master/package.json');
-    if (!response.ok) {
-      debugConfig('GitHub API responded with status %s', response.status);
+    const res = await fetch('https://raw.githubusercontent.com/MIbnEKhalid/mbkbucket/master/package.json');
+    if (!res.ok) {
+      debugConfig('GitHub API responded with status %s', res.status);
       return "0.0.0";
     }
-
-    const latestPackageJson = await response.json();
-    return latestPackageJson.version;
-  } catch (error) {
-    debugConfig('Error fetching latest version from GitHub: %s', error.message);
+    const data = await res.json();
+    return data.version;
+  } catch (err) {
+    debugConfig('Error fetching latest version from GitHub: %s', err.message);
     return null;
   }
 }
 
-// Version check with error handling
-async function checkVersion() {
-    try {
-        const latestVersion = await getLatestVersion();
-        if (latestVersion && compareVersions(latestVersion, packageJson.version) > 0) {
-            debugConfig('Current version (%s) is outdated. Latest version: %s.', packageJson.version, latestVersion);
-        } else if (latestVersion && compareVersions(latestVersion, packageJson.version) < 0) {
-            debugConfig('Current version (%s) is newer than published version: %s.', packageJson.version, latestVersion);
-        } else if (latestVersion) {
-            debugConfig('Running latest version (%s).', packageJson.version);
-        }
-    } catch (error) {
-        debugConfig('Failed to check for updates: %s', error.message);
+export async function checkVersion() {
+  try {
+    const latest = await getLatestVersion();
+    if (!latest) return;
+    const diff = compareVersions(latest, packageJson.version);
+    if (diff > 0) {
+      console.log(`[mbkbucket] ⚠️  Update available: v${latest} (current: v${packageJson.version})`);
+    } else {
+      debugConfig('Running latest version (%s).', packageJson.version);
     }
+  } catch (err) {
+    debugConfig('Failed to check for updates: %s', err.message);
+  }
 }
 
-// Comprehensive validation function
-function validateConfiguration() {
-    try {
-        const parsed = parseAndValidateMbkbucketVar(process.env.mbkbucketVar);
-        if (!process.env.mbkbucketVar) {
-            debugConfig('mbkbucketVar not defined, using defaults');
-        }
-        debugConfig('Configuration loaded');
-        return parsed;
-    } catch (error) {
-        throw new Error(`[mbkbucket] Configuration Validation Failed:\n  - ${error.message}`);
-    }
+export function validateConfiguration() {
+  try {
+    return parseAndValidateMbkbucketVar(process.env.mbkbucketVar);
+  } catch (err) {
+    throw new Error(`[mbkbucket] Configuration Validation Failed:\n  - ${err.message}`);
+  }
 }
 
-// Validate BucketConnection configuration
-function validateBucketConnection() {
-    if (!process.env.BucketConnection) {
-        console.warn(`[mbkbucket] ⚠️  BucketConnection not configured. You need to set this environment variable.`);
-        console.warn(`[mbkbucket] Example format:`);
-        console.warn(`[mbkbucket] BucketConnection={"r2":{"BUCKET_NAME":"my-bucket","ACCESS_KEY_ID":"key","SECRET_ACCESS_KEY":"secret","ENDPOINT":"https://..."}}`);
-        return;
-    }
-
-    try {
-        parseAndValidateBucketConnection(process.env.BucketConnection);
-        debugConfig('BucketConnection configuration validated successfully');
-    } catch (error) {
-        throw new Error(`[mbkbucket] BucketConnection validation failed:\n  - ${error.message}`);
-    }
+export function validateBucketConnection() {
+  if (!process.env.BucketConnection) {
+    console.warn(`[mbkbucket] ⚠️  BucketConnection not configured. You need to set this environment variable.`);
+    console.warn(`[mbkbucket] Example format:\n[mbkbucket] BucketConnection={"r2":{"BUCKET_NAME":"my-bucket","ACCESS_KEY_ID":"key","SECRET_ACCESS_KEY":"secret","ENDPOINT":"https://..."}}`);
+    return;
+  }
+  try {
+    parseAndValidateBucketConnection(process.env.BucketConnection);
+    debugConfig('BucketConnection validated');
+  } catch (err) {
+    throw new Error(`[mbkbucket] BucketConnection validation failed:\n  - ${err.message}`);
+  }
 }
 
-// Validate all configuration at startup
-function validateAllConfiguration() {
-    try {
-        validateConfiguration();
-        validateBucketConnection();
-        debugConfig('All configurations validated successfully');
-        return true;
-    } catch (error) {
-        console.error(error.message);
-        return false;
-    }
+export function validateAllConfiguration() {
+  try {
+    validateConfiguration();
+    validateBucketConnection();
+    return true;
+  } catch (err) {
+    console.error(err.message);
+    return false;
+  }
 }
 
-const mbkbucketVar = validateConfiguration();
+export const mbkbucketVar = validateConfiguration();
 
-export {
-    packageJson,
-    appVersion,
-    mbkbucketVar,
-    checkVersion,
-    getLatestVersion,
-    validateConfiguration,
-    validateBucketConnection,
-    validateAllConfiguration
-};
+export { packageJson, appVersion };