npm - @runfusion/fusion - Versions diffs - 0.70.2 → 0.71.0 - Mend

@runfusion/fusion 0.70.2 → 0.71.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (100) hide show

package/dist/bin.js CHANGED Viewed

@@ -47419,6 +47419,25 @@ function classifyColumnType(pgCol) {
   }
   return "plain";
 }
+function stripNulChars(text2) {
+  return text2.includes("\0") ? text2.replace(NUL_CHAR_RE, "") : text2;
+}
+function deepStripNulChars(value) {
+  if (typeof value === "string") {
+    return stripNulChars(value);
+  }
+  if (Array.isArray(value)) {
+    return value.map(deepStripNulChars);
+  }
+  if (value !== null && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(
+        ([key, entry]) => [stripNulChars(key), deepStripNulChars(entry)]
+      )
+    );
+  }
+  return value;
+}
 function convertValue(value, type, nullJsonbFallback, preserveEmptyJsonbString = false) {
   if (value === null || value === void 0) {
     return type === "jsonb" && nullJsonbFallback !== void 0 ? nullJsonbFallback : null;
@@ -47431,12 +47450,12 @@ function convertValue(value, type, nullJsonbFallback, preserveEmptyJsonbString =
           return nullJsonbFallback ?? (preserveEmptyJsonbString ? JSON.stringify(value) : null);
         }
         try {
-          return JSON.stringify(JSON.parse(trimmed));
+          return JSON.stringify(deepStripNulChars(JSON.parse(trimmed)));
         } catch {
-          return JSON.stringify(value);
+          return JSON.stringify(stripNulChars(value));
         }
       }
-      return JSON.stringify(value);
+      return JSON.stringify(deepStripNulChars(value));
     }
     case "bytea": {
       if (Buffer.isBuffer(value)) {
@@ -47454,7 +47473,7 @@ function convertValue(value, type, nullJsonbFallback, preserveEmptyJsonbString =
     case "identity":
     case "generated":
     default:
-      return value;
+      return typeof value === "string" ? stripNulChars(value) : value;
   }
 }
 function createQuarterProgressReporter(sourceRows, onCopyProgress) {
@@ -47479,7 +47498,7 @@ function tagLegacyCell(value) {
   if (typeof value === "number" || typeof value === "bigint") {
     return { type: "number", value: Object.is(value, -0) ? "-0" : String(value) };
   }
-  return { type: "text", value: String(value) };
+  return { type: "text", value: stripNulChars(String(value)) };
 }
 function canonicalizeLegacyRows(rows, occurrences = /* @__PURE__ */ new Map()) {
   return rows.map((row) => {
@@ -47947,7 +47966,7 @@ async function computeTargetCanonicalRows(db, pgSchema2, table, cols, projectId)
     return canonical;
   }).sort();
 }
-var log4, INSERT_BATCH_SIZE, LEGACY_PRESERVATION_TARGETS, SQLITE_MIGRATION_STATE_TABLE, CENTRAL_SQLITE_MIGRATION_KEY, DryRunRollback;
+var log4, INSERT_BATCH_SIZE, LEGACY_PRESERVATION_TARGETS, SQLITE_MIGRATION_STATE_TABLE, CENTRAL_SQLITE_MIGRATION_KEY, DryRunRollback, NUL_CHAR_RE;
 var init_sqlite_migrator = __esm({
   "../core/src/postgres/sqlite-migrator.ts"() {
     "use strict";
@@ -47972,6 +47991,7 @@ var init_sqlite_migrator = __esm({
         this.name = "DryRunRollback";
       }
     };
+    NUL_CHAR_RE = /\u0000/g;
   }
 });
@@ -59739,6 +59759,10 @@ async function createTaskStoreForBackend(options) {
               */
               onProgress: (event) => {
                 log5.log(`startup-factory: SQLite migration \u2014 ${formatMigrationProgress2(event)}`);
+                try {
+                  options.onMigrationProgress?.(event);
+                } catch {
+                }
               }
             });
             const failedTables = report.tables.filter((table) => !table.skipped && !table.verified);
@@ -382718,6 +382742,137 @@ var init_port_prompt = __esm({
   }
 });
