ryugi-artifacts 1.34.0 → 1.34.2

package/dist/cli.cjs

@@ -1477,7 +1477,7 @@ async function main(argv) {
       return await monitor({ json: !!values.json }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.34.0");
+      console.log("1.34.2");
       return 0;
     }
     if (command === "--help" || command === "-h") {

package/dist/server.cjs

@@ -89299,6 +89299,7 @@ var import_node_fs14 = __toESM(require("node:fs"), 1);
 var import_node_path14 = __toESM(require("node:path"), 1);
 
 // src/shared/cloud.ts
+var publishing = (phase) => phase === "preparing" || phase === "uploading" || phase === "publishing";
 var ownLink = (url, hostId) => hostId ? `${url}#ryugi-host=${hostId}` : url;
 var isVisibility = (value) => value === "private" || value === "public";
 
@@ -90063,7 +90064,7 @@ var LOGIN_STATE_TTL_MS = 10 * 60 * 1e3;
 var UPLOAD_CONCURRENCY = 6;
 var MAX_JSON_BODY = 4096;
 var CLOUD_ID = /^[A-Za-z0-9_-]{1,64}$/;
-var ROUTE = /^\/api\/cloud\/(status|login|logout|artifacts|publish|reserve|visibility|auto-publish|sync)(?:\/([^/]+)(?:\/([^/]+))?)?$/;
+var ROUTE = /^\/api\/cloud\/(status|login|logout|artifacts|publish|publication|reserve|visibility|auto-publish|sync)(?:\/([^/]+)(?:\/([^/]+))?)?$/;
 var SignedOut = class extends Error {
 };
 var CloudRefused = class extends Error {
@@ -90176,6 +90177,18 @@ function createCloudRoutes(options) {
     return res;
   };
   const artifactEntry = (key2) => readConfig(configFile).config.artifacts[key2] ?? {};
+  const publications = /* @__PURE__ */ new Map();
+  const changedDuringPublish = /* @__PURE__ */ new Set();
+  const snapshot2 = (key2) => ({
+    phase: artifactEntry(key2).cloud?.publishedAt ? "published" : "waiting",
+    ...publications.get(key2),
+    publishedAt: artifactEntry(key2).cloud?.publishedAt ?? null,
+    autoPublish: autoPublishState().enabled && artifactEntry(key2).autoPublish !== false && publications.get(key2)?.autoPublish !== false
+  });
+  const setPublication = (key2, state) => {
+    publications.set(key2, state);
+    options.onPublication?.(key2, snapshot2(key2));
+  };
   const locks = /* @__PURE__ */ new Map();
   const serialized = (key2, task) => {
     const run2 = (locks.get(key2) ?? Promise.resolve()).then(task, task);
@@ -90234,7 +90247,21 @@ function createCloudRoutes(options) {
     const prepared = await prepare(ref);
     return prepared.ready ? prepared.fingerprint === cloud.fingerprint : null;
   };
-  const publish = async (ref, requested, { recreate = true, skipUnchanged = false } = {}) => {
+  const publication = async (key2) => {
+    const saved = publications.get(key2);
+    if (saved && saved.phase !== "waiting" && saved.phase !== "published") return snapshot2(key2);
+    const ref = artifactKeyOf(key2);
+    if (!ref) throw new CloudRefused(404, "artifact not found");
+    try {
+      const prepared = await prepare(ref);
+      if (publications.get(key2) !== saved) return snapshot2(key2);
+      const cloud = artifactEntry(key2).cloud;
+      return { ...snapshot2(key2), ...!prepared.ready ? { phase: "not-ready", reasons: prepared.reasons } : { phase: cloud?.publishedAt && cloud.fingerprint === prepared.fingerprint ? "published" : "waiting" } };
+    } catch (err) {
+      return { ...snapshot2(key2), phase: "failed", message: err.message };
+    }
+  };
+  const publishFiles = async (ref, requested, { recreate = true, skipUnchanged = false } = {}) => {
     const prepared = await prepare(ref);
     if (!prepared.ready) return { status: 409, body: { error: "fix these before publishing", code: "publish_not_ready", reasons: prepared.reasons } };
     const { hashed, content, fingerprint } = prepared;
@@ -90259,11 +90286,14 @@ function createCloudRoutes(options) {
       }
     };
     const commit = async (id2, visibility) => {
+      setPublication(key2, { phase: "preparing" });
       const res2 = await cloudFetch("POST", `/api/artifacts/${id2}/versions`, version2(visibility));
       if (res2.status !== 409) return res2;
       const { missing } = await res2.clone().json().catch(() => ({}));
       if (!Array.isArray(missing)) return res2;
+      setPublication(key2, { phase: "uploading" });
       await upload(id2, missing);
+      setPublication(key2, { phase: "publishing" });
       return cloudFetch("POST", `/api/artifacts/${id2}/versions`, version2(visibility));
     };
     let res = entry.cloud ? await commit(entry.cloud.id, requested) : await commit(await create3(), void 0);
@@ -90278,6 +90308,19 @@ function createCloudRoutes(options) {
     });
     return { status: 200, body: { id: published.id, url: published.url, visibility: published.visibility, publishedAt: published.updatedAt } };
   };
+  const publish = async (ref, requested, flags) => {
+    const key2 = `${ref.type}/${ref.id}`;
+    changedDuringPublish.delete(key2);
+    setPublication(key2, { phase: "preparing" });
+    try {
+      const result = await publishFiles(ref, requested, flags);
+      setPublication(key2, result.status === 200 ? { phase: changedDuringPublish.has(key2) ? "waiting" : "published" } : { phase: "not-ready", reasons: result.body.reasons });
+      return result;
+    } catch (err) {
+      setPublication(key2, { phase: "failed", message: err instanceof SignedOut ? "Sign in to Ryugi Cloud on this computer to publish." : err.message.replace(/^cloud refused \(\d+\): /, ""), autoPublish: !(err instanceof SignedOut || err instanceof PlanLimited || err instanceof CreateRefused || err instanceof CloudRefused && err.status === 413) });
+      throw err;
+    }
+  };
   const setVisibility = async (ref, visibility) => {
     if (!await options.inspect(ref)) throw new CloudRefused(404, `${ref.type}/${ref.id} not found`);
     const key2 = `${ref.type}/${ref.id}`;
@@ -90304,7 +90347,10 @@ function createCloudRoutes(options) {
     const res = await cloudFetch("DELETE", `/api/artifacts/${cloudId}`);
     if (res.status !== 404) await expectOk(res);
     for (const [key2, entry] of Object.entries(readConfig(configFile).config.artifacts)) {
-      if (entry.cloud?.id === cloudId) updateArtifactConfig(configFile, key2, { cloud: null, autoPublish: false });
+      if (entry.cloud?.id === cloudId) {
+        updateArtifactConfig(configFile, key2, { cloud: null, autoPublish: false });
+        setPublication(key2, { phase: "waiting" });
+      }
     }
   };
   const autoPublish = (key2) => serialized(key2, () => autoPublishNow(key2));
@@ -90382,6 +90428,10 @@ function createCloudRoutes(options) {
       sendJson(res, 200, { upToDate: await serialized(`${ref.type}/${ref.id}`, () => upToDate(ref)) });
       return;
     }
+    if (action === "publication" && ref && method === "GET") {
+      sendJson(res, 200, await publication(`${ref.type}/${ref.id}`));
+      return;
+    }
     if (action === "reserve" && ref && method === "POST") {
       sendJson(res, 200, await serialized(`${ref.type}/${ref.id}`, () => reserve(ref)));
       return;
@@ -90452,6 +90502,24 @@ function createCloudRoutes(options) {
     },
     match: (pathname) => ROUTE.exec(pathname),
     autoPublish,
+    publication,
+    changed(key2) {
+      changedDuringPublish.add(key2);
+      if (!publishing(snapshot2(key2).phase)) setPublication(key2, { phase: "waiting" });
+    },
+    publishNow(key2) {
+      const ref = artifactKeyOf(key2);
+      if (!ref) throw new CloudRefused(404, "artifact not found");
+      if (!publishing(snapshot2(key2).phase)) {
+        setPublication(key2, { phase: "preparing" });
+        void serialized(key2, async () => {
+          const result = await publish(ref, void 0, { recreate: false });
+          if (result.status === 200) updateArtifactConfig(configFile, key2, { autoPublish: null });
+        }).catch(() => {
+        });
+      }
+      return snapshot2(key2);
+    },
     autoPublishEnabled: () => autoPublishState().enabled,
     token: () => readCredentials(credentialsFile2, origin)?.token ?? null,
     async handle(req, res, match) {
@@ -90982,7 +91050,16 @@ async function startArtifactsServer(options) {
     }
     return { dir, title, reasons, payload: published };
   };
-  const cloud = options.cloud && options.configFile ? createCloudRoutes({ ...options.cloud, configFile: options.configFile, project: import_node_path21.default.basename(import_node_path21.default.resolve(root, "../..")), port: () => port, inspect }) : null;
+  const cloud = options.cloud && options.configFile ? createCloudRoutes({
+    ...options.cloud,
+    configFile: options.configFile,
+    project: import_node_path21.default.basename(import_node_path21.default.resolve(root, "../..")),
+    port: () => port,
+    inspect,
+    onPublication: (key2, publication) => {
+      broadcast({ type: "cloud-publication", artifact: key2, publication });
+    }
+  }) : null;
   const autoPublisher = cloud ? createAutoPublisher({
     stateFile: import_node_path21.default.join(stateDir, "auto-publish.json"),
     enabled: cloud.autoPublishEnabled,
@@ -91559,6 +91636,8 @@ async function startArtifactsServer(options) {
     const dir = resolveArtifactDir(root, ref.type, ref.id);
     if (!dir) throw new Error(`${key2} not found`);
     const request = typeof body === "object" && body !== null ? body : {};
+    if (request.op === "publication" && cloud) return cloud.publication(key2);
+    if (request.op === "publish" && cloud) return cloud.publishNow(key2);
     if (request.op === "meta") return artifactMeta(ref, dir, contentOrigin);
     if (request.op === "file") {
       const file = typeof request.path === "string" ? readArtifactFile(dir, ref.type, request.path, CLOUD_RUNTIME_URL, MAX_RELAY_FILE) : null;
@@ -91675,6 +91754,7 @@ async function startArtifactsServer(options) {
         for (const socket of clients) socket.write(frame);
         relay?.emit(key2, { type: "change", artifact: key2, files: changed });
         direct.emit(key2, { type: "change", artifact: key2, files: changed });
+        cloud?.changed(key2);
         changeListeners.forEach((listener) => listener(ref, payload, changed));
       }
       touch();
@@ -91865,7 +91945,7 @@ function touchEntry(dir, entry) {
 }
 
 // package.json
-var version = "1.34.0";
+var version = "1.34.2";
 
 // src/server/main.ts
 async function main() {

package/dist/viewer/{CloudDocument-DBhwAPZX.js → CloudDocument-DMxzGKGr.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{S as r,T as i,o as a,t as o}from"./RailSwitch-B8Aht-FG.js";import{E as s,T as c,d as l,f as u,k as d,t as f,y as p}from"./DocumentLayout-DUPesXt0.js";var m=e(t(),1),h=n();function g(){let e=(0,m.useMemo)(()=>window.matchMedia(`(prefers-color-scheme: dark)`),[]),[t,n]=(0,m.useState)(e.matches);return(0,m.useEffect)(()=>{let t=()=>n(e.matches);return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[e]),t}function _({id:e,state:t,contentBase:n,comments:_=r(),offline:v=!1}){let y=g(),[b,x]=(0,m.useState)(null),S=(0,m.useMemo)(()=>({artifact:`cloud/${e}`,contentBase:n,channel:c(),send:()=>void 0}),[e,n]),C=_.threads.filter(e=>e.status===`open`).length,w=a(e,{comments:C,activity:null,retrying:!1,reason:null,history:!1,historyOpen:!1});return(0,m.useEffect)(()=>{let e=document.createElement(`base`);return e.href=n,document.head.prepend(e),()=>e.remove()},[n]),(0,h.jsxs)(`div`,{className:`x1us19tq x1rozbrz xo2rkog`,className:`ryugi-doc ${{className:`x1us19tq x1rozbrz xo2rkog`}.className??``}`,children:[w?null:(0,h.jsxs)(`div`,{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`,children:[(0,h.jsx)(o,{comments:C,open:!1,available:!1,onComments:()=>{},onHistory:()=>{}}),(0,h.jsx)(`span`,{children:i(`document.historyOffline`)})]}),v?(0,h.jsxs)(`div`,{...{0:{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`},1:{className:`x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61 x1s85apg x1ux6vrq`}}[!!w|0],children:[(0,h.jsx)(`i`,{className:`xci0xqf x1hagigm x16rqkct xxwmxtg`}),i(`document.offlineNoComments`)]}):null,(0,h.jsx)(f,{editor:b,threads:_.threads,children:(0,h.jsx)(p.Provider,{value:S,children:(0,h.jsx)(d,{variant:`article`,theme:y?`dark`:`light`,initialValue:t,extraNodes:l,rendererConfig:u,onEditorReady:e=>{e?.setEditable(!1),x(e??null)},children:(0,h.jsx)(s,{})})})})]})}export{_ as default};
+import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{O as r,j as i,o as a,t as o}from"./RailSwitch-BFT07B3v.js";import{E as s,T as c,d as l,f as u,k as d,t as f,y as p}from"./DocumentLayout-DifRAAM4.js";var m=e(t(),1),h=n();function g(){let e=(0,m.useMemo)(()=>window.matchMedia(`(prefers-color-scheme: dark)`),[]),[t,n]=(0,m.useState)(e.matches);return(0,m.useEffect)(()=>{let t=()=>n(e.matches);return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[e]),t}function _({id:e,state:t,contentBase:n,comments:_=r(),offline:v=!1}){let y=g(),[b,x]=(0,m.useState)(null),S=(0,m.useMemo)(()=>({artifact:`cloud/${e}`,contentBase:n,channel:c(),send:()=>void 0}),[e,n]),C=_.threads.filter(e=>e.status===`open`).length,w=a(e,{comments:C,activity:null,retrying:!1,reason:null,history:!1,historyOpen:!1});return(0,m.useEffect)(()=>{let e=document.createElement(`base`);return e.href=n,document.head.prepend(e),()=>e.remove()},[n]),(0,h.jsxs)(`div`,{className:`x1us19tq x1rozbrz xo2rkog`,className:`ryugi-doc ${{className:`x1us19tq x1rozbrz xo2rkog`}.className??``}`,children:[w?null:(0,h.jsxs)(`div`,{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`,children:[(0,h.jsx)(o,{comments:C,open:!1,available:!1,onComments:()=>{},onHistory:()=>{}}),(0,h.jsx)(`span`,{children:i(`document.historyOffline`)})]}),v?(0,h.jsxs)(`div`,{...{0:{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`},1:{className:`x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61 x1s85apg x1ux6vrq`}}[!!w|0],children:[(0,h.jsx)(`i`,{className:`xci0xqf x1hagigm x16rqkct xxwmxtg`}),i(`document.offlineNoComments`)]}):null,(0,h.jsx)(f,{editor:b,threads:_.threads,children:(0,h.jsx)(p.Provider,{value:S,children:(0,h.jsx)(d,{variant:`article`,theme:y?`dark`:`light`,initialValue:t,extraNodes:l,rendererConfig:u,onEditorReady:e=>{e?.setEditable(!1),x(e??null)},children:(0,h.jsx)(s,{})})})})]})}export{_ as default};

package/dist/viewer/CloudLiveDocument-D8xwGUx6.js

@@ -0,0 +1 @@
+import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{A as r,j as i,o as a}from"./RailSwitch-BFT07B3v.js";import{t as o}from"./index.js";import s from"./CloudDocument-DMxzGKGr.js";import{DocumentView as c,t as l}from"./DocumentPage-BnAdtCR2.js";var u=e(t(),1),d=`1.34.2`,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)=>r.t(`document.versionReason`,{host:t??r.t(`document.unknownVersion`),viewer:e}),h=n();function g({id:e,state:t,contentBase:n,liveContentBase:r,comments:f}){let{transport:g,presence:_}=l(e,r??n??``),v=_?.online??!1;a(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:i(_===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};