@quatrain/storage-supabase 1.1.11 → 1.1.13

package/lib/SupabaseStorageAdapter.d.ts

@@ -3,16 +3,17 @@
 /// <reference types="node" />
 import { AbstractStorageAdapter, FileType, FileResponseLinkType, StorageParameters, DownloadFileMetaType } from '@quatrain/storage';
 import { Readable, Stream } from 'stream';
-import { SupabaseClient } from '@supabase/supabase-js';
+import { StorageClient } from '@supabase/storage-js';
 export declare class SupabaseStorageAdapter extends AbstractStorageAdapter {
-    protected _client: SupabaseClient;
+    protected _client: StorageClient;
     constructor(params: StorageParameters);
-    getDriver(): SupabaseClient<any, "public", any>;
+    getDriver(): StorageClient;
     getMetaData(file: FileType): Promise<FileType>;
+    test(): Promise<boolean>;
     streamToBuffer(stream: Stream): Promise<Buffer>;
-    create(file: FileType, stream: Readable): Promise<FileType>;
+    create(file: FileType, stream: Readable | string): Promise<FileType>;
     copy(file: FileType, destFile: FileType): Promise<void>;
-    move(file: FileType, destFile: FileType): Promise<string | FileType>;
+    move(file: FileType, destFile: FileType): Promise<FileType>;
     getUrl(file: FileType, expiresIn?: number): Promise<{
         url: string;
         expiresIn: number;

package/lib/SupabaseStorageAdapter.js

@@ -8,18 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SupabaseStorageAdapter = void 0;
 const storage_1 = require("@quatrain/storage");
 const stream_1 = require("stream");
-const supabase_js_1 = require("@supabase/supabase-js");
+const storage_js_1 = require("@supabase/storage-js");
 const os_1 = require("os");
 const path_1 = require("path");
+const node_fs_1 = __importDefault(require("node:fs"));
 class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
     constructor(params) {
         super(params);
-        this._client = (0, supabase_js_1.createClient)(this._params.config.supabaseUrl, this._params.config.supabaseKey);
-        storage_1.Storage.log(`[ASA] Supabase Storage Adapter initialized`);
+        this._client = new storage_js_1.StorageClient(params.config.endpoint, {
+            apikey: params.config.secret,
+            Authorization: `Bearer ${params.config.secret}`,
+        });
+        storage_1.Storage.log(`[SSA] Supabase Storage Adapter initialized`);
     }
     getDriver() {
         return this._client;
@@ -27,6 +34,23 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
     getMetaData(file) {
         return new Promise(() => file);
     }
+    test() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const { data, error } = yield this._client.listBuckets();
+                if (error !== null) {
+                    storage_1.Storage.error(`Unable to get buckets list`);
+                    throw new Error(`Unable to get buckets list: ${error.message}`);
+                }
+                // Storage.info(`S3 Buckets: ${JSON.stringify(data)}`)
+                return true;
+            }
+            catch (err) {
+                storage_1.Storage.error(`Failed to connect to storage: ${err.message}`);
+                return false;
+            }
+        });
+    }
     streamToBuffer(stream) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
