clawfire 0.6.17 → 0.6.19

package/dist/dev.js

@@ -3056,7 +3056,7 @@ function generateDashboardHtml(options) {
 
 // src/dev/firebase-setup.ts
 import { execFile as execFile2, spawn } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3, rmSync } from "fs";
 import { resolve as resolve5, join as join4 } from "path";
 import { tmpdir, platform, homedir } from "os";
 var FirebaseSetup = class {
@@ -3389,40 +3389,41 @@ var FirebaseSetup = class {
       return { success: false, message: "Invalid firebase.json." };
     }
     const timeoutMs = targets.includes("functions") ? 3e5 : 12e4;
+    const args = ["deploy", "--only", targets, "--json"];
+    if (targets.includes("functions")) args.push("--force");
     try {
-      const output = await this.execTimeout(
-        "firebase",
-        ["deploy", "--only", targets, "--json"],
-        timeoutMs
-      );
-      let url = "";
-      try {
-        const data = JSON.parse(output);
-        if (data?.result) {
-          for (const key of Object.keys(data.result)) {
-            if (key.startsWith("hosting") && typeof data.result[key] === "object") {
-              url = data.result[key]?.url || data.result[key]?.site?.url || "";
-              if (url) break;
-            }
-          }
-        }
-      } catch {
-        const urlMatch = output.match(/https:\/\/[a-z0-9-]+\.web\.app/i);
-        if (urlMatch) url = urlMatch[0];
-      }
-      if (!url) {
-        const state = this.loadState();
-        if (state.projectId) {
-          url = `https://${state.projectId}.web.app`;
-        }
-      }
-      const label = targets.includes("functions") ? "Hosting + Functions" : "Hosting";
-      return { success: true, url: url || void 0, message: `${label} deployed successfully!` };
+      const output = await this.execTimeout("firebase", args, timeoutMs);
+      return { success: true, url: this.extractDeployUrl(output), message: `${targets.includes("functions") ? "Functions" : "Hosting"} deployed successfully!` };
     } catch (err) {
       const msg = err instanceof Error ? err.message : "Unknown error";
+      if (msg.includes("successfully deployed") || msg.includes("Successful create operation") || msg.includes("Successful update operation")) {
+        return { success: true, url: this.extractDeployUrl(msg), message: `${targets.includes("functions") ? "Functions" : "Hosting"} deployed successfully!` };
+      }
       return { success: false, message: `Deploy failed: ${msg}` };
     }
   }
+  /** Extract hosting URL from deploy output */
+  extractDeployUrl(output) {
+    try {
+      const data = JSON.parse(output);
+      if (data?.result) {
+        for (const key of Object.keys(data.result)) {
+          if (key.startsWith("hosting") && typeof data.result[key] === "object") {
+            const url = data.result[key]?.url || data.result[key]?.site?.url || "";
+            if (url) return url;
+          }
+        }
+      }
+    } catch {
+      const urlMatch = output.match(/https:\/\/[a-z0-9-]+\.web\.app/i);
+      if (urlMatch) return urlMatch[0];
+    }
+    const state = this.loadState();
+    if (state.projectId) {
+      return `https://${state.projectId}.web.app`;
+    }
+    return void 0;
+  }
   // ─── Full Deploy Pipeline ────────────────────────────────────────────
   /**
    * Sync environment variables to functions/.env for production.
@@ -3533,6 +3534,14 @@ var FirebaseSetup = class {
       return { success: false, message: "functions/package.json not found." };
     }
     this.ensureFunctionsCJS(functionsDir);
+    const distDir = resolve5(functionsDir, "dist");
+    if (existsSync6(distDir)) {
+      try {
+        rmSync(distDir, { recursive: true, force: true });
+        console.log("  \x1B[32m\u2713\x1B[0m Cleaned functions/dist/");
+      } catch {
+      }
+    }
     try {
       await this.execTimeout("npm", ["install"], 12e4, functionsDir);
     } catch (err) {
@@ -3549,11 +3558,41 @@ var FirebaseSetup = class {
           await this.execTimeout("npx", ["tsc"], 6e4, functionsDir);
         }
       }
-      return { success: true, message: "Functions built successfully." };
     } catch (err) {
       const msg = err instanceof Error ? err.message : "Unknown error";
       return { success: false, message: `Functions build failed: ${msg}` };
     }
+    const mainEntry = resolve5(functionsDir, "dist/index.js");
+    if (!existsSync6(mainEntry)) {
+      return { success: false, message: "Build produced no output (dist/index.js not found)." };
+    }
+    try {
+      const firstLine = readFileSync4(mainEntry, "utf-8").split("\n")[0];
+      const isESM = firstLine.startsWith("import ") || firstLine.startsWith("export ");
+      if (isESM) {
+        console.log("  \x1B[33m\u26A0\x1B[0m Warning: dist/index.js appears to be ESM, not CJS");
+      } else {
+        console.log("  \x1B[32m\u2713\x1B[0m Build output verified (CJS)");
+      }
+    } catch {
+    }
+    try {
+      const verifyScript = [
+        'process.env.FIREBASE_CONFIG=JSON.stringify({projectId:"verify"});',
+        'process.env.GCLOUD_PROJECT="verify";',
+        'try{require("./dist/index.js");console.log("OK")}',
+        'catch(e){console.error("LOAD_ERROR:"+e.message);process.exit(1)}'
+      ].join("");
+      await this.execTimeout("node", ["-e", verifyScript], 15e3, functionsDir);
+      console.log("  \x1B[32m\u2713\x1B[0m Module load verification passed");
+    } catch (verifyErr) {
+      const msg = verifyErr instanceof Error ? verifyErr.message : "Unknown";
+      const match = msg.match(/LOAD_ERROR:(.+?)(\n|$)/);
+      const detail = match ? match[1].trim() : msg.substring(0, 300);
+      console.log(`  \x1B[31m\u2717\x1B[0m Module load failed: ${detail}`);
+      return { success: false, message: `Functions built but failed to load: ${detail}` };
+    }
+    return { success: true, message: "Functions built successfully." };
   }
   /**
    * Ensure functions/ uses CommonJS for Firebase Functions compatibility.