@aurora-blue/signalk-connector 0.2.0-dev.28 → 0.2.0-dev.30

package/VERSION

@@ -1 +1 @@
-0.2.0-dev.28
+0.2.0-dev.30

package/dist/src/connector.d.ts

@@ -45,7 +45,11 @@ export declare class ConnectorRuntime {
     private readonly emissionTimes;
     private publisher;
     private captureTail;
-    private pendingCaptureEvents;
+    private captureResult;
+    private captureRunning;
+    private readonly pendingCaptures;
+    private captureInFlight;
+    private captureTransition;
     private nextCaptureStatusAt;
     constructor(app: ServerAPI, store: StateStore, config: ConnectorConfig, options?: ConnectorRuntimeOptions);
     start(): Promise<void>;
@@ -59,7 +63,8 @@ export declare class ConnectorRuntime {
         source: string | null;
     } | null;
     stop(): Promise<void>;
-    capture(delta: Delta, subscriptionScope?: SubscriptionScope): Promise<void>;
+    capture(delta: Delta, subscriptionScope?: SubscriptionScope, waitForPersistence?: boolean): Promise<void>;
+    private drainCaptures;
     private captureEvents;
     status(): Promise<ConnectorStatus>;
     flush(): Promise<void>;

package/dist/src/connector.js

@@ -57,7 +57,11 @@ class ConnectorRuntime {
     emissionTimes = [];
     publisher = null;
     captureTail = Promise.resolve();
-    pendingCaptureEvents = 0;
+    captureResult = Promise.resolve();
+    captureRunning = false;
+    pendingCaptures = new Map();
+    captureInFlight = 0;
+    captureTransition = 0;
     nextCaptureStatusAt = 0;
     constructor(app, store, config, options = {}) {
         this.app = app;
@@ -204,7 +208,7 @@ class ConnectorRuntime {
         await this.captureTail;
         await this.store.summary();
     }
-    async capture(delta, subscriptionScope = "self") {
+    async capture(delta, subscriptionScope = "self", waitForPersistence = true) {
         if (this.stopped) {
             return;
         }
@@ -229,19 +233,66 @@ class ConnectorRuntime {
             events.length === 0) {
             return;
         }
-        const admitted = events.slice(0, MAXIMUM_PENDING_CAPTURE_EVENTS - this.pendingCaptureEvents);
-        this.droppedEvents += events.length - admitted.length;
-        if (admitted.length === 0) {
+        let admitted = false;
+        for (const event of events) {
+            const kind = (0, telemetry_catalog_1.telemetryDefinition)(event.context, event.path)?.valueKind;
+            // Keep transitions in order. Only unpersisted sampled values may be replaced.
+            const sampled = kind === "number" || kind === "position" || kind === "json";
+            const key = sampled
+                ? `${event.context}\0${event.path}\0${event.source ?? ""}`
+                : this.captureTransition++;
+            if (this.pendingCaptures.has(key)) {
+                // Map.set preserves the original FIFO position, preventing hot-path starvation.
+                this.pendingCaptures.set(key, event);
+                admitted = true;
+                this.suppressedEvents += 1;
+            }
+            else if (this.pendingCaptures.size + this.captureInFlight <
+                MAXIMUM_PENDING_CAPTURE_EVENTS) {
+                this.pendingCaptures.set(key, event);
+                admitted = true;
+            }
+            else {
+                this.droppedEvents += 1;
+            }
+        }
+        if (!admitted)
             return;
+        if (!this.captureRunning && this.pendingCaptures.size > 0) {
+            this.captureRunning = true;
+            const current = Promise.resolve().then(() => this.drainCaptures());
+            this.captureTail = current.catch((error) => {
+                this.app.setPluginError("Signal K data could not be buffered safely.");
+                this.app.error(error instanceof Error ? error.message : String(error));
+            });
+            // All admitted callbacks observe write failures; the tail remains safe for stop().
+            this.captureResult = current;
         }
-        this.pendingCaptureEvents += admitted.length;
-        const current = this.captureTail.then(() => this.captureEvents(admitted));
-        this.captureTail = current.catch(() => undefined);
+        // Subscription callbacks must not retain a waiter for a continuously busy drain.
+        if (waitForPersistence)
+            await this.captureResult;
+    }
+    async drainCaptures() {
         try {
-            await current;
+            while (this.pendingCaptures.size > 0) {
+                const [key, event] = this.pendingCaptures.entries().next().value;
+                this.pendingCaptures.delete(key);
+                this.captureInFlight = 1;
+                try {
+                    await this.captureEvents([event]);
+                }
+                finally {
+                    this.captureInFlight = 0;
+                }
+            }
+        }
+        catch (error) {
+            this.droppedEvents += this.pendingCaptures.size;
+            this.pendingCaptures.clear();
+            throw error;
         }
         finally {
-            this.pendingCaptureEvents -= admitted.length;
+            this.captureRunning = false;
         }
     }
     async captureEvents(events) {
@@ -412,7 +463,7 @@ class ConnectorRuntime {
             this.app.setPluginError("Signal K subscription failed.");
             this.app.error(error instanceof Error ? error.message : String(error));
         }, (delta) => {
-            void this.capture(delta, context === "vessels.self" ? "self" : "ais").catch((error) => {
+            void this.capture(delta, context === "vessels.self" ? "self" : "ais", false).catch((error) => {
                 this.app.setPluginError("Signal K data could not be buffered safely.");
                 this.app.error(error instanceof Error ? error.message : String(error));
             });

package/dist/src/telemetry-catalog.js

@@ -55,6 +55,42 @@ exports.SELF_TELEMETRY = [
     self("environment.outside.temperature", "number", "scalar", 30_000, 60_000, 0.5),
     self("environment.outside.pressure", "number", "scalar", 30_000, 60_000, 50),
     self("environment.outside.relativeHumidity", "number", "scalar", 30_000, 60_000, 0.02),
+    self("electrical.batteries.*.power", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.batteries.*.capacity.remaining", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.batteries.*.capacity.nominal", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.solar.*.voltage", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.solar.*.current", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.solar.*.power", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.chargers.*.voltage", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.chargers.*.current", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.chargers.*.power", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.alternators.*.voltage", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.alternators.*.current", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.alternators.*.power", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.solar.*.panelPower", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.solar.*.yieldToday", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.inverters.*.dc.voltage", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.inverters.*.dc.current", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.inverters.*.dc.power", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.inverters.*.ac.realPower", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.inverters.*.ac.lineNeutralVoltage", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.inverters.*.ac.frequency", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.ac.*.phase.*.realPower", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.ac.*.phase.*.lineNeutralVoltage", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.ac.*.phase.*.current", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.ac.*.phase.*.frequency", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.dc.*.power", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.dc.*.voltage", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.dc.*.current", "number", "scalar", 5_000, 60_000, 1),
+    self("electrical.batteries.*.name", "string", "identity", 30_000, 600_000, 0),
+    self("electrical.solar.*.name", "string", "identity", 30_000, 600_000, 0),
+    self("electrical.chargers.*.name", "string", "identity", 30_000, 600_000, 0),
+    self("electrical.alternators.*.name", "string", "identity", 30_000, 600_000, 0),
+    self("electrical.inverters.*.name", "string", "identity", 30_000, 600_000, 0),
+    self("electrical.ac.*.name", "string", "identity", 30_000, 600_000, 0),
+    self("electrical.dc.*.name", "string", "identity", 30_000, 600_000, 0),
+    self("electrical.inverters.*.inverterMode", "string", "identity", 30_000, 60_000, 0),
+    self("electrical.chargers.*.chargingMode", "string", "identity", 30_000, 60_000, 0),
     self("electrical.batteries.*.voltage", "number", "scalar", 10_000, 300_000, 0.1),
     self("electrical.batteries.*.current", "number", "scalar", 5_000, 120_000, 1),
     self("electrical.batteries.*.temperature", "number", "scalar", 30_000, 600_000, 0.5),

package/dist/src/version.d.ts

@@ -1 +1 @@
-export declare const CONNECTOR_VERSION = "0.2.0-dev.28";
+export declare const CONNECTOR_VERSION = "0.2.0-dev.30";

package/dist/src/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONNECTOR_VERSION = void 0;
-exports.CONNECTOR_VERSION = "0.2.0-dev.28";
+exports.CONNECTOR_VERSION = "0.2.0-dev.30";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aurora-blue/signalk-connector",
-  "version": "0.2.0-dev.28",
+  "version": "0.2.0-dev.30",
   "description": "Signal K edge connector for the Aurora Blue ABOARD ingest protocol",
   "private": false,
   "main": "dist/src/index.js",
@@ -48,9 +48,9 @@
     "release:verify": "node tools/release.mjs verify"
   },
   "devDependencies": {
-    "@signalk/server-api": "2.31.1",
-    "@types/node": "22.20.1",
-    "prettier": "3.9.6",
+    "@signalk/server-api": "2.35.0",
+    "@types/node": "24.19.2",
+    "prettier": "3.9.10",
     "typescript": "7.0.2"
   },
   "license": "MIT",