From 1352ed9f2928df5d2d5edb6119531e35a5353d89 Mon Sep 17 00:00:00 2001 From: Jonathan Sykes Date: Thu, 15 Oct 2026 19:29:13 +0800 Subject: [PATCH] Watch party reader view: presented websites become clean text with per-device font size, landscape/portrait and an Original switch; SSRF-guarded server fetch --- frontend/styles.css | 24 ++++++ frontend/watch-party-client.js | 66 +++++++++++++++-- server/bun.lock | 48 ++++++++++++ server/package.json | 4 +- server/party.js | 3 +- server/reader.js | 132 +++++++++++++++++++++++++++++++++ server/reader.test.js | 49 ++++++++++++ server/server.js | 2 + 8 files changed, 320 insertions(+), 8 deletions(-) create mode 100644 server/reader.js create mode 100644 server/reader.test.js diff --git a/frontend/styles.css b/frontend/styles.css index 5d30294..d675be4 100755 --- a/frontend/styles.css +++ b/frontend/styles.css @@ -4088,6 +4088,30 @@ body.landscape-fs .player-stage { touch-action: none; } /* fullscreen (real or t .pp-bar .np-btn { min-height: 40px; text-decoration: none; display: inline-flex; align-items: center; } .pp-frame { flex: 1; width: 100%; border: 0; background: #fff; } .pp-hint { margin: 0; padding: 6px 10px; font-size: 12px; color: var(--text-dim); background: var(--bg-2); } +.pp-hint[hidden], .pp-frame[hidden], .pp-rtools[hidden] { display: none; } +.pp-rtools { display: inline-flex; gap: 6px; } +.pp-reader { flex: 1; overflow-y: auto; -webkit-overflow-scrolling: touch; overscroll-behavior: contain; background: var(--bg); } +.pp-reader[hidden] { display: none; } +.pp-article { max-width: 68ch; margin: 0 auto; padding: 24px 20px 64px; font: 400 var(--pp-size, 20px)/1.65 var(--ui, system-ui), sans-serif; color: var(--text); overflow-wrap: anywhere; } +.pp-article h1 { font-family: var(--display, inherit); font-size: 1.6em; line-height: 1.15; margin: 0 0 .3em; text-wrap: balance; } +.pp-article h2, .pp-article h3 { line-height: 1.25; margin: 1.4em 0 .4em; } +.pp-article .pp-by { margin: 0 0 1.4em; color: var(--text-2); font-size: .8em; } +.pp-article p, .pp-article li { margin: 0 0 .9em; } +.pp-article img { max-width: 100%; height: auto; border-radius: 6px; } +.pp-article a { color: var(--accent, #f06b53); text-underline-offset: 3px; } +.pp-article blockquote { margin: 1em 0; padding-left: 1em; border-left: 2px solid var(--line); color: var(--text-2); } +.pp-article pre { overflow-x: auto; font-size: .8em; } +.pp-article table { display: block; overflow-x: auto; font-size: .85em; border-collapse: collapse; } +.pp-article td, .pp-article th { padding: 4px 8px; border: 1px solid var(--line); } +.pp-msg { padding: 32px 20px 0; text-align: center; color: var(--text-2); } +.party-present.landscape { inset: 0; border-radius: 0; z-index: 900; } +@media (orientation: portrait) { + .party-present.landscape { inset: auto; top: 0; left: 100vw; width: 100vh; width: 100dvh; height: 100vw; transform-origin: top left; transform: rotate(90deg); } +} +@media (max-width: 899px) { + .pp-bar { flex-wrap: wrap; } + .pp-what { flex-basis: 100%; } +} @media (max-width: 899px) { .party-present { inset: calc(8px + env(safe-area-inset-top, 0px)) 8px calc(8px + env(safe-area-inset-bottom, 0px)) 8px; z-index: 165; } } diff --git a/frontend/watch-party-client.js b/frontend/watch-party-client.js index 365a17e..803f1ee 100644 --- a/frontend/watch-party-client.js +++ b/frontend/watch-party-client.js @@ -20,7 +20,7 @@ ws: null, role: null, code: '', secret: '', name: '', members: [], chat: [], state: null, offset: 0, dj: { enabled: false, entries: [] }, djPending: false, allowControl: false, quietUntil: 0, detached: false, retry: null, pushTimer: null, driftTimer: null, lastPush: '', - loadingId: '', restoring: false, inviteCode: '', hiddenAt: 0, present: null, presentHidden: false, invites: [], inviteError: '', + loadingId: '', restoring: false, inviteCode: '', hiddenAt: 0, present: null, presentHidden: false, invites: [], inviteError: '', viewMode: {}, reader: { url: '', html: '', error: '', loading: false }, voice: { on: false, stream: null, muted: false, pcs: new Map(), audios: new Map() }, minimized: false, }; @@ -548,18 +548,24 @@ el.innerHTML = `
+ + Open
+

Blank? Some sites don't allow embedding — tap Open to view it in a new tab.

`; el.addEventListener('click', (e) => { const b = e.target.closest('[data-pp]'); if (!b || !st.present) return; if (b.dataset.pp === 'hide') { st.presentHidden = true; renderPresent(); render(); return; } + if (b.dataset.pp === 'smaller' || b.dataset.pp === 'bigger') { readerSize(readerSize() + (b.dataset.pp === 'bigger' ? 2 : -2)); renderPresent(); return; } + if (b.dataset.pp === 'rotate') { setPresentLandscape(!el.classList.contains('landscape')); return; } + if (b.dataset.pp === 'mode') { st.viewMode[st.present.url] = viewOf(st.present) === 'reader' ? 'embed' : 'reader'; renderPresent(); return; } if (!canPresent()) return; const page = Math.max(1, (st.present.page || 1) + (b.dataset.pp === 'next' ? 1 : -1)); - send({ type: 'present', present: { url: st.present.url, page } }); + send({ type: 'present', present: { url: st.present.url, page, mode: st.present.mode } }); }); document.addEventListener('keydown', (e) => { if (!st.present || st.presentHidden || !canPresent() || e.target.closest?.('input, textarea')) return; @@ -569,10 +575,55 @@ document.body.append(el); return el; } + // Reader view: the server turns the page into clean text; each device picks + // its own size and orientation, and can switch to the original page. + const viewOf = (p) => st.viewMode[p.url] || p.mode || 'embed'; + const readerSize = (v) => { + if (v !== undefined) { ls.set('ytpReaderSize', String(Math.max(14, Math.min(44, v)))); } + return Number(ls.get('ytpReaderSize')) || 20; + }; + async function setPresentLandscape(on) { + const el = $('partyPresent'); if (!el) return; + el.classList.toggle('landscape', !!on); + const b = el.querySelector('[data-pp="rotate"]'); b.setAttribute('aria-pressed', String(!!on)); b.textContent = on ? '⟲ Portrait' : '⟳ Landscape'; + try { + if (on && document.documentElement.requestFullscreen && screen.orientation?.lock) { if (!document.fullscreenElement) await document.documentElement.requestFullscreen(); await screen.orientation.lock('landscape'); } + else if (!on) { try { screen.orientation?.unlock?.(); } catch { /* not locked */ } if (document.fullscreenElement) await document.exitFullscreen(); } + } catch { /* iOS: the CSS rotation covers it */ } + } + async function loadReader(url) { + if (st.reader.url === url && (st.reader.html || st.reader.loading)) return; + st.reader = { url, html: '', error: '', loading: true }; renderPresent(); + try { + const j = await (await fetch(`/api/party/${encodeURIComponent(st.code)}/reader`)).json(); + if (st.reader.url !== url) return; + if (!j.ok) throw new Error(j.error || 'Could not read that page'); + st.reader = { url, loading: false, error: '', html: `

${escapeHtml(j.title || '')}

+

${escapeHtml([j.byline, j.site].filter(Boolean).join(' · '))}

${j.content}
` }; + } catch (err) { if (st.reader.url === url) st.reader = { url, loading: false, html: '', error: err.message }; } + renderPresent(); + } function renderPresent() { const p = st.present; - if (!p) { const el = $('partyPresent'); if (el) { el.classList.add('hidden'); el.querySelector('.pp-frame').removeAttribute('src'); } return; } + if (!p) { const el = $('partyPresent'); if (el) { el.classList.add('hidden'); el.classList.remove('landscape'); el.querySelector('.pp-frame').removeAttribute('src'); } return; } const el = presentEl(), e = embedOf(p.url, p.page || 1); + const reading = viewOf(p) === 'reader'; + el.classList.toggle('reading', reading); + el.querySelector('.pp-rtools').hidden = !reading; + el.querySelector('[data-pp="mode"]').textContent = reading ? 'Original' : 'Reader'; + const box = el.querySelector('.pp-reader'); + box.hidden = !reading; + el.querySelector('.pp-frame').hidden = reading; + el.querySelector('.pp-hint').hidden = reading; + if (reading) { + el.style.setProperty('--pp-size', readerSize() + 'px'); + if (st.reader.url !== p.url) loadReader(p.url); + const r = st.reader; + const html = r.loading ? '

Making the page easy to read…

' + : r.error ? `

${escapeHtml(r.error)}

` : r.html; + if (box.dataset.for !== p.url + '|' + html.length) { box.innerHTML = html; box.dataset.for = p.url + '|' + html.length; } + el.querySelector('.pp-frame').removeAttribute('src'); + } el.classList.toggle('hidden', st.presentHidden); el.querySelector('.pp-what').textContent = `${p.by || 'Host'} · ${e.label}`; el.querySelector('.pp-pages').hidden = !e.paged; @@ -580,18 +631,21 @@ for (const b of el.querySelectorAll('.pp-pages button')) b.hidden = !canPresent(); el.querySelector('.pp-open').href = p.url; const frame = el.querySelector('.pp-frame'); - if (frame.getAttribute('src') !== e.src) frame.setAttribute('src', e.src); + if (!reading && frame.getAttribute('src') !== e.src) frame.setAttribute('src', e.src); } function presentPrompt() { const body = document.createElement('div'); body.innerHTML = `

Everyone in the party sees it full screen. Google Slides and PDFs follow your page — use ‹ › or the arrow keys.

- + +

Google files must be shared “Anyone with the link”. Sites like Facebook or banks refuse embedding; guests can still tap Open.

`; const go = () => { let url = ($('ppUrl').value || '').trim(); if (url && !/^https?:\/\//i.test(url)) url = 'https://' + url; try { new URL(url); } catch { toast('Paste a full link, e.g. https://…'); return; } - closeModal(); send({ type: 'present', present: { url, page: 1 } }); + const special = embedOf(url, 1); // Google files and PDFs always embed + const mode = $('ppReader').checked && !special.paged && !/Google/.test(special.label || '') ? 'reader' : 'embed'; + closeModal(); send({ type: 'present', present: { url, page: 1, mode } }); }; showModal('🖥 Present to the party', body, [{ label: 'Cancel', onClick: closeModal }, { label: 'Present', primary: true, onClick: go }]); setTimeout(() => { const i = $('ppUrl'); if (i) { i.focus(); i.addEventListener('keydown', (e) => { if (e.key === 'Enter') { e.preventDefault(); go(); } }); } }, 50); diff --git a/server/bun.lock b/server/bun.lock index c4c4b73..2478182 100644 --- a/server/bun.lock +++ b/server/bun.lock @@ -7,7 +7,9 @@ "dependencies": { "@hono/node-server": "^1.14.0", "@libsql/client": "^0.14.0", + "@mozilla/readability": "^0.6.0", "hono": "^4.7.10", + "linkedom": "^0.18.13", "nodemailer": "^6", "qrcode": "^1.5.4", }, @@ -40,6 +42,8 @@ "@libsql/win32-x64-msvc": ["@libsql/win32-x64-msvc@0.4.7", "", { "os": "win32", "cpu": "x64" }, "sha512-7pJzOWzPm6oJUxml+PCDRzYQ4A1hTMHAciTAHfFK4fkbDZX33nWPVG7Y3vqdKtslcwAzwmrNDc6sXy2nwWnbiw=="], + "@mozilla/readability": ["@mozilla/readability@0.6.0", "", {}, "sha512-juG5VWh4qAivzTAeMzvY9xs9HY5rAcr2E4I7tiSSCokRFi7XIZCAu92ZkSTsIj1OPceCifL3cpfteP3pDT9/QQ=="], + "@neon-rs/load": ["@neon-rs/load@0.0.4", "", {}, "sha512-kTPhdZyTQxB+2wpiRcFWrDcejc4JI6tkPuS7UZCG4l6Zvc5kU/gGQ/ozvHTh1XR5tS+UlfAfGuPajjzQjCiHCw=="], "@types/node": ["@types/node@26.6.5", "", { "dependencies": { "undici-types": "~8.9.0" } }, "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg=="], @@ -50,6 +54,8 @@ "ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], + "boolbase": ["boolbase@2.0.0", "", {}, "sha512-DkVaaQHymRhpYEYo9x1oo7Q7B0Y6KJUsjm3c9eTyFDby4MHLBTwZ6ZDWBel5zrYxj1WsZgC5oLpiz+93MluXeA=="], + "camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="], "cliui": ["cliui@6.0.0", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^6.2.0" } }, "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="], @@ -58,6 +64,12 @@ "color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="], + "css-select": ["css-select@7.0.0", "", { "dependencies": { "boolbase": "^2.0.0", "css-what": "^8.0.0", "domhandler": "^6.0.1", "domutils": "^4.0.2", "nth-check": "^3.0.1" } }, "sha512-snmjEVXy+1LnwXdxhYvTMj1d9tOh4HxkA1YmoayVBeeyR2C14Pum7fcxJIm4SswYspVy866eYNwlH6xC3/VH5g=="], + + "css-what": ["css-what@8.0.0", "", {}, "sha512-DH0Bqq3DNp5tdOReuNyAA+Ev4Y2GS5FMbZpeTLP6C4CDi0h5nL0BmUPChXw3o/qbHLDWHl49sbNqQVY7bMSDdw=="], + + "cssom": ["cssom@0.5.0", "", {}, "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="], + "data-uri-to-buffer": ["data-uri-to-buffer@4.0.1", "", {}, "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="], "decamelize": ["decamelize@1.2.0", "", {}, "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="], @@ -66,8 +78,18 @@ "dijkstrajs": ["dijkstrajs@1.0.3", "", {}, "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="], + "dom-serializer": ["dom-serializer@3.1.1", "", { "dependencies": { "domelementtype": "^3.0.0", "domhandler": "^6.0.0", "entities": "^8.0.0" } }, "sha512-4MEa38/QexBob6gFNwu+EGdWvhJ1OKuNwdYY3Y3NyeWDQfnGeDYQUDfIRzWu5B5gsv03so2Uxd28YC6zrsx3Lw=="], + + "domelementtype": ["domelementtype@2.3.0", "", {}, "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="], + + "domhandler": ["domhandler@6.0.1", "", { "dependencies": { "domelementtype": "^3.0.0" } }, "sha512-gYzvtM72ZtxQO0T048kd6HWSbbGCNOUwcnfQ01cqIJ4X2IYKFFHZ5mKvrQETcFXxsRObZulDaKmy//R7TPtsBg=="], + + "domutils": ["domutils@4.0.2", "", { "dependencies": { "dom-serializer": "^3.0.0", "domelementtype": "^3.0.0", "domhandler": "^6.0.0" } }, "sha512-qI4JLRKnSzqFqr7hAlS5xQDusBCjKSEG4t4+7aNrIQMHBcsC2TGEhuyABJdYkgSewL57PNLYEiibY2iPKhKpaA=="], + "emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], + "entities": ["entities@7.0.1", "", {}, "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA=="], + "fetch-blob": ["fetch-blob@3.2.0", "", { "dependencies": { "node-domexception": "^1.0.0", "web-streams-polyfill": "^3.0.3" } }, "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ=="], "find-up": ["find-up@4.1.0", "", { "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="], @@ -78,12 +100,18 @@ "hono": ["hono@4.13.13", "", {}, "sha512-CQ46U0ZkAGmbT/4UxdzzGJpacP2IeKgY4a5/tOI9AABbpOMfK739wfDXmv1usCk+3RkKj1hQy4/fjhiwa2xlrA=="], + "html-escaper": ["html-escaper@3.0.3", "", {}, "sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ=="], + + "htmlparser2": ["htmlparser2@10.1.0", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", "domutils": "^3.2.2", "entities": "^7.0.1" } }, "sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ=="], + "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], "js-base64": ["js-base64@3.9.4", "", {}, "sha512-PtOMXpEGuP0RRiRXsjzHzl44dMHxSu2CPvAhinupR1tBa88me+1DPqsobl7eupn5UukjLkln1ZnAOAOXOrYG0Q=="], "libsql": ["libsql@0.4.7", "", { "dependencies": { "@neon-rs/load": "^0.0.4", "detect-libc": "2.0.2" }, "optionalDependencies": { "@libsql/darwin-arm64": "0.4.7", "@libsql/darwin-x64": "0.4.7", "@libsql/linux-arm64-gnu": "0.4.7", "@libsql/linux-arm64-musl": "0.4.7", "@libsql/linux-x64-gnu": "0.4.7", "@libsql/linux-x64-musl": "0.4.7", "@libsql/win32-x64-msvc": "0.4.7" }, "os": [ "linux", "win32", "darwin", ], "cpu": [ "x64", "arm64", ] }, "sha512-T9eIRCs6b0J1SHKYIvD8+KCJMcWZ900iZyxdnSCdqxN12Z1ijzT+jY5nrk72Jw4B0HGzms2NgpryArlJqvc3Lw=="], + "linkedom": ["linkedom@0.18.13", "", { "dependencies": { "css-select": "^7.0.0", "cssom": "^0.5.0", "html-escaper": "^3.0.3", "htmlparser2": "^10.1.0", "uhyphen": "^0.2.0" }, "peerDependencies": { "canvas": ">= 2" }, "optionalPeers": ["canvas"] }, "sha512-ES/o9qotMpzpN2MHs+Iq/JcVoOj8Fa5wiQYrTdFpvAnwXL0g66XHHUc9WUMk6nAlBtGsFQ24ne+SYnvnaQ2FSw=="], + "locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="], "node-domexception": ["node-domexception@1.0.0", "", {}, "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="], @@ -92,6 +120,8 @@ "nodemailer": ["nodemailer@6.10.1", "", {}, "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA=="], + "nth-check": ["nth-check@3.0.1", "", { "dependencies": { "boolbase": "^2.0.0" } }, "sha512-GX0gsdbGVCgnRgbeGaubfjpBXyYRWOOCVeYh08bSQvDZqxz5ndXs1OTfAt/h36G1xvI94YIspsI0sVFqAV9+RQ=="], + "p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], "p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="], @@ -116,6 +146,8 @@ "strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], + "uhyphen": ["uhyphen@0.2.0", "", {}, "sha512-qz3o9CHXmJJPGBdqzab7qAYuW8kQGKNEuoHFYrBwV6hWIMcpAmxDLXojcHfFr9US1Pe6zUswEIJIbLI610fuqA=="], + "undici-types": ["undici-types@8.9.0", "", {}, "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg=="], "web-streams-polyfill": ["web-streams-polyfill@3.3.3", "", {}, "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="], @@ -131,5 +163,21 @@ "yargs": ["yargs@15.4.1", "", { "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", "yargs-parser": "^18.1.2" } }, "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="], "yargs-parser": ["yargs-parser@18.1.3", "", { "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" } }, "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="], + + "dom-serializer/domelementtype": ["domelementtype@3.0.0", "", {}, "sha512-umCQid3jKbDmVjx8jGaW7uUykm4DEUeyV21hPxNMo2nV955DhUThwqyOIDtreepP31hl84X7G5U9ZfsWvIB3Pg=="], + + "dom-serializer/entities": ["entities@8.1.0", "", {}, "sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA=="], + + "domhandler/domelementtype": ["domelementtype@3.0.0", "", {}, "sha512-umCQid3jKbDmVjx8jGaW7uUykm4DEUeyV21hPxNMo2nV955DhUThwqyOIDtreepP31hl84X7G5U9ZfsWvIB3Pg=="], + + "domutils/domelementtype": ["domelementtype@3.0.0", "", {}, "sha512-umCQid3jKbDmVjx8jGaW7uUykm4DEUeyV21hPxNMo2nV955DhUThwqyOIDtreepP31hl84X7G5U9ZfsWvIB3Pg=="], + + "htmlparser2/domhandler": ["domhandler@5.0.3", "", { "dependencies": { "domelementtype": "^2.3.0" } }, "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="], + + "htmlparser2/domutils": ["domutils@3.2.2", "", { "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", "domhandler": "^5.0.3" } }, "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw=="], + + "htmlparser2/domutils/dom-serializer": ["dom-serializer@2.0.0", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", "entities": "^4.2.0" } }, "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="], + + "htmlparser2/domutils/dom-serializer/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="], } } diff --git a/server/package.json b/server/package.json index 5c3858f..c91444f 100644 --- a/server/package.json +++ b/server/package.json @@ -6,12 +6,14 @@ "scripts": { "start": "bun server.js", "dev": "bun --hot server.js", - "test": "bun test ./recommendations.test.js && bun test --timeout 60000 ./media-cache.test.js && bun test ./notes.test.js && bun test ./audit-log.test.js && bun test ./request-monitor.test.js && bun test ./admin-tools.test.js && bun test ./transcriptions.test.js && bun test ./admin-analytics.test.js && bun test ./remote.test.js && bun test ./party.test.js && bun test ./uploads.test.js && bun test ./innertube.test.js && bun test ./related.test.js && bun test ./ytdlp-pool.test.js && bun test ./warm-queue.test.js && bun test ./p2p-db.test.js && bun test ./p2p-admin.test.js && bun test ./p2p-admit.test.js && bun test ./p2p-retention.test.js && bun test ./p2p-routes.test.js && bun test ./p2p-hub.test.js && bun test --timeout 60000 ./p2p-intake.test.js && bun test ./flags.test.js && bun test ./asset-manifest.test.js && bun test ./static-delivery.test.js && bun test ./video-catalog.test.js && bun test ./search-cache.test.js && bun test --timeout 60000 ./deep-search.test.js && bun test ./profile-recovery.test.js" + "test": "bun test ./recommendations.test.js && bun test --timeout 60000 ./media-cache.test.js && bun test ./notes.test.js && bun test ./audit-log.test.js && bun test ./request-monitor.test.js && bun test ./admin-tools.test.js && bun test ./transcriptions.test.js && bun test ./admin-analytics.test.js && bun test ./remote.test.js && bun test ./party.test.js && bun test ./uploads.test.js && bun test ./innertube.test.js && bun test ./related.test.js && bun test ./ytdlp-pool.test.js && bun test ./warm-queue.test.js && bun test ./p2p-db.test.js && bun test ./p2p-admin.test.js && bun test ./p2p-admit.test.js && bun test ./p2p-retention.test.js && bun test ./p2p-routes.test.js && bun test ./p2p-hub.test.js && bun test --timeout 60000 ./p2p-intake.test.js && bun test ./flags.test.js && bun test ./asset-manifest.test.js && bun test ./static-delivery.test.js && bun test ./video-catalog.test.js && bun test ./search-cache.test.js && bun test --timeout 60000 ./deep-search.test.js && bun test ./profile-recovery.test.js && bun test ./reader.test.js" }, "dependencies": { "@hono/node-server": "^1.14.0", "@libsql/client": "^0.14.0", + "@mozilla/readability": "^0.6.0", "hono": "^4.7.10", + "linkedom": "^0.18.13", "nodemailer": "^6", "qrcode": "^1.5.4" } diff --git a/server/party.js b/server/party.js index 93924ed..96a6ff7 100644 --- a/server/party.js +++ b/server/party.js @@ -168,7 +168,7 @@ export function createPartyHub({ now = () => Date.now(), profileExists = async ( else { const url = String(v?.url || '').trim(); if (!/^https?:\/\/[^\s<>"]{3,2000}$/i.test(url)) return; - p.present = { url, page: Math.max(1, Math.min(9999, Math.floor(Number(v.page) || 1))), by: me.name, at: now() }; + p.present = { url, mode: v.mode === 'reader' ? 'reader' : 'embed', page: Math.max(1, Math.min(9999, Math.floor(Number(v.page) || 1))), by: me.name, at: now() }; } broadcast(p, { type: 'present', present: p.present }); } else if ((m.type === 'invite' || m.type === 'uninvite') && isHost) { @@ -226,6 +226,7 @@ export function createPartyHub({ now = () => Date.now(), profileExists = async ( return { upgrade, invitesFor, + presentUrl: (code) => parties.get(code)?.present?.url || null, websocket: { maxPayloadLength: MAX_MSG, idleTimeout: 120, open, message: (ws, msg) => message(ws, typeof msg === 'string' ? msg : null), close }, _parties: parties, stop() { clearInterval(sweeper); }, diff --git a/server/reader.js b/server/reader.js new file mode 100644 index 0000000..231a3c6 --- /dev/null +++ b/server/reader.js @@ -0,0 +1,132 @@ +// Reader view for watch-party presentations: fetch a public web page, pull +// out the article (Mozilla Readability) and return clean, safe HTML that every +// guest can read at their own font size. +// +// GET /api/party/:code/reader reads the link the party is presenting right now +// +// Only the party's current link can be fetched, so this is not an open proxy. +// The fetch refuses private/loopback addresses (also after every redirect), +// caps size and time, and the output keeps only an allow-list of tags and +// attributes. +import { lookup } from 'node:dns/promises'; +import { isIP } from 'node:net'; +import { parseHTML } from 'linkedom'; +import { Readability } from '@mozilla/readability'; + +const MAX_BYTES = 3 * 1024 * 1024, TIMEOUT_MS = 12000, MAX_REDIRECTS = 4; +const TAGS = new Set(['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ul', 'ol', 'li', 'blockquote', 'pre', 'code', 'em', 'strong', 'b', 'i', 'u', 's', + 'a', 'img', 'figure', 'figcaption', 'br', 'hr', 'sup', 'sub', 'small', 'mark', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'caption', 'dl', 'dt', 'dd', 'span', 'div', 'section', 'article']); +const DROP = new Set(['script', 'style', 'iframe', 'object', 'embed', 'form', 'input', 'button', 'textarea', 'select', 'noscript', 'svg', 'math', 'video', 'audio', 'canvas', 'link', 'meta', 'base', 'template']); + +export function privateAddress(ip) { + const v = isIP(ip); + if (v === 4) { + const [a, b] = ip.split('.').map(Number); + return a === 0 || a === 10 || a === 127 || (a === 100 && b >= 64 && b < 128) || (a === 169 && b === 254) + || (a === 172 && b >= 16 && b < 32) || (a === 192 && b === 168) || (a === 198 && (b === 18 || b === 19)) || a >= 224; + } + if (v === 6) { + const x = ip.toLowerCase(); + if (x.startsWith('::ffff:')) return privateAddress(x.slice(7)); + return x === '::' || x === '::1' || x.startsWith('fc') || x.startsWith('fd') || x.startsWith('fe8') || x.startsWith('fe9') + || x.startsWith('fea') || x.startsWith('feb') || x.startsWith('ff'); + } + return true; +} + +async function assertPublic(u, resolve) { + if (!/^https?:$/.test(u.protocol)) throw new Error('only http and https links can be read'); + if (u.port && !['80', '443'].includes(u.port)) throw new Error('that port is not allowed'); + if (u.username || u.password) throw new Error('links with credentials are not allowed'); + const host = u.hostname.replace(/^\[|\]$/g, ''); + const addrs = isIP(host) ? [host] : (await resolve(host)).map((a) => a.address); + if (!addrs.length || addrs.some(privateAddress)) throw new Error('that address is not on the public internet'); +} + +async function fetchPublic(url, { fetchImpl, resolve }) { + let u = new URL(url); + for (let hop = 0; hop <= MAX_REDIRECTS; hop++) { + await assertPublic(u, resolve); + const res = await fetchImpl(u.href, { redirect: 'manual', signal: AbortSignal.timeout(TIMEOUT_MS), + headers: { 'User-Agent': 'Mozilla/5.0 (compatible; YTPlayerReader/1.0)', Accept: 'text/html,application/xhtml+xml' } }); + if (res.status >= 300 && res.status < 400 && res.headers.get('location')) { u = new URL(res.headers.get('location'), u); continue; } + if (!res.ok) throw new Error(`the site answered ${res.status}`); + const type = res.headers.get('content-type') || ''; + if (!/html|xml/i.test(type)) throw new Error('that link is not a web page (try Original view)'); + const reader = res.body.getReader(); const parts = []; let size = 0; + for (;;) { + const { done, value } = await reader.read(); if (done) break; + size += value.length; if (size > MAX_BYTES) { reader.cancel(); throw new Error('that page is too large to read'); } + parts.push(value); + } + const charset = (type.match(/charset=([\w-]+)/i) || [])[1] || 'utf-8'; + let text; try { text = new TextDecoder(charset).decode(Buffer.concat(parts)); } catch { text = new TextDecoder().decode(Buffer.concat(parts)); } + return { html: text, finalUrl: u.href }; + } + throw new Error('too many redirects'); +} + +// Rebuild the article from an allow-list; anything else is unwrapped or dropped. +export function sanitize(html, baseUrl) { + const { document } = parseHTML(`
${html}
`); + const abs = (v) => { try { const x = new URL(v, baseUrl); return /^https?:$/.test(x.protocol) ? x.href : null; } catch { return null; } }; + const walk = (node) => { + for (const child of [...node.childNodes]) { + if (child.nodeType === 8) { child.remove(); continue; } + if (child.nodeType !== 1) continue; + const tag = child.tagName.toLowerCase(); + if (DROP.has(tag)) { child.remove(); continue; } + walk(child); + if (!TAGS.has(tag)) { child.replaceWith(...child.childNodes); continue; } + const keep = {}; + if (tag === 'a') { const h = abs(child.getAttribute('href') || ''); if (h) Object.assign(keep, { href: h, target: '_blank', rel: 'noopener noreferrer nofollow' }); } + if (tag === 'img') { + const src = abs(child.getAttribute('src') || child.getAttribute('data-src') || ''); + if (!src) { child.remove(); continue; } + Object.assign(keep, { src, alt: (child.getAttribute('alt') || '').slice(0, 300), loading: 'lazy', referrerpolicy: 'no-referrer' }); + } + if ((tag === 'td' || tag === 'th') && /^\d{1,2}$/.test(child.getAttribute('colspan') || '')) keep.colspan = child.getAttribute('colspan'); + for (const a of [...child.attributes]) child.removeAttribute(a.name); + for (const [k, v] of Object.entries(keep)) child.setAttribute(k, v); + } + }; + const root = document.getElementById('r'); + walk(root); + return root.innerHTML.trim(); +} + +export function extractArticle(html, url) { + const { document } = parseHTML(html); + const article = new Readability(document, { charThreshold: 300 }).parse(); + if (!article || !article.content) throw new Error('could not find readable text on that page (try Original view)'); + return { + title: String(article.title || '').trim().slice(0, 300), byline: String(article.byline || '').trim().slice(0, 200), + site: String(article.siteName || new URL(url).hostname.replace(/^www\./, '')).slice(0, 120), + excerpt: String(article.excerpt || '').slice(0, 500), content: sanitize(article.content, url), + length: Number(article.length) || 0, + }; +} + +export function registerReaderRoutes(app, { presentUrlOf, fetchImpl = fetch, resolve = (h) => lookup(h, { all: true }), now = Date.now }) { + const cache = new Map(); // url → { at, value } + const hits = new Map(); // ip → timestamps + const ipOf = (c) => (c.req.header('x-forwarded-for') || c.req.header('x-real-ip') || '').split(',')[0].trim() || 'local'; + app.get('/api/party/:code/reader', async (c) => { + const url = presentUrlOf(String(c.req.param('code') || '').toUpperCase()); + if (!url) return c.json({ ok: false, error: 'this party is not presenting a link' }, 404); + const t = now(), ip = ipOf(c), mine = (hits.get(ip) || []).filter((x) => t - x < 60_000); + if (mine.length >= 30) return c.json({ ok: false, error: 'too many requests — try again in a minute' }, 429); + mine.push(t); hits.set(ip, mine); if (hits.size > 5000) hits.clear(); + const cached = cache.get(url); + if (cached && t - cached.at < 10 * 60_000) return c.json({ ok: true, ...cached.value }, 200, { 'Cache-Control': 'no-store' }); + try { + const page = await fetchPublic(url, { fetchImpl, resolve }); + const value = { url, ...extractArticle(page.html, page.finalUrl) }; + cache.set(url, { at: t, value }); + if (cache.size > 60) cache.delete(cache.keys().next().value); + return c.json({ ok: true, ...value }, 200, { 'Cache-Control': 'no-store' }); + } catch (err) { + return c.json({ ok: false, error: err.name === 'TimeoutError' ? 'the site took too long to answer' : err.message }, 502); + } + }); +} diff --git a/server/reader.test.js b/server/reader.test.js new file mode 100644 index 0000000..75e5bd6 --- /dev/null +++ b/server/reader.test.js @@ -0,0 +1,49 @@ +import { expect, test } from 'bun:test'; +import { Hono } from 'hono'; +import { privateAddress, sanitize, extractArticle, registerReaderRoutes } from './reader.js'; + +const PAGE = `Psalm 23 study + +

Psalm 23 study

By Ana

+ ${'

The Lord is my shepherd; I shall not want. He makes me lie down in green pastures. He leads me beside still waters.

'.repeat(8)} +

Read the next part

+ bad
`; + +test('private and special addresses are refused', () => { + for (const ip of ['127.0.0.1', '10.8.0.1', '192.168.1.2', '172.20.0.1', '169.254.169.254', '100.64.0.1', '::1', 'fd00::1', '::ffff:10.0.0.1', '0.0.0.0']) + expect(privateAddress(ip)).toBe(true); + for (const ip of ['93.184.216.34', '1.1.1.1', '2606:4700::1111']) expect(privateAddress(ip)).toBe(false); +}); + +test('sanitize keeps reading tags, makes links absolute and strips scripts/handlers', () => { + const out = sanitize('

Hi linkkept text

', 'https://site.example/a/b'); + expect(out).toMatch(/]*href="https:\/\/site\.example\/x"[^>]*>link<\/a>/); + expect(out).toContain('rel="noopener noreferrer nofollow"'); + expect(out).toContain('src="https://site.example/a/i.png"'); + expect(out).toContain('kept text'); + for (const bad of ['script', 'onclick', 'onerror', 'iframe', 'style=', 'custom']) expect(out).not.toContain(bad); +}); + +test('extractArticle finds the article and drops unsafe parts', () => { + const a = extractArticle(PAGE, 'https://bible.example/psalm-23'); + expect(a.title).toBe('Psalm 23 study'); + expect(a.content).toContain('The Lord is my shepherd'); + expect(a.content).toContain('href="https://bible.example/next"'); + for (const bad of [' { + const present = { ABCDEF: 'https://bible.example/psalm-23', PRIVAT: 'http://10.0.0.5/admin', HOPPER: 'https://hop.example/' }; + const resolve = async (h) => [{ address: h === 'inside.example' ? '192.168.0.9' : '93.184.216.34' }]; + const fetchImpl = async (url) => url.startsWith('https://hop.example') + ? new Response('', { status: 302, headers: { location: 'http://inside.example/secret' } }) + : new Response(PAGE, { headers: { 'content-type': 'text/html; charset=utf-8' } }); + const app = new Hono(); + registerReaderRoutes(app, { presentUrlOf: (code) => present[code], fetchImpl, resolve }); + const get = async (code) => { const r = await app.request(`/api/party/${code}/reader`); return { status: r.status, json: await r.json() }; }; + expect((await get('ZZZZZZ')).status).toBe(404); + const ok = await get('abcdef'); + expect(ok.json).toMatchObject({ ok: true, title: 'Psalm 23 study' }); + expect((await get('PRIVAT')).json.error).toMatch(/public internet/); + expect((await get('HOPPER')).json.error).toMatch(/public internet/); +}); diff --git a/server/server.js b/server/server.js index bcecea5..cf91b4f 100644 --- a/server/server.js +++ b/server/server.js @@ -71,6 +71,7 @@ import { createYtdlpPool } from './ytdlp-pool.js'; import { createWarmQueue } from './warm-queue.js'; import { registerDeepSearchRoutes } from './deep-search.js'; import { registerProfileRecoveryRoutes } from './profile-recovery.js'; +import { registerReaderRoutes } from './reader.js'; import { dirname, join as pathJoin } from 'node:path'; import { createRequestMonitor, registerRequestMonitorRoutes } from './request-monitor.js'; import { registerP2pAdminRoutes } from './p2p-admin.js'; @@ -2305,6 +2306,7 @@ app.get('/api/user/data', async (c) => { // ============================================================================ const remote = createRemoteHub({ requireSameNetwork: process.env.REMOTE_SAME_NETWORK === '1' }); const party = createPartyHub({ profileExists: async (name) => !!(await getProfile(name)) }); +registerReaderRoutes(app, { presentUrlOf: (code) => party.presentUrl(code) }); // Running parties that invited this online profile (protected profiles need their secret). app.get('/api/party/invites', async (c) => { const name = (c.req.query('name') || '').trim().toLowerCase();