ryugi-artifacts 1.29.0 → 1.30.0

package/dist/cli.cjs

@@ -675,6 +675,24 @@ async function start(options, emit) {
   }
 }
 
+// src/shared/cloud-error.ts
+function cloudErrorDetails(value) {
+  if (!value || typeof value !== "object") return {};
+  const fields = value;
+  const details = {};
+  if (typeof fields.code === "string") details.code = fields.code;
+  if (fields.plan === "free" || fields.plan === "pro") details.plan = fields.plan;
+  if (typeof fields.upgradeUrl === "string") details.upgradeUrl = fields.upgradeUrl;
+  if (fields.limit && typeof fields.limit === "object") {
+    const limit = fields.limit;
+    if (typeof limit.kind === "string" && typeof limit.used === "number" && Number.isFinite(limit.used) && limit.used >= 0 && typeof limit.max === "number" && Number.isFinite(limit.max) && limit.max >= 0) {
+      details.limit = { kind: limit.kind, used: limit.used, max: limit.max };
+      if (typeof limit.requested === "number" && Number.isFinite(limit.requested) && limit.requested >= 0) details.limit.requested = limit.requested;
+    }
+  }
+  return details;
+}
+
 // src/cli/publish.ts
 async function publish(options, emit) {
   if (options.action === "publish" || options.action === "unpublish") {
@@ -686,8 +704,9 @@ 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 } : {});
+    const details = cloudErrorDetails(json);
+    if (status === 402 && details.code === "plan_limit") throw new CliError("", { type: "plan-limit", message: json.error, status, ...details }, 2);
+    if (status < 200 || status >= 300) throw new CliError(json.error || `HTTP ${status}`, { status, ...details, ...json.reasons ? { reasons: json.reasons } : {} });
     return json;
   };
   const { action, artifact, cloudId } = options;
@@ -928,7 +947,7 @@ async function main(argv) {
       }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.29.0");
+      console.log("1.30.0");
       return 0;
     }
     if (command === "--help" || command === "-h") {

package/dist/server.cjs

@@ -89796,6 +89796,24 @@ function callbackPage(result) {
 `;
 }
 
+// src/shared/cloud-error.ts
+function cloudErrorDetails(value) {
+  if (!value || typeof value !== "object") return {};
+  const fields = value;
+  const details = {};
+  if (typeof fields.code === "string") details.code = fields.code;
+  if (fields.plan === "free" || fields.plan === "pro") details.plan = fields.plan;
+  if (typeof fields.upgradeUrl === "string") details.upgradeUrl = fields.upgradeUrl;
+  if (fields.limit && typeof fields.limit === "object") {
+    const limit = fields.limit;
+    if (typeof limit.kind === "string" && typeof limit.used === "number" && Number.isFinite(limit.used) && limit.used >= 0 && typeof limit.max === "number" && Number.isFinite(limit.max) && limit.max >= 0) {
+      details.limit = { kind: limit.kind, used: limit.used, max: limit.max };
+      if (typeof limit.requested === "number" && Number.isFinite(limit.requested) && limit.requested >= 0) details.limit.requested = limit.requested;
+    }
+  }
+  return details;
+}
+
 // src/server/pack.ts
 var import_node_fs16 = __toESM(require("node:fs"), 1);
 var import_node_path16 = __toESM(require("node:path"), 1);
@@ -89904,24 +89922,26 @@ var ROUTE = /^\/api\/cloud\/(status|login|logout|artifacts|publish|reserve|visib
 var SignedOut = class extends Error {
 };
 var CloudRefused = class extends Error {
-  constructor(status, message) {
+  constructor(status, message, details = {}) {
     super(message);
     this.status = status;
+    this.details = details;
   }
   status;
+  details;
 };
 var CloudCopyGone = class extends Error {
 };
 var PlanLimited = class extends CloudRefused {
-  constructor(message, upgradeUrl) {
-    super(402, message);
+  constructor(message, upgradeUrl, details) {
+    super(402, message, details);
     this.upgradeUrl = upgradeUrl;
   }
   upgradeUrl;
 };
 var CreateRefused = class extends CloudRefused {
   constructor(detail) {
-    super(502, `cloud refused (403): ${detail}`);
+    super(403, `cloud refused (403): ${detail}`);
     this.detail = detail;
   }
   detail;
@@ -89944,12 +89964,14 @@ async function refuse(res) {
   const text2 = await res.text().catch(() => "");
   let parsed = {};
   try {
-    parsed = JSON.parse(text2);
+    const body = JSON.parse(text2);
+    if (body && typeof body === "object") parsed = body;
   } catch {
   }
+  const details = cloudErrorDetails(parsed);
   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}`);
+  if (res.status === 402 && details.code === "plan_limit" && details.upgradeUrl) throw new PlanLimited(message, details.upgradeUrl, details);
+  throw new CloudRefused(res.status, `cloud refused (${res.status}): ${message}`, details);
 }
 async function errorMessage(res) {
   const text2 = await res.text().catch(() => "");
@@ -90159,7 +90181,7 @@ function createCloudRoutes(options) {
       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" };
+      if (err instanceof CloudRefused && err.status === 413) return { kind: "cannot-create", message: err.message };
       return { kind: "failed", message: err.message };
     }
   };
@@ -90294,9 +90316,9 @@ function createCloudRoutes(options) {
         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 });
+          sendJson(res, 402, { error: err.message, ...err.details });
         } else if (err instanceof CloudRefused) {
-          sendJson(res, err.status, { error: err.message });
+          sendJson(res, err.status, { error: err.message, ...err.details });
         } else {
           sendJson(res, 500, { error: err.message });
         }
@@ -91579,7 +91601,7 @@ function openReady(payload) {
 }
 
 // package.json
-var version = "1.29.0";
+var version = "1.30.0";
 
 // src/server/main.ts
 async function main() {

package/dist/viewer/CloudDocument-F3ikpU1A.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,x as i}from"./useSandboxFrame-DJc_WnFq.js";import{E as a,T as o,d as s,f as c,k as l,t as u,y as d}from"./DocumentLayout-CDZm1Mud.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:o(),send:()=>void 0}),[e,n]),x=r(e,{comments:h.threads.filter(e=>e.status===`open`).length,activity:null,retrying:!1,reason:null,history:!1,historyOpen:!1});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:[x?null:(0,p.jsxs)(`div`,{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`,children:[(0,p.jsx)(`button`,{type:`button`,className:`doc-history-entry`,disabled:!0,title:`电脑离线，历史暂不可用`,children:`历史记录`}),(0,p.jsx)(`span`,{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)(u,{editor:v,threads:h.threads,children:(0,p.jsx)(d.Provider,{value:b,children:(0,p.jsx)(l,{variant:`article`,theme:_?`dark`:`light`,initialValue:t,extraNodes:s,rendererConfig:c,onEditorReady:e=>{e?.setEditable(!1),y(e??null)},children:(0,p.jsx)(a,{})})})})]})}export{h as default};

package/dist/viewer/{CloudLiveDocument-BDga8aEj.js → CloudLiveDocument-DuFE3g-N.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-rZO0A3sZ.js";import{t as i}from"./index.js";import a from"./CloudDocument-DaS9ceOa.js";import{DocumentView as o,t as s}from"./DocumentPage-BLL9x3pY.js";var c=e(t(),1),l=`1.29.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};
+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-DJc_WnFq.js";import{t as i}from"./index.js";import a from"./CloudDocument-F3ikpU1A.js";import{DocumentView as o,t as s}from"./DocumentPage-DJWzglCT.js";var c=e(t(),1),l=`1.30.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};