Add pooling and request limiting to prevent memory leaks #110
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
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
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 |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| export interface BuiltScriptExecutorSchema { | ||
| scriptPath: string; | ||
| inspect: boolean; | ||
| 'inspect-brk': boolean; | ||
| 'trace-exit': boolean; | ||
| 'trace-uncaught': boolean; | ||
| 'trace-warnings': boolean; | ||
| __unparsed__: string; | ||
| } // eslint-disable-line |
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
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
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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import { PHPResponse } from '@php-wasm/universal'; | ||
| import { NodePHP } from '@php-wasm/node'; | ||
| import { Pool } from './pool'; | ||
|
|
||
| export type nodePoolOptions = { | ||
| spawn?: () => Promise<NodePHP>; | ||
| reap?: (instance: NodePHP) => void; | ||
| fatal?: (instance: NodePHP, error: any) => any; | ||
| maxRequests?: number; | ||
| maxJobs?: number; | ||
| }; | ||
|
|
||
| const defaultSpawn = async () => await NodePHP.load('8.2'); | ||
adamziel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| const defaultFatal = (instance: NodePHP, error: any) => | ||
| new PHPResponse( | ||
| 500, | ||
| {}, | ||
| new TextEncoder().encode( | ||
| `500 Internal Server Error:\n\n${String( | ||
| error && error.stack ? error.stack : error | ||
| )}` | ||
| ) | ||
| ); | ||
|
|
||
| const defaultReap = (instance: NodePHP) => { | ||
| try { | ||
| instance.exit(); | ||
| } catch { | ||
| void 0; | ||
adamziel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| }; | ||
|
|
||
| export class NodePool extends Pool { | ||
| constructor({ | ||
| maxRequests = 128, | ||
| maxJobs = 1, | ||
| spawn = defaultSpawn, | ||
| fatal = defaultFatal, | ||
| reap = defaultReap, | ||
| } = {}) { | ||
| super({ maxRequests, maxJobs, spawn, fatal, reap }); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Why only add
-fin this line of code but not the other ones? And why update theinteractive-code-block?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.
I was getting an error during the build process due to the attempted removal of a non-existent file.
-fpreventsrmfrom throwing errors when you try to remove a file that isn't there. I've reverted it locally and the issue doesn't seem to be happening anymore. I only applied this to php5 because I've seen that we're deprecating that.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.
Aha! PHP is not in the Playground repo anymore so that entire
rmline could be removed in a separate PR.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.
@adamziel See, that worries me. If someone still has that directory, and then moves to a version that doesn't have an
rmcall for it, then it won't be removed. I think we should definitely open the PR now, BUT I think we should hold off on actually merging it for a predetermined amount of time, so that this can run off. Let me know your thoughts.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.
#131
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.
How would someone still have that directory after
git pullandnpm install?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.
@adamziel If someone pulled the package freshly then that directory wouldn't exist. But if someone were already working with it, and had it in a state where that directory exists, and then checked out a version where the
rmcall is gone, then the directory might persist unexpectedly.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.
The way I understand git is that checking out a newer revision where a file is removed does remove that file from the filesystem. Am I getting that wrong?