clawfire 0.4.3 → 0.4.4

package/dist/dev.js

@@ -1457,38 +1457,89 @@ async function checkCli(projectDir) {
   return result;
 }
 async function fetchFirebaseSdkConfig(projectDir) {
-  const output = await execWithTimeout(
-    "firebase",
-    ["apps:sdkconfig", "web", "--json"],
-    projectDir,
-    15e3
-  );
-  const data = JSON.parse(output);
-  if (data?.result?.sdkConfig) {
-    return data.result.sdkConfig;
-  }
-  if (data?.result?.fileContents) {
-    const contents = data.result.fileContents;
-    const config = {};
-    const extract = (key) => {
-      const match = contents.match(new RegExp(`"${key}"\\s*:\\s*"([^"]+)"`));
-      return match ? match[1] : void 0;
-    };
-    config.apiKey = extract("apiKey");
-    config.authDomain = extract("authDomain");
-    config.projectId = extract("projectId");
-    config.storageBucket = extract("storageBucket");
-    config.messagingSenderId = extract("messagingSenderId");
-    config.appId = extract("appId");
-    return config;
+  try {
+    const output = await execWithTimeout(
+      "firebase",
+      ["apps:sdkconfig", "web", "--json"],
+      projectDir,
+      15e3
+    );
+    const config = parseSdkConfigOutput(output);
+    if (config) return config;
+  } catch {
+  }
+  let webApps = [];
+  try {
+    const appsOutput = await execWithTimeout(
+      "firebase",
+      ["apps:list", "--json"],
+      projectDir,
+      15e3
+    );
+    const appsData = JSON.parse(appsOutput);
+    const allApps = appsData?.result || [];
+    webApps = allApps.filter((a) => a.platform === "WEB").map((a) => ({
+      appId: String(a.appId || ""),
+      displayName: String(a.displayName || "")
+    })).filter((a) => a.appId);
+  } catch {
+    throw new Error(
+      "Failed to fetch Firebase SDK config. Make sure you are logged in and have an active project selected."
+    );
+  }
+  if (webApps.length === 0) {
+    throw new Error(
+      "No web app registered in this Firebase project. Go to Firebase Console > Project Settings > General > Your apps > Add app (Web) to create one, then click Auto-fill again."
+    );
+  }
+  const appId = webApps[0].appId;
+  try {
+    const output = await execWithTimeout(
+      "firebase",
+      ["apps:sdkconfig", "web", appId, "--json"],
+      projectDir,
+      15e3
+    );
+    const config = parseSdkConfigOutput(output);
+    if (config) return config;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : "Unknown error";
+    throw new Error(`Failed to fetch config for web app ${appId}: ${msg}`);
   }
   throw new Error("Could not parse Firebase SDK config from CLI output");
 }
+function parseSdkConfigOutput(output) {
+  try {
+    const data = JSON.parse(output);
+    if (data?.result?.sdkConfig) {
+      return data.result.sdkConfig;
+    }
+    if (data?.result?.fileContents) {
+      const contents = data.result.fileContents;
+      const config = {};
+      const extract = (key) => {
+        const match = contents.match(new RegExp(`"${key}"\\s*:\\s*"([^"]+)"`));
+        return match ? match[1] : void 0;
+      };
+      config.apiKey = extract("apiKey");
+      config.authDomain = extract("authDomain");
+      config.projectId = extract("projectId");
+      config.storageBucket = extract("storageBucket");
+      config.messagingSenderId = extract("messagingSenderId");
+      config.appId = extract("appId");
+      if (config.apiKey || config.projectId) return config;
+    }
+  } catch {
+  }
+  return null;
+}
 function execWithTimeout(command, args, cwd, timeoutMs) {
   return new Promise((resolve7, reject) => {
-    const proc = execFile(command, args, { cwd, timeout: timeoutMs }, (err, stdout) => {
+    const proc = execFile(command, args, { cwd, timeout: timeoutMs }, (err, stdout, stderr) => {
       if (err) {
-        reject(err);
+        const detail = stderr?.trim() || stdout?.trim() || "";
+        const enriched = new Error(`${err.message}${detail ? "\n" + detail : ""}`);
+        reject(enriched);
       } else {
         resolve7(stdout);
       }
@@ -2237,7 +2288,12 @@ function generateDashboardHtml(options) {
     if (wizStatus) wizStatus.style.display = 'none';
 
     fetch(API + '/__dev/firebase-sdk-config')
-    .then(function(r) { return r.json(); })
+    .then(function(r) {
+      if (!r.ok) {
+        return r.json().catch(function() { return { error: 'Server error (' + r.status + ')' }; });
+      }
+      return r.json();
+    })
     .then(function(data) {
       if (data.error) {
         showAutoFillResult(false, data.error);