WASM API for LTS. #10

.github/workflows/web.yml

@@ -17,10 +17,20 @@ jobs:
           cache: 'npm'
           cache-dependency-path: viewer/package-lock.json
 
+      - name: Install wasm-pack
+        uses: jetli/[email protected]
+
+      - name: Cache WASM build
+        uses: actions/cache@v3
+        with:
+          path: target
+          key: doesnt-matter-share-everything
+
       - name: Build web app
         run: |
           cd viewer
           npm ci
+          npm run wasm
           npm run build --if-present
 
       - name: Publish

lts/Cargo.toml

@@ -3,4 +3,10 @@ name = "lts"
 version = "0.1.0"
 edition = "2021"
 
-[dependencies]
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+serde = { version = "1.0.188", features = ["derive"] }
+serde-wasm-bindgen = "0.5.0"
+wasm-bindgen = "0.2.87"

lts/src/lib.rs

@@ -2,6 +2,8 @@ mod bike_ottawa;
 mod parse;
 mod speed_limit_only;
 mod tags;
+#[cfg(target_arch = "wasm32")]
+mod wasm;
 
 pub use bike_ottawa::bike_ottawa;
 pub use speed_limit_only::speed_limit_only;

lts/src/wasm.rs

@@ -0,0 +1,43 @@
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use wasm_bindgen::prelude::*;
+
+use crate::{bike_ottawa, speed_limit_only, Tags, LTS};
+
+#[derive(Deserialize)]
+struct Input {
+    // TODO Improve this API
+    method: String,
+    tags: HashMap<String, String>,
+}
+
+#[derive(Serialize)]
+struct Output {
+    lts: usize,
+    messages: Vec<String>,
+}
+
+#[wasm_bindgen()]
+pub fn calculate(input: JsValue) -> Result<JsValue, JsValue> {
+    let input: Input = serde_wasm_bindgen::from_value(input)?;
+    let mut tags = Tags::new();
+    for (k, v) in input.tags {
+        tags.insert(k, v);
+    }
+
+    let (lts, messages) = if input.method == "speed_limit_only" {
+        speed_limit_only::speed_limit_only(tags)
+    } else if input.method == "bike_ottawa" {
+        bike_ottawa::bike_ottawa(tags)
+    } else {
+        (
+            LTS::NotAllowed,
+            vec![format!("Unknown method {}", input.method)],
+        )
+    };
+    let result = serde_wasm_bindgen::to_value(&Output {
+        lts: lts.into_json(),
+        messages,
+    })?;
+    Ok(result)
+}

viewer/package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "wasm": "wasm-pack build --release --target web ../lts",
     "preview": "vite preview",
     "check": "svelte-check --tsconfig ./tsconfig.json",
     "fmt": "npx prettier --write *.html src/**"
@@ -21,7 +22,8 @@
     "svelte-check": "^3.4.4",
     "tslib": "^2.6.0",
     "typescript": "^5.1.3",
-    "vite": "^4.3.9"
+    "vite": "^4.3.9",
+    "vite-plugin-wasm-pack": "0.1.11"
   },
   "dependencies": {
     "@turf/bbox": "^6.5.0",