clawfire 0.6.5 → 0.6.6

package/dist/dev.js

@@ -2230,8 +2230,9 @@ function generateDashboardHtml(options) {
     }
 
     btn.disabled = true;
-    btn.textContent = 'Setting...';
-    status.style.display = 'none';
+    btn.textContent = 'Setting up...';
+    status.textContent = 'Selecting project, detecting web app, auto-filling config...';
+    status.style.cssText = 'display:block;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;background:#0a0a1c;border:1px solid #3b82f6;color:#93c5fd;';
 
     fetch(API + '/__dev/setup/select-project', {
       method: 'POST',
@@ -2241,8 +2242,11 @@ function generateDashboardHtml(options) {
     .then(function(r) { return r.json(); })
     .then(function(data) {
       if (data.success) {
-        status.textContent = data.message;
-        status.style.cssText = 'display:block;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;background:#0a1a0a;border:1px solid #22c55e;color:#22c55e;';
+        var msg = data.steps ? data.steps.join('\\n') : data.message;
+        status.textContent = msg;
+        status.style.whiteSpace = 'pre-line';
+        status.style.cssText = 'display:block;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;background:#0a1a0a;border:1px solid #22c55e;color:#22c55e;white-space:pre-line;';
+        btn.textContent = 'Done';
         setTimeout(refreshSetupStatus, 1000);
       } else {
         status.textContent = data.message;
@@ -3493,41 +3497,48 @@ https://console.developers.google.com/apis/api/firestore.googleapis.com/overview
    * Handles "ALREADY_EXISTS" gracefully — returns success.
    */
   async createFirestoreDatabase(location = "nam5") {
-    try {
-      await this.execTimeout(
-        "firebase",
-        ["firestore:databases:create", "(default)", "--location", location, "--json"],
-        6e4
-      );
-      return { success: true, message: `Firestore database created (location: ${location}).` };
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : "Unknown error";
-      if (msg.includes("ALREADY_EXISTS") || msg.includes("already exists")) {
-        return { success: true, message: "Firestore database already exists." };
-      }
-      if (msg.includes("403") || msg.includes("has not been used") || msg.includes("is disabled")) {
-        const enableResult = await this.enableFirestoreApi();
-        if (!enableResult.success) {
-          return enableResult;
+    const dbArgs = ["firestore:databases:create", "(default)", "--location", location, "--json"];
+    const tryCreate = async () => {
+      try {
+        await this.execTimeout("firebase", dbArgs, 6e4);
+        return { ok: true, alreadyExists: false, needsApi: false, msg: "" };
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : "Unknown error";
+        if (msg.includes("ALREADY_EXISTS") || msg.includes("already exists")) {
+          return { ok: true, alreadyExists: true, needsApi: false, msg };
         }
-        await new Promise((r) => setTimeout(r, 5e3));
-        try {
-          await this.execTimeout(
-            "firebase",
-            ["firestore:databases:create", "(default)", "--location", location, "--json"],
-            6e4
-          );
-          return { success: true, message: `Firestore API enabled and database created (location: ${location}).` };
-        } catch (retryErr) {
-          const retryMsg = retryErr instanceof Error ? retryErr.message : "Unknown error";
-          if (retryMsg.includes("ALREADY_EXISTS") || retryMsg.includes("already exists")) {
-            return { success: true, message: "Firestore database already exists." };
-          }
-          return { success: false, message: `Failed to create Firestore database after enabling API: ${retryMsg}` };
+        if (msg.includes("403") || msg.includes("has not been used") || msg.includes("is disabled")) {
+          return { ok: false, alreadyExists: false, needsApi: true, msg };
         }
+        return { ok: false, alreadyExists: false, needsApi: false, msg };
+      }
+    };
+    const first = await tryCreate();
+    if (first.ok) {
+      return { success: true, message: first.alreadyExists ? "Firestore database already exists." : `Firestore database created (location: ${location}).` };
+    }
+    if (!first.needsApi) {
+      return { success: false, message: `Failed to create Firestore database: ${first.msg}` };
+    }
+    const enableResult = await this.enableFirestoreApi();
+    if (!enableResult.success) {
+      return enableResult;
+    }
+    const waits = [5e3, 5e3, 1e4, 1e4, 15e3];
+    for (let i = 0; i < waits.length; i++) {
+      await new Promise((r) => setTimeout(r, waits[i]));
+      const retry = await tryCreate();
+      if (retry.ok) {
+        return { success: true, message: `Firestore API enabled and database created (location: ${location}).` };
+      }
+      if (!retry.needsApi) {
+        return { success: false, message: `Failed to create Firestore database: ${retry.msg}` };
       }
-      return { success: false, message: `Failed to create Firestore database: ${msg}` };
     }
+    return {
+      success: false,
+      message: "Firestore API was enabled but database creation timed out waiting for propagation. Please wait a minute and try again."
+    };
   }
   /**
    * Deploy open Firestore security rules for dev testing.
@@ -4547,10 +4558,57 @@ ${liveReloadScript}
             sendJson({ success: false, message: "projectId is required" }, 400);
             return;
           }
-          this.firebaseSetup.selectProject(data.projectId).then((result) => {
+          (async () => {
+            const selectResult = await this.firebaseSetup.selectProject(data.projectId);
+            if (!selectResult.success) {
+              sendJson(selectResult);
+              return;
+            }
+            const steps = [selectResult.message];
+            try {
+              const { apps } = await this.firebaseSetup.listWebApps();
+              let webAppId = "";
+              if (apps.length > 0) {
+                webAppId = apps[0].appId;
+                this.firebaseSetup.selectWebApp(apps[0].appId, apps[0].displayName);
+                steps.push(`Web app "${apps[0].displayName}" selected.`);
+              } else {
+                const createResult = await this.firebaseSetup.createWebApp(data.projectId);
+                if (createResult.success && createResult.appId) {
+                  webAppId = createResult.appId;
+                  steps.push(`Web app "${data.projectId}" created.`);
+                } else {
+                  steps.push(`Web app creation skipped: ${createResult.message}`);
+                }
+              }
+              if (webAppId) {
+                try {
+                  const sdkConfig = await fetchFirebaseSdkConfig(this.options.projectDir, webAppId);
+                  const fields = {};
+                  for (const [key, value] of Object.entries(sdkConfig)) {
+                    if (value && typeof value === "string") {
+                      fields[key] = value;
+                    }
+                  }
+                  if (Object.keys(fields).length > 0) {
+                    for (const [key, value] of Object.entries(fields)) {
+                      try {
+                        this.updateProjectConfig(key, value);
+                      } catch {
+                      }
+                    }
+                    steps.push("Config auto-filled in clawfire.config.ts.");
+                  }
+                } catch (configErr) {
+                  steps.push(`Config auto-fill skipped: ${configErr instanceof Error ? configErr.message : "unknown error"}`);
+                }
+              }
+            } catch (autoFillErr) {
+              steps.push(`Auto-setup partial: ${autoFillErr instanceof Error ? autoFillErr.message : "unknown error"}`);
+            }
             clearFirebaseStatusCache();
-            sendJson(result);
-          }).catch((err) => sendJson({ success: false, message: err instanceof Error ? err.message : "Failed" }, 500));
+            sendJson({ success: true, message: steps.join(" "), steps });
+          })().catch((err) => sendJson({ success: false, message: err instanceof Error ? err.message : "Failed" }, 500));
         } catch {
           sendJson({ success: false, message: "Invalid JSON body" }, 400);
         }