signalk-tides 2.2.0 → 2.3.0

package/dist/middleware.js

@@ -1,78 +1,103 @@
-import { findStation, nearestStation } from "neaps";
+import { findStation, nearestStation } from "slackwater";
+import { MAX_STATION_KM, hasTideModel, isNoStationNearby, isStationNotFound, } from "./calculations.js";
+const nearestToVessel = ({ latitude, longitude }) => nearestStation({
+    latitude,
+    longitude,
+    maxDistance: MAX_STATION_KM,
+});
 /**
  * Middleware that resolves the vessel/default station alias and bare
  * location-based queries (/extremes, /timeline) against the configured default
  * station, falling back to the station nearest the vessel's position when no
- * default is set.
+ * default is set or it can't be used.
  */
 export function withVesselPosition(router, getPosition, getDefaultStationId) {
-    return (req, res, next) => {
-        // HTTP 303 See Other: the response can be found under a different URI
-        const redirect = (toPath) => res.redirect(303, `${req.baseUrl}${toPath}`);
-        // The configured default station, or null when unset, "auto", or stale.
-        const defaultStation = () => {
-            const id = getDefaultStationId?.();
-            if (!id || id === "auto")
-                return null;
-            try {
-                return findStation(id);
-            }
-            catch {
-                return null; // stale or invalid saved id: fall back to position
-            }
-        };
-        // Redirect the vessel/default alias to the configured (or nearest) station.
-        if (/^\/stations\/vessel\/default(?:\/|$)/.test(req.path)) {
-            const toStation = (station) => redirect(req.url.replace(/^\/stations\/vessel\/default\b/, `/stations/${station.id}`));
-            // A configured default station resolves without a position
-            const station = defaultStation();
-            if (station)
-                return toStation(station);
-            const pos = getPosition();
-            if (!pos) {
-                return res.status(503).json({ message: "Vessel position not available" });
-            }
-            try {
-                const nearest = nearestStation({
-                    latitude: pos.latitude,
-                    longitude: pos.longitude,
-                });
-                if (!nearest) {
-                    return res.status(404).json({ message: "No nearby stations found" });
+    // signalk-server runs Express 4, which ignores a rejected handler and leaves
+    // the request hanging, so every failure has to reach next().
+    return async (req, res, next) => {
+        try {
+            // HTTP 303 See Other: the response can be found under a different URI
+            const redirect = (toPath) => res.redirect(303, `${req.baseUrl}${toPath}`);
+            // The configured default station, or null when unset, "auto", stale, or unpredictable.
+            const defaultStation = async () => {
+                const id = getDefaultStationId?.();
+                if (!id || id === "auto")
+                    return null;
+                try {
+                    const station = await findStation(id);
+                    return hasTideModel(station) ? station : null;
+                }
+                catch (e) {
+                    // A stale or invalid saved id falls back to position; a database that
+                    // failed to load has to reach next().
+                    if (isStationNotFound(e))
+                        return null;
+                    throw e;
+                }
+            };
+            // Redirect the vessel/default alias to the configured (or nearest) station.
+            if (/^\/stations\/vessel\/default(?:\/|$)/.test(req.path)) {
+                const toStation = (station) => redirect(req.url.replace(/^\/stations\/vessel\/default\b/, `/stations/${station.id}`));
+                // A configured default station resolves without a position
+                const station = await defaultStation();
+                if (station)
+                    return toStation(station);
+                const pos = getPosition();
+                if (!pos) {
+                    res.status(503).json({ message: "Vessel position not available" });
+                    return;
+                }
+                try {
+                    return toStation(await nearestToVessel(pos));
+                }
+                catch (e) {
+                    if (isNoStationNearby(e)) {
+                        res.status(404).json({ message: "No nearby stations found" });
+                        return;
+                    }
+                    res.status(500).json({ message: "Failed to find nearest station" });
+                    return;
                 }
-                return toStation(nearest);
             }
-            catch {
-                return res.status(500).json({
-                    message: "Failed to find nearest station",
-                });
+            // Bare location-based queries: redirect to the configured station when set,
+            // otherwise inject the vessel position so slackwater uses the nearest station.
+            const isLocationQueryPath = req.path === "/extremes" || req.path === "/timeline";
+            if (isLocationQueryPath && !req.query.latitude && !req.query.longitude) {
+                const station = await defaultStation();
+                if (station) {
+                    return redirect(req.url.replace(/^\/(extremes|timeline)\b/, `/stations/${station.id}/$1`));
+                }
+                const pos = getPosition();
+                if (pos) {
+                    // The Slackwater route takes any distance, so check the range here
+                    try {
+                        await nearestToVessel(pos);
+                    }
+                    catch (e) {
+                        if (!isNoStationNearby(e))
+                            throw e;
+                        res.status(404).json({ message: "No nearby stations found" });
+                        return;
+                    }
+                    // Express 5 makes `req.query` a read-only getter, so assigning to its
+                    // properties is silently lost. Shadow it with an own data property,
+                    // which behaves identically on Express 4 and 5.
+                    Object.defineProperty(req, "query", {
+                        value: {
+                            ...req.query,
+                            latitude: String(pos.latitude),
+                            longitude: String(pos.longitude),
+                        },
+                        writable: true,
+                        configurable: true,
+                        enumerable: true,
+                    });
+                }
             }
+            router(req, res, next);
         }
-        // Bare location-based queries: redirect to the configured station when set,
-        // otherwise inject the vessel position so neaps uses the nearest station.
-        const isLocationQueryPath = req.path === "/extremes" || req.path === "/timeline";
-        if (isLocationQueryPath && !req.query.latitude && !req.query.longitude) {
-            const station = defaultStation();
-            if (station) {
-                return redirect(req.url.replace(/^\/(extremes|timeline)\b/, `/stations/${station.id}/$1`));
-            }
-            const pos = getPosition();
-            if (pos) {
-                // Express 5 makes `req.query` a read-only getter, so assigning to its
-                // properties is silently lost. Shadow it with an own data property,
-                // which behaves identically on Express 4 and 5.
-                Object.defineProperty(req, "query", {
-                    value: {
-                        ...req.query,
-                        latitude: String(pos.latitude),
-                        longitude: String(pos.longitude),
-                    },
-                    writable: true,
-                    configurable: true,
-                    enumerable: true,
-                });
-            }
+        catch (error) {
+            next(error);
         }
-        router(req, res, next);
     };
 }

package/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+node = "22"

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "signalk-tides",
-  "version": "2.2.0",
-  "description": "Tidal predictions for the vessel's position, powered by Neaps.",
+  "version": "2.3.0",
+  "description": "Tidal predictions for the vessel's position, powered by Slackwater.",
+  "homepage": "https://openwaters.io/tides/slackwater/",
   "type": "module",
   "main": "./dist/index.js",
   "exports": "./dist/index.js",
@@ -34,42 +35,42 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@neaps/api": "^0.7.0",
-    "@neaps/react": "^0.2.0",
-    "@signalk/server-api": "^2.28.0",
-    "express": "^5.2.1",
-    "neaps": "^0.8.0",
+    "@signalk/server-api": "^2.35.0",
+    "@slackwater/api": "^1.0.0-beta.4",
+    "@slackwater/react": "^1.0.0-beta.2",
+    "express": "^5.3.0",
     "react": "^19.1.0",
-    "react-dom": "^19.1.0",
-    "signalk-plotterext-bus": "^0.15.0"
+    "react-dom": "^19.3.1",
+    "signalk-plotterext-bus": "^0.24.0",
+    "slackwater": "^1.0.0-beta.4"
   },
   "devDependencies": {
     "@eslint/js": "^9.21.0",
     "@tailwindcss/vite": "^4.1.3",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
-    "@testing-library/user-event": "^14.6.1",
+    "@testing-library/user-event": "^14.6.8",
     "@types/express": "^5.0.6",
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.6.5",
     "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
     "@types/supertest": "^7.2.0",
-    "@vitejs/plugin-react": "^6.0.2",
-    "@vitest/browser": "5.0.2",
-    "@vitest/browser-playwright": "5.0.2",
-    "@vitest/ui": "5.0.2",
-    "jsdom": "^30.0.1",
-    "maplibre-gl": "^6.9.0",
-    "oxlint": "^1.74.0",
-    "pkg-pr-new": "^0.0.88",
-    "playwright": "^1.58.2",
+    "@vitejs/plugin-react": "^6.1.2",
+    "@vitest/browser": "5.0.5",
+    "@vitest/browser-playwright": "5.0.5",
+    "@vitest/ui": "5.0.5",
+    "jsdom": "^30.1.3",
+    "maplibre-gl": "^6.15.0",
+    "oxlint": "^1.89.0",
+    "pkg-pr-new": "^0.0.92",
+    "playwright": "^1.64.1",
     "react-map-gl": "^8.1.0",
-    "signalk-server": "^2.13.5",
-    "supertest": "^7.2.2",
+    "signalk-server": "^2.35.1",
+    "supertest": "^7.3.1",
     "tailwindcss": "^4.1.3",
     "typescript": "^7.0.2",
-    "vite": "^8.0.16",
-    "vitest": "5.0.2"
+    "vite": "^8.3.5",
+    "vitest": "5.0.5"
   },
   "overrides": {
     "vite-plus": {

package/public/assets/main-FMwgC28o.js

@@ -0,0 +1 @@
+import{a as e,c as t,d as n,f as r,i,l as a,n as o,r as s,s as c,t as l,u}from"./useUnitPreferences-Bnl2Hfv0.js";var d=u(),f=r(n(),1),p=()=>new URLSearchParams(window.location.search).get(`station`)||`vessel/default`;function m(){let[e,t]=(0,f.useState)(p);return(0,f.useEffect)(()=>{let e=()=>t(p());return window.addEventListener(`popstate`,e),()=>window.removeEventListener(`popstate`,e)},[]),[e,(0,f.useCallback)(e=>{let n=e.trim()||`vessel/default`,r=new URL(window.location.href);n===`vessel/default`?r.searchParams.delete(`station`):r.searchParams.set(`station`,n),window.history.pushState(window.history.state,``,r),t(n)},[])]}var h=a(),g={version:8,sources:{osm:{type:`raster`,tiles:[`https://tile.openstreetmap.org/{z}/{x}/{y}.png`],tileSize:256,attribution:`© OpenStreetMap contributors`}},layers:[{id:`osm`,type:`raster`,source:`osm`}]};function _({stationId:n,onSelect:r}){let a=(0,f.useRef)(null),[s,c]=(0,f.useState)(!1),[l,u]=(0,f.useState)(!1),[d,p]=(0,f.useState)(`list`),{data:m,error:_}=t(n),v=()=>{u(window.matchMedia(`(min-width: 1024px)`).matches),p(`list`),c(!0),a.current?.showModal()},y=e=>{r(e.id),a.current?.close()};return(0,h.jsxs)(h.Fragment,{children:[(0,h.jsx)(`button`,{type:`button`,onClick:v,"aria-label":`Browse stations`,className:`absolute hidden min-[20rem]:block right-2 top-2 sm:right-4 sm:top-4 md:right-6 md:top-6 lg:right-8 lg:top-8 xl:right-20 xl:top-20 z-10 rounded-md border border-(--slackwater-border) bg-(--slackwater-bg-subtle) p-2 text-(--slackwater-text) hover:bg-(--slackwater-bg)`,children:(0,h.jsxs)(`svg`,{width:`20`,height:`20`,viewBox:`0 0 24 24`,fill:`none`,stroke:`currentColor`,strokeWidth:`2`,"aria-hidden":`true`,children:[(0,h.jsx)(`line`,{x1:`3`,y1:`6`,x2:`21`,y2:`6`}),(0,h.jsx)(`line`,{x1:`3`,y1:`12`,x2:`21`,y2:`12`}),(0,h.jsx)(`line`,{x1:`3`,y1:`18`,x2:`21`,y2:`18`})]})}),(0,h.jsx)(`dialog`,{ref:a,onClose:()=>c(!1),onClick:e=>{e.target===e.currentTarget&&e.currentTarget.close()},className:`m-auto w-[min(92vw,900px)] max-h-[85vh] rounded-lg border border-(--slackwater-border) bg-(--slackwater-bg) p-0 text-(--slackwater-text) backdrop:bg-black/50`,children:s&&(0,h.jsxs)(`div`,{className:`flex max-h-[85vh] flex-col`,children:[(0,h.jsxs)(`div`,{className:`flex items-center justify-between border-b border-(--slackwater-border) p-3`,children:[(0,h.jsx)(`button`,{type:`button`,onClick:()=>a.current?.close(),"aria-label":`Close`,className:`grid size-11 place-items-center rounded-md text-(--slackwater-text-muted) hover:text-(--slackwater-text)`,children:`✕`}),(0,h.jsx)(`h2`,{className:`text-base font-semibold`,children:`Stations`}),(0,h.jsx)(`button`,{type:`button`,onClick:()=>p(d===`map`?`list`:`map`),"aria-label":d===`map`?`Show list`:`Show map`,className:`grid size-11 place-items-center rounded-md text-(--slackwater-text-muted) hover:text-(--slackwater-text) lg:invisible`,children:d===`map`?(0,h.jsxs)(`svg`,{width:`20`,height:`20`,viewBox:`0 0 24 24`,fill:`none`,stroke:`currentColor`,strokeWidth:`2`,strokeLinecap:`round`,strokeLinejoin:`round`,"aria-hidden":`true`,children:[(0,h.jsx)(`line`,{x1:`8`,y1:`6`,x2:`21`,y2:`6`}),(0,h.jsx)(`line`,{x1:`8`,y1:`12`,x2:`21`,y2:`12`}),(0,h.jsx)(`line`,{x1:`8`,y1:`18`,x2:`21`,y2:`18`}),(0,h.jsx)(`line`,{x1:`3`,y1:`6`,x2:`3.01`,y2:`6`}),(0,h.jsx)(`line`,{x1:`3`,y1:`12`,x2:`3.01`,y2:`12`}),(0,h.jsx)(`line`,{x1:`3`,y1:`18`,x2:`3.01`,y2:`18`})]}):(0,h.jsxs)(`svg`,{width:`20`,height:`20`,viewBox:`0 0 24 24`,fill:`none`,stroke:`currentColor`,strokeWidth:`2`,strokeLinecap:`round`,strokeLinejoin:`round`,"aria-hidden":`true`,children:[(0,h.jsx)(`polygon`,{points:`3 6 9 3 15 6 21 3 21 18 15 21 9 18 3 21 3 6`}),(0,h.jsx)(`line`,{x1:`9`,y1:`3`,x2:`9`,y2:`18`}),(0,h.jsx)(`line`,{x1:`15`,y1:`6`,x2:`15`,y2:`21`})]})})]}),(0,h.jsxs)(`div`,{className:`flex min-h-0 flex-col gap-4 p-3 lg:flex-row`,children:[(0,h.jsxs)(`div`,{className:`w-full flex-col gap-3 overflow-y-auto lg:flex lg:w-80 ${d===`map`?`hidden`:`flex`}`,children:[(0,h.jsx)(i,{onSelect:y}),(0,h.jsx)(`button`,{type:`button`,onClick:()=>y({id:`vessel/default`}),className:`rounded-md border border-(--slackwater-border) px-3 py-2 text-left text-sm hover:bg-(--slackwater-bg-subtle)`,children:`📍 Vessel position`}),(0,h.jsx)(o,{stationId:n,onStationSelect:y})]}),(l||d===`map`)&&(m||_)&&(0,h.jsx)(`div`,{className:`h-[60vh] overflow-hidden rounded-md border border-(--slackwater-border) lg:h-auto lg:min-h-100 lg:flex-1`,children:(0,h.jsx)(e,{mapStyle:g,initialViewState:m?{longitude:m.longitude,latitude:m.latitude,zoom:10}:{longitude:0,latitude:20,zoom:1},focusStation:m?.id,onStationSelect:y})})]})]})})]})}var{VITE_SIGNALK_URL:v=window.location.toString()}={BASE_URL:`./`,DEV:!1,MODE:`production`,PROD:!0,SSR:!1},y=new URL(`/signalk/v2/api`,v).toString();function b(){let{units:e,ready:t}=l(),[n,r]=m();return t?(0,h.jsx)(s,{baseUrl:y,units:e,children:(0,h.jsxs)(`div`,{className:`relative`,children:[(0,h.jsx)(_,{stationId:n,onSelect:r}),(0,h.jsx)(c,{id:n,className:`overflow-y-auto p-2 sm:p-4 md:p-6 lg:p-8 xl:p-20`})]})}):null}(0,d.createRoot)(document.getElementById(`app`)).render((0,h.jsx)(b,{}));