@sailingnaturali/signalk-dsc 0.5.1 → 0.5.3

package/README.md

@@ -43,6 +43,9 @@ For every DSC call heard by a connected radio:
   (default 24); an active (un-cleared) distress call stays until you clear the alarm.
   This is the *detail* layer — distinct from the prominent live SaR marker a
   distress call also draws via the `sar.` context (see Remote-vessel deltas).
+
+  ![DSC distress markers in Freeboard-SK](docs/screenshots/freeboard-distress-markers.png)
+
 - **Alarms under your own vessel** — `notifications.dsc.distress` (state
   `emergency`), `notifications.dsc.urgency` (`alarm`), `notifications.dsc.safety`
   (`alert`). Routine calls never alarm. Repeated re-transmissions of the same

package/lib/dsc.js

@@ -56,6 +56,32 @@ const NATURES = {
 // Telecommand 21 on a non-distress call = "ship position" — field 5 holds a position.
 const TELECOMMAND_SHIP_POSITION = '21';
 
+// AIS device-beacon MMSI prefixes (ITU 97x). A modern SART / MOB / EPIRB can
+// send a DSC distress directly; the prefix lets a consumer correlate it with
+// the matching AIS target.
+const DEVICE_BEACONS = {
+  '970': 'sart',
+  '972': 'mob',
+  '974': 'epirb',
+};
+
+// Tag the AIS device class (sart/mob/epirb) for a 97x device-beacon MMSI, else
+// undefined. Shared with the N2K (PGN 129808) path so both transports agree.
+function deviceBeaconFor(mmsi) {
+  if (typeof mmsi !== 'string') return undefined;
+  return DEVICE_BEACONS[mmsi.substring(0, 3)];
+}
+
+// Resolve a nature-of-distress code to its name. The code arrives over the air
+// unsanitised: only a clean 1–2 digit numeric code may reach the NATURES lookup
+// or the code-NN fallback. A key like "__proto__" would otherwise resolve to
+// Object.prototype, and any dotted value would inject extra segments into the
+// notification path the server walks unguarded (SignalK/signalk-server#2768).
+// Anything else collapses to a safe constant.
+function parseNature(raw) {
+  return /^\d{1,2}$/.test(raw) ? NATURES[raw] || `code-${raw}` : 'undesignated';
+}
+
 function field(parts, i) {
   const v = parts[i];
   return typeof v === 'string' ? v.trim() : '';
@@ -126,18 +152,22 @@ function parseDsc(parts) {
     mmsi: parseMmsi(parts[1]),
   };
 
+  const beacon = deviceBeaconFor(event.mmsi);
+  if (beacon) event.deviceBeacon = beacon;
+
   const distress = event.category === 'distress';
   if (distress) {
-    const natureCode = field(parts, 3);
-    // natureCode arrives over the air, unsanitised. Only a clean numeric code
-    // may reach the NATURES lookup or the code-NN fallback: a key like
-    // "__proto__" would otherwise resolve to Object.prototype, and any dotted
-    // value would inject extra segments into the notification path that the
-    // server walks unguarded (SignalK/signalk-server#2768). Anything else
-    // collapses to a safe constant.
-    event.natureOfDistress = /^\d{1,2}$/.test(natureCode)
-      ? NATURES[natureCode] || `code-${natureCode}`
-      : 'undesignated';
+    // A distress *relay* (all-ships / area / individual format carrying a
+    // distress category) reports the casualty in field 7 and the nature of
+    // distress in field 8 — field 3 holds the relay telecommand, not a nature
+    // code. A first-party alert (format distressAlert) carries the nature in
+    // field 3.
+    if (event.format !== 'distressAlert') {
+      event.relay = true;
+      event.natureOfDistress = parseNature(field(parts, 8));
+    } else {
+      event.natureOfDistress = parseNature(field(parts, 3));
+    }
     event.distressedMmsi = parseMmsi(parts[7]);
   }
 
@@ -156,4 +186,4 @@ function parseDsc(parts) {
   return event;
 }
 
-module.exports = { parseDsc, parsePosition, parseMmsi, parseUtcTime, parseChannel, NATURES };
+module.exports = { parseDsc, parsePosition, parseMmsi, parseUtcTime, parseChannel, deviceBeaconFor, NATURES };

package/lib/format.js

@@ -64,7 +64,8 @@ function buildMessage(event, { ownPosition, vesselName } = {}) {
   const where = wherePhrase(event, ownPosition, { spoken: true });
   if (event.category === 'distress') {
     const nature = NATURE_TEXT[event.natureOfDistress] || event.natureOfDistress || 'undesignated distress';
-    return `DSC distress alert: ${who}, ${nature}, ${where}. Monitor channel 16.`;
+    const lead = event.relay ? 'DSC distress relay' : 'DSC distress alert';
+    return `${lead}: ${who}, ${nature}, ${where}. Monitor channel 16.`;
   }
   const kind = event.category === 'unknown' ? 'call' : `${event.category} call`;
   return `DSC ${kind}: ${who}, ${where}.`;
@@ -75,7 +76,13 @@ function buildLogbookText(event, { ownPosition, vesselName } = {}) {
   const name = vesselName ? `${vesselName} (MMSI ${event.mmsi || 'unknown'})` : `MMSI ${event.mmsi || 'unknown'}`;
   if (event.category === 'distress') {
     const nature = NATURE_TEXT[event.natureOfDistress] || event.natureOfDistress || 'undesignated distress';
-    parts.push(`DISTRESS alert from ${name}: ${nature}`);
+    if (event.relay) {
+      // Name the casualty (distressedMmsi) and the relaying station (name).
+      const casualty = event.distressedMmsi ? `MMSI ${event.distressedMmsi}` : 'an unidentified vessel';
+      parts.push(`DISTRESS RELAY from ${name} reporting ${casualty}: ${nature}`);
+    } else {
+      parts.push(`DISTRESS alert from ${name}: ${nature}`);
+    }
   } else {
     parts.push(`${event.category} call from ${name}`);
   }

package/lib/pgn129808.js

@@ -9,6 +9,8 @@
  * ITU symbol number (1xx) comes through instead — handle both.
  */
 
+const { deviceBeaconFor } = require('./dsc');
+
 // Lookup-name → canonical (lowercased keys); ITU symbols as numeric fallback.
 const FORMATS = new Map([
   ['geographical area', 'area'],
@@ -109,9 +111,16 @@ function normalizePgn129808(pgnData) {
     mmsi: normalizeMmsi(f.dscMessageAddress),
   };
 
+  const beacon = deviceBeaconFor(event.mmsi);
+  if (beacon) event.deviceBeacon = beacon;
+
   if (event.category === 'distress') {
     const nature = f.natureOfDistress ?? f['1stTelecommand'];
     event.natureOfDistress = lookup(NATURES, nature) || 'undesignated';
+    // A distress *relay* arrives under a calling format (all-ships / area /
+    // individual), not the distressAlert format of a first-party alert. The
+    // PGN already carries the casualty's nature + MMSI in dedicated fields.
+    if (event.format !== 'distressAlert') event.relay = true;
   }
 
   const lat = f.latitudeOfVesselReported;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sailingnaturali/signalk-dsc",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "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": {
@@ -29,6 +29,9 @@
   },
   "signalk": {
     "displayName": "DSC",
+    "recommends": [
+      "@meri-imperiumi/signalk-logbook"
+    ],
     "screenshots": [
       "./docs/screenshots/config.png",
       "./docs/screenshots/data-table.png"