lazypock 0.16.1 → 0.17.1

package/dist/index.cjs

@@ -39,6 +39,7 @@ __export(index_exports, {
   getFileUrl: () => getFileUrl,
   getScaleUrl: () => getScaleUrl,
   getThumbUrl: () => getThumbUrl,
+  getVariantUrl: () => getVariantUrl,
   schemaFieldType: () => schemaFieldType,
   wsUrlFromBaseUrl: () => wsUrlFromBaseUrl
 });
@@ -385,20 +386,24 @@ var AuthStore = class {
   }
   /**
    * Set the auth collection name (used internally by auto-refresh).
+   *
+   * Persisted, so it survives a reload together with the token and model.
    * @param name The collection name, or null for superuser tokens.
    */
   setCollectionName(name) {
     this._collectionName = name;
+    void this.persistCollectionName();
   }
   /**
    * Load persisted auth state from storage.
    * Should be called once at application startup.
    */
   async init() {
-    const [token, model, expiresAt] = await Promise.all([
+    const [token, model, expiresAt, collectionName] = await Promise.all([
       this.storage.get("auth_token"),
       this.storage.get("auth_model"),
-      this.storage.get("auth_expires_at")
+      this.storage.get("auth_expires_at"),
+      this.storage.get("auth_collection")
     ]);
     if (token) this._token = token;
     if (expiresAt) this._tokenExpiresAt = parseInt(expiresAt, 10) || null;
@@ -408,6 +413,11 @@ var AuthStore = class {
       } catch {
       }
     }
+    if (collectionName) {
+      this._collectionName = collectionName;
+    } else if (this._model && typeof this._model.collectionName === "string") {
+      this._collectionName = this._model.collectionName;
+    }
   }
   /**
    * Update the current auth token and model, persist to storage, and notify listeners.
@@ -418,15 +428,19 @@ var AuthStore = class {
     this._token = token;
     this._model = model;
     this._tokenExpiresAt = Date.now() + TOKEN_TTL_MS;
+    if (!this._collectionName && model && typeof model.collectionName === "string") {
+      this._collectionName = model.collectionName;
+    }
     void Promise.all([
       this.storage.set("auth_token", token),
       this.storage.set("auth_expires_at", String(this._tokenExpiresAt)),
-      model ? this.storage.set("auth_model", JSON.stringify(model)) : this.storage.remove("auth_model")
+      model ? this.storage.set("auth_model", JSON.stringify(model)) : this.storage.remove("auth_model"),
+      this.persistCollectionName()
     ]);
     this.notify();
   }
   /**
-   * Clear all auth state (token, model, expiry) and notify listeners.
+   * Clear all auth state (token, model, expiry, collection) and notify listeners.
    */
   clear() {
     this._token = "";
@@ -436,10 +450,14 @@ var AuthStore = class {
     void Promise.all([
       this.storage.remove("auth_token"),
       this.storage.remove("auth_expires_at"),
-      this.storage.remove("auth_model")
+      this.storage.remove("auth_model"),
+      this.storage.remove("auth_collection")
     ]);
     this.notify();
   }
+  persistCollectionName() {
+    return this._collectionName ? this.storage.set("auth_collection", this._collectionName) : this.storage.remove("auth_collection");
+  }
   /**
    * Register a listener for auth state changes.
    * @param fn Callback invoked with (model, token) on every change.
@@ -1229,7 +1247,7 @@ var CollectionService = class _CollectionService {
       requestKey,
       autoCancel,
       cancelKey,
-      fetch,
+      fetch: fetch2,
       headers,
       signal,
       singleFlight,
@@ -1273,7 +1291,7 @@ var CollectionService = class _CollectionService {
       requestKey,
       autoCancel,
       cancelKey,
-      fetch,
+      fetch: fetch2,
       headers,
       signal,
       singleFlight,
@@ -1999,9 +2017,28 @@ function getThumbUrl(baseUrl, fileId, size) {
 function getScaleUrl(baseUrl, fileId, size) {
   return baseUrl.replace(/\/+$/, "") + "/files/" + encodeURIComponent(fileId) + "/scale/" + encodeURIComponent(size);
 }
+function getVariantUrl(baseUrl, fileId, preset) {
+  return getScaleUrl(baseUrl, fileId, preset);
+}
+function parseUploadTarget(rawUrl, allowedHosts) {
+  let parsed;
+  try {
+    parsed = new URL(rawUrl);
+  } catch {
+    throw new Error("Direct upload: the server returned an invalid upload URL");
+  }
+  if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+    throw new Error(`Direct upload: unsupported protocol ${parsed.protocol}`);
+  }
+  if (allowedHosts && allowedHosts.length > 0 && !allowedHosts.includes(parsed.host)) {
+    throw new Error(`Direct upload: host ${parsed.host} is not in the allowlist`);
+  }
+  return parsed;
+}
 var FilesService = class {
-  constructor(http) {
+  constructor(http, allowedUploadHosts) {
     this.http = http;
+    this.allowedUploadHosts = allowedUploadHosts;
   }
   /**
    * Upload a file or blob.
@@ -2022,6 +2059,8 @@ var FilesService = class {
       formData.append("collection_name", meta.collectionName);
     if (meta?.recordId) formData.append("record_id", meta.recordId);
     if (meta?.fieldName) formData.append("field_name", meta.fieldName);
+    if (meta?.origin) formData.append("origin", meta.origin);
+    if (meta?.variants?.length) formData.append("variants", meta.variants.join(","));
     const data = await this.http.request(
       "POST",
       "/files",
@@ -2030,6 +2069,62 @@ var FilesService = class {
     );
     return data;
   }
+  /**
+   * Direct upload (Mode B): the browser PUTs straight to S3/R2.
+   *
+   * Presigns, uploads, then asks the server to verify the object. Falls back to
+   * `upload()` when the server has no direct-upload support configured.
+   */
+  async uploadDirect(file, opts) {
+    const filename = opts?.filename || (file instanceof File ? file.name : "file");
+    const mime = file.type || "application/octet-stream";
+    const presigned = await this.presign({
+      filename,
+      size: file.size,
+      mime,
+      collectionName: opts?.collectionName,
+      fieldName: opts?.fieldName,
+      recordId: opts?.recordId
+    });
+    if (!presigned) return this.upload(file, filename, { signal: opts?.signal }, { collectionName: opts?.collectionName, fieldName: opts?.fieldName, recordId: opts?.recordId });
+    const target = parseUploadTarget(presigned.url, this.allowedUploadHosts);
+    const put = await fetch(target.href, {
+      method: presigned.method || "PUT",
+      headers: presigned.headers,
+      body: file,
+      signal: opts?.signal
+    });
+    if (!put.ok) throw new Error(`Direct upload failed: HTTP ${put.status}`);
+    return this.complete(presigned.id, { variant: opts?.variant, signal: opts?.signal });
+  }
+  /** Step 1 of a direct upload: reserve an object and get a presigned PUT. */
+  async presign(params) {
+    const data = await this.http.request(
+      "POST",
+      "/files/presign",
+      {
+        filename: params.filename,
+        size: params.size,
+        mime: params.mime,
+        collection_name: params.collectionName,
+        field_name: params.fieldName,
+        record_id: params.recordId
+      }
+    );
+    if (!data || typeof data.url !== "string") return null;
+    return data;
+  }
+  /** Step 2 of a direct upload: ask the server to verify the object. */
+  async complete(fileId, opts) {
+    const query = opts?.variant ? `?variants=${encodeURIComponent(opts.variant)}` : "";
+    const data = await this.http.request(
+      "POST",
+      `/files/${encodeURIComponent(fileId)}/complete${query}`,
+      {},
+      { signal: opts?.signal }
+    );
+    return data;
+  }
   /**
    * List uploaded files (newest first), with optional filters.
    *
@@ -2842,6 +2937,7 @@ function createClient(options) {
   getFileUrl,
   getScaleUrl,
   getThumbUrl,
+  getVariantUrl,
   schemaFieldType,
   wsUrlFromBaseUrl
 });