WebpackPatcher: Try catch more code prone to errors
This commit is contained in:
parent
98b1b11dfa
commit
707d688887
2 changed files with 49 additions and 19 deletions
|
|
@ -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;
|
||||
}
|
||||
if (typeof exports !== "object") {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (const exportKey in exports) {
|
||||
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 filtering or firing callback for Webpack waitFor subscription:\n", err,
|
||||
"\n\nExport value:", exports,
|
||||
"\n\nFilter:", filter,
|
||||
"\n\nCallback:", callback
|
||||
);
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error("Error while firing callback for Webpack waitFor subscription:\n", err, filter, callback);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue