@rubytech/create-realagent 1.0.635 → 1.0.636

package/payload/server/public/index.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Real Agent</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/admin-BTjragNx.js"></script>
+  <script type="module" crossorigin src="/assets/admin-E3EIZIw0.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Be6NvmcD.js">
   <link rel="modulepreload" crossorigin href="/assets/preload-helper-rov5CBGT.js">
   <link rel="modulepreload" crossorigin href="/assets/useVoiceRecorder-D4y_EM_A.js">

package/payload/server/server.js

@@ -1,32 +1,9 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
+import {
+  __commonJS,
+  __export,
+  __toESM,
+  readProgressLog
+} from "./chunk-LM5BMENF.js";
 
 // ../lib/models/dist/index.js
 var require_dist = __commonJS({
@@ -2660,8 +2637,8 @@ var createAdaptorServer = (options) => {
     overrideGlobalObjects: options.overrideGlobalObjects,
     autoCleanupIncoming: options.autoCleanupIncoming
   });
-  const createServer = options.createServer || createServerHTTP;
-  const server = createServer(options.serverOptions || {}, requestListener);
+  const createServer2 = options.createServer || createServerHTTP;
+  const server = createServer2(options.serverOptions || {}, requestListener);
   return server;
 };
 var serve = (options, listeningListener) => {
@@ -32315,7 +32292,9 @@ async function GET13() {
 // app/api/admin/version/upgrade/route.ts
 import { spawn as spawn4 } from "child_process";
 import { existsSync as existsSync24, statSync as statSync9, writeFileSync as writeFileSync16, readFileSync as readFileSync24, openSync as openSync5, closeSync as closeSync5 } from "fs";
-import { resolve as resolve26, join as join11 } from "path";
+import { createServer } from "net";
+import { resolve as resolve26, join as join11, dirname as dirname8 } from "path";
+import { fileURLToPath } from "url";
 var PLATFORM_ROOT10 = process.env.MAXY_PLATFORM_ROOT ?? resolve26(process.cwd(), "..");
 var upgradePkg = "@rubytech/create-maxy";
 var upgradeHostname = "maxy";
@@ -32348,6 +32327,27 @@ function isLockFresh() {
     return false;
   }
 }
+function probePortFree(port2) {
+  return new Promise((resolve29) => {
+    const probe = createServer();
+    probe.once("error", (err) => {
+      resolve29({ error: `${err.code ?? "EADDRINUSE"} on port ${port2}` });
+    });
+    probe.once("listening", () => {
+      probe.close(() => resolve29(true));
+    });
+    probe.listen(port2, "0.0.0.0");
+  });
+}
+function resolveSidecarPath() {
+  try {
+    const here = dirname8(fileURLToPath(import.meta.url));
+    const candidate = join11(here, "upgrade-progress-server.js");
+    return existsSync24(candidate) ? candidate : null;
+  } catch {
+    return null;
+  }
+}
 async function POST23(req) {
   let body;
   try {
@@ -32365,17 +32365,65 @@ async function POST23(req) {
   if (isLockFresh()) {
     return Response.json({ ok: false, error: "upgrade already in progress" }, { status: 409 });
   }
+  const mainPort = parseInt(process.env.PORT ?? "19200", 10);
+  const sidecarPort = mainPort + 99;
+  const portProbe = await probePortFree(sidecarPort);
+  if (portProbe !== true) {
+    console.error(`[admin/version/upgrade] sidecar port probe failed: ${portProbe.error}`);
+    return Response.json(
+      { ok: false, error: `upgrade progress port ${sidecarPort} is already in use (${portProbe.error})` },
+      { status: 500 }
+    );
+  }
+  const sidecarPath = resolveSidecarPath();
+  const installerScope = `upgrade-${upgradeHostname}`;
+  const sidecarScope = `upgrade-progress-${upgradeHostname}`;
   try {
     writeFileSync16(LOCK_FILE, String(Date.now()));
   } catch (err) {
     console.error("[admin/version/upgrade] failed to write lock file:", err);
   }
+  if (!sidecarPath) {
+    console.error("[admin/version/upgrade] progress sidecar binary not found in dist/");
+    return Response.json(
+      { ok: false, error: "progress sidecar binary missing \u2014 rebuild required" },
+      { status: 500 }
+    );
+  }
+  let sidecarPid;
+  try {
+    const sidecarLogFd = openSync5(LOG_FILE, "a");
+    const sidecar = spawn4("systemd-run", [
+      "--user",
+      "--scope",
+      `--unit=${sidecarScope}`,
+      "--",
+      "node",
+      sidecarPath,
+      `--port=${sidecarPort}`,
+      `--log=${LOG_FILE}`,
+      `--scope=${installerScope}`
+    ], {
+      detached: true,
+      stdio: ["ignore", sidecarLogFd, sidecarLogFd]
+    });
+    sidecar.unref();
+    closeSync5(sidecarLogFd);
+    sidecarPid = sidecar.pid;
+    console.log(`[admin/version/upgrade] spawned progress sidecar (pid ${sidecarPid} port ${sidecarPort})`);
+  } catch (err) {
+    console.error("[admin/version/upgrade] failed to spawn progress sidecar:", err);
+    return Response.json(
+      { ok: false, error: err instanceof Error ? err.message : "failed to spawn progress sidecar" },
+      { status: 500 }
+    );
+  }
   try {
     const logFd = openSync5(LOG_FILE, "w");
     const child = spawn4("systemd-run", [
       "--user",
       "--scope",
-      `--unit=upgrade-${upgradeHostname}`,
+      `--unit=${installerScope}`,
       "--",
       "npx",
       "-y",
@@ -32389,7 +32437,9 @@ async function POST23(req) {
     child.unref();
     closeSync5(logFd);
     console.log(`[admin/version/upgrade] spawned upgrade process (pid ${child.pid})`);
-    return Response.json({ ok: true, started: true });
+    const host = new URL(req.url).hostname;
+    const progressUrl = `http://${host}:${sidecarPort}/progress`;
+    return Response.json({ ok: true, started: true, progressUrl });
   } catch (err) {
     console.error("[admin/version/upgrade] failed to spawn upgrade process:", err);
     return Response.json(
@@ -32413,40 +32463,8 @@ if (existsSync25(brandPath2)) {
   }
 }
 var LOG_FILE2 = `/tmp/${upgradeHostname2}-upgrade.log`;
-var STEP_RE = /\[(\d+)\/(\d+)\]\s+(.+)/;
-var ANSI_RE = /\x1b\[[0-9;?]*[a-zA-Z]/g;
-var stripAnsi = (s) => s.replace(ANSI_RE, "").replace(/\r/g, "").trimEnd();
-var MAX_SUBSTEPS = 20;
 async function GET14() {
-  if (!existsSync25(LOG_FILE2)) {
-    return Response.json({ step: 0, total: 0, label: "", started: false, subSteps: [] });
-  }
-  let content;
-  try {
-    content = readFileSync25(LOG_FILE2, "utf-8");
-  } catch {
-    return Response.json({ step: 0, total: 0, label: "", started: false, subSteps: [] });
-  }
-  const rawLines = content.split("\n");
-  let step = 0;
-  let total = 0;
-  let label = "";
-  let markerIdx = -1;
-  for (let i = rawLines.length - 1; i >= 0; i--) {
-    const match2 = rawLines[i].match(STEP_RE);
-    if (match2) {
-      step = parseInt(match2[1], 10);
-      total = parseInt(match2[2], 10);
-      label = match2[3].replace(/\.{3}$/, "").trim();
-      markerIdx = i;
-      break;
-    }
-  }
-  const subSteps = markerIdx >= 0 ? rawLines.slice(markerIdx + 1).map(stripAnsi).filter((l) => l.length > 0).slice(-MAX_SUBSTEPS) : [];
-  const tail = rawLines.slice(-20).join("\n");
-  const finished = tail.includes("Open in your browser:");
-  const failed = tail.includes("Setup failed:");
-  return Response.json({ step, total, label, started: true, finished, failed, subSteps });
+  return Response.json(readProgressLog(LOG_FILE2));
 }
 
 // app/api/admin/sessions/route.ts

package/payload/server/upgrade-progress-server.js

@@ -0,0 +1,83 @@
+import {
+  readProgressLog
+} from "./chunk-LM5BMENF.js";
+
+// server/upgrade-progress-server.ts
+import { createServer } from "http";
+import { spawnSync } from "child_process";
+import { appendFileSync } from "fs";
+function arg(name) {
+  const prefix = `--${name}=`;
+  const hit = process.argv.find((a) => a.startsWith(prefix));
+  return hit?.slice(prefix.length);
+}
+var port = parseInt(arg("port") ?? "0", 10);
+var logPath = arg("log") ?? "";
+var scopeUnit = arg("scope") ?? "";
+if (!port || !logPath || !scopeUnit) {
+  console.error(`[progress-server] missing required args: --port=${port} --log=${logPath} --scope=${scopeUnit}`);
+  process.exit(2);
+}
+function banner(line) {
+  try {
+    appendFileSync(logPath, `${line}
+`);
+  } catch {
+  }
+}
+var server = createServer((req, res) => {
+  res.setHeader("Access-Control-Allow-Origin", "*");
+  res.setHeader("Access-Control-Allow-Methods", "GET, OPTIONS");
+  if (req.method === "OPTIONS") {
+    res.statusCode = 204;
+    res.end();
+    return;
+  }
+  if (req.url !== "/progress") {
+    res.statusCode = 404;
+    res.end();
+    return;
+  }
+  const payload = readProgressLog(logPath);
+  res.setHeader("Content-Type", "application/json");
+  res.statusCode = 200;
+  res.end(JSON.stringify(payload));
+});
+server.on("error", (err) => {
+  console.error(`[progress-server] listen error: ${err.code ?? ""} ${err.message}`);
+  banner(`[progress-server] exiting reason=error code=${err.code ?? "unknown"}`);
+  process.exit(1);
+});
+server.listen(port, "0.0.0.0", () => {
+  banner(`[progress-server] listening port=${port} log=${logPath} scope=${scopeUnit}`);
+});
+var installerSeenActive = false;
+var WATCHDOG_INTERVAL_MS = 2e3;
+var GRACE_UNTIL = Date.now() + 5e3;
+function shutdown(reason) {
+  banner(`[progress-server] exiting reason=${reason}`);
+  server.close(() => process.exit(0));
+  setTimeout(() => process.exit(0), 500).unref();
+}
+var watchdog = setInterval(() => {
+  const result = spawnSync("systemctl", ["--user", "is-active", scopeUnit], { stdio: "pipe" });
+  const status = result.stdout?.toString().trim();
+  if (status === "active") {
+    installerSeenActive = true;
+    return;
+  }
+  if (!installerSeenActive && Date.now() < GRACE_UNTIL) return;
+  if (!installerSeenActive) {
+    banner(`[progress-server] exiting reason=scope-inactive (installer never reached active)`);
+  }
+  clearInterval(watchdog);
+  shutdown("scope-inactive");
+}, WATCHDOG_INTERVAL_MS);
+process.on("SIGTERM", () => {
+  clearInterval(watchdog);
+  shutdown("sigterm");
+});
+process.on("SIGINT", () => {
+  clearInterval(watchdog);
+  shutdown("sigint");
+});