truecanvas 0.6.0 → 0.6.2

package/dist/{chunk-NAK4DQWO.js → chunk-FJO64PGM.js}

@@ -564,6 +564,13 @@ async function startHub(opts) {
   const store = new ProjectStore();
   const editorDir = fileURLToPath(new URL("./editor/", import.meta.url));
   const pkgDir = path5.resolve(path5.dirname(opts.cli), "..");
+  const version = (() => {
+    try {
+      return JSON.parse(fs5.readFileSync(path5.join(pkgDir, "package.json"), "utf8")).version;
+    } catch {
+      return "";
+    }
+  })();
   const origin = `http://localhost:${opts.port}`;
   const allowedHosts = /* @__PURE__ */ new Set([`localhost:${opts.port}`, `127.0.0.1:${opts.port}`]);
   const clients = /* @__PURE__ */ new Set();
@@ -628,6 +635,7 @@ async function startHub(opts) {
     const live = await Promise.all(running.map(async (dir) => [dir, await sessionsOf(dir)]));
     return {
       origin,
+      version,
       active,
       focus,
       notice: opts.notice ?? null,

package/dist/cli.js

@@ -14,7 +14,7 @@ import {
   readPackage,
   runScript,
   startHub
-} from "./chunk-NAK4DQWO.js";
+} from "./chunk-FJO64PGM.js";
 import {
   CHUNK,
   decodeFrame,
@@ -1659,6 +1659,9 @@ function serializePage() {
 ${root.outerHTML}`, css, canvases, height };
 }
 
+// src/server/app-run.ts
+var appRun = { state: "external", log: [] };
+
 // src/server/review.ts
 import fs5 from "fs";
 import path6 from "path";
@@ -2264,7 +2267,11 @@ var Sessions = class {
   get(canvas) {
     return this.sessions.get(canvas) ?? null;
   }
-  /** Starts (or returns) the canvas's session. The canvas needs a link: share it first. */
+  /**
+   * Starts (or returns) the canvas's session. A canvas that has no link yet is
+   * shared first through `opts.share` (invited-only on sites with sign-in), so
+   * going live is one click.
+   */
   async start(canvas, opts = {}) {
     const running = this.sessions.get(canvas);
     if (running && running.state.status !== "stopped") return running.state;
@@ -2272,12 +2279,19 @@ var Sessions = class {
     if (!site) throw new Error("No review site yet: connect one with `npx truecanvas share setup`, share the canvas, then start a session.");
     const features = await siteFeatures(site);
     if (!features.includes("session")) throw new Error("This review site doesn't support live sessions yet: deploy the latest review site (packages/review-worker) with LIVE_HOST_SUFFIX set.");
-    const res = await fetch(`${site.url}/api/shares?project=${encodeURIComponent(this.project)}&canvas=${encodeURIComponent(canvas)}`, {
-      headers: { authorization: `Bearer ${site.token}` },
-      signal: AbortSignal.timeout(2e4)
-    });
-    if (!res.ok) throw new Error(`Review site: ${res.status} ${res.statusText}`);
-    const { slug } = await res.json();
+    const lookup = async () => {
+      const res = await fetch(`${site.url}/api/shares?project=${encodeURIComponent(this.project)}&canvas=${encodeURIComponent(canvas)}`, {
+        headers: { authorization: `Bearer ${site.token}` },
+        signal: AbortSignal.timeout(2e4)
+      });
+      if (!res.ok) throw new Error(`Review site: ${res.status} ${res.statusText}`);
+      return (await res.json()).slug;
+    };
+    let slug = await lookup();
+    if (!slug && opts.share) {
+      await opts.share();
+      slug = await lookup();
+    }
     if (!slug) throw new Error(`${canvas} has no link yet. Share it once (Share, or \`npx truecanvas share ${canvas}\`), then start a session.`);
     const session = new LiveSession(site, slug, canvas, this.appUrl, {
       name: opts.name ?? "Studio",
@@ -2406,6 +2420,8 @@ async function startServer(ws) {
     const route = `${req.method} ${url.pathname}`;
     const user = { kind: "user" };
     switch (route) {
+      case "GET /api/app":
+        return json(res, 200, appRun);
       case "GET /api/state":
         return json(res, 200, {
           appUrl: config.appUrl,
@@ -2720,7 +2736,14 @@ async function startServer(ws) {
         const canvas = body.canvas ?? ws.selection.canvas ?? ws.canvases()[0];
         if (!canvas) return json(res, 400, { error: "No canvas to share live yet." });
         assertCanvasName(canvas);
-        return json(res, 200, { session: await sessions.start(canvas, { name: body.name }) });
+        const share = async () => {
+          const site = reviewSite();
+          if (!site) return;
+          const { dir, manifest } = await createSnapshot(ws, shots, canvas, {});
+          await publishSnapshot(site, dir, manifest, {});
+          commentSync.forget(canvas);
+        };
+        return json(res, 200, { session: await sessions.start(canvas, { name: body.name, share }) });
       }
       case "POST /api/session/stop": {
         const { canvas } = await readJson(req);
@@ -3497,7 +3520,10 @@ async function main() {
   let next = null;
   const appUp = await reachable(config.appUrl);
   const devCommand = config.framework === "vite" ? "vite" : "next dev";
-  if (!appUp && values.next && !values["no-next"]) next = startApp(root, config.appUrl, config.framework);
+  if (!appUp && values.next && !values["no-next"]) {
+    next = startApp(root, config.appUrl, config.framework);
+    appRun.state = "starting";
+  }
   console.log(`
   ${c.accent("\u25C6")} ${c.bold("Truecanvas")} ${c.dim(`v${version}`)}
 
@@ -3510,7 +3536,11 @@ ${hasAgentConfig(root, config.port) ? `  ${c.dim("Agents")}   connected through
 `);
   if (next) {
     const exited = new Promise((r) => next.once("exit", () => r("exited")));
+    void exited.then(() => {
+      if (appRun.state !== "ready") appRun.state = "failed";
+    });
     const result = await Promise.race([waitFor(config.appUrl, 9e4), exited]);
+    if (result === true) appRun.state = "ready";
     if (result === true) console.log(`  ${c.green("\u2713")} App ready at ${config.appUrl}
 `);
     else if (result === "exited") console.log(`  ${c.dim(`${devCommand} stopped (see above). Start your app, the editor connects as soon as it's up.`)}
@@ -3664,8 +3694,13 @@ function startApp(root, appUrl, framework) {
       buf += chunk.toString();
       const lines = buf.split(/\r?\n/);
       buf = lines.pop();
-      for (const line of lines) if (line.trim()) process.stdout.write(`  ${prefix}${line}
+      for (const line of lines) {
+        if (!line.trim()) continue;
+        process.stdout.write(`  ${prefix}${line}
 `);
+        appRun.log.push(line.replace(/\x1b\[[0-9;]*m/g, ""));
+        if (appRun.log.length > 20) appRun.log.shift();
+      }
     });
   }
   return child;