@netlify/spark-ui 1.26.0-alpha.2 → 1.26.0-alpha.3

package/dist/components/preact/DropZone/drop-core/client.d.ts

@@ -1,9 +1,9 @@
-import { Deploy, Digest } from './types';
+import { DropResponse, Digest } from './types';
 export interface DropClient {
     getToken(): Promise<string>;
-    createDeploy(digest: Digest, token: string): Promise<Deploy>;
+    createDeploy(digest: Digest, token: string): Promise<DropResponse>;
     uploadFile(deployId: string, path: string, content: ArrayBuffer, token: string): Promise<void>;
-    waitUntilReady(deploy: Deploy, token: string): Promise<void>;
+    waitUntilReady(deploy: DropResponse, token: string): Promise<void>;
 }
 /**
  * Unauthenticated drop client. Authorized server-side by the Referer header,
@@ -13,7 +13,7 @@ export declare class AnonymousDropClient implements DropClient {
     private apiBase;
     constructor(apiBase?: string);
     getToken(): Promise<string>;
-    createDeploy(files: Digest, token: string): Promise<Deploy>;
+    createDeploy(files: Digest, token: string): Promise<DropResponse>;
     uploadFile(deployId: string, path: string, content: ArrayBuffer, token: string): Promise<void>;
-    waitUntilReady(deploy: Deploy, token: string): Promise<void>;
+    waitUntilReady(deploy: DropResponse, token: string): Promise<void>;
 }

package/dist/components/preact/DropZone/drop-core/client.js

@@ -27,7 +27,7 @@ class n {
   }
   async waitUntilReady(e, o) {
     for (let t = 0; t < 600; t++) {
-      const a = await fetch(`${this.apiBase}/deploys/${e.id}`, {
+      const a = await fetch(`${this.apiBase}/deploys/${e.deploy_id}`, {
         headers: { Authorization: `Bearer ${o}` }
       });
       if (a.ok && (await a.json()).state === "ready") return;

package/dist/components/preact/DropZone/drop-core/types.d.ts

@@ -8,8 +8,17 @@ export interface ProcessedFile {
     name: string;
 }
 export type Digest = Record<string, string>;
-export interface Deploy {
+/**
+ * Response body of `POST /api/v1/drop`. Not a canonical Deploy resource —
+ * it's a mixed shape carrying both the anonymous site and the initial deploy
+ * so the client has everything it needs to upload, poll, and hand off to the
+ * user in one round trip.
+ */
+export interface DropResponse {
+    /** site id (UUID) — surfaced to callers so they can build claim links */
     id: string;
+    /** deploy id (BSON) — used for `/deploys/{deploy_id}` reads and file PUTs */
+    deploy_id: string;
     /** the *.netlify.app subdomain assigned to the anonymous site */
     subdomain: string;
     /** SHAs the backend does NOT yet have — only these get uploaded */
@@ -17,7 +26,7 @@ export interface Deploy {
     state?: string;
 }
 export interface DeployResult {
-    deploy: Deploy;
+    deploy: DropResponse;
     /** drop token — persist this to later claim the site into an account */
     token: string;
     url: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@netlify/spark-ui",
   "description": "Assets, design tokens, components, and utilities",
-  "version": "1.26.0-alpha.2",
+  "version": "1.26.0-alpha.3",
   "type": "module",
   "main": "dist/components/preact/index.js",
   "types": "dist/components/preact/index.d.ts",

package/packages/components/preact/DropZone/drop-core/client.ts

@@ -1,10 +1,10 @@
-import type { Deploy, Digest } from './types';
+import type { DropResponse, Digest } from './types';
 
 export interface DropClient {
   getToken(): Promise<string>;
-  createDeploy(digest: Digest, token: string): Promise<Deploy>;
+  createDeploy(digest: Digest, token: string): Promise<DropResponse>;
   uploadFile(deployId: string, path: string, content: ArrayBuffer, token: string): Promise<void>;
-  waitUntilReady(deploy: Deploy, token: string): Promise<void>;
+  waitUntilReady(deploy: DropResponse, token: string): Promise<void>;
 }
 
 const API = 'https://api.netlify.com/api/v1';
@@ -22,7 +22,7 @@ export class AnonymousDropClient implements DropClient {
     return (await res.json()).token;
   }
 
-  async createDeploy(files: Digest, token: string): Promise<Deploy> {
+  async createDeploy(files: Digest, token: string): Promise<DropResponse> {
     const res = await fetch(`${this.apiBase}/drop`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -47,10 +47,13 @@ export class AnonymousDropClient implements DropClient {
     if (!res.ok) throw new Error(`upload ${path} failed: ${res.status}`);
   }
 
-  async waitUntilReady(deploy: Deploy, token: string): Promise<void> {
+  async waitUntilReady(deploy: DropResponse, token: string): Promise<void> {
     // Poll the deploy with the drop token until ready.
+    // Note: `/deploys/{id}` expects the deploy_id (BSON), not the site id (UUID)
+    // that lives at `deploy.id`. See drop_controller.rb; Deploy.find(uuid) is nil
+    // and the request 401s misleadingly via require_current_actor!.
     for (let i = 0; i < 600; i++) {
-      const res = await fetch(`${this.apiBase}/deploys/${deploy.id}`, {
+      const res = await fetch(`${this.apiBase}/deploys/${deploy.deploy_id}`, {
         headers: { Authorization: `Bearer ${token}` },
       });
       if (res.ok && (await res.json()).state === 'ready') return;

package/packages/components/preact/DropZone/drop-core/types.ts

@@ -10,8 +10,17 @@ export interface ProcessedFile {
 
 export type Digest = Record<string, string>; // { "/index.html": "<sha1>" }
 
-export interface Deploy {
+/**
+ * Response body of `POST /api/v1/drop`. Not a canonical Deploy resource —
+ * it's a mixed shape carrying both the anonymous site and the initial deploy
+ * so the client has everything it needs to upload, poll, and hand off to the
+ * user in one round trip.
+ */
+export interface DropResponse {
+  /** site id (UUID) — surfaced to callers so they can build claim links */
   id: string;
+  /** deploy id (BSON) — used for `/deploys/{deploy_id}` reads and file PUTs */
+  deploy_id: string;
   /** the *.netlify.app subdomain assigned to the anonymous site */
   subdomain: string;
   /** SHAs the backend does NOT yet have — only these get uploaded */
@@ -20,7 +29,7 @@ export interface Deploy {
 }
 
 export interface DeployResult {
-  deploy: Deploy;
+  deploy: DropResponse;
   /** drop token — persist this to later claim the site into an account */
   token: string;
   url: string; // https://<subdomain>.netlify.app