npm - @fastybird/smart-panel-backend - Versions diffs - 1.1.0-alpha.63 → 1.1.0-alpha.65 - Mend

@fastybird/smart-panel-backend 1.1.0-alpha.63 → 1.1.0-alpha.65

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.

Files changed (1116) hide show

package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"home-assistant.ws.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-home-assistant/services/home-assistant.ws.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"home-assistant.ws.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-home-assistant/services/home-assistant.ws.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAA2C;AAC3C,4CAA2B;AAE3B,2CAA4C;AAE5C,mDAAuF;AACvF,2EAAmE;AACnE,oFAAgF;AAChF,wHAAkH;AAKlH,oGAIgE;AAChE,4FAA0F;AAC1F,yGAAqG;AACrG,0FAAyF;AACzF,4FAI8C;AAC9C,8EAAoF;AAEpF,yEAKwC;AAExC,mEAA8D;AAC9D,+EAAyE;AAalE,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,4DAA2B;IAuE9D,wBAAwB;QAC/B,OAAO,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACzG,CAAC;IACO,6BAA6B;QACpC,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACpC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE;YAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxF,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE,CAAC;IAC1C,CAAC;IAED,6BAA6B,CAAC,QAAkD;QAC/E,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1C,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,8BAA8B;QAM7B,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;YAAE,OAAO,IAAI,CAAC;QACrG,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACzC,MAAM,aAAa,GAAG,IAAI,CAAC,4BAA4B,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAuD,CAAC;QACxF,OAAO;YACN,QAAQ,EAAE,GAAG,UAAU,IAAI,aAAa,EAAE;YAC1C,cAAc,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ;YAC7E,SAAS,EAAE,GAAG,EAAE,CACf,IAAI,CAAC,KAAK,KAAK,SAAS;gBACxB,IAAI,CAAC,gBAAgB,KAAK,UAAU;gBACpC,IAAI,CAAC,EAAE,KAAK,MAAM;gBAClB,IAAI,CAAC,WAAW,EAAE;gBAClB,IAAI,CAAC,4BAA4B,KAAK,aAAa;gBACnD,IAAI,CAAC,wBAAwB,EAAE;YAChC,IAAI;SACJ,CAAC;IACH,CAAC;IAQD,YACkB,aAA4B,EAC5B,wBAAkD,EAClD,iBAAsC,EACtC,aAAmC;QAEpD,KAAK,EAAE,CAAC;QALS,kBAAa,GAAb,aAAa,CAAe;QAC5B,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,sBAAiB,GAAjB,iBAAiB,CAAqB;QACtC,kBAAa,GAAb,aAAa,CAAsB;QAxHpC,WAAM,GAA2B,IAAA,8BAAqB,EACtE,qEAAkC,EAClC,WAAW,CACX,CAAC;QAEO,UAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,qEAAkC,EAAW,CAAC;QAC9E,cAAS,GAAG,WAAW,CAAC;QAEhB,wBAAmB,GAAG,KAAK,CAAC;QAErC,OAAE,GAAqB,IAAI,CAAC;QAE5B,iBAAY,GAAoC,IAAI,CAAC;QAErD,WAAM,GAAG,CAAC,CAAC;QAEX,eAAU,GAAG,CAAC,CAAC;QAEf,qBAAgB,GAA0B,IAAI,CAAC;QAC/C,iBAAY,GAA0B,IAAI,CAAC;QAE3C,mBAAc,GAAgC,IAAI,GAAG,EAAE,CAAC;QAExD,cAAS,GAAG,IAAI,GAAG,EAOxB,CAAC;QAEI,uBAAkB,GAGf,IAAI,CAAC;QAMR,0BAAqB,GAAG,KAAK,CAAC;QAG9B,0BAAqB,GAAG,KAAK,CAAC;QAM9B,0BAAqB,GAAG,CAAC,CAAC;QAM1B,qBAAgB,GAAG,CAAC,CAAC;QAEZ,2BAAsB,GAAG,IAAI,GAAG,EAA4C,CAAC;QAC7E,6BAAwB,GAAG,IAAI,GAAG,CAAC;YACnD,eAAe;YACf,yBAAyB;YACzB,qBAAqB;SACrB,CAAC,CAAC;QACc,yBAAoB,GAAG,IAAI,GAAG,EAG5C,CAAC;QACa,gCAA2B,GAAG,IAAI,GAAG,EAAU,CAAC;QACzD,iCAA4B,GAAG,CAAC,CAAC;QA6CjC,2BAAsB,GAAyB,IAAI,CAAC;IAS5D,CAAC;IAED,qBAAqB,CAAC,KAAa,EAAE,OAAuB;QAC3D,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,iEAA6B,CAAC,6DAA6D,CAAC,CAAC;QACxG,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IASD,KAAK,CAAC,KAAK;QACV,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC9B,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,SAAS;oBACb,OAAO;gBACR,KAAK,UAAU;oBACd,OAAO;gBACR,KAAK,UAAU;oBACd,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAChC,MAAM;gBACP,KAAK,SAAS,CAAC;gBACf,KAAK,OAAO;oBAEX,MAAM;YACR,CAAC;YAGD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YAEzB,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;gBAClE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;gBAErB,OAAO;YACR,CAAC;YAED,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;YAExB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;YAE7D,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAEpC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;gBAEvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;YAC1E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;oBACtD,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC/D,CAAC,CAAC;gBAEH,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;gBAErB,IAAI,CAAC,UAAU,EAAE,CAAC;gBAElB,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAMD,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC9B,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,SAAS;oBACb,OAAO;gBACR,KAAK,UAAU;oBACd,OAAO;gBACR,KAAK,UAAU;oBACd,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;oBAEpD,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,SAAS,EAAE,CAAC;wBACnC,OAAO;oBACR,CAAC;gBAEF,KAAK,SAAS,CAAC;gBACf,KAAK,OAAO;oBAEX,MAAM;YACR,CAAC;YAED,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;YAExB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;YAE7D,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC3B,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBACpC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC9B,CAAC;YAMD,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;YAE3B,IAAI,IAAI,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;gBAC1C,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,sBAAsB,CAAC;gBACnC,CAAC;gBAAC,MAAM,CAAC;gBAGT,CAAC;YACF,CAAC;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAElB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YAEvB,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;YACnC,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAC;YAM/B,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,qEAAkC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACJ,CAAC;IAUD,eAAe;QAEd,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CACnD,qEAAkC,CAClC,CAAC;YAGF,IAAI,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;gBACxF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACpD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;YACnD,CAAC;YAGD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;QAGD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;IAMO,sBAAsB;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,kBAAkB,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;YAE9C,IAAI,CAAC,OAAO,EAAE,CAAC;YAGf,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBAC7B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC,CAAC;oBAC3G,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAChC,CAAC;YACF,CAAC,EAAE,KAAK,CAAC,CAAC;YAGV,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;YAEjD,IAAI,CAAC,kBAAkB,GAAG;gBACzB,OAAO,EAAE,GAAG,EAAE;oBACb,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,gBAAgB,CAAC,OAAO,EAAE,CAAC;oBAC3B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAChC,CAAC;gBACD,MAAM,EAAE,CAAC,KAAY,EAAE,EAAE;oBACxB,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC/B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAChC,CAAC;aACD,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,OAAO;QACd,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAErC,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;QAKnC,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAE3B,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAGzC,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAC7F,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC;QAGhD,MAAM,OAAO,GAA4B,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE;YACnF,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE;YACzD,CAAC,CAAC,EAAE,CAAC;QAEN,IAAI,CAAC,EAAE,GAAG,IAAI,YAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;YAE1E,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE;YACtC,IAAI,UAAU,KAAK,IAAI,CAAC,gBAAgB;gBAAE,OAAO;YACjD,KAAK,CAAC,KAAK,IAAI,EAAE;gBAChB,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC,CAAC,EAAE,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAGxB,IAAI,UAAU,KAAK,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,qBAAqB;gBAAE,OAAO;YAChF,IAAI,UAAU,KAAK,IAAI,CAAC,gBAAgB;gBAAE,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAC/E,IAAI,CAAC,QAAQ,EAAE,CAAC;YAGhB,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC,CAAC;YAC1G,CAAC;YAGD,IAAI,CAAC,wBAAwB,CAAC,0BAA0B,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;gBAC/E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,GAAG,EAAE,OAAO,IAAI,eAAe,EAAE,CAAC,CAAC;YAChG,CAAC,CAAC,CAAC;YAIH,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;gBAEjE,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;oBACjF,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;gBACpC,CAAC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC3B,IAAI,UAAU,KAAK,IAAI,CAAC,gBAAgB;gBAAE,OAAO;YACjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE;gBAC/C,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;aACzD,CAAC,CAAC;YAGH,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrF,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,UAAU;QACjB,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACrC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAElC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAIhB,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAC;YAC3F,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAChC,CAAC;QAGD,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACtD,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAEvB,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;IAChB,CAAC;IAED,WAAW;QACV,OAAO,IAAI,CAAC,EAAE,EAAE,UAAU,KAAK,YAAS,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,SAAS;QACR,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAE5E,MAAM,IAAI,2EAAuC,CAAC,+CAA+C,CAAC,CAAC;QACpG,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;gBAChC,IAAI,EAAE,6BAA6B;aACnC,CAAC,CAAC;YAEH,MAAM,GAAG,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAW,CAAC;YAEnD,MAAM,eAAe,GAAG,IAAA,4BAAU,EAAC,uDAAgC,EAAE,GAAG,EAAE;gBACzE,uBAAuB,EAAE,KAAK;aAC9B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,eAAe,CAAC,CAAC;YAE/C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjH,CAAC;iBAAM,CAAC;gBACP,OAAO,eAAe,CAAC,MAAM,CAAC;YAC/B,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE;gBACpE,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;YAEH,MAAM,IAAI,iEAA6B,CACtC,+EAA+E,CAC/E,CAAC;QACH,CAAC;QAED,MAAM,IAAI,yEAAqC,CAC9C,+EAA+E,CAC/E,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YAE7E,MAAM,IAAI,2EAAuC,CAAC,+CAA+C,CAAC,CAAC;QACpG,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;gBAChC,IAAI,EAAE,6BAA6B;aACnC,CAAC,CAAC;YAEH,MAAM,GAAG,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAW,CAAC;YAEnD,MAAM,gBAAgB,GAAG,IAAA,4BAAU,EAAC,uDAAgC,EAAE,GAAG,EAAE;gBAC1E,uBAAuB,EAAE,KAAK;aAC9B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,gBAAgB,CAAC,CAAC;YAEhD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,qEAAqE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAC7F,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,OAAO,gBAAgB,CAAC,MAAM,CAAC;YAChC,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE;gBACrE,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;YAEH,MAAM,IAAI,iEAA6B,CACtC,gFAAgF,CAChF,CAAC;QACH,CAAC;QAED,MAAM,IAAI,yEAAqC,CAC9C,gFAAgF,CAChF,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAyB;QAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;YAEpE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,iEAA6B,CAAC,+CAA+C,CAAC,CAAC,CAAC;QAC3G,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAEhC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAEjC,MAAM,CAAC,IAAI,iEAA6B,CAAC,4CAA4C,SAAS,GAAG,CAAC,CAAC,CAAC;YACrG,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAE7B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YAE5D,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,IAAY,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CACrD,qEAAkC,CAClC,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,IAAY,MAAM;QACjB,IAAI,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC;QACpD,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,IAAY,QAAQ;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC7B,CAAC;IAED,IAAY,OAAO;QAClB,IAAI,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC3E,CAAC;QAED,OAAO,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChC,CAAC;IAcO,KAAK,CAAC,qBAAqB,CAAC,UAAkB;QACrD,IAAI,UAAU,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1C,OAAO;QACR,CAAC;QAED,IAAI,CAAC,qBAAqB,IAAI,CAAC,CAAC;QAEhC,IAAI,IAAI,CAAC,qBAAqB,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,oBAAoB,CAAC,gFAAgF,CAAC,CAAC;QACnH,CAAC;QAED,IAAI,UAAU,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1C,OAAO;QACR,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC1B,CAAC;IAOO,KAAK,CAAC,oBAAoB,CAAC,OAAe;QACjD,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAChC,OAAO;QACR,CAAC;QAED,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAElC,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAC/B,MAAM,EAAE,qEAAkC;YAC1C,IAAI,EAAE,0CAAgB,CAAC,KAAK;YAC5B,GAAG,EAAE,YAAY;YACjB,QAAQ,EAAE,8CAAoB,CAAC,KAAK;YACpC,KAAK,EAAE,gCAAgC;YACvC,OAAO,EAAE,IAAA,0CAAoB,EAAC,OAAO,CAAC;YACtC,OAAO,EAAE;gBACR;oBACC,IAAI,EAAE,gDAAsB,CAAC,OAAO;oBACpC,KAAK,EAAE,iBAAiB;oBACxB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;oBAC/B,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;oBAC/B,UAAU,EAAE,IAAI,CAAC,SAAS;oBAC1B,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,IAAI;iBACb;gBACD;oBACC,IAAI,EAAE,gDAAsB,CAAC,IAAI;oBACjC,KAAK,EAAE,8BAA8B;oBACrC,GAAG,EAAE,eAAe,qEAAkC,EAAE;iBACxD;aACD;SACD,CAAC,CAAC;IACJ,CAAC;IAQO,KAAK,CAAC,sBAAsB;QACnC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACjC,OAAO;QACR,CAAC;QAKD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,qEAAkC,EAAE,YAAY,CAAC,CAAC;YAEnF,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACtG,CAAC;IACF,CAAC;IAEO,iBAAiB;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC;QAExD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5B,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,GAAG,EAAE;gBACvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAM7B,IAAI,UAAU,KAAK,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;oBACrG,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,CAAC;YACF,CAAC,EAAE,KAAK,CAAC,CAAC;QACX,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,IAAY;QACvC,IAAI,GAA4B,CAAC;QAEjC,IAAI,CAAC;YACJ,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBACtD,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC/D,CAAC,CAAC;YAEH,OAAO;QACR,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;YACzD,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3D,IAAI,YAAY,EAAE,CAAC;gBAClB,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACnC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACzC,IAAI,YAAY,CAAC,UAAU,KAAK,IAAI,CAAC,4BAA4B,EAAE,CAAC;oBACnE,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;wBAC1B,IAAI,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;4BACxD,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBAC3D,CAAC;yBAAM,CAAC;wBACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;wBACtF,IAAI,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;4BAAE,IAAI,CAAC,6BAA6B,EAAE,CAAC;oBACjG,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,EAAE,IAAI,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACvF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAExD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9B,YAAY,CAAC,OAAO,CAAC,CAAC;YAEtB,OAAO,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO;QACR,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAClC,IAAI,CAAC,EAAE,EAAE,IAAI,CACZ,IAAI,CAAC,SAAS,CAAC;gBACd,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,IAAI,CAAC,MAAM;aACzB,CAAC,CACF,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAEnC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACnC,CAAC;YAED,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAC;YAC/B,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAEpC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,EAAE,CAAC;YAGjB,IAAI,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;gBAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,GAAG,EAAE,OAAO,IAAI,eAAe,EAAE,CAAC,CAAC;YAC7F,CAAC,CAAC,CAAC;YAIH,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;gBAC/D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,GAAG,EAAE,OAAO,IAAI,eAAe,EAAE,CAAC,CAAC;YACvF,CAAC,CAAC,CAAC;QACJ,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACxC,MAAM,YAAY,GAAG,SAAS,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC;YAEjH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;YAE5D,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YAG9C,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;YACzD,CAAC;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACjC,IACC,OAAO,IAAI,GAAG;gBACd,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;gBAC7B,GAAG,CAAC,KAAK,KAAK,IAAI;gBAClB,YAAY,IAAI,GAAG,CAAC,KAAK;gBACzB,OAAO,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,EACvC,CAAC;gBACF,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;gBACvC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,sBAAsB;oBAAE,QAAQ,CAAC,GAAG,CAAC,KAAgC,CAAC,CAAC;gBACnG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAEnF,IAAI,OAAO,EAAE,CAAC;oBACb,IAAI,SAAS,KAAK,eAAe,EAAE,CAAC;wBAGnC,MAAM,KAAK,GAAG,IAAA,4BAAU,EAAC,4DAAiC,EAAE,GAAG,CAAC,KAAe,EAAE;4BAChF,uBAAuB,EAAE,KAAK;yBAC9B,CAAC,CAAC;wBAEH,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC7B,CAAC;yBAAM,CAAC;wBACP,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAA2C,CAAC,CAAC;oBACvE,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,SAAS,IAAI,CAAC,CAAC;gBAC9F,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAEO,iBAAiB;QACxB,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAS,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACxE,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC;YACpD,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;gBACvB,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACjC,CAAC;QACF,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,IAAI,CAAC,4BAA4B,CAAC;YACrD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IACC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,KAAK,OAAO;oBACtD,UAAU,KAAK,IAAI,CAAC,4BAA4B;oBAChD,gBAAgB,KAAK,IAAI,CAAC,gBAAgB;oBAC1C,IAAI,CAAC,EAAE,KAAK,MAAM;oBAElB,OAAO;gBACR,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gEAAgE,SAAS,EAAE,CAAC,CAAC;gBAC9F,IAAI,CAAC,6BAA6B,EAAE,CAAC;gBAErC,MAAM,CAAC,SAAS,EAAE,CAAC;YACpB,CAAC,EAAE,MAAM,CAAC,CAAC;YACX,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7E,MAAM,CAAC,IAAI,CACV,IAAI,CAAC,SAAS,CAAC;gBACd,EAAE;gBACF,IAAI,EAAE,kBAAkB;gBACxB,UAAU,EAAE,SAAS;aACrB,CAAC,CACF,CAAC;QACH,CAAC;IACF,CAAC;IAQO,SAAS;QAChB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACzB,OAAO;YACR,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;gBAGxE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;QACJ,CAAC,EAAE,MAAM,CAAC,CAAC;IACZ,CAAC;IAEO,QAAQ;QACf,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC1B,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,GAAG,MAAsB;QAChD,MAAM,OAAO,GAAG,KAAK,CAAC;QACtB,MAAM,QAAQ,GAAG,GAAG,CAAC;QACrB,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,GAAG,OAAO,EAAE,CAAC;YAC1D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;YAE9D,OAAO,IAAI,QAAQ,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACnG,CAAC;IACF,CAAC;CACD,CAAA;AAh4BY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAuHqB,8BAAa;QACF,sDAAwB;QAC/B,2CAAmB;QACvB,4CAAoB;GAzHzC,sBAAsB,CAg4BlC"}

