put-sample to D1

Author: kallanreed

addSample.html

@@ -16,6 +16,14 @@
       <label for="path">Path:</label>
       <input type="text" id="path" name="path">
     </div>
+    <div class="form-item">
+      <label for="path">SNR:</label>
+      <input type="text" id="snr" name="snr">
+    </div>
+    <div class="form-item">
+      <label for="path">RSSI:</label>
+      <input type="text" id="rssi" name="rssi">
+    </div>
     <div class="form-item">
       <label for="path">Observed:</label>
       <input type="checkbox" id="observed" name="observed">
@@ -32,6 +40,8 @@
     const $ = (id) => document.getElementById(id);
     const locTxt = $('loc');
     const pathTxt = $('path');
+    const snrTxt = $('snr');
+    const rssiTxt = $('rssi');
     const observedCB = $('observed');
     const statusDiv = $('status');
 
@@ -46,16 +56,23 @@
     function clearForm() {
       locTxt.value = '';
       pathTxt.value = '';
+      snrTxt.value = '';
+      rssiTxt.value = '';
+      observedCB.checked = false;
     }
 
     async function putSample() {
       const [latVal, lonVal] = locTxt.value.split(/\s*,?\s+/)
       const [lat, lon] = parseLocation(latVal, lonVal);
       const pathVal = pathTxt.value;
+      const snrVal = snrTxt.value;
+      const rssiVal = rssiTxt.value;
       const payload = {
         lat: lat,
         lon: lon,
         path: pathVal !== "" ? pathVal.split(',') : [],
+        snr: snrVal !== "" ? Number(snrVal) : null,
+        rssi: rssiVal !== "" ? Number(rssiVal) : null,
         observed: observedCB.checked
       };
 

functions/put-sample.js

@@ -1,59 +1,49 @@
 import {
-  ageInDays,
-  definedOr,
-  or,
   parseLocation,
-  retry,
   sampleKey
 } from '../content/shared.js'
 
-function mergeMetadata(a, b) {
-  const merged = {
-    time: Math.max(a.time, b.time),
-    snr: definedOr(Math.max, a.snr, b.snr),
-    rssi: definedOr(Math.max, a.rssi, b.rssi),
-    observed: definedOr(or, a.observed, b.observed),
-  };
-
-  const setA = new Set(a.path);
-  const setB = new Set(b.path);
-  merged.path = Array.from(setA.union(setB));
-
-  return merged;
-}
-
 export async function onRequest(context) {
   const request = context.request;
   const data = await request.json();
-  const store = context.env.SAMPLES;
 
+  // TODO: Pass geohash directly.
   const [lat, lon] = parseLocation(data.lat, data.lon);
   const key = sampleKey(lat, lon);
-  const path = (data.path ?? []).map(p => p.toLowerCase());
-  let metadata = {
-    time: Date.now(),
-    rssi: data.rssi ?? null,
-    snr: data.snr ?? null,
-    path: path,
-    observed: data.observed ?? false,
-  };
-
-  // KV only allows one write to a key per second.
-  // There's a strong possibility that's hit by #wardrive.
-  await retry(async () => {
-    const resp = await store.getWithMetadata(key);
-    if (resp.value !== null
-        && resp.metadata !== null
-        && ageInDays(resp.metadata.time) < 1) {
-      // Merge new information with existing if recent.
-      metadata = mergeMetadata(metadata, resp.metadata);
-    }
 
-    console.log(`PUT ${key} -> ${JSON.stringify(metadata)}`);
-    await store.put(key, "", {
-      metadata: metadata
-    });
-  });
+  const time = Date.now();
+  const rssi = data.rssi ?? null;
+  const snr = data.snr ?? null;
+  const path = (data.path ?? []).map(p => p.toLowerCase());
+  const observed = data.observed ?? false;
+
+  await context.env.DB
+    .prepare(`
+      INSERT INTO samples (hash, time, rssi, snr, observed, repeaters)
+      VALUES (?, ?, ?, ?, ?, ?)
+      ON CONFLICT(hash) DO UPDATE SET
+        time = excluded.time,
+        rssi = CASE
+          WHEN samples.rssi IS NULL THEN excluded.rssi
+          WHEN excluded.rssi IS NULL THEN samples.rssi
+          ELSE MAX(samples.rssi, excluded.rssi)
+        END,
+        snr = CASE
+          WHEN samples.snr IS NULL THEN excluded.snr
+          WHEN excluded.snr IS NULL THEN samples.snr
+          ELSE MAX(samples.snr, excluded.snr)
+        END,
+        observed = MAX(samples.observed, excluded.observed),
+        repeaters = (
+          SELECT json_group_array(value) FROM (
+            SELECT value FROM json_each(samples.repeaters)
+            UNION
+            SELECT value FROM json_each(excluded.repeaters)
+          )
+        )
+    `)
+    .bind(key, time, rssi, snr, observed, JSON.stringify(path))
+    .run();
 
   return new Response('OK');
 }

support/schema.sql

@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS samples;
+CREATE TABLE IF NOT EXISTS samples (
+  hash TEXT PRIMARY KEY,
+  time INTEGER NOT NULL,
+  rssi REAL CHECK (rssi IS NULL OR typeof(rssi) = 'real'),
+  snr REAL CHECK (snr  IS NULL OR typeof(snr)  = 'real'),
+  observed INTEGER NOT NULL DEFAULT 0 CHECK (observed IN (0, 1)),
+  repeaters TEXT NOT NULL DEFAULT '[]'
+);

wrangler.jsonc

@@ -6,6 +6,13 @@
     "compatibility_flags": [
         "nodejs_compat"
     ],
+    "d1_databases": [
+        {
+            "binding": "DB",
+            "database_name": "mesh-map",
+            "database_id": "60046b37-9e23-4af3-879d-232d4663032d"
+        }
+    ],
     "kv_namespaces": [
         {
             "binding": "SAMPLES",