mbkbucket 3.5.0 → 3.6.0

package/lib/src/config/index.js

@@ -1,112 +1,112 @@
-/**
- * MBKBucket
- * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
- * Licensed under the MIT License.
- * Source: https://github.com/MIbnEKhalid/mbkbucket
- */
-
-import { createRequire } from "module";
-import dotenv from "dotenv";
-import { parseAndValidateMbkbucketVar, parseAndValidateBucketConnection } from "./validation.js";
-import { createLogger } from "#logger";
-
-dotenv.config();
-const debugConfig = createLogger('config');
-const require = createRequire(import.meta.url);
-
-// Load mbkbucket package.json
-let packageJson;
-try {
-  packageJson = require("mbkbucket/package.json");
-} catch {
-  packageJson = require("../../../package.json");
-}
-
-// Parent project version
-let appVersion = "unknown";
-try {
-  appVersion = require("../../../../package.json")?.version ?? require(`${process.cwd()}/package.json`)?.version ?? "unknown";
-} catch {
-  try {
-    appVersion = require(`${process.cwd()}/package.json`)?.version ?? "unknown";
-  } catch {}
-}
-
-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 < len; i++) {
-    const diff = (left[i] || 0) - (right[i] || 0);
-    if (diff !== 0) return diff;
-  }
-  return 0;
-}
-
-export async function getLatestVersion() {
-  try {
-    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 data = await res.json();
-    return data.version;
-  } catch (err) {
-    debugConfig('Error fetching latest version from GitHub: %s', err.message);
-    return null;
-  }
-}
-
-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);
-  }
-}
-
-export function validateConfiguration() {
-  try {
-    return parseAndValidateMbkbucketVar(process.env.mbkbucketVar);
-  } catch (err) {
-    throw new Error(`[mbkbucket] Configuration Validation Failed:\n  - ${err.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}`);
-  }
-}
-
-export function validateAllConfiguration() {
-  try {
-    validateConfiguration();
-    validateBucketConnection();
-    return true;
-  } catch (err) {
-    console.error(err.message);
-    return false;
-  }
-}
-
-export const mbkbucketVar = validateConfiguration();
-
-export { packageJson, appVersion };
+/**
+ * MBKBucket
+ * Copyright (c) 2026 Muhammad Bin Khalid, MBKTech.org and contributors
+ * Licensed under the MIT License.
+ * Source: https://github.com/MIbnEKhalid/mbkbucket
+ */
+
+import { createRequire } from "module";
+import dotenv from "dotenv";
+import { parseAndValidateMbkbucketVar, parseAndValidateBucketConnection } from "./validation.js";
+import { createLogger } from "#logger";
+
+dotenv.config();
+const debugConfig = createLogger('config');
+const require = createRequire(import.meta.url);
+
+// Load mbkbucket package.json
+let packageJson;
+try {
+  packageJson = require("mbkbucket/package.json");
+} catch {
+  packageJson = require("../../../package.json");
+}
+
+// Parent project version
+let appVersion = "unknown";
+try {
+  appVersion = require("../../../../package.json")?.version ?? require(`${process.cwd()}/package.json`)?.version ?? "unknown";
+} catch {
+  try {
+    appVersion = require(`${process.cwd()}/package.json`)?.version ?? "unknown";
+  } catch {}
+}
+
+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 < len; i++) {
+    const diff = (left[i] || 0) - (right[i] || 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
+
+export async function getLatestVersion() {
+  try {
+    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 data = await res.json();
+    return data.version;
+  } catch (err) {
+    debugConfig('Error fetching latest version from GitHub: %s', err.message);
+    return null;
+  }
+}
+
+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);
+  }
+}
+
+export function validateConfiguration() {
+  try {
+    return parseAndValidateMbkbucketVar(process.env.mbkbucketVar);
+  } catch (err) {
+    throw new Error(`[mbkbucket] Configuration Validation Failed:\n  - ${err.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}`);
+  }
+}
+
+export function validateAllConfiguration() {
+  try {
+    validateConfiguration();
+    validateBucketConnection();
+    return true;
+  } catch (err) {
+    console.error(err.message);
+    return false;
+  }
+}
+
+export const mbkbucketVar = validateConfiguration();
+
+export { packageJson, appVersion };

package/lib/src/config/validation.js

