Fixed on asterisk

Author: JexSrs

src/components/types.ts

@@ -4,4 +4,6 @@ export type ParserResult = {
     aliases: string[];
     url: string;
     articles: Article[];
-};
+};
+
+export type CallbackVoid = (...args: any[]) => void;

src/modules/events.ts

@@ -7,6 +7,7 @@ import Grid from "./grid/index";
 import Config from "../components/config";
 import {ConfigOptions} from "../middleware/ConfigOptions";
 import Source from "../components/source";
+import {CallbackVoid} from "../components/types";
 
 export default class Events {
 
@@ -108,29 +109,43 @@ export default class Events {
                 Logger(LoggerTypes.INFO, `${chalk.red('Parsers')} - failed to scrape the articles.`);
                 console.log(e);
             });
+
+            this.getAntennae().on("middleware.error", (mid: string, e: any) => {
+                Logger(LoggerTypes.INFO, `${chalk.red('Middleware')} - an error was caught at ${mid}.`);
+                console.log(e);
+            });
         }
 
     }
 }
 
 class Antennae {
-    private _callbacks: any = {};
+    private _callbacks: { [event: string]: CallbackVoid[] } = {};
+    private _allCallbacks: CallbackVoid[] = [];
+
+    public on(eventName: string, callback: CallbackVoid): void {
+        if (eventName.length === 0) throw Error("You cannot create an event for nothing!");
+
+        if(eventName === "*") {
+            this._allCallbacks.push(callback);
+            return;
+        }
 
-    public on(eventName: string, callback: (...args: any[]) => void): void {
-        if (eventName.length === 0) throw Error("You cannot create an event for nothing!")
+        if (!this._callbacks[eventName])
+            this._callbacks[eventName] = [];
 
-        if (!this._callbacks[eventName]) this._callbacks[eventName] = [];
-        this._callbacks[eventName].push(callback)
+        this._callbacks[eventName].push(callback);
     }
 
     public emit(eventName: string, ...args: any[]): void {
         if (!this._callbacks[eventName]) return;
 
         Grid.getInstance().emit(eventName, ...args);
 
-        this._callbacks[eventName].forEach((callback: any) => callback(...args));
+        // Call all callbacks
+        this._allCallbacks.forEach(callback => callback(eventName, ...args));
 
-        if (this._callbacks['*'])
-            this._callbacks["*"].forEach((callback: any) => callback(...args));
+        // Call specified callback
+        this._callbacks[eventName].forEach(callback => callback(...args));
     }
 }

src/modules/grid/index.ts

@@ -247,14 +247,19 @@ export default class Grid {
         Events.emit("middleware.before", articles);
 
         let getExtPair = Extensions.getInstance().startCount();
-        let pair: any;
-        while ((pair = getExtPair()) != null) {
-            if (pair.event === 'article.format') {
-                for (const i in articles)
-                    articles[i] = await pair.callback(articles[i]);
-            } else if (pair.event === 'articles') {
-                articles = await pair.callback(articles);
+        let pair: any = {};
+        try {
+            while ((pair = getExtPair()) != null) {
+                if (pair.event === 'article.format') {
+                    for (const i in articles)
+                        articles[i] = await pair.callback(articles[i]);
+                } else if (pair.event === 'articles') {
+                    articles = await pair.callback(articles);
+                }
             }
+        } catch (e) {
+            Events.emit("middleware.error", pair.event, e);
+            return;
         }
 
         Events.emit("middleware.after", articles);