package/dist/plugins/devices-homekit/devices-homekit.plugin.js CHANGED Viewed

@@ -35,6 +35,8 @@ const homekit_actions_service_1 = require("./services/homekit-actions.service");
 const homekit_bridge_service_1 = require("./services/homekit-bridge.service");
 const homekit_command_dispatcher_1 = require("./services/homekit-command.dispatcher");
 const homekit_mapper_registry_service_1 = require("./services/homekit-mapper-registry.service");
+const homekit_mapping_maintenance_1 = require("./services/homekit-mapping-maintenance");
+const homekit_property_state_service_1 = require("./services/homekit-property-state.service");
 const homekit_wizard_service_1 = require("./services/homekit-wizard.service");
 let DevicesHomeKitPlugin = DevicesHomeKitPlugin_1 = class DevicesHomeKitPlugin {
     constructor(configMapper, swaggerRegistry, extensionsService, managedServiceManager, homeKitBridgeService, pluginConfigMutations, devicesService, mapperRegistry, configService) {
@@ -63,6 +65,11 @@ let DevicesHomeKitPlugin = DevicesHomeKitPlugin_1 = class DevicesHomeKitPlugin {
         });
         this.pluginConfigMutations.register(devices_homekit_constants_1.DEVICES_HOMEKIT_PLUGIN_NAME, async (update, commit) => {
             let previousMappedDeviceIds = [];
+            const maintenance = (0, homekit_mapping_maintenance_1.getMappingMaintenance)(update);
+            const currentIds = this.configService.getPluginConfig(devices_homekit_constants_1.DEVICES_HOMEKIT_PLUGIN_NAME).mappedDeviceIds ?? [];
+            if (maintenance) {
+                update.mapped_device_ids = currentIds.filter((id) => !maintenance.removeDeviceIds?.includes(id));
+            }
             if (update.mapped_device_ids !== undefined) {
                 if (!Array.isArray(update.mapped_device_ids)) {
                     throw new common_1.BadRequestException([{ field: 'mapped_device_ids', reason: 'Device IDs must be an array.' }]);
@@ -83,7 +90,12 @@ let DevicesHomeKitPlugin = DevicesHomeKitPlugin_1 = class DevicesHomeKitPlugin {
                     const device = await this.devicesService.findOne(deviceId);
                     return { deviceId, device };
                 }));
+                const retainedIds = [];
                 for (const { deviceId, device } of devices) {
+                    if ((!device || !this.mapperRegistry.canMap(device)) && (maintenance || currentIds.includes(deviceId))) {
+                        this.logger.warn(`Pruning missing or incompatible HomeKit device ${deviceId}.`);
+                        continue;
+                    }
                     if (!device) {
                         throw new common_1.BadRequestException([{ field: 'mapped_device_ids', reason: `Device ${deviceId} not found.` }]);
                     }
@@ -95,14 +107,21 @@ let DevicesHomeKitPlugin = DevicesHomeKitPlugin_1 = class DevicesHomeKitPlugin {
                             },
                         ]);
                     }
+                    retainedIds.push(deviceId);
                 }
