@vanillaspa/event-bus 1.3.2 → 1.4.0

package/index.js

@@ -1,58 +1,56 @@
 export const name = 'eventbus';
-const channel = new BroadcastChannel('eventbus');
-const contextListeners = new WeakMap(); // context - Map<type, listener[]>
 
-channel.onmessage = ({ data }) => {
-    const { type, detail } = data;
-    dispatchLocally(new CustomEvent(type, { detail }));
-}
+const contextListeners = new WeakMap(); // context -> Map<type, listener[]>
+const typeIndex = new Map();            // type -> Set<WeakRef<context>>
+
+export function addEventListener(type, listener, context) {
+    if (!contextListeners.has(context)) { // first seen
+        contextListeners.set(context, new Map());
+    }
+    const byType = contextListeners.get(context);
+    if (!byType.has(type)) byType.set(type, []);
+    byType.get(type).push(listener);
 
-channel.onmessageerror = (e) => {
-    console.error('eventbus deserialization error:', e);
+    if (!typeIndex.has(type)) typeIndex.set(type, new Set());
+    typeIndex.get(type).add(new WeakRef(context));
 }
 
-function dispatchLocally(event, context = undefined) {
-    if (!context) context = event instanceof CustomEvent ? event.detail?.target : event.target;
+export function removeEventListener(type, listener, context) {
+    const byType = contextListeners.get(context);
+    if (!byType?.has(type)) return;
 
-    if (context && contextListeners.has(context)) {
-        const byType = contextListeners.get(context);
-        byType.get(event.type)?.forEach(handler => handler(event));
-    } else {
-        if (typeof window !== 'undefined') window.dispatchEvent(event);
-    }
-}
+    const handlers = byType.get(type);
+    const index = handlers.indexOf(listener);
+    if (index > -1) handlers.splice(index, 1);
 
-export function addEventListener(type, listener, context = undefined) {
-    if (context && typeof context === 'object') { // context is well defined, should be a WebComponent
-        if (!contextListeners.has(context)) {
-            contextListeners.set(context, new Map());
+    if (handlers.length === 0) {
+        byType.delete(type);
+        const refs = typeIndex.get(type);
+        if (refs) {
+            for (const ref of refs) {
+                if (ref.deref() === context) {
+                    refs.delete(ref);
+                    break;
+                }
+            }
         }
-        const byType = contextListeners.get(context);
-        if (!byType.has(type)) byType.set(type, []);
-        byType.get(type).push(listener);
-    } else {
-        if (context) throw new Error('Syntax error: context must be an object.');
-        if (typeof window !== 'undefined') window.addEventListener(type, listener);
     }
 }
 
-export function removeEventListener(type, listener, context = undefined) {
-    if (context && typeof context === 'object') {
+export function dispatchEvent(event, context = undefined) {
+    if (!context) context = event instanceof CustomEvent ? event.detail?.target : event.target;
+
+    if (context && contextListeners.has(context)) {
         const byType = contextListeners.get(context);
-        if (!byType?.has(type)) return;
-        const handlers = byType.get(type)
-        const index = handlers.indexOf(listener);
-        if (index > -1) handlers.splice(index, 1);
-        if (handlers.length === 0) byType.delete(type);
+        byType.get(event.type)?.forEach(handler => handler(event));
     } else {
-        if (typeof window !== 'undefined') window.removeEventListener(type, listener);
+        const refs = typeIndex.get(event.type);
+        if (refs) {
+            for (const ref of refs) {
+                const ctx = ref.deref();
+                if (!ctx) { refs.delete(ref); continue; }
+                contextListeners.get(ctx)?.get(event.type)?.forEach(handler => handler(event));
+            }
+        }
     }
 }
-
-export function dispatchEvent(event) {
-    dispatchLocally(event, context);
-    channel.postMessage({
-        type: event.type,
-        detail: event instanceof CustomEvent ? event.detail : {}
-    });
-}

package/package.json

@@ -6,7 +6,6 @@
     "description": "An event-bus for vanilla SPA. You can use it with web-components.",
     "homepage": "https://github.com/vanillaspa/event-bus#readme",
     "keywords": [
-        "BroadcastChannel",
         "CustomElement",
         "EventBus",
         "JavaScript",
@@ -14,6 +13,7 @@
         "Vanilla",
         "SPA",
         "WeakMap",
+        "WeakRef",
         "WebComponents"
     ],
     "license": "Unlicense",
@@ -27,5 +27,5 @@
         "url": "git+https://github.com/vanillaspa/event-bus.git"
     },
     "type": "module",
-    "version": "1.3.2"
+    "version": "1.4.0"
 }