@marcel2215/homebridge-supla-plugin 2.1.28 → 2.1.29

package/README.md

@@ -30,3 +30,45 @@ $ npm i homebridge-supla-plugin
 2. Configure the plugin. You can find your MQTT credentials in the [Supla Cloud](https://cloud.supla.org/).
 3. Restart Homebridge
 4. Plugin will automatically discover your devices and add them to HomeKit
+
+### Front-gate safety model
+
+Supla front gates controlled through the non-idempotent `open_close` action need a closed end-stop sensor. If the sensor is on a
+separate channel, the plugin pairs it only when there is one unambiguous candidate. Configure one of these overrides if automatic
+pairing is not possible:
+
+```json
+{
+  "frontGateSensorTopic": "supla/USER/devices/123/channels/456"
+}
+```
+
+Alternatively, use `frontGateSensorDeviceId` and `frontGateSensorChannelId`. A missing or ambiguous sensor keeps the gate unavailable.
+The legacy control-channel sensor fallback is disabled unless `frontGateSensorFallbackToControlChannel` is explicitly enabled.
+
+With only a closed sensor, `false` means “not fully closed”; it does not prove that the gate is fully open or reveal its direction.
+The plugin therefore reports an unproven non-closed position as HomeKit `STOPPED` and rejects ambiguous open and close requests by
+default:
+
+```json
+{
+  "frontGateUnknownOpenPolicy": "reject",
+  "frontGateUnknownClosePolicy": "reject",
+  "frontGateAssumeOpenAfterTravel": false
+}
+```
+
+Optional compatibility policies are:
+
+- `accept_non_closed` for open requests: accepts any non-closed position without sending a pulse.
+- `single_pulse_best_effort` for close requests: sends one pulse but continues reporting `STOPPED` until hard evidence arrives.
+- `seek_closed` for close requests: sends up to `frontGateSeekClosedMaxPulses` pulses, one full travel interval apart, until the closed
+  sensor activates. The search can initially move the gate in the opposite direction and must only be enabled with that behavior
+  understood.
+
+`frontGateAssumeOpenAfterTravel` is also an approximation and is disabled by default. An IR remote cannot be observed by the plugin,
+so external IR use can always invalidate a direction estimate until new sensor evidence arrives.
+
+Front-gate action publications always use MQTT QoS 0 and `retain: false`, independently of the global command settings. Retained
+`execute_action` messages are ignored by the state estimator; any old retained action already stored on the broker should be removed.
+MQTT 5 enables a No Local subscription for safer self-echo handling by setting `mqttProtocolVersion` to `5`, if the broker supports it.

package/config.schema.json

@@ -58,95 +58,82 @@
         "auto"
       ]
     },
-    "gateControlMode": {
-      "title": "Gate Control Mode",
-      "type": "string",
-      "default": "execute_action",
-      "enum": [
-        "execute_action",
-        "toggle"
-      ]
-    },
-    "gateExecuteActionOpen": {
-      "title": "Gate Execute Action Open",
-      "type": "string",
-      "default": "open_close"
-    },
-    "gateExecuteActionClose": {
-      "title": "Gate Execute Action Close",
-      "type": "string",
-      "default": "open_close"
-    },
     "gateExecuteActionToggle": {
-      "title": "Gate Execute Action Toggle",
+      "title": "Front Gate Toggle Action",
       "type": "string",
       "default": "open_close"
     },
