fix: redirect page and first-hit normalization #201
Merged
Conversation
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
SgtPooki
changed the title
SgtPooki
commented
Apr 15, 2024
| window.location.replace(windowLocation.href) | ||
| } | ||
|
|
||
| return (<>First-hit on IPFS hosted service-worker-gateway. Reloading</>) |
There was a problem hiding this comment.
we could probably add a spinner or something better here.
Comment on lines
+20
to
+34
| /** | ||
| * If you host helia-service-worker-gateway on an IPFS domain, the redirects file will route some requests from | ||
| * `<domain>/<wildcard-splat>` to `https://<domain>/?helia-sw=<wildcard-splat>`. | ||
| * | ||
| * This function will check for "?helia-sw=" in the URL and modify the URL so that it works with the rest of our logic | ||
| */ | ||
| function translateIpfsRedirectUrl (urlString: string): URL { | ||
| const url = new URL(urlString) | ||
| const heliaSw = url.searchParams.get('helia-sw') | ||
| if (heliaSw != null) { | ||
| url.searchParams.delete('helia-sw') | ||
| url.pathname = heliaSw | ||
| } | ||
| return url | ||
| } |
There was a problem hiding this comment.
this was moved from ipfs-hosted-redirect-utils.ts without modification
|
|
||
| const routes: Route[] = [ | ||
| { default: true, component: LazyHelperUi }, | ||
| { path: '#/ipfs-sw-config', shouldRender: async () => (await import('./lib/routing-render-checks')).shouldRenderConfigPage(), component: LazyConfig }, | ||
| { shouldRender: async () => (await import('./lib/routing-render-checks')).shouldRenderRedirectPage(), component: LazyRedirectPage } | ||
| { shouldRender: async () => (await import('./lib/routing-render-checks.js')).shouldRenderRedirectsInterstitial(), component: LazyInterstitial }, |
There was a problem hiding this comment.
We could probably import this check function immediately since it's tiny but this is consistent at least.
There was a problem hiding this comment.
Sounds like a reasonable way to avoid an additional round trip.
|
I need this in to fix config page loading on subdomains on localhost... will merge shortly. |
|
Nice! From my testing this resolves the redirection loop. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Title
fix: redirect page and first-hit normalization
Description
Fixes config page loading and normalizes first hits landing on redirectPage.
Fixes #148
Fixes #150
Summary of changes
Notes & open questions
This normalizes how redirects are handled. Now, the first hit on a redirect page will always land on the redirect page, and subsequent hits will be redirected to the target page. Previously, the first hit for ?helia-sw would actually load the helperUI page, which is not ideal.
Change checklist