clawfire 0.6.13 → 0.6.15

package/dist/dev.js

@@ -1830,6 +1830,24 @@ function generateDashboardHtml(options) {
             <div style="font-size:11px;color:#a3a3a3;margin-bottom:4px;">Live URL</div>
             <a id="deploy-hosting-link" href="#" target="_blank" style="color:#22c55e;font-family:monospace;font-size:14px;text-decoration:none;word-break:break-all;"></a>
           </div>
+          <div id="deploy-billing-note" style="display:none;margin-top:10px;padding:14px;border-radius:8px;background:#1a1400;border:1px solid #f59e0b;">
+            <div style="display:flex;align-items:center;gap:6px;margin-bottom:8px;">
+              <span style="font-size:16px;">&#9888;&#65039;</span>
+              <span style="font-weight:700;color:#fbbf24;font-size:14px;">Blaze Plan Required for API</span>
+            </div>
+            <div style="font-size:13px;color:#d4d4d4;line-height:1.6;">
+              <div style="margin-bottom:6px;"><strong style="color:#fbbf24;">Current Plan:</strong> <span style="color:#ef4444;">Spark (Free)</span></div>
+              <div style="margin-bottom:6px;"><strong style="color:#fbbf24;">Required Plan:</strong> <span style="color:#22c55e;">Blaze (Pay-as-you-go)</span></div>
+              <div style="margin-bottom:10px;color:#a3a3a3;font-size:12px;">
+                Static pages (HTML/CSS/JS) are deployed and live.<br>
+                API routes (<code style="background:#2a2a2a;padding:2px 6px;border-radius:3px;color:#f97316;">/api/*</code>) require Cloud Functions, which need the Blaze plan.<br>
+                Blaze plan has a generous free tier \u2014 you only pay for usage beyond free limits.
+              </div>
+              <a id="deploy-upgrade-link" href="#" target="_blank" style="display:inline-block;padding:8px 16px;background:#f59e0b;color:#000;border-radius:6px;font-size:13px;font-weight:700;text-decoration:none;">
+                Upgrade to Blaze Plan &#8594;
+              </a>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -2710,11 +2728,13 @@ function generateDashboardHtml(options) {
     var btn = document.getElementById('deploy-hosting-btn');
     var status = document.getElementById('deploy-hosting-status');
     var urlBox = document.getElementById('deploy-hosting-url');
+    var billingNote = document.getElementById('deploy-billing-note');
     btn.disabled = true;
     btn.textContent = 'Deploying...';
-    status.textContent = 'Deploying to Firebase Hosting... This may take up to 2 minutes.';
+    status.textContent = 'Deploying to Firebase Hosting... This may take up to 3 minutes.';
     status.style.cssText = 'display:block;margin-top:10px;font-size:13px;padding:10px 14px;border-radius:6px;background:#0a0a1a;border:1px solid #3b82f6;color:#3b82f6;';
     urlBox.style.display = 'none';
+    billingNote.style.display = 'none';
 
     fetch(API + '/__dev/deploy/hosting', { method: 'POST' })
     .then(function(r) { return r.json(); })
@@ -2728,9 +2748,21 @@ function generateDashboardHtml(options) {
           link.textContent = data.url;
           urlBox.style.display = 'block';
         }
+        // Show Blaze plan notice when functions deploy failed
+        if (data.blazeRequired) {
+          billingNote.style.display = 'block';
+          if (data.upgradeUrl) {
+            document.getElementById('deploy-upgrade-link').href = data.upgradeUrl;
+          }
+        }
       } else {
         status.textContent = data.message;
         status.style.cssText = 'display:block;margin-top:10px;font-size:13px;padding:10px 14px;border-radius:6px;background:#1c0808;border:1px solid #ef4444;color:#ef4444;';
+        // Also check if error is billing-related
+        var errMsg = (data.message || '').toLowerCase();
+        if (errMsg.indexOf('blaze') >= 0 || errMsg.indexOf('pay-as-you-go') >= 0 || errMsg.indexOf('upgrade') >= 0 || errMsg.indexOf('artifactregistry') >= 0) {
+          billingNote.style.display = 'block';
+        }
       }
       btn.disabled = false;
       btn.textContent = 'Deploy Hosting';
@@ -3761,7 +3793,8 @@ https://console.developers.google.com/apis/api/firestore.googleapis.com/overview
     return new Promise((resolve7, reject) => {
       const proc = execFile2(command, args, { cwd: cwd || this.projectDir, timeout: timeoutMs }, (err, stdout, stderr) => {
         if (err) {
-          const detail = stderr?.trim() || stdout?.trim() || "";
+          const parts = [stderr?.trim(), stdout?.trim()].filter(Boolean);
+          const detail = parts.join("\n");
           const enriched = new Error(`${err.message}${detail ? "\n" + detail : ""}`);
           reject(enriched);
         } else {
@@ -4978,22 +5011,42 @@ ${liveReloadScript}
               steps.push("Functions build failed \u2014 hosting only");
             }
           }
-          let targets = deployFunctions ? "hosting,functions" : "hosting";
-          console.log(`  Deploying ${targets}...`);
-          let result = await this.firebaseSetup.deployHosting(targets);
-          if (!result.success && deployFunctions) {
-            const msg = result.message.toLowerCase();
-            if (msg.includes("blaze") || msg.includes("pay-as-you-go") || msg.includes("upgrade") || msg.includes("billing") || msg.includes("artifactregistry")) {
-              console.log("  \x1B[33m\u26A0\x1B[0m Functions require Blaze plan. Deploying hosting only...");
-              steps.push("Functions skipped (requires Blaze plan)");
-              targets = "hosting";
-              result = await this.firebaseSetup.deployHosting(targets);
+          console.log("  Deploying hosting...");
+          const hostingResult = await this.firebaseSetup.deployHosting("hosting");
+          if (!hostingResult.success) {
+            clearFirebaseStatusCache();
+            sendJson({
+              ...hostingResult,
+              message: hostingResult.message + (steps.length > 0 ? ` (${steps.join(", ")})` : "")
+            });
+            return;
+          }
+          steps.push("Hosting deployed");
+          let blazeRequired = false;
+          if (deployFunctions) {
+            console.log("  Deploying functions...");
+            const funcResult = await this.firebaseSetup.deployHosting("functions");
+            if (funcResult.success) {
+              console.log("  \x1B[32m\u2713\x1B[0m Functions deployed");
+              steps.push("Functions deployed");
+            } else {
+              blazeRequired = true;
+              console.log("  \x1B[33m\u26A0\x1B[0m Functions deploy failed (Blaze plan likely required)");
+              steps.push("Functions skipped (Blaze plan required)");
             }
           }
           clearFirebaseStatusCache();
+          const state = this.firebaseSetup.loadState();
+          const projectId = state.projectId || firebaseConfig.projectId || "";
+          const upgradeUrl = projectId ? `https://console.firebase.google.com/project/${projectId}/usage/details` : "https://console.firebase.google.com";
+          const stepsStr = steps.length > 0 ? ` (${steps.join(", ")})` : "";
           sendJson({
-            ...result,
-            message: result.message + (steps.length > 0 ? ` (${steps.join(", ")})` : "")
+            success: true,
+            url: hostingResult.url,
+            blazeRequired,
+            upgradeUrl: blazeRequired ? upgradeUrl : void 0,
+            message: `Hosting deployed successfully!${stepsStr}`,
+            billingNote: blazeRequired ? `Static pages are live! But API routes (/api/*) need Cloud Functions, which require the Blaze (pay-as-you-go) plan. Upgrade: ${upgradeUrl}` : void 0
           });
         } catch (err) {
           sendJson({ success: false, message: err instanceof Error ? err.message : "Failed" }, 500);