+// src/commands/migration-holding-server.ts
+import { createServer as createServer6 } from "node:http";
+function renderHoldingPage() {
+  return `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Fusion \u2014 starting</title>
+<style>
+  :root { color-scheme: dark; }
+  body {
+    margin: 0; min-height: 100vh; display: flex; align-items: center; justify-content: center;
+    background: #0b0e14; color: #e6e9ef;
+    font: 15px/1.6 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+  }
+  .card { max-width: 30rem; padding: 2rem; text-align: center; }
+  .spinner {
+    width: 2.25rem; height: 2.25rem; margin: 0 auto 1.25rem;
+    border: 3px solid rgba(59, 130, 246, 0.25); border-top-color: #3b82f6;
+    border-radius: 50%; animation: spin 0.9s linear infinite;
+  }
+  @keyframes spin { to { transform: rotate(360deg); } }
+  h1 { font-size: 1.15rem; margin: 0 0 0.5rem; font-weight: 600; }
+  p { margin: 0 0 0.75rem; color: #9aa4b2; }
+  .progress { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 0.85rem; color: #7fb1ff; min-height: 1.5em; overflow-wrap: anywhere; }
+  .offline { color: #f0883e; }
+</style>
+</head>
+<body>
+<div class="card" role="status" aria-live="polite">
+  <div class="spinner" aria-hidden="true"></div>
+  <h1 id="title">Fusion is starting\u2026</h1>
+  <p id="subtitle">If a database migration is needed it runs now and can take a few minutes for large projects. This page reloads automatically when the dashboard is ready.</p>
+  <div class="progress" id="progress"></div>
+</div>
+<script>
+(function () {
+  var failures = 0;
+  var sawMigration = false;
+  async function poll() {
+    try {
+      var res = await fetch("/api/health", { cache: "no-store" });
+      if (!res.ok) return;
+      failures = 0;
+      var data = await res.json();
+      if (data && (data.status === "starting" || data.status === "migrating")) {
+        if (data.status === "migrating") {
+          sawMigration = true;
+          document.getElementById("title").textContent = "Database migration in progress";
+        }
+        var label = data.migration && data.migration.label;
+        if (label) document.getElementById("progress").textContent = label;
+        return;
+      }
+      location.reload();
+    } catch (err) {
+      failures += 1;
+      if (failures >= 8) {
+        document.getElementById("progress").innerHTML =
+          '<span class="offline">Cannot reach Fusion \u2014 it may have stopped. Check the terminal, then reload.</span>';
+      }
+    }
+  }
+  poll();
+  setInterval(poll, 1500);
+})();
+</script>
+</body>
+</html>`;
+}
+async function startMigrationHoldingServer(options) {
+  let latest = null;
+  const server = createServer6((req, res) => {
+    const url2 = req.url ?? "/";
+    if (url2 === "/api/health" || url2.startsWith("/api/health?")) {
+      res.writeHead(200, { "content-type": "application/json", "cache-control": "no-store" });
+      res.end(JSON.stringify({
+        status: latest ? "migrating" : "starting",
+        holding: true,
+        migration: latest ? {
+          active: true,
+          phase: latest.phase,
+          label: formatMigrationProgress(latest),
+          ..."table" in latest ? { table: latest.table, tableIndex: latest.tableIndex, tableCount: latest.tableCount } : {},
+          ...latest.phase === "table-progress" ? { processedRows: latest.processedRows, sourceRows: latest.sourceRows } : {}
+        } : { active: false }
+      }));
+      return;
+    }
+    if (url2.startsWith("/api/")) {
+      res.writeHead(503, { "content-type": "application/json", "retry-after": "2" });
+      res.end(JSON.stringify({ error: "Fusion is starting (database migration may be in progress)" }));
+      return;
+    }
+    res.writeHead(503, { "content-type": "text/html; charset=utf-8", "retry-after": "2", "cache-control": "no-store" });
+    res.end(renderHoldingPage());
+  });
+  const bound = await new Promise((resolve96) => {
+    server.once("error", (error48) => {
+      options.log?.(`migration holding page not available (${error48.code ?? error48.message}); continuing boot without it`);
+      resolve96(false);
+    });
+    server.listen(options.port, options.host, () => resolve96(true));
+  });
+  if (!bound) return null;
+  const address = server.address();
+  const port = typeof address === "object" && address !== null ? address.port : options.port;
+  let closed = null;
+  return {
+    port,
+    setMigrationProgress(event) {
+      latest = event;
+    },
+    close() {
+      if (closed) return closed;
+      closed = new Promise((resolve96) => {
+        server.close(() => resolve96());
+        server.closeAllConnections();
+      });
+      return closed;
+    }
+  };
+}
+var init_migration_holding_server = __esm({
+  "src/commands/migration-holding-server.ts"() {
+    "use strict";
+    init_src2();
+  }
+});
 // src/commands/ensure-project-registered.ts
 import { exec as exec48 } from "node:child_process";
 import { existsSync as existsSync83, mkdirSync as mkdirSync17 } from "node:fs";
@@ -392638,9 +392793,17 @@ async function runDashboard(port, opts = {}) {
   }
   ensureProcessDiagnostics(runtimeLogger);
   const logPhase = (message, scope = "dashboard") => logSink.log(message, scope);
