@vanillaspa/event-bus 1.2.0 → 1.3.0

package/index.js

@@ -1,63 +1,58 @@
 export const name = "eventbus";
-const worker = new ServiceWorker(new URL('./eventbusWorker.js', import.meta.url), { type: 'module' });
-worker.port.start();
+const channel = new BroadcastChannel();
+const contextListeners = new WeakMap(); // context - Map<type, listener[]>
 
-const contextListeners = new WeakMap(); // WeakMap to store listeners per object. Keep it private unless you know what you do.
-
-worker.port.onmessage = ({ data }) => {
+channel.onmessage = ({ data }) => {
     const { type, detail } = data;
-    dispatchEvent(new CustomEvent(type, { detail }));
+    dispatchLocally(new CustomEvent(type, { detail }));
 }
 
-worker.port.onmessageerror = (e) => {
+channel.onmessageerror = (e) => {
     console.error('eventbus deserialization error:', e);
 }
 
+function dispatchLocally(event, context = undefined) {
+    if (!context) context = event instanceof CustomEvent ? event.detail?.target : event.target;
+
+    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);
+    }
+}
+
 export function addEventListener(type, listener, context = undefined) {
     if (context && typeof context === 'object') { // context is well defined, should be a WebComponent
-        if (!contextListeners.has(context)) { // context is yet unknown to the listeners
-            contextListeners.set(context, new Map()); // will be stored here
+        if (!contextListeners.has(context)) {
+            contextListeners.set(context, new Map());
         }
         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.");
-        window.addEventListener(type, listener);
+        if (typeof window !== 'undefined') window.addEventListener(type, listener);
     }
-
-    worker.port.postMessage({ action: 'addEventListener', type });
 }
 
-export function removeEventListener(type, listener, context = undefined, options) {
+export function removeEventListener(type, listener, context = undefined) {
     if (context && typeof context === 'object') {
         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);
-            worker.port.postMessage({ action: 'removeEventListener', type });
-        }
+        if (handlers.length === 0) byType.delete(type);
     } else {
-        window.removeEventListener(type, listener);
-        worker.port.postMessage({ action: 'removeEventListener', type });
+        if (typeof window !== 'undefined') window.removeEventListener(type, listener);
     }
 }
 
 export function dispatchEvent(event) {
-    const context = event instanceof CustomEvent ? event.detail?.target : event.target;
-    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);
-        worker.port.postMessage({
-            action: 'dispatchEvent',
-            type: event.type,
-            detail: event instanceof CustomEvent ? event.detail : {}
-        });
-    }
+    dispatchLocally(event, context);
+    channel.postMessage({
+        type: event.type,
+        detail: event instanceof CustomEvent ? event.detail : {}
+    });
 }

package/package.json

@@ -6,12 +6,14 @@
     "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",
         "Module",
         "Vanilla",
-        "ServiceWorker",
         "SPA",
+        "WeakMap",
         "WebComponents"
     ],
     "license": "Unlicense",
@@ -25,5 +27,5 @@
         "url": "git+https://github.com/vanillaspa/event-bus.git"
     },
     "type": "module",
-    "version": "1.2.0"
+    "version": "1.3.0"
 }

package/eventbusWorker.js

@@ -1,31 +0,0 @@
-const listeners = new Map();
-
-onconnect = function ({ ports }) {
-    const port = ports[0];
-
-    port.onmessage = ({ data }) => {
-        const { action, type, detail } = data;
-        switch (action) {
-            case 'addEventListener':
-                if (!listeners.has(type)) listeners.set(type, new Set());
-                listeners.get(type).add(port);
-                break;
-            case 'removeEventListener':
-                listeners.get(type)?.delete(port);
-                break;
-            case 'dispatchEvent':
-                listeners.get(type)?.forEach(p => {
-                    if (p !== port) p.postMessage({ type, detail });
-                });
-                break;
-        }
-    };
-
-    port.onmessageerror = () => {
-        for (const ports of listeners.values()) {
-            ports.delete(port);
-        }
-    };
-
-    port.start();
-}