-    "gatePartialHiMode": {
-      "title": "Gate Partial Hi Mode",
-      "type": "string",
-      "default": "moving",
-      "enum": [
-        "moving",
-        "open_endstop",
-        "pedestrian_endstop",
-        "ignore"
-      ]
-    },
-    "gateReverseFollowUpDelayMs": {
-      "title": "Gate Reverse Follow-up Delay (ms)",
+    "frontGateFullTravelMs": {
+      "title": "Front Gate Full Travel (ms)",
       "type": "number",
-      "default": 3000
+      "default": 25000,
+      "minimum": 5000,
+      "maximum": 120000
     },
-    "gateOpenAssumeDelayMs": {
-      "title": "Gate Open Assume Delay (ms)",
+    "frontGateReversePauseMs": {
+      "title": "Front Gate Reverse Pause (ms)",
       "type": "number",
-      "default": 22000
+      "default": 3000,
+      "minimum": 3000,
+      "maximum": 15000
     },
-    "gateCommandCooldownMs": {
-      "title": "Gate Command Cooldown (ms)",
+    "frontGateMinimumPulseGapMs": {
+      "title": "Front Gate Minimum Pulse Gap (ms)",
       "type": "number",
-      "default": 700
+      "default": 3000,
+      "minimum": 0,
+      "maximum": 15000
     },
-    "gatePublishRetryDelayMs": {
-      "title": "Gate Publish Retry Delay (ms)",
-      "type": "number",
-      "default": 300
+    "frontGateUnknownOpenPolicy": {
+      "title": "Unknown-State Open Policy",
+      "type": "string",
+      "default": "reject",
+      "enum": [
+        "reject",
+        "accept_non_closed"
+      ]
     },
-    "gateStrictReverseDoublePulse": {
-      "title": "Gate Strict Reverse Double Pulse",
-      "type": "boolean",
-      "default": true
+    "frontGateUnknownClosePolicy": {
+      "title": "Unknown-State Close Policy",
+      "type": "string",
+      "default": "reject",
+      "enum": [
+        "reject",
+        "single_pulse_best_effort",
+        "seek_closed"
+      ]
+    },
+    "frontGateSeekClosedMaxPulses": {
+      "title": "Seek-Closed Maximum Pulses",
+      "type": "number",
+      "default": 3,
+      "minimum": 1,
+      "maximum": 3
     },
-    "gateDebugTimeline": {
-      "title": "Gate Debug Timeline",
+    "frontGateAssumeOpenAfterTravel": {
+      "title": "Assume Fully Open After Travel Time",
       "type": "boolean",
       "default": false
     },
-    "frontGateFullTravelMs": {
-      "title": "Front Gate Full Travel (ms)",
-      "type": "number",
-      "default": 25000
-    },
-    "frontGateReversePauseMs": {
-      "title": "Front Gate Reverse Pause (ms)",
-      "type": "number",
-      "default": 900
+    "frontGateSensorTopic": {
+      "title": "Front Gate Sensor Base Topic",
+      "type": "string",
+      "default": ""
     },
-    "frontGateWrongDirectionRunMs": {
-      "title": "Front Gate Wrong Direction Run (ms)",
-      "type": "number",
-      "default": 700
+    "frontGateSensorDeviceId": {
+      "title": "Front Gate Sensor Device ID",
+      "type": "string",
+      "default": ""
     },
-    "frontGateMinimumPulseGapMs": {
-      "title": "Front Gate Minimum Pulse Gap (ms)",
-      "type": "number",
-      "default": 400
+    "frontGateSensorChannelId": {
+      "title": "Front Gate Sensor Channel ID",
+      "type": "string",
+      "default": ""
     },
-    "frontGateCloseRetryLimit": {
-      "title": "Front Gate Close Retry Limit",
-      "type": "number",
-      "default": 1
+    "frontGateSensorFallbackToControlChannel": {
+      "title": "Use Control Channel as Sensor Fallback",
+      "type": "boolean",
+      "default": false
     },
     "gateLockControlMode": {
       "title": "Gate Lock Control Mode",
@@ -222,6 +209,15 @@
       "type": "number",
       "default": 0
     },
+    "mqttProtocolVersion": {
+      "title": "MQTT Protocol Version",
+      "type": "number",
+      "default": 4,
+      "enum": [
+        4,
+        5
+      ]
+    },
     "commandQos": {
       "title": "Command QoS",
       "type": "number",

package/dist/Accesories/FrontGateFsm.d.ts

@@ -1,9 +1,7 @@
 export type GateTarget = 'open' | 'closed';
 export type MotionDirection = 'opening' | 'closing';
-export type MotionCertainty = 'known' | 'goalOnly';
-export type MotionSource = 'homekit' | 'external' | 'recovery';
-export type IdleNotClosedMode = 'openKnown' | 'openishUnknown';
-export type NextPulseDirection = MotionDirection | 'unknown';
+export type UnknownOpenPolicy = 'reject' | 'accept_non_closed';
+export type UnknownClosePolicy = 'reject' | 'single_pulse_best_effort' | 'seek_closed';
 export declare const enum DoorCurrentState {
     OPEN = 0,
     CLOSED = 1,
@@ -15,30 +13,37 @@ export declare const enum DoorTargetState {
     OPEN = 0,
     CLOSED = 1
 }
-export interface FrontGateTimingConfig {
+export interface FrontGateConfig {
     fullTravelMs: number;
     reversePauseMs: number;
-    wrongDirectionRunMs: number;
     minimumPulseGapMs: number;
-    closeRetryLimit: number;
+    unknownOpenPolicy: UnknownOpenPolicy;
+    unknownClosePolicy: UnknownClosePolicy;
+    seekClosedMaxPulses: number;
+    assumeOpenAfterTravel: boolean;
 }
-export declare const DEFAULT_FRONT_GATE_TIMINGS: FrontGateTimingConfig;
-export interface PersistedFrontGateState {
+export declare const DEFAULT_FRONT_GATE_CONFIG: FrontGateConfig;
+export type FrontGateErrorCode = 'unavailable' | 'not_allowed' | 'resource_busy' | 'communication_failure' | 'operation_timed_out';
+export declare class FrontGateError extends Error {
+    readonly code: FrontGateErrorCode;
+    constructor(code: FrontGateErrorCode, message: string, options?: ErrorOptions);
 }
+export type PositionEstimateKind = 'closed' | 'openingKnown' | 'closingKnown' | 'reversalPause' | 'notClosedUnknown' | 'openAssumed';
+export type FrontGateOperationKind = 'none' | 'scheduledPulse' | 'reversalPause' | 'seekClosed';
 export interface FrontGateSnapshot {
     available: boolean;
+    transportConnected: boolean;
     controlConnected: boolean | null;
     sensorConnected: boolean | null;
     closedSensor: boolean | null;
-    sensorFreshSinceOnline: boolean;
+    observationEpoch: number;
+    sensorSampleEpoch: number | null;
     currentDoorState?: DoorCurrentState;
     targetDoorState?: DoorTargetState;
-    requestedTarget: GateTarget | null;
+    desiredTarget: GateTarget | null;
+    positionEstimate: PositionEstimateKind;
     motionDirection: MotionDirection | 'none';
-    motionCertainty: MotionCertainty | 'none';
-    planKind: Plan['kind'];
-    idleNotClosedMode: IdleNotClosedMode;
-    nextPulseDirection: NextPulseDirection;
+    operationKind: FrontGateOperationKind;
     note: string;
 }
 export interface FrontGateLogger {
@@ -51,81 +56,76 @@ export interface FrontGateIo {
     publishSnapshot(snapshot: FrontGateSnapshot): void;
     log: FrontGateLogger;
 }
-type Plan = {
-    kind: 'idle';
-} | {
-    kind: 'moving';
-    direction: MotionDirection;
-    certainty: MotionCertainty;
-    source: MotionSource;
-    startedAt: number;
-    deadlineAt: number;
-} | {
-    kind: 'waitingSecondPulse';
-    stoppedFrom: MotionDirection;
-    finalDirection: MotionDirection;
-    source: MotionSource;
-    dueAt: number;
-    deadlineAt: number;
-    reason: 'reverseToOpen' | 'reverseToClose';
-};
+export interface FrontGateScheduler {
+    now(): number;
+    schedule(callback: () => void, delayMs: number): () => void;
+}
 export declare class FrontGateFsm {
     private readonly io;
-    private readonly travelMs;
-    private readonly pulseGapMs;
+    private readonly config;
+    private readonly scheduler;
     private facts;
-    private sensorFreshSinceOnline;
-    private requestedTarget;
-    private idleNotClosedMode;
-    private idleNextPulseDirection;
-    private plan;
-    private lastPulseLikeActivityAt;
-    private movementTimer?;
-    private movementTimerToken;
-    private phaseTimer?;
-    private phaseTimerToken;
+    private observationEpoch;
+    private sensorSampleEpoch;
+    private previousSensorInEpoch;
+    private desiredTarget;
+    private position;
+    private positionGeneration;
+    private operation;
+    private nextOperationId;
+    private lastPublishedPulseAt;
+    private cancelMovementTimer?;
+    private cancelOperationTimer?;
     private sequence;
     private disposed;
-    constructor(io: FrontGateIo, timings?: FrontGateTimingConfig, _persisted?: PersistedFrontGateState);
+    constructor(io: FrontGateIo, config?: Partial<FrontGateConfig>, scheduler?: FrontGateScheduler);
     dispose(): void;
-    handleConnectedChange(connected: boolean): void;
+    handleTransportConnectedChange(connected: boolean): void;
     handleControlConnectedChange(connected: boolean): void;
     handleSensorConnectedChange(connected: boolean): void;
     handleClosedSensorChange(closed: boolean): void;
     handleObservedExternalPulse(reason?: string): void;
     requestHomeKitTarget(target: GateTarget): Promise<void>;
     getSnapshot(): FrontGateSnapshot;
+    whenIdle(): Promise<void>;
     private enqueue;
+    private applyTransportConnectedChange;
     private applyControlConnectedChange;
     private applySensorConnectedChange;
     private applyClosedSensorChange;
     private applyHomeKitTarget;
-    private handleOpenRequest;
-    private handleCloseRequest;
-    private startOpeningFromClosed;
-    private startOpeningFromStoppedState;
-    private startKnownCloseFromIdle;
-    private startAmbiguousCloseAttempt;
-    private reverseKnownMotion;
-    private startOpeningMotion;
-    private startClosingMotion;
-    private scheduleMovementTimer;
-    private schedulePhaseTimer;
-    private clearMovementTimer;
-    private clearPhaseTimer;
-    private clearTimers;
-    private handlePhaseTimer;
-    private handleMovementTimeout;
+    private acceptOpenRequest;
+    private acceptCloseRequest;
+    private acceptUnknownCloseRequest;
+    private acceptPulse;
+    private executeScheduledPulse;
+    private applySuccessfulPulse;
+    private startReversalPause;
+    private startSeekClosedWait;
+    private scheduleOperationTimer;
+    private handleOperationTimer;
+    private executeReversalPulse;
+    private advanceSeekClosed;
+    private validateScheduledPulse;
+    private validateOperationContext;
+    private hasCurrentOperation;
+    private cancelConflictingOperation;
+    private cancelInvalidOperation;
     private applyObservedExternalPulse;
-    private enterUnavailable;
+    private advanceObservationEpoch;
+    private setKnownMovement;
+    private setPosition;
+    private handleMovementTimeout;
+    private setOperation;
+    private clearOperation;
+    private clearMovementTimer;
+    private clearOperationTimer;
     private isAvailableForHomeKit;
-    private pulseMotor;
     private emitSnapshot;
     private buildSnapshot;
     private getMotionDirection;
-    private getMotionCertainty;
     private computeCurrentDoorState;
     private computeTargetDoorState;
+    private errorMessage;
 }
-export {};
 //# sourceMappingURL=FrontGateFsm.d.ts.map

package/dist/Accesories/FrontGateFsm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FrontGateFsm.d.ts","sourceRoot":"","sources":["../../src/Accesories/FrontGateFsm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FrontGateFsm.d.ts","sourceRoot":"","sources":["../../src/Accesories/FrontGateFsm.ts"],"names":[],"mappings":"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"}