-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Fix crash in bsc project when thread has error #235
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,7 @@ export class BscProjectThreaded implements ExtractMethods<BscProject> { | |
private messageHandler: ThreadMessageHandler<BscProject>; | ||
|
||
private activateDeferred = new Deferred(); | ||
private errorDeferred = new Deferred(); | ||
|
||
/** | ||
* Has this project finished activating (either resolved or rejected...) | ||
|
@@ -26,12 +27,38 @@ export class BscProjectThreaded implements ExtractMethods<BscProject> { | |
return this.activateDeferred.isCompleted; | ||
} | ||
|
||
/** | ||
* If an error occurs at any time during the worker's lifetime, it will be caught and stored here. | ||
*/ | ||
public isErrored() { | ||
return this.errorDeferred.isCompleted; | ||
} | ||
|
||
private ready() { | ||
return Promise.race([ | ||
//if we've encountered an error, reject immediately. The underlying error should propagate up | ||
this.errorDeferred.promise, | ||
//wait for the activate to finish. This should typically be the only promise that resolves | ||
this.activateDeferred.promise | ||
]); | ||
} | ||
|
||
public async activate(options: Parameters<ProgramBuilder['run']>[0]) { | ||
const timeEnd = this.logger.timeStart('log', 'activate'); | ||
|
||
// start a new worker thread or get an unused existing thread | ||
this.worker = bscProjectWorkerPool.getWorker(); | ||
|
||
//!!!IMPORTANT!!! this observer must be registered in order to prevent the worker thread from crashing the main thread | ||
this.worker.on('error', (error) => { | ||
this.logger.error('Worker encountered an error', error); | ||
this.errorDeferred.reject(error); | ||
//!!!IMPORTANT!!! this is required to prevent node from freaking out about an uncaught promise | ||
this.errorDeferred.promise.catch(e => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is also important. It's new code that helps track whether our worker has crashed. but by not observing the rejection, that would also bring down the node process. So we observe it, do nothing, and assume someone else will pay attention on the outside. |
||
//do nothing. this is just to prevent node from freaking out about an uncaught promise | ||
}); | ||
}); | ||
|
||
//link the message handler to the worker | ||
this.messageHandler = new ThreadMessageHandler<BscProject>({ | ||
name: 'MainThread', | ||
|
@@ -62,7 +89,7 @@ export class BscProjectThreaded implements ExtractMethods<BscProject> { | |
* @param relativePath path to the file relative to rootDir | ||
* @returns | ||
*/ | ||
public getScopeFunctionsForFile(options: { relativePath: string }): MaybePromise<Array<ScopeFunction>> { | ||
public async getScopeFunctionsForFile(options: { relativePath: string }): Promise<Array<ScopeFunction>> { | ||
return this.sendStandardRequest('getScopeFunctionsForFile', options); | ||
} | ||
|
||
|
@@ -73,7 +100,7 @@ export class BscProjectThreaded implements ExtractMethods<BscProject> { | |
* @returns the response from the request | ||
*/ | ||
private async sendStandardRequest<T>(name: MethodNames<BscProject>, ...data: any[]) { | ||
await this.activateDeferred.promise; | ||
await this.ready(); | ||
const response = await this.messageHandler.sendRequest<T>(name, { | ||
data: data | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was the most important part of the fix. by not observing this, node sees an unhandled exception and crashes.