@nebutra/uploads 0.1.2 → 2.0.0

package/dist/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAIlF;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,CAAC,EAAE,cAAc,GAAG,cAAc,CAM5E;AAkFD;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAOxF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAO1C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,kBAAkB,CAyB1D"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAIlF;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,CAAC,EAAE,cAAc,GAAG,cAAc,CAM5E;AA6FD;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAOxF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAO1C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,kBAAkB,CAyB1D"}

package/dist/factory.js

@@ -40,8 +40,19 @@ function createUploadProviderByType(type, config) {
  * Auto-detect provider based on environment
  */
 function autoDetectProvider(config) {
-    // Priority 1: Check explicit UPLOAD_PROVIDER
-    const explicitProvider = process.env.UPLOAD_PROVIDER;
+    // Priority 1: Check explicit UPLOAD_PROVIDER (r2 is an alias for S3-compatible)
+    const explicitRaw = process.env.UPLOAD_PROVIDER?.trim().toLowerCase();
+    if (explicitRaw === "r2") {
+        logger.info("Using explicit upload provider", { provider: "r2→s3" });
+        return new S3UploadProvider({
+            accessKeyId: process.env.R2_ACCESS_KEY_ID || "",
+            secretAccessKey: process.env.R2_SECRET_ACCESS_KEY || "",
+            region: "auto",
+            ...(process.env.R2_ENDPOINT !== undefined ? { endpoint: process.env.R2_ENDPOINT } : {}),
+            ...(process.env.R2_PUBLIC_URL !== undefined ? { publicUrl: process.env.R2_PUBLIC_URL } : {}),
+        });
+    }
+    const explicitProvider = explicitRaw;
     if (explicitProvider) {
         logger.info("Using explicit upload provider", { provider: explicitProvider });
         return createUploadProviderByType(explicitProvider, config);

package/dist/providers/local.d.ts

@@ -11,6 +11,8 @@ export declare class LocalUploadProvider implements UploadProvider {
      * Build object key with tenant prefix and UUID
      */
     private buildKey;
+    /** Prefer an explicit full object key (contains `/`) over generating a new one. */
+    private resolveKey;
     /**
      * Generate presigned URL for simple uploads
      */

package/dist/providers/local.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../src/providers/local.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,eAAe,EACf,cAAc,EACd,cAAc,EACd,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,cAAc,CAA2D;gBAErE,MAAM,EAAE,mBAAmB;IAcvC;;OAEG;IACH,OAAO,CAAC,QAAQ;IAQhB;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAqB3E;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAmC9F;;OAEG;IACG,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,YAAY,EAAE,GACrB,OAAO,CAAC,cAAc,CAAC;IAsC1B;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzE;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAcpE;;OAEG;IACG,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7D;;OAEG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3F;;OAEG;YACW,SAAS;IAUvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,mBAAmB,CAUzD"}
+{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../src/providers/local.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,eAAe,EACf,cAAc,EACd,cAAc,EACd,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,cAAc,CAA2D;gBAErE,MAAM,EAAE,mBAAmB;IAcvC;;OAEG;IACH,OAAO,CAAC,QAAQ;IAQhB,mFAAmF;IACnF,OAAO,CAAC,UAAU;IAKlB;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAqB3E;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAmC9F;;OAEG;IACG,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,YAAY,EAAE,GACrB,OAAO,CAAC,cAAc,CAAC;IAsC1B;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzE;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAcpE;;OAEG;IACG,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7D;;OAEG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3F;;OAEG;YACW,SAAS;IAUvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,mBAAmB,CAUzD"}

package/dist/providers/local.js

@@ -31,11 +31,17 @@ export class LocalUploadProvider {
         }
         return `${id}/${target.key.split("/").pop()}`;
     }
+    /** Prefer an explicit full object key (contains `/`) over generating a new one. */
+    resolveKey(target) {
+        if (target.key.includes("/"))
+            return target.key;
+        return this.buildKey(target);
+    }
     /**
      * Generate presigned URL for simple uploads
      */
     async createPresignedUpload(target) {
-        const key = this.buildKey(target);
+        const key = this.resolveKey(target);
         // Ensure directory exists
         await this.ensureDir(target.bucket);
         const expiresIn = 3600; // 1 hour

package/dist/providers/s3.d.ts

@@ -8,10 +8,17 @@ export declare class S3UploadProvider implements UploadProvider {
     private config;
     private uploadTracking;
     constructor(config: S3ProviderConfig);
+    /**
+     * AWS SDK `Client.send` types sometimes fail to resolve under standalone pnpm +
+     * moduleResolution bundler; call through a narrow helper so builds stay portable.
+     */
+    private send;
     /**
      * Build object key with tenant prefix
      */
     private buildKey;
+    /** Prefer an explicit full object key (contains `/`) over generating a new one. */
+    private resolveKey;
     /**
      * Generate presigned PUT URL for simple uploads
      */

package/dist/providers/s3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../src/providers/s3.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgBH,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,cAAc,EACd,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,qBAAa,gBAAiB,YAAW,cAAc;IACrD,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAOZ;IACF,OAAO,CAAC,cAAc,CAA+C;gBAEzD,MAAM,EAAE,gBAAgB;IAwBpC;;OAEG;IACH,OAAO,CAAC,QAAQ;IAQhB;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IA2B3E;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAgE9F;;OAEG;YACW,mBAAmB;IAUjC;;OAEG;IACG,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,YAAY,EAAE,GACpB,OAAO,CAAC,cAAc,CAAC;IAuC1B;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxE;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IA4BpE;;OAEG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAS/F;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,gBAAgB,CAoBnD"}
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../src/providers/s3.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgBH,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,cAAc,EACd,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,qBAAa,gBAAiB,YAAW,cAAc;IACrD,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAOZ;IACF,OAAO,CAAC,cAAc,CAA+C;gBAEzD,MAAM,EAAE,gBAAgB;IAwBpC;;;OAGG;IACH,OAAO,CAAC,IAAI;IAIZ;;OAEG;IACH,OAAO,CAAC,QAAQ;IAQhB,mFAAmF;IACnF,OAAO,CAAC,UAAU;IAKlB;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IA2B3E;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAgE9F;;OAEG;YACW,mBAAmB;IAUjC;;OAEG;IACG,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,YAAY,EAAE,GACpB,OAAO,CAAC,cAAc,CAAC;IAuC1B;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxE;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IA4BpE;;OAEG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAS/F;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,gBAAgB,CAqBnD"}

package/dist/providers/s3.js

@@ -31,6 +31,13 @@ export class S3UploadProvider {
         });
         logger.info("S3 upload provider initialized", { provider: "s3", region: this.config.region });
     }
+    /**
+     * AWS SDK `Client.send` types sometimes fail to resolve under standalone pnpm +
+     * moduleResolution bundler; call through a narrow helper so builds stay portable.
+     */
+    send(command) {
+        return this.client.send(command);
+    }
     /**
      * Build object key with tenant prefix
      */
@@ -41,11 +48,17 @@ export class S3UploadProvider {
         }
         return `${id}/${target.key.split("/").pop()}`;
     }
+    /** Prefer an explicit full object key (contains `/`) over generating a new one. */
+    resolveKey(target) {
+        if (target.key.includes("/"))
+            return target.key;
+        return this.buildKey(target);
+    }
     /**
      * Generate presigned PUT URL for simple uploads
      */
     async createPresignedUpload(target) {
-        const key = this.buildKey(target);
+        const key = this.resolveKey(target);
         const expiresIn = 3600; // 1 hour
         const command = new PutObjectCommand({
             Bucket: target.bucket,
@@ -78,7 +91,7 @@ export class S3UploadProvider {
             Metadata: target.metadata,
             ...(target.acl !== undefined ? { ACL: target.acl } : {}),
         });
-        const response = await this.client.send(createCmd);
+        const response = await this.send(createCmd);
         if (!response.UploadId) {
             throw new Error("Failed to initiate multipart upload: no UploadId returned");
         }
@@ -150,7 +163,7 @@ export class S3UploadProvider {
                 Parts: completedParts,
             },
         });
-        const response = await this.client.send(command);
+        const response = await this.send(command);
         const url = this.generateDownloadUrl(key);
         logger.info("Multipart upload completed", { key, bucket, uploadId, etag: response.ETag });
         return {
@@ -173,7 +186,7 @@ export class S3UploadProvider {
             Key: key,
             UploadId: uploadId,
         });
-        await this.client.send(command);
+        await this.send(command);
         this.uploadTracking.delete(uploadId);
         logger.info("Multipart upload aborted", { key, bucket, uploadId });
     }
@@ -188,7 +201,7 @@ export class S3UploadProvider {
             Key: key,
             ContentType: target.contentType,
         });
-        const response = await this.client.send(createCmd);
+        const response = await this.send(createCmd);
         if (!response.UploadId) {
             throw new Error("Failed to create Tus upload session");
         }
@@ -211,7 +224,7 @@ export class S3UploadProvider {
             Bucket: bucket,
             Key: key,
         });
