WebpackPatcher: Try catch more code prone to errors

src/webpack/patchWebpack.ts

@@ -60,7 +60,7 @@ export function getFactoryPatchedBy(moduleId: PropertyKey, webpackRequire = wreq
     return webpackRequire.m[moduleId]?.[SYM_PATCHED_BY];
 }
 
-const logger = new Logger("WebpackInterceptor", "#8caaee");
+const logger = new Logger("WebpackPatcher", "#8caaee");
 
 /** Whether we tried to fallback to the WebpackRequire of the factory, or disabled patches */
 let wreqFallbackApplied = false;
@@ -436,12 +436,21 @@ function runFactoryWithWrap(patchedFactory: PatchedModuleFactory, thisArg: unkno
                 callback(exports, module.id);
                 continue;
             }
+        } catch (err) {
+            logger.error(
+                "Error while filtering or firing callback for Webpack waitFor subscription:\n", err,
+                "\n\nModule exports:", exports,
+                "\n\nFilter:", filter,
+                "\n\nCallback:", callback
+            );
+        }
 
         if (typeof exports !== "object") {
             continue;
         }
 
         for (const exportKey in exports) {
+            try {
                 // Some exports might have not been initialized yet due to circular imports, so try catch it.
                 try {
                     var exportValue = exports[exportKey];
@@ -454,9 +463,14 @@ function runFactoryWithWrap(patchedFactory: PatchedModuleFactory, thisArg: unkno
                     callback(exportValue, module.id);
                     break;
                 }
-            }
             } catch (err) {
-            logger.error("Error while firing callback for Webpack waitFor subscription:\n", err, filter, callback);
+                logger.error(
+                    "Error while filtering or firing callback for Webpack waitFor subscription:\n", err,
+                    "\n\nExport value:", exports,
+                    "\n\nFilter:", filter,
+                    "\n\nCallback:", callback
+                );
+            }
         }
     }
 

src/webpack/webpack.ts

@@ -145,10 +145,18 @@ function makePropertyNonEnumerable(target: Record<PropertyKey, any>, key: Proper
 }
 
 export function _blacklistBadModules(requireCache: NonNullable<AnyWebpackRequire["c"]>, exports: ModuleExports, moduleId: PropertyKey) {
+    try {
         if (shouldIgnoreValue(exports)) {
             makePropertyNonEnumerable(requireCache, moduleId);
             return true;
         }
+    } catch (err) {
+        logger.error(
+            "Error while blacklisting module:\n", err,
+            "\n\nModule id:", moduleId,
+            "\n\nModule exports:", exports,
+        );
+    }
 
     if (typeof exports !== "object") {
         return false;
@@ -156,6 +164,7 @@ export function _blacklistBadModules(requireCache: NonNullable<AnyWebpackRequire
 
     let hasOnlyBadProperties = true;
     for (const exportKey in exports) {
+        try {
             // Some exports might have not been initialized yet due to circular imports, so try catch it.
             try {
                 var exportValue = exports[exportKey];
@@ -168,6 +177,13 @@ export function _blacklistBadModules(requireCache: NonNullable<AnyWebpackRequire
             } else {
                 hasOnlyBadProperties = false;
             }
+        } catch (err) {
+            logger.error(
+                "Error while blacklistng module:\n", err,
+                "\n\nModule id:", moduleId,
+                "\n\nExport value:", exportValue,
+            );
+        }
     }
 
     return hasOnlyBadProperties;