Repository navigation
Run the GeoLibre tools in the web app #24
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| //! The GeoLibre tools in the browser: geolibre-rust's WASI runner (the `geolibre-wasm` npm | ||
| //! package), loaded on demand from jsDelivr and run in an in-memory `/work` folder. | ||
|
|
||
| use rustgis_ui_egui::Slot; | ||
| use rustgis_ui_egui::rustgis_engine::cmd::gp::{ExternalOutput, ExternalRun}; | ||
| use wasm_bindgen::JsCast as _; | ||
| use wasm_bindgen::prelude::*; | ||
|
|
||
| // The runner's version is pinned: the tool forms and the runner must come from the same | ||
| // release. The JS module is jsDelivr's ES-module build of the package; the WASI binary is | ||
| // passed explicitly, since that build can't find it beside itself. | ||
| // | ||
| // Trust: this runs code from jsDelivr in the app's origin, only after the user asks for the | ||
| // tools (Load GeoLibre tools). A dynamic import can't carry Subresource Integrity, and the | ||
| // runner (~25 MB) is too large to ship with the app, so the pinned version and HTTPS are the | ||
| // safeguards: the same trust as installing the npm package. | ||
| #[wasm_bindgen(inline_js = r#" | ||
| const BASE = "https://cdn.jsdelivr.net/npm/geolibre-wasm@1.6.0"; | ||
| let ready = null; | ||
| function tools() { | ||
| if (!ready) { | ||
| ready = (async () => { | ||
| const mod = await import(`${BASE}/tools.mjs/+esm`); | ||
|
giswqs marked this conversation as resolved.
|
||
| await mod.initTools(`${BASE}/geolibre-cli.wasm`); | ||
| return mod; | ||
| })(); | ||
| // A failed download can be retried. | ||
| ready.catch(() => { ready = null; }); | ||
| } | ||
| return ready; | ||
| } | ||
| export async function geolibre_manifests() { | ||
| const t = await tools(); | ||
| return JSON.stringify(await t.listManifests()); | ||
| } | ||
| export async function geolibre_run(tool, argv, names, datas) { | ||
| const t = await tools(); | ||
| const input = {}; | ||
| for (let i = 0; i < names.length; i++) input[names[i]] = datas[i]; | ||
| const r = await t.runTool(tool, { args: argv, input }); | ||
| const out = Object.entries(r.files); | ||
| return { exitCode: r.exitCode, stdout: r.stdout, names: out.map((e) => e[0]), datas: out.map((e) => e[1]) }; | ||
| } | ||
| "#)] | ||
| extern "C" { | ||
| #[wasm_bindgen(catch)] | ||
| async fn geolibre_manifests() -> Result<JsValue, JsValue>; | ||
| #[wasm_bindgen(catch)] | ||
| async fn geolibre_run(tool: &str, argv: js_sys::Array, names: js_sys::Array, datas: js_sys::Array) -> Result<JsValue, JsValue>; | ||
| } | ||
|
|
||
| fn js_error(e: &JsValue) -> String { | ||
| match e.dyn_ref::<js_sys::Error>() { | ||
| Some(err) => String::from(err.message()), | ||
| None => e.as_string().unwrap_or_else(|| format!("{e:?}")), | ||
| } | ||
| } | ||
|
|
||
| fn get(obj: &JsValue, key: &str) -> JsValue { | ||
| js_sys::Reflect::get(obj, &JsValue::from_str(key)).unwrap_or(JsValue::UNDEFINED) | ||
| } | ||
|
|
||
| fn strings(v: &JsValue) -> Vec<String> { | ||
|
There was a problem hiding this comment.
|
||
| js_sys::Array::from(v).iter().filter_map(|s| s.as_string()).collect() | ||
| } | ||
|
|
||
| /// Lists the tools' manifests into `slot`, downloading the runner the first time. | ||
| pub fn manifests(slot: Slot<Result<String, String>>, ctx: egui::Context) { | ||
| wasm_bindgen_futures::spawn_local(async move { | ||
| let r = match geolibre_manifests().await { | ||
| Ok(v) => v.as_string().ok_or_else(|| "the GeoLibre runner returned no tool list".to_string()), | ||
| Err(e) => Err(format!("couldn't load the GeoLibre tools: {}", js_error(&e))), | ||
| }; | ||
| if let Ok(mut s) = slot.lock() { | ||
| *s = Some(r); | ||
| } | ||
| ctx.request_repaint(); | ||
| }); | ||
| } | ||
|
|
||
| /// Runs one tool and puts its new files and printed lines (or its error) in `slot`. | ||
| pub fn run(job: ExternalRun, slot: Slot<ExternalOutput>, ctx: egui::Context) { | ||
| wasm_bindgen_futures::spawn_local(async move { | ||
| let argv: js_sys::Array = job.argv.iter().map(|a| JsValue::from_str(a)).collect(); | ||
| let names: js_sys::Array = job.files.iter().map(|(n, _)| JsValue::from_str(n)).collect(); | ||
| let datas: js_sys::Array = job.files.iter().map(|(_, b)| JsValue::from(js_sys::Uint8Array::from(b.as_slice()))).collect(); | ||
| let r = match geolibre_run(&job.tool, argv, names, datas).await { | ||
| Err(e) => Err(js_error(&e)), | ||
| Ok(out) => { | ||
| let lines = strings(&get(&out, "stdout")); | ||
| if get(&out, "exitCode").as_f64().unwrap_or(1.0) != 0.0 { | ||
| // The tool's error is the end of what it printed. | ||
| let tail: Vec<&String> = lines.iter().rev().take(12).collect(); | ||
| let msg = tail.into_iter().rev().map(String::as_str).collect::<Vec<_>>().join("\n"); | ||
| Err(if msg.trim().is_empty() { "the tool stopped unexpectedly".to_string() } else { msg }) | ||
| } else { | ||
| let files = strings(&get(&out, "names")) | ||
| .into_iter() | ||
| .zip(js_sys::Array::from(&get(&out, "datas")).iter()) | ||
| .map(|(n, d)| (n, js_sys::Uint8Array::new(&d).to_vec())) | ||
| .collect(); | ||
| Ok((files, lines)) | ||
| } | ||
| } | ||
| }; | ||
| if let Ok(mut s) = slot.lock() { | ||
| *s = Some(r); | ||
| } | ||
| ctx.request_repaint(); | ||
| }); | ||
| } | ||
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Supply-chain note (confidence: medium): this dynamically imports third-party JS from a CDN with full page privileges and no Subresource Integrity or hash check. The version is pinned, but jsDelivr's
/+esmbuild is rewritten on the fly and may resolve its own dependencies by range. Also, the "geolibre_web" pref means the ~25 MB runner is fetched and executed automatically on every later visit. Consider self-hosting the runner, or at least documenting the trust decision.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same trust decision as answered in the earlier thread and documented in 1c857c5 (code comment and user guide). On the automatic load on later visits: it happens only after the user chose Load GeoLibre tools once, and it re-imports the same pinned version, usually from the browser cache. Whether to keep that convenience or ask every visit, and whether to self-host the runner (e.g. in rustgis-assets), is a product call, so I'm leaving this thread open for a maintainer.