fix: add back nextEvent() to EventWorker

nyannyacha · Jul 10, 2023 · 87aada8 · 87aada8
1 parent 9cfdf6b
commit 87aada8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 30 deletions.
diff --git a/crates/base/src/server.rs b/crates/base/src/server.rs
@@ -94,7 +94,7 @@ impl Server {
     ) -> Result<Self, Error> {
         let mut worker_event_sender: Option<mpsc::UnboundedSender<WorkerEvents>> = None;
 
-        // Creates Event Worker
+        // Create Event Worker
         if let Some(events_service_path) = maybe_events_service_path {
             let events_path = Path::new(&events_service_path);
             let events_path_buf = events_path.to_path_buf();
@@ -107,7 +107,7 @@ impl Server {
             worker_event_sender = Some(event_worker);
         }
 
-        // create a user worker pool
+        // Create a user worker pool
         let user_worker_msgs_tx = create_user_worker_pool(worker_event_sender).await?;
 
         // create main worker

diff --git a/crates/sb_workers/event_worker.js b/crates/sb_workers/event_worker.js
@@ -3,37 +3,38 @@ const { SymbolAsyncIterator } = primordials;
 const core = globalThis.Deno.core;
 
 class SupabaseEventListener {
-    [SymbolAsyncIterator]() {
-        return {
-            async next() {
-                try {
-                  const reqEvt = await core.opAsync("op_event_accept");
-                  const done = reqEvt === "Done";
+	async nextEvent() {
+		try {
+			const reqEvt = await core.opAsync('op_event_accept');
+			const done = reqEvt === 'Done';
 
-                  let value = undefined;
-                  if (!done) {
-                    const rawEvent = reqEvt['Event'];
-                    const eventType = Object.keys(rawEvent)[0];
-                    value = {
-                        deployment_id: "",
-                        timestamp: new Date().toISOString(),
-                        event_type: eventType,
-                        event: rawEvent[eventType],
-                        execution_id: "",
-                        region: "",
-                        context: undefined
-                    }
-                  }
+			let value = undefined;
+			if (!done) {
+				const rawEvent = reqEvt['Event'];
+				const eventType = Object.keys(rawEvent)[0];
+				value = {
+					timestamp: new Date().toISOString(),
+					event_type: eventType,
+					event: rawEvent[eventType],
+				};
+			}
 
-                  return { value, done }
-                } catch (e) {
-                  // TODO: handle errors
-                  throw e;
-                }
-            },
-        };
-    }
+			return { value, done };
+		} catch (e) {
+			// TODO: handle errors
+			throw e;
+		}
+	}
 
+	[SymbolAsyncIterator]() {
+		const scopedClass = this;
+
+		return {
+			async next() {
+				return await scopedClass.nextEvent();
+			},
+		};
+	}
 }
 
 export { SupabaseEventListener };