@quatrain/cloudwrapper-supabase 1.1.16 → 1.1.18

package/lib/SupabaseCloudWrapper.d.ts

@@ -6,6 +6,15 @@ export type SupabaseParams = {
     url?: string;
     key?: string;
 };
+export type Channel = {
+    name: string;
+    channel: RealtimeChannel | undefined;
+    state: any;
+};
+export type Channels = {
+    database: Channel[];
+    storage: Channel[];
+};
 export declare const eventMap: {
     create: string;
     update: string;
@@ -15,6 +24,7 @@ export declare class SupabaseCloudWrapper extends AbstractCloudWrapper {
     protected _supabaseClient: SupabaseClient | undefined;
     protected _realtimeClient: RealtimeChannel | undefined;
     protected _isInitialized: boolean;
+    protected _channels: Channels;
     constructor(params: SupabaseParams);
     databaseTrigger(trigger: DatabaseTriggerType): void | {
         event: any;
@@ -26,9 +36,8 @@ export declare class SupabaseCloudWrapper extends AbstractCloudWrapper {
         schema: string;
         table: string;
     };
-    triggersEnable(): void;
-    triggersDisable(): void;
     protected _initialize(): void;
+    poll(): void;
     protected _payload2File(payload: {
         [x: string]: any;
     }): FileType | undefined;

package/lib/SupabaseCloudWrapper.js

@@ -33,12 +33,13 @@ class SupabaseCloudWrapper extends cloudwrapper_1.AbstractCloudWrapper {
     constructor(params) {
         super(params);
         this._isInitialized = false;
+        this._channels = { database: [], storage: [] };
         this._initialize();
     }
     databaseTrigger(trigger) {
         var _a;
         this._initialize();
-        if (!this._realtimeClient) {
+        if (!(this._supabaseClient instanceof supabase_js_1.SupabaseClient)) {
             throw new Error(`Realtime channel is not enabled`);
         }
         if (typeof trigger.script !== 'function') {
@@ -58,7 +59,7 @@ class SupabaseCloudWrapper extends cloudwrapper_1.AbstractCloudWrapper {
                 table: trigger.model,
             };
             cloudwrapper_1.CloudWrapper.info(`Set up DB trigger ${trigger.name} for ${trigger.event} event on table ${schema}.${params.table}`);
-            (_a = this._supabaseClient) === null || _a === void 0 ? void 0 : _a.channel(trigger.name).on('postgres_changes', params, (_b) => __awaiter(this, void 0, void 0, function* () {
+            const channel = (_a = this._supabaseClient) === null || _a === void 0 ? void 0 : _a.channel(trigger.name).on('postgres_changes', params, (_b) => __awaiter(this, void 0, void 0, function* () {
                 var { old: before, new: after } = _b, context = __rest(_b, ["old", "new"]);
                 cloudwrapper_1.CloudWrapper.info(`Triggering function on event ${trigger.name}`);
                 try {
@@ -69,6 +70,11 @@ class SupabaseCloudWrapper extends cloudwrapper_1.AbstractCloudWrapper {
                     console.log(err);
                 }
             })).subscribe();
+            this._channels.database.push({
+                name: trigger.name,
+                channel,
+                state: channel.state,
+            });
             return params;
         }
         catch (err) {
@@ -79,9 +85,6 @@ class SupabaseCloudWrapper extends cloudwrapper_1.AbstractCloudWrapper {
     storageTrigger(trigger) {
         var _a;
         this._initialize();
-        if (!this._realtimeClient) {
-            throw new Error(`Realtime channel is not enabled`);
-        }
         if (typeof trigger.script !== 'function') {
             throw new Error(`Passed script value is not a function`);
         }
@@ -98,7 +101,7 @@ class SupabaseCloudWrapper extends cloudwrapper_1.AbstractCloudWrapper {
                 table: 'objects',
             };
             cloudwrapper_1.CloudWrapper.info(`Set up Storage trigger ${trigger.name} for ${trigger.event} event`);
-            (_a = this._supabaseClient) === null || _a === void 0 ? void 0 : _a.channel(trigger.name).on('postgres_changes', params, (_b) => __awaiter(this, void 0, void 0, function* () {
+            const channel = (_a = this._supabaseClient) === null || _a === void 0 ? void 0 : _a.channel(trigger.name).on('postgres_changes', params, (_b) => __awaiter(this, void 0, void 0, function* () {
                 var { old: before, new: after } = _b, context = __rest(_b, ["old", "new"]);
                 cloudwrapper_1.CloudWrapper.info(`Triggering storage function on event ${trigger.name}`);
                 try {
@@ -112,9 +115,13 @@ class SupabaseCloudWrapper extends cloudwrapper_1.AbstractCloudWrapper {
                 }
                 catch (err) {
                     cloudwrapper_1.CloudWrapper.error(err.message);
-                    console.log(err);
                 }
             })).subscribe();
+            this._channels.storage.push({
+                name: trigger.name,
+                channel,
+                state: channel === null || channel === void 0 ? void 0 : channel.state,
+            });
             return params;
         }
         catch (err) {
@@ -122,42 +129,31 @@ class SupabaseCloudWrapper extends cloudwrapper_1.AbstractCloudWrapper {
             throw new Error(`Realtime channel subscription failed`);
         }
     }
-    triggersEnable() {
-        if (!this._realtimeClient) {
-            throw new Error(`Realtime client is not enabled`);
-        }
-        this._realtimeClient.subscribe((res) => {
-            cloudwrapper_1.CloudWrapper.info(`Enabling Realtime triggers: ${res}`);
-            if (res !== 'SUBSCRIBED') {
-                throw new Error(`Failed to subscribe to Realtime channels`);
-            }
-        });
-    }
-    triggersDisable() {
-        var _a;
-        if (!this._realtimeClient) {
-            throw new Error(`Realtime channel is not enabled`);
-        }
-        cloudwrapper_1.CloudWrapper.info(`Disabling Realtime triggers`);
-        (_a = this._supabaseClient) === null || _a === void 0 ? void 0 : _a.removeAllChannels();
-    }
     _initialize() {
         if (this._isInitialized === false) {
             this._supabaseClient = (0, supabase_js_1.createClient)(this._params.url, this._params.key);
-            this._realtimeClient = this._supabaseClient.channel('table-db-changes');
             this._isInitialized = true;
             cloudwrapper_1.CloudWrapper.info(`Supabase App initialized`);
         }
     }
+    poll() {
+        var _a;
+        cloudwrapper_1.CloudWrapper.info(`Supabase client status: ${(_a = this._supabaseClient) === null || _a === void 0 ? void 0 : _a.channel}`);
+        this._channels.storage.forEach((channel) => {
+            var _a;
+            cloudwrapper_1.CloudWrapper.info(`${channel.name}: ${channel.state}`);
+            console.log((_a = channel.channel) === null || _a === void 0 ? void 0 : _a.params);
+        });
+        setTimeout(() => this.poll(), 10000);
+    }
     _payload2File(payload) {
-        console.log('received payload', payload);
         if (!payload.metadata) {
             return undefined;
         }
         if (Object.keys(payload).length === 0) {
             return undefined;
         }
-        const { size, mimetype } = payload === null || payload === void 0 ? void 0 : payload.metadata;
+        const { size, mimetype } = (payload === null || payload === void 0 ? void 0 : payload.metadata) || {};
         return {
             host: 'supabase',
             bucket: payload.bucket_id,

package/package.json

@@ -1,31 +1,36 @@
 {
   "name": "@quatrain/cloudwrapper-supabase",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "license": "MIT",
   "description": "Cloud Wrapper adapter for Supabase",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/quatrain/Core.git",
+    "directory": "packages/cloudwrapper-supabase"
+  },
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
+    "src/",
     "lib/",
     "README.md"
   ],
   "author": "Quatrain Développement SAS <developers@quatrain.com>",
   "peerDependencies": {
-    "@quatrain/core": "^1.1.19"
+    "@quatrain/core": "^1.1.22"
   },
   "dependencies": {
-    "@quatrain/backend": "^1.1.20",
+    "@quatrain/backend": "^1.1.21",
     "@quatrain/cloudwrapper": "^1.1.14",
-    "@quatrain/core": "^1.1.19",
-    "@supabase/supabase-js": "^2.49.4"
+    "@supabase/supabase-js": "^2.53.0"
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.1",
     "@types/jest": "^27.0.3",
     "@types/node": "^22.10.1",
-    "jest": "^27.4.7",
+    "jest": "^30.1.2",
     "jest-node-exports-resolver": "^1.1.6",
-    "jest-serial-runner": "^1.2.1",
+    "jest-serial-runner": "^1.2.2",
     "trace-unhandled": "^2.0.1",
     "ts-jest": "^27.1.2",
     "ts-node": "^10.9.1",

package/src/SupabaseCloudWrapper.ts

@@ -0,0 +1,215 @@
+import {
+   CloudWrapper,
+   AbstractCloudWrapper,
+   DatabaseTriggerType,
+   StorageTriggerType,
+   StorageEventPayloadType,
+} from '@quatrain/cloudwrapper'
+import { BackendAction } from '@quatrain/backend'
+import {
+   createClient,
+   SupabaseClient,
+   RealtimeChannel,
+} from '@supabase/supabase-js'
+import { FileType } from '@quatrain/storage'
+
+export type SupabaseParams = {
+   useEmulator?: boolean
+   url?: string
+   key?: string
+}
+
+export type Channel = {
+   name: string
+   channel: RealtimeChannel | undefined
+   state: any
+}
+
+export type Channels = {
+   database: Channel[]
+   storage: Channel[]
+}
+
+export const eventMap = {
+   [BackendAction.CREATE]: 'INSERT',
+   [BackendAction.UPDATE]: 'UPDATE',
+   [BackendAction.DELETE]: 'DELETE',
+}
+
+export class SupabaseCloudWrapper extends AbstractCloudWrapper {
+   protected _supabaseClient: SupabaseClient | undefined
+   protected _realtimeClient: RealtimeChannel | undefined
+   protected _isInitialized = false
+   protected _channels: Channels = { database: [], storage: [] }
+
+   constructor(params: SupabaseParams) {
+      super(params)
+      this._initialize()
+   }
+
+   databaseTrigger(trigger: DatabaseTriggerType) {
+      this._initialize()
+
+      if (!(this._supabaseClient instanceof SupabaseClient)) {
+         throw new Error(`Realtime channel is not enabled`)
+      }
+
+      if (typeof trigger.script !== 'function') {
+         throw new Error(`Passed script value is not a function`)
+      }
+
+      if (Array.isArray(trigger.event)) {
+         const params = trigger.event.forEach((event) => {
+            return this.databaseTrigger({
+               ...trigger,
+               event,
+               name: `${trigger.name}-${event}`,
+            })
+         })
+         return params
+      }
+
+      try {
+         const schema = trigger.schema || 'public'
+         const params = {
+            event: Reflect.get(eventMap, trigger.event),
+            schema,
+            table: trigger.model,
+         }
+         CloudWrapper.info(
+            `Set up DB trigger ${trigger.name} for ${trigger.event} event on table ${schema}.${params.table}`
+         )
+         const channel = this._supabaseClient
+            ?.channel(trigger.name)
+            .on(
+               'postgres_changes',
+               params,
+               async ({ old: before, new: after, ...context }) => {
+                  CloudWrapper.info(
+                     `Triggering function on event ${trigger.name}`
+                  )
+                  try {
+                     return await trigger.script({ before, after, context })
+                  } catch (err) {
+                     CloudWrapper.error((err as Error).message)
+                     console.log(err)
+                  }
+               }
+            )
+            .subscribe()
+         this._channels.database.push({
+            name: trigger.name,
+            channel,
+            state: channel.state,
+         })
+
+         return params
+      } catch (err) {
+         CloudWrapper.error(err)
+         throw new Error(`Realtime channel subscription failed`)
+      }
+   }
+
+   storageTrigger(trigger: StorageTriggerType) {
+      this._initialize()
+
+      if (typeof trigger.script !== 'function') {
+         throw new Error(`Passed script value is not a function`)
+      }
+
+      if (Array.isArray(trigger.event)) {
+         const params = trigger.event.forEach((event) => {
+            return this.storageTrigger({
+               ...trigger,
+               event,
+               name: `${trigger.name}-${event}`,
+            })
+         })
+
+         return params
+      }
+
+      try {
+         const params = {
+            event: Reflect.get(eventMap, trigger.event),
+            schema: 'storage',
+            table: 'objects',
+         }
+         CloudWrapper.info(
+            `Set up Storage trigger ${trigger.name} for ${trigger.event} event`
+         )
+         const channel = this._supabaseClient
+            ?.channel(trigger.name)
+            .on(
+               'postgres_changes',
+               params,
+               async ({ old: before, new: after, ...context }) => {
+                  CloudWrapper.info(
+                     `Triggering storage function on event ${trigger.name}`
+                  )
+                  try {
+                     const payload: StorageEventPayloadType = {
+                        before: this._payload2File(before),
+                        after: this._payload2File(after),
+                        context,
+                     }
+                     CloudWrapper.debug(payload)
+                     return await trigger.script(payload)
+                  } catch (err) {
+                     CloudWrapper.error((err as Error).message)
+                  }
+               }
+            )
+            .subscribe()
+         this._channels.storage.push({
+            name: trigger.name,
+            channel,
+            state: channel?.state,
+         })
+         return params
+      } catch (err) {
+         console.log(err)
+         throw new Error(`Realtime channel subscription failed`)
+      }
+   }
+
+   protected _initialize() {
+      if (this._isInitialized === false) {
+         this._supabaseClient = createClient(this._params.url, this._params.key)
+         this._isInitialized = true
+         CloudWrapper.info(`Supabase App initialized`)
+      }
+   }
+
+   public poll() {
+      CloudWrapper.info(
+         `Supabase client status: ${this._supabaseClient?.channel}`
+      )
+      this._channels.storage.forEach((channel) => {
+         CloudWrapper.info(`${channel.name}: ${channel.state}`)
+         console.log(channel.channel?.params)
+      })
+      setTimeout(() => this.poll(), 10000)
+   }
+
+   protected _payload2File(payload: {
+      [x: string]: any
+   }): FileType | undefined {
+      if (!payload.metadata) {
+         return undefined
+      }
+
+      if (Object.keys(payload).length === 0) {
+         return undefined
+      }
+
+      const { size, mimetype } = payload?.metadata || {}
+      return {
+         host: 'supabase',
+         bucket: payload.bucket_id,
+         ref: payload.name,
+         contentType: mimetype,
+         size,
+      }
+   }
+}

package/src/index.ts

@@ -0,0 +1,3 @@
+import { SupabaseCloudWrapper } from './SupabaseCloudWrapper'
+
+export { SupabaseCloudWrapper }