+  const migrationHoldingServer = await startMigrationHoldingServer({
+    port: selectedPort,
+    host: selectedHost,
+    log: (message) => logSink.log(message, "dashboard")
+  });
   const dashboardBackendBoot = await phaseTime(
     "backend.factory",
-    () => createTaskStoreForBackend({ rootDir: cwd }),
+    () => createTaskStoreForBackend({
+      rootDir: cwd,
+      onMigrationProgress: (event) => migrationHoldingServer?.setMigrationProgress(event)
+    }),
     logPhase
   );
   store = dashboardBackendBoot.taskStore;
@@ -393839,6 +394002,9 @@ async function runDashboard(port, opts = {}) {
       }
     }, POLL_MS).unref();
   }
+  if (migrationHoldingServer) {
+    await migrationHoldingServer.close();
+  }
   const server = app.listen(selectedPort, selectedHost);
   server.on("error", (err) => {
     if (err.code === "EADDRINUSE") {
@@ -394548,6 +394714,7 @@ var init_dashboard = __esm({
     init_extension();
     init_task_lifecycle();
     init_port_prompt();
+    init_migration_holding_server();
     init_ensure_project_registered();
     init_provider_settings();
     init_provider_auth2();

package/dist/child-process-worker.js CHANGED Viewed

@@ -47494,6 +47494,25 @@ function classifyColumnType(pgCol) {
   }
   return "plain";
 }
+function stripNulChars(text2) {
+  return text2.includes("\0") ? text2.replace(NUL_CHAR_RE, "") : text2;
+}
+function deepStripNulChars(value) {
+  if (typeof value === "string") {
+    return stripNulChars(value);
+  }
+  if (Array.isArray(value)) {
+    return value.map(deepStripNulChars);
+  }
+  if (value !== null && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(
+        ([key, entry]) => [stripNulChars(key), deepStripNulChars(entry)]
+      )
+    );
+  }
+  return value;
+}
 function convertValue(value, type, nullJsonbFallback, preserveEmptyJsonbString = false) {
   if (value === null || value === void 0) {
     return type === "jsonb" && nullJsonbFallback !== void 0 ? nullJsonbFallback : null;
@@ -47506,12 +47525,12 @@ function convertValue(value, type, nullJsonbFallback, preserveEmptyJsonbString =
           return nullJsonbFallback ?? (preserveEmptyJsonbString ? JSON.stringify(value) : null);
         }
         try {
-          return JSON.stringify(JSON.parse(trimmed));
+          return JSON.stringify(deepStripNulChars(JSON.parse(trimmed)));
         } catch {
-          return JSON.stringify(value);
+          return JSON.stringify(stripNulChars(value));
         }
       }
-      return JSON.stringify(value);
+      return JSON.stringify(deepStripNulChars(value));
     }
     case "bytea": {
       if (Buffer.isBuffer(value)) {
@@ -47529,7 +47548,7 @@ function convertValue(value, type, nullJsonbFallback, preserveEmptyJsonbString =
     case "identity":
     case "generated":
     default:
-      return value;
+      return typeof value === "string" ? stripNulChars(value) : value;
   }
 }
 function createQuarterProgressReporter(sourceRows, onCopyProgress) {
@@ -47554,7 +47573,7 @@ function tagLegacyCell(value) {
   if (typeof value === "number" || typeof value === "bigint") {
     return { type: "number", value: Object.is(value, -0) ? "-0" : String(value) };
   }
-  return { type: "text", value: String(value) };
+  return { type: "text", value: stripNulChars(String(value)) };
 }
 function canonicalizeLegacyRows(rows, occurrences = /* @__PURE__ */ new Map()) {
   return rows.map((row) => {
@@ -48022,7 +48041,7 @@ async function computeTargetCanonicalRows(db, pgSchema2, table, cols, projectId)
     return canonical;
   }).sort();
 }
-var log4, INSERT_BATCH_SIZE, LEGACY_PRESERVATION_TARGETS, SQLITE_MIGRATION_STATE_TABLE, CENTRAL_SQLITE_MIGRATION_KEY, DryRunRollback;
+var log4, INSERT_BATCH_SIZE, LEGACY_PRESERVATION_TARGETS, SQLITE_MIGRATION_STATE_TABLE, CENTRAL_SQLITE_MIGRATION_KEY, DryRunRollback, NUL_CHAR_RE;
 var init_sqlite_migrator = __esm({
   "../core/src/postgres/sqlite-migrator.ts"() {
     "use strict";
@@ -48047,6 +48066,7 @@ var init_sqlite_migrator = __esm({
         this.name = "DryRunRollback";
       }
     };
+    NUL_CHAR_RE = /\u0000/g;
   }
 });
@@ -59814,6 +59834,10 @@ async function createTaskStoreForBackend(options) {
               */
               onProgress: (event) => {
                 log5.log(`startup-factory: SQLite migration \u2014 ${formatMigrationProgress2(event)}`);
+                try {
+                  options.onMigrationProgress?.(event);
+                } catch {
+                }
               }
             });
             const failedTables = report.tables.filter((table) => !table.skipped && !table.verified);