@@ -1,73 +1,73 @@
-const TRUE_VALUES = new Set(['true', 't', '1', 'yes', 'y', 'on']);
-const FALSE_VALUES = new Set(['false', 'f', '0', 'no', 'n', 'off']);
-
-export function normalizeBooleanLike(value) {
-  if (typeof value === 'boolean') return value;
-  if (typeof value === 'string') {
-    const norm = value.trim().toLowerCase();
-    if (TRUE_VALUES.has(norm)) return true;
-    if (FALSE_VALUES.has(norm)) return false;
-  }
-  return value;
-}
-
-export function parseAndValidateMbkbucketVar(rawValue) {
-  let parsed;
-  try {
-    parsed = rawValue ? JSON.parse(rawValue) : {};
-  } catch {
-    throw new Error('Invalid JSON in process.env.mbkbucketVar');
-  }
-
-  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-    throw new Error('mbkbucketVar must be a valid object');
-  }
-
-  const defaults = { p_view_inline: true, publiView_enabled: false };
-  for (const [key, defaultVal] of Object.entries(defaults)) {
-    const val = parsed[key];
-    if (val === undefined || (typeof val === 'string' && val.trim() === '')) {
-      parsed[key] = defaultVal;
-    }
-  }
-
-  parsed.p_view_inline = normalizeBooleanLike(parsed.p_view_inline);
-  parsed.publiView_enabled = normalizeBooleanLike(parsed.publiView_enabled);
-
-  const errors = [];
-  if (typeof parsed.p_view_inline !== 'boolean') errors.push('mbkbucketVar.p_view_inline must be a boolean if provided');
-  if (typeof parsed.publiView_enabled !== 'boolean') errors.push('mbkbucketVar.publiView_enabled must be a boolean if provided');
-  if (errors.length) throw new Error(errors.join(' | '));
-
-  return parsed;
-}
-
-export function parseAndValidateBucketConnection(rawValue) {
-  if (!rawValue) return null;
-
-  let parsed;
-  try {
-    parsed = JSON.parse(rawValue);
-  } catch {
-    throw new Error('BucketConnection is not valid JSON');
-  }
-
-  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed) || !Object.keys(parsed).length) {
-    throw new Error('BucketConnection must be a non-empty object');
-  }
-
-  const requiredFields = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
-
-  for (const [bucketName, config] of Object.entries(parsed)) {
-    if (!config || typeof config !== 'object' || Array.isArray(config)) {
-      throw new Error(`Bucket '${bucketName}' configuration must be an object, not a string. Remove quotes around the inner JSON object.`);
-    }
-
-    const missingFields = requiredFields.filter(field => !config[field]);
-    if (missingFields.length) {
-      throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
-    }
-  }
-
-  return parsed;
-}
+const TRUE_VALUES = new Set(['true', 't', '1', 'yes', 'y', 'on']);
+const FALSE_VALUES = new Set(['false', 'f', '0', 'no', 'n', 'off']);
+
+export function normalizeBooleanLike(value) {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'string') {
+    const norm = value.trim().toLowerCase();
+    if (TRUE_VALUES.has(norm)) return true;
+    if (FALSE_VALUES.has(norm)) return false;
+  }
+  return value;
+}
+
+export function parseAndValidateMbkbucketVar(rawValue) {
+  let parsed;
+  try {
+    parsed = rawValue ? JSON.parse(rawValue) : {};
+  } catch {
+    throw new Error('Invalid JSON in process.env.mbkbucketVar');
+  }
+
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new Error('mbkbucketVar must be a valid object');
+  }
+
+  const defaults = { p_view_inline: true, publiView_enabled: false };
+  for (const [key, defaultVal] of Object.entries(defaults)) {
+    const val = parsed[key];
+    if (val === undefined || (typeof val === 'string' && val.trim() === '')) {
+      parsed[key] = defaultVal;
+    }
+  }
+
+  parsed.p_view_inline = normalizeBooleanLike(parsed.p_view_inline);
+  parsed.publiView_enabled = normalizeBooleanLike(parsed.publiView_enabled);
+
+  const errors = [];
+  if (typeof parsed.p_view_inline !== 'boolean') errors.push('mbkbucketVar.p_view_inline must be a boolean if provided');
+  if (typeof parsed.publiView_enabled !== 'boolean') errors.push('mbkbucketVar.publiView_enabled must be a boolean if provided');
+  if (errors.length) throw new Error(errors.join(' | '));
+
+  return parsed;
+}
+
+export function parseAndValidateBucketConnection(rawValue) {
+  if (!rawValue) return null;
+
+  let parsed;
+  try {
+    parsed = JSON.parse(rawValue);
+  } catch {
+    throw new Error('BucketConnection is not valid JSON');
+  }
+
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed) || !Object.keys(parsed).length) {
+    throw new Error('BucketConnection must be a non-empty object');
+  }
+
+  const requiredFields = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
+
+  for (const [bucketName, config] of Object.entries(parsed)) {
+    if (!config || typeof config !== 'object' || Array.isArray(config)) {
+      throw new Error(`Bucket '${bucketName}' configuration must be an object, not a string. Remove quotes around the inner JSON object.`);
+    }
+
+    const missingFields = requiredFields.filter(field => !config[field]);
+    if (missingFields.length) {
+      throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
+    }
+  }
+
+  return parsed;
+}