@mp-consulting/homebridge-unifi-access 1.0.4 → 1.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/access-options.js +1 -1
- package/dist/access-options.js.map +1 -1
- package/dist/hub/access-hub-api.d.ts +2 -1
- package/dist/hub/access-hub-api.js +9 -2
- package/dist/hub/access-hub-api.js.map +1 -1
- package/dist/hub/access-hub-events.js +2 -2
- package/dist/hub/access-hub-events.js.map +1 -1
- package/dist/hub/access-hub-services.js +97 -31
- package/dist/hub/access-hub-services.js.map +1 -1
- package/dist/hub/access-hub.d.ts +3 -1
- package/dist/hub/access-hub.js +33 -6
- package/dist/hub/access-hub.js.map +1 -1
- package/dist/settings.d.ts +1 -1
- package/dist/settings.js +2 -2
- package/dist/settings.js.map +1 -1
- package/package.json +1 -1
package/dist/access-options.js
CHANGED
|
@@ -39,7 +39,7 @@ export const featureOptions = {
|
|
|
39
39
|
"Hub": [
|
|
40
40
|
{ default: false, description: "Use a lock accessory instead of a garage door opener accessory for the gate.", modelKey: modelsDefaultGarageDoor, name: "Door.UseLock" },
|
|
41
41
|
{ default: false, description: "Use a garage door opener accessory instead of a lock accessory. This is a visual preference only within HomeKit; the underlying lock behavior and feature options remain the same.", modelKey: modelsDefaultLock, name: "Door.UseGarageOpener" },
|
|
42
|
-
{ default: false, defaultValue: ACCESS_GATE_DIRECTION_DURATION, description: "Duration, in seconds, of the gate
|
|
42
|
+
{ default: false, defaultValue: ACCESS_GATE_DIRECTION_DURATION, description: "Duration, in seconds, of the full gate cycle (open, hold, and close). This time is split into three equal phases — Opening, Open, and Closing — to show the gate status in HomeKit. The door position sensor confirms the final Closed state. Adjust this to match your gate's actual cycle time.", modelKey: modelsDefaultGarageDoor, name: "GateDirectionDuration" },
|
|
43
43
|
{ default: false, defaultValue: ACCESS_DEVICE_UNLOCK_INTERVAL, description: "Delay, in minutes, before locking the door lock relay once it's been unlocked by HomeKit. If set to 0, it will remain unlocked indefinitely. This applies regardless of whether you use a lock or garage door opener accessory. By default, the door lock relay will lock five seconds after unlocking.", name: "LockDelayInterval" },
|
|
44
44
|
{ default: false, description: "Add a switch accessory to control the door lock relay. This can be useful in automation scenarios where you want to work around HomeKit's security restrictions and trigger events when a lock or unlock event occurs. This works with both lock and garage door opener accessories.", name: "Lock.Trigger" },
|
|
45
45
|
{ default: true, description: "Add a doorbell accessory to handle doorbell ring events in HomeKit.", hasCapability: ["door_bell"], name: "Doorbell" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-options.js","sourceRoot":"","sources":["../src/access-options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"access-options.js","sourceRoot":"","sources":["../src/access-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AccessHub } from "./access-hub.js";
|
|
2
2
|
export declare function hubDoorLockCommand(hub: AccessHub, isLocking: boolean, isSideDoor?: boolean): Promise<boolean>;
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function discoverDoorNames(hub: AccessHub): void;
|
|
4
|
+
export declare function initializeDoorsFromApi(hub: AccessHub): void;
|
|
4
5
|
export declare function initializeDoorsFromBootstrap(hub: AccessHub, doors: {
|
|
5
6
|
unique_id: string;
|
|
6
7
|
name: string;
|
|
@@ -67,8 +67,8 @@ export async function hubDoorLockCommand(hub, isLocking, isSideDoor = false) {
|
|
|
67
67
|
}
|
|
68
68
|
return true;
|
|
69
69
|
}
|
|
70
|
-
// Discover main and side door location IDs for UA Gate hubs.
|
|
71
|
-
export function
|
|
70
|
+
// Discover main and side door location IDs and names for UA Gate hubs. Has no service dependency and can run early in the boot sequence.
|
|
71
|
+
export function discoverDoorNames(hub) {
|
|
72
72
|
const doors = hub.controller.udaApi.doors ?? [];
|
|
73
73
|
if (doors.length === 0) {
|
|
74
74
|
hub.log.warn("No doors found in Access API. Door event handling may not work correctly.");
|
|
@@ -111,6 +111,13 @@ export function discoverDoorIds(hub) {
|
|
|
111
111
|
// Store the side door name for HomeKit service naming.
|
|
112
112
|
hub.sideDoorName = doors.find(d => d.unique_id === hub.sideDoorLocationId)?.name;
|
|
113
113
|
}
|
|
114
|
+
}
|
|
115
|
+
// Initialize door states from the API bootstrap data and propagate names to HomeKit services. Must be called after services are configured.
|
|
116
|
+
export function initializeDoorsFromApi(hub) {
|
|
117
|
+
const doors = hub.controller.udaApi.doors ?? [];
|
|
118
|
+
if (doors.length === 0) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
114
121
|
// Initialize door states from the already-loaded doors data.
|
|
115
122
|
initializeDoorsFromBootstrap(hub, doors);
|
|
116
123
|
// Propagate discovered door names to HomeKit services.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-hub-api.js","sourceRoot":"","sources":["../../src/hub/access-hub-api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"access-hub-api.js","sourceRoot":"","sources":["../../src/hub/access-hub-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,8 +89,8 @@ function handleDeviceUpdate(hub, packet) {
|
|
|
89
89
|
hub.hkSideDoorLockState = newHubState;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
|
-
// Process a side door DPS update event if our state has changed (UA Gate only).
|
|
93
|
-
if (hub.hints.hasSideDoor && hub.hints.hasWiringDps) {
|
|
92
|
+
// Process a side door DPS update event if our state has changed (UA Gate only).
|
|
93
|
+
if (hub.hints.hasSideDoor && hub.hints.hasWiringDps && !hub.catalog.skipsV1LockEvents) {
|
|
94
94
|
const newSideDoorDpsState = hubDpsState(hub, true);
|
|
95
95
|
if (newSideDoorDpsState !== hub._hkSideDoorDpsState) {
|
|
96
96
|
hub._hkSideDoorDpsState = newSideDoorDpsState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-hub-events.js","sourceRoot":"","sources":["../../src/hub/access-hub-events.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EACL,kBAAkB,EACD,aAAa,EAAE,cAAc,EAC/C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE/F,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC/F,OAAO,EACL,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EACnG,MAAM,uBAAuB,CAAC;AAE/B,+HAA+H;AAC/H,MAAM,UAAU,qBAAqB,CAAC,GAAc;IAElD,MAAM,YAAY,GAAG,CAAC,MAAyB,EAAQ,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAEpF,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC,CAAC;IAC7F,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,YAAY,CAAC,CAAC;IACrH,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,EAAE,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,eAAe,CAAC,GAAG,YAAY,CAAC,CAAC;IAEzH,yEAAyE;IACzE,IAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAE/B,IAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC;YAE1B,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,YAAY,CAAC,CAAC;QACzG,CAAC;QAED,IAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC;YAE1B,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,YAAY,CAAC,CAAC;QACzG,CAAC;IACH,CAAC;AACH,CAAC;AAED,8BAA8B;AAC9B,SAAS,YAAY,CAAC,GAAc,EAAE,MAAyB;IAE7D,QAAO,MAAM,CAAC,KAAK,EAAE,CAAC;QAEpB,KAAK,eAAe,CAAC,oBAAoB;YAEvC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAEhC,MAAM;QAER,KAAK,eAAe,CAAC,aAAa;YAEhC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAEhC,MAAM;QAER,KAAK,eAAe,CAAC,gBAAgB;YAEnC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAElC,MAAM;QAER,KAAK,eAAe,CAAC,eAAe;YAElC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAElC,MAAM;QAER,KAAK,eAAe,CAAC,aAAa;YAEhC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAEhC,MAAM;QAER,KAAK,eAAe,CAAC,eAAe;YAElC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAElC,MAAM;QAER;YAEE,MAAM;IACV,CAAC;AACH,CAAC;AAED,+BAA+B;AAC/B,SAAS,kBAAkB,CAAC,GAAc,EAAE,MAAyB;IAEnE,oFAAoF;IACpF,IAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAE/B,MAAM,WAAW,GAAG,MAAM,CAAC,eAAe,CAAC;QAC3C,MAAM,UAAU,GAAG,GAAG,CAAC,kBAAkB,IAAI,CAAC,WAAW,KAAK,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACtF,MAAM,UAAU,GAAG,GAAG,CAAC,kBAAkB,IAAI,CAAC,WAAW,KAAK,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAEtF,IAAG,CAAC,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;YAE9B,OAAO;QACT,CAAC;QAED,iFAAiF;QACjF,IAAG,UAAU,EAAE,CAAC;YAEd,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC;QAC9E,CAAC;aAAM,CAAC;YAEN,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC;QACtE,CAAC;QAED,yBAAyB;QACzB,UAAU,CAAC,GAAG,EAAE;YAEd,IAAG,UAAU,EAAE,CAAC;gBAEd,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC5E,CAAC;iBAAM,CAAC;gBAEN,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;YACpE,CAAC;QACH,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAEzB,CAAC;SAAM,CAAC;QAEN,sCAAsC;QACtC,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC;IACtE,CAAC;AACH,CAAC;AAED,wCAAwC;AACxC,SAAS,kBAAkB,CAAC,GAAc,EAAE,MAAyB;IAEnE,8GAA8G;IAC9G,IAAG,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QAE9E,GAAG,CAAC,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,iFAAiF;IACjF,IAAG,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAE3D,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAE5C,IAAG,WAAW,KAAK,GAAG,CAAC,oBAAoB,EAAE,CAAC;YAE5C,GAAG,CAAC,mBAAmB,GAAG,WAAW,CAAC;QACxC,CAAC;IACH,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"access-hub-events.js","sourceRoot":"","sources":["../../src/hub/access-hub-events.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,35 @@ import { GATE_TRANSITION_COOLDOWN_MS, accessMethods, getConfigValue, terminalInp
|
|
|
4
4
|
import { HK_CHARACTERISTIC_REVERT_DELAY_MS } from "../settings.js";
|
|
5
5
|
import { hubDoorLockCommand } from "./access-hub-api.js";
|
|
6
6
|
import { doorServiceType, hasCapability, hubInputState, hubLockState, isClosed, isLocked, isWired } from "./access-hub-utils.js";
|
|
7
|
+
// Start a 3-phase gate cycle: Opening → Open → Closing. The full gateDirectionDuration is split into equal thirds. DPS "close" confirms the final Closed state.
|
|
8
|
+
function startGateCycle(hub) {
|
|
9
|
+
hub.clearGatePhaseTimers();
|
|
10
|
+
const phaseDuration = hub.gateDirectionDuration / 3;
|
|
11
|
+
hub.gateDirection = "opening";
|
|
12
|
+
hub.gateDirectionUntil = Date.now() + hub.gateDirectionDuration;
|
|
13
|
+
hub.log.debug("Gate cycle started: Opening → Open (%.0fs) → Closing (%.0fs) → DPS confirms Closed (%.0fs total).", phaseDuration / 1000, (phaseDuration * 2) / 1000, hub.gateDirectionDuration / 1000);
|
|
14
|
+
const gdoService = hub.accessory.getService(hub.hap.Service.GarageDoorOpener);
|
|
15
|
+
// Push initial Opening state.
|
|
16
|
+
if (gdoService) {
|
|
17
|
+
gdoService.updateCharacteristic(hub.hap.Characteristic.TargetDoorState, hub.hap.Characteristic.TargetDoorState.OPEN);
|
|
18
|
+
gdoService.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, hub.hap.Characteristic.CurrentDoorState.OPENING);
|
|
19
|
+
}
|
|
20
|
+
// Phase 2: transition to Open after 1/3 of the duration.
|
|
21
|
+
hub.gatePhaseTimers.push(setTimeout(() => {
|
|
22
|
+
hub.gateDirection = "open";
|
|
23
|
+
hub.log.debug("Gate cycle phase: Open.");
|
|
24
|
+
gdoService?.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, hub.hap.Characteristic.CurrentDoorState.OPEN);
|
|
25
|
+
}, phaseDuration));
|
|
26
|
+
// Phase 3: transition to Closing after 2/3 of the duration.
|
|
27
|
+
hub.gatePhaseTimers.push(setTimeout(() => {
|
|
28
|
+
hub.gateDirection = "closing";
|
|
29
|
+
hub.log.debug("Gate cycle phase: Closing.");
|
|
30
|
+
if (gdoService) {
|
|
31
|
+
gdoService.updateCharacteristic(hub.hap.Characteristic.TargetDoorState, hub.hap.Characteristic.TargetDoorState.CLOSED);
|
|
32
|
+
gdoService.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, hub.hap.Characteristic.CurrentDoorState.CLOSING);
|
|
33
|
+
}
|
|
34
|
+
}, phaseDuration * 2));
|
|
35
|
+
}
|
|
7
36
|
// Configure all HomeKit services on the hub. Called once at device setup.
|
|
8
37
|
export function configureServices(hub) {
|
|
9
38
|
// Configure access method switches, if we're a reader device.
|
|
@@ -31,16 +60,23 @@ export function registerServiceReactions(hub) {
|
|
|
31
60
|
if (serviceType === "GarageDoorOpener") {
|
|
32
61
|
// For UA Gate, lock trigger only (GarageDoorOpener state is driven by DPS events, not lock events).
|
|
33
62
|
if (hub.catalog.usesLocationApi) {
|
|
34
|
-
// Track gate direction for external triggers (NFC, remote, physical button)
|
|
35
|
-
// (e.g. from a HomeKit command).
|
|
63
|
+
// Track gate direction for external triggers (NFC, remote, physical button). Start a 3-phase cycle for opening, or set closing direction directly.
|
|
64
|
+
// Skip if a cycle is already active (e.g. from a HomeKit command).
|
|
36
65
|
if (!data.isSideDoor && !isLocked(hub, data.value) && (Date.now() >= hub.gateDirectionUntil)) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
66
|
+
if (isClosed(hub, hub._hkDpsState)) {
|
|
67
|
+
// Gate is closed, starting to open → start 3-phase cycle (Opening → Open → Closing).
|
|
68
|
+
startGateCycle(hub);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
// Gate is open, starting to close.
|
|
72
|
+
hub.clearGatePhaseTimers();
|
|
73
|
+
hub.gateDirection = "closing";
|
|
74
|
+
hub.gateDirectionUntil = Date.now() + (hub.gateDirectionDuration / 3);
|
|
75
|
+
const gdoService = hub.accessory.getService(hub.hap.Service.GarageDoorOpener);
|
|
76
|
+
if (gdoService) {
|
|
77
|
+
gdoService.updateCharacteristic(hub.hap.Characteristic.TargetDoorState, hub.hap.Characteristic.TargetDoorState.CLOSED);
|
|
78
|
+
gdoService.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, hub.hap.Characteristic.CurrentDoorState.CLOSING);
|
|
79
|
+
}
|
|
44
80
|
}
|
|
45
81
|
}
|
|
46
82
|
hub.accessory.getServiceById(hub.hap.Service.Switch, triggerSubtype)?.updateCharacteristic(hub.hap.Characteristic.On, !isLocked(hub, data.value));
|
|
@@ -70,10 +106,10 @@ export function registerServiceReactions(hub) {
|
|
|
70
106
|
// Log lock state changes.
|
|
71
107
|
if (hub.hints.logLock) {
|
|
72
108
|
if (data.isSideDoor) {
|
|
73
|
-
hub.log.info("
|
|
109
|
+
hub.log.info("%s %s.", hub.sideDoorName ?? "Side door", isLocked(hub, data.value) ? "locked" : "unlocked");
|
|
74
110
|
}
|
|
75
111
|
else if (hub.catalog.usesLocationApi) {
|
|
76
|
-
hub.log.info("
|
|
112
|
+
hub.log.info("%s %s.", hub.mainDoorName ?? "Gate", isLocked(hub, data.value) ? "locked" : "unlocked");
|
|
77
113
|
}
|
|
78
114
|
else {
|
|
79
115
|
hub.log.info(isLocked(hub, data.value) ? "Locked." : "Unlocked.");
|
|
@@ -84,7 +120,7 @@ export function registerServiceReactions(hub) {
|
|
|
84
120
|
hub.hubEvents.on("dps:changed", (data) => {
|
|
85
121
|
// Log DPS state changes.
|
|
86
122
|
if (hub.hints.logDps) {
|
|
87
|
-
hub.log.info("%s position sensor %s.", data.isSideDoor ? "Side door" : "Door", isClosed(hub, data.value) ? "closed" : "open");
|
|
123
|
+
hub.log.info("%s position sensor %s.", data.isSideDoor ? (hub.sideDoorName ?? "Side door") : (hub.mainDoorName ?? "Door"), isClosed(hub, data.value) ? "closed" : "open");
|
|
88
124
|
}
|
|
89
125
|
// Side door DPS: update the side door contact sensor and return — the GarageDoorOpener only reflects main door state.
|
|
90
126
|
if (data.isSideDoor) {
|
|
@@ -95,19 +131,36 @@ export function registerServiceReactions(hub) {
|
|
|
95
131
|
if (doorServiceType(hub) !== "GarageDoorOpener" || !hub.catalog.usesLocationApi) {
|
|
96
132
|
return;
|
|
97
133
|
}
|
|
98
|
-
//
|
|
99
|
-
if (
|
|
134
|
+
// During the opening and open phases, the timer drives GDO state — don't update from DPS events.
|
|
135
|
+
if (hub.gateDirection === "opening" || hub.gateDirection === "open") {
|
|
136
|
+
hub.log.debug("Gate DPS event ignored during %s phase.", hub.gateDirection);
|
|
100
137
|
return;
|
|
101
138
|
}
|
|
102
139
|
const service = hub.accessory.getService(hub.hap.Service.GarageDoorOpener);
|
|
103
|
-
if (service) {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
140
|
+
if (!service) {
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
// During the closing phase, only DPS "close" finalizes to Closed.
|
|
144
|
+
if (hub.gateDirection === "closing") {
|
|
145
|
+
if (data.value === hub.hap.Characteristic.ContactSensorState.CONTACT_DETECTED) {
|
|
146
|
+
hub.log.debug("Gate DPS confirmed Closed — cycle complete, cooldown active.");
|
|
147
|
+
hub.clearGatePhaseTimers();
|
|
148
|
+
// Keep "closing" direction active as a cooldown to suppress DPS bounce after the gate settles. The bounce filter will suppress any DPS "open" events until
|
|
149
|
+
// the cooldown expires. Use one phase duration (1/3 of the full cycle) to cover the settling period.
|
|
150
|
+
hub.gateDirectionUntil = Date.now() + (hub.gateDirectionDuration / 3);
|
|
151
|
+
service.updateCharacteristic(hub.hap.Characteristic.TargetDoorState, hub.hap.Characteristic.TargetDoorState.CLOSED);
|
|
152
|
+
service.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, hub.hap.Characteristic.CurrentDoorState.CLOSED);
|
|
153
|
+
}
|
|
154
|
+
return;
|
|
110
155
|
}
|
|
156
|
+
// No active gate cycle — update GDO state directly from DPS.
|
|
157
|
+
hub.log.debug("Gate DPS update (no active cycle): %s.", isClosed(hub, data.value) ? "Closed" : "Open");
|
|
158
|
+
const doorState = data.value === hub.hap.Characteristic.ContactSensorState.CONTACT_DETECTED ?
|
|
159
|
+
hub.hap.Characteristic.CurrentDoorState.CLOSED : hub.hap.Characteristic.CurrentDoorState.OPEN;
|
|
160
|
+
const targetState = data.value === hub.hap.Characteristic.ContactSensorState.CONTACT_DETECTED ?
|
|
161
|
+
hub.hap.Characteristic.TargetDoorState.CLOSED : hub.hap.Characteristic.TargetDoorState.OPEN;
|
|
162
|
+
service.updateCharacteristic(hub.hap.Characteristic.TargetDoorState, targetState);
|
|
163
|
+
service.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, doorState);
|
|
111
164
|
});
|
|
112
165
|
// React to doorbell ring events by updating the doorbell trigger switch.
|
|
113
166
|
hub.hubEvents.on("doorbell:ring", () => {
|
|
@@ -346,10 +399,15 @@ function configureGarageDoorService(hub, service, isSideDoor) {
|
|
|
346
399
|
// Determine the current door state.
|
|
347
400
|
const getDoorState = () => {
|
|
348
401
|
if (isUaGate) {
|
|
349
|
-
// Return
|
|
402
|
+
// Return the current gate cycle phase state.
|
|
350
403
|
if (!isSideDoor && hub.gateDirection && (Date.now() < hub.gateDirectionUntil)) {
|
|
351
|
-
|
|
352
|
-
hub.hap.Characteristic.CurrentDoorState.
|
|
404
|
+
if (hub.gateDirection === "opening") {
|
|
405
|
+
return hub.hap.Characteristic.CurrentDoorState.OPENING;
|
|
406
|
+
}
|
|
407
|
+
if (hub.gateDirection === "open") {
|
|
408
|
+
return hub.hap.Characteristic.CurrentDoorState.OPEN;
|
|
409
|
+
}
|
|
410
|
+
return hub.hap.Characteristic.CurrentDoorState.CLOSING;
|
|
353
411
|
}
|
|
354
412
|
const dpsState = isSideDoor ? hub._hkSideDoorDpsState : hub.hkDpsState;
|
|
355
413
|
return dpsState === hub.hap.Characteristic.ContactSensorState.CONTACT_DETECTED ? hub.hap.Characteristic.CurrentDoorState.CLOSED :
|
|
@@ -367,16 +425,23 @@ function configureGarageDoorService(hub, service, isSideDoor) {
|
|
|
367
425
|
// Set a transition cooldown to prevent WebSocket events from immediately reverting the door state.
|
|
368
426
|
if (isSideDoor) {
|
|
369
427
|
hub.sideDoorGateTransitionUntil = Date.now() + GATE_TRANSITION_COOLDOWN_MS;
|
|
428
|
+
// Immediately show transitional state for side door.
|
|
429
|
+
service.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, shouldClose ? hub.hap.Characteristic.CurrentDoorState.CLOSING :
|
|
430
|
+
hub.hap.Characteristic.CurrentDoorState.OPENING);
|
|
370
431
|
}
|
|
371
432
|
else {
|
|
372
433
|
hub.gateTransitionUntil = Date.now() + GATE_TRANSITION_COOLDOWN_MS;
|
|
373
|
-
//
|
|
374
|
-
|
|
375
|
-
|
|
434
|
+
// Start the 3-phase gate cycle (Opening → Open → Closing) for opening, or set closing direction directly.
|
|
435
|
+
if (shouldClose) {
|
|
436
|
+
hub.clearGatePhaseTimers();
|
|
437
|
+
hub.gateDirection = "closing";
|
|
438
|
+
hub.gateDirectionUntil = Date.now() + (hub.gateDirectionDuration / 3);
|
|
439
|
+
service.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, hub.hap.Characteristic.CurrentDoorState.CLOSING);
|
|
440
|
+
}
|
|
441
|
+
else {
|
|
442
|
+
startGateCycle(hub);
|
|
443
|
+
}
|
|
376
444
|
}
|
|
377
|
-
// Immediately show transitional state (Opening/Closing) while the door moves.
|
|
378
|
-
service.updateCharacteristic(hub.hap.Characteristic.CurrentDoorState, shouldClose ? hub.hap.Characteristic.CurrentDoorState.CLOSING :
|
|
379
|
-
hub.hap.Characteristic.CurrentDoorState.OPENING);
|
|
380
445
|
// Trigger the gate.
|
|
381
446
|
if (!(await hubDoorLockCommand(hub, false, isSideDoor))) {
|
|
382
447
|
// Clear the transition cooldown and direction on failure.
|
|
@@ -385,6 +450,7 @@ function configureGarageDoorService(hub, service, isSideDoor) {
|
|
|
385
450
|
}
|
|
386
451
|
else {
|
|
387
452
|
hub.gateTransitionUntil = 0;
|
|
453
|
+
hub.clearGatePhaseTimers();
|
|
388
454
|
hub.gateDirection = null;
|
|
389
455
|
hub.gateDirectionUntil = 0;
|
|
390
456
|
}
|
|
@@ -450,7 +516,7 @@ function configureSideDoorLock(hub) {
|
|
|
450
516
|
return false;
|
|
451
517
|
}
|
|
452
518
|
// Acquire the service.
|
|
453
|
-
const service = acquireService(hub.accessory, hub.hap.Service.LockMechanism, hub.accessoryName + " Side Door", AccessReservedNames.LOCK_DOOR_SIDE, () => hub.log.info("Configuring
|
|
519
|
+
const service = acquireService(hub.accessory, hub.hap.Service.LockMechanism, hub.accessoryName + " Side Door", AccessReservedNames.LOCK_DOOR_SIDE, () => hub.log.info("Configuring %s lock.", hub.sideDoorName ?? "side door"));
|
|
454
520
|
if (!service) {
|
|
455
521
|
hub.log.error("Unable to add the side door.");
|
|
456
522
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-hub-services.js","sourceRoot":"","sources":["../../src/hub/access-hub-services.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"access-hub-services.js","sourceRoot":"","sources":["../../src/hub/access-hub-services.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,2BAA2B,EAAE,aAAa,EAAE,cAAc,EAA2C,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5J,OAAO,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEjI,gKAAgK;AAChK,SAAS,cAAc,CAAC,GAAc;IAEpC,GAAG,CAAC,oBAAoB,EAAE,CAAC;IAE3B,MAAM,aAAa,GAAG,GAAG,CAAC,qBAAqB,GAAG,CAAC,CAAC;IAEpD,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC;IAC9B,GAAG,CAAC,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,qBAAqB,CAAC;IAEhE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,mGAAmG,EAC/G,aAAa,GAAG,IAAI,EAAE,CAAC,aAAa,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAC;IAEtF,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE9E,8BAA8B;IAC9B,IAAG,UAAU,EAAE,CAAC;QAEd,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrH,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC5H,CAAC;IAED,yDAAyD;IACzD,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE;QAEvC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;QAC3B,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACzC,UAAU,EAAE,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC1H,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;IAEnB,4DAA4D;IAC5D,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE;QAEvC,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC;QAC9B,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAE5C,IAAG,UAAU,EAAE,CAAC;YAEd,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YACvH,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5H,CAAC;IACH,CAAC,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,iBAAiB,CAAC,GAAc;IAE9C,8DAA8D;IAC9D,6BAA6B,CAAC,GAAG,CAAC,CAAC;IAEnC,6JAA6J;IAC7J,yEAAyE;IACzE,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC7B,+BAA+B,CAAC,GAAG,CAAC,CAAC;IAErC,6CAA6C;IAC7C,aAAa,CAAC,GAAG,CAAC,CAAC;IACnB,oBAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAEjC,2DAA2D;IAC3D,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3B,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEhC,0CAA0C;IAC1C,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACvB,wBAAwB,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,wBAAwB,CAAC,GAAc;IAErD,gFAAgF;IAChF,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAiC,EAAE,EAAE;QAErE,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,6BAA6B,CAAC,CAAC,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;QAErI,IAAG,WAAW,KAAK,kBAAkB,EAAE,CAAC;YAEtC,oGAAoG;YACpG,IAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;gBAE/B,mJAAmJ;gBACnJ,mEAAmE;gBACnE,IAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBAE5F,IAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;wBAElC,qFAAqF;wBACrF,cAAc,CAAC,GAAG,CAAC,CAAC;oBACtB,CAAC;yBAAM,CAAC;wBAEN,mCAAmC;wBACnC,GAAG,CAAC,oBAAoB,EAAE,CAAC;wBAC3B,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC;wBAC9B,GAAG,CAAC,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;wBAEtE,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;wBAE9E,IAAG,UAAU,EAAE,CAAC;4BAEd,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;4BACvH,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;wBAC5H,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBAElJ,OAAO;YACT,CAAC;YAED,mEAAmE;YACnE,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAE3E,IAAG,OAAO,EAAE,CAAC;gBAEX,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBAC5I,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC;gBAE5I,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;gBAClF,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;aAAM,CAAC;YAEN,uBAAuB;YACvB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC;gBACjI,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAE1D,IAAG,OAAO,EAAE,CAAC;gBAEX,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC9F,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBACrG,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QAED,6CAA6C;QAC7C,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAElJ,0BAA0B;QAC1B,IAAG,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAErB,IAAG,IAAI,CAAC,UAAU,EAAE,CAAC;gBAEnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,IAAI,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YAC7G,CAAC;iBAAM,IAAG,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;gBAEtC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACxG,CAAC;iBAAM,CAAC;gBAEN,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,2FAA2F;IAC3F,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,IAAgC,EAAE,EAAE;QAEnE,yBAAyB;QACzB,IAAG,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAEpB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,EACvH,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QAED,sHAAsH;QACtH,IAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAEnB,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,mBAAmB,CAAC,gBAAgB,CAAC;gBAC/F,EAAE,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhF,OAAO;QACT,CAAC;QAED,IAAG,eAAe,CAAC,GAAG,CAAC,KAAK,kBAAkB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAE/E,OAAO;QACT,CAAC;QAED,iGAAiG;QACjG,IAAG,GAAG,CAAC,aAAa,KAAK,SAAS,IAAI,GAAG,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;YAEnE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;YAE5E,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAE3E,IAAG,CAAC,OAAO,EAAE,CAAC;YAEZ,OAAO;QACT,CAAC;QAED,kEAAkE;QAClE,IAAG,GAAG,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAEnC,IAAG,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC;gBAE7E,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;gBAC9E,GAAG,CAAC,oBAAoB,EAAE,CAAC;gBAE3B,2JAA2J;gBAC3J,qGAAqG;gBACrG,GAAG,CAAC,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;gBAEtE,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBACpH,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACxH,CAAC;YAED,OAAO;QACT,CAAC;QAED,6DAA6D;QAC7D,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAwC,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACvG,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YAC3F,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC;QAChG,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YAC7F,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC;QAE9F,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QAClF,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;IAEH,yEAAyE;IACzE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QAErC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,EAAE,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC3J,CAAC,CAAC,CAAC;IAEH,2EAA2E;IAC3E,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAEvC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,EAAE,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC5J,CAAC,CAAC,CAAC;IAEH,2EAA2E;IAC3E,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,IAAmC,EAAE,EAAE;QAEzE,qDAAqD;QACrD,IAAG,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAExB,OAAO;QACT,CAAC;QAED,IAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAE7B,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAA2B,CAAC;QAC9D,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;QAEtE,IAAG,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAE9B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,iFAAiF;IACjF,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,IAAkC,EAAE,EAAE;QAEvE,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAE/F,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,mBAAmB,CAAC,MAA0C,CAAC,CAAC,EAAE;gBAC5H,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,oDAAoD;AACpD,SAAS,6BAA6B,CAAC,GAAc;IAEnD,KAAI,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QAExC,wDAAwD;QACxD,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EACpD,aAAa,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,aAAa,CAAC,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YAE/I,SAAS;QACX,CAAC;QAED,uBAAuB;QACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,aAAa,GAAG,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;QAEzI,IAAG,CAAC,OAAO,EAAE,CAAC;YAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;YAE/E,SAAS;QACX,CAAC;QAED,qCAAqC;QACrC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,CAAC;QAE9H,gCAAgC;QAChC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAA0B,EAAE,EAAE;YAE9F,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;YAChE,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC;YAChD,IAAI,OAAO,CAAC;YAEZ,IAAG,KAAK,EAAE,CAAC;gBAET,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,WAAW,CAAC;gBACxE,MAAM,IAAI,GAAG,CAAC,YAAY,IAAI,CAAC,gBAAgB,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACrH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAEpG,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,GAAG,QAAQ,EAAE;oBAEzI,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC7B,MAAM,EAAE,KAAK;iBACd,CAAC,CAAC;gBAEH,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACnE,CAAC;YAED,gHAAgH;YAChH,IAAG,CAAC,OAAO,EAAE,CAAC;gBAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;gBAC1G,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,iCAAiC,CAAC,CAAC;YACvH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,yBAAyB;QACzB,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,CAAC;IACvH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8CAA8C;AAC9C,SAAS,iBAAiB,CAAC,GAAc;IAEvC,wDAAwD;IACxD,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QAE7H,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAEpJ,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAE7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEhC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,4EAA4E;AAC5E,SAAS,wBAAwB,CAAC,GAAc;IAE9C,wDAAwD;IACxD,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAC/H,mBAAmB,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAE/C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,aAAa,GAAG,mBAAmB,EAC3G,mBAAmB,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC,CAAC;IAEhH,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAEhE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wBAAwB;IACxB,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,qBAAqB,KAAK,IAAI,CAAC,CAAC;IAErG,0GAA0G;IAC1G,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QAE9D,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,qBAAqB,KAAK,IAAI,CAAC,EAAE,iCAAiC,CAAC,CAAC;IACnJ,CAAC,CAAC,CAAC;IAEH,yBAAyB;IACzB,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,GAAG,CAAC,aAAa,GAAG,mBAAmB,CAAC,CAAC;IAC7G,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,2JAA2J;AAC3J,MAAM,UAAU,uBAAuB,CAAC,GAAc;IAEpD,KAAI,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,cAAc,EAAE,CAAC;QAE7C,MAAM,IAAI,GAAG,CAAC,WAAW,GAAG,KAAK,CAAqB,CAAC;QACvD,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAqC,CAAC,CAAC;QAE/G,wDAAwD;QACxD,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,UAAmB,EAAE,EAAE;YAErF,IAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,CAAC;gBAElC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC;YAC7D,CAAC;YAED,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,EAAE,UAAU,CAAC,EAAE,CAAC;YAEf,SAAS;QACX,CAAC;QAED,uBAAuB;QACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,aAAa,GAAG,GAAG,GAAG,KAAK,EAAE,UAAU,EACtH,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;QAEnE,IAAG,CAAC,OAAO,EAAE,CAAC;YAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC;YAEhE,SAAS;QACX,CAAC;QAED,+BAA+B;QAC/B,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,EAAE,aAAa,CAAC,GAAG,EAAE,KAAoB,CAAC,CAAC,CAAC;QAClH,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvF,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+EAA+E;AAC/E,SAAS,+BAA+B,CAAC,GAAc;IAErD,gGAAgG;IAChG,IAAG,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAE1B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,oJAAoJ;IACpJ,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,UAAmB,EAAE,EAAE;QAErF,IAAG,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,IAAI,UAAU,EAAE,CAAC;YAEjD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC;IACxC,CAAC,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,aAAa,GAAG,4BAA4B,EAC3H,mBAAmB,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC,CAAC;IAEvG,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAE9D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,oEAAoE;IACpE,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,EAAE,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACjG,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvF,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAEvC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oFAAoF;AACpF,SAAS,aAAa,CAAC,GAAc;IAEnC,MAAM,kBAAkB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IAEhD,wEAAwE;IACxE,MAAM,YAAY,GAAG,CAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAE,CAAC;IACzF,MAAM,eAAe,GAAG,kBAAkB,KAAK,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;IAErI,KAAI,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QAEtC,IAAG,WAAW,KAAK,eAAe,EAAE,CAAC;YAEnC,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAEzD,IAAG,UAAU,EAAE,CAAC;gBAEd,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED,wDAAwD;IACxD,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;QAE/E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EACzF,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAE7E,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mCAAmC;IACnC,IAAG,kBAAkB,KAAK,kBAAkB,EAAE,CAAC;QAE7C,0BAA0B,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;SAAM,CAAC;QAEN,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,wBAAwB;IACxB,GAAG,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACtB,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC;IACxC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7E,GAAG,CAAC,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAEpC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEhC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,qCAAqC;AACrC,SAAS,oBAAoB,CAAC,GAAc,EAAE,OAA0C,EAAE,UAAmB;IAE3G,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,GAAwB,EAAE,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAwB,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC;IACrI,MAAM,WAAW,GAAG,KAAK,EAAE,IAAa,EAAoB,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAEzG,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC1F,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAEzF,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAA0B,EAAE,EAAE;QAE3G,4FAA4F;QAC5F,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;QACvC,MAAM,YAAY,GAAG,KAAK,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC;QAC9E,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAEpD,oFAAoF;QACpF,IAAG,YAAY,KAAK,eAAe,EAAE,CAAC;YAEpC,OAAO;QACT,CAAC;QAED,IAAG,CAAC,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YAEtC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAClF,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,iCAAiC,CAAC,CAAC;QAC7J,CAAC;QAED,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wCAAwC;AACxC,SAAS,0BAA0B,CAAC,GAAc,EAAE,OAA0C,EAAE,UAAmB;IAEjH,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,OAAO;IACT,CAAC;IAED,wGAAwG;IACxG,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;IAE7C,oCAAoC;IACpC,MAAM,YAAY,GAAG,GAAwB,EAAE;QAE7C,IAAG,QAAQ,EAAE,CAAC;YAEZ,6CAA6C;YAC7C,IAAG,CAAC,UAAU,IAAI,GAAG,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAE7E,IAAG,GAAG,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;oBAEnC,OAAO,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBACzD,CAAC;gBAED,IAAG,GAAG,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;oBAEhC,OAAO,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACtD,CAAC;gBAED,OAAO,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC;YACzD,CAAC;YAED,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC;YAEvE,OAAO,QAAQ,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAC/H,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACjD,CAAC;QAED,kDAAkD;QAClD,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;QAEzE,OAAO,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC;IAClI,CAAC,CAAC;IAEF,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEvF,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAA0B,EAAE,EAAE;QAE3G,MAAM,WAAW,GAAG,KAAK,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC;QAE5E,yEAAyE;QACzE,IAAG,QAAQ,EAAE,CAAC;YAEZ,mGAAmG;YACnG,IAAG,UAAU,EAAE,CAAC;gBAEd,GAAG,CAAC,2BAA2B,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,2BAA2B,CAAC;gBAE3E,qDAAqD;gBACrD,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBACnI,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YACrD,CAAC;iBAAM,CAAC;gBAEN,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,2BAA2B,CAAC;gBAEnE,0GAA0G;gBAC1G,IAAG,WAAW,EAAE,CAAC;oBAEf,GAAG,CAAC,oBAAoB,EAAE,CAAC;oBAC3B,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC;oBAC9B,GAAG,CAAC,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;oBACtE,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;gBACzH,CAAC;qBAAM,CAAC;oBAEN,cAAc,CAAC,GAAG,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;YAED,oBAAoB;YACpB,IAAG,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;gBAEvD,0DAA0D;gBAC1D,IAAG,UAAU,EAAE,CAAC;oBAEd,GAAG,CAAC,2BAA2B,GAAG,CAAC,CAAC;gBACtC,CAAC;qBAAM,CAAC;oBAEN,GAAG,CAAC,mBAAmB,GAAG,CAAC,CAAC;oBAC5B,GAAG,CAAC,oBAAoB,EAAE,CAAC;oBAC3B,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;oBACzB,GAAG,CAAC,kBAAkB,GAAG,CAAC,CAAC;gBAC7B,CAAC;gBAED,kCAAkC;gBAClC,UAAU,CAAC,GAAG,EAAE;oBAEd,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EACjE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBAC7G,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,YAAY,EAAE,CAAC,CAAC;gBACxF,CAAC,EAAE,iCAAiC,CAAC,CAAC;YACxC,CAAC;YAED,uFAAuF;YACvF,OAAO;QACT,CAAC;QAED,uDAAuD;QACvD,IAAG,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YAE7D,kCAAkC;YAClC,UAAU,CAAC,GAAG,EAAE;gBAEd,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EACjE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBAC7G,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,YAAY,EAAE,CAAC,CAAC;YACxF,CAAC,EAAE,iCAAiC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,qEAAqE;IACrE,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AAC3F,CAAC;AAED,oEAAoE;AACpE,SAAS,oBAAoB,CAAC,GAAc,EAAE,UAAmB;IAE/D,MAAM,SAAS,GAAG,UAAU;QAC1B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,2BAA2B,CAAC;QACtE,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,6BAA6B,CAAC,CAAC,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;IACzH,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,cAAc,CAAC;IACrE,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,yBAAyB,CAAC;IAE9F,wDAAwD;IACxD,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;QAE5E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,aAAa,GAAG,GAAG,GAAG,KAAK,EAAE,OAAO,EAC5G,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEpD,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC;QAEjD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,yBAAyB;IACzB,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;SACjD,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAEvF,2CAA2C;IAC3C,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAA0B,EAAE,EAAE;QAE9F,sFAAsF;QACtF,IAAG,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YAExD,oBAAoB;YACpB,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,iCAAiC,CAAC,CAAC;QACvH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,yBAAyB;IACzB,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,GAAG,CAAC,aAAa,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC;IACrG,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iFAAiF;AACjF,SAAS,qBAAqB,CAAC,GAAc;IAE3C,wDAAwD;IACxD,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,mBAAmB,CAAC,cAAc,CAAC,EAAE,CAAC;QAE1H,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,aAAa,GAAG,YAAY,EAAE,mBAAmB,CAAC,cAAc,EAC/I,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,CAAC,YAAY,IAAI,WAAW,CAAC,CAAC,CAAC;IAE/E,IAAG,CAAC,OAAO,EAAE,CAAC;QAEZ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAE9C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,8BAA8B;IAC9B,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAEzC,uBAAuB;IACvB,GAAG,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC;IAC9B,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,aAAa,GAAG,YAAY,CAAC;IACvD,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,aAAa,GAAG,YAAY,CAAC,CAAC;IAC5F,GAAG,CAAC,mBAAmB,GAAG,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAElD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iFAAiF;AACjF,SAAS,wBAAwB,CAAC,GAAc,EAAE,OAA0C;IAE1F,IAAG,CAAC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,iBAAiB,CAAC,EAAE,CAAC;QAEtD,OAAO;IACT,CAAC;IAED,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAEtE,IAAG,aAAa,EAAE,CAAC;QAEjB,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC/I,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,iHAAiH;AACjH,MAAM,UAAU,0BAA0B,CAAC,GAAc;IAEvD,IAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;QAE5C,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE5C,MAAM,gBAAgB,GAAuD;QAC3E,EAAE,OAAO,EAAE,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,EAAE;QAC3D,EAAE,OAAO,EAAE,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,uBAAuB,EAAE;QAClF,EAAE,OAAO,EAAE,mBAAmB,CAAC,6BAA6B,EAAE,MAAM,EAAE,eAAe,EAAE;KACxF,CAAC;IAEF,KAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;QAElD,MAAM,WAAW,GAAG,OAAO,KAAK,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAClG,OAAO,KAAK,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;QAC5G,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEnE,IAAG,CAAC,OAAO,EAAE,CAAC;YAEZ,SAAS;QACX,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,CAAC;QAElC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;QAClC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEvE,IAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;YAErE,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/dist/hub/access-hub.d.ts
CHANGED
|
@@ -21,9 +21,10 @@ export declare class AccessHub extends AccessDevice {
|
|
|
21
21
|
_hkSideDoorLockState: CharacteristicValue;
|
|
22
22
|
readonly catalog: DeviceCatalogEntry;
|
|
23
23
|
doorbellRingRequestId: string | null;
|
|
24
|
-
gateDirection: "opening" | "closing" | null;
|
|
24
|
+
gateDirection: "opening" | "open" | "closing" | null;
|
|
25
25
|
gateDirectionDuration: number;
|
|
26
26
|
gateDirectionUntil: number;
|
|
27
|
+
gatePhaseTimers: ReturnType<typeof setTimeout>[];
|
|
27
28
|
gateTransitionUntil: number;
|
|
28
29
|
lockDelayInterval: number | undefined;
|
|
29
30
|
mainDoorLocationId: string | undefined;
|
|
@@ -37,6 +38,7 @@ export declare class AccessHub extends AccessDevice {
|
|
|
37
38
|
protected configureHints(): boolean;
|
|
38
39
|
get resolvedName(): string | undefined;
|
|
39
40
|
configureInfo(): boolean;
|
|
41
|
+
clearGatePhaseTimers(): void;
|
|
40
42
|
private configureDevice;
|
|
41
43
|
get hkDpsState(): CharacteristicValue;
|
|
42
44
|
set hkDpsState(value: CharacteristicValue);
|
package/dist/hub/access-hub.js
CHANGED
|
@@ -8,7 +8,7 @@ import { AccessDevice } from "../access-device.js";
|
|
|
8
8
|
import { AccessReservedNames } from "../access-types.js";
|
|
9
9
|
import { ACCESS_GATE_DIRECTION_DURATION } from "../settings.js";
|
|
10
10
|
import { sensorInputs } from "./access-hub-types.js";
|
|
11
|
-
import {
|
|
11
|
+
import { discoverDoorNames, initializeDoorsFromApi } from "./access-hub-api.js";
|
|
12
12
|
import { registerEventHandlers } from "./access-hub-events.js";
|
|
13
13
|
import { configureMqtt } from "./access-hub-mqtt.js";
|
|
14
14
|
import { configureServices, registerServiceReactions, updateSideDoorServiceNames } from "./access-hub-services.js";
|
|
@@ -40,6 +40,7 @@ export class AccessHub extends AccessDevice {
|
|
|
40
40
|
gateDirection;
|
|
41
41
|
gateDirectionDuration;
|
|
42
42
|
gateDirectionUntil;
|
|
43
|
+
gatePhaseTimers;
|
|
43
44
|
gateTransitionUntil;
|
|
44
45
|
lockDelayInterval;
|
|
45
46
|
mainDoorLocationId;
|
|
@@ -64,6 +65,7 @@ export class AccessHub extends AccessDevice {
|
|
|
64
65
|
this.gateDirection = null;
|
|
65
66
|
this.gateDirectionDuration = ((this.getFeatureNumber("Hub.GateDirectionDuration") ?? ACCESS_GATE_DIRECTION_DURATION) * 1000);
|
|
66
67
|
this.gateDirectionUntil = 0;
|
|
68
|
+
this.gatePhaseTimers = [];
|
|
67
69
|
this.gateTransitionUntil = 0;
|
|
68
70
|
this.lockDelayInterval = this.getFeatureNumber("Hub.LockDelayInterval") ?? undefined;
|
|
69
71
|
this.mainDoorLocationId = undefined;
|
|
@@ -116,6 +118,13 @@ export class AccessHub extends AccessDevice {
|
|
|
116
118
|
updateSideDoorServiceNames(this);
|
|
117
119
|
return this.setInfo(this.accessory, this.uda);
|
|
118
120
|
}
|
|
121
|
+
// Clear any scheduled gate phase transition timers.
|
|
122
|
+
clearGatePhaseTimers() {
|
|
123
|
+
for (const timer of this.gatePhaseTimers) {
|
|
124
|
+
clearTimeout(timer);
|
|
125
|
+
}
|
|
126
|
+
this.gatePhaseTimers = [];
|
|
127
|
+
}
|
|
119
128
|
// Initialize and configure the hub accessory for HomeKit. Orchestrates all module setup.
|
|
120
129
|
configureDevice() {
|
|
121
130
|
this._hkLockState = hubLockState(this);
|
|
@@ -125,9 +134,13 @@ export class AccessHub extends AccessDevice {
|
|
|
125
134
|
this.accessory.context = {};
|
|
126
135
|
this.accessory.context.mac = this.uda.mac;
|
|
127
136
|
this.accessory.context.controller = this.controller.uda.host.mac;
|
|
128
|
-
|
|
137
|
+
// Discover door names for UA Gate hubs early so log messages and services can use real names.
|
|
138
|
+
if (this.catalog.usesLocationApi) {
|
|
139
|
+
discoverDoorNames(this);
|
|
140
|
+
}
|
|
141
|
+
logLockDelayInterval(this, this.mainDoorName ?? "door");
|
|
129
142
|
if (this.hints.hasSideDoor) {
|
|
130
|
-
logLockDelayInterval(this, "side door");
|
|
143
|
+
logLockDelayInterval(this, this.sideDoorName ?? "side door");
|
|
131
144
|
}
|
|
132
145
|
// Configure accessory information.
|
|
133
146
|
this.configureInfo();
|
|
@@ -137,9 +150,9 @@ export class AccessHub extends AccessDevice {
|
|
|
137
150
|
configureServices(this);
|
|
138
151
|
// Configure MQTT services (includes its own event bus subscriptions).
|
|
139
152
|
configureMqtt(this);
|
|
140
|
-
//
|
|
153
|
+
// Initialize door states from API bootstrap data (must be done after services are configured, before event handlers).
|
|
141
154
|
if (this.catalog.usesLocationApi) {
|
|
142
|
-
|
|
155
|
+
initializeDoorsFromApi(this);
|
|
143
156
|
}
|
|
144
157
|
// Register external event handlers (subscribes to controller events).
|
|
145
158
|
registerEventHandlers(this);
|
|
@@ -155,13 +168,27 @@ export class AccessHub extends AccessDevice {
|
|
|
155
168
|
}
|
|
156
169
|
// HomeKit DPS state setter. Updates the backing variable, contact sensor, and emits events.
|
|
157
170
|
set hkDpsState(value) {
|
|
171
|
+
const isClosed = value === this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
|
|
158
172
|
// Suppress contradictory DPS events during gate movement (e.g. sensor bounce as the gate moves past).
|
|
159
173
|
if (this.gateDirection && (Date.now() < this.gateDirectionUntil)) {
|
|
160
|
-
const isClosed = value === this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
|
|
161
174
|
if ((this.gateDirection === "opening" && isClosed) || (this.gateDirection === "closing" && !isClosed)) {
|
|
175
|
+
this.log.debug("Gate DPS bounce suppressed: %s during %s phase.", isClosed ? "close" : "open", this.gateDirection);
|
|
162
176
|
return;
|
|
163
177
|
}
|
|
164
178
|
}
|
|
179
|
+
// Detect gate closing: DPS transitions from open to close during the "open" phase (gate closing earlier than the timer predicted) or after the direction window
|
|
180
|
+
// expires (self-closing with no active cycle). Cancel any pending phase timers and set closing direction to suppress bounce and push transitional state.
|
|
181
|
+
if (this.catalog.usesLocationApi && isClosed && (this._hkDpsState !== value) && (this.gateDirection === "open" || (Date.now() >= this.gateDirectionUntil))) {
|
|
182
|
+
this.log.debug("Gate closing detected during %s phase — transitioning to Closing.", this.gateDirection ?? "idle");
|
|
183
|
+
this.clearGatePhaseTimers();
|
|
184
|
+
this.gateDirection = "closing";
|
|
185
|
+
this.gateDirectionUntil = Date.now() + (this.gateDirectionDuration / 3);
|
|
186
|
+
const gdoService = this.accessory.getService(this.hap.Service.GarageDoorOpener);
|
|
187
|
+
if (gdoService) {
|
|
188
|
+
gdoService.updateCharacteristic(this.hap.Characteristic.TargetDoorState, this.hap.Characteristic.TargetDoorState.CLOSED);
|
|
189
|
+
gdoService.updateCharacteristic(this.hap.Characteristic.CurrentDoorState, this.hap.Characteristic.CurrentDoorState.CLOSING);
|
|
190
|
+
}
|
|
191
|
+
}
|
|
165
192
|
this._hkDpsState = value;
|
|
166
193
|
setContactSensorState(this, AccessReservedNames.CONTACT_DPS, value);
|
|
167
194
|
// Emit events for DPS and sensor changes.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-hub.js","sourceRoot":"","sources":["../../src/hub/access-hub.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAA6C,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE1G,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAmG,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtJ,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"access-hub.js","sourceRoot":"","sources":["../../src/hub/access-hub.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAA6C,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE1G,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAmG,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtJ,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AACnH,OAAO,EACL,gBAAgB,EAAE,qBAAqB,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EACzH,MAAM,uBAAuB,CAAC;AAQ/B,qDAAqD;AACrD,MAAM,WAAW;IAEE,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACtC,MAAM,CAAmD;IAEjE,IAAI,CAAwB,KAAQ,EAAE,IAAoB;QAExD,IAAI,CAAC,MAAM,EAAE,CAAC,mBAAmB,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,EAAE,CAAwB,KAAQ,EAAE,OAAuC;QAEzE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAuC,CAAC,CAAC;IAClE,CAAC;IAED,SAAS,CAAC,MAAuD;QAE/D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,SAAU,SAAQ,YAAY;IAEzC,mDAAmD;IAC5C,WAAW,CAAsB;IACjC,YAAY,CAAsB;IAClC,mBAAmB,CAAsB;IACzC,oBAAoB,CAAsB;IAEjD,mDAAmD;IACnC,OAAO,CAAqB;IACrC,qBAAqB,CAAgB;IACrC,aAAa,CAAwC;IACrD,qBAAqB,CAAS;IAC9B,kBAAkB,CAAS;IAC3B,eAAe,CAAkC;IACjD,mBAAmB,CAAS;IAC5B,iBAAiB,CAAqB;IACtC,kBAAkB,CAAqB;IACvC,YAAY,CAAqB;IACjC,kBAAkB,CAAqB;IACvC,YAAY,CAAqB;IACjC,2BAA2B,CAAS;IACpC,GAAG,CAAqB;IAE/B,iDAAiD;IACjC,SAAS,GAAG,IAAI,WAAW,EAAE,CAAC;IAE9C,sBAAsB;IACtB,YAAY,UAA4B,EAAE,MAA0B,EAAE,SAA4B;QAEhG,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAE7B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAExD,oEAAoE;QACpE,IAAI,CAAC,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAE,CAAC;QAChF,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,mBAAmB,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,oBAAoB,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,IAAI,8BAA8B,CAAC,GAAG,IAAI,CAAC,CAAC;QAC7H,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,IAAI,SAAS,CAAC;QACrF,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,2BAA2B,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAElC,sHAAsH;QACtH,IAAG,CAAC,IAAI,CAAC,iBAAiB,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC,EAAE,CAAC;YAE1E,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACrC,CAAC;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,sDAAsD;IAC5C,cAAc;QAEtB,gCAAgC;QAChC,KAAK,CAAC,cAAc,EAAE,CAAC;QAEvB,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC1F,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;QAChG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAE/C,+FAA+F;QAC/F,IAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAE9B,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2EAA2E;IAC3E,IAAoB,YAAY;QAE9B,OAAO,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;IAC7C,CAAC;IAED,iJAAiJ;IAC1I,aAAa;QAElB,IAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAEvB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;YAEjD,IAAG,IAAI,EAAE,CAAC;gBAER,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,oDAAoD;IAC7C,oBAAoB;QAEzB,KAAI,MAAM,KAAK,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAExC,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED,yFAAyF;IACjF,eAAe;QAErB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,mBAAmB,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,oBAAoB,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAErD,mEAAmE;QACnE,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;QAEjE,8FAA8F;QAC9F,IAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAEhC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC;QAExD,IAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YAE1B,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,IAAI,WAAW,CAAC,CAAC;QAC/D,CAAC;QAED,mCAAmC;QACnC,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,kHAAkH;QAClH,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,kCAAkC;QAClC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAExB,sEAAsE;QACtE,aAAa,CAAC,IAAI,CAAC,CAAC;QAEpB,sHAAsH;QACtH,IAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAEhC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QAED,sEAAsE;QACtE,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yIAAyI;IACzI,IAAW,UAAU;QAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAE/G,IAAG,OAAO,EAAE,CAAC;YAEX,OAAO,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC;QACzG,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,4FAA4F;IAC5F,IAAW,UAAU,CAAC,KAA0B;QAE9C,MAAM,QAAQ,GAAG,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;QAEvF,sGAAsG;QACtG,IAAG,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAEhE,IAAG,CAAC,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAErG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iDAAiD,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBAEnH,OAAO;YACT,CAAC;QACH,CAAC;QAED,gKAAgK;QAChK,yJAAyJ;QACzJ,IAAG,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC;YAE1J,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mEAAmE,EAAE,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC,CAAC;YAClH,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;YAC/B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;YAExE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAEhF,IAAG,UAAU,EAAE,CAAC;gBAEd,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBACzH,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC9H,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEpE,0CAA0C;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,KAAoB,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,wCAAwC;IACxC,IAAW,WAAW;QAEpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,4FAA4F;IAC5F,IAAW,WAAW,CAAC,KAA0B;QAE/C,yBAAyB;QACzB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAE1B,iFAAiF;QACjF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,kDAAkD;IAClD,IAAW,mBAAmB;QAE5B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACnC,CAAC;IAED,sGAAsG;IACtG,IAAW,mBAAmB,CAAC,KAA0B;QAEvD,yBAAyB;QACzB,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAElC,iFAAiF;QACjF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,uGAAuG;IACvG;QAEE,+CAA+C;QAC/C,KAAI,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YAEhC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,GAAG,KAAK,GAAG,OAAO,EAAE;gBAEjE,YAAY,EAAE,IAAI;gBAClB,UAAU,EAAE,IAAI;gBAChB,GAAG;oBAED,OAAO,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC9B,CAAC;aACF,CAAC,CAAC;QACL,CAAC;QAED,iKAAiK;QACjK,eAAe;QACf,KAAI,MAAM,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YAEzD,MAAM,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;YAEjD,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,GAAG,KAAK,GAAG,OAAO,EAAE;gBAEjE,YAAY,EAAE,IAAI;gBAClB,UAAU,EAAE,IAAI;gBAChB,GAAG;oBAED,OAAO,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,CAAC,OAA2C,CAAC,CAAC,CAAC;gBACvG,CAAC;gBAED,GAAG,CAAkB,KAA0B;oBAE7C,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,CAAC,OAA2C,CAAC,EAAE,KAAK,CAAC,CAAC;oBAErG,kDAAkD;oBAClD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,KAAoB,EAAE,KAAK,EAAE,CAAC,CAAC;gBAChF,CAAC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF"}
|
package/dist/settings.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare const PLATFORM_NAME = "UniFi Access";
|
|
|
5
5
|
export declare const ACCESS_CONTROLLER_REFRESH_INTERVAL = 120;
|
|
6
6
|
export declare const ACCESS_CONTROLLER_RETRY_INTERVAL = 10;
|
|
7
7
|
export declare const ACCESS_DEVICE_REMOVAL_DELAY_INTERVAL = 60;
|
|
8
|
-
export declare const ACCESS_GATE_DIRECTION_DURATION =
|
|
8
|
+
export declare const ACCESS_GATE_DIRECTION_DURATION = 90;
|
|
9
9
|
export declare const ACCESS_DEVICE_UNLOCK_INTERVAL = 0;
|
|
10
10
|
export declare const ACCESS_MOTION_DURATION = 10;
|
|
11
11
|
export declare const ACCESS_MQTT_RECONNECT_INTERVAL = 60;
|
package/dist/settings.js
CHANGED
|
@@ -9,8 +9,8 @@ export const ACCESS_CONTROLLER_REFRESH_INTERVAL = 120;
|
|
|
9
9
|
export const ACCESS_CONTROLLER_RETRY_INTERVAL = 10;
|
|
10
10
|
// Default delay, in seconds, before removing Access devices that no longer exist.
|
|
11
11
|
export const ACCESS_DEVICE_REMOVAL_DELAY_INTERVAL = 60;
|
|
12
|
-
// Default duration, in seconds,
|
|
13
|
-
export const ACCESS_GATE_DIRECTION_DURATION =
|
|
12
|
+
// Default duration, in seconds, of the full gate cycle (open, hold, close) used for the 3-phase GarageDoorOpener state progression.
|
|
13
|
+
export const ACCESS_GATE_DIRECTION_DURATION = 90;
|
|
14
14
|
// Default delay, in minutes, before locking an unlocked door relay.
|
|
15
15
|
export const ACCESS_DEVICE_UNLOCK_INTERVAL = 0;
|
|
16
16
|
// Default duration, in seconds, of motion events. Setting this too low will potentially cause a lot of notification spam.
|
package/dist/settings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAMA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,0BAA0B;AAC1B,MAAM,CAAC,MAAM,WAAW,GAAG,wCAAwC,CAAC;AAEpE,mCAAmC;AACnC,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAC;AAE5C,wFAAwF;AACxF,MAAM,CAAC,MAAM,kCAAkC,GAAG,GAAG,CAAC;AAEtD,yGAAyG;AACzG,MAAM,CAAC,MAAM,gCAAgC,GAAG,EAAE,CAAC;AAEnD,kFAAkF;AAClF,MAAM,CAAC,MAAM,oCAAoC,GAAG,EAAE,CAAC;AAEvD,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mp-consulting/homebridge-unifi-access",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.5",
|
|
4
4
|
"displayName": "UniFi Access",
|
|
5
5
|
"description": "Complete HomeKit support for UniFi Access devices — locks, doorbells, sensors, and readers — with automatic device discovery and realtime events.",
|
|
6
6
|
"author": "Mickael Palma",
|