@switchbot/homebridge-switchbot 3.5.0-beta.62 → 3.5.0-beta.64

package/dist/irdevice/light.js.map

@@ -1 +1 @@
-{"version":3,"file":"light.js","sourceRoot":"","sources":["../../src/irdevice/light.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"light.js","sourceRoot":"","sources":["../../src/irdevice/light.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAM7C;;;;GAIG;AACH,MAAM,OAAO,KAAM,SAAQ,YAAY;IAuB1B;IAtBX,WAAW;IACH,SAAS,CAIf;IAEM,oBAAoB,CAK1B;IAEM,qBAAqB,CAK3B;IAEF,YACW,QAA2B,EACpC,SAA4B,EAC5B,MAAkC;QAElC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAJ1B,aAAQ,GAAR,QAAQ,CAAmB;QAMpC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YAC/B,+BAA+B;YAC/B,SAAS,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;YAChE,IAAI,CAAC,SAAS,GAAG;gBACf,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,GAAG,SAAS,CAAC,WAAW,IAAI,MAAM,CAAC,UAAU,EAAE;gBACzF,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAY;gBACxH,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,KAAK;aAClC,CAAC;YACF,SAAS,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,SAAmB,CAAC;YAEvD,IAAI,CAAC,SAAS,CAAC,OAAO;iBACnB,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;iBACpE,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;iBAC7C,KAAK,CAAC,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,SAAU,CAAC,EAAE,CAAC;YAC5B,CAAC,CAAC;iBACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,0CAA0C;YAC1C,SAAS,CAAC,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,OAAO,CAAC,oBAAoB,IAAI,EAAE,CAAC;YACtF,IAAI,CAAC,oBAAoB,GAAG;gBAC1B,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,IAAI,GAAG,SAAS,CAAC,WAAW,IAAI,MAAM,CAAC,UAAU,KAAK;gBACvG,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0BAA0B,CAAC;uBACvE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0BAA0B,CAAY;gBAC/E,uBAAuB,EAAE,SAAS,CAAC,OAAO,CAAC,uBAAuB,IAAI,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY;gBAClI,6BAA6B,EAAE,SAAS,CAAC,OAAO,CAAC,6BAA6B,IAAI,CAAC;aACpF,CAAC;YACF,SAAS,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAA8B,CAAC;YAE7E,kDAAkD;YAClD,IAAI,CAAC,oBAAoB,EAAE,OAAO;iBAC/B,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;iBAC/E,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC;gBAC3E,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACxB,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,CAAC;gBACX,WAAW,EAAE,CAAC,CAAC,CAAC;aACjB,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,oBAAqB,CAAC,uBAAuB,CAAC;YAC5D,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,oBAAoB,EAAE,OAAO;iBAC/B,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,CAAC;iBACxE,KAAK,CAAC,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,oBAAqB,CAAC,6BAA6B,CAAC;YAClE,CAAC,CAAC;iBACD,KAAK,CAAC,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAE7D,2CAA2C;YAC3C,SAAS,CAAC,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC;YACxF,IAAI,CAAC,qBAAqB,GAAG;gBAC3B,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,IAAI,GAAG,SAAS,CAAC,WAAW,IAAI,MAAM,CAAC,UAAU,MAAM;gBACzG,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0BAA0B,CAAC;uBACvE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0BAA0B,CAAY;gBAC/E,uBAAuB,EAAE,SAAS,CAAC,OAAO,CAAC,uBAAuB,IAAI,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY;gBAClI,6BAA6B,EAAE,SAAS,CAAC,OAAO,CAAC,6BAA6B,IAAI,CAAC;aACpF,CAAC;YACF,SAAS,CAAC,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAA+B,CAAC;YAE/E,mDAAmD;YACnD,IAAI,CAAC,qBAAqB,EAAE,OAAO;iBAChC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC;iBAChF,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC;gBAC3E,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACxB,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,CAAC;gBACX,WAAW,EAAE,CAAC,CAAC,CAAC;aACjB,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,qBAAsB,CAAC,uBAAuB,CAAC;YAC7D,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,qBAAqB,EAAE,OAAO;iBAChC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,CAAC;iBACxE,KAAK,CAAC,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,qBAAsB,CAAC,6BAA6B,CAAC;YACnE,CAAC,CAAC;iBACD,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChE,CAAC;IAEH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAA0B;QACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,QAAQ,KAAK,EAAE,CAAC,CAAC;QAEvF,IAAI,CAAC,SAAU,CAAC,EAAE,GAAG,KAAK,CAAC;QAC3B,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC;YACvB,MAAM,EAAE,GAAG,IAAI,CAAC;YAChB,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,GAAG,KAAK,CAAC;YACjB,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;QACD;;;WAGG;IACL,CAAC;IAED,KAAK,CAAC,kCAAkC,CAAC,KAA0B;QACjE,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,QAAQ,KAAK,EAAE,CAAC,CAAC;QAEvF,IAAI,CAAC,oBAAqB,CAAC,6BAA6B,GAAG,KAAK,CAAC;QACjE,IAAI,IAAI,CAAC,oBAAoB,EAAE,6BAA6B,KAAK,CAAC,EAAE,CAAC;YACnE,MAAM,EAAE,GAAG,IAAI,CAAC;YAChB,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACpC,CAAC;QACD;;;WAGG;IACL,CAAC;IAED,KAAK,CAAC,mCAAmC,CAAC,KAA0B;QAClE,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,QAAQ,KAAK,EAAE,CAAC,CAAC;QAEvF,IAAI,CAAC,qBAAsB,CAAC,6BAA6B,GAAG,KAAK,CAAC;QAClE,IAAI,IAAI,CAAC,qBAAqB,EAAE,6BAA6B,KAAK,CAAC,EAAE,CAAC;YACpE,MAAM,EAAE,GAAG,KAAK,CAAC;YACjB,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;QACD;;;WAGG;IACL,CAAC;IAID;;;;;;;;;OASG;IACH,KAAK,CAAC,kBAAkB,CAAC,EAAW;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,2BAA2B,EAAE,oBAAoB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAC7I,IAAI,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;YAChD,MAAM,WAAW,GAAW,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACrD,MAAM,OAAO,GAAW,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChC,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,WAAW;aACzB,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,EAAW;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,4BAA4B,EAAE,qBAAqB,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QAChJ,IAAI,EAAE,KAAK,KAAK,IAAI,IAAI,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;YAClD,MAAM,WAAW,GAAW,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACrD,MAAM,OAAO,GAAW,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YAChD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChC,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,WAAW;aACzB,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAe,EAAE,EAAW;QAC5C,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,cAAc,CAAC,CAAC;QACtF,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,4CAA4C,UAAU,GAAG,CAAC,CAAC;YAChI,IAAI,CAAC;gBACH,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,WAAW,EAAE;oBACxF,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;iBACzC,CAAC,CAAC;gBACH,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,gBAAgB,UAAU,EAAE,CAAC,CAAC;gBACxG,MAAM,YAAY,GAAQ,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,kBAAkB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;gBAC5H,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,6BAA6B,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;gBAClI,IAAI,CAAC,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,KAAK,GAAG,IAAI,YAAY,CAAC,UAAU,KAAK,GAAG,CAAC,EAAE,CAAC;oBACvH,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG;0BAC5E,eAAe,UAAU,+BAA+B,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;oBACvF,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;0BACtE,oCAAoC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;oBACxF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;oBAC/B,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBACtC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;oBAC5B,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACjB,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,4BAA4B,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;sBAC5H,+BAA+B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,oBAAoB;kBACvF,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,wCAAwC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B;QAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YACpC,KAAK;YACL,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;gBACrC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,QAAQ,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YACtG,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC5F,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,6BAA6B,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1H,CAAC;QACH,CAAC;aAAM,CAAC;YACN,kCAAkC;YAClC,IAAI,IAAI,CAAC,oBAAoB,EAAE,6BAA6B,KAAK,SAAS,EAAE,CAAC;gBAC3E,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;sBACpE,qCAAqC,IAAI,CAAC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC,CAAC;YACvG,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,+BAA+B,GAAG,IAAI,CAAC,oBAAoB,CAAC,6BAA6B,CAAC;gBACjH,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,EAC3G,IAAI,CAAC,oBAAoB,CAAC,6BAA6B,CAAC,CAAC;gBAC3D,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,uBAAuB;sBACzF,qCAAqC,IAAI,CAAC,oBAAoB,CAAC,6BAA6B,EAAE,CAAC,CAAC;YACtG,CAAC;YACD,mCAAmC;YACnC,IAAI,IAAI,CAAC,qBAAqB,EAAE,6BAA6B,KAAK,SAAS,EAAE,CAAC;gBAC5E,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;sBACpE,sCAAsC,IAAI,CAAC,qBAAqB,EAAE,6BAA6B,EAAE,CAAC,CAAC;YACzG,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,qBAAqB,CAAC,6BAA6B,CAAC;gBACnH,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,EAC3G,IAAI,CAAC,qBAAqB,CAAC,6BAA6B,CAAC,CAAC;gBAC5D,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,uBAAuB;sBACzF,sCAAsC,IAAI,CAAC,qBAAqB,EAAE,6BAA6B,EAAE,CAAC,CAAC;YACzG,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,CAAM;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;YAC5G,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;YAClH,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;YAC7G,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;QACrH,CAAC;IACH,CAAC;CACF"}

package/dist/irdevice/other.d.ts

@@ -14,7 +14,7 @@ export declare class Others extends irdeviceBase {
     private Door?;
     private Window?;
     private WindowCovering?;
-    private Lock?;
+    private LockMechanism?;
     private Faucet?;
     private Fan?;
     private StatefulProgrammableSwitch?;

package/dist/irdevice/other.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../src/irdevice/other.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAElF;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,YAAY;IAwDpC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB;IAtDtC,OAAO,CAAC,MAAM,CAAC,CAGb;IAEF,OAAO,CAAC,UAAU,CAAC,CAGjB;IAEF,OAAO,CAAC,IAAI,CAAC,CAGX;IAEF,OAAO,CAAC,MAAM,CAAC,CAGb;IAEF,OAAO,CAAC,cAAc,CAAC,CAGrB;IAEF,OAAO,CAAC,IAAI,CAAC,CAGX;IAEF,OAAO,CAAC,MAAM,CAAC,CAGb;IAEF,OAAO,CAAC,GAAG,CAAC,CAGV;IAEF,OAAO,CAAC,0BAA0B,CAAC,CAGjC;IAEF,OAAO,CAAC,MAAM,CAAC,CAGb;IAGF,eAAe,CAAC,EAAE,MAAM,CAAC;gBAGd,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,QAAQ,GAAG,eAAe;IAyRpC;;OAEG;IACG,KAAK,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyEtD;;;;;;;;;OASG;IACG,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBzC,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB1C,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3C,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IA0J7C,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAkC/B,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,uBAAuB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IASpE,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,gBAAgB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,2BAA2B,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IASxE,uCAAuC,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IASpF,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,sBAAsB,CAAC,MAAM,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CAchF"}
+{"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../src/irdevice/other.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAElF;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,YAAY;IAkEpC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB;IAhEtC,OAAO,CAAC,MAAM,CAAC,CAIb;IAEF,OAAO,CAAC,UAAU,CAAC,CAIjB;IAEF,OAAO,CAAC,IAAI,CAAC,CAIX;IAEF,OAAO,CAAC,MAAM,CAAC,CAIb;IAEF,OAAO,CAAC,cAAc,CAAC,CAIrB;IAEF,OAAO,CAAC,aAAa,CAAC,CAIpB;IAEF,OAAO,CAAC,MAAM,CAAC,CAIb;IAEF,OAAO,CAAC,GAAG,CAAC,CAIV;IAEF,OAAO,CAAC,0BAA0B,CAAC,CAIjC;IAEF,OAAO,CAAC,MAAM,CAAC,CAIb;IAGF,eAAe,CAAC,EAAE,MAAM,CAAC;gBAGd,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,QAAQ,GAAG,eAAe;IAmUpC;;OAEG;IACG,KAAK,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyEtD;;;;;;;;;OASG;IACG,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBzC,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB1C,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3C,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IA8J7C,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAkC/B,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,uBAAuB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IASpE,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,gBAAgB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,2BAA2B,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IASxE,uCAAuC,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IASpF,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE,sBAAsB,CAAC,MAAM,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CAchF"}

package/dist/irdevice/other.js

@@ -18,7 +18,7 @@ export class Others extends irdeviceBase {
     Door;
     Window;
     WindowCovering;
-    Lock;
+    LockMechanism;
     Faucet;
     Fan;
     StatefulProgrammableSwitch;
@@ -32,11 +32,23 @@ export class Others extends irdeviceBase {
         this.getOtherConfigSettings(device);
         // deviceType
         if (this.otherDeviceType === 'switch') {
-            // Initialize Switch property
+            // Initialize Switch Service
+            accessory.context.Switch = accessory.context.Switch ?? {};
             this.Switch = {
-                Service: accessory.getService(this.hap.Service.Switch),
-                On: accessory.context.On || false,
+                Name: accessory.context.Switch.Name ?? `${accessory.displayName} Switch`,
+                Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch),
+                On: accessory.context.On ?? false,
             };
+            accessory.context.Switch = this.Switch;
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Switch`);
+            this.Switch.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .getCharacteristic(this.hap.Characteristic.On)
+                .onGet(() => {
+                return this.Switch.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -46,20 +58,26 @@ export class Others extends irdeviceBase {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add Switch Service
-            const SwitchService = `${accessory.displayName} Switch`;
-            (this.Switch.Service = accessory.getService(this.hap.Service.Switch)
-                || accessory.addService(this.hap.Service.Switch)), SwitchService;
-            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Switch`);
-            this.Switch.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.Switch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'garagedoor') {
-            // Initialize Garage Door property
+            // Initialize Garage Door Service
+            accessory.context.GarageDoor = accessory.context.GarageDoor ?? {};
             this.GarageDoor = {
-                Service: accessory.getService(this.hap.Service.GarageDoorOpener),
-                On: accessory.context.On || false,
+                Name: accessory.context.GarageDoor.Name ?? `${accessory.displayName} Garage Door`,
+                Service: accessory.getService(this.hap.Service.GarageDoorOpener) ?? accessory.addService(this.hap.Service.GarageDoorOpener),
+                On: accessory.context.On ?? false,
             };
+            accessory.context.GarageDoor = this.GarageDoor;
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Garage Door Opener`);
+            this.GarageDoor.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .setCharacteristic(this.hap.Characteristic.ObstructionDetected, false)
+                .getCharacteristic(this.hap.Characteristic.TargetDoorState)
+                .onGet(() => {
+                return this.GarageDoor.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -69,117 +87,129 @@ export class Others extends irdeviceBase {
             this.removeWindowService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add GarageDoor Service
-            const GarageDoorService = `${accessory.displayName} Garage Door Opener`;
-            (this.GarageDoor.Service = accessory.getService(this.hap.Service.GarageDoorOpener)
-                || accessory.addService(this.hap.Service.GarageDoorOpener)), GarageDoorService;
-            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Garage Door Opener`);
-            this.GarageDoor.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.GarageDoor.Service.getCharacteristic(this.hap.Characteristic.TargetDoorState).onSet(this.OnSet.bind(this));
-            this.GarageDoor.Service.setCharacteristic(this.hap.Characteristic.ObstructionDetected, false);
         }
         else if (this.otherDeviceType === 'door') {
-            // Initialize Door property
+            // Initialize Door Service
+            accessory.context.Door = accessory.context.Door ?? {};
             this.Door = {
-                Service: accessory.getService(this.hap.Service.Door),
-                On: accessory.context.On || false,
+                Name: accessory.context.Door.Name ?? `${accessory.displayName} Door`,
+                Service: accessory.getService(this.hap.Service.Door) ?? accessory.addService(this.hap.Service.Door),
+                On: accessory.context.On ?? false,
             };
-            this.removeFanService(accessory);
-            this.removeLockService(accessory);
-            this.removeOutletService(accessory);
-            this.removeFaucetService(accessory);
-            this.removeSwitchService(accessory);
-            this.removeWindowService(accessory);
-            this.removeGarageDoorService(accessory);
-            this.removeWindowCoveringService(accessory);
-            this.removeStatefulProgrammableSwitchService(accessory);
-            // Add Door Service
-            const DoorService = `${accessory.displayName} Door`;
-            (this.Door.Service = accessory.getService(this.hap.Service.Door)
-                || accessory.addService(this.hap.Service.Door)), DoorService;
+            accessory.context.Door = this.Door;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Door`);
-            this.Door.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
             this.Door.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
                 .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
+            })
+                .onGet(() => {
+                return this.GarageDoor.On;
             })
                 .onSet(this.OnSet.bind(this));
-            this.Door.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-        }
-        else if (this.otherDeviceType === 'window') {
-            // Initialize Window property
-            this.Window = {
-                Service: accessory.getService(this.hap.Service.Window),
-                On: accessory.context.On || false,
-            };
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
-            this.removeDoorService(accessory);
             this.removeOutletService(accessory);
             this.removeFaucetService(accessory);
             this.removeSwitchService(accessory);
+            this.removeWindowService(accessory);
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add Window Service
-            const WindowService = `${accessory.displayName} Window`;
-            (this.Window.Service = accessory.getService(this.hap.Service.Window)
-                || accessory.addService(this.hap.Service.Window)), WindowService;
+        }
+        else if (this.otherDeviceType === 'window') {
+            // Initialize Window Service
+            accessory.context.Window = accessory.context.Window ?? {};
+            this.Window = {
+                Name: accessory.context.Window.Name ?? `${accessory.displayName} Window`,
+                Service: accessory.getService(this.hap.Service.Window) ?? accessory.addService(this.hap.Service.Window),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.Window = this.Window;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Window`);
-            this.Window.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.Window.Service
+            this.Window.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
                 .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
+            })
+                .onGet(() => {
+                return this.GarageDoor.On;
             })
                 .onSet(this.OnSet.bind(this));