@@ -39,21 +63,28 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
     }
     create(file, stream) {
         return __awaiter(this, void 0, void 0, function* () {
-            storage_1.Storage.log(`Uploading ${file.ref} to ${file.bucket}`);
-            const { data, error } = yield this._client.storage
-                .from(file.bucket)
-                .upload(file.ref, yield this.streamToBuffer(stream), {
-                cacheControl: '3600',
-                upsert: false,
-            });
+            console.log(stream);
+            storage_1.Storage.info(`Uploading ${file.ref} to ${file.bucket}`);
+            if (typeof stream === 'string') {
+                const { data, error } = yield this._client
+                    .from(file.bucket)
+                    .upload(file.ref, new Blob([node_fs_1.default.readFileSync(stream)]), {
+                    //   cacheControl: '3600',
+                    upsert: false,
+                    contentType: file.contentType,
+                });
+                if (error !== null) {
+                    storage_1.Storage.error(`Unable to upload ${file.ref} to ${file.bucket}`);
+                    throw new Error(`Unable to upload ${file.ref} to ${file.bucket}`);
+                }
+            }
             return file;
         });
     }
     copy(file, destFile) {
         return __awaiter(this, void 0, void 0, function* () {
-            storage_1.Storage.log(`Copying file ${file.ref} to ${destFile.ref} in bucket ${file.bucket}`);
             try {
-                const response = yield this._client.storage
+                const response = yield this._client
                     .from(file.bucket)
                     .copy(file.ref, destFile.ref, {
                     destinationBucket: destFile.bucket,
@@ -67,21 +98,23 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
     }
     move(file, destFile) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.copy(file, destFile);
-                yield this.delete(file);
-                return destFile;
-            }
-            catch (err) {
-                return err.message;
+            storage_1.Storage.info(`Moving file ${file.ref} to ${destFile.ref} in same bucket ${file.bucket}`);
+            const { data, error } = yield this._client
+                .from(file.bucket)
+                .move(file.ref, destFile.ref);
+            if (error !== null) {
+                storage_1.Storage.error(`Unable to move ${file.ref} to ${destFile.ref}: ${error.message}`);
+                throw new Error(`Unable to move ${file.ref} to ${destFile.ref}`);
             }
+            return destFile;
         });
     }
     getUrl(file, expiresIn = 3600) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { data, error } = yield this._client.storage
+            storage_1.Storage.info(`Getting signed url for file ${file.ref} in bucket ${file.bucket}`);
+            const { data, error } = yield this._client
                 .from(file.bucket)
-                .createSignedUrl(file.path, expiresIn);
+                .createSignedUrl(file.ref, expiresIn, { download: true });
             if (error !== null) {
                 throw new Error(`Unable to get signed url: ${error}`);
             }
@@ -90,13 +123,12 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
     }
     delete(file) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { error } = yield this._client.storage
-                .from(file.bucket)
-                .remove([file.ref]);
+            storage_1.Storage.info(`Deleting file ${file.ref} in bucket ${file.bucket}`);
+            const { error } = yield this._client.from(file.bucket).remove([file.ref]);
             if (error !== null) {
                 throw new Error(`Unable to delete ${file.ref}`);
             }
-            storage_1.Storage.log('Object successfully deleted');
+            storage_1.Storage.info(`Object ${file.ref} successfully deleted`);
             return true;
         });
     }
@@ -127,7 +159,7 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
     }
     download(file, meta) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { data, error } = yield this._client.storage
+            const { data, error } = yield this._client
                 .from(file.bucket)
                 .download(meta.path);
             if (error !== null) {
@@ -140,14 +172,15 @@ class SupabaseStorageAdapter extends storage_1.AbstractStorageAdapter {
             return meta.path;
         });
     }
-    getUploadUrl(file, _expiresIn = 3600) {
+    getUploadUrl(file, _expiresIn = 7200) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { data, error } = yield this._client.storage
+            const { data, error } = yield this._client
                 .from(file.bucket)
-                .createSignedUploadUrl(file.ref);
+                .createSignedUploadUrl(file.ref, { upsert: true });
             if (error !== null) {
                 throw new Error(`Unable to get signed upload url: ${error}`);
             }
+            storage_1.Storage.info(`Upload URL for ${file.ref} in bucket ${file.bucket} is ${data === null || data === void 0 ? void 0 : data.signedUrl}`);
             return {
                 url: data === null || data === void 0 ? void 0 : data.signedUrl,
                 method: 'PUT',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/storage-supabase",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "Storage adapter for Supabase Storage",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,16 +22,20 @@
     "typescript": "^5.1.5"
   },
   "dependencies": {
-    "@quatrain/core": "^1.1.15",
-    "@quatrain/storage": "^1.1.13",
+    "@quatrain/core": "^1.1.19",
+    "@quatrain/storage": "^1.1.16",
+    "@supabase/storage-js": "^2.7.2",
     "@supabase/supabase-js": "^2.45.1"
   },
   "scripts": {
-    "test": "tsc && jest --verbose",
+    "test-ci": "jest --runInBand",
     "build": "tsc",
     "wbuild": "tsc --watch",
     "bump-to": "yarn version",
-    "patch": "yarn version --patch --no-git-tag-version",
-    "publish": "yarn build && yarn npm publish --access public"
+    "hash": "node ../../bin/hashFolder.js",
+    "hash:persist": "yarn hash  > .hash_latest.txt",
+    "hash:compare": "yarn hash > .hash_newest.txt && cmp -s .hash_latest.txt .hash_newest.txt",
+    "publish": "yarn hash:compare || yarn publish:process",
+    "publish:process": "yarn version patch && yarn build && yarn npm publish --access public && yarn hash:persist"
   }
 }