feat: add supabase package (#3675)

* feat: add supabase package * fix: rm packages
heyxyz · Aug 31, 2023 · a7eebfa · a7eebfa · vercel · Aug 31, 2023
1 parent a38d6c4
commit a7eebfa
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 50 deletions.
diff --git a/packages/data/constants.ts b/packages/data/constants.ts
@@ -57,7 +57,6 @@ export const OLD_LENS_RELAYER_ADDRESS =
 
 // URLs
 export const STATIC_ASSETS_URL = 'https://static-assets.lenster.xyz';
-export const SUPABASE_URL = 'https://nberpnnqcqfnrzjpnisb.supabase.co';
 export const LENS_MEDIA_SNAPSHOT_URL =
   'https://ik.imagekit.io/lens/media-snapshot';
 export const STATIC_IMAGES_URL = `${STATIC_ASSETS_URL}/images`;

diff --git a/packages/supabase/.eslintrc.js b/packages/supabase/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@lenster/config/eslint/base.js')]
+};
diff --git a/packages/supabase/constants.ts b/packages/supabase/constants.ts
@@ -0,0 +1 @@
+export const SUPABASE_URL = 'https://nberpnnqcqfnrzjpnisb.supabase.co';
diff --git a/packages/supabase/createSupabaseClient.ts b/packages/supabase/createSupabaseClient.ts
@@ -0,0 +1,11 @@
+import { createClient } from '@supabase/supabase-js';
+
+import { SUPABASE_URL } from './constants';
+// @ts-ignore
+import type { Database } from './database.types';
+
+const createSupabaseClient = (key: string) => {
+  return createClient<Database>(SUPABASE_URL, key);
+};
+
+export default createSupabaseClient;
diff --git a/...workers/preferences/src/database.types.ts → packages/supabase/database.types.ts b/...workers/preferences/src/database.types.ts → packages/supabase/database.types.ts
@@ -12,7 +12,6 @@ export interface Database {
       channels: {
         Row: {
           avatar: string;
-          cover: string;
           description: string;
           id: string;
           name: string;
@@ -21,7 +20,6 @@ export interface Database {
         };
         Insert: {
           avatar: string;
-          cover: string;
           description: string;
           id?: string;
           name: string;
@@ -30,7 +28,6 @@ export interface Database {
         };
         Update: {
           avatar?: string;
-          cover?: string;
           description?: string;
           id?: string;
           name?: string;

diff --git a/packages/supabase/package.json b/packages/supabase/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@lenster/supabase",
+  "version": "0.0.0",
+  "private": true,
+  "license": "AGPL-3.0",
+  "scripts": {
+    "codegen": "supabase gen types typescript --project-id nberpnnqcqfnrzjpnisb > database.types.ts; pnpm lint:fix",
+    "lint": "eslint . --ext .ts",
+    "lint:fix": "eslint . --fix --ext .ts",
+    "prettier": "prettier --check \"**/*.{js,ts,tsx,md}\"  --cache",
+    "prettier:fix": "prettier --write \"**/*.{js,ts,tsx,md}\"  --cache",
+    "typecheck": "tsc --pretty"
+  },
+  "dependencies": {
+    "@supabase/supabase-js": "^2.33.1"
+  },
+  "devDependencies": {
+    "@lenster/config": "workspace:*",
+    "typescript": "^5.2.2"
+  }
+}
diff --git a/packages/supabase/tsconfig.json b/packages/supabase/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@lenster/config/base.tsconfig.json"
+}
diff --git a/packages/workers/channels/package.json b/packages/workers/channels/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
-    "codegen": "supabase gen types typescript --project-id nberpnnqcqfnrzjpnisb > src/database.types.ts; pnpm lint:fix",
     "dev": "wrangler dev --port 8093",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --fix --ext .ts",
@@ -16,8 +15,8 @@
   "dependencies": {
     "@lenster/data": "workspace:*",
     "@lenster/lib": "workspace:*",
+    "@lenster/supabase": "workspace:*",
     "@sentry/tracing": "^7.66.0",
-    "@supabase/supabase-js": "^2.33.1",
     "itty-router": "^4.0.22",
     "toucan-js": "^3.2.3",
     "zod": "^3.22.2"

diff --git a/packages/workers/channels/src/handlers/allChannels.ts b/packages/workers/channels/src/handlers/allChannels.ts
@@ -1,8 +1,8 @@
 import '@sentry/tracing';
 
 import response from '@lenster/lib/response';
+import createSupabaseClient from '@lenster/supabase/createSupabaseClient';
 
-import createSupabaseClient from '../helpers/createSupabaseClient';
 import type { WorkerRequest } from '../types';
 
 export default async (request: WorkerRequest) => {
@@ -14,7 +14,7 @@ export default async (request: WorkerRequest) => {
     const cache = await request.env.CHANNELS.get('channels-list');
 
     if (!cache) {
-      const client = createSupabaseClient(request.env);
+      const client = createSupabaseClient(request.env.SUPABASE_KEY);
       const { data } = await client.from('channels').select('*');
       await request.env.CHANNELS.put('channels-list', JSON.stringify(data));
 

diff --git a/packages/workers/channels/src/helpers/createSupabaseClient.ts b/packages/workers/channels/src/helpers/createSupabaseClient.ts
diff --git a/packages/workers/preferences/package.json b/packages/workers/preferences/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
-    "codegen": "supabase gen types typescript --project-id nberpnnqcqfnrzjpnisb > src/database.types.ts; pnpm lint:fix",
     "dev": "wrangler dev --port 8092",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --fix --ext .ts",
@@ -16,8 +15,8 @@
   "dependencies": {
     "@lenster/data": "workspace:*",
     "@lenster/lib": "workspace:*",
+    "@lenster/supabase": "workspace:*",
     "@sentry/tracing": "^7.66.0",
-    "@supabase/supabase-js": "^2.33.1",
     "@tsndr/cloudflare-worker-jwt": "^2.2.2",
     "itty-router": "^4.0.22",
     "toucan-js": "^3.2.3",

diff --git a/packages/workers/preferences/src/handlers/getPreferences.ts b/packages/workers/preferences/src/handlers/getPreferences.ts
@@ -2,8 +2,8 @@ import '@sentry/tracing';
 
 import { Errors } from '@lenster/data/errors';
 import response from '@lenster/lib/response';
+import createSupabaseClient from '@lenster/supabase/createSupabaseClient';
 
-import createSupabaseClient from '../helpers/createSupabaseClient';
 import type { WorkerRequest } from '../types';
 
 export default async (request: WorkerRequest) => {
@@ -18,7 +18,7 @@ export default async (request: WorkerRequest) => {
   }
 
   try {
-    const client = createSupabaseClient(request.env);
+    const client = createSupabaseClient(request.env.SUPABASE_KEY);
 
     const { data } = await client
       .from('rights')

diff --git a/packages/workers/preferences/src/handlers/getVerified.ts b/packages/workers/preferences/src/handlers/getVerified.ts
@@ -1,8 +1,8 @@
 import '@sentry/tracing';
 
 import response from '@lenster/lib/response';
+import createSupabaseClient from '@lenster/supabase/createSupabaseClient';
 
-import createSupabaseClient from '../helpers/createSupabaseClient';
 import type { WorkerRequest } from '../types';
 
 export default async (request: WorkerRequest) => {
@@ -14,7 +14,7 @@ export default async (request: WorkerRequest) => {
     const cache = await request.env.PREFERENCES.get('verified-list');
 
     if (!cache) {
-      const client = createSupabaseClient(request.env);
+      const client = createSupabaseClient(request.env.SUPABASE_KEY);
 
       const { data } = await client
         .from('rights')

diff --git a/packages/workers/preferences/src/handlers/updateGardenerMode.ts b/packages/workers/preferences/src/handlers/updateGardenerMode.ts
@@ -4,10 +4,10 @@ import { Errors } from '@lenster/data/errors';
 import hasOwnedLensProfiles from '@lenster/lib/hasOwnedLensProfiles';
 import response from '@lenster/lib/response';
 import validateLensAccount from '@lenster/lib/validateLensAccount';
+import createSupabaseClient from '@lenster/supabase/createSupabaseClient';
 import jwt from '@tsndr/cloudflare-worker-jwt';
 import { boolean, object, string } from 'zod';
 
-import createSupabaseClient from '../helpers/createSupabaseClient';
 import type { WorkerRequest } from '../types';
 
 type ExtensionRequest = {
@@ -57,7 +57,7 @@ export default async (request: WorkerRequest) => {
       );
     }
 
-    const client = createSupabaseClient(request.env);
+    const client = createSupabaseClient(request.env.SUPABASE_KEY);
 
     const { data, error } = await client
       .from('rights')

diff --git a/packages/workers/preferences/src/handlers/updatePreferences.ts b/packages/workers/preferences/src/handlers/updatePreferences.ts
@@ -5,10 +5,10 @@ import { adminAddresses } from '@lenster/data/staffs';
 import hasOwnedLensProfiles from '@lenster/lib/hasOwnedLensProfiles';
 import response from '@lenster/lib/response';
 import validateLensAccount from '@lenster/lib/validateLensAccount';
+import createSupabaseClient from '@lenster/supabase/createSupabaseClient';
 import jwt from '@tsndr/cloudflare-worker-jwt';
 import { boolean, object, string } from 'zod';
 
-import createSupabaseClient from '../helpers/createSupabaseClient';
 import type { WorkerRequest } from '../types';
 
 type ExtensionRequest = {
@@ -83,7 +83,7 @@ export default async (request: WorkerRequest) => {
       );
     }
 
-    const client = createSupabaseClient(request.env);
+    const client = createSupabaseClient(request.env.SUPABASE_KEY);
 
     const { data, error } = await client
       .from('rights')

diff --git a/packages/workers/preferences/src/handlers/updateStaffMode.ts b/packages/workers/preferences/src/handlers/updateStaffMode.ts
@@ -4,10 +4,10 @@ import { Errors } from '@lenster/data/errors';
 import hasOwnedLensProfiles from '@lenster/lib/hasOwnedLensProfiles';
 import response from '@lenster/lib/response';
 import validateLensAccount from '@lenster/lib/validateLensAccount';
+import createSupabaseClient from '@lenster/supabase/createSupabaseClient';
 import jwt from '@tsndr/cloudflare-worker-jwt';
 import { boolean, object, string } from 'zod';
 
-import createSupabaseClient from '../helpers/createSupabaseClient';
 import type { WorkerRequest } from '../types';
 
 type ExtensionRequest = {
@@ -57,7 +57,7 @@ export default async (request: WorkerRequest) => {
       );
     }
 
-    const client = createSupabaseClient(request.env);
+    const client = createSupabaseClient(request.env.SUPABASE_KEY);
 
     const { data, error } = await client
       .from('rights')

diff --git a/packages/workers/preferences/src/helpers/createSupabaseClient.ts b/packages/workers/preferences/src/helpers/createSupabaseClient.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml