Skip to content

feat(): capture worker errors #2709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2020
Merged

feat(): capture worker errors #2709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/client/client-log.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import type * as d from '../declarations';
import { BUILD } from '@app-data';

export let consoleError: d.ErrorHandler = (e: any, _?: any) => console.error(e);
let customError: d.ErrorHandler ;
export const consoleError: d.ErrorHandler = (e: any, el?: any) => (customError || console.error)(e, el);

export const STENCIL_DEV_MODE = BUILD.isTesting
? ['STENCIL:'] // E2E testing
Expand All @@ -13,4 +14,4 @@ export const consoleDevWarn = (...m: any[]) => console.warn(...STENCIL_DEV_MODE,

export const consoleDevInfo = (...m: any[]) => console.info(...STENCIL_DEV_MODE, ...m);

export const setErrorHandler = (handler: d.ErrorHandler) => consoleError = handler;
export const setErrorHandler = (handler: d.ErrorHandler) => customError = handler;
14 changes: 9 additions & 5 deletions src/compiler/bundle/worker-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { Plugin, TransformResult, PluginContext } from 'rollup';
import { bundleOutput } from './bundle-output';
import { normalizeFsPath, hasError } from '@utils';
import { optimizeModule } from '../optimize/optimize-module';
import { STENCIL_INTERNAL_ID } from './entry-alias-ids';

export const workerPlugin = (config: d.Config, compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx, platform: string, inlineWorkers: boolean): Plugin => {
if (platform === 'worker' || platform === 'hydrate') {
Expand Down Expand Up @@ -248,7 +249,6 @@ addEventListener('message', async ({data}) => {

} catch (e) {
value = null;
${isDev ? 'console.error("Error when calling worker routine", e);' : ''}
if (e instanceof Error) {
err = {
isError: true,
Expand Down Expand Up @@ -279,6 +279,8 @@ addEventListener('message', async ({data}) => {
`;

export const WORKER_HELPERS = `
import { consoleError } from '${STENCIL_INTERNAL_ID}';

let pendingIds = 0;
let callbackIds = 0;
const pending = new Map();
Expand All @@ -299,10 +301,12 @@ export const createWorker = (workerPath, workerName, workerMsgId) => {
pending.delete(id);

if (err) {
reject((err.isError)
const errObj = (err.isError)
? Object.assign(new Error(err.value.message), err.value)
: err.value
);
: err.value;

consoleError(errObj);
reject(errObj);
} else {
if (callbackIds) {
callbackIds.forEach(id => callbacks.delete(id));
Expand All @@ -313,7 +317,7 @@ export const createWorker = (workerPath, workerName, workerMsgId) => {
try {
callbacks.get(id)(...value);
} catch (e) {
console.error(e);
consoleError(e);
}
}
}
Expand Down