diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2026-10-27 20:01:00 +0100 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2026-10-27 20:01:00 +0100 |
| commit | b084d94e484aa057cc839892c6e49df3caf8a0e6 (patch) | |
| tree | 9662970fe087a04cc7f8b5f1dbc641590859093f /crates/wipfel | |
| parent | 2df51e89039b9b160aafb52b700e874411eb0555 (diff) | |
Revert "wipfel: PWA — manifest, service worker, Web Share Target"
This reverts commit 2df51e89039b9b160aafb52b700e874411eb0555.
Diffstat (limited to 'crates/wipfel')
| -rwxr-xr-x | crates/wipfel/build-release.sh | 3 | ||||
| -rwxr-xr-x | crates/wipfel/serve-here.sh | 3 | ||||
| -rw-r--r-- | crates/wipfel/src/app.rs | 32 | ||||
| -rw-r--r-- | crates/wipfel/www/icons/icon-192.png | bin | 1425 -> 0 bytes | |||
| -rw-r--r-- | crates/wipfel/www/icons/icon-512.png | bin | 4371 -> 0 bytes | |||
| -rw-r--r-- | crates/wipfel/www/icons/icon-maskable-512.png | bin | 4005 -> 0 bytes | |||
| -rw-r--r-- | crates/wipfel/www/index.html | 11 | ||||
| -rw-r--r-- | crates/wipfel/www/manifest.webmanifest | 25 | ||||
| -rw-r--r-- | crates/wipfel/www/sw.js | 115 |
9 files changed, 0 insertions, 189 deletions
diff --git a/crates/wipfel/build-release.sh b/crates/wipfel/build-release.sh index bf41513..1ee09b7 100755 --- a/crates/wipfel/build-release.sh +++ b/crates/wipfel/build-release.sh @@ -16,9 +16,6 @@ wasm-bindgen --remove-name-section --target web --out-dir "$DIST" target/wasm32- # the loader page (not the trunk entry point, which is dev-only) rm -f "$DIST"/wipfel.d.ts "$DIST"/wipfel_bg.wasm.d.ts cp crates/wipfel/www/index.html crates/wipfel/www/style.css "$DIST/" -cp crates/wipfel/www/sw.js crates/wipfel/www/manifest.webmanifest "$DIST/" -mkdir -p "$DIST/icons" -cp crates/wipfel/www/icons/*.png "$DIST/icons/" gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" echo "site assembled in $DIST ($(du -sh "$DIST" | cut -f1)):" ls "$DIST" diff --git a/crates/wipfel/serve-here.sh b/crates/wipfel/serve-here.sh index 9951829..2accdb9 100755 --- a/crates/wipfel/serve-here.sh +++ b/crates/wipfel/serve-here.sh @@ -8,8 +8,5 @@ DIST=/tmp/wipfel-dist mkdir -p "$DIST" wasm-bindgen --target web --out-dir "$DIST" target/wasm32-unknown-unknown/release/wipfel.wasm cp crates/wipfel/www/index.html crates/wipfel/www/style.css "$DIST/" -cp crates/wipfel/www/sw.js crates/wipfel/www/manifest.webmanifest "$DIST/" -mkdir -p "$DIST/icons" -cp crates/wipfel/www/icons/*.png "$DIST/icons/" gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" echo "dist refreshed: $(ls -la "$DIST" | awk '{s+=$5} END {print s" bytes"}')" diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index 441f17c..78961fc 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -11,7 +11,6 @@ use gipfel_core::metadata::{apply_image_metadata, ImageMetaData}; use gipfel_core::panorama::Panorama; use wasm_bindgen::closure::Closure; use wasm_bindgen::JsCast; -use wasm_bindgen::JsValue; use wasm_bindgen_futures::spawn_local; use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, InputEvent, MouseEvent}; use yew::prelude::*; @@ -451,37 +450,6 @@ pub fn app() -> Html { }) }; - // Web Share Target handoff: the service worker stashes the shared - // file at `__shared` and redirects here with ?shared=1 - { - let load_bytes = load_bytes.clone(); - let status = status.clone(); - use_effect_with((), move |_| { - let shared = web_sys::window() - .map(|w| { - w.location() - .search() - .map(|s| s.contains("shared=1")) - .unwrap_or(false) - }) - .unwrap_or(false); - if shared { - spawn_local(async move { - match bridge::fetch_bytes("__shared").await { - Ok(bytes) => load_bytes.emit((bytes, "shared image".into())), - Err(e) => status.set(format!("shared image missing: {e}")), - } - }); - if let Some(w) = web_sys::window() { - let _ = w - .history() - .and_then(|h| h.replace_state_with_url(&JsValue::NULL, "", Some("./"))); - } - } - || () - }); - } - let on_drop = { let read_file = read_file.clone(); let status = status.clone(); diff --git a/crates/wipfel/www/icons/icon-192.png b/crates/wipfel/www/icons/icon-192.png Binary files differdeleted file mode 100644 index 07262f1..0000000 --- a/crates/wipfel/www/icons/icon-192.png +++ /dev/null diff --git a/crates/wipfel/www/icons/icon-512.png b/crates/wipfel/www/icons/icon-512.png Binary files differdeleted file mode 100644 index e1f8dd0..0000000 --- a/crates/wipfel/www/icons/icon-512.png +++ /dev/null diff --git a/crates/wipfel/www/icons/icon-maskable-512.png b/crates/wipfel/www/icons/icon-maskable-512.png Binary files differdeleted file mode 100644 index 6dd4595..0000000 --- a/crates/wipfel/www/icons/icon-maskable-512.png +++ /dev/null diff --git a/crates/wipfel/www/index.html b/crates/wipfel/www/index.html index 69dd433..98f81e8 100644 --- a/crates/wipfel/www/index.html +++ b/crates/wipfel/www/index.html @@ -3,11 +3,7 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> - <meta name="theme-color" content="#141418" /> <title>wipfel — web based gipfel photogrammetry</title> - <link rel="manifest" href="manifest.webmanifest" /> - <link rel="icon" type="image/png" sizes="192x192" href="icons/icon-192.png" /> - <link rel="apple-touch-icon" href="icons/icon-192.png" /> <link rel="stylesheet" href="style.css" /> </head> <body> @@ -15,12 +11,5 @@ import init from './wipfel.js'; init(); </script> - <script> - if ('serviceWorker' in navigator) { - window.addEventListener('load', () => { - navigator.serviceWorker.register('./sw.js'); - }); - } - </script> </body> </html> diff --git a/crates/wipfel/www/manifest.webmanifest b/crates/wipfel/www/manifest.webmanifest deleted file mode 100644 index 29996fb..0000000 --- a/crates/wipfel/www/manifest.webmanifest +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "wipfel — web based gipfel photogrammetry", - "short_name": "wipfel", - "description": "Measure mountains from photographs. All processing stays on your device.", - "start_url": "./", - "scope": "./", - "display": "standalone", - "background_color": "#141418", - "theme_color": "#141418", - "icons": [ - { "src": "icons/icon-192.png", "sizes": "192x192", "type": "image/png" }, - { "src": "icons/icon-512.png", "sizes": "512x512", "type": "image/png" }, - { "src": "icons/icon-maskable-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } - ], - "share_target": { - "action": "__share", - "method": "POST", - "enctype": "multipart/form-data", - "params": { - "files": [ - { "name": "files", "accept": ["image/jpeg", "image/png", "image/webp"] } - ] - } - } -} diff --git a/crates/wipfel/www/sw.js b/crates/wipfel/www/sw.js deleted file mode 100644 index 2a5cfdc..0000000 --- a/crates/wipfel/www/sw.js +++ /dev/null @@ -1,115 +0,0 @@ -/* wipfel service worker: full offline + Web Share Target. - * - * Strategy: network-first with cache fallback, so an online app is - * always fresh and the app still starts offline after the first visit. - * - * Share target: the browser POSTs multipart/form-data to __share; we - * stash the file in a cache under __shared and redirect to the app - * with ?shared=1, which the app picks up on startup. - */ -const VERSION = "wipfel-v1"; -const SHARE_CACHE = "wipfel-share"; -const base = self.registration.scope; -const url = (p) => new URL(p, base).href; -const sharePath = new URL("__share", base).pathname; -const sharedPath = new URL("__shared", base).pathname; - -const SHELL = [ - "", - "index.html", - "wipfel.js", - "wipfel_bg.wasm", - "style.css", - "gipfel.dat.gz", - "manifest.webmanifest", - "icons/icon-192.png", - "icons/icon-512.png", - "icons/icon-maskable-512.png", -].map(url); - -self.addEventListener("install", (e) => { - e.waitUntil( - caches - .open(VERSION) - .then((c) => c.addAll(SHELL)) - .then(() => self.skipWaiting()) - ); -}); - -self.addEventListener("activate", (e) => { - e.waitUntil( - caches - .keys() - .then((keys) => - Promise.all( - keys.filter((k) => k !== VERSION && k !== SHARE_CACHE).map((k) => caches.delete(k)) - ) - ) - .then(() => self.clients.claim()) - ); -}); - -self.addEventListener("fetch", (e) => { - const req = e.request; - const u = new URL(req.url); - if (u.origin !== self.location.origin) return; - - // Web Share Target handoff - if (req.method === "POST" && u.pathname === sharePath) { - e.respondWith( - (async () => { - const form = await req.formData(); - const file = form.getAll("files")[0] || form.get("files"); - if (file && file.size) { - const buf = await file.arrayBuffer(); - const cache = await caches.open(SHARE_CACHE); - await cache.put( - sharedPath, - new Response(buf, { - headers: { - "Content-Type": file.type || "image/jpeg", - "X-File-Name": encodeURIComponent(file.name || "shared.jpg"), - }, - }) - ); - } - return Response.redirect(url("?shared=1"), 303); - })() - ); - return; - } - - // the stashed shared image - if (req.method === "GET" && u.pathname === sharedPath) { - e.respondWith( - caches.open(SHARE_CACHE).then((c) => - c.match(sharedPath).then( - (r) => r || new Response("no shared image", { status: 410 }) - ) - ) - ); - return; - } - - // app assets: network first, cache fallback - e.respondWith( - (async () => { - try { - const res = await fetch(req); - if (res.ok) { - const cache = await caches.open(VERSION); - cache.put(req, res.clone()); - } - return res; - } catch (err) { - const cached = await caches.match(req, { ignoreSearch: true }); - if (cached) return cached; - if (req.mode === "navigate") { - const idx = await caches.match(url("index.html")); - if (idx) return idx; - } - throw err; - } - })() - ); -}); |