-            this.Window.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
-        }
-        else if (this.otherDeviceType === 'windowcovering') {
-            // Initialize WindowCovering property
-            this.WindowCovering = {
-                Service: accessory.getService(this.hap.Service.WindowCovering),
-                On: accessory.context.On || false,
-            };
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeOutletService(accessory);
             this.removeFaucetService(accessory);
             this.removeSwitchService(accessory);
-            this.removeWindowService(accessory);
             this.removeGarageDoorService(accessory);
+            this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add WindowCovering Service
-            const WindowCoveringService = `${accessory.displayName} Window Covering`;
-            (this.WindowCovering.Service = accessory.getService(this.hap.Service.WindowCovering)
-                || accessory.addService(this.hap.Service.WindowCovering)), WindowCoveringService;
+        }
+        else if (this.otherDeviceType === 'windowcovering') {
+            // Initialize WindowCovering Service
+            accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
+            this.WindowCovering = {
+                Name: accessory.context.WindowCovering.Name ?? `${accessory.displayName} Window Covering`,
+                Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering),
+                On: accessory.context.On ?? false,
+            };
+            accessory.context.WindowCovering = this.WindowCovering;
             this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Window Covering`);
-            this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
             this.WindowCovering.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED)
                 .getCharacteristic(this.hap.Characteristic.TargetPosition)
                 .setProps({
                 validValues: [0, 100],
                 minValue: 0,
                 maxValue: 100,
                 minStep: 100,
+            })
+                .onGet(() => {
+                return this.WindowCovering.On;
             })
                 .onSet(this.OnSet.bind(this));
-            this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+            // Remove other services
+            this.removeFanService(accessory);
+            this.removeLockService(accessory);
+            this.removeDoorService(accessory);
+            this.removeOutletService(accessory);
+            this.removeFaucetService(accessory);
+            this.removeSwitchService(accessory);
+            this.removeWindowService(accessory);
+            this.removeGarageDoorService(accessory);
+            this.removeStatefulProgrammableSwitchService(accessory);
         }
         else if (this.otherDeviceType === 'lock') {
-            // Initialize Lock property
-            this.Lock = {
-                Service: accessory.getService(this.hap.Service.LockMechanism),
-                On: accessory.context.On || false,
+            // Initialize LockMechanism Service
+            accessory.context.LockMechanism = accessory.context.LockMechanism ?? {};
+            this.LockMechanism = {
+                Name: accessory.context.LockMechanism.Name ?? `${accessory.displayName} Lock`,
+                Service: accessory.getService(this.hap.Service.LockMechanism) ?? accessory.addService(this.hap.Service.LockMechanism),
+                On: accessory.context.On ?? false,
             };
+            accessory.context.LockMechanism = this.LockMechanism;
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Lock`);
+            this.LockMechanism.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .getCharacteristic(this.hap.Characteristic.LockTargetState)
+                .onGet(() => {
+                return this.LockMechanism.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeDoorService(accessory);
             this.removeOutletService(accessory);
@@ -189,20 +219,25 @@ export class Others extends irdeviceBase {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add Lock Service
-            const LockService = `${accessory.displayName} Lock`;
-            (this.Lock.Service = accessory.getService(this.hap.Service.LockMechanism)
-                || accessory.addService(this.hap.Service.LockMechanism)), LockService;
-            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Lock`);
-            this.Lock.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.Lock.Service.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'faucet') {
-            // Initialize Faucet property
+            // Initialize Faucet Service
+            accessory.context.Faucet = accessory.context.Faucet ?? {};
             this.Faucet = {
-                Service: accessory.getService(this.hap.Service.Faucet),
-                On: accessory.context.On || false,
+                Name: accessory.context.Faucet.Name ?? `${accessory.displayName} Faucet`,
+                Service: accessory.getService(this.hap.Service.Faucet) ?? accessory.addService(this.hap.Service.Faucet),
+                On: accessory.context.On ?? false,
             };
+            accessory.context.Faucet = this.Faucet;
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Faucet`);
+            this.Faucet.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .getCharacteristic(this.hap.Characteristic.Active)
+                .onGet(() => {
+                return this.Faucet.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -212,20 +247,25 @@ export class Others extends irdeviceBase {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add Faucet Service
-            const FaucetService = `${accessory.displayName} Faucet`;
-            (this.Faucet.Service = accessory.getService(this.hap.Service.Faucet)
-                || accessory.addService(this.hap.Service.Faucet)), FaucetService;
-            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Faucet`);
-            this.Faucet.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.Faucet.Service.getCharacteristic(this.hap.Characteristic.Active).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'fan') {
-            // Initialize Fan property
+            // Initialize Fan Service
+            accessory.context.Fan = accessory.context.Fan ?? {};
             this.Fan = {
-                Service: accessory.getService(this.hap.Service.Fanv2),
-                On: accessory.context.On || false,
+                Name: accessory.context.Fan.Name ?? `${accessory.displayName} Fan`,
+                Service: accessory.getService(this.hap.Service.Fanv2) ?? accessory.addService(this.hap.Service.Fanv2),
+                On: accessory.context.On ?? false,
             };
+            accessory.context.Fan = this.Fan;
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Fan`);
+            this.Fan.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .getCharacteristic(this.hap.Characteristic.On)
+                .onGet(() => {
+                return this.Fan.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeFaucetService(accessory);
@@ -235,20 +275,26 @@ export class Others extends irdeviceBase {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add Fan Service
-            const FanService = `${accessory.displayName} Fan`;
-            (this.Fan.Service = accessory.getService(this.hap.Service.Fanv2)
-                || accessory.addService(this.hap.Service.Fanv2)), FanService;
-            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Fan`);
-            this.Fan.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.Fan.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
         else if (this.otherDeviceType === 'stateful') {
-            // Initialize StatefulProgrammableSwitch property
+            // Initialize StatefulProgrammableSwitch Service
+            accessory.context.StatefulProgrammableSwitch = accessory.context.StatefulProgrammableSwitch ?? {};
             this.StatefulProgrammableSwitch = {
-                Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch),
-                On: accessory.context.On || false,
+                Name: accessory.context.StatefulProgrammableSwitch.Name ?? `${accessory.displayName} Stateful Programmable Switch`,
+                Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
+                    ?? accessory.addService(this.hap.Service.StatefulProgrammableSwitch),
+                On: accessory.context.On ?? false,
             };
+            accessory.context.StatefulProgrammableSwitch = this.StatefulProgrammableSwitch;
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
+            this.StatefulProgrammableSwitch.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
+                .onGet(() => {
+                return this.StatefulProgrammableSwitch.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -258,22 +304,25 @@ export class Others extends irdeviceBase {
             this.removeWindowService(accessory);
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
-            // Add StatefulProgrammableSwitch.Service
-            const StatefulProgrammableSwitchService = `${accessory.displayName} Stateful Programmable Switch`;
-            (this.StatefulProgrammableSwitch.Service = accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
-                || accessory.addService(this.hap.Service.StatefulProgrammableSwitch)), StatefulProgrammableSwitchService;
-            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
-            this.StatefulProgrammableSwitch.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.StatefulProgrammableSwitch.Service
-                .getCharacteristic(this.hap.Characteristic.ProgrammableSwitchOutputState)
-                .onSet(this.OnSet.bind(this));
         }
         else {
-            // Initialize Outlet property
+            // Initialize Outlet Service
+            accessory.context.Outlet = accessory.context.Outlet ?? {};
             this.Outlet = {
-                Service: accessory.getService(this.hap.Service.Outlet),
-                On: accessory.context.On || false,
+                Name: accessory.context.Outlet.Name ?? `${accessory.displayName} Outlet`,
+                Service: accessory.getService(this.hap.Service.Outlet) ?? accessory.addService(this.hap.Service.Outlet),
+                On: accessory.context.On ?? false,
             };
+            accessory.context.Outlet = this.Outlet;
+            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Outlet`);
+            this.Outlet.Service
+                .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+                .getCharacteristic(this.hap.Characteristic.On)
+                .onGet(() => {
+                return this.Outlet.On;
+            })
+                .onSet(this.OnSet.bind(this));
+            // Remove other services
             this.removeFanService(accessory);
             this.removeLockService(accessory);
             this.removeDoorService(accessory);
@@ -283,13 +332,6 @@ export class Others extends irdeviceBase {
             this.removeGarageDoorService(accessory);
             this.removeWindowCoveringService(accessory);
             this.removeStatefulProgrammableSwitchService(accessory);
-            // Add Outlet.Service
-            const OutletService = `${accessory.displayName} Outlet`;
-            (this.Outlet.Service = accessory.getService(this.hap.Service.Outlet)
-                || accessory.addService(this.hap.Service.Outlet)), OutletService;
-            this.debugWarnLog(`${this.device.remoteType}: ${accessory.displayName} Displaying as Outlet`);
-            this.Outlet.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-            this.Outlet.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         }
     }
     /**
@@ -340,12 +382,12 @@ export class Others extends irdeviceBase {
         else if (this.otherDeviceType === 'lock') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
             if (value === this.hap.Characteristic.LockTargetState.SECURED) {
-                this.Lock.On = false;
+                this.LockMechanism.On = false;
             }
             else {
-                this.Lock.On = true;
+                this.LockMechanism.On = true;
             }
-            On = this.Lock.On;
+            On = this.LockMechanism.On;
         }
         else if (this.otherDeviceType === 'faucet') {
             this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Set Active: ${value}`);
@@ -553,24 +595,24 @@ export class Others extends irdeviceBase {
             this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Window Covering On: ${this.WindowCovering.On}`);
         }
         else if (this.otherDeviceType === 'lock') {
-            if (this.Lock.On === undefined) {
-                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.Lock.On}`);
+            if (this.LockMechanism?.On === undefined) {
+                this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} On: ${this.LockMechanism?.On}`);
             }
             else {
-                if (this.Lock.On) {
-                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
-                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
+                if (this.LockMechanism.On) {
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.UNSECURED);
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.UNSECURED);
                     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-                        + ` LockTargetState: UNSECURED, LockCurrentState: UNSECURE (${this.Lock.On})`);
+                        + ` LockTargetState: UNSECURED, LockCurrentState: UNSECURE (${this.LockMechanism.On})`);
                 }
                 else {
-                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
-                    this.Lock.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
+                    this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
                     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
-                        + ` LockTargetState: SECURED, LockCurrentState: SECURED (${this.Lock.On})`);
+                        + ` LockTargetState: SECURED, LockCurrentState: SECURED (${this.LockMechanism.On})`);
                 }
             }
-            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Lock On: ${this.Lock.On}`);
+            this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Lock On: ${this.LockMechanism?.On}`);
         }
         else if (this.otherDeviceType === 'faucet') {
             if (this.Faucet.On === undefined) {
@@ -711,10 +753,10 @@ export class Others extends irdeviceBase {
     }
     async removeLockService(accessory) {
         // If Lock.Service still present, then remove first
-        if (this.Lock?.Service) {
-            this.Lock.Service = this.accessory.getService(this.hap.Service.LockMechanism);
+        if (this.LockMechanism?.Service) {
+            this.LockMechanism.Service = this.accessory.getService(this.hap.Service.LockMechanism);
             this.warnLog(`${this.device.remoteType}: ${accessory.displayName} Removing Leftover Lock Service`);
-            accessory.removeService(this.Lock.Service);
+            accessory.removeService(this.LockMechanism.Service);
         }
     }
     async removeFaucetService(accessory) {