Skip to content

Fix upper search bar navigation from any page and Scramjet URL decoding #36

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix upper search bar navigation from any page and Scramjet URL decoding #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
673379e
Initial plan
Copilot Nov 20, 2025
dc71c65
Fix upper search bar functionality and scramjet URL decoding
Copilot Nov 20, 2025
bca456d
Improve URL decoding to handle cases when proxy objects not initialized
Copilot Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 49 additions & 30 deletions src/components/UpperSearchBar.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,43 +71,58 @@ import { Icon } from "astro-icon/components";
// Get the actual URL from the proxy
if (iframeWin.__uv) {
pageURL = iframeWin.__uv.location.href;
} else if (iframeWin.$scramjet?.config?.prefix) {
const scramjetURL = iframeWin.location.href;
pageURL = scramjetURL
.replace(iframeWin.location.origin, '')
.replace(iframeWin.$scramjet.config.prefix, '');
} else {
pageURL = iframeWin.location.href;
upperSearchInput.value = pageURL;
return;
} else if (iframeWin.$scramjet?.url) {
// Use scramjet's URL property which contains the decoded URL
pageURL = iframeWin.$scramjet.url.href;
upperSearchInput.value = pageURL;
return;
}
upperSearchInput.value = pageURL;
// If proxy objects not available, fall through to decode from src
}
} catch (e) {
// Cross-origin error - try to get URL from iframe src
try {
const iframeSrc = iframe.src;
if (iframeSrc) {
// Decode URL from proxy prefix
if (iframeSrc.includes('/~/uv/')) {
// Extract and decode UV URL
const encoded = iframeSrc.split('/~/uv/')[1];
if (encoded && typeof __uv$config !== 'undefined') {
try {
const decoded = __uv$config.decodeUrl!(encoded);
upperSearchInput.value = decoded;
} catch {
upperSearchInput.value = iframeSrc;
}
// Cross-origin error - will decode from iframe src below
}

// Decode URL from iframe src (for both cross-origin and when proxy objects not available)
try {
const iframeSrc = iframe.src;
if (iframeSrc) {
// Decode URL from proxy prefix
if (iframeSrc.includes('/~/uv/')) {
// Extract and decode UV URL
const encoded = iframeSrc.split('/~/uv/')[1];
if (encoded && typeof __uv$config !== 'undefined') {
try {
const decoded = __uv$config.decodeUrl!(encoded);
upperSearchInput.value = decoded;
} catch {
upperSearchInput.value = iframeSrc;
}
}
} else if (iframeSrc.includes('/~/scramjet/')) {
// Extract and decode Scramjet URL
const encoded = iframeSrc.split('/~/scramjet/')[1];
if (encoded && typeof $scramjetLoadController !== 'undefined') {
try {
const { ScramjetController } = $scramjetLoadController();
// Create a temporary controller instance to decode
const tempController = new ScramjetController({ prefix: '/~/scramjet/' });
const decoded = tempController.decodeUrl(encoded);
upperSearchInput.value = decoded;
} catch {
upperSearchInput.value = encoded;
}
} else if (iframeSrc.includes('/~/scramjet/')) {
const encoded = iframeSrc.split('/~/scramjet/')[1];
upperSearchInput.value = encoded || iframeSrc;
} else {
upperSearchInput.value = iframeSrc;
upperSearchInput.value = encoded || iframeSrc;
}
} else {
upperSearchInput.value = iframeSrc;
}
} catch {
// Fallback - just leave the current value
}
} catch {
// Fallback - just leave the current value
}
};

Expand All @@ -121,13 +136,17 @@ import { Icon } from "astro-icon/components";
return;
}

// Regular URL handling - only if iframe exists
// Regular URL handling
// If we're on the main page with iframe, use it
if (iframe && bhl && phl) {
iframe.classList.remove("hidden");
await sw.ready();
iframe.src = sw.encodeURL(inputValue);
bhl.classList.add("hidden");
phl.classList.remove("hidden");
} else {
// Otherwise, navigate to home page with the search query
window.location.href = '/?redir=' + btoa(inputValue);
}
}
});
Expand Down
7 changes: 3 additions & 4 deletions src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,9 @@ const link = Astro.url.searchParams.get("redir");
if (iframeWin!.__uv) {
return iframeWin!.__uv.location.href
}
else if (iframeWin!.$scramjet?.config?.prefix) {
return iframeWin!.location.href
.replace(iframeWin!.location.origin, '')
.replace(iframeWin!.$scramjet.config.prefix, '')
else if (iframeWin!.$scramjet?.url) {
// Use scramjet's URL property which contains the decoded URL
return iframeWin!.$scramjet.url.href
}
else {
// Fallback if neither proxy is available
Expand Down