Repository navigation
fix(script-manager): allow retry after resolveScript failure #1507
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
Open
linhh-phv
wants to merge
1
commit into
callstack:main
Choose a base branch
from
linhh-phv:fix/script-manager-retry-after-resolve-failure
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+84
−12
Open
Changes from all commits
Commits
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 hidden or 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,5 @@ | ||
| --- | ||
| "@callstack/repack": patch | ||
| --- | ||
|
|
||
| Fix `ScriptManager.loadScript` and `ScriptManager.prefetchScript` caching a failed resolution forever. `resolveScript` was awaited outside the `try`/`finally` that clears `scriptsPromises`, so when a resolver threw (e.g. the device was offline while fetching the script URL), the rejected promise stayed cached and every later call for the same script returned that same error without calling the resolvers again, until the app was restarted. The rejected promise is now removed when resolving fails, so the next call retries. |
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -1050,6 +1050,57 @@ describe('ScriptManagerAPI', () => { | |
|
|
||
| spy.mockRestore(); | ||
| }); | ||
|
|
||
| it('should retry loadScript after resolver failure', async () => { | ||
|
Collaborator
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. both new tests |
||
| const spy = mockLoadScriptBasedOnFetch(); | ||
|
|
||
| const resolver = jest | ||
| .fn() | ||
| .mockRejectedValueOnce(new Error('Network request failed')) | ||
| .mockImplementation(async (scriptId: string) => ({ | ||
| url: Script.getRemoteURL(scriptId), | ||
| })); | ||
| ScriptManager.shared.addResolver(resolver); | ||
|
|
||
| await expect(ScriptManager.shared.loadScript('miniApp')).rejects.toThrow( | ||
| 'Network request failed' | ||
| ); | ||
|
|
||
| // should not reuse the rejected promise from the first call | ||
| await expect( | ||
| ScriptManager.shared.loadScript('miniApp') | ||
| ).resolves.toBeUndefined(); | ||
| expect(resolver).toHaveBeenCalledTimes(2); | ||
| expect(spy).toHaveBeenCalledTimes(1); | ||
|
|
||
| spy.mockRestore(); | ||
| }); | ||
|
|
||
| it('should retry prefetchScript after resolver failure', async () => { | ||
| const spy = jest.spyOn(NativeScriptManager, 'prefetchScript'); | ||
| spy.mockResolvedValue(null); | ||
|
|
||
| const resolver = jest | ||
| .fn() | ||
| .mockRejectedValueOnce(new Error('Network request failed')) | ||
| .mockImplementation(async (scriptId: string) => ({ | ||
| url: Script.getRemoteURL(scriptId), | ||
| })); | ||
| ScriptManager.shared.addResolver(resolver); | ||
|
|
||
| await expect( | ||
| ScriptManager.shared.prefetchScript('miniApp') | ||
| ).rejects.toThrow('Network request failed'); | ||
|
|
||
| // should not reuse the rejected promise from the first call | ||
| await expect( | ||
| ScriptManager.shared.prefetchScript('miniApp') | ||
| ).resolves.toBeUndefined(); | ||
| expect(resolver).toHaveBeenCalledTimes(2); | ||
| expect(spy).toHaveBeenCalledTimes(1); | ||
|
|
||
| spy.mockRestore(); | ||
| }); | ||
| }); | ||
|
|
||
| function mockLoadScriptBasedOnFetch() { | ||
|
|
||
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 change lets later calls try again, but one case stays open:
loadScriptreuses the error fro running prefetch, so load that starts while prefetch fails also fails, and user must retry twice. Prefetch only fills the cache, so it must not decide the load:non-blocking, but worth a test