Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/footer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ export function snippetFor(value: string | null | undefined): string | null {

// all:initial keeps the host page's CSS out; it also drops the UA popover rules, hence height:fit-content
// and the :not(:popover-open) line.
export const FOOTER_CSS = `.pit-foot,.pit-foot-modal{all:initial;box-sizing:border-box;font:13px/1.5 system-ui,-apple-system,'Segoe UI',Roboto,sans-serif;color:#5b6555}
export const FOOTER_CSS = `.pit-foot,.pit-foot-modal{all:initial;box-sizing:border-box;font:14px/1.5 system-ui,-apple-system,'Segoe UI',Roboto,sans-serif;color:#273321}
.pit-foot *{box-sizing:border-box;font:inherit;color:inherit}
.pit-foot{display:flex;flex-wrap:wrap;align-items:center;justify-content:center;gap:4px 16px;margin:0 auto;padding:12px 16px;max-width:960px;text-align:center}
.pit-foot b{font-weight:600;color:#2a3324}
.pit-foot{display:flex;flex-wrap:wrap;align-items:center;justify-content:center;gap:6px 16px;margin:16px auto 8px;padding:14px 18px;max-width:960px;text-align:center;background:#f4f8ee;border:1px solid #d1dac7;border-top:2px solid #4d8a00;border-radius:8px}
.pit-foot b{font-weight:600;color:#172015}
.pit-foot-links{display:flex;flex-wrap:wrap;justify-content:center;gap:4px 14px}
.pit-foot-links>a,.pit-foot-links>button{all:unset;cursor:pointer;color:#2f6b00}
.pit-foot-links>a,.pit-foot-links>button{all:unset;cursor:pointer;color:#285800}
.pit-foot-links>a:hover,.pit-foot-links>button:hover{text-decoration:underline}
.pit-foot a:focus-visible,.pit-foot button:focus-visible{outline:2px solid #4d8a00;outline-offset:2px;border-radius:2px}
.pit-foot-modal{position:fixed;inset:0;margin:auto;width:min(560px,calc(100vw - 32px));height:fit-content;max-height:calc(100vh - 32px);overflow:auto;padding:22px 24px 18px;border:0;border-radius:12px;background:#fff;color:#2a3324;font-size:14px;line-height:1.55;text-align:left;box-shadow:0 20px 60px rgba(0,0,0,.25)}
Expand All @@ -115,7 +115,7 @@ export const FOOTER_CSS = `.pit-foot,.pit-foot-modal{all:initial;box-sizing:bord
.pit-foot-modal b{font-weight:700}.pit-foot-modal a{color:#2f6b00;text-decoration:underline;cursor:pointer}
.pit-foot-modal code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:.9em;background:#eef3e7;padding:.05em .3em;border-radius:4px;overflow-wrap:anywhere}
.pit-foot-x{all:unset;position:absolute;top:8px;right:12px;font-size:22px;line-height:1;padding:4px 6px;cursor:pointer;color:#6b7563}
@media (prefers-color-scheme:dark){.pit-foot{color:#a9b5a0}.pit-foot b{color:#dfe8d8}.pit-foot-links>a,.pit-foot-links>button{color:#c4ff6b}.pit-foot-modal{background:#151a11;color:#dfe8d8}.pit-foot-modal a{color:#c4ff6b}.pit-foot-modal code{background:#222a1c}.pit-foot-x{color:#a9b5a0}}
@media (prefers-color-scheme:dark){.pit-foot{background:#151a11;border-color:#384330;border-top-color:#a6ff1a;color:#edf3e8}.pit-foot b{color:#fff}.pit-foot-links>a,.pit-foot-links>button{color:#c4ff6b}.pit-foot-modal{background:#151a11;color:#edf3e8}.pit-foot-modal a{color:#c4ff6b}.pit-foot-modal code{background:#222a1c}.pit-foot-x{color:#c4ff6b}}
`

// Neutral, inherits the host page's colors: a clearnet site is not dressed in pit.world green.
Expand Down
5 changes: 3 additions & 2 deletions src/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import { isPublicAddress, normalizeDomain, type MoshpitAccess } from './listings
import { FOOTER_CSS, footerMarkup } from './footer.js'

export const PROXY_SUFFIX = '.pit.world'
const ASSET = '/.pit/proxy.css'
const ASSET_PATH = '/.pit/proxy.css'
const ASSET = `${ASSET_PATH}?v=contrast-1`
const HOP = new Set(['connection', 'keep-alive', 'proxy-connection', 'transfer-encoding', 'upgrade', 'te', 'trailer', 'proxy-authorization', 'proxy-authenticate', 'host', 'content-length', 'accept-encoding'])
const MAX_REWRITE = 8 * 1024 * 1024

Expand Down Expand Up @@ -268,7 +269,7 @@ export type ProxyDeps = { access: MoshpitAccess; certs: Certs; targets?: Targets
export async function proxyRequest(request: Request, name: string, ip: string, proto: string, deps: ProxyDeps): Promise<Response> {
const url = new URL(request.url)
const proxyHost = `${name}${PROXY_SUFFIX}`
if (url.pathname === ASSET) return new Response(PROXY_CSS, { headers: { 'content-type': 'text/css; charset=utf-8', 'cache-control': 'public, max-age=3600' } })
if (url.pathname === ASSET_PATH) return new Response(PROXY_CSS, { headers: { 'content-type': 'text/css; charset=utf-8', 'cache-control': 'public, max-age=3600' } })

const found = await (deps.targets ?? defaultTargets).get(name, deps.access)
if (found.state === 'unreachable')
Expand Down
Loading