+                update.mapped_device_ids = retainedIds;
                 const currentConfig = this.configService.getPluginConfig(devices_homekit_constants_1.DEVICES_HOMEKIT_PLUGIN_NAME);
                 previousMappedDeviceIds = [...(currentConfig.mappedDeviceIds ?? [])];
             }
-            await commit();
+            const mappingChanged = update.mapped_device_ids?.join(',') !== currentIds.join(',');
+            if (!maintenance || mappingChanged) {
+                await commit();
+            }
             if (update.mapped_device_ids !== undefined) {
                 try {
-                    await this.homeKitBridgeService.reconcileLatestMapping();
+                    if (maintenance?.reconcile !== false) {
+                        await this.homeKitBridgeService.applyMapping(maintenance?.rebuildDeviceIds ?? []);
+                    }
                 }
                 catch (reconcileError) {
                     let rollbackError;
@@ -140,6 +159,12 @@ Exposes Smart Panel registered devices to Apple Home as bridged accessories over
 - **Local Control**: Direct local connection via HomeKit Accessory Protocol (HAP) and mDNS.
 - **Selective Bridging**: Select exactly which devices are exposed to Apple Home via the mapping wizard.
 - **Bidirectional Sync**: Real-time push updates for lights, switches, outlets, thermostats, sensors, blinds, and locks.
+- **Device Lifecycle**: Deleted or incompatible devices are removed, and structure changes rebuild accessories with the same identity. Offline devices report No Response.
+- **Virtual Measurements**: Supported temperature, humidity and light-level outputs use live producer quality and freshness. Unavailable readings report No Response; supported sensor services expose StatusFault for degraded quality. Arbitrary numeric quantities have no generic HomeKit mapping.
+- **Virtual Light Groups**: Common mapped controls use backend composite commands. ON means any member on; partial member outcomes fail the request while retaining successful feedback.
+- **Virtual Thermostats**: Target mode is requested intent; current activity follows confirmed feedback. Backend floor/window guards remain authoritative. Detailed protective diagnostics remain in Smart Panel; standard Thermostat and Lightbulb services have no StatusFault here.
+- **Verification**: Software acceptance does not qualify live hardware, heating protection or Apple Home commissioning.
+- **Accessory Names**: Renames in Smart Panel are not automatically propagated to Apple Home after pairing. Rename the accessory in Apple Home.
 - **Easy Pairing**: Scan the generated QR code or enter the 8-digit setup PIN code directly in the Apple Home app.
 `,
             links: {
@@ -166,6 +191,7 @@ exports.DevicesHomeKitPlugin = DevicesHomeKitPlugin = DevicesHomeKitPlugin_1 = _
             homekit_command_dispatcher_1.HomeKitCommandDispatcher,
             homekit_event_listener_1.HomeKitEventListener,
             homekit_mapper_registry_service_1.HomeKitMapperRegistryService,
+            homekit_property_state_service_1.HomeKitPropertyStateService,
             homekit_wizard_service_1.HomeKitWizardService,
         ],
         exports: [homekit_bridge_service_1.HomeKitBridgeService],

package/dist/plugins/devices-homekit/devices-homekit.plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"devices-homekit.plugin.js","sourceRoot":"","sources":["../../../src/plugins/devices-homekit/devices-homekit.plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAmF;AAEnF,sEAAkE;AAClE,iFAA6E;AAC7E,mIAA4H;AAC5H,2GAAqG;AACrG,yEAAqE;AACrE,oFAAgF;AAChF,kFAA8E;AAC9E,6FAAyF;AACzF,uHAAiH;AACjH,sEAAkE;AAClE,0FAA4E;AAC5E,oHAA8G;AAC9G,yEAAqE;AAErE,uFAAkF;AAClF,2EAKqC;AACrC,uEAAwF;AACxF,+DAAuE;AACvE,+EAA0E;AAC1E,wDAA2D;AAC3D,gFAA2E;AAC3E,8EAAyE;AACzE,sFAAiF;AACjF,gGAA0F;AAC1F,8EAAyE;~~AAoBlE~~,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAGhC,YACkB,YAAsC,EACtC,eAA6C,EAC7C,iBAAoC,EACpC,qBAAmD,EACnD,oBAA0C,EAC1C,qBAA0D,EAC1D,cAA8B,EAC9B,cAA4C,EAC5C,aAA4B;QAR5B,iBAAY,GAAZ,YAAY,CAA0B;QACtC,oBAAe,GAAf,eAAe,CAA8B;QAC7C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAA8B;QACnD,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAqC;QAC1D,mBAAc,GAAd,cAAc,CAAgB;QAC9B,mBAAc,GAAd,cAAc,CAA8B;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAX7B,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAY7D,CAAC;IAEJ,YAAY;QAEX,IAAI,CAAC,YAAY,CAAC,eAAe,CAAmD;YACnF,IAAI,EAAE,uDAA2B;YACjC,KAAK,EAAE,iCAAkB;YACzB,SAAS,EAAE,gDAA4B;YACvC,YAAY,EAAE;gBACb;oBACC,IAAI,EAAE,SAAS;oBACf,cAAc,EAAE,oBAAoB;iBACpC;aACD;SACD,CAAC,CAAC;QAGH,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAClC,uDAA2B,EAC3B,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACxB,IAAI,uBAAuB,GAAa,EAAE,CAAC;~~YAE3C~~,IAAI,MAAM,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBAC5C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBAC9C,MAAM,IAAI,4BAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC;gBACzG,CAAC;gBAED,IAAI,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,2DAA+B,EAAE,CAAC;oBACvE,MAAM,IAAI,4BAAmB,CAAC;wBAC7B;4BACC,KAAK,EAAE,mBAAmB;4BAC1B,MAAM,EAAE,oEAAoE;yBAC5E;qBACD,CAAC,CAAC;gBACJ,CAAC;gBAED,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;gBACjD,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;oBACrD,MAAM,IAAI,4BAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAC,CAAC;gBACvG,CAAC;gBAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;oBAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;gBAC7B,CAAC,CAAC,CACF,CAAC;gBAEF,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;oBAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;wBACb,MAAM,IAAI,4BAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,UAAU,QAAQ,aAAa,EAAE,CAAC,CAAC,CAAC;oBAC1G,CAAC;oBAED,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;wBACzC,MAAM,IAAI,4BAAmB,CAAC;4BAC7B;gCACC,KAAK,EAAE,mBAAmB;gCAC1B,MAAM,EAAE,WAAW,MAAM,CAAC,IAAI,MAAM,QAAQ,mCAAmC;6BAC/E;yBACD,CAAC,CAAC;oBACJ,CAAC;~~gBACF~~,CAAC;gBAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAqB,uDAA2B,CAAC,CAAC;gBAC1G,uBAAuB,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;YACtE,CAAC;YAED,MAAM,MAAM,EAAE,CAAC;~~YAEf~~,IAAI,MAAM,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBAC5C,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,oBAAoB,CAAC,~~sBAAsB~~,EAAE,CAAC;~~gBAC1D~~,CAAC;gBAAC,OAAO,cAAc,EAAE,CAAC;oBACzB,IAAI,aAAsB,CAAC;oBAC3B,IAAI,CAAC;wBACJ,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,uDAA2B,EAAE;4BAC/D,IAAI,EAAE,uDAA2B;4BACjC,iBAAiB,EAAE,uBAAuB;yBAC1C,CAAC,CAAC;oBACJ,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACd,aAAa,GAAG,GAAG,CAAC;wBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,8EAA+E,GAAa,CAAC,OAAO,EAAE,CACtG,CAAC;oBACH,CAAC;oBAED,IAAI,aAAa,EAAE,CAAC;wBACnB,MAAM,IAAI,KAAK,CACd,0CAA2C,cAAwB,CAAC,OAAO,iDAAkD,aAAuB,CAAC,OAAO,EAAE,EAC9J,EAAE,KAAK,EAAE,cAAc,EAAE,CACzB,CAAC;oBACH,CAAC;oBAED,MAAM,cAAc,CAAC;gBACtB,CAAC;YACF,CAAC;QACF,CAAC,CACD,CAAC;QAGF,KAAK,MAAM,KAAK,IAAI,qEAA2C,EAAE,CAAC;YACjE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAGD,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC;YAC7C,IAAI,EAAE,uDAA2B;YACjC,IAAI,EAAE,sBAAsB;YAC5B,WAAW,EAAE,yEAAyE;YACtF,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE~~;;;;;;;;;;CAUV~~;YACE,KAAK,EAAE;gBACN,aAAa,EAAE,wCAAwC;gBACvD,UAAU,EAAE,0CAA0C;aACtD;SACD,CAAC,CAAC;QAGH,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;CACD,CAAA;~~AA/IY~~,oDAAoB;+BAApB,oBAAoB;~~IAlBhC~~,IAAA,0BAAM,EAAC;QACP,OAAO,EAAE,uDAA2B;QACpC,WAAW,EAAE,+DAAmC;QAChD,WAAW,EAAE,sEAA0C;KACvD,CAAC;IACD,IAAA,eAAM,EAAC;QACP,OAAO,EAAE,CAAC,4BAAY,EAAE,8BAAa,EAAE,oCAAgB,EAAE,4BAAY,EAAE,8BAAa,CAAC;QACrF,WAAW,EAAE,CAAC,mDAAuB,CAAC;QACtC,SAAS,EAAE;YACV,+CAAqB;YACrB,6CAAoB;YACpB,qDAAwB;YACxB,6CAAoB;YACpB,8DAA4B;YAC5B,6CAAoB;SACpB;QACD,OAAO,EAAE,CAAC,6CAAoB,CAAC;KAC/B,CAAC;qCAK+B,sDAAwB;QACrB,8DAA4B;QAC1B,sCAAiB;QACb,8DAA4B;QAC7B,6CAAoB;QACnB,6EAAmC;QAC1C,gCAAc;QACd,8DAA4B;QAC7B,8BAAa;GAZlC,oBAAoB,~~CA+IhC~~"}
1	+ {"version":3,"file":"devices-homekit.plugin.js","sourceRoot":"","sources":["../../../src/plugins/devices-homekit/devices-homekit.plugin.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-homekit/listeners/homekit-event.listener.d.ts CHANGED Viewed

@@ -1,10 +1,33 @@
-import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
+import { OnModuleDestroy } from '@nestjs/common';
+import { ConnectionState } from '../../../modules/devices/devices.constants';
+import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../../../modules/devices/entities/devices.entity';
 import { ChannelInputOccurrencePayload } from '../../../modules/devices/models/channel-input-occurrence.model';
+import { ChannelsService } from '../../../modules/devices/services/channels.service';
+import { DevicesService } from '../../../modules/devices/services/devices.service';
+import { HomeKitBridgeService } from '../services/homekit-bridge.service';
 import { HomeKitMapperRegistryService } from '../services/homekit-mapper-registry.service';
-export declare class HomeKitEventListener {
+export declare class HomeKitEventListener implements OnModuleDestroy {
     private readonly mapperRegistry;
+    private readonly bridge?;
+    private readonly devicesService?;
+    private readonly channelsService?;
     private readonly logger;
-    constructor(mapperRegistry: HomeKitMapperRegistryService);
+    private readonly rebuildTimers;
+    constructor(mapperRegistry: HomeKitMapperRegistryService, bridge?: HomeKitBridgeService, devicesService?: DevicesService, channelsService?: ChannelsService);
+    onModuleDestroy(): void;
+    handleDeviceDeleted(device: DeviceEntity): Promise<void>;
+    handleConnectionChanged(event: {
+        device: DeviceEntity;
+        state: ConnectionState;
+    }): Promise<void>;
+    handleChannelStructureChanged(channel: ChannelEntity): void;
+    handlePropertyStructureChanged(property: ChannelPropertyEntity): Promise<void>;
+    handleCarbonDioxideMetadataChanged(property: ChannelPropertyEntity): Promise<void>;
+    handleFanMetadataChanged(property: ChannelPropertyEntity): Promise<void>;
+    handleThermostatMetadataChanged(property: ChannelPropertyEntity): Promise<void>;
+    private handleMetadataChanged;
+    private isMapped;
+    private scheduleRebuild;
     handlePropertyValueSet(property: ChannelPropertyEntity): void;
     handlePropertyValueChanged(property: ChannelPropertyEntity, acceptedValue?: boolean): void;
     handleChannelInputOccurrence(occurrence: ChannelInputOccurrencePayload): void;

package/dist/plugins/devices-homekit/listeners/homekit-event.listener.js CHANGED Viewed

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var HomeKitEventListener_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HomeKitEventListener = void 0;
@@ -16,11 +19,127 @@ const event_emitter_1 = require("@nestjs/event-emitter");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
 const channel_input_occurrence_model_1 = require("../../../modules/devices/models/channel-input-occurrence.model");
+const channels_service_1 = require("../../../modules/devices/services/channels.service");
+const devices_service_1 = require("../../../modules/devices/services/devices.service");
+const homekit_bridge_service_1 = require("../services/homekit-bridge.service");
 const homekit_mapper_registry_service_1 = require("../services/homekit-mapper-registry.service");
 let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
-    constructor(mapperRegistry) {
+    constructor(mapperRegistry, bridge, devicesService, channelsService) {
         this.mapperRegistry = mapperRegistry;
+        this.bridge = bridge;
+        this.devicesService = devicesService;
+        this.channelsService = channelsService;
         this.logger = new common_1.Logger(HomeKitEventListener_1.name);
+        this.rebuildTimers = new Map();
+    }
+    onModuleDestroy() {
+        for (const timer of this.rebuildTimers.values())
+            clearTimeout(timer);
+        this.rebuildTimers.clear();
+    }
+    async handleDeviceDeleted(device) {
+        if (!device?.id || !this.isMapped(device.id))
+            return;
+        const timer = this.rebuildTimers.get(device.id);
+        if (timer)
+            clearTimeout(timer);
+        this.rebuildTimers.delete(device.id);
+        try {
+            await this.bridge.maintainMapping({ removeDeviceIds: [device.id] });
+        }
+        catch (error) {
+            this.logger.warn(`Failed to remove deleted HomeKit device ${device.id}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    async handleConnectionChanged(event) {
+        if (!event?.device?.id || !this.isMapped(event.device.id) || this.bridge?.getState() === 'stopped')
+            return;
+        const online = devices_constants_1.OnlineDeviceState.includes(event.state);
+        const becameOnline = this.mapperRegistry.setDeviceOnline(event.device.id, online);
+        if (!becameOnline || !this.devicesService)
+            return;
+        const isCurrent = this.mapperRegistry.captureRefresh(event.device.id);
+        try {
+            const device = await this.devicesService.findOne(event.device.id);
+            if (!device || !isCurrent())
+                return;
+            for (const channel of device.channels ?? []) {
+                for (const property of channel.properties ?? []) {
+                    if (isCurrent(property.id))
+                        this.handlePropertyValueChanged(property);
+                }
+            }
+        }
+        catch (error) {
+            this.logger.warn(`Failed to refresh online HomeKit device ${event.device.id}: ${error.message}`);
+        }
+    }
+    handleChannelStructureChanged(channel) {
+        const deviceId = typeof channel?.device === 'string' ? channel.device : channel?.device?.id;
+        if (deviceId)
+            this.scheduleRebuild(deviceId);
+    }
+    async handlePropertyStructureChanged(property) {
+        if (!property?.id)
+            return;
+        const owner = this.mapperRegistry.getDeviceIdForProperty(property.id);
+        if (owner) {
+            this.scheduleRebuild(owner);
+            return;
+        }
+        const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
+        const embeddedDevice = typeof property.channel === 'object' ? property.channel?.device : undefined;
+        if (embeddedDevice) {
+            this.scheduleRebuild(typeof embeddedDevice === 'string' ? embeddedDevice : embeddedDevice.id);
+        }
+        else if (channelId && this.channelsService) {
+            const channel = await this.channelsService.findOne(channelId);
+            if (channel)
+                this.handleChannelStructureChanged(channel);
+        }
+    }
+    async handleCarbonDioxideMetadataChanged(property) {
+        await this.handleMetadataChanged(property, [devices_constants_1.PropertyCategory.CONCENTRATION, devices_constants_1.PropertyCategory.PEAK_LEVEL], devices_constants_1.ChannelCategory.CARBON_DIOXIDE);
+    }
+    async handleFanMetadataChanged(property) {
+        await this.handleMetadataChanged(property, [devices_constants_1.PropertyCategory.SPEED, devices_constants_1.PropertyCategory.SWING, devices_constants_1.PropertyCategory.DIRECTION, devices_constants_1.PropertyCategory.MODE], devices_constants_1.ChannelCategory.FAN);
+    }
+    async handleThermostatMetadataChanged(property) {
+        await this.handleMetadataChanged(property, [devices_constants_1.PropertyCategory.MODE], devices_constants_1.ChannelCategory.THERMOSTAT);
+    }
+    async handleMetadataChanged(property, categories, expectedChannel) {
+        if (!property || !categories.includes(property.category))
+            return;
+        let channel;
+        try {
+            channel =
+                typeof property.channel === 'string' ? await this.channelsService?.findOne(property.channel) : property.channel;
+        }
+        catch (error) {
+            const owner = this.mapperRegistry.getDeviceIdForProperty(property.id);
+            if (owner)
+                this.scheduleRebuild(owner);
+            this.logger.warn(`Failed to resolve HomeKit metadata channel: ${error instanceof Error ? error.message : String(error)}`);
+            return;
+        }
+        if (channel?.category === expectedChannel && this.mapperRegistry.admissionMetadataChanged(property, channel))
+            await this.handlePropertyStructureChanged(property);
+    }
+    isMapped(deviceId) {
+        return this.bridge?.getConfig().mappedDeviceIds?.includes(deviceId) ?? false;
+    }
+    scheduleRebuild(deviceId) {
+        if (!this.isMapped(deviceId))
+            return;
+        const previous = this.rebuildTimers.get(deviceId);
+        if (previous)
+            clearTimeout(previous);
+        this.rebuildTimers.set(deviceId, setTimeout(() => {
+            this.rebuildTimers.delete(deviceId);
+            void this.bridge.maintainMapping({ rebuildDeviceIds: [deviceId] }).catch((error) => {
+                this.logger.warn(`Failed to rebuild HomeKit device ${deviceId}: ${error.message}`);
+            });
+        }, 100));
     }
     handlePropertyValueSet(property) {
         this.handlePropertyValueChanged(property, true);
@@ -29,6 +148,7 @@ let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
         if (!property || !property.id) {
             return;
         }
+        this.mapperRegistry.notePropertyEvent(property.id);
         const bindings = this.mapperRegistry.getBindingsForProperty(property.id);
         const listeners = this.mapperRegistry.getListenersForProperty(property.id);
         if (bindings.length === 0 && listeners.length === 0) {
@@ -36,10 +156,16 @@ let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
         }
         const rawValue = property.value?.value;
         for (const binding of bindings) {
+            if (acceptedValue) {
+                binding.revision++;
+                binding.pendingWrite = undefined;
+            }
             try {
-                const hapValue = binding.toHomeKit
-                    ? binding.toHomeKit(rawValue)
-                    : rawValue;
+                const hapValue = binding.readValue
+                    ? binding.readValue(property, !acceptedValue)
+                    : binding.toHomeKit
+                        ? binding.toHomeKit(rawValue)
+                        : rawValue;
                 if (!acceptedValue && binding.pendingWrite && Object.is(hapValue, binding.pendingWrite.previousValue)) {
                     this.logger.debug(`Suppressing stale HomeKit characteristic update: property=${property.id} value=${JSON.stringify(rawValue)}`);
                     continue;
@@ -52,6 +178,7 @@ let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
             }
             catch (error) {
                 const err = error;
+                binding.characteristic.updateValue(err);
                 this.logger.warn(`Failed to update HomeKit characteristic for property=${property.id}: ${err.message}`);
             }
         }
@@ -83,6 +210,51 @@ let HomeKitEventListener = HomeKitEventListener_1 = class HomeKitEventListener {
 };
 exports.HomeKitEventListener = HomeKitEventListener;
 __decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.DEVICE_DELETED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [devices_entity_1.DeviceEntity]),
+    __metadata("design:returntype", Promise)
+], HomeKitEventListener.prototype, "handleDeviceDeleted", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.DEVICE_CONNECTION_CHANGED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], HomeKitEventListener.prototype, "handleConnectionChanged", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_CREATED),
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_DELETED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [devices_entity_1.ChannelEntity]),
+    __metadata("design:returntype", void 0)
+], HomeKitEventListener.prototype, "handleChannelStructureChanged", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_CREATED),
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_DELETED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [devices_entity_1.ChannelPropertyEntity]),
+    __metadata("design:returntype", Promise)
+], HomeKitEventListener.prototype, "handlePropertyStructureChanged", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_UPDATED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [devices_entity_1.ChannelPropertyEntity]),
+    __metadata("design:returntype", Promise)
+], HomeKitEventListener.prototype, "handleCarbonDioxideMetadataChanged", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_UPDATED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [devices_entity_1.ChannelPropertyEntity]),
+    __metadata("design:returntype", Promise)
+], HomeKitEventListener.prototype, "handleFanMetadataChanged", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_UPDATED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [devices_entity_1.ChannelPropertyEntity]),
+    __metadata("design:returntype", Promise)
+], HomeKitEventListener.prototype, "handleThermostatMetadataChanged", null);
+__decorate([
+    (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_VALUE_STATE_CHANGED),
     (0, event_emitter_1.OnEvent)(devices_constants_1.EventType.CHANNEL_PROPERTY_VALUE_SET),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [devices_entity_1.ChannelPropertyEntity]),
@@ -102,6 +274,12 @@ __decorate([
 ], HomeKitEventListener.prototype, "handleChannelInputOccurrence", null);
 exports.HomeKitEventListener = HomeKitEventListener = HomeKitEventListener_1 = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [homekit_mapper_registry_service_1.HomeKitMapperRegistryService])
