chore: use cloudflare worker env

ubiquity-os · Jan 29, 2024 · a9867d9 · a9867d9
1 parent 89d9644
commit a9867d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/context.ts b/src/context.ts
@@ -2,10 +2,7 @@ import { EmitterWebhookEvent as WebhookEvent, EmitterWebhookEventName as Webhook
 import { createClient } from "@supabase/supabase-js";
 import { Database } from "./types/database";
 import { Logs } from "ubiquibot-logger";
-
-const supabaseClient = createClient<Database>(process.env.SUPABASE_URL, process.env.SUPABASE_KEY, {
-  auth: { persistSession: false },
-});
+import { Env } from "./worker";
 
 export class Context<T extends WebhookEventName = WebhookEventName> {
   public key: WebhookEventName;
@@ -14,7 +11,7 @@ export class Context<T extends WebhookEventName = WebhookEventName> {
   public payload: WebhookEvent<T>["payload"];
   public logger: Logs;
 
-  constructor(event: WebhookEvent<T>) {
+  constructor(event: WebhookEvent<T>, env: Env) {
     this.name = event.name;
     this.id = event.id;
     this.payload = event.payload;
@@ -23,7 +20,10 @@ export class Context<T extends WebhookEventName = WebhookEventName> {
     } else {
       this.key = this.name;
     }
-    this.logger = new Logs(supabaseClient, process.env.LOG_RETRY_LIMIT, process.env.LOG_LEVEL, "ubiquibot-kernel");
+    const supabaseClient = createClient<Database>(env.SUPABASE_URL, env.SUPABASE_KEY, {
+      auth: { persistSession: false },
+    });
+    this.logger = new Logs(supabaseClient, env.LOG_RETRY_LIMIT, env.LOG_LEVEL, "ubiquibot-kernel");
   }
 }
 

diff --git a/src/webhooks.ts b/src/webhooks.ts
@@ -1,6 +1,6 @@
 import { EmitterWebhookEvent } from "@octokit/webhooks";
 
 export async function handleEvent(event: EmitterWebhookEvent) {
-  logger.info("Event received", { id: event.id, name: event.name });
+  event.logger.info("Event received", { id: event.id, name: event.name });
   console.log(event);
 }
diff --git a/src/worker.ts b/src/worker.ts
@@ -7,9 +7,13 @@ import { bindHandlers } from "./handlers";
 
 const envSchema = T.Object({
   WEBHOOK_SECRET: T.String(),
+  SUPABASE_URL: T.String(),
+  SUPABASE_KEY: T.String(),
+  LOG_LEVEL: T.String(),
+  LOG_RETRY_LIMIT: T.String(),
 });
 
-type Env = Static<typeof envSchema>;
+export type Env = Static<typeof envSchema>;
 
 export default {
   async fetch(request: Request, env: Env): Promise<Response> {