mbkbucket 3.5.1 → 3.7.0

package/lib/src/app.js

@@ -1,109 +1,109 @@
-/**
- * MBKBucket
- * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
- * Licensed under the MIT License.
- * Source: https://github.com/MIbnEKhalid/mbkbucket
- */
-
-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";
-import mbkautheRoutes from "mbkauthe";
-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 "#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";
-
-export function createApp() {
-  const server = express();
-  server.set('trust proxy', 1);
-
-  server.use(compression());
-  server.use(express.json({ limit: '10mb' }));
-  server.use(express.urlencoded({ extended: true, limit: '10mb' }));
-
-  // 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();
-    });
-  };
-
-  server.get('/mbkbucket/bucketadmin.css', serveAsset('bucketadmin.css'));
-  server.get('/mbkbucket/bucketadmin.js', serveAsset('bucketadmin.js'));
-  server.get('/mbkbucket/mbkbucket-helper.css', serveAsset('mbkbucket-helper.css'));
-  server.get('/mbkbucket/mbkbucket-helper.js', serveAsset('mbkbucket-helper.js'));
-  server.get('/mbkbucket/helper-demo', serveAsset('mbkbucket-helper-demo.html'));
-
-  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: [...new Set(partialsDir)],
-    cache: process.env.NODE_ENV === "production",
-    helpers: {
-      ...commonHandlebarsHelpers,
-      mbkbucket_cachebuster: () => `?v=${packageJson.version}`
-    }
-  }));
-
-  server.set("view engine", "handlebars");
-  server.set("views", [...new Set(viewDirs)]);
-
-  server.use(mbkautheRoutes);
-  server.use(generalLimiter);
-  server.use(bucketRoutes);
-
-  if (isDevMode) {
-    server.use((req, res, next) => {
-      const start = Date.now();
-      res.on('finish', () => {
-        debugServer('%s %s %s (%sms)', req.method, req.originalUrl, res.statusCode, Date.now() - start);
-      });
-      next();
-    });
-
-    server.get("/", (_req, res) => res.redirect("/mbkbucket"));
-  }
-
-  server.use(notFoundHandler);
-  server.use(globalErrorHandler);
-
-  return server;
-}
+/**
+ * MBKBucket
+ * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
+ * Licensed under the MIT License.
+ * Source: https://github.com/MIbnEKhalid/mbkbucket
+ */
+
+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";
+import mbkautheRoutes from "mbkauthe";
+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 "#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";
+
+export function createApp() {
+  const server = express();
+  server.set('trust proxy', 1);
+
+  server.use(compression());
+  server.use(express.json({ limit: '10mb' }));
+  server.use(express.urlencoded({ extended: true, limit: '10mb' }));
+
+  // 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();
+    });
+  };
+
+  server.get('/mbkbucket/bucketadmin.css', serveAsset('bucketadmin.css'));
+  server.get('/mbkbucket/bucketadmin.js', serveAsset('bucketadmin.js'));
+  server.get('/mbkbucket/mbkbucket-helper.css', serveAsset('mbkbucket-helper.css'));
+  server.get('/mbkbucket/mbkbucket-helper.js', serveAsset('mbkbucket-helper.js'));
+  server.get('/mbkbucket/helper-demo', serveAsset('mbkbucket-helper-demo.html'));
+
+  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: [...new Set(partialsDir)],
+    cache: process.env.NODE_ENV === "production",
+    helpers: {
+      ...commonHandlebarsHelpers,
+      mbkbucket_cachebuster: () => `?v=${packageJson.version}`
+    }
+  }));
+
+  server.set("view engine", "handlebars");
+  server.set("views", [...new Set(viewDirs)]);
+
+  server.use(mbkautheRoutes);
+  server.use(generalLimiter);
+  server.use(bucketRoutes);
+
+  if (isDevMode) {
+    server.use((req, res, next) => {
+      const start = Date.now();
+      res.on('finish', () => {
+        debugServer('%s %s %s (%sms)', req.method, req.originalUrl, res.statusCode, Date.now() - start);
+      });
+      next();
+    });
+
+    server.get("/", (_req, res) => res.redirect("/mbkbucket"));
+  }
+
+  server.use(notFoundHandler);
+  server.use(globalErrorHandler);
+
+  return server;
+}

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

