ryugi-artifacts 1.9.1 → 1.9.2

package/dist/cli.cjs

@@ -64,6 +64,7 @@ function projectPaths(dir) {
     lock: import_node_path.default.join(state, "start.lock")
   };
 }
+var invocation = () => process.env.RYUGI_ARTIFACTS_COMMAND || "ryugi-artifacts";
 var ARTIFACT_PATTERN = /^(artboard|document|html)\/[a-z0-9][a-z0-9-]*$/;
 var ARTIFACT_ERROR = "--artifact must be <type>/<id>: type artboard, document or html, id of lowercase letters, digits and hyphens";
 
@@ -148,9 +149,14 @@ function commandLine(pid) {
   const line = full.stdout.split("\n").slice(1).join(" ").trim();
   return line ? line.split(/\s+/) : null;
 }
+var isNodeImage = (tasklistLine) => /^"node\.exe"/i.test(tasklistLine.trim());
+function windowsNodeAt(pid) {
+  const result = (0, import_node_child_process.spawnSync)("tasklist", ["/FI", `PID eq ${pid}`, "/FO", "CSV", "/NH"], { encoding: "utf8", windowsHide: true });
+  return result.status === 0 && isNodeImage(result.stdout);
+}
 function hasServerId(pid, id) {
   if (!alive(pid)) return false;
-  if (process.platform === "win32") return true;
+  if (process.platform === "win32") return windowsNodeAt(pid);
   return commandLine(pid)?.includes(`--artifacts-server-id=${id}`) ?? false;
 }
 function parentOf(pid) {
@@ -230,7 +236,7 @@ function recordAgent(paths) {
   if (Object.keys(markers).length) import_node_fs3.default.writeFileSync(paths.agent, `${JSON.stringify(markers)}
 `);
 }
-async function replace(pid) {
+async function replace(pid, paths) {
   try {
     process.kill(pid, "SIGTERM");
   } catch {
@@ -241,7 +247,7 @@ async function replace(pid) {
   } catch {
   }
   if (await waitForExit(pid, 2e3)) return;
-  throw new CliError(`The running server (pid ${pid}) is on another release and did not stop; stop it with \`ryugi-artifacts stop\` and retry`);
+  throw new CliError(`The running server (pid ${pid}) is on another release and did not stop; stop it with \`${invocation()} stop --project-dir ${paths.project}\` and retry`);
 }
 function serverEnv(paths, options) {
   const env = { ...process.env, ARTIFACTS_ROOT: paths.root, ARTIFACTS_HOST: options.host, ARTIFACTS_URL_HOST: options.urlHost, ARTIFACTS_OPEN: options.open ? "1" : "0" };
@@ -249,6 +255,7 @@ function serverEnv(paths, options) {
   if (options.idleTimeoutMinutes) env.ARTIFACTS_IDLE_TIMEOUT_MS = String(Number(options.idleTimeoutMinutes) * 6e4);
   delete env.RYUGI_ARTIFACTS_OWNER;
   delete env.RYUGI_ARTIFACTS_VERSION;
+  delete env.RYUGI_ARTIFACTS_COMMAND;
   return env;
 }
 async function start(options, emit) {
@@ -282,7 +289,7 @@ async function start(options, emit) {
         emit(withLink(JSON.parse(info), options.artifact, true));
         return 0;
       }
-      await replace(running);
+      await replace(running, paths);
     }
     registerOwner(paths);
     recordAgent(paths);
@@ -326,7 +333,7 @@ async function start(options, emit) {
       const started = lines.find((line) => line.includes('"server-started"'));
       if (started) {
         for (let check = 0; check < 20; check++) {
-          if (!alive(child.pid)) throw new CliError(`Server started but was killed. Retry in a persistent terminal with: ryugi-artifacts start --project-dir ${paths.project} --host ${options.host} --url-host ${options.urlHost} --foreground`);
+          if (!alive(child.pid)) throw new CliError(`Server started but was killed. Retry in a persistent terminal with: ${invocation()} start --project-dir ${paths.project}${options.artifact ? ` --artifact ${options.artifact}` : ""} --host ${options.host} --url-host ${options.urlHost} --foreground`);
           await sleep(100);
         }
         emit(withLink(JSON.parse(started), options.artifact, false));
@@ -346,7 +353,7 @@ async function start(options, emit) {
 }
 
 // src/cli/publish.ts
-var NOT_RUNNING = "No artifacts server is running for this project. Start it with `ryugi-artifacts start`, then run this again.";
+var notRunning = (project) => `No artifacts server is running for this project. Start it with \`${invocation()} start --project-dir ${project}\`, then run this again.`;
 async function publish(options, emit) {
   if (options.action === "publish" || options.action === "unpublish") {
     if (!options.artifact) throw new CliError("--artifact <type>/<id> is required");
@@ -358,7 +365,7 @@ async function publish(options, emit) {
   try {
     info = JSON.parse(readText(paths.info) ?? "");
   } catch {
-    throw new CliError(NOT_RUNNING);
+    throw new CliError(notRunning(paths.project));
   }
   const base = new URL(info.url);
   const key = base.searchParams.get("key") ?? "";
@@ -372,7 +379,7 @@ async function publish(options, emit) {
         body: body ? JSON.stringify(body) : void 0
       });
     } catch {
-      throw new CliError(NOT_RUNNING);
+      throw new CliError(notRunning(paths.project));
     }
     const json = await res.json().catch(() => ({}));
     if (res.status === 401) throw new CliError("", { type: "login-required", url: json.loginUrl, message: "Open url to sign in to the Ryugi cloud, then run the same command again." }, 2);
@@ -569,7 +576,7 @@ async function main(argv) {
       }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.9.1");
+      console.log("1.9.2");
       return 0;
     }
     if (command === "--help" || command === "-h") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ryugi-artifacts",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "type": "module",
   "description": "Server and viewer for the Ryugi artifacts app",
   "license": "MIT",