+    __param(1, (0, common_1.Optional)()),
+    __param(2, (0, common_1.Optional)()),
+    __param(3, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [homekit_mapper_registry_service_1.HomeKitMapperRegistryService,
+        homekit_bridge_service_1.HomeKitBridgeService,
+        devices_service_1.DevicesService,
+        channels_service_1.ChannelsService])
 ], HomeKitEventListener);
 //# sourceMappingURL=homekit-event.listener.js.map

package/dist/plugins/devices-homekit/listeners/homekit-event.listener.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"homekit-event.listener.js","sourceRoot":"","sources":["../../../../src/plugins/devices-homekit/listeners/homekit-event.listener.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;~~AACA,~~2CAAoD~~;~~AACpD~~,yDAAgD;AAEhD,~~kFAA2F~~;~~AAC3F~~,~~qFAAyF~~;~~AACzF~~,mHAA+G;AAC/G,iGAA2F;AAGpF,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;~~IAGhC~~,~~YAA6B~~,cAA4C;~~QAA5C~~,mBAAc,GAAd,cAAc,CAA8B;~~QAFxD~~,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;~~IAEY~~,CAAC;~~IAG7E~~,sBAAsB,CAAC,QAA+B;QAGrD,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAGD,0BAA0B,CAAC,QAA+B,EAAE,aAAa,GAAG,KAAK;QAChF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAC/B,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE3E,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAwB,OAAO,CAAC,SAAS;oBACtD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;~~oBAC7B~~,CAAC,CAAE,QAAgC,CAAC;~~gBACrC~~,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;oBACvG,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,6DAA6D,QAAQ,CAAC,EAAE,UAAU,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAC5G,CAAC;oBACF,SAAS;gBACV,CAAC;gBAED,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACnB,OAAO,CAAC,YAAY,GAAG,QAAQ,CAAC;gBAChC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,6CAA6C,QAAQ,CAAC,EAAE,UAAU,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAC/H,CAAC;gBACF,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC9C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,QAAQ,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACzG,CAAC;QACF,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC;gBACJ,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;YAC/D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,QAAQ,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5G,CAAC;QACF,CAAC;IACF,CAAC;IAGD,4BAA4B,CAAC,UAAyC;QACrE,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;YAC3C,OAAO;QACR,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACpF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC;gBACJ,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACnC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,yDAAyD,UAAU,CAAC,QAAQ,YAAY,UAAU,CAAC,SAAS,aAAa,UAAU,CAAC,UAAU,KAAK,GAAG,CAAC,OAAO,EAAE,CAChK,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;CACD,CAAA;~~AAhFY~~,oDAAoB;~~AAMhC~~;~~IADC~~,IAAA,uBAAO,EAAC,6BAAgB,CAAC,0BAA0B,CAAC;;qCACpB,sCAAqB;;kEAIrD;AAGD;IADC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;;qCACd,sCAAqB;;~~sEA+CzD~~;AAGD;IADC,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;;qCACV,8DAA6B;;wEAgBrE;+~~BA/EW~~,oBAAoB;IADhC,IAAA,mBAAU,GAAE;~~qCAIiC~~,8DAA4B;~~GAH7D~~,oBAAoB,~~CAgFhC~~"}
1	+ {"version":3,"file":"homekit-event.listener.js","sourceRoot":"","sources":["../../../../src/plugins/devices-homekit/listeners/homekit-event.listener.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-homekit/mappers/base.mapper.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { Accessory, Categories, Characteristic, CharacteristicValue } from '@hom
 import { ChannelCategory, PropertyCategory } from '../../../modules/devices/devices.constants';
 import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../../../modules/devices/entities/devices.entity';
 import { HomeKitMapperContext, IHomeKitAccessoryMapper } from './homekit-mapper.interface';
+import { ManagedSemanticConversion } from './property-read';
 export declare abstract class BaseHomeKitMapper implements IHomeKitAccessoryMapper {
     abstract canMap(device: DeviceEntity): boolean;
     abstract getSuggestedServiceType(device: DeviceEntity): string;
@@ -11,5 +12,5 @@ export declare abstract class BaseHomeKitMapper implements IHomeKitAccessoryMapp
     protected findChannels(device: DeviceEntity, category: ChannelCategory): ChannelEntity[];
     protected findProperty(channel: ChannelEntity, category: PropertyCategory): ChannelPropertyEntity | undefined;
     protected unwrapValue(val: unknown): unknown;
-    protected bindCharacteristic(context: HomeKitMapperContext, device: DeviceEntity, channel: ChannelEntity, property: ChannelPropertyEntity, characteristic: Characteristic, toHomeKit?: (value: unknown) => CharacteristicValue, fromHomeKit?: (value: CharacteristicValue) => unknown): void;
+    protected bindCharacteristic(context: HomeKitMapperContext, device: DeviceEntity, channel: ChannelEntity, property: ChannelPropertyEntity, characteristic: Characteristic, toHomeKit?: (value: unknown, property?: ChannelPropertyEntity) => CharacteristicValue, fromHomeKit?: (value: CharacteristicValue) => unknown, fault?: Characteristic, semanticConversion?: ManagedSemanticConversion, validateProperty?: (property: ChannelPropertyEntity) => void): void;
 }

package/dist/plugins/devices-homekit/mappers/base.mapper.js CHANGED Viewed

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseHomeKitMapper = void 0;
 const hap_nodejs_1 = require("@homebridge/hap-nodejs");
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
+const characteristic_get_1 = require("./characteristic-get");
 const characteristic_write_1 = require("./characteristic-write");
+const property_read_1 = require("./property-read");
+const service_fault_1 = require("./service-fault");
 class BaseHomeKitMapper {
     createBaseAccessory(device, category) {
         const accessoryUuid = hap_nodejs_1.uuid.generate(`fastybird.smart-panel.device.${device.id}`);
@@ -25,7 +28,8 @@ class BaseHomeKitMapper {
         return device.channels?.filter((channel) => channel.category === category) ?? [];
     }
     findProperty(channel, category) {
-        return channel.properties?.find((property) => property.category === category);
+        return channel.properties?.find((property) => property.category === category &&
+            property.measurementQuantity !== 'dew_point');
     }
     unwrapValue(val) {
         if (val !== null && typeof val === 'object' && 'value' in val) {
@@ -33,8 +37,16 @@ class BaseHomeKitMapper {
         }
         return val;
     }
-    bindCharacteristic(context, device, channel, property, characteristic, toHomeKit = (val) => val, fromHomeKit = (val) => val) {
-        const initialValue = toHomeKit(property.value?.value);
+    bindCharacteristic(context, device, channel, property, characteristic, toHomeKit = (val) => val, fromHomeKit = (val) => val, fault, semanticConversion, validateProperty) {
+        let currentProperty = property;
+        let initialValue;
+        try {
+            initialValue = (0, property_read_1.readMappedProperty)(context, property, characteristic, toHomeKit, fault, semanticConversion, validateProperty);
+        }
+        catch {
+            initialValue = undefined;
+            characteristic.updateValue((0, property_read_1.communicationFailure)());
+        }
         const binding = {
             deviceId: device.id,
             channelId: channel.id,
@@ -45,9 +57,17 @@ class BaseHomeKitMapper {
             currentValue: initialValue,
             revision: 0,
         };
-        characteristic.onGet(() => {
-            return binding.currentValue;
-        });
+        binding.readValue = (event, metadataUpdate = false) => {
+            if (event)
+                currentProperty = Object.assign(Object.create(Object.getPrototypeOf(currentProperty)), currentProperty, metadataUpdate ? event : { value: event.value }, { channel: currentProperty.channel });
+            const state = context.propertyState?.read(currentProperty);
+            if (!validateProperty && !event && !currentProperty.requiresLiveValue && (!state || state.quality === null))
+                return binding.currentValue;
+            return (0, property_read_1.readMappedProperty)(context, currentProperty, characteristic, toHomeKit, fault, semanticConversion, validateProperty);
+        };
+        (0, characteristic_get_1.bindCharacteristicGet)(context, characteristic, () => binding.readValue());
+        if (fault)
+            (0, service_fault_1.bindServiceFault)(context, fault, characteristic, () => binding.readValue(currentProperty));
         if (initialValue !== undefined && initialValue !== null) {
             try {
                 characteristic.updateValue(initialValue);
@@ -55,11 +75,18 @@ class BaseHomeKitMapper {
             catch {
             }
         }
-        const isPropertyWritable = Array.isArray(property.permissions) &&
-            property.permissions.some((p) => [devices_constants_1.PermissionType.READ_WRITE, devices_constants_1.PermissionType.WRITE_ONLY].includes(p));
+        const isComposite = context.commandDispatcher.canExecuteCompositeProperty?.(property) ?? false;
+        const isPropertyWritable = (Array.isArray(property.permissions) &&
+            property.permissions.some((p) => [devices_constants_1.PermissionType.READ_WRITE, devices_constants_1.PermissionType.WRITE_ONLY].includes(p))) ||
+            isComposite;
         const isCharacteristicWritable = characteristic.props.perms.includes("pw");
         if (isPropertyWritable && isCharacteristicWritable) {
             (0, characteristic_write_1.bindCharacteristicWrite)(characteristic, async (value) => {
+                validateProperty?.(currentProperty);
+                if (validateProperty &&
+                    !(context.commandDispatcher.canExecuteCompositeProperty?.(currentProperty) ||
+                        currentProperty.permissions?.some((permission) => [devices_constants_1.PermissionType.READ_WRITE, devices_constants_1.PermissionType.WRITE_ONLY].includes(permission))))
+                    throw (0, property_read_1.communicationFailure)();
                 const startingRevision = binding.revision;
                 const token = (binding.nextWriteToken ?? 0) + 1;
                 binding.nextWriteToken = token;
@@ -70,7 +97,8 @@ class BaseHomeKitMapper {
                     requestedValue: value,
                     startingRevision,
                 };
-                binding.currentValue = value;
+                if (!isComposite)
+                    binding.currentValue = value;
                 const smartPanelValue = fromHomeKit(value);
                 try {
                     await context.commandDispatcher.dispatch(property.id, smartPanelValue);
@@ -89,7 +117,7 @@ class BaseHomeKitMapper {
                         binding.pendingWrite = undefined;
                     }
                 }
-            }, () => binding.currentValue);
+            }, () => binding.readValue(), () => context.availability?.assertAvailable());
         }
         context.registerBinding(binding);
     }