ryugi-artifacts 1.31.3 → 1.31.5

package/dist/cli.cjs

@@ -384,6 +384,9 @@ var isVisibility = (value) => value === "private" || value === "public";
 var import_node_fs4 = __toESM(require("node:fs"), 1);
 var import_node_path2 = __toESM(require("node:path"), 1);
 
+// src/shared/types.ts
+var ARTIFACT_TYPES = ["artboard", "document", "html"];
+
 // src/shared/validate.ts
 var BOARD_NUMBERS = ["x", "y", "w", "h"];
 var BOARD_REQUIRED = ["file", "page", ...BOARD_NUMBERS];
@@ -515,17 +518,64 @@ function config(options, emit) {
 
 // src/cli/start.ts
 var import_node_child_process2 = require("node:child_process");
+var import_node_crypto2 = __toESM(require("node:crypto"), 1);
+var import_node_fs8 = __toESM(require("node:fs"), 1);
+var import_node_path8 = __toESM(require("node:path"), 1);
+var import_node_readline = __toESM(require("node:readline"), 1);
+
+// src/server/artifact-address.ts
 var import_node_crypto = __toESM(require("node:crypto"), 1);
 var import_node_fs7 = __toESM(require("node:fs"), 1);
 var import_node_path7 = __toESM(require("node:path"), 1);
-var import_node_readline = __toESM(require("node:readline"), 1);
+
+// src/shared/ids.ts
+var ID_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+var isArtifactId = (id) => ID_PATTERN.test(id);
+var isArtifactType = (type) => ARTIFACT_TYPES.includes(type);
+
+// src/server/artifacts.ts
+function artifactKeyOf(relative) {
+  const [type, id] = relative.split("/");
+  if (!type || !id || !isArtifactType(type) || !isArtifactId(id)) return null;
+  return { type, id };
+}
+
+// src/server/artifact-address.ts
+function artifactId(dir) {
+  const file = import_node_path7.default.join(dir, ".artifact-id");
+  let id;
+  try {
+    id = import_node_fs7.default.readFileSync(file, "utf8").trim();
+  } catch (err) {
+    if (err.code !== "ENOENT") throw err;
+    id = import_node_crypto.default.randomBytes(16).toString("hex");
+    try {
+      import_node_fs7.default.writeFileSync(file, `${id}
+`, { flag: "wx" });
+    } catch (writeError) {
+      if (writeError.code !== "EEXIST") throw writeError;
+      return artifactId(dir);
+    }
+  }
+  if (!/^[a-f0-9]{32}$/.test(id)) throw new Error(`Invalid artifact ID in ${file}`);
+  return id;
+}
+function artifactPath(root, type, slug) {
+  if (!isArtifactType(type) || !isArtifactId(slug)) throw new Error("Invalid artifact locator");
+  const dir = import_node_path7.default.join(root, type, slug);
+  import_node_fs7.default.mkdirSync(dir, { recursive: true });
+  return `/${type}/${artifactId(dir)}`;
+}
+
+// src/cli/start.ts
 var windowsLike = () => process.platform === "win32";
 function withLink(info, artifact, reused) {
   const out = { ...info };
   if (reused) out.reused = true;
   if (artifact && typeof out.url === "string") {
     const url = new URL(out.url);
-    out.link = `${url.origin}/${artifact}?key=${url.searchParams.get("key")}`;
+    const ref = artifactKeyOf(artifact);
+    out.link = `${url.origin}${artifactPath(String(out.root), ref.type, ref.id)}?key=${url.searchParams.get("key")}`;
   }
   return out;
 }
@@ -551,13 +601,13 @@ async function withCloudLink(out, artifact) {
 async function acquireLock(lock) {
   for (let attempt = 0; attempt < 150; attempt++) {
     try {
-      import_node_fs7.default.mkdirSync(lock);
+      import_node_fs8.default.mkdirSync(lock);
       return true;
     } catch {
     }
     try {
-      if (Date.now() - import_node_fs7.default.statSync(lock).mtimeMs > 6e4) {
-        import_node_fs7.default.rmdirSync(lock);
+      if (Date.now() - import_node_fs8.default.statSync(lock).mtimeMs > 6e4) {
+        import_node_fs8.default.rmdirSync(lock);
         continue;
       }
     } catch {
@@ -587,13 +637,13 @@ function registerOwner(paths) {
   const owner = ownerPid();
   if (owner) owners.add(owner);
   const tmp = `${paths.owners}.${process.pid}`;
-  import_node_fs7.default.writeFileSync(tmp, [...owners].sort((a, b) => a - b).map((pid) => `${pid}
+  import_node_fs8.default.writeFileSync(tmp, [...owners].sort((a, b) => a - b).map((pid) => `${pid}
 `).join(""));
-  import_node_fs7.default.renameSync(tmp, paths.owners);
+  import_node_fs8.default.renameSync(tmp, paths.owners);
 }
 function recordAgent(paths) {
   const markers = Object.fromEntries(AGENT_MARKERS.flatMap((key) => process.env[key] ? [[key, process.env[key]]] : []));
-  if (Object.keys(markers).length) import_node_fs7.default.writeFileSync(paths.agent, `${JSON.stringify(markers)}
+  if (Object.keys(markers).length) import_node_fs8.default.writeFileSync(paths.agent, `${JSON.stringify(markers)}
 `);
 }
 async function replace(pid, paths) {
@@ -625,9 +675,9 @@ async function start(options, emit) {
   const foreground = options.foreground || !options.background && (!!process.env.CODEX_CI || windowsLike());
   process.umask(63);
   const paths = projectPaths(options.projectDir);
-  import_node_fs7.default.mkdirSync(paths.state, { recursive: true });
-  if (!import_node_fs7.default.existsSync(import_node_path7.default.join(paths.state, ".gitignore"))) import_node_fs7.default.writeFileSync(import_node_path7.default.join(paths.state, ".gitignore"), "*\n");
-  const server = import_node_path7.default.join(__dirname, "server.cjs");
+  import_node_fs8.default.mkdirSync(paths.state, { recursive: true });
+  if (!import_node_fs8.default.existsSync(import_node_path8.default.join(paths.state, ".gitignore"))) import_node_fs8.default.writeFileSync(import_node_path8.default.join(paths.state, ".gitignore"), "*\n");
+  const server = import_node_path8.default.join(__dirname, "server.cjs");
   const version = process.env.RYUGI_ARTIFACTS_VERSION ?? "";
   if (!await acquireLock(paths.lock)) throw new CliError("Another start for this project is still starting; retry in a moment");
   let locked = true;
@@ -635,7 +685,7 @@ async function start(options, emit) {
     if (!locked) return;
     locked = false;
     try {
-      import_node_fs7.default.rmdirSync(paths.lock);
+      import_node_fs8.default.rmdirSync(paths.lock);
     } catch {
     }
   };
@@ -653,17 +703,17 @@ async function start(options, emit) {
     }
     registerOwner(paths);
     recordAgent(paths);
-    import_node_fs7.default.rmSync(paths.info, { force: true });
-    const id = import_node_crypto.default.randomBytes(24).toString("hex");
-    import_node_fs7.default.writeFileSync(paths.serverId, `${id}
+    import_node_fs8.default.rmSync(paths.info, { force: true });
+    const id = import_node_crypto2.default.randomBytes(24).toString("hex");
+    import_node_fs8.default.writeFileSync(paths.serverId, `${id}
 `);
-    import_node_fs7.default.writeFileSync(paths.version, `${version}
+    import_node_fs8.default.writeFileSync(paths.version, `${version}
 `);
     const env = serverEnv(paths, options);
     const args = [server, `--artifacts-server-id=${id}`];
     if (foreground) {
       const child2 = (0, import_node_child_process2.spawn)(process.execPath, args, { env, stdio: ["ignore", "pipe", "inherit"] });
-      import_node_fs7.default.writeFileSync(paths.pid, `${child2.pid}
+      import_node_fs8.default.writeFileSync(paths.pid, `${child2.pid}
 `);
       for (const signal of ["SIGINT", "SIGTERM"]) process.on(signal, () => child2.kill("SIGTERM"));
       import_node_readline.default.createInterface({ input: child2.stdout }).on("line", (line) => {
@@ -679,15 +729,15 @@ async function start(options, emit) {
         else void withCloudLink(withLink(value, options.artifact, false), options.artifact).then(emit);
       });
       const exited = new Promise((resolve) => child2.on("close", (code) => resolve(code ?? 1)));
-      for (let waited = 0; waited < 5e3 && !import_node_fs7.default.existsSync(paths.info); waited += 100) await sleep(100);
+      for (let waited = 0; waited < 5e3 && !import_node_fs8.default.existsSync(paths.info); waited += 100) await sleep(100);
       unlock();
       return await exited;
     }
-    const log = import_node_fs7.default.openSync(paths.log, "w");
+    const log = import_node_fs8.default.openSync(paths.log, "w");
     const child = (0, import_node_child_process2.spawn)(process.execPath, args, { env, detached: true, stdio: ["ignore", log, log] });
-    import_node_fs7.default.closeSync(log);
+    import_node_fs8.default.closeSync(log);
     child.unref();
-    import_node_fs7.default.writeFileSync(paths.pid, `${child.pid}
+    import_node_fs8.default.writeFileSync(paths.pid, `${child.pid}
 `);
     for (let waited = 0; waited < 5e3; waited += 100) {
       const lines = (readText(paths.log) ?? "").split("\n");
@@ -767,13 +817,13 @@ async function publish(options, emit) {
 }
 
 // src/cli/stop.ts
-var import_node_fs8 = __toESM(require("node:fs"), 1);
+var import_node_fs9 = __toESM(require("node:fs"), 1);
 async function stop(projectDir, emit) {
   const paths = projectPaths(projectDir);
   const markStopped = (reason) => {
-    import_node_fs8.default.rmSync(paths.info, { force: true });
-    import_node_fs8.default.mkdirSync(paths.state, { recursive: true });
-    import_node_fs8.default.writeFileSync(paths.stopped, `${JSON.stringify({ reason, timestamp: Math.floor(Date.now() / 1e3) })}
+    import_node_fs9.default.rmSync(paths.info, { force: true });
+    import_node_fs9.default.mkdirSync(paths.state, { recursive: true });
+    import_node_fs9.default.writeFileSync(paths.stopped, `${JSON.stringify({ reason, timestamp: Math.floor(Date.now() / 1e3) })}
 `);
   };
   const pid = Number(readText(paths.pid));
@@ -783,8 +833,8 @@ async function stop(projectDir, emit) {
   }
   const id = readText(paths.serverId) ?? "";
   if (!Number.isInteger(pid) || pid <= 0 || !/^[A-Za-z0-9_-]{32,64}$/.test(id) || !hasServerId(pid, id)) {
-    import_node_fs8.default.rmSync(paths.pid, { force: true });
-    import_node_fs8.default.rmSync(paths.serverId, { force: true });
+    import_node_fs9.default.rmSync(paths.pid, { force: true });
+    import_node_fs9.default.rmSync(paths.serverId, { force: true });
     markStopped("stale_pid");
     emit({ status: "stale_pid" });
     return 0;
@@ -804,7 +854,7 @@ async function stop(projectDir, emit) {
     emit({ status: "failed", error: "process still running" });
     return 1;
   }
-  for (const file of [paths.pid, paths.serverId, paths.log, paths.owners]) import_node_fs8.default.rmSync(file, { force: true });
+  for (const file of [paths.pid, paths.serverId, paths.log, paths.owners]) import_node_fs9.default.rmSync(file, { force: true });
   markStopped("stop");
   emit({ status: "stopped" });
   return 0;
@@ -996,7 +1046,7 @@ async function main(argv) {
       }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.31.3");
+      console.log("1.31.5");
       return 0;
     }
     if (command === "--help" || command === "-h") {