From 0c62d79312b50b7854997da894e27c737d1d788a Mon Sep 17 00:00:00 2001
From: Vladimir Borisov <borisov1024@gmail.com>
Date: Tue, 29 Oct 2019 14:50:35 +0200
Subject: [PATCH] New type of core messages. Better events

---
 src/services/Core/Core.js | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/services/Core/Core.js b/src/services/Core/Core.js
index 1489be668..0999b75f0 100644
--- a/src/services/Core/Core.js
+++ b/src/services/Core/Core.js
@@ -1,6 +1,34 @@
-const EventEmitter = require('events');
+// const EventEmitter = require('events');
 const { default: init, ContainerService } = require('stremio-core-web');
 
+// Slightly better event handling
+class EventEmitter {
+    constructor() {
+        this._handlers = {};
+    }
+    _handlersFor(event) {
+        return this._handlers[event] || [];
+    }
+    on(event, handler) {
+        this._handlers[event] = this._handlersFor(event).concat(handler);
+    }
+    off(event, handler) {
+        console.log('Before off', this._handlersFor(event))
+        this._handlers[event] = this._handlersFor(event).filter(event => event !== handler);
+        console.log('After off', this._handlersFor(event))
+    }
+    emit(event, args) {
+        this._handlersFor(event).forEach(handler => {
+            try {
+                handler(args);
+            }
+            catch (e) {
+                console.log('Event error', event, args, e);
+            }
+        });
+    }
+}
+
 function Core() {
     let active = false;
     let error = null;
@@ -52,12 +80,12 @@ function Core() {
     function off(name, listener) {
         events.off(name, listener);
     }
-    function dispatch({ action, args } = {}) {
+    function dispatch(args, model = 'All') {
         if (!active) {
             return;
         }
 
-        containerService.dispatch({ action, args });
+        containerService.dispatch({ model, args });
     }
     function getState() {
         if (!active) {