@usegraft/assets 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/index.d.ts

@@ -24,8 +24,22 @@ declare function defaultKeyFor(file: string): string;
 interface PresignOptions {
     expiresIn?: number;
 }
+interface PutOptions {
+    /**
+     * Write only if nothing is stored under the key yet. Sent as
+     * `If-None-Match: *`, so the store decides, not a separate existence check
+     * that a concurrent upload could slip past. A taken key throws
+     * AssetKeyTakenError. A store that ignores the header writes as usual.
+     */
+    ifAbsent?: boolean;
+}
+/** The key already held an object, and the put asked for `ifAbsent`. */
+declare class AssetKeyTakenError extends Error {
+    readonly key: string;
+    constructor(key: string);
+}
 interface Storage {
-    put(key: string, body: Uint8Array | string, contentType?: string): Promise<void>;
+    put(key: string, body: Uint8Array | string, contentType?: string, options?: PutOptions): Promise<void>;
     get(key: string): Promise<Uint8Array>;
     delete(key: string): Promise<void>;
     exists(key: string): Promise<boolean>;
@@ -41,4 +55,4 @@ interface Storage {
 }
 declare function createStorage(config?: StorageConfig): Storage;
 
-export { type PresignOptions, type Storage, type StorageConfig, contentTypeFor, createStorage, defaultKeyFor, storageConfigFromEnv };
+export { AssetKeyTakenError, type PresignOptions, type PutOptions, type Storage, type StorageConfig, contentTypeFor, createStorage, defaultKeyFor, storageConfigFromEnv };

package/dist/index.js

@@ -41,6 +41,19 @@ function defaultKeyFor(file) {
 
 // src/storage.ts
 import { AwsClient } from "aws4fetch";
+var AssetKeyTakenError = class extends Error {
+  key;
+  constructor(key) {
+    super(`An object is already stored under "${key}".`);
+    this.name = "AssetKeyTakenError";
+    this.key = key;
+  }
+};
+function withoutTrailingSlashes(value) {
+  let end = value.length;
+  while (end > 0 && value.charCodeAt(end - 1) === 47) end -= 1;
+  return value.slice(0, end);
+}
 function createStorage(config = storageConfigFromEnv()) {
   const aws = new AwsClient({
     accessKeyId: config.accessKeyId,
@@ -48,7 +61,7 @@ function createStorage(config = storageConfigFromEnv()) {
     region: config.region,
     service: "s3"
   });
-  const base = `${config.endpoint.replace(/\/+$/, "")}/${config.bucket}`;
+  const base = `${withoutTrailingSlashes(config.endpoint)}/${config.bucket}`;
   const urlFor = (key) => `${base}/${key.split("/").map(encodeURIComponent).join("/")}`;
   const presign = async (key, method, options) => {
     const url = new URL(urlFor(key));
@@ -57,12 +70,12 @@ function createStorage(config = storageConfigFromEnv()) {
     return signed.url;
   };
   return {
-    async put(key, body, contentType) {
-      const res = await aws.fetch(urlFor(key), {
-        method: "PUT",
-        body,
-        headers: contentType ? { "content-type": contentType } : void 0
-      });
+    async put(key, body, contentType, options = {}) {
+      const headers = {};
+      if (contentType) headers["content-type"] = contentType;
+      if (options.ifAbsent) headers["if-none-match"] = "*";
+      const res = await aws.fetch(urlFor(key), { method: "PUT", body, headers });
+      if (res.status === 412 && options.ifAbsent) throw new AssetKeyTakenError(key);
       if (!res.ok) throw new Error(`storage put failed (${res.status}): ${await res.text()}`);
     },
     async get(key) {
@@ -86,7 +99,7 @@ function createStorage(config = storageConfigFromEnv()) {
     },
     async url(key, options = {}) {
       if (config.publicBaseUrl) {
-        const publicBase = config.publicBaseUrl.replace(/\/+$/, "");
+        const publicBase = withoutTrailingSlashes(config.publicBaseUrl);
         return `${publicBase}/${key.split("/").map(encodeURIComponent).join("/")}`;
       }
       return presign(key, "GET", options);
@@ -94,6 +107,7 @@ function createStorage(config = storageConfigFromEnv()) {
   };
 }
 export {
+  AssetKeyTakenError,
   contentTypeFor,
   createStorage,
   defaultKeyFor,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usegraft/assets",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "description": "S3-compatible object storage for binary assets: Cloudflare R2, MinIO, Tigris.",
   "keywords": [
     "agent",