@quatrain/storage-supabase 1.1.13 → 1.1.15

package/README.md

@@ -0,0 +1,28 @@
+# @quatrain/storage-supabase
+
+A storage adapter for Supabase Storage. This package allows Quatrain to use Supabase for S3-compatible object storage.
+
+## Features
+
+-  Implements the `@quatrain/storage` abstract adapter.
+-  Works with both Supabase SaaS and self-hosted instances.
+-  Integrates with Supabase's policies for fine-grained file access control.
+-  Uses the `@supabase/supabase-js` library.
+
+## Installation
+
+```bash
+npm install @quatrain/storage-supabase @supabase/supabase-js
+```
+
+## Usage
+
+```typescript
+import { Storage } from '@quatrain/storage'
+import { SupabaseStorageAdapter } from '@quatrain/storage-supabase'
+
+const adapter = new SupabaseStorageAdapter({
+   config: { url: '...', anonKey: '...' },
+})
+Storage.addAdapter(adapter, 'default', true)
+```

package/lib/SupabaseStorageAdapter.d.ts

@@ -11,6 +11,7 @@ export declare class SupabaseStorageAdapter extends AbstractStorageAdapter {
     getMetaData(file: FileType): Promise<FileType>;
     test(): Promise<boolean>;
     streamToBuffer(stream: Stream): Promise<Buffer>;
+    toArrayBuffer(buffer: Buffer): ArrayBuffer;
     create(file: FileType, stream: Readable | string): Promise<FileType>;
     copy(file: FileType, destFile: FileType): Promise<void>;
     move(file: FileType, destFile: FileType): Promise<FileType>;
@@ -22,5 +23,13 @@ export declare class SupabaseStorageAdapter extends AbstractStorageAdapter {
     getReadable(file: FileType): Promise<Readable>;
     stream(file: FileType, res: any): Promise<any>;
     download(file: FileType, meta: DownloadFileMetaType): Promise<string | Blob>;
+    /**
+     * Get signed upload url for file
+     * Careful, on docker the time to live for JWT signature is defaulted to 60 sec
+     * Add SIGNED_UPLOAD_URL_EXPIRATION_TIME env variable to fix TTL
+     * @param file FileType
+     * @param _expiresIn actually ignored
+     * @returns
+     */
     getUploadUrl(file: FileType, _expiresIn?: number): Promise<FileResponseLinkType>;
 }

package/lib/SupabaseStorageAdapter.js

@@ -61,12 +61,19 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
             });
         });
     }
+    toArrayBuffer(buffer) {
+        const arrayBuffer = new ArrayBuffer(buffer.length);
+        const view = new Uint8Array(arrayBuffer);
+        for (let i = 0; i < buffer.length; ++i) {
+            view[i] = buffer[i];
+        }
+        return arrayBuffer;
+    }
     create(file, stream) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log(stream);
-            storage_1.Storage.info(`Uploading ${file.ref} to ${file.bucket}`);
+            storage_1.Storage.info(`[SSA] Uploading ${file.ref} to ${file.bucket}`);
             if (typeof stream === 'string') {
-                const { data, error } = yield this._client
+                const { error } = yield this._client
                     .from(file.bucket)
                     .upload(file.ref, new Blob([node_fs_1.default.readFileSync(stream)]), {
                     //   cacheControl: '3600',
@@ -74,6 +81,24 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
                     contentType: file.contentType,
                 });
                 if (error !== null) {
+                    console.log(error);
+                    storage_1.Storage.error(`Unable to upload ${file.ref} to ${file.bucket}`);
+                    throw new Error(`Unable to upload ${file.ref} to ${file.bucket}`);
+                }
+            }
+            else {
+                const content = new Blob([
+                    this.toArrayBuffer(yield this.streamToBuffer(stream)),
+                ]);
+                const { error } = yield this._client
+                    .from(file.bucket)
+                    .upload(file.ref, content, {
+                    //   cacheControl: '3600',
+                    upsert: false,
+                    contentType: file.contentType,
+                });
+                if (error !== null) {
+                    console.log(error);
                     storage_1.Storage.error(`Unable to upload ${file.ref} to ${file.bucket}`);
                     throw new Error(`Unable to upload ${file.ref} to ${file.bucket}`);
                 }
@@ -161,7 +186,7 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
         return __awaiter(this, void 0, void 0, function* () {
             const { data, error } = yield this._client
                 .from(file.bucket)
-                .download(meta.path);
+                .download(file.ref);
             if (error !== null) {
                 console.log(error);
                 throw new Error(`Unable to download ${file.ref}`);
@@ -169,9 +194,20 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
             if (meta.onlyContent) {
                 return data;
             }
+            // Write the downloaded data to the specified path
+            const buffer = yield data.arrayBuffer();
+            node_fs_1.default.writeFileSync(meta.path, Buffer.from(buffer));
             return meta.path;
         });
     }
+    /**
+     * Get signed upload url for file
+     * Careful, on docker the time to live for JWT signature is defaulted to 60 sec
+     * Add SIGNED_UPLOAD_URL_EXPIRATION_TIME env variable to fix TTL
+     * @param file FileType
+     * @param _expiresIn actually ignored
+     * @returns
+     */
     getUploadUrl(file, _expiresIn = 7200) {
         return __awaiter(this, void 0, void 0, function* () {
             const { data, error } = yield this._client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/storage-supabase",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Storage adapter for Supabase Storage",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,10 +22,10 @@
     "typescript": "^5.1.5"
   },
   "dependencies": {
-    "@quatrain/core": "^1.1.19",
-    "@quatrain/storage": "^1.1.16",
+    "@quatrain/core": "^1.1.23",
+    "@quatrain/storage": "^1.1.21",
     "@supabase/storage-js": "^2.7.2",
-    "@supabase/supabase-js": "^2.45.1"
+    "@supabase/supabase-js": "^2.57.2"
   },
   "scripts": {
     "test-ci": "jest --runInBand",