ryugi-artifacts 1.32.0 → 1.33.0

package/dist/server.cjs

@@ -5171,9 +5171,9 @@ var require_websocket_server = __commonJS({
 
 // src/server/main.ts
 var import_node_child_process2 = require("node:child_process");
-var import_node_fs26 = __toESM(require("node:fs"), 1);
-var import_node_os = __toESM(require("node:os"), 1);
-var import_node_path22 = __toESM(require("node:path"), 1);
+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);
 
 // src/server/app.ts
 var import_node_fs24 = __toESM(require("node:fs"), 1);
@@ -19688,19 +19688,19 @@ var ElementDOMSlot = class _ElementDOMSlot extends DOMSlot {
   }
 };
 function indexPath(root, child) {
-  const path23 = [];
+  const path24 = [];
   let node = child;
   for (; node !== root && node !== null; node = node.parentNode) {
     let i6 = 0;
     for (let sibling = node.previousSibling; sibling !== null; sibling = sibling.previousSibling) {
       i6++;
     }
-    path23.push(i6);
+    path24.push(i6);
   }
   if (!(node === root)) {
     formatDevErrorMessage(`indexPath: root is not a parent of child`);
   }
-  return path23.reverse();
+  return path24.reverse();
 }
 // @__NO_SIDE_EFFECTS__
 function readLexicalVersion() {
@@ -34480,9 +34480,9 @@ function getActiveElementDeep(root) {
 function getComposedEventTarget(event) {
   const target = event.target;
   if (target !== null && isHTMLElement(target) && target.shadowRoot !== null && typeof event.composedPath === "function") {
-    const path23 = event.composedPath();
-    if (path23.length > 0) {
-      return path23[0];
+    const path24 = event.composedPath();
+    if (path24.length > 0) {
+      return path24[0];
     }
   }
   return target;
@@ -44578,10 +44578,10 @@ function _loadWasmModule(sync, filepath, src, imports2) {
   var buf = null;
   var isNode2 = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
   if (filepath && isNode2) {
-    var fs29 = null;
-    var path23 = null;
+    var fs30 = null;
+    var path24 = null;
     return new Promise((resolve, reject) => {
-      fs29.readFile(path23.resolve(__dirname, filepath), (error, buffer) => {
+      fs30.readFile(path24.resolve(__dirname, filepath), (error, buffer) => {
         if (error != null) {
           reject(error);
         } else {
@@ -45884,10 +45884,10 @@ var LoroDoc = class _LoroDoc {
    * @param {string} path
    * @returns {Value | Container | undefined}
    */
-  getByPath(path23) {
+  getByPath(path24) {
     try {
       const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      const ptr0 = passStringToWasm0(path23, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+      const ptr0 = passStringToWasm0(path24, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
       const len0 = WASM_VECTOR_LEN;
       wasm.lorodoc_getByPath(retptr, this.__wbg_ptr, ptr0, len0);
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
@@ -90150,7 +90150,7 @@ function createCloudRoutes(options) {
     const challenge = import_node_crypto8.default.createHash("sha256").update(verifier).digest("base64url");
     return `${origin}/auth/cli?port=${options.port()}&state=${state}&challenge=${challenge}`;
   };
-  const cloudFetch = async (method, path23, body) => {
+  const cloudFetch = async (method, path24, body) => {
     const credentials = readCredentials(credentialsFile2, origin);
     if (!credentials) throw new SignedOut();
     const headers = { Authorization: `Bearer ${credentials.token}` };
@@ -90164,7 +90164,7 @@ function createCloudRoutes(options) {
     }
     let res;
     try {
-      res = await fetch(`${origin}${path23}`, { method, headers, body: payload });
+      res = await fetch(`${origin}${path24}`, { method, headers, body: payload });
     } catch (err) {
       throw new CloudRefused(502, `could not reach ${origin}: ${err.message}`);
     }
@@ -90221,7 +90221,7 @@ function createCloudRoutes(options) {
     }
     const sha = (data) => import_node_crypto8.default.createHash("sha256").update(data).digest("hex");
     const hashed = withCloudRuntime(ref.type, packed).map((file) => ({ ...file, hash: sha(file.data) }));
-    const content = { title: inspected.title, payload: inspected.payload, files: hashed.map(({ path: path23, hash }) => ({ path: path23, hash })) };
+    const content = { title: inspected.title, payload: inspected.payload, files: hashed.map(({ path: path24, hash }) => ({ path: path24, hash })) };
     const fingerprint = sha(JSON.stringify({ title: inspected.title, payload: fingerprintPayload(inspected.payload), files: packed.map((file) => ({ path: file.path, hash: sha(file.data) })) }));
     return { ready: true, hashed, content, fingerprint };
   };
@@ -90921,7 +90921,12 @@ async function startArtifactsServer(options) {
   selections.clearAll();
   const changeListeners = [];
   const activityListeners = [];
-  const touch = () => activityListeners.forEach((listener) => listener());
+  const startedAt = Date.now();
+  let lastActivity = startedAt;
+  const touch = () => {
+    lastActivity = Date.now();
+    activityListeners.forEach((listener) => listener());
+  };
   let port = 0;
   let cookieName = "";
   let relay = null;
@@ -91289,9 +91294,14 @@ async function startArtifactsServer(options) {
     for (const socket of clients) socket.write(frame);
   }
   const handleRequest = (req, res) => {
-    touch();
     res.setHeader("X-Robots-Tag", "noindex, nofollow");
     const url2 = new URL(req.url ?? "/", "http://artifacts.local");
+    if (url2.pathname === "/api/status") {
+      if (!isAuthorized(req, url2.searchParams.get("key"))) send(res, 403, "Forbidden: agent calls need ?key=");
+      else sendJson(res, 200, { pid: process.pid, startedAt, lastActivity, clients: clients.size });
+      return;
+    }
+    touch();
     let pathname;
     try {
       pathname = decodeURIComponent(url2.pathname);
@@ -91800,22 +91810,76 @@ function openReady(payload) {
   return pageBoards.filter(([id2]) => ready(id2)).length >= 2;
 }
 
+// src/server/registry.ts
+var import_node_crypto11 = __toESM(require("node:crypto"), 1);
+var import_node_fs26 = __toESM(require("node:fs"), 1);
+var import_node_os = __toESM(require("node:os"), 1);
+var import_node_path22 = __toESM(require("node:path"), 1);
+function registryDir(env = process.env, platform = process.platform, uid = process.getuid?.() ?? -1, tmpdir = import_node_os.default.tmpdir()) {
+  if (env.RYUGI_RUNTIME_DIR) return import_node_path22.default.join(env.RYUGI_RUNTIME_DIR, "servers");
+  if (platform === "win32") return import_node_path22.default.join(tmpdir, "ryugi", "servers");
+  return `/tmp/ryugi-${uid}/servers`;
+}
+var fileFor = (dir, project) => import_node_path22.default.join(dir, `${import_node_crypto11.default.createHash("sha256").update(project).digest("hex").slice(0, 16)}.json`);
+function verifyDir(dir) {
+  if (process.platform === "win32") return;
+  for (const target of [import_node_path22.default.dirname(dir), dir]) {
+    const stat = import_node_fs26.default.lstatSync(target);
+    if (!stat.isDirectory() || stat.uid !== process.getuid() || stat.mode & 18) throw new Error(`Unsafe registry directory: ${target}`);
+  }
+}
+function ensureDir(dir) {
+  import_node_fs26.default.mkdirSync(dir, { recursive: true, mode: 448 });
+  verifyDir(dir);
+}
+function writeEntry(dir, entry) {
+  ensureDir(dir);
+  const file = fileFor(dir, entry.project);
+  const tmp = `${file}.${process.pid}.tmp`;
+  import_node_fs26.default.writeFileSync(tmp, `${JSON.stringify(entry)}
+`, { mode: 384 });
+  import_node_fs26.default.renameSync(tmp, file);
+}
+function readEntry(file) {
+  try {
+    const value = JSON.parse(import_node_fs26.default.readFileSync(file, "utf8"));
+    if (typeof value.project !== "string" || typeof value.root !== "string" || typeof value.serverId !== "string") return null;
+    if (!Number.isInteger(value.pid) || !Number.isFinite(value.startedAt)) return null;
+    if (value.root !== import_node_path22.default.join(value.project, ".ryugi", "artifacts")) return null;
+    return value;
+  } catch {
+    return null;
+  }
+}
+function removeEntry(dir, entry) {
+  const file = fileFor(dir, entry.project);
+  if (readEntry(file)?.serverId === entry.serverId) import_node_fs26.default.rmSync(file, { force: true });
+}
+function touchEntry(dir, entry) {
+  const file = fileFor(dir, entry.project);
+  const current = readEntry(file);
+  if (!current) return writeEntry(dir, entry);
+  if (current.serverId !== entry.serverId) return;
+  const now = /* @__PURE__ */ new Date();
+  import_node_fs26.default.utimesSync(file, now, now);
+}
+
 // package.json
-var version = "1.32.0";
+var version = "1.33.0";
 
 // src/server/main.ts
 async function main() {
   const config = parseEnv(process.env, process.argv.slice(2));
-  const root = import_node_path22.default.resolve(config.root);
-  const stateDir = import_node_path22.default.join(root, ".state");
+  const root = import_node_path23.default.resolve(config.root);
+  const stateDir = import_node_path23.default.join(root, ".state");
   const server = await startArtifactsServer({
     root,
-    viewerDir: import_node_path22.default.join(__dirname, "viewer"),
-    runtimeDir: import_node_path22.default.join(__dirname, "runtime"),
+    viewerDir: import_node_path23.default.join(__dirname, "viewer"),
+    runtimeDir: import_node_path23.default.join(__dirname, "runtime"),
     host: config.host,
     urlHost: config.urlHost,
-    configFile: import_node_path22.default.join(import_node_path22.default.dirname(root), "config.json"),
-    cloud: { origin: config.cloudOrigin, credentialsFile: credentialsFile(process.env, process.platform, import_node_os.default.homedir()) },
+    configFile: import_node_path23.default.join(import_node_path23.default.dirname(root), "config.json"),
+    cloud: { origin: config.cloudOrigin, credentialsFile: credentialsFile(process.env, process.platform, import_node_os2.default.homedir()) },
     relay: { url: `${config.cloudOrigin.replace(/^http/, "ws")}/api/relay/host`, version }
   });
   let lastActivity = Date.now();
@@ -91839,17 +91903,26 @@ async function main() {
     if (launcher) (0, import_node_child_process2.execFile)(launcher.bin, launcher.args, () => {
     });
   });
+  const registry2 = registryDir();
+  const entry = config.serverId ? { project: import_node_path23.default.dirname(import_node_path23.default.dirname(root)), root, pid: process.pid, serverId: config.serverId, startedAt: Date.now() } : null;
+  const quietly = (fn5) => {
+    try {
+      fn5();
+    } catch {
+    }
+  };
   let stopping = false;
   const shutdown = async (reason) => {
     if (stopping) return;
     stopping = true;
     console.log(JSON.stringify({ type: "server-stopped", reason }));
-    import_node_fs26.default.rmSync(import_node_path22.default.join(stateDir, "server-info"), { force: true });
-    writeJsonAtomic(import_node_path22.default.join(stateDir, "server-stopped"), { reason, timestamp: Date.now() });
+    import_node_fs27.default.rmSync(import_node_path23.default.join(stateDir, "server-info"), { force: true });
+    writeJsonAtomic(import_node_path23.default.join(stateDir, "server-stopped"), { reason, timestamp: Date.now() });
+    if (entry) quietly(() => removeEntry(registry2, entry));
     await server.close();
     process.exit(0);
   };
-  const ownersFile = import_node_path22.default.join(stateDir, "owners");
+  const ownersFile = import_node_path23.default.join(stateDir, "owners");
   const timer = setInterval(() => {
     const owners = readOwners(ownersFile);
     const reason = shutdownReason({
@@ -91859,11 +91932,14 @@ async function main() {
       ownersAlive: owners.length === 0 || liveOwners(owners, processAlive).length > 0
     });
     if (reason) void shutdown(reason);
+    else if (entry) quietly(() => touchEntry(registry2, entry));
   }, config.lifecycleCheckMs);
   timer.unref();
   process.on("SIGTERM", () => void shutdown("SIGTERM"));
   process.on("SIGINT", () => void shutdown("SIGINT"));
-  import_node_fs26.default.rmSync(import_node_path22.default.join(stateDir, "server-stopped"), { force: true });
+  process.on("SIGHUP", () => void shutdown("SIGHUP"));
+  import_node_fs27.default.rmSync(import_node_path23.default.join(stateDir, "server-stopped"), { force: true });
+  if (entry) quietly(() => writeEntry(registry2, entry));
   console.log(JSON.stringify({ type: "server-started", url: server.url, port: server.port, root }));
 }
 main().catch((err) => {

package/dist/viewer/{CloudLiveDocument-BX2fqdBQ.js → CloudLiveDocument-ceRinz2F.js}

@@ -1 +1 @@
-import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{T as r,o as i,w as a}from"./RailSwitch-B8Aht-FG.js";import{t as o}from"./index.js";import s from"./CloudDocument-DBhwAPZX.js";import{DocumentView as c,t as l}from"./DocumentPage-p78IN0UO.js";var u=e(t(),1),d=`1.32.0`,f=e=>/^(\d+)\.(\d+)\./.exec(e??``)?.slice(1,3).join(`.`)??null;function p(e,t){let n=f(e);return n!==null&&n===f(t)}var m=(e,t)=>a.t(`document.versionReason`,{host:t??a.t(`document.unknownVersion`),viewer:e}),h=n();function g({id:e,state:t,contentBase:n,liveContentBase:a,comments:f}){let{transport:g,presence:_}=l(e,a??n??``),v=_?.online??!1;i(e,{online:_?.online??null});let[y,b]=(0,u.useState)(!1);(0,u.useEffect)(()=>{v&&b(!0)},[v]);let x=t&&n?(0,h.jsx)(s,{id:e,state:t,contentBase:n,comments:f,offline:_!==null&&!v}):null;if(!g||!(y||v))return x??(0,h.jsx)(o,{children:r(_===null?`common.connecting`:`document.notPublished`)});let S=v&&p(d,_?.version??null),C=v&&!S?m(d,_?.version??null):null;return(0,h.jsx)(c,{id:e,transport:g,live:v,cloud:{online:v,canEdit:S,reason:C},fallback:x})}export{g as default};
+import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{T as r,o as i,w as a}from"./RailSwitch-B8Aht-FG.js";import{t as o}from"./index.js";import s from"./CloudDocument-DBhwAPZX.js";import{DocumentView as c,t as l}from"./DocumentPage-p78IN0UO.js";var u=e(t(),1),d=`1.33.0`,f=e=>/^(\d+)\.(\d+)\./.exec(e??``)?.slice(1,3).join(`.`)??null;function p(e,t){let n=f(e);return n!==null&&n===f(t)}var m=(e,t)=>a.t(`document.versionReason`,{host:t??a.t(`document.unknownVersion`),viewer:e}),h=n();function g({id:e,state:t,contentBase:n,liveContentBase:a,comments:f}){let{transport:g,presence:_}=l(e,a??n??``),v=_?.online??!1;i(e,{online:_?.online??null});let[y,b]=(0,u.useState)(!1);(0,u.useEffect)(()=>{v&&b(!0)},[v]);let x=t&&n?(0,h.jsx)(s,{id:e,state:t,contentBase:n,comments:f,offline:_!==null&&!v}):null;if(!g||!(y||v))return x??(0,h.jsx)(o,{children:r(_===null?`common.connecting`:`document.notPublished`)});let S=v&&p(d,_?.version??null),C=v&&!S?m(d,_?.version??null):null;return(0,h.jsx)(c,{id:e,transport:g,live:v,cloud:{online:v,canEdit:S,reason:C},fallback:x})}export{g as default};