-        await this.client.send(command);
+        await this.send(command);
         logger.debug("File deleted from S3", { key, bucket });
     }
     /**
@@ -243,7 +256,8 @@ export class S3UploadProvider {
  * Create S3 provider from environment variables
  */
 export function createS3Provider() {
-    const endpoint = process.env.S3_ENDPOINT;
+    // R2 uses R2_ENDPOINT; generic S3 uses S3_ENDPOINT. Prefer explicit S3, else R2.
+    const endpoint = process.env.S3_ENDPOINT ?? process.env.R2_ENDPOINT;
     const publicUrl = process.env.S3_PUBLIC_URL ?? process.env.R2_PUBLIC_URL;
     const config = {
         accessKeyId: process.env.AWS_ACCESS_KEY_ID ?? process.env.R2_ACCESS_KEY_ID ?? "",

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@nebutra/uploads",
-  "version": "0.1.2",
+  "version": "2.0.0",
   "private": false,
   "license": "MIT",
   "type": "module",
   "nebutra": {
+    "graph": "core",
     "status": "foundation",
     "productionReady": false,
     "requires": [
@@ -43,7 +44,7 @@
     "@aws-sdk/client-s3": "^3.700.0",
     "@aws-sdk/s3-request-presigner": "^3.700.0",
     "zod": "^4.3.6",
-    "@nebutra/logger": "0.1.2"
+    "@nebutra/logger": "2.0.0"
   },
   "peerDependencies": {
     "@vercel/blob": ">=0.23.0",