ryugi-artifacts 1.7.2 → 1.7.4

package/dist/server.cjs

@@ -84619,7 +84619,7 @@ var defaults = () => ({ version: 1, artifacts: {} });
 function isCloudRecord(value) {
   if (typeof value !== "object" || value === null) return false;
   const { id: id2, url, publishedAt, visibility } = value;
-  return typeof id2 === "string" && typeof url === "string" && typeof publishedAt === "string" && isVisibility(visibility);
+  return typeof id2 === "string" && typeof url === "string" && (typeof publishedAt === "string" || publishedAt === null) && isVisibility(visibility);
 }
 function normalize(raw) {
   const config = defaults();
@@ -84886,6 +84886,7 @@ function withCloudRuntime(type, files) {
 
 // src/server/cloud.ts
 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|visibility)(?:\/([^/]+)(?:\/([^/]+))?)?$/;
@@ -84938,8 +84939,10 @@ function createCloudRoutes(options) {
     if (!credentials) throw new SignedOut();
     const headers = { Authorization: `Bearer ${credentials.token}` };
     let payload;
-    if (body instanceof FormData) payload = body;
-    else if (body) {
+    if (body instanceof Uint8Array) {
+      headers["Content-Type"] = "application/octet-stream";
+      payload = body;
+    } else if (body) {
       headers["Content-Type"] = "application/json";
       payload = JSON.stringify(body);
     }
@@ -84969,15 +84972,40 @@ function createCloudRoutes(options) {
     }
     const key2 = `${ref.type}/${ref.id}`;
     const entry = artifactEntry(key2);
-    const upload = (visibility) => {
-      const form = new FormData();
-      form.set("meta", JSON.stringify({ type: ref.type, title: inspected.title, ...visibility ? { visibility } : {} }));
-      form.set("payload", JSON.stringify(inspected.payload));
-      for (const file of files) form.set(`file:${file.path}`, new Blob([new Uint8Array(file.data)]), file.path);
-      return form;
+    const hashed = files.map((file) => ({ ...file, hash: import_node_crypto3.default.createHash("sha256").update(file.data).digest("hex") }));
+    const byHash = new Map(hashed.map((file) => [file.hash, file.data]));
+    const manifest = hashed.map(({ path: path17, hash }) => ({ path: path17, hash }));
+    const version = (visibility) => ({ title: inspected.title, payload: inspected.payload, files: manifest, ...visibility ? { visibility } : {} });
+    const create3 = async () => {
+      const res2 = await cloudFetch("POST", "/api/artifacts", { type: ref.type, visibility: requested ?? entry.visibility ?? "private" });
+      const created = await (await expectOk(res2)).json();
+      updateArtifactConfig(configFile, key2, {
+        visibility: created.visibility,
+        cloud: { id: created.id, url: created.url, publishedAt: null, visibility: created.visibility }
+      });
+      return created.id;
+    };
+    const upload = async (id2, hashes) => {
+      for (let i6 = 0; i6 < hashes.length; i6 += UPLOAD_CONCURRENCY) {
+        await Promise.all(
+          hashes.slice(i6, i6 + UPLOAD_CONCURRENCY).map(async (hash) => {
+            const data = byHash.get(hash);
+            if (!data) throw new CloudRefused(502, `cloud asked for a file this artifact does not have (${hash})`);
+            await expectOk(await cloudFetch("PUT", `/api/artifacts/${id2}/blobs/${hash}`, new Uint8Array(data)));
+          })
+        );
+      }
+    };
+    const commit = async (id2, visibility) => {
+      const res2 = await cloudFetch("POST", `/api/artifacts/${id2}/versions`, version(visibility));
+      if (res2.status !== 409) return res2;
+      const { missing } = await res2.clone().json().catch(() => ({}));
+      if (!Array.isArray(missing)) return res2;
+      await upload(id2, missing);
+      return cloudFetch("POST", `/api/artifacts/${id2}/versions`, version(visibility));
     };
-    let res = entry.cloud ? await cloudFetch("PUT", `/api/artifacts/${entry.cloud.id}`, upload(requested)) : null;
-    if (!res || res.status === 404) res = await cloudFetch("POST", "/api/artifacts", upload(requested ?? entry.visibility ?? "private"));
+    let res = entry.cloud ? await commit(entry.cloud.id, requested) : await commit(await create3(), void 0);
+    if (res.status === 404 && entry.cloud) res = await commit(await create3(), void 0);
     const published = await (await expectOk(res)).json();
     updateArtifactConfig(configFile, key2, {
       visibility: published.visibility,