PluginManager: catch errors during plugin flux handlers

src/plugins/index.ts

@@ -169,7 +169,18 @@ export function subscribePluginFluxEvents(p: Plugin, fluxDispatcher: typeof Flux
 
         logger.debug("Subscribing to flux events of plugin", p.name);
         for (const [event, handler] of Object.entries(p.flux)) {
-            fluxDispatcher.subscribe(event as FluxEvents, handler);
+            const wrappedHandler = p.flux[event] = function () {
+                try {
+                    const res = handler.apply(p, arguments as any);
+                    return res instanceof Promise
+                        ? res.catch(e => logger.error(`${p.name}: Error while handling ${event}\n`, e))
+                        : res;
+                } catch (e) {
+                    logger.error(`${p.name}: Error while handling ${event}\n`, e);
+                }
+            };
+
+            fluxDispatcher.subscribe(event as FluxEvents, wrappedHandler);
         }
     }
 }

src/plugins/xsOverlay.desktop/index.ts

@@ -154,8 +154,6 @@ export default definePlugin({
             }
         },
         MESSAGE_CREATE({ message, optimistic }: { message: Message; optimistic: boolean; }) {
-            // Apparently without this try/catch, discord's socket connection dies if any part of this errors
-            try {
             if (optimistic) return;
             const channel = ChannelStore.getChannel(message.channel_id);
             if (!shouldNotify(message, message.channel_id)) return;
@@ -249,9 +247,6 @@ export default definePlugin({
 
             if (shouldIgnoreForChannelType(channel)) return;
             sendMsgNotif(titleString, finalMsg, message);
-            } catch (err) {
-                XSLog.error(`Failed to catch MESSAGE_CREATE: ${err}`);
-            }
         }
     }
 });

src/utils/types.ts

@@ -128,7 +128,7 @@ export interface PluginDef {
      * Allows you to subscribe to Flux events
      */
     flux?: {
-        [E in FluxEvents]?: (event: any) => void;
+        [E in FluxEvents]?: (event: any) => void | Promise<void>;
     };
     /**
      * Allows you to manipulate context menus