@geejay/use-feature-flags 1.0.3 → 1.0.5

package/dist/useFeatureFlags.d.ts

@@ -1,6 +1,6 @@
 import { FeatureFlag } from './store';
 export declare const DEFAULT_SUPABASE_URL = "https://khppgsehvvlukzfdqbuo.supabase.co";
-export declare const DEFAULT_SUPABASE_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImtocHBnc2VodnZsdWt6ZmRxYnVvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTI2ODU1MzQsImV4cCI6MjA2ODI2MTUzNH0.8Z4VY4HFMm95UgO21c-DnDkbLPN_0mbDBZJPExaghDk";
+export declare const DEFAULT_SUPABASE_KEY = "yeyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImtocHBnc2VodnZsdWt6ZmRxYnVvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTI2ODU1MzQsImV4cCI6MjA2ODI2MTUzNH0.8Z4VY4HFMm95UgO21c-DnDkbLPN_0mbDBZJPExaghDk";
 export declare function useFeatureFlags(passedKey?: string, environment?: string): {
     isActive: (key: string) => boolean;
     flags: FeatureFlag[];

package/dist/useFeatureFlags.js

@@ -1,75 +1,44 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { createClient } from '@supabase/supabase-js';
 export const DEFAULT_SUPABASE_URL = 'https://khppgsehvvlukzfdqbuo.supabase.co';
-export const DEFAULT_SUPABASE_KEY = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImtocHBnc2VodnZsdWt6ZmRxYnVvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTI2ODU1MzQsImV4cCI6MjA2ODI2MTUzNH0.8Z4VY4HFMm95UgO21c-DnDkbLPN_0mbDBZJPExaghDk';
-const supabase = createClient(DEFAULT_SUPABASE_URL, DEFAULT_SUPABASE_KEY);
+export const DEFAULT_SUPABASE_KEY = 'yeyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImtocHBnc2VodnZsdWt6ZmRxYnVvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTI2ODU1MzQsImV4cCI6MjA2ODI2MTUzNH0.8Z4VY4HFMm95UgO21c-DnDkbLPN_0mbDBZJPExaghDk';
+const EDGE_FN_URL = `${DEFAULT_SUPABASE_URL}/functions/v1/get-feature-flags`;
 let initialized = false;
 export function useFeatureFlags(passedKey, environment = 'localhost') {
     const [state, setState] = useState({ flags: [], loading: true });
+    const [envId, setEnvId] = useState(null);
     const debounceTimeout = useRef(null);
     const cleanupRef = useRef();
     const apiKey = passedKey || DEFAULT_SUPABASE_KEY;
+    const supabase = useMemo(() => {
+        return createClient(DEFAULT_SUPABASE_URL, passedKey || DEFAULT_SUPABASE_KEY);
+    }, [passedKey]);
     const fetchFlags = async () => {
         setState((prev) => ({ ...prev, loading: true }));
         try {
-            const headerOpts = { headers: { 'api-key': apiKey } };
-            const { data: tenantLookup, error: keyError } = await supabase
-                .from('api_keys')
-                .select('tenant_id')
-                .eq('key', apiKey)
-                .maybeSingle();
-            if (keyError || !(tenantLookup === null || tenantLookup === void 0 ? void 0 : tenantLookup.tenant_id)) {
-                console.warn('Invalid or missing API key.');
+            const res = await fetch(EDGE_FN_URL, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'api-key': apiKey,
+                },
+                body: JSON.stringify({ environment }),
+            });
+            const json = await res.json();
+            if (!res.ok) {
+                console.warn('Edge function error:', (json === null || json === void 0 ? void 0 : json.error) || res.statusText);
                 setState({ flags: [], loading: false });
                 return;
             }
-            const tenant = tenantLookup.tenant_id;
-            const { data: env, error: envError } = await supabase
-                .from('environments')
-                .select('id')
-                .eq('value', environment)
-                .eq('tenant_id', tenant)
-                .maybeSingle();
-            if (envError || !(env === null || env === void 0 ? void 0 : env.id)) {
-                console.warn('Environment not found:', environment);
-                setState({ flags: [], loading: false });
-                return;
-            }
-            const environmentId = env.id;
-            const { data: flagsData, error: flagsError } = await supabase
-                .from('feature_flags')
-                .select('*')
-                .eq('tenant_id', tenant)
-                .eq('environment_id', environmentId);
-            if (flagsError) {
-                console.error('Flag fetch error:', flagsError.message);
-                setState({ flags: [], loading: false });
-            }
-            else {
-                setState({ flags: flagsData || [], loading: false });
-                // Clean up existing channel if present
-                if (cleanupRef.current)
-                    cleanupRef.current();
-                const channel = supabase
-                    .channel(`flags-${environment}`)
-                    .on('postgres_changes', {
-                    event: '*',
-                    schema: 'public',
-                    table: 'feature_flags',
-                    filter: `environment_id=eq.${environmentId}`,
-                }, () => {
-                    if (debounceTimeout.current)
-                        clearTimeout(debounceTimeout.current);
-                    debounceTimeout.current = setTimeout(fetchFlags, 300);
-                })
-                    .subscribe();
-                cleanupRef.current = () => {
-                    supabase.removeChannel(channel);
-                };
+            const flags = json.flags || [];
+            setState({ flags, loading: false });
+            // Store environment_id from first flag (assumes all have same env)
+            if (flags.length > 0 && flags[0].environment_id) {
+                setEnvId(flags[0].environment_id);
             }
         }
         catch (err) {
-            console.error('Unexpected error fetching flags:', err.message);
+            console.error('Error fetching flags:', err.message);
             setState({ flags: [], loading: false });
         }
     };
@@ -85,6 +54,32 @@ export function useFeatureFlags(passedKey, environment = 'localhost') {
                 cleanupRef.current();
         };
     }, [environment, apiKey]);
+    // Subscribe to flag changes for the correct environment
+    useEffect(() => {
+        if (!envId)
+            return;
+        const channel = supabase
+            .channel(`flags-${environment}`)
+            .on('postgres_changes', {
+            event: '*',
+            schema: 'public',
+            table: 'feature_flags',
+            filter: `environment_id=eq.${envId}`,
+        }, () => {
+            if (debounceTimeout.current)
+                clearTimeout(debounceTimeout.current);
+            debounceTimeout.current = setTimeout(fetchFlags, 300);
+        })
+            .subscribe();
+        if (cleanupRef.current)
+            cleanupRef.current();
+        cleanupRef.current = () => supabase.removeChannel(channel);
+        return () => {
+            if (debounceTimeout.current)
+                clearTimeout(debounceTimeout.current);
+            supabase.removeChannel(channel);
+        };
+    }, [envId]);
     return {
         isActive: (key) => state.flags.some((f) => f.key === key && f.enabled),
         flags: state.flags,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geejay/use-feature-flags",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "React hook for feature flag management using Supabase",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",