-
Notifications
You must be signed in to change notification settings - Fork 3
fix: support network throttle bypass origins #82
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
originalix
wants to merge
1
commit into
main
Choose a base branch
from
codex/network-throttle-bypass-origins
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.
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
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
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
79 changes: 79 additions & 0 deletions
79
native-modules/react-native-network-throttle/src/__tests__/index.test.tsx
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,79 @@ | ||
| jest.mock('react-native', () => ({ | ||
| NativeModules: { | ||
| OneKeyNetworkThrottle: { | ||
| getConfig: jest.fn(), | ||
| setConfig: jest.fn(), | ||
| }, | ||
| }, | ||
| Platform: { | ||
| select: (options: { default: string }) => options.default, | ||
| }, | ||
| })); | ||
|
|
||
| import { NativeModules } from 'react-native'; | ||
|
|
||
| import { NetworkThrottle, type NetworkThrottleConfig } from '../index'; | ||
|
|
||
| const { getConfig: mockGetConfig, setConfig: mockSetConfig } = | ||
| NativeModules.OneKeyNetworkThrottle as { | ||
| getConfig: jest.Mock; | ||
| setConfig: jest.Mock; | ||
| }; | ||
|
|
||
| const baseConfig = { | ||
| enabled: true, | ||
| profile: 'slow4g' as const, | ||
| latencyMs: 562.5, | ||
| downloadBps: 102 * 1024, | ||
| uploadBps: 102 * 1024, | ||
| }; | ||
|
|
||
| describe('NetworkThrottle', () => { | ||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| it('normalizes config from an older native binary', async () => { | ||
| mockGetConfig.mockResolvedValue(baseConfig); | ||
|
|
||
| await expect(NetworkThrottle.getConfig()).resolves.toEqual({ | ||
| ...baseConfig, | ||
| bypassUrlOrigins: [], | ||
| }); | ||
| }); | ||
|
|
||
| it('forwards exact bypass origins with a complete native config', async () => { | ||
| const bypassUrlOrigins = ['http://localhost:8081']; | ||
| const expectedConfig: NetworkThrottleConfig = { | ||
| ...baseConfig, | ||
| bypassUrlOrigins, | ||
| }; | ||
| mockGetConfig.mockResolvedValue({ | ||
| ...baseConfig, | ||
| bypassUrlOrigins: [], | ||
| }); | ||
| mockSetConfig.mockResolvedValue(expectedConfig); | ||
|
|
||
| await expect( | ||
| NetworkThrottle.setConfig({ bypassUrlOrigins }) | ||
| ).resolves.toEqual(expectedConfig); | ||
| expect(mockSetConfig).toHaveBeenCalledWith(expectedConfig); | ||
| }); | ||
|
|
||
| it('preserves registered origins for unrelated config updates', async () => { | ||
| const currentConfig: NetworkThrottleConfig = { | ||
| ...baseConfig, | ||
| bypassUrlOrigins: ['http://10.0.2.2:8081'], | ||
| }; | ||
| const expectedConfig = { | ||
| ...currentConfig, | ||
| enabled: false, | ||
| }; | ||
| mockGetConfig.mockResolvedValue(currentConfig); | ||
| mockSetConfig.mockResolvedValue(expectedConfig); | ||
|
|
||
| await NetworkThrottle.setConfig({ enabled: false }); | ||
|
|
||
| expect(mockSetConfig).toHaveBeenCalledWith(expectedConfig); | ||
| }); | ||
| }); |
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.
P2: [Android bypass policy does not follow redirects]
When this URL redirects across origins, this check evaluates only the initial request.
ThrottleInterceptoris installed as an OkHttp application interceptor, sochain.proceed()follows redirects without invoking this bypass check again.As a result, a request starting on a bypassed origin can redirect to a non-bypassed origin and still skip all throttling; the reverse direction can keep throttling a bypassed target. Please evaluate the bypass set for each network exchange or redirect target, and cover redirects both into and out of bypassed origins.