ryugi-artifacts 1.39.2 → 1.39.3

package/dist/cli.cjs

@@ -24,8 +24,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/cli/main.ts
-var import_node_child_process4 = require("node:child_process");
-var import_node_util = require("node:util");
+var import_node_child_process5 = require("node:child_process");
+var import_node_util2 = require("node:util");
 
 // src/cli/paths.ts
 var import_node_fs = __toESM(require("node:fs"), 1);
@@ -985,7 +985,7 @@ async function monitor(options, emit) {
 }
 
 // src/cli/start.ts
-var import_node_child_process3 = require("node:child_process");
+var import_node_child_process4 = require("node:child_process");
 var import_node_crypto3 = __toESM(require("node:crypto"), 1);
 var import_node_fs11 = __toESM(require("node:fs"), 1);
 var import_node_path10 = __toESM(require("node:path"), 1);
@@ -1035,6 +1035,54 @@ function artifactPath(root, type, slug) {
   return `/${type}/${artifactId(dir)}`;
 }
 
+// src/server/browser-focus.ts
+var import_node_child_process3 = require("node:child_process");
+var import_node_util = require("node:util");
+var execute = (0, import_node_util.promisify)(import_node_child_process3.execFile);
+var MAC_FOCUS_SCRIPT = String.raw`
+function run(urls) {
+  function key(url) {
+    return String(url).split(/[?#]/)[0].replace(/^(https?:\/\/)127\.0\.0\.1:/, '$1localhost:').replace(/\/$/, '');
+  }
+  var targets = urls.map(key);
+  var ids = ['company.thebrowser.dia', 'com.google.Chrome', 'com.apple.Safari'];
+  var unknown = false;
+  for (var a = 0; a < ids.length; a++) {
+    var app;
+    try { app = Application(ids[a]); if (!app.running()) continue; } catch (e) { continue; }
+    try {
+      var windows = app.windows();
+      for (var w = 0; w < windows.length; w++) {
+        var tabs = windows[w].tabs();
+        for (var t = 0; t < tabs.length; t++) {
+          if (targets.indexOf(key(tabs[t].url())) === -1) continue;
+          try {
+            if (ids[a] === 'company.thebrowser.dia') app.focus(tabs[t]);
+            else {
+              if (ids[a] === 'com.apple.Safari') windows[w].currentTab = tabs[t];
+              else windows[w].activeTabIndex = t + 1;
+              windows[w].index = 1;
+            }
+            app.activate();
+          } catch (e) { console.log('Could not focus the existing browser tab: ' + e.message); }
+          return 'found';
+        }
+      }
+    } catch (e) { unknown = true; }
+  }
+  return unknown ? 'unknown' : 'missing';
+}`;
+async function openBrowser(url, aliases = []) {
+  if (process.platform === "darwin") {
+    const { stdout, stderr } = await execute("osascript", ["-l", "JavaScript", "-e", MAC_FOCUS_SCRIPT, url, ...aliases], { timeout: 5e3 });
+    if (stderr.trim()) console.error(stderr.trim());
+    if (stdout.trim() === "found") return;
+    if (stdout.trim() !== "missing") throw new Error("Could not inspect existing browser tabs; open the artifact link manually.");
+  }
+  const launcher = browserLauncher(process.platform, url);
+  if (launcher) await execute(launcher.bin, launcher.args);
+}
+
 // src/cli/start.ts
 var windowsLike = () => process.platform === "win32";
 function withLink(info, artifact, reused) {
@@ -1048,9 +1096,8 @@ function withLink(info, artifact, reused) {
   return out;
 }
 var RESERVE_TIMEOUT_MS = 5e3;
-var inClaudeCode = () => !!(process.env.CLAUDECODE || process.env.CLAUDE_CODE);
 async function withCloudLink(out, artifact) {
-  if (!artifact || !inClaudeCode() || typeof out.url !== "string") return out;
+  if (!artifact || typeof out.url !== "string") return out;
   const server = new URL(out.url);
   if (server.hostname === "localhost") server.hostname = "127.0.0.1";
   try {
@@ -1164,7 +1211,14 @@ async function start(options, emit) {
       if (!version || readText(paths.version) === version) {
         registerOwner(paths);
         recordAgent(paths);
-        emit(await withCloudLink(withLink(JSON.parse(info), options.artifact, true), options.artifact));
+        const out = await withCloudLink(withLink(JSON.parse(info), options.artifact, true), options.artifact);
+        emit(out);
+        if (process.platform === "darwin" && options.open && options.artifact && !process.env.ARTIFACTS_OPEN_CMD) {
+          const local = out.link;
+          await openBrowser(typeof out.cloudLink === "string" ? out.cloudLink : local, [local]).catch((error) => {
+            console.error(error.message);
+          });
+        }
         return 0;
       }
       await replace(running, paths);
@@ -1180,7 +1234,7 @@ async function start(options, emit) {
     const env = serverEnv(paths, options);
     const args = [server, `--artifacts-server-id=${id}`];
     if (foreground) {
-      const child2 = (0, import_node_child_process3.spawn)(process.execPath, args, { env, stdio: ["ignore", "pipe", "inherit"] });
+      const child2 = (0, import_node_child_process4.spawn)(process.execPath, args, { env, stdio: ["ignore", "pipe", "inherit"] });
       import_node_fs11.default.writeFileSync(paths.pid, `${child2.pid}
 `);
       for (const signal of ["SIGINT", "SIGTERM"]) process.on(signal, () => child2.kill("SIGTERM"));
@@ -1202,7 +1256,7 @@ async function start(options, emit) {
       return await exited;
     }
     const log = import_node_fs11.default.openSync(paths.log, "w");
-    const child = (0, import_node_child_process3.spawn)(process.execPath, args, { env, detached: true, stdio: ["ignore", log, log] });
+    const child = (0, import_node_child_process4.spawn)(process.execPath, args, { env, detached: true, stdio: ["ignore", log, log] });
     import_node_fs11.default.closeSync(log);
     child.unref();
     import_node_fs11.default.writeFileSync(paths.pid, `${child.pid}
@@ -1322,7 +1376,7 @@ Options:
 var common = { "project-dir": { type: "string" }, json: { type: "boolean" } };
 function parse(args, options, positionals = 0) {
   try {
-    const parsed = (0, import_node_util.parseArgs)({ args, options: { ...common, ...options }, allowPositionals: positionals > 0, strict: true });
+    const parsed = (0, import_node_util2.parseArgs)({ args, options: { ...common, ...options }, allowPositionals: positionals > 0, strict: true });
     if (parsed.positionals.length > positionals) throw new CliError(`Unknown argument: ${parsed.positionals[positionals]}`);
     return parsed;
   } catch (err) {
@@ -1333,7 +1387,7 @@ function parse(args, options, positionals = 0) {
 }
 function text(value) {
   if (typeof value.error === "string") return `Error: ${value.error}`;
-  if (value.type === "server-started") return `${value.link ?? value.url}${value.reused ? " (already running)" : ""}`;
+  if (value.type === "server-started") return `${value.cloudLink ?? value.link ?? value.url}${value.reused ? " (already running)" : ""}`;
   if (value.type === "login-required" || value.type === "login") return `${value.message}
 ${value.url}`;
   if (value.type === "published") return `${value.url} (${value.visibility})`;
@@ -1347,10 +1401,10 @@ ${value.url}`;
   if (typeof value.status === "string") return value.status === "stopped" ? "Stopped." : value.status.replace(/_/g, " ");
   return JSON.stringify(value);
 }
-function openBrowser(url) {
+function openBrowser2(url) {
   const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
   const args = process.platform === "win32" ? ["/c", "start", '""', url] : [url];
-  (0, import_node_child_process4.execFile)(command, args, () => {
+  (0, import_node_child_process5.execFile)(command, args, () => {
   });
 }
 async function browse(argv) {
@@ -1370,7 +1424,7 @@ async function browse(argv) {
     if (value.type !== "server-started") return;
     console.log(value.url);
     if (!value.reused) console.log("Press Ctrl+C to stop the server.");
-    if (!values["no-open"]) openBrowser(value.url);
+    if (!values["no-open"]) openBrowser2(value.url);
   });
 }
 async function main(argv) {
@@ -1478,7 +1532,7 @@ async function main(argv) {
       return await monitor({ json: !!values.json }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.39.2");
+      console.log("1.39.3");
       return 0;
     }
     if (command === "--help" || command === "-h") {

package/dist/server.cjs

@@ -5170,7 +5170,7 @@ var require_websocket_server = __commonJS({
 });
 
 // src/server/main.ts
-var import_node_child_process2 = require("node:child_process");
+var import_node_child_process3 = require("node:child_process");
 var import_node_fs27 = __toESM(require("node:fs"), 1);
 var import_node_os2 = __toESM(require("node:os"), 1);
 var import_node_path23 = __toESM(require("node:path"), 1);
@@ -90504,6 +90504,7 @@ function createCloudRoutes(options) {
     },
     match: (pathname) => ROUTE.exec(pathname),
     autoPublish,
+    reserve: (ref) => serialized(`${ref.type}/${ref.id}`, () => reserve(ref)),
     publication,
     changed(key2) {
       changedDuringPublish.add(key2);
@@ -91770,12 +91771,11 @@ async function startArtifactsServer(options) {
     contentToken,
     url,
     linkFor,
-    cloudLinkFor: (type, id2) => {
-      if (!options.cloud || !options.configFile || !readCredentials(options.cloud.credentialsFile, options.cloud.origin)) return null;
-      const url2 = readConfig(options.configFile).config.artifacts[`${type}/${id2}`]?.cloud?.url;
+    cloudLinkFor: async (type, id2) => {
+      if (!cloud || !options.cloud || !readCredentials(options.cloud.credentialsFile, options.cloud.origin)) return null;
+      const { url: url2 } = await cloud.reserve({ type, id: id2 });
       return url2 ? ownLink(url2, hostIdFor(options.cloud.credentialsFile)) : null;
     },
-    clientCount: () => clients.size,
     onArtifactChange: (listener) => {
       changeListeners.push(listener);
       for (const change of initialChanges) listener(change.ref, change.payload, change.files);
@@ -91798,6 +91798,10 @@ async function startArtifactsServer(options) {
   };
 }
 
+// src/server/browser-focus.ts
+var import_node_child_process2 = require("node:child_process");
+var import_node_util = require("node:util");
+
 // src/server/lifecycle.ts
 var import_node_fs25 = __toESM(require("node:fs"), 1);
 var DEFAULT_IDLE_TIMEOUT_MS = 4 * 60 * 60 * 1e3;
@@ -91859,6 +91863,52 @@ function processAlive(pid) {
   }
 }
 
+// src/server/browser-focus.ts
+var execute = (0, import_node_util.promisify)(import_node_child_process2.execFile);
+var MAC_FOCUS_SCRIPT = String.raw`
+function run(urls) {
+  function key(url) {
+    return String(url).split(/[?#]/)[0].replace(/^(https?:\/\/)127\.0\.0\.1:/, '$1localhost:').replace(/\/$/, '');
+  }
+  var targets = urls.map(key);
+  var ids = ['company.thebrowser.dia', 'com.google.Chrome', 'com.apple.Safari'];
+  var unknown = false;
+  for (var a = 0; a < ids.length; a++) {
+    var app;
+    try { app = Application(ids[a]); if (!app.running()) continue; } catch (e) { continue; }
+    try {
+      var windows = app.windows();
+      for (var w = 0; w < windows.length; w++) {
+        var tabs = windows[w].tabs();
+        for (var t = 0; t < tabs.length; t++) {
+          if (targets.indexOf(key(tabs[t].url())) === -1) continue;
+          try {
+            if (ids[a] === 'company.thebrowser.dia') app.focus(tabs[t]);
+            else {
+              if (ids[a] === 'com.apple.Safari') windows[w].currentTab = tabs[t];
+              else windows[w].activeTabIndex = t + 1;
+              windows[w].index = 1;
+            }
+            app.activate();
+          } catch (e) { console.log('Could not focus the existing browser tab: ' + e.message); }
+          return 'found';
+        }
+      }
+    } catch (e) { unknown = true; }
+  }
+  return unknown ? 'unknown' : 'missing';
+}`;
+async function openBrowser(url, aliases2 = []) {
+  if (process.platform === "darwin") {
+    const { stdout, stderr } = await execute("osascript", ["-l", "JavaScript", "-e", MAC_FOCUS_SCRIPT, url, ...aliases2], { timeout: 5e3 });
+    if (stderr.trim()) console.error(stderr.trim());
+    if (stdout.trim() === "found") return;
+    if (stdout.trim() !== "missing") throw new Error("Could not inspect existing browser tabs; open the artifact link manually.");
+  }
+  const launcher = browserLauncher(process.platform, url);
+  if (launcher) await execute(launcher.bin, launcher.args);
+}
+
 // src/server/ready.ts
 var pageOfGroup = (canvas, ids) => ids.map((id2) => canvas.boards[id2]?.page).find((page) => Boolean(page));
 function openReady(payload) {
@@ -91948,7 +91998,7 @@ function touchEntry(dir, entry) {
 }
 
 // package.json
-var version = "1.39.2";
+var version = "1.39.3";
 
 // src/server/main.ts
 async function main() {
@@ -91970,20 +92020,19 @@ async function main() {
     lastActivity = Date.now();
   });
   let browserOpened = false;
-  server.onArtifactChange((ref, payload) => {
+  server.onArtifactChange(async (ref, payload) => {
     if (browserOpened || !config.open || !isLoopback(config.host)) return;
     if (config.openArtifact && `${ref.type}/${ref.id}` !== config.openArtifact) return;
     if ("canvas" in payload ? !openReady(payload) : payload.warnings.length > 0) return;
     browserOpened = true;
-    if (server.clientCount() > 0) return;
-    const link = server.cloudLinkFor(ref.type, ref.id) ?? server.linkFor(ref.type, ref.id);
+    const link = await server.cloudLinkFor(ref.type, ref.id) ?? server.linkFor(ref.type, ref.id);
     if (config.openCmd) {
-      (0, import_node_child_process2.exec)(`${config.openCmd} ${JSON.stringify(link)}`, () => {
+      (0, import_node_child_process3.exec)(`${config.openCmd} ${JSON.stringify(link)}`, () => {
       });
       return;
     }
-    const launcher = browserLauncher(process.platform, link);
-    if (launcher) (0, import_node_child_process2.execFile)(launcher.bin, launcher.args, () => {
+    await openBrowser(link, [server.linkFor(ref.type, ref.id)]).catch((error) => {
+      console.error(JSON.stringify({ type: "browser-open-error", error: error.message }));
     });
   });
   const registry2 = registryDir();

package/dist/viewer-lib/index.js

@@ -4592,7 +4592,7 @@ function zi(e, t) {
 }
 //#endregion
 //#region src/viewer/lib/version.ts
-var Bi = "1.39.2", Vi = 100, Hi = 2e3, Ui = 50, Wi = (e, t = Vi) => typeof e == "string" && e.length > 0 && e.length <= t, Gi = (e) => typeof e == "number" && Number.isFinite(e), Ki = (e) => Gi(e) && e >= 0 && e <= 1;
+var Bi = "1.39.3", Vi = 100, Hi = 2e3, Ui = 50, Wi = (e, t = Vi) => typeof e == "string" && e.length > 0 && e.length <= t, Gi = (e) => typeof e == "number" && Number.isFinite(e), Ki = (e) => Gi(e) && e >= 0 && e <= 1;
 function qi(e) {
 	if (!Array.isArray(e) || e.length === 0 || e.length > Ui) return null;
 	let t = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ryugi-artifacts",
-  "version": "1.39.2",
+  "version": "1.39.3",
   "type": "module",
   "description": "Server and viewer for the Ryugi artifacts app",
   "license": "AGPL-3.0-only",