mbkbucket 4.0.0 → 4.1.0

package/lib/public/mbkbucket-helper-demo.html

@@ -13,11 +13,6 @@
   <title>Helper Utils Demo — MBKBucket</title>
   <meta name="description" content="Interactive demo of MBKBucket frontend helper utilities: gallery picker, file input, upload widget, multi-select, live preview binding, and API helpers.">
 
-  <!-- Fonts (same as bucket.hbs) -->
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link href="https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=IBM+Plex+Sans:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
-
   <!-- MBKBucket design system + helper styles -->
   <link rel="stylesheet" href="/mbkbucket/bucketadmin.css">
   <link rel="stylesheet" href="/mbkbucket/mbkbucket-helper.css">
@@ -834,14 +829,12 @@ uploader.<span class="fn">clear</span>();</pre>
           <span class="chip">MBKBucket.url.*</span>
           <span class="chip">listFiles</span>
           <span class="chip">uploadFile</span>
-          <span class="chip">getSignedUrl</span>
         </div>
       </div>
 
       <div class="demo-tabs">
         <div class="demo-tab active" data-tab="urls" data-group="api">URL Builders</div>
         <div class="demo-tab" data-tab="list" data-group="api">List Files</div>
-        <div class="demo-tab" data-tab="signed" data-group="api">Signed URL</div>
         <div class="demo-tab" data-tab="code" data-group="api">Code Reference</div>
       </div>
 
@@ -899,30 +892,6 @@ uploader.<span class="fn">clear</span>();</pre>
         </div>
       </div>
 
-      <!-- Signed URL -->
-      <div class="demo-pane" data-pane="api-signed">
-        <div class="form-row">
-          <label class="form-label" for="api-signed-key">File key:</label>
-          <div class="flex-row">
-            <input id="api-signed-key"
-                   class="demo-input"
-                   type="text"
-                   style="max-width:320px"
-                   placeholder="e.g. images/photo.jpg">
-            <button class="btn btn-primary btn-sm" onclick="demoSignedUrl()">Get URL</button>
-          </div>
-          <div class="form-hint">Calls <code class="inline-code">MBKBucket.api.getSignedUrl(key, { expiresIn: 3600 })</code></div>
-        </div>
-
-        <div class="api-result" id="api-signed-result" style="display:none">
-          <div class="api-result-header">
-            <div class="api-dot" id="api-signed-dot"></div>
-            <span id="api-signed-status">—</span>
-          </div>
-          <pre id="api-signed-pre"></pre>
-        </div>
-      </div>
-
       <!-- Code reference -->
       <div class="code-pane" data-pane="api-code">
         <pre class="code-block"><span class="cm">// URL helpers</span>
@@ -1132,33 +1101,6 @@ MBKBucket.toast.<span class="fn">info</span>(<span class="str">'Loading…'</spa
       pre.textContent = JSON.stringify({ error: err.message, status: err.status }, null, 2);
     }
   }
-
-  // ── 4. API: signed URL ───────────────────────────────────────
-  async function demoSignedUrl() {
-    const key = document.getElementById('api-signed-key').value.trim();
-    if (!key) { MBKBucket.toast.warning('Enter a file key first'); return; }
-
-    const result = document.getElementById('api-signed-result');
-    const dot    = document.getElementById('api-signed-dot');
-    const status = document.getElementById('api-signed-status');
-    const pre    = document.getElementById('api-signed-pre');
-
-    result.style.display = '';
-    dot.className = 'api-dot';
-    status.textContent = 'Loading…';
-    pre.textContent = '';
-
-    try {
-      const data = await MBKBucket.api.getSignedUrl(key, { expiresIn: 3600 });
-      dot.className = 'api-dot ok';
-      status.textContent = `200 OK — expires in ${data.expiresIn}s`;
-      pre.textContent = JSON.stringify(data, null, 2);
-    } catch (err) {
-      dot.className = 'api-dot err';
-      status.textContent = `Error: ${err.message}`;
-      pre.textContent = JSON.stringify({ error: err.message }, null, 2);
-    }
-  }
 </script>
 </body>
 </html>

package/lib/public/mbkbucket-helper.js

@@ -330,17 +330,9 @@
       }
       return this.uploadSingle(prefix, file, opts);
     },
-
-    getSignedUrl(key, opts) {
-      opts = opts || {};
-      return apiFetch(buildUrl(`${BASE}/api/signed-url`, {
-        key,
-        bucket: opts.bucket || '',
-        expiresIn: opts.expiresIn || 3600,
-      }));
-    },
   };
 
+
   // ─────────────────────────────────────────────────────────────────────────
   // Gallery Modal (with In-Modal Upload & Multi-Select)
   // ─────────────────────────────────────────────────────────────────────────

package/lib/src/config/validation.js

@@ -1,86 +1,91 @@
-const TRUE_VALUES = new Set(['true', 't', '1', 'yes', 'y', 'on']);
-const FALSE_VALUES = new Set(['false', 'f', '0', 'no', 'n', 'off']);
-const REQUIRED_S3_FIELDS = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
-
-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');
-  }
-
-  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 providerType = String(config.type || config.provider || '').toLowerCase();
-
-    if (providerType === 'gdrive' || providerType === 'google-drive' || providerType === 'googledrive') {
-      const hasOAuth = Boolean(config.client_id && config.client_secret && (config.refresh_token || config.access_token || config.code));
-      const hasServiceAccount = Boolean((config.client_email || config.service_account_email) && (config.private_key || config.service_account_key));
-      const hasAccessTokenOnly = Boolean(config.access_token);
-      const hasServiceAccountKeyObj = Boolean(config.service_account && typeof config.service_account === 'object');
-
-      if (!hasOAuth && !hasServiceAccount && !hasAccessTokenOnly && !hasServiceAccountKeyObj) {
-        throw new Error(`Google Drive connection '${bucketName}' requires OAuth credentials (client_id, client_secret, refresh_token) or Service Account credentials (client_email, private_key).`);
-      }
-    } else {
-      // Default is S3-compatible provider
-      const missingFields = REQUIRED_S3_FIELDS.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']);
+const REQUIRED_S3_FIELDS = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
+
+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');
+  }
+
+  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 providerType = String(config.type || config.provider || '').toLowerCase();
+    const isLocal = providerType === 'local' || providerType === 'fs' || providerType === 'filesystem' || Boolean(config.basePath || config.rootPath || config.directory);
+
+    if (isLocal) {
+      // Local filesystem provider needs no cloud credentials, basePath is optional (defaults to ./mbkbucket_storage)
+      continue;
+    } else if (providerType === 'gdrive' || providerType === 'google-drive' || providerType === 'googledrive') {
+      const hasOAuth = Boolean(config.client_id && config.client_secret && (config.refresh_token || config.access_token || config.code));
+      const hasServiceAccount = Boolean((config.client_email || config.service_account_email) && (config.private_key || config.service_account_key));
+      const hasAccessTokenOnly = Boolean(config.access_token);
+      const hasServiceAccountKeyObj = Boolean(config.service_account && typeof config.service_account === 'object');
+
+      if (!hasOAuth && !hasServiceAccount && !hasAccessTokenOnly && !hasServiceAccountKeyObj) {
+        throw new Error(`Google Drive connection '${bucketName}' requires OAuth credentials (client_id, client_secret, refresh_token) or Service Account credentials (client_email, private_key).`);
+      }
+    } else {
+      // Default is S3-compatible provider
+      const missingFields = REQUIRED_S3_FIELDS.filter(field => !config[field]);
+      if (missingFields.length) {
+        throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
+      }
+    }
+
+  }
+
+  return parsed;
+}