@signalk/freeboard-sk 3.2.0-beta.0 → 3.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/freeboard-sk",
-  "version": "3.2.0-beta.0",
+  "version": "3.2.0-beta.1",
   "description": "Openlayers chart plotter implementation for Signal K",
   "keywords": [
     "signalk-webapp",
@@ -58,6 +58,7 @@
     "prepack": "npm run build:all",
     "test:ci": "node scripts/test-ci.mjs",
     "test:tools": "vitest run --config dev-tools/changelog/vitest.config.mjs",
+    "test:helper": "vitest run --config helper/vitest.config.mts",
     "version": "node dev-tools/changelog/index.mjs stamp && git add features/changelog.json"
   },
   "author": "AdrianP",
@@ -82,19 +83,19 @@
     "uuid": "^14.0.1"
   },
   "devDependencies": {
-    "@angular/animations": "^21.2.19",
-    "@angular/build": "^21.2.19",
+    "@angular/animations": "^21.2.23",
+    "@angular/build": "^21.2.24",
     "@angular/cdk": "^21.0.3",
-    "@angular/cli": "^21.2.19",
-    "@angular/common": "^21.2.19",
-    "@angular/compiler": "^21.2.19",
-    "@angular/compiler-cli": "^21.2.19",
-    "@angular/core": "^21.2.19",
-    "@angular/forms": "^21.2.19",
-    "@angular/language-service": "^21.2.19",
+    "@angular/cli": "^21.2.24",
+    "@angular/common": "^21.2.23",
+    "@angular/compiler": "^21.2.23",
+    "@angular/compiler-cli": "^21.2.23",
+    "@angular/core": "^21.2.23",
+    "@angular/forms": "^21.2.23",
+    "@angular/language-service": "^21.2.23",
     "@angular/material": "^21.0.3",
-    "@angular/platform-browser": "^21.2.19",
-    "@angular/platform-browser-dynamic": "^21.2.19",
+    "@angular/platform-browser": "^21.2.23",
+    "@angular/platform-browser-dynamic": "^21.2.23",
     "@eslint/js": "^10.0.1",
     "@kolkov/angular-editor": "^3.0.5",
     "@types/arcgis-rest-api": "^10.4.5",
@@ -119,7 +120,7 @@
     "pmtiles": "^4.4.1",
     "prettier": "^3.6.2",
     "prettier-plugin-organize-attributes": "^1.0.0",
-    "proj4": "2.21.0",
+    "proj4": "2.22.0",
     "remark": "^15.0.1",
     "rxjs": "~7.8.2",
     "semver": "^7.6.0",

package/plugin/alarms/alarms.js

@@ -126,6 +126,15 @@ let pluginId;
 let unsubscribes = [];
 const alarmAreas = new Map();
 const alarmManager = new AreaAlarmManager();
+// Initial region load: the resources provider may register after this plugin
+// starts (slow hardware, many plugins, startup order), so a single fixed
+// delay can miss it and leave on-disk hazard regions unloaded until one is
+// edited (#746). Retry with a doubling delay, giving up after the last one.
+const REGION_LOAD_DELAYS_MS = [5_000, 10_000, 20_000, 40_000, 60_000, 60_000];
+let regionLoadTimer;
+// Cleared by shutdownAlarms() so an attempt already in flight at shutdown
+// cannot reschedule itself from its catch block.
+let regionLoadActive = false;
 const getSelfPathValue = (path) => {
     return server.getSelfPath(path);
 };
@@ -134,7 +143,8 @@ const initAlarms = (app, id) => {
     pluginId = id;
     server.debug(`** initAlarms() **`);
     initAlarmEndpoints();
-    setTimeout(() => parseRegionList(), 5000);
+    regionLoadActive = true;
+    scheduleRegionLoad(0);
     // subscribe to deltas
     const subCommand = {
         context: 'vessels.self',
@@ -155,6 +165,11 @@ const initAlarms = (app, id) => {
 };
 exports.initAlarms = initAlarms;
 const shutdownAlarms = () => {
+    regionLoadActive = false;
+    if (regionLoadTimer) {
+        clearTimeout(regionLoadTimer);
+        regionLoadTimer = undefined;
+    }
     unsubscribes.forEach((s) => s());
     unsubscribes = [];
 };
@@ -424,11 +439,51 @@ const fetchRegion = async (id) => {
     return reg;
 };
 /**
- * Fetch list of region resources and parse them to assign alarm area
+ * Schedule attempt `attempt` of the initial region load.
+ * @param attempt Index into REGION_LOAD_DELAYS_MS
+ */
+const scheduleRegionLoad = (attempt) => {
+    if (!regionLoadActive) {
+        return;
+    }
+    regionLoadTimer = setTimeout(() => {
+        regionLoadTimer = undefined;
+        parseRegionList(attempt);
+    }, REGION_LOAD_DELAYS_MS[attempt]);
+};
+/**
+ * Fetch list of region resources and parse them to assign alarm area,
+ * rescheduling on failure until the retry delays are exhausted.
+ * @param attempt Which attempt this is (0-based)
  * @returns void
  */
-const parseRegionList = async () => {
-    const regList = await server.resourcesApi.listResources('regions', undefined);
+const parseRegionList = async (attempt) => {
+    // Called from a fire-and-forget timer, so a rejection here has nothing to
+    // catch it and would escape as an unhandled rejection (#732). The usual
+    // cause is no provider registered for `regions` — either not yet (retry)
+    // or not at all (resources-provider disabled, or `regions` unticked in
+    // its config): recoverable, there are simply no region alarm areas to load.
+    let regList;
+    try {
+        regList = await server.resourcesApi.listResources('regions', undefined);
+    }
+    catch (err) {
+        if (!regionLoadActive) {
+            return; // plugin stopped while the request was in flight
+        }
+        const reason = err instanceof Error ? err.message : String(err);
+        if (attempt + 1 < REGION_LOAD_DELAYS_MS.length) {
+            server.debug(`** region alarm areas not loaded (${reason}), retry ${attempt + 2}/${REGION_LOAD_DELAYS_MS.length} in ${REGION_LOAD_DELAYS_MS[attempt + 1] / 1000}s`);
+            scheduleRegionLoad(attempt + 1);
+        }
+        else {
+            console.warn(`Freeboard-SK: unable to load region alarm areas after ${REGION_LOAD_DELAYS_MS.length} attempts: ${reason}`);
+        }
+        return;
+    }
+    if (!regionLoadActive) {
+        return; // plugin stopped while the request was in flight
+    }
     Object.entries(regList).forEach((r) => processRegionUpdate(r[0], r[1]));
 };
 /**

package/plugin/lib/fetch.js

@@ -40,10 +40,10 @@ exports.fetch = fetch;
 const post = (href, data) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const opt = url.parse(href);
-    ((opt.method = 'POST'),
-        (opt.headers = {
-            'Content-Type': 'application/json'
-        }));
+    opt.method = 'POST';
+    opt.headers = {
+        'Content-Type': 'application/json'
+    };
     const req = href.indexOf('https') !== -1 ? https : http;
     return new Promise((resolve, reject) => {
         const postReq = req

package/plugin/vitest.config.mjs

@@ -0,0 +1,11 @@
+import { defineConfig } from 'vitest/config';
+// Standalone config for the helper plugin (the server-side code compiled by
+// `build:helper` into plugin/). It is plain Node, not part of the Angular app,
+// so `ng test` never sees it. Run via `npm run test:helper`.
+export default defineConfig({
+    test: {
+        root: __dirname,
+        include: ['**/*.spec.ts'],
+        environment: 'node'
+    }
+});

package/public/{chunk-RU2QXGZX.js → chunk-24TYZLHO.js}

@@ -1 +1 @@
-import{c as y,d as S,e as k,g as E,k as R,o as B}from"./chunk-PSRS6NXJ.js";import"./chunk-PGHE7FOF.js";import"./chunk-7UXFP343.js";import{Dd as b,Ed as I,Gd as L,Hd as C,Ia as f,Id as w,Ja as u,Jd as P,La as e,Ma as a,Q as s,R as g,Td as W,Ua as M,Wa as c,Wd as v,Ya as _,Yd as T,Zd as h,ja as l,lb as o,mb as D,nb as A,oa as r,ob as x,ra as p}from"./chunk-JH5KSRZ6.js";import"./chunk-6H3I7D5M.js";var F=(n,i)=>i.extension+"/"+i.widget.id;function O(n,i){if(n&1){let t=M();e(0,"button",4),c("click",function(){let m=s(t).$implicit,j=_();return g(j.dialogRef.close(m))}),e(1,"span",5),o(2),a(),e(3,"span",6),o(4),a()()}if(n&2){let t=i.$implicit;l(2),D(t.widget.title),l(2),x("",t.extensionName," \xB7 ",t.widget.size)}}var N=class n{constructor(i,t){this.dialogRef=i;this.data=t;this.anchorLabel=B[t.anchor]}dialogRef;data;anchorLabel;static \u0275fac=function(t){return new(t||n)(r(b),r(I))};static \u0275cmp=p({type:n,selectors:[["fb-plotterext-add-widget"]],decls:12,vars:1,consts:[["mat-dialog-title","",1,"pe-add-title"],["mat-list-item",""],["align","end"],["mat-button","",3,"click"],["mat-list-item","",3,"click"],["matListItemTitle",""],["matListItemLine",""]],template:function(t,d){t&1&&(e(0,"div",0)(1,"mat-icon"),o(2,"widgets"),a(),e(3,"span"),o(4),a()(),e(5,"mat-dialog-content")(6,"mat-action-list"),f(7,O,5,3,"button",1,F),a()(),e(9,"mat-dialog-actions",2)(10,"button",3),c("click",function(){return d.dialogRef.close()}),o(11,"Cancel"),a()()),t&2&&(l(4),A("Add widget \u2014 ",d.anchorLabel),l(3),u(d.data.candidates))},dependencies:[P,L,w,C,v,W,h,T,R,k,E,S,y],styles:[".pe-add-title[_ngcontent-%COMP%]{display:flex;align-items:center;gap:8px}"]})};export{N as PlotterAddWidgetDialog};
+import{c as y,d as S,e as k,g as E,k as R,o as B}from"./chunk-4WQCRQTL.js";import"./chunk-T5UYZVNA.js";import"./chunk-FMYAA5JW.js";import{Dd as b,Ed as I,Gd as L,Hd as C,Ia as f,Id as w,Ja as u,Jd as P,La as e,Ma as a,R as s,S as g,Td as W,Ua as M,Wa as c,Wd as v,Ya as _,Yd as T,Zd as h,ja as l,lb as o,mb as D,nb as A,oa as r,ob as x,ra as p}from"./chunk-K2CIRFN7.js";import"./chunk-6H3I7D5M.js";var F=(n,i)=>i.extension+"/"+i.widget.id;function O(n,i){if(n&1){let t=M();e(0,"button",4),c("click",function(){let m=s(t).$implicit,j=_();return g(j.dialogRef.close(m))}),e(1,"span",5),o(2),a(),e(3,"span",6),o(4),a()()}if(n&2){let t=i.$implicit;l(2),D(t.widget.title),l(2),x("",t.extensionName," \xB7 ",t.widget.size)}}var N=class n{constructor(i,t){this.dialogRef=i;this.data=t;this.anchorLabel=B[t.anchor]}dialogRef;data;anchorLabel;static \u0275fac=function(t){return new(t||n)(r(b),r(I))};static \u0275cmp=p({type:n,selectors:[["fb-plotterext-add-widget"]],decls:12,vars:1,consts:[["mat-dialog-title","",1,"pe-add-title"],["mat-list-item",""],["align","end"],["mat-button","",3,"click"],["mat-list-item","",3,"click"],["matListItemTitle",""],["matListItemLine",""]],template:function(t,d){t&1&&(e(0,"div",0)(1,"mat-icon"),o(2,"widgets"),a(),e(3,"span"),o(4),a()(),e(5,"mat-dialog-content")(6,"mat-action-list"),f(7,O,5,3,"button",1,F),a()(),e(9,"mat-dialog-actions",2)(10,"button",3),c("click",function(){return d.dialogRef.close()}),o(11,"Cancel"),a()()),t&2&&(l(4),A("Add widget \u2014 ",d.anchorLabel),l(3),u(d.data.candidates))},dependencies:[P,L,w,C,v,W,h,T,R,k,E,S,y],styles:[".pe-add-title[_ngcontent-%COMP%]{display:flex;align-items:center;gap:8px}"]})};export{N as PlotterAddWidgetDialog};

package/public/{chunk-WXOWBQXR.js → chunk-2M5JDEPT.js}

@@ -1,4 +1,4 @@
-import{a as nt}from"./chunk-TGPAYIRR.js";import{b as at,i as it,j as ct,n as ot,o as rt}from"./chunk-7Z4ZZM32.js";import{$ as Be,Da as K,Dd as j,Ea as O,Ed as N,Fa as z,Gd as Y,Ha as ae,Hc as se,Hd as V,I as De,Ia as ie,Ic as ke,Id as J,Ja as ce,Jc as Ue,Jd as q,K as Ae,Ka as g,Kc as Ge,L as we,La as o,M as X,Ma as c,Mb as je,N as T,Na as _,Nc as _e,Oa as ue,Od as We,P as r,Pa as pe,Q as E,Qd as Ye,R as S,S as Ie,Sc as He,T as Te,Td as w,U as Q,Ua as $,V as Ee,Va as ze,Wa as b,Wb as re,Wc as Xe,Wd as R,X as le,Y as te,Ya as B,Yb as A,Yc as Qe,Yd as U,Z as Se,Za as P,Zb as Ne,Zd as G,_a as x,_d as Je,ab as L,ae as et,bb as C,c as I,ca as ne,cb as M,ga as he,gb as v,gd as Ze,i as Me,ib as D,ja as d,ka as be,kb as Pe,la as Re,lb as s,lc as Ve,mb as oe,md as Ke,nb as h,pc as qe,pe as tt,ra as p,sa as Z,ta as f,td as $e,va as Fe,vd as W,wa as Oe,wb as Le,xc as de}from"./chunk-JH5KSRZ6.js";import{a as F}from"./chunk-6H3I7D5M.js";var Mt=["*"],Dt=[[["mat-card-title"],["mat-card-subtitle"],["","mat-card-title",""],["","mat-card-subtitle",""],["","matCardTitle",""],["","matCardSubtitle",""]],[["","mat-card-image",""],["","matCardImage",""],["","mat-card-sm-image",""],["","matCardImageSmall",""],["","mat-card-md-image",""],["","matCardImageMedium",""],["","mat-card-lg-image",""],["","matCardImageLarge",""],["","mat-card-xl-image",""],["","matCardImageXLarge",""]],"*"],At=[`mat-card-title, mat-card-subtitle,
+import{a as nt}from"./chunk-OGLYW4PJ.js";import{b as at,i as it,j as ct,n as ot,o as rt}from"./chunk-ABEPBSQB.js";import{Da as K,Dd as j,Ea as O,Ed as N,Fa as z,Gd as Y,Ha as ae,Hc as se,Hd as V,I as De,Ia as ie,Ic as ke,Id as J,Ja as ce,Jc as Ue,Jd as q,K as Ae,Ka as g,Kc as Ge,L as we,La as o,M as X,Ma as c,Mb as je,N as T,Na as _,Nc as _e,Oa as ue,Od as We,P as r,Pa as pe,Qd as Ye,R as E,S,Sc as He,T as Ie,Td as w,U as Te,Ua as $,V as Q,Va as ze,W as Ee,Wa as b,Wb as re,Wc as Xe,Wd as R,Y as le,Ya as B,Yb as A,Yc as Qe,Yd as U,Z as te,Za as P,Zb as Ne,Zd as G,_ as Se,_a as x,_d as Je,aa as Be,ab as L,ae as et,bb as C,c as I,cb as M,da as ne,ga as he,gb as v,gd as Ze,i as Me,ib as D,ja as d,ka as be,kb as Pe,la as Re,lb as s,lc as Ve,mb as oe,md as Ke,nb as h,pc as qe,pe as tt,ra as p,sa as Z,ta as f,td as $e,va as Fe,vd as W,wa as Oe,wb as Le,xc as de}from"./chunk-K2CIRFN7.js";import{a as F}from"./chunk-6H3I7D5M.js";var Mt=["*"],Dt=[[["mat-card-title"],["mat-card-subtitle"],["","mat-card-title",""],["","mat-card-subtitle",""],["","matCardTitle",""],["","matCardSubtitle",""]],[["","mat-card-image",""],["","matCardImage",""],["","mat-card-sm-image",""],["","matCardImageSmall",""],["","mat-card-md-image",""],["","matCardImageMedium",""],["","mat-card-lg-image",""],["","matCardImageLarge",""],["","mat-card-xl-image",""],["","matCardImageXLarge",""]],"*"],At=[`mat-card-title, mat-card-subtitle,
       [mat-card-title], [mat-card-subtitle],
       [matCardTitle], [matCardSubtitle]`,`[mat-card-image], [matCardImage],
                     [mat-card-sm-image], [matCardImageSmall],

package/public/chunk-3FOJW6X2.js

@@ -0,0 +1 @@
+import{m as a,n as b,o as c,p as d,q as e,r as f}from"./chunk-2M5JDEPT.js";import"./chunk-OGLYW4PJ.js";import"./chunk-ABEPBSQB.js";import"./chunk-K2CIRFN7.js";import"./chunk-6H3I7D5M.js";export{d as AboutDialog,b as AlertDialog,c as ConfirmDialog,e as LoginDialog,f as MessageBarComponent,a as MsgBox};

package/public/{chunk-PSRS6NXJ.js → chunk-4WQCRQTL.js}

@@ -1,4 +1,4 @@
-import{b as xt}from"./chunk-PGHE7FOF.js";import{a as U}from"./chunk-7UXFP343.js";import{$ as at,$a as S,Da as C,Ea as T,Fa as z,Gb as B,I as V,K as tt,Ka as f,La as l,M as E,Ma as _,Md as gt,N as R,Na as L,Nd as bt,P as c,Pc as dt,Qd as ut,S as it,Sd as ft,T as et,U as nt,Wa as D,Wb as W,X as Q,Y as H,Ya as v,Z as F,Za as I,_a as r,_d as vt,a as Y,aa as w,ab as G,ac as st,bb as d,c as $,ca as O,cb as h,gb as M,hd as q,ib as x,id as ht,ja as p,lc as ct,na as ot,nc as rt,pc as lt,ra as g,rc as mt,rd as m,s as J,sa as P,ta as b,va as u,vd as pt,wa as y,wb as A,xc as j,xd as _t}from"./chunk-JH5KSRZ6.js";var Ot=(()=>{class i{get vertical(){return this._vertical}set vertical(t){this._vertical=m(t)}_vertical=!1;get inset(){return this._inset}set inset(t){this._inset=m(t)}_inset=!1;static \u0275fac=function(e){return new(e||i)};static \u0275cmp=g({type:i,selectors:[["mat-divider"]],hostAttrs:["role","separator",1,"mat-divider"],hostVars:7,hostBindings:function(e,n){e&2&&(C("aria-orientation",n.vertical?"vertical":"horizontal"),x("mat-divider-vertical",n.vertical)("mat-divider-horizontal",!n.vertical)("mat-divider-inset",n.inset))},inputs:{vertical:"vertical",inset:"inset"},decls:0,vars:0,template:function(e,n){},styles:[`.mat-divider {
+import{b as xt}from"./chunk-T5UYZVNA.js";import{a as U}from"./chunk-FMYAA5JW.js";import{$a as S,Da as C,Ea as T,Fa as z,Gb as B,I as V,K as tt,Ka as f,La as l,M as E,Ma as _,Md as gt,N as R,Na as L,Nd as bt,P as c,Pc as dt,Qd as ut,Sd as ft,T as it,U as et,V as nt,Wa as D,Wb as W,Y as Q,Ya as v,Z as H,Za as I,_ as F,_a as r,_d as vt,a as Y,aa as at,ab as G,ac as st,ba as w,bb as d,c as $,cb as h,da as O,gb as M,hd as q,ib as x,id as ht,ja as p,lc as ct,na as ot,nc as rt,pc as lt,ra as g,rc as mt,rd as m,s as J,sa as P,ta as b,va as u,vd as pt,wa as y,wb as A,xc as j,xd as _t}from"./chunk-K2CIRFN7.js";var Ot=(()=>{class i{get vertical(){return this._vertical}set vertical(t){this._vertical=m(t)}_vertical=!1;get inset(){return this._inset}set inset(t){this._inset=m(t)}_inset=!1;static \u0275fac=function(e){return new(e||i)};static \u0275cmp=g({type:i,selectors:[["mat-divider"]],hostAttrs:["role","separator",1,"mat-divider"],hostVars:7,hostBindings:function(e,n){e&2&&(C("aria-orientation",n.vertical?"vertical":"horizontal"),x("mat-divider-vertical",n.vertical)("mat-divider-horizontal",!n.vertical)("mat-divider-inset",n.inset))},inputs:{vertical:"vertical",inset:"inset"},decls:0,vars:0,template:function(e,n){},styles:[`.mat-divider {
   display: block;
   margin: 0;
   border-top-style: solid;