Fixed a bug where the wrapped callback was added to the plugins.

Author: niemyjski

src/plugins/EventPluginManager-spec.ts

@@ -23,7 +23,7 @@ describe('EventPluginManager', () => {
         if (next) {
           next();
         }
-      }, 500);
+      }, 100);
     });
 
     client.config.addPlugin('2', 2, (context:EventPluginContext, next?:() => void) => {
@@ -170,13 +170,15 @@ describe('EventPluginManager', () => {
     });
 
     expect(client.config.plugins[0].name).toBe('1');
-
+    expect(client.config.plugins.length).toBe(1);
     EventPluginManager.run(context, (context?:EventPluginContext) => {
       expect(client.config.plugins[0].name).toBe('1');
     });
+    expect(client.config.plugins.length).toBe(1);
 
     EventPluginManager.run(context, (context?:EventPluginContext) => {
       expect(client.config.plugins[0].name).toBe('1');
     });
+    expect(client.config.plugins.length).toBe(1);
   });
 });

src/plugins/EventPluginManager.ts

@@ -19,7 +19,7 @@ export class EventPluginManager {
           }
         } catch (ex) {
           context.cancelled = true;
-          context.log.error(`Error while running plugin '${plugin.name}': ${ex.message}. This event will be discarded.`);
+          context.log.error(`Error running plugin '${plugin.name}': ${ex.message}. Discarding Event.`);
         }
 
         if (context.cancelled && !!callback) {
@@ -29,13 +29,13 @@ export class EventPluginManager {
     };
 
     var plugins:IEventPlugin[] = context.client.config.plugins;
+    var wrappedPlugins:{ (): void }[] = [];
     if (!!callback) {
-      plugins.push({ name: 'callback', priority: 9007199254740992, run: callback });
+      wrappedPlugins[plugins.length] = wrap({ name: 'cb', priority: 9007199254740992, run: callback }, null);
     }
 
-    var wrappedPlugins:{ (): void }[] = [];
     for (var index = plugins.length - 1; index > -1; index--) {
-      wrappedPlugins[index] = wrap(plugins[index], index < plugins.length - 1 ? wrappedPlugins[index + 1] : null);
+      wrappedPlugins[index] = wrap(plugins[index], !!callback || (index < plugins.length - 1) ? wrappedPlugins[index + 1] : null);
     }
 
     wrappedPlugins[0]();

src/storage/InMemoryStorage-spec.ts

@@ -19,7 +19,7 @@ describe('InMemoryStorage', () => {
 
   it('should get saved events', () => {
     var storage = new InMemoryStorage<IEvent>();
-    var key = 'ex-LhhP1C9gi-q-';
+    var key = 'ex-q-';
     var event1:IEvent = { type: 'log', reference_id: key + '11' };
     var event2:IEvent = { type: 'log', reference_id: key + '12' };
     var event3:IEvent = { type: 'log', reference_id: key + '13' };
@@ -37,15 +37,21 @@ describe('InMemoryStorage', () => {
     expect(storage.count()).toBe(6);
 
     var ev = storage.get(event1.reference_id, 1)[0];
-    expect(ev).toBe(event1);
+    expect(ev).toEqual(event1);
     expect(storage.count()).toBe(5);
 
+    ev = storage.get(event2.reference_id, 1)[0];
+    expect(ev).toEqual(event2);
+    expect(storage.count()).toBe(4);
+
     var events = storage.get(key, 2);
     expect(events.length).toBe(2);
-    expect(storage.count()).toBe(3);
+    expect(events[0]).not.toEqual(events[1]);
+    expect(storage.count()).toBe(2);
 
     events = storage.get(key);
-    expect(events.length).toBe(3);
+    expect(events.length).toBe(2);
+    expect(events[0]).not.toEqual(events[1]);
     expect(storage.count()).toBe(0);
   });