fix uv#580
Merged
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the proxy stack to use a combined service worker for Ultraviolet + Scramjet (Scramjet v2 controller), adjusts Ultraviolet’s bare-client fetch header shape, and refactors the client-side navigation/autocomplete wiring to match the new Scramjet controller model.
Changes:
- Replace separate UV/Scramjet service workers with a combined SW (
views/sw.js) and a combined blacklist SW (views/sw-blacklist.js), updating registration logic accordingly. - Migrate Scramjet page bootstrapping from
scramjet.all.jstoscramjet.js+controller.api.js, and refactor “stealth frame” navigation/autocomplete to use the controller/frame API. - Switch Ultraviolet dependency sourcing to a local
file:./lib/ultravioletwith a setup script/patching workflow, and apply an Ultraviolet SW header fix (Object.entries(requestCtx.headers)).
Reviewed changes
Copilot reviewed 26 out of 29 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| views/uv/WWError.js | Removes Workerware error helper (cleanup of unused middleware path). |
| views/uv/workerware.js | Removes Workerware middleware implementation (cleanup). |
| views/uv/uv.sw.js | Adjusts bare-client fetch headers format. |
| views/uv/sw-blacklist.js | Removes legacy UV-only blacklist SW. |
| views/sw.js | Adds combined UV + Scramjet routing in one SW. |
| views/sw-blacklist.js | Adds combined SW with domain blacklist enforcement for both engines. |
| views/scram/scramjet.sw.js | Removes legacy Scramjet v1 SW. |
| views/scram/scramjet.sw-blacklist.js | Removes legacy Scramjet v1 blacklist SW. |
| views/scram/scramjet.all.js | Removes Scramjet v1 bundled payload. |
| views/pages/proxnav/ultraviolet.html | Loads Scramjet controller scripts alongside UV assets. |
| views/pages/proxnav/scramjet.html | Switches to Scramjet v2 scripts + controller API. |
| views/pages/proxnav/preset/youtube.html | Switches to Scramjet v2 scripts + controller API. |
| views/pages/proxnav/preset/applications.html | Switches to Scramjet v2 scripts + controller API. |
| views/pages/nav/partners.html | Switches to Scramjet v2 scripts + controller API. |
| views/pages/nav/games.html | Switches to Scramjet v2 scripts + controller API. |
| views/pages/frame.html | Switches to Scramjet v2 scripts + controller API. |
| views/assets/js/register-sw.js | Refactors SW registration and initializes Scramjet controller + transport. |
| views/assets/js/common-1778310233.js | Updates stealth-frame navigation + Scramjet URL handling/autocomplete flow. |
| TODO.md | Updates todo list items and marks Scramjet v2 work complete. |
| src/source-rewrites.mjs | Tweaks escaping behavior in source rewriting. |
| src/server.mjs | Serves SW scripts with Service-Worker-Allowed header; route/alt-path integration. |
| src/routes.mjs | Updates alt-path mappings for new SW/controller asset names. |
| run-command.mjs | Updates build pipeline for Scramjet v2/controller assets and minification inputs. |
| proxyServiceValidator.js | Updates validator to new asset names and Scramjet controller readiness flow. |
| pnpm-lock.yaml | Updates dependencies (Scramjet v2 + controller, transports, UV from local file path). |
| package.json | Updates deps and adds UV preparation step to install lifecycle. |
| lib/ultraviolet.patch | Adds Ultraviolet SW patch to adjust header passing to bare client. |
| lib/setup-ultraviolet.sh | Clones/builds Ultraviolet and applies patch for local file: dependency. |
| .gitignore | Ignores lib/ultraviolet/. |
Files not reviewed (1)
- pnpm-lock.yaml: Language not supported
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Collaborator
Author
|
wowzers |
Collaborator
Author
|
@QuiteAFancyEmerald review asp pls |
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
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.
No description provided.