@@ -1,150 +1,141 @@
-/**
- * CLI Authentication Helper
- * Handles mbkauthe device-flow login for the mbkbucket CLI.
- * Stores credentials in ~/.mbkbucket/config.json
- */
-
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-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 MAX_POLL_TIME_MS = 15 * 60 * 1000; // 15 minutes
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
-
-export function readConfig() {
-  try {
-    return fs.existsSync(CONFIG_FILE) ? JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8')) : {};
-  } catch (err) {
-    debugCli('Failed to read config: %s', err.message);
-    return {};
-  }
-}
-
-export function writeConfig(config) {
-  try {
-    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}`);
-    throw err;
-  }
-}
-
-export function clearConfig() {
-  try {
-    if (fs.existsSync(CONFIG_FILE)) fs.unlinkSync(CONFIG_FILE);
-    return true;
-  } catch (err) {
-    debugCli('Failed to clear config: %s', err.message);
-    return false;
-  }
-}
-
-export function updateConfig(partial) {
-  const updated = { ...readConfig(), ...partial };
-  writeConfig(updated);
-  return updated;
-}
-
-export function isLoggedIn() {
-  const { token, server_url } = readConfig();
-  return Boolean(token && server_url);
-}
-
-export function getStoredToken() {
-  return readConfig().token || null;
-}
-
-export function getStoredServerUrl() {
-  return readConfig().server_url || null;
-}
-
-export async function deviceFlowLogin({ server_url, profile_key }) {
-  const baseUrl = String(server_url).replace(/\/+$/, '');
-  console.log(`🔑 Requesting device login from ${baseUrl} ...`);
-
-  let deviceResp;
-  try {
-    const res = await fetch(`${baseUrl}/api/cli/device`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        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');
-  } 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.\nVerify the server URL and that CLI_AUTH_ENABLED=true on the server.`);
-    }
-    throw err;
-  }
-
-  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(`│   🔢 Or enter this code:  ${(user_code || '').padEnd(30)}│`);
-  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((expires_in || 900) / 60)} minutes)...\n`);
-
-  const pollInterval = (interval || 5) * 1000;
-  const deadline = Date.now() + MAX_POLL_TIME_MS;
-  let attempts = 0;
-
-  while (Date.now() < deadline) {
-    await sleep(pollInterval);
-    attempts++;
-
-    try {
-      const pollRes = await fetch(`${baseUrl}/api/cli/device/token`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        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: ${token_prefix}...`);
-        return {
-          token: pollBody.token,
-          token_prefix: token_prefix,
-          username: pollBody.username,
-          profile: profile || null,
-        };
-      }
-
-      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 (attempts % 5 === 0) process.stdout.write('.');
-    } catch (err) {
-      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.');
-}
+/**
+ * CLI Authentication Helper
+ * Handles mbkauthe device-flow login for the mbkbucket CLI.
+ * Stores credentials in ~/.mbkbucket/config.json
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+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 MAX_POLL_TIME_MS = 15 * 60 * 1000; // 15 minutes
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+export function readConfig() {
+  try {
+    return fs.existsSync(CONFIG_FILE) ? JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8')) : {};
+  } catch (err) {
+    debugCli('Failed to read config: %s', err.message);
+    return {};
+  }
+}
+
+export function writeConfig(config) {
+  try {
+    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}`);
+    throw err;
+  }
+}
+
+export function clearConfig() {
+  try {
+    if (fs.existsSync(CONFIG_FILE)) fs.unlinkSync(CONFIG_FILE);
+    return true;
+  } catch (err) {
+    debugCli('Failed to clear config: %s', err.message);
+    return false;
+  }
+}
+
+export function updateConfig(partial) {
+  const updated = { ...readConfig(), ...partial };
+  writeConfig(updated);
+  return updated;
+}
+
+export function isLoggedIn() {
+  const { token, server_url } = readConfig();
+  return Boolean(token && server_url);
+}
+
+export const getStoredToken = () => readConfig().token || null;
+export const getStoredServerUrl = () => readConfig().server_url || null;
+
+export async function deviceFlowLogin({ server_url, profile_key }) {
+  const baseUrl = String(server_url).replace(/\/+$/, '');
+  console.log(`🔑 Requesting device login from ${baseUrl} ...`);
+
+  let deviceResp;
+  try {
+    const res = await fetch(`${baseUrl}/api/cli/device`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        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');
+  } 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.\nVerify the server URL and that CLI_AUTH_ENABLED=true on the server.`);
+    }
+    throw err;
+  }
+
+  const { verification_url = '', user_code = '', device_code, expires_in = 900, interval = 5, profile } = deviceResp;
+
+  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(`│   🔢 Or enter this code:  ${user_code.padEnd(30)}│`);
+  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(expires_in / 60)} minutes)...\n`);
+
+  const pollInterval = interval * 1000;
+  const deadline = Date.now() + MAX_POLL_TIME_MS;
+  let attempts = 0;
+
+  while (Date.now() < deadline) {
+    await sleep(pollInterval);
+    attempts++;
+
+    try {
+      const pollRes = await fetch(`${baseUrl}/api/cli/device/token`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        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: ${token_prefix}...`);
+        return {
+          token: pollBody.token,
+          token_prefix,
+          username: pollBody.username,
+          profile: profile || null,
+        };
+      }
+
+      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 (attempts % 5 === 0) process.stdout.write('.');
+    } catch (err) {
+      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.');
+}
+