ryugi-artifacts 1.26.1 → 1.28.0

package/dist/cli.cjs

@@ -502,8 +502,10 @@ async function withCloudLink(out, artifact) {
       method: "POST",
       signal: AbortSignal.timeout(RESERVE_TIMEOUT_MS)
     });
-    const { url } = await res.json();
-    return typeof url === "string" ? { ...out, cloudLink: url } : out;
+    const { url, limit } = await res.json();
+    if (typeof url === "string") return { ...out, cloudLink: url };
+    if (typeof limit?.upgradeUrl === "string") return { ...out, cloudLimit: { message: limit.message, upgradeUrl: limit.upgradeUrl } };
+    return out;
   } catch {
     return out;
   }
@@ -684,6 +686,7 @@ async function publish(options, emit) {
   const call = async (method, route, body) => {
     const { status, json } = await server.call(method, route, body);
     if (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);
+    if (status === 402 && json.code === "plan_limit") throw new CliError("", { type: "plan-limit", message: json.error, upgradeUrl: json.upgradeUrl }, 2);
     if (status < 200 || status >= 300) throw new CliError(json.error || `HTTP ${status}`, json.reasons ? { reasons: json.reasons } : {});
     return json;
   };
@@ -925,7 +928,7 @@ async function main(argv) {
       }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.26.1");
+      console.log("1.28.0");
       return 0;
     }
     if (command === "--help" || command === "-h") {

package/dist/server.cjs

@@ -88684,8 +88684,9 @@ var INSPECTOR_PROPERTIES = [
   "color",
   "box-shadow"
 ];
-var COMMENT_CURSOR_SVG = "<svg xmlns='http://www.w3.org/2000/svg' width='26' height='26' viewBox='0 0 26 26'><path d='M2 24V13a11 11 0 1 1 11 11z' fill='white' stroke='black' stroke-width='1.5' stroke-linejoin='round'/><path d='M13 8.5v9M8.5 13h9' stroke='black' stroke-width='1.8' stroke-linecap='round'/></svg>";
-var COMMENT_CURSOR = `url("data:image/svg+xml,${encodeURIComponent(COMMENT_CURSOR_SVG)}") 2 24, crosshair`;
+var COMMENT_BUBBLE = "M14.5 3a10.5 10.5 0 1 1-4.2 20.1l-5 1.6c-.9.3-1.7-.5-1.4-1.4l1.6-5A10.5 10.5 0 0 1 14.5 3z";
+var COMMENT_CURSOR_SVG = `<svg xmlns='http://www.w3.org/2000/svg' width='28' height='28' viewBox='0 0 28 28'><path d='${COMMENT_BUBBLE}' fill='none' stroke='white' stroke-width='4' stroke-linejoin='round'/><path d='${COMMENT_BUBBLE}' fill='#c65d3b'/><path d='M14.5 9.3v8.4M10.3 13.5h8.4' stroke='white' stroke-width='2.4' stroke-linecap='round'/></svg>`;
+var COMMENT_CURSOR = `url("data:image/svg+xml,${encodeURIComponent(COMMENT_CURSOR_SVG)}") 4 24, crosshair`;
 
 // src/shared/tweaks.ts
 function tweakTools() {
@@ -89911,6 +89912,13 @@ var CloudRefused = class extends Error {
 };
 var CloudCopyGone = class extends Error {
 };
+var PlanLimited = class extends CloudRefused {
+  constructor(message, upgradeUrl) {
+    super(402, message);
+    this.upgradeUrl = upgradeUrl;
+  }
+  upgradeUrl;
+};
 var CreateRefused = class extends CloudRefused {
   constructor(detail) {
     super(502, `cloud refused (403): ${detail}`);
@@ -89932,6 +89940,17 @@ async function readJsonBody(req) {
     return null;
   }
 }
+async function refuse(res) {
+  const text2 = await res.text().catch(() => "");
+  let parsed = {};
+  try {
+    parsed = JSON.parse(text2);
+  } catch {
+  }
+  const message = typeof parsed.error === "string" ? parsed.error : text2 || res.statusText;
+  if (res.status === 402 && parsed.code === "plan_limit" && typeof parsed.upgradeUrl === "string") throw new PlanLimited(message, parsed.upgradeUrl);
+  throw new CloudRefused(502, `cloud refused (${res.status}): ${message}`);
+}
 async function errorMessage(res) {
   const text2 = await res.text().catch(() => "");
   try {
@@ -89986,7 +90005,7 @@ function createCloudRoutes(options) {
     return res;
   };
   const expectOk = async (res) => {
-    if (!res.ok) throw new CloudRefused(502, `cloud refused (${res.status}): ${await errorMessage(res)}`);
+    if (!res.ok) await refuse(res);
     return res;
   };
   const artifactEntry = (key2) => readConfig(configFile).config.artifacts[key2] ?? {};
@@ -90014,14 +90033,14 @@ function createCloudRoutes(options) {
   const reserve = async (ref) => {
     const key2 = `${ref.type}/${ref.id}`;
     const entry = artifactEntry(key2);
-    if (entry.cloud) return entry.cloud.url;
-    if (entry.autoPublish === false || !autoPublishState().enabled) return null;
+    if (entry.cloud) return { url: entry.cloud.url };
+    if (entry.autoPublish === false || !autoPublishState().enabled) return { url: null };
     try {
       await createRecord2(ref, entry.visibility ?? "private");
-    } catch {
-      return null;
+    } catch (err) {
+      return err instanceof PlanLimited ? { url: null, limit: { message: err.message, upgradeUrl: err.upgradeUrl } } : { url: null };
     }
-    return artifactEntry(key2).cloud?.url ?? null;
+    return { url: artifactEntry(key2).cloud?.url ?? null };
   };
   const prepare = async (ref) => {
     const inspected = await options.inspect(ref);
@@ -90082,7 +90101,7 @@ function createCloudRoutes(options) {
     };
     let res = entry.cloud ? await commit(entry.cloud.id, requested) : await commit(await create3(), void 0);
     if (res.status === 404 && entry.cloud) {
-      if (!recreate) throw new CloudCopyGone();
+      if (!recreate && entry.cloud.publishedAt) throw new CloudCopyGone();
       res = await commit(await create3(), void 0);
     }
     const published = await (await expectOk(res)).json();
@@ -90137,6 +90156,7 @@ function createCloudRoutes(options) {
         return { kind: "opted-out" };
       }
       if (err instanceof SignedOut) return { kind: "signed-out" };
+      if (err instanceof PlanLimited) return { kind: "cannot-create", message: err.message, upgradeUrl: err.upgradeUrl };
       if (err instanceof CreateRefused) return { kind: "cannot-create", message: err.detail };
       if (err instanceof CloudRefused && err.status === 404) return { kind: "gone" };
       if (err instanceof CloudRefused && err.status === 413) return { kind: "not-ready" };
@@ -90196,7 +90216,7 @@ function createCloudRoutes(options) {
       return;
     }
     if (action === "reserve" && ref && method === "POST") {
-      sendJson(res, 200, { url: await serialized(`${ref.type}/${ref.id}`, () => reserve(ref)) });
+      sendJson(res, 200, await serialized(`${ref.type}/${ref.id}`, () => reserve(ref)));
       return;
     }
     if (action === "publish" && ref && method === "DELETE") {
@@ -90273,6 +90293,8 @@ function createCloudRoutes(options) {
         if (res.headersSent) return;
         if (err instanceof SignedOut) {
           sendJson(res, 401, { error: "not signed in to the Ryugi cloud", loginUrl: loginUrl() });
+        } else if (err instanceof PlanLimited) {
+          sendJson(res, 402, { error: err.message, code: "plan_limit", upgradeUrl: err.upgradeUrl });
         } else if (err instanceof CloudRefused) {
           sendJson(res, err.status, { error: err.message });
         } else {
@@ -90434,10 +90456,11 @@ var import_node_fs20 = __toESM(require("node:fs"), 1);
 var IDLE_MS = 5 * 60 * 1e3;
 var MAX_WAIT_MS = 15 * 60 * 1e3;
 var SIGNED_OUT_MESSAGE = "auto-publish paused: the Ryugi Cloud sign-in expired";
+var FAILURES_BEFORE_NOTICE = 3;
 function isNotice(value) {
   if (typeof value !== "object" || value === null) return false;
   const { id: id2, kind, message } = value;
-  return typeof id2 === "string" && (kind === "signed-out" || kind === "cap") && typeof message === "string";
+  return typeof id2 === "string" && (kind === "signed-out" || kind === "cap" || kind === "failing") && typeof message === "string";
 }
 function readAutoPublishState(file) {
   let raw = {};
@@ -90460,9 +90483,10 @@ function createAutoPublisher(options) {
   let notice = saved.notice;
   let paused = saved.paused;
   const remarked = /* @__PURE__ */ new Set();
+  const failures = /* @__PURE__ */ new Map();
   const save = () => writeJsonAtomic(options.stateFile, { dirty: [...dirty], notice, paused });
-  const raise = (kind, message) => {
-    if (notice?.kind !== kind) notice = { id: import_node_crypto8.default.randomUUID(), kind, message };
+  const raise = (kind, message, upgradeUrl) => {
+    if (notice?.kind !== kind) notice = { id: import_node_crypto8.default.randomUUID(), kind, message, ...upgradeUrl ? { upgradeUrl } : {} };
   };
   let idleTimer = null;
   let maxTimer = null;
@@ -90489,6 +90513,15 @@ function createAutoPublisher(options) {
     for (const key2 of [...dirty]) {
       remarked.delete(key2);
       const outcome = await options.publish(key2);
+      console.error(JSON.stringify({ type: "auto-publish", key: key2, outcome: outcome.kind, ..."message" in outcome ? { message: outcome.message } : {} }));
+      if (outcome.kind === "failed" || outcome.kind === "not-ready") {
+        const count = (failures.get(key2) ?? 0) + 1;
+        failures.set(key2, count);
+        if (count >= FAILURES_BEFORE_NOTICE) raise("failing", `${key2}: ${outcome.kind === "failed" ? outcome.message : "not ready to publish; fix its warnings"}`);
+      } else {
+        failures.delete(key2);
+        if (failures.size === 0 && notice?.kind === "failing") notice = null;
+      }
       if (outcome.kind === "signed-out") {
         paused = { token };
         raise("signed-out", SIGNED_OUT_MESSAGE);
@@ -90501,7 +90534,7 @@ function createAutoPublisher(options) {
       } else if (outcome.kind === "opted-out" || outcome.kind === "gone") {
         dirty.delete(key2);
       } else if (outcome.kind === "cannot-create") {
-        raise("cap", outcome.message);
+        raise("cap", outcome.message, outcome.upgradeUrl);
       } else {
         retry = true;
       }
@@ -90657,6 +90690,7 @@ var CONTENT_CSP = {
   document: "sandbox; default-src 'none'",
   html: "sandbox allow-scripts allow-modals allow-forms allow-popups allow-downloads"
 };
+var CLOSE_FLUSH_MS = 5e3;
 var DIRECT_RELAY_ROUTE = /^\/relay\/a\/([A-Za-z0-9_-]{1,64})$/;
 var SHELL_ROUTE = new RegExp(`^/(?:(${ARTIFACT_TYPES.join("|")})/([^/]+)/?)?$`);
 var API_ARTIFACT_ROUTE = /^\/api\/artifacts\/([^/]+)\/([^/]+)$/;
@@ -91432,16 +91466,20 @@ async function startArtifactsServer(options) {
       for (const change of initialChanges) listener(change.ref, change.payload, change.files);
     },
     onActivity: (listener) => activityListeners.push(listener),
-    close: () => new Promise((resolve) => {
-      watcher.close();
-      autoPublisher?.close();
-      relay?.close();
-      direct.close();
-      selections.clearAll();
-      for (const socket of clients) socket.destroy();
-      server.close(() => resolve());
-      server.closeAllConnections();
-    }).then(() => documents.close().catch(() => void 0))
+    close: async () => {
+      await Promise.race([autoPublisher?.flush(), new Promise((resolve) => setTimeout(resolve, CLOSE_FLUSH_MS).unref())]);
+      await new Promise((resolve) => {
+        watcher.close();
+        autoPublisher?.close();
+        relay?.close();
+        direct.close();
+        selections.clearAll();
+        for (const socket of clients) socket.destroy();
+        server.close(() => resolve());
+        server.closeAllConnections();
+      });
+      await documents.close().catch(() => void 0);
+    }
   };
 }
 
@@ -91541,7 +91579,7 @@ function openReady(payload) {
 }
 
 // package.json
-var version = "1.26.1";
+var version = "1.28.0";
 
 // src/server/main.ts
 async function main() {

package/dist/viewer/{CloudDocument-D3S7e7RC.js → CloudDocument-BWuXcyA5.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{a as r,x as i}from"./useSandboxFrame-8NPM2cx_.js";import{_ as a,d as o,f as s,g as c,t as l,v as u,y as d}from"./DocumentLayout-DCqaPuH2.js";var f=e(t(),1),p=n();function m(){let e=(0,f.useMemo)(()=>window.matchMedia(`(prefers-color-scheme: dark)`),[]),[t,n]=(0,f.useState)(e.matches);return(0,f.useEffect)(()=>{let t=()=>n(e.matches);return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[e]),t}function h({id:e,state:t,contentBase:n,comments:h=i(),offline:g=!1}){let _=m(),[v,y]=(0,f.useState)(null),b=(0,f.useMemo)(()=>({artifact:`cloud/${e}`,contentBase:n,channel:a(),send:()=>void 0}),[e,n]),x=r(e,{comments:h.threads.filter(e=>e.status===`open`).length,activity:null,retrying:!1,reason:null});return(0,f.useEffect)(()=>{let e=document.createElement(`base`);return e.href=n,document.head.prepend(e),()=>e.remove()},[n]),(0,p.jsxs)(`div`,{className:`x1us19tq x1rozbrz xo2rkog`,className:`ryugi-doc ${{className:`x1us19tq x1rozbrz xo2rkog`}.className??``}`,children:[g?(0,p.jsxs)(`div`,{...{0:{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`},1:{className:`x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61 x1s85apg x1ux6vrq`}}[!!x|0],children:[(0,p.jsx)(`i`,{className:`xci0xqf x1hagigm x16rqkct xxwmxtg`}),`电脑离线，暂时不能评论`]}):null,(0,p.jsx)(l,{editor:v,threads:h.threads,children:(0,p.jsx)(c.Provider,{value:b,children:(0,p.jsx)(d,{variant:`article`,theme:_?`dark`:`light`,initialValue:t,extraNodes:o,rendererConfig:s,onEditorReady:e=>{e?.setEditable(!1),y(e??null)},children:(0,p.jsx)(u,{})})})})]})}export{h as default};
+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,x as i}from"./useSandboxFrame-8NPM2cx_.js";import{_ as a,d as o,f as s,g as c,t as l,v as u,y as d}from"./DocumentLayout-Byi-FSqu.js";var f=e(t(),1),p=n();function m(){let e=(0,f.useMemo)(()=>window.matchMedia(`(prefers-color-scheme: dark)`),[]),[t,n]=(0,f.useState)(e.matches);return(0,f.useEffect)(()=>{let t=()=>n(e.matches);return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[e]),t}function h({id:e,state:t,contentBase:n,comments:h=i(),offline:g=!1}){let _=m(),[v,y]=(0,f.useState)(null),b=(0,f.useMemo)(()=>({artifact:`cloud/${e}`,contentBase:n,channel:a(),send:()=>void 0}),[e,n]),x=r(e,{comments:h.threads.filter(e=>e.status===`open`).length,activity:null,retrying:!1,reason:null});return(0,f.useEffect)(()=>{let e=document.createElement(`base`);return e.href=n,document.head.prepend(e),()=>e.remove()},[n]),(0,p.jsxs)(`div`,{className:`x1us19tq x1rozbrz xo2rkog`,className:`ryugi-doc ${{className:`x1us19tq x1rozbrz xo2rkog`}.className??``}`,children:[g?(0,p.jsxs)(`div`,{...{0:{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`},1:{className:`x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61 x1s85apg x1ux6vrq`}}[!!x|0],children:[(0,p.jsx)(`i`,{className:`xci0xqf x1hagigm x16rqkct xxwmxtg`}),`电脑离线，暂时不能评论`]}):null,(0,p.jsx)(l,{editor:v,threads:h.threads,children:(0,p.jsx)(c.Provider,{value:b,children:(0,p.jsx)(d,{variant:`article`,theme:_?`dark`:`light`,initialValue:t,extraNodes:o,rendererConfig:s,onEditorReady:e=>{e?.setEditable(!1),y(e??null)},children:(0,p.jsx)(u,{})})})})]})}export{h as default};

package/dist/viewer/{CloudLiveDocument-CRPSKpFi.js → CloudLiveDocument-DY2AK2fW.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{a as r}from"./useSandboxFrame-8NPM2cx_.js";import{t as i}from"./index.js";import a from"./CloudDocument-D3S7e7RC.js";import{DocumentView as o,t as s}from"./DocumentPage-U7FIJYbX.js";var c=e(t(),1),l=`1.26.1`,u=e=>/^(\d+)\.(\d+)\./.exec(e??``)?.slice(1,3).join(`.`)??null;function d(e,t){let n=u(e);return n!==null&&n===u(t)}var f=(e,t)=>`电脑上的 ryugi 是 ${t??`未知版本`}，网页是 ${e}，版本对上之前只能评论`,p=n();function m({id:e,state:t,contentBase:n,liveContentBase:u,comments:m}){let{transport:h,presence:g}=s(e,u??n??``),_=g?.online??!1;r(e,{online:g?.online??null});let[v,y]=(0,c.useState)(!1);if((0,c.useEffect)(()=>{_&&y(!0)},[_]),!h||!(v||_))return!t||!n?(0,p.jsx)(i,{children:g===null?`正在连接…`:`还没发布。电脑在线时，这里会实时显示。`}):(0,p.jsx)(a,{id:e,state:t,contentBase:n,comments:m,offline:g!==null&&!_});let b=_&&d(l,g?.version??null),x=_&&!b?f(l,g?.version??null):null;return(0,p.jsx)(o,{id:e,transport:h,live:_,cloud:{online:_,canEdit:b,reason:x}})}export{m as default};
+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}from"./useSandboxFrame-8NPM2cx_.js";import{t as i}from"./index.js";import a from"./CloudDocument-BWuXcyA5.js";import{DocumentView as o,t as s}from"./DocumentPage-OOUWnUbI.js";var c=e(t(),1),l=`1.28.0`,u=e=>/^(\d+)\.(\d+)\./.exec(e??``)?.slice(1,3).join(`.`)??null;function d(e,t){let n=u(e);return n!==null&&n===u(t)}var f=(e,t)=>`电脑上的 ryugi 是 ${t??`未知版本`}，网页是 ${e}，版本对上之前只能评论`,p=n();function m({id:e,state:t,contentBase:n,liveContentBase:u,comments:m}){let{transport:h,presence:g}=s(e,u??n??``),_=g?.online??!1;r(e,{online:g?.online??null});let[v,y]=(0,c.useState)(!1);if((0,c.useEffect)(()=>{_&&y(!0)},[_]),!h||!(v||_))return!t||!n?(0,p.jsx)(i,{children:g===null?`正在连接…`:`还没发布。电脑在线时，这里会实时显示。`}):(0,p.jsx)(a,{id:e,state:t,contentBase:n,comments:m,offline:g!==null&&!_});let b=_&&d(l,g?.version??null),x=_&&!b?f(l,g?.version??null):null;return(0,p.jsx)(o,{id:e,transport:h,live:_,cloud:{online:_,canEdit:b,reason:x}})}export{m as default};