From b616f62a2541bbc62ccf71b8172301ac572be6fd Mon Sep 17 00:00:00 2001
From: Kyler Eastridge <felix.wolfz@gmail.com>
Date: Sat, 5 Jul 2025 22:02:01 -0400
Subject: [PATCH] Refactor EventTarget

---
 pymetaverse/eventtarget.py | 77 +++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 13 deletions(-)

diff --git a/pymetaverse/eventtarget.py b/pymetaverse/eventtarget.py
index 8ee02be..c81d94d 100644
--- a/pymetaverse/eventtarget.py
+++ b/pymetaverse/eventtarget.py
@@ -1,37 +1,88 @@
 import asyncio
 import inspect
 
+class EventTargetListener:
+    def __init__(self, func, filters=None, once=False):
+        self.func = func
+        self.filters = filters or {}
+        self.once = once
+
+    def test(self, event_kwargs):
+        return all(event_kwargs.get(k) == v for k, v in self.filters.items())
+
+    def __call__(self, *args, **kwargs):
+        return self.func(*args, **kwargs)
+
+    def is_async(self):
+        return inspect.iscoroutinefunction(self.func)
+
+
 class EventTarget:
     def __init__(self):
-        self._listeners = {}  # event -> list of (func, filters)
+        self._listeners = {}  # event -> list of EventTargetListener
 
-    def on(self, event, func=None, **filters):
+    def on(self, event, func=None, once=False, **filters):
         if event not in self._listeners:
             self._listeners[event] = []
 
         def decorator(f):
-            self._listeners[event].append((f, filters))
+            listener = EventTargetListener(f, filters, once)
+            self._listeners[event].append(listener)
             return f
 
         return decorator(func) if func else decorator
 
+    def once(self, event, func=None, **filters):
+        return self.on(event, func=func, once=True, **filters)
+
     def off(self, event, func):
         if event in self._listeners:
             self._listeners[event] = [
-                (f, filt) for (f, filt) in self._listeners[event] if f != func
+                listener for listener in self._listeners[event]
+                if listener.func != func
             ]
 
     async def fire(self, event, *args, **kwargs):
         listeners = self._listeners.get(event, [])
-        for func, filters in listeners:
-            if all(kwargs.get(k) == v for k, v in filters.items()):
-                if inspect.iscoroutinefunction(func):
-                    await func(*args)
+        to_remove = []
+
+        for listener in list(listeners):  # shallow copy to allow mutation
+            if listener.test(kwargs):
+                if listener.is_async():
+                    await listener(*args)
                 else:
-                    func(*args)
-    
+                    listener(*args)
+                if listener.once:
+                    to_remove.append(listener)
+
+        for listener in to_remove:
+            self._listeners[event].remove(listener)
+
     def fireSync(self, event, *args, **kwargs):
         listeners = self._listeners.get(event, [])
-        for func, filters in listeners:
-            if all(kwargs.get(k) == v for k, v in filters.items()):
-                func(*args)
+        to_remove = []
+
+        for listener in list(listeners):
+            if listener.test(kwargs):
+                listener(*args)
+                if listener.once:
+                    to_remove.append(listener)
+
+        for listener in to_remove:
+            self._listeners[event].remove(listener)
+
+    async def waitFor(self, event, timeout=None, **filters):
+        future = asyncio.get_event_loop().create_future()
+
+        def handler(*args):
+            if not future.done():
+                self.off(event, handler)  # Ensure the listener is removed
+                future.set_result(args)
+
+        self.on(event, handler, once=True, **filters)
+
+        try:
+            return await asyncio.wait_for(future, timeout)
+        except asyncio.TimeoutError:
+            self.off(event, handler)
+            raise TimeoutError(f"Timeout while waiting for event '{event}'")