@sailingnaturali/signalk-dsc 0.5.4 → 0.5.6

package/index.js

@@ -34,7 +34,9 @@ const {
   buildLogbookText,
   captureOwnShip,
   buildObservations,
+  createNotifier,
   unwrap,
+  writeLogbookEntry,
 } = require('@sailingnaturali/signalk-distress-core');
 
 const DSC_PGN = 129808;
@@ -141,37 +143,33 @@ module.exports = function makePlugin(app) {
     };
   }
 
+  // Notification plumbing (raise/clear/reannounce) is shared with
+  // signalk-ais-distress via signalk-distress-core. A non-alarming category
+  // (routine/unknown, not in NOTIFICATION_STATES) makes raise a no-op.
+  const notifier = createNotifier({
+    app,
+    pluginId: plugin.id,
+    pathFor: (event) => `notifications.dsc.${event.category}`,
+    stateFor: (event) => NOTIFICATION_STATES[event.category],
+  });
+
+  // Rebuild the spoken message against the current own-ship position — range
+  // and direction shift as we move. Terse on purpose: this string gets spoken;
+  // full detail lives in the resource store and the logbook entry.
+  function refreshMessage(event) {
+    event.message = buildMessage(event, messageContext(event));
+    return event;
+  }
+
   function notify(event) {
-    const state = NOTIFICATION_STATES[event.category];
-    if (!state) return;
-    app.handleMessage(plugin.id, {
-      updates: [
-        {
-          values: [
-            {
-              path: `notifications.dsc.${event.category}`,
-              value: {
-                state,
-                method: ['visual', 'sound'],
-                // Kept terse on purpose: this string gets spoken by the
-                // voice pipeline. Full detail lives in the resource store
-                // and the logbook entry.
-                message: buildMessage(event, messageContext(event)),
-                timestamp: event.receivedAt,
-              },
-            },
-          ],
-        },
-      ],
-    });
+    refreshMessage(event);
+    notifier.raise(event);
   }
 
   /** Clear an active DSC alarm: drop the live notification from our own source
    *  and stamp the stored events so the restart reannounce skips them. */
   function clearCategory(category) {
-    app.handleMessage(plugin.id, {
-      updates: [{ values: [{ path: `notifications.dsc.${category}`, value: null }] }],
-    });
+    notifier.clear(`notifications.dsc.${category}`);
     store.markCleared((e) => e.category === category, new Date().toISOString());
   }
 
@@ -185,26 +183,14 @@ module.exports = function makePlugin(app) {
   }
 
   async function postLogbook(event) {
-    const observations = buildObservations(event.ownShip);
-    const res = await fetch(options.logbookUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        // signalk-server's auth gate reads the Authorization header; the
-        // logbook plugin reads the author from the JAUTHENTICATION cookie.
-        Authorization: `Bearer ${options.logbookToken}`,
-        Cookie: `JAUTHENTICATION=${options.logbookToken}`,
-      },
-      body: JSON.stringify({
-        text: buildLogbookText(event, messageContext(event)),
-        ago: 0,
-        category: 'radio',
-        // DSC is received on VHF channel 70 by definition.
-        vhf: '70',
-        ...(observations ? { observations } : {}),
-      }),
+    await writeLogbookEntry({
+      url: options.logbookUrl,
+      token: options.logbookToken,
+      text: buildLogbookText(event, messageContext(event)),
+      observations: buildObservations(event.ownShip),
+      // DSC is received on VHF channel 70 by definition.
+      extra: { vhf: '70' },
     });
-    if (!res.ok) throw new Error(`HTTP ${res.status}`);
   }
 
   /** Store a normalized call, alarm on it, and log it. Returns the stored event. */
@@ -431,23 +417,14 @@ module.exports = function makePlugin(app) {
     // Survive server restarts mid-incident: re-raise the newest alert per
     // category that is still fresh (a received MAYDAY must not vanish just
     // because the server bounced). Delayed so position providers are up and
-    // the spoken message can say "N miles <direction>" instead of raw
-    // coordinates.
+    // the refreshed spoken message can say "N miles <direction>" instead of raw
+    // coordinates. Non-alarming categories are skipped by raise's no-op path.
     reannounceTimer = setTimeout(() => {
       if (!started) return;
-      const now = Date.now();
-      const reannounced = new Set();
-      const events = store.list();
-      for (let i = events.length - 1; i >= 0; i--) {
-        const event = events[i];
-        if (!NOTIFICATION_STATES[event.category] || reannounced.has(event.category)) continue;
-        if (event.clearedAt) continue; // operator-cleared: never resurrect
-        const at = Date.parse(event.lastReceivedAt || event.receivedAt);
-        if (now - at <= REANNOUNCE_WINDOW_MS) {
-          notify(event);
-          reannounced.add(event.category);
-        }
-      }
+      notifier.reannounce(store.list(), {
+        window: REANNOUNCE_WINDOW_MS,
+        prepare: refreshMessage,
+      });
     }, options.reannounceDelayMs ?? 30000);
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sailingnaturali/signalk-dsc",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Receive, log, and alert on DSC (VHF digital selective calling) calls — distress, urgency, safety, routine — from NMEA 0183 ($CDDSC/$CDDSE) and NMEA 2000 (PGN 129808).",
   "main": "index.js",
   "scripts": {
@@ -49,6 +49,6 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@sailingnaturali/signalk-distress-core": "^0.1.0"
+    "@sailingnaturali/signalk-distress-core": "^0.3.0"
   }
 }