homebridge-nanoleaf-multi 4.0.2 → 5.0.1

package/dist/Device.d.ts

@@ -13,5 +13,6 @@ export declare class Device {
     private withWriteLock;
     setActive(active: boolean): Promise<void>;
     setActiveEffect(effect: Effect<any>): Promise<void>;
+    setBrightness(brightness: number): Promise<void>;
     addNativeEffect(nativeEffect: NativeEffect): Promise<void>;
 }

package/dist/Device.js

@@ -96,6 +96,13 @@ class Device {
             }));
         });
     }
+    setBrightness(brightness) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.withWriteLock(() => __awaiter(this, void 0, void 0, function* () {
+                yield this.nanoleafClient.setBrightness(brightness * 100);
+            }));
+        });
+    }
     addNativeEffect(nativeEffect) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.withWriteLock(() => __awaiter(this, void 0, void 0, function* () {

package/dist/Device.js.map

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

package/dist/Zone.d.ts

@@ -15,16 +15,22 @@ export declare class Zone extends EventEmitter {
     initialize(): Promise<void>;
     private devices;
     private get devicesArray();
+    private active;
+    getActive(): boolean;
     setActive(active: boolean): Promise<void>;
     private effects;
-    private activeEffectId;
     getEffects(): Map<string, Effect<any>>;
     getEffect<T extends Effect<any> = Effect<EffectConfigurationBase>>(effectId: string): T | null;
+    getDefaultEffectId(): string;
+    private effectId;
+    getEffectIdOrDefault(): string;
+    get effect(): Effect<EffectConfigurationBase>;
+    get activeEffectId(): string;
     get activeEffect(): Effect<EffectConfigurationBase>;
-    getDefaultActiveEffectId(): string;
     setActiveEffectById(effectId: string): Promise<void>;
-    setActiveEffect(effect: Effect<any>): Promise<void>;
-    getActiveEffectId(): string;
+    private brightness;
+    getBrightness(): number;
+    setBrightness(brightness: number): Promise<void>;
     private autoOffTimeout;
     private setAutoOffTimeout;
     private clearAutoOffTimeout;

package/dist/Zone.js

@@ -28,6 +28,8 @@ class Zone extends events_1.default {
         this.devices = new Set();
         // Effects
         this.effects = new Map();
+        // Brightness
+        this.brightness = 1;
         this.configuration = configuration;
         this.context = context;
         configuration.devices.forEach((deviceConfiguration) => {
@@ -44,7 +46,7 @@ class Zone extends events_1.default {
                 if (this.activeEffectId !== effect.id)
                     return;
                 this.context.log.info(`The active effect '${effect.name}' changed, applying to zone`);
-                this.setActiveEffect(effect);
+                this.setActiveEffectById(effect.id);
             });
             this.effects.set(effect.id, effect);
         });
@@ -89,18 +91,18 @@ class Zone extends events_1.default {
     get devicesArray() {
         return Array.from(this.devices);
     }
+    getActive() {
+        return !!this.active;
+    }
     setActive(active) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!active) {
                 this.clearAutoOffTimeout();
             }
+            this.active = active;
             yield Promise.all(this.devicesArray.map((device) => __awaiter(this, void 0, void 0, function* () {
                 yield device.setActive(active);
             })));
-            const { activeEffect } = this;
-            if (active && !!activeEffect) {
-                yield this.setActiveEffect(activeEffect);
-            }
         });
     }
     getEffects() {
@@ -110,24 +112,37 @@ class Zone extends events_1.default {
         const effect = this.effects.get(effectId);
         return effect || null;
     }
-    get activeEffect() {
-        return this.getEffect(this.activeEffectId);
-    }
-    getDefaultActiveEffectId() {
+    getDefaultEffectId() {
         if (this.effects.size === 0) {
             return null;
         }
         return Array.from(this.effects.values())[0].id;
     }
-    setActiveEffectById(effectId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.activeEffectId = effectId;
-            yield this.setActiveEffect(this.activeEffect);
-        });
+    getEffectIdOrDefault() {
+        var _a;
+        return (_a = this.effectId) !== null && _a !== void 0 ? _a : this.getDefaultEffectId();
+    }
+    get effect() {
+        return this.getEffect(this.getEffectIdOrDefault());
+    }
+    get activeEffectId() {
+        if (!this.active)
+            return null;
+        return this.effectId;
     }
-    setActiveEffect(effect) {
+    get activeEffect() {
+        if (!this.activeEffectId)
+            return null;
+        return this.getEffect(this.activeEffectId);
+    }
+    setActiveEffectById(effectId) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.effectId = effectId;
             this.clearAutoOffTimeout();
+            if (!this.active) {
+                this.setActive(true);
+            }
+            const effect = this.activeEffect;
             yield Promise.all(Array.from(this.devices).map((device) => {
                 return device.setActiveEffect(effect);
             }));
@@ -136,8 +151,32 @@ class Zone extends events_1.default {
             }
         });
     }
-    getActiveEffectId() {
-        return this.activeEffectId;
+    getBrightness() {
+        if (!this.active)
+            return 0;
+        return this.brightness;
+    }
+    setBrightness(brightness) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const previousBrightness = this.brightness;
+            const previousActive = previousBrightness > 0;
+            const active = brightness > 0;
+            // if (this.context.persistence) {
+            //   this.context.log.debug(
+            //     `Persisting zone ${logAccessoryName(
+            //       this.name
+            //     )} brightness = ${logPercent(brightness)}`
+            //   );
+            //   await this.context.persistence.setZoneBrightness(this.id, brightness);
+            // }
+            if (brightness > 0) {
+                this.brightness = brightness;
+                yield Promise.all(this.devicesArray.map((device) => device.setBrightness(brightness)));
+            }
+            if (active !== previousActive) {
+                this.setActive(active);
+            }
+        });
     }
     setAutoOffTimeout(duration) {
         this.autoOffTimeout = setTimeout(() => __awaiter(this, void 0, void 0, function* () {

package/dist/Zone.js.map

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

package/dist/accessories/ZoneBrightnessAccessory.d.ts

@@ -0,0 +1,9 @@
+import { BrightnessAccessory } from 'helpers-for-homebridge';
+import { Context } from '../types';
+import { Zone } from '../Zone';
+export declare class ZoneBrightnessAccessory extends BrightnessAccessory {
+    private readonly zone;
+    constructor(zone: Zone, context: Context);
+    getBrightness(): Promise<number>;
+    setBrightness(brightness: number): Promise<void>;
+}

package/dist/accessories/ZoneBrightnessAccessory.js

@@ -0,0 +1,35 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZoneBrightnessAccessory = void 0;
+const helpers_for_homebridge_1 = require("helpers-for-homebridge");
+class ZoneBrightnessAccessory extends helpers_for_homebridge_1.BrightnessAccessory {
+    constructor(zone, context) {
+        super({
+            name: zone.name + ' Brightness',
+            serial: zone.id + '_brightness',
+            model: 'Nanoleaf Multi Zone Brightness',
+        }, context);
+        this.zone = zone;
+    }
+    getBrightness() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.zone.getBrightness();
+        });
+    }
+    setBrightness(brightness) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.zone.setBrightness(brightness);
+        });
+    }
+}
+exports.ZoneBrightnessAccessory = ZoneBrightnessAccessory;
+//# sourceMappingURL=ZoneBrightnessAccessory.js.map

package/dist/accessories/ZoneBrightnessAccessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ZoneBrightnessAccessory.js","sourceRoot":"","sources":["../../src/accessories/ZoneBrightnessAccessory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAA6D;AAI7D,MAAa,uBAAwB,SAAQ,4CAAmB;IAC9D,YACmB,IAAU,EAC3B,OAAgB;QAEhB,KAAK,CACH;YACE,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,aAAa;YAC/B,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,aAAa;YAC/B,KAAK,EAAE,gCAAgC;SACxC,EACD,OAAO,CACR,CAAC;QAVe,SAAI,GAAJ,IAAI,CAAM;IAW7B,CAAC;IAEqB,aAAa;;YACjC,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnC,CAAC;KAAA;IAEqB,aAAa,CAAC,UAAkB;;YACpD,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC;KAAA;CACF;AAtBD,0DAsBC"}

package/dist/accessories/{ZoneAccessory.d.ts → ZoneEffectAccessory.d.ts}

@@ -1,11 +1,9 @@
 import { SelectionAccessory } from 'helpers-for-homebridge';
 import { Context } from '../types';
 import { Zone } from '../Zone';
-export declare class ZoneAccessory extends SelectionAccessory {
+export declare class ZoneEffectAccessory extends SelectionAccessory {
     private readonly zone;
     constructor(zone: Zone, context: Context);
-    private active;
-    private activeOptionId;
     protected getActiveOptionId(): Promise<string>;
     protected setActiveOptionId(effectId: string): Promise<void>;
     protected getActive(): Promise<boolean>;

package/dist/accessories/{ZoneAccessory.js → ZoneEffectAccessory.js}

@@ -9,14 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZoneAccessory = void 0;
+exports.ZoneEffectAccessory = void 0;
 const helpers_for_homebridge_1 = require("helpers-for-homebridge");
-class ZoneAccessory extends helpers_for_homebridge_1.SelectionAccessory {
+const constants_1 = require("../constants");
+class ZoneEffectAccessory extends helpers_for_homebridge_1.SelectionAccessory {
     constructor(zone, context) {
         super({
-            name: zone.name,
-            serial: zone.id,
-            model: 'Nanoleaf Multi Zone',
+            name: zone.name + ' Effect',
+            serial: zone.id + '_effect',
+            model: 'Nanoleaf Multi Zone Effect',
+            mode: constants_1.ZONE_EFFECT_SELECTION_ACCESSORY_MODE,
             options: zone.configuration.effects.map((effectConfiguration) => {
                 return {
                     name: effectConfiguration.name,
@@ -26,31 +28,27 @@ class ZoneAccessory extends helpers_for_homebridge_1.SelectionAccessory {
             }),
         }, context);
         this.zone = zone;
-        this.active = false;
-        this.activeOptionId = this.configuration.options[0].id;
     }
     getActiveOptionId() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.activeOptionId;
+            return this.zone.getEffectIdOrDefault();
         });
     }
     setActiveOptionId(effectId) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.activeOptionId = effectId;
             yield this.zone.setActiveEffectById(effectId);
         });
     }
     getActive() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.active;
+            return this.zone.getActive();
         });
     }
     setActive(active) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.active = active;
             yield this.zone.setActive(active);
         });
     }
 }
-exports.ZoneAccessory = ZoneAccessory;
-//# sourceMappingURL=ZoneAccessory.js.map
+exports.ZoneEffectAccessory = ZoneEffectAccessory;
+//# sourceMappingURL=ZoneEffectAccessory.js.map

package/dist/accessories/ZoneEffectAccessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ZoneEffectAccessory.js","sourceRoot":"","sources":["../../src/accessories/ZoneEffectAccessory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAA4D;AAG5D,4CAAoE;AAEpE,MAAa,mBAAoB,SAAQ,2CAAkB;IACzD,YACmB,IAAU,EAC3B,OAAgB;QAEhB,KAAK,CACH;YACE,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS;YAC3B,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,SAAS;YAC3B,KAAK,EAAE,4BAA4B;YACnC,IAAI,EAAE,gDAAoC;YAC1C,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,EAAE;gBAC9D,OAAO;oBACL,IAAI,EAAE,mBAAmB,CAAC,IAAI;oBAC9B,EAAE,EAAE,mBAAmB,CAAC,EAAE;oBAC1B,aAAa,EAAE,mBAAmB,CAAC,aAAa;iBACjD,CAAC;YACJ,CAAC,CAAC;SACH,EACD,OAAO,CACR,CAAC;QAlBe,SAAI,GAAJ,IAAI,CAAM;IAmB7B,CAAC;IAEwB,iBAAiB;;YACxC,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAEwB,iBAAiB,CAAC,QAAgB;;YACzD,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC;KAAA;IAEwB,SAAS;;YAChC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,CAAC;KAAA;IAEwB,SAAS,CAAC,MAAe;;YAChD,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;KAAA;CACF;AAtCD,kDAsCC"}

package/dist/accessories/index.d.ts

@@ -1 +1,2 @@
-export * from './ZoneAccessory';
+export * from './ZoneBrightnessAccessory';
+export * from './ZoneEffectAccessory';

package/dist/accessories/index.js

@@ -14,5 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ZoneAccessory"), exports);
+__exportStar(require("./ZoneBrightnessAccessory"), exports);
+__exportStar(require("./ZoneEffectAccessory"), exports);
 //# sourceMappingURL=index.js.map

package/dist/accessories/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accessories/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accessories/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,wDAAsC"}

package/dist/constants.d.ts

@@ -1,5 +1,6 @@
 import { ColorHSV } from '@manganese/palette-kit-core';
 import { NativeEffect, NativeEffectType } from './types';
+import { SelectionAccessoryMode } from 'helpers-for-homebridge';
 export declare const OFF_COLOR: ColorHSV;
 export declare const DEFAULT_DEVICE_SIZE = 50;
 export declare const EFFECT_CHANGE_EVENT = "change";
@@ -8,3 +9,4 @@ export declare const DEFAULT_NATIVE_EFFECT_NAME = "Dynamic Effect";
 export declare const NATIVE_EFFECT_TYPE_UUIDS: Map<NativeEffectType, string>;
 export declare const NATIVE_EFFECT_BASE: NativeEffect;
 export declare const ZONE_AUTO_OFF_EVENT = "zone_auto_off";
+export declare const ZONE_EFFECT_SELECTION_ACCESSORY_MODE: SelectionAccessoryMode;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZONE_AUTO_OFF_EVENT = exports.NATIVE_EFFECT_BASE = exports.NATIVE_EFFECT_TYPE_UUIDS = exports.DEFAULT_NATIVE_EFFECT_NAME = exports.EFFECT_SPEED_COEFFICIENT = exports.EFFECT_CHANGE_EVENT = exports.DEFAULT_DEVICE_SIZE = exports.OFF_COLOR = void 0;
+exports.ZONE_EFFECT_SELECTION_ACCESSORY_MODE = exports.ZONE_AUTO_OFF_EVENT = exports.NATIVE_EFFECT_BASE = exports.NATIVE_EFFECT_TYPE_UUIDS = exports.DEFAULT_NATIVE_EFFECT_NAME = exports.EFFECT_SPEED_COEFFICIENT = exports.EFFECT_CHANGE_EVENT = exports.DEFAULT_DEVICE_SIZE = exports.OFF_COLOR = void 0;
 const palette_kit_core_1 = require("@manganese/palette-kit-core");
 const types_1 = require("./types");
 exports.OFF_COLOR = {
@@ -33,4 +33,5 @@ exports.NATIVE_EFFECT_BASE = {
     hasOverlay: false,
 };
 exports.ZONE_AUTO_OFF_EVENT = 'zone_auto_off';
+exports.ZONE_EFFECT_SELECTION_ACCESSORY_MODE = 'outlet';
 //# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,kEAAmE;AACnE,mCAAyD;AAE5C,QAAA,SAAS,GAAa;IACjC,KAAK,EAAE,6BAAU,CAAC,GAAG;IACrB,GAAG,EAAE,CAAC;IACN,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,CAAC;CACT,CAAC;AACW,QAAA,mBAAmB,GAAG,EAAE,CAAC;AACzB,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,wBAAwB,GAAG,GAAG,CAAC;AAC/B,QAAA,0BAA0B,GAAG,gBAAgB,CAAC;AAC9C,QAAA,wBAAwB,GAAG,IAAI,GAAG,CAA2B;IACxE,CAAC,wBAAgB,CAAC,KAAK,EAAE,sCAAsC,CAAC;IAChE,CAAC,wBAAgB,CAAC,IAAI,EAAE,sCAAsC,CAAC;IAC/D,CAAC,wBAAgB,CAAC,OAAO,EAAE,sCAAsC,CAAC;IAClE,CAAC,wBAAgB,CAAC,IAAI,EAAE,sCAAsC,CAAC;IAC/D,CAAC,wBAAgB,CAAC,MAAM,EAAE,sCAAsC,CAAC;IACjE,CAAC,wBAAgB,CAAC,SAAS,EAAE,sCAAsC,CAAC;CACrE,CAAC,CAAC;AACU,QAAA,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,kCAA0B;IACpC,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,OAAO;IACnB,UAAU,EAAE,gCAAwB,CAAC,GAAG,CAAC,wBAAgB,CAAC,IAAI,CAAC;IAC/D,aAAa,EAAE,EAAE;IACjB,UAAU,EAAE,KAAK;CAClB,CAAC;AACW,QAAA,mBAAmB,GAAG,eAAe,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,kEAAmE;AACnE,mCAAyD;AAG5C,QAAA,SAAS,GAAa;IACjC,KAAK,EAAE,6BAAU,CAAC,GAAG;IACrB,GAAG,EAAE,CAAC;IACN,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,CAAC;CACT,CAAC;AACW,QAAA,mBAAmB,GAAG,EAAE,CAAC;AACzB,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,wBAAwB,GAAG,GAAG,CAAC;AAC/B,QAAA,0BAA0B,GAAG,gBAAgB,CAAC;AAC9C,QAAA,wBAAwB,GAAG,IAAI,GAAG,CAA2B;IACxE,CAAC,wBAAgB,CAAC,KAAK,EAAE,sCAAsC,CAAC;IAChE,CAAC,wBAAgB,CAAC,IAAI,EAAE,sCAAsC,CAAC;IAC/D,CAAC,wBAAgB,CAAC,OAAO,EAAE,sCAAsC,CAAC;IAClE,CAAC,wBAAgB,CAAC,IAAI,EAAE,sCAAsC,CAAC;IAC/D,CAAC,wBAAgB,CAAC,MAAM,EAAE,sCAAsC,CAAC;IACjE,CAAC,wBAAgB,CAAC,SAAS,EAAE,sCAAsC,CAAC;CACrE,CAAC,CAAC;AACU,QAAA,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,kCAA0B;IACpC,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,OAAO;IACnB,UAAU,EAAE,gCAAwB,CAAC,GAAG,CAAC,wBAAgB,CAAC,IAAI,CAAC;IAC/D,aAAa,EAAE,EAAE;IACjB,UAAU,EAAE,KAAK;CAClB,CAAC;AACW,QAAA,mBAAmB,GAAG,eAAe,CAAC;AACtC,QAAA,oCAAoC,GAC/C,QAAQ,CAAC"}

package/dist/platformFactory.js

@@ -43,14 +43,17 @@ exports.default = (homebridge) => {
         accessories(callback) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.context.paletteClient.connect();
-                const zoneAccessories = yield Promise.all(Array.from(this.zones.values()).map((zone) => __awaiter(this, void 0, void 0, function* () {
-                    yield zone.initialize();
-                    const zoneAccessory = new accessories_1.ZoneAccessory(zone, this.context);
+                yield Promise.all(Array.from(this.zones.values()).map((zone) => __awaiter(this, void 0, void 0, function* () {
+                    return yield zone.initialize();
+                })));
+                const zoneAccessories = yield Promise.all(Array.from(this.zones.values()).flatMap((zone) => {
+                    const zoneEffectAccessory = new accessories_1.ZoneEffectAccessory(zone, this.context);
+                    const zoneBrightnessAccessory = new accessories_1.ZoneBrightnessAccessory(zone, this.context);
                     zone.on(constants_1.ZONE_AUTO_OFF_EVENT, () => {
-                        zoneAccessory.updateActive(false);
+                        zoneEffectAccessory.updateActive(false);
                     });
-                    return zoneAccessory;
-                })));
+                    return [zoneEffectAccessory, zoneBrightnessAccessory];
+                }));
                 const accessories = [...zoneAccessories];
                 callback(accessories);
             });

package/dist/platformFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"platformFactory.js","sourceRoot":"","sources":["../src/platformFactory.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAA4C;AAE5C,mEAA+D;AAC/D,kEAAsD;AACtD,sEAA8D;AAG9D,+CAA8C;AAC9C,2CAAkD;AAClD,iCAA8B;AAE9B,kBAAe,CAAC,UAAe,EAAE,EAAE;IACjC,MAAM,QAAQ;QAIZ,YACE,aAAsB,EACb,aAAoC;YAApC,kBAAa,GAAb,aAAa,CAAuB;YAJ/C,UAAK,GAAG,IAAI,GAAG,EAA8B,CAAC;YAM5C,MAAM,GAAG,GAAG,IAAI,2BAAM,CAAC;gBACrB,KAAK,EAAE,OAAO;gBACd,SAAS,EAAE,CAAC,IAAI,8CAAqB,CAAC,aAAa,CAAC,CAAC;aACtD,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,0BAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,IAAI,kCAAa,CACrC,aAAa,CAAC,aAAa,EAC3B;gBACE,GAAG;aACJ,EACD,OAAO,CACR,CAAC;YAEF,IAAI,CAAC,OAAO,GAAG;gBACb,UAAU;gBACV,GAAG;gBACH,OAAO;gBACP,aAAa;aACd,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;gBACrD,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEvD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACL,CAAC;QAEY,WAAW,CAAC,QAAQ;;gBAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;gBAE3C,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;oBACjD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;oBAExB,MAAM,aAAa,GAAG,IAAI,2BAAa,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;oBAE5D,IAAI,CAAC,EAAE,CAAC,+BAAmB,EAAE,GAAG,EAAE;wBAChC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBACpC,CAAC,CAAC,CAAC;oBAEH,OAAO,aAAa,CAAC;gBACvB,CAAC,CAAA,CAAC,CACH,CAAC;gBAEF,MAAM,WAAW,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;gBAEzC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACxB,CAAC;SAAA;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
+{"version":3,"file":"platformFactory.js","sourceRoot":"","sources":["../src/platformFactory.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAA4C;AAE5C,mEAA+D;AAC/D,kEAAsD;AACtD,sEAA8D;AAG9D,+CAA6E;AAC7E,2CAAkD;AAClD,iCAA8B;AAE9B,kBAAe,CAAC,UAAe,EAAE,EAAE;IACjC,MAAM,QAAQ;QAIZ,YACE,aAAsB,EACb,aAAoC;YAApC,kBAAa,GAAb,aAAa,CAAuB;YAJ/C,UAAK,GAAG,IAAI,GAAG,EAA8B,CAAC;YAM5C,MAAM,GAAG,GAAG,IAAI,2BAAM,CAAC;gBACrB,KAAK,EAAE,OAAO;gBACd,SAAS,EAAE,CAAC,IAAI,8CAAqB,CAAC,aAAa,CAAC,CAAC;aACtD,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,0BAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,IAAI,kCAAa,CACrC,aAAa,CAAC,aAAa,EAC3B;gBACE,GAAG;aACJ,EACD,OAAO,CACR,CAAC;YAEF,IAAI,CAAC,OAAO,GAAG;gBACb,UAAU;gBACV,GAAG;gBACH,OAAO;gBACP,aAAa;aACd,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;gBACrD,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEvD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACL,CAAC;QAEY,WAAW,CAAC,QAAQ;;gBAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC3C,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;oBACjD,OAAO,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjC,CAAC,CAAA,CAAC,CACH,CAAC;gBAEF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC/C,MAAM,mBAAmB,GAAG,IAAI,iCAAmB,CACjD,IAAI,EACJ,IAAI,CAAC,OAAO,CACb,CAAC;oBACF,MAAM,uBAAuB,GAAG,IAAI,qCAAuB,CACzD,IAAI,EACJ,IAAI,CAAC,OAAO,CACb,CAAC;oBAEF,IAAI,CAAC,EAAE,CAAC,+BAAmB,EAAE,GAAG,EAAE;wBAChC,mBAAmB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBAC1C,CAAC,CAAC,CAAC;oBAEH,OAAO,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;gBACxD,CAAC,CAAC,CACH,CAAC;gBAEF,MAAM,WAAW,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;gBAEzC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACxB,CAAC;SAAA;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}

package/package.json

@@ -6,7 +6,7 @@
   "keywords": [
     "homebridge-plugin"
   ],
-  "version": "4.0.2",
+  "version": "5.0.1",
   "deprecated": false,
   "author": {
     "name": "Samuel Goodell"
@@ -36,7 +36,7 @@
     "async-lock": "^1.2.4",
     "axios": "^0.19.2",
     "colors": "^1.4.0",
-    "helpers-for-homebridge": "^4.2.3",
+    "helpers-for-homebridge": "^4.4.0",
     "nanoleaf-client-multi": "^2.0.1",
     "rwlock": "^5.0.0",
     "simple-node-logger": "^21.8.12"

package/src/Device.ts

@@ -106,6 +106,12 @@ export class Device {
     });
   }
 
+  public async setBrightness(brightness: number): Promise<void> {
+    await this.withWriteLock(async () => {
+      await this.nanoleafClient.setBrightness(brightness * 100);
+    });
+  }
+
   public async addNativeEffect(nativeEffect: NativeEffect) {
     await this.withWriteLock(async () => {
       await this.nanoleafClient.addEffect(nativeEffect);

package/src/Zone.ts

@@ -48,7 +48,7 @@ export class Zone extends EventEmitter {
           `The active effect '${effect.name}' changed, applying to zone`
         );
 
-        this.setActiveEffect(effect);
+        this.setActiveEffectById(effect.id);
       });
 
       this.effects.set(effect.id, effect);
@@ -119,27 +119,29 @@ export class Zone extends EventEmitter {
     return Array.from(this.devices);
   }
 
+  // Active
+  private active: boolean;
+
+  public getActive() {
+    return !!this.active;
+  }
+
   public async setActive(active: boolean) {
     if (!active) {
       this.clearAutoOffTimeout();
     }
 
+    this.active = active;
+
     await Promise.all(
       this.devicesArray.map(async (device) => {
         await device.setActive(active);
       })
     );
-
-    const { activeEffect } = this;
-
-    if (active && !!activeEffect) {
-      await this.setActiveEffect(activeEffect);
-    }
   }
 
   // Effects
   private effects = new Map<string, Effect<any>>();
-  private activeEffectId: string;
 
   public getEffects() {
     return this.effects;
@@ -153,11 +155,7 @@ export class Zone extends EventEmitter {
     return (effect as T) || null;
   }
 
-  public get activeEffect() {
-    return this.getEffect(this.activeEffectId);
-  }
-
-  public getDefaultActiveEffectId() {
+  public getDefaultEffectId() {
     if (this.effects.size === 0) {
       return null;
     }
@@ -165,15 +163,37 @@ export class Zone extends EventEmitter {
     return Array.from(this.effects.values())[0].id;
   }
 
-  public async setActiveEffectById(effectId: string) {
-    this.activeEffectId = effectId;
+  private effectId: string;
+
+  public getEffectIdOrDefault() {
+    return this.effectId ?? this.getDefaultEffectId();
+  }
+  public get effect() {
+    return this.getEffect(this.getEffectIdOrDefault());
+  }
+
+  public get activeEffectId() {
+    if (!this.active) return null;
+
+    return this.effectId;
+  }
 
-    await this.setActiveEffect(this.activeEffect);
+  public get activeEffect() {
+    if (!this.activeEffectId) return null;
+
+    return this.getEffect(this.activeEffectId);
   }
 
-  public async setActiveEffect(effect: Effect<any>) {
+  public async setActiveEffectById(effectId: string) {
+    this.effectId = effectId;
     this.clearAutoOffTimeout();
 
+    if (!this.active) {
+      this.setActive(true);
+    }
+
+    const effect = this.activeEffect;
+
     await Promise.all(
       Array.from(this.devices).map((device) => {
         return device.setActiveEffect(effect);
@@ -185,8 +205,41 @@ export class Zone extends EventEmitter {
     }
   }
 
-  public getActiveEffectId() {
-    return this.activeEffectId;
+  // Brightness
+  private brightness: number = 1;
+
+  public getBrightness() {
+    if (!this.active) return 0;
+
+    return this.brightness;
+  }
+
+  public async setBrightness(brightness: number): Promise<void> {
+    const previousBrightness = this.brightness;
+    const previousActive = previousBrightness > 0;
+    const active = brightness > 0;
+
+    // if (this.context.persistence) {
+    //   this.context.log.debug(
+    //     `Persisting zone ${logAccessoryName(
+    //       this.name
+    //     )} brightness = ${logPercent(brightness)}`
+    //   );
+
+    //   await this.context.persistence.setZoneBrightness(this.id, brightness);
+    // }
+
+    if (brightness > 0) {
+      this.brightness = brightness;
+
+      await Promise.all(
+        this.devicesArray.map((device) => device.setBrightness(brightness))
+      );
+    }
+
+    if (active !== previousActive) {
+      this.setActive(active);
+    }
   }
 
   // Auto-off

package/src/accessories/ZoneBrightnessAccessory.ts

@@ -0,0 +1,27 @@
+import { BrightnessAccessory } from 'helpers-for-homebridge';
+import { Context } from '../types';
+import { Zone } from '../Zone';
+
+export class ZoneBrightnessAccessory extends BrightnessAccessory {
+  constructor(
+    private readonly zone: Zone,
+    context: Context
+  ) {
+    super(
+      {
+        name: zone.name + ' Brightness',
+        serial: zone.id + '_brightness',
+        model: 'Nanoleaf Multi Zone Brightness',
+      },
+      context
+    );
+  }
+
+  public override async getBrightness(): Promise<number> {
+    return this.zone.getBrightness();
+  }
+
+  public override async setBrightness(brightness: number): Promise<void> {
+    return this.zone.setBrightness(brightness);
+  }
+}

package/src/accessories/{ZoneAccessory.ts → ZoneEffectAccessory.ts}

@@ -1,17 +1,19 @@
 import { SelectionAccessory } from 'helpers-for-homebridge';
 import { Context } from '../types';
 import { Zone } from '../Zone';
+import { ZONE_EFFECT_SELECTION_ACCESSORY_MODE } from '../constants';
 
-export class ZoneAccessory extends SelectionAccessory {
+export class ZoneEffectAccessory extends SelectionAccessory {
   constructor(
     private readonly zone: Zone,
     context: Context
   ) {
     super(
       {
-        name: zone.name,
-        serial: zone.id,
-        model: 'Nanoleaf Multi Zone',
+        name: zone.name + ' Effect',
+        serial: zone.id + '_effect',
+        model: 'Nanoleaf Multi Zone Effect',
+        mode: ZONE_EFFECT_SELECTION_ACCESSORY_MODE,
         options: zone.configuration.effects.map((effectConfiguration) => {
           return {
             name: effectConfiguration.name,
@@ -22,30 +24,21 @@ export class ZoneAccessory extends SelectionAccessory {
       },
       context
     );
-
-    this.activeOptionId = this.configuration.options[0].id;
   }
 
-  private active: boolean = false;
-  private activeOptionId: string;
-
   protected override async getActiveOptionId() {
-    return this.activeOptionId;
+    return this.zone.getEffectIdOrDefault();
   }
 
   protected override async setActiveOptionId(effectId: string) {
-    this.activeOptionId = effectId;
-
     await this.zone.setActiveEffectById(effectId);
   }
 
   protected override async getActive() {
-    return this.active;
+    return this.zone.getActive();
   }
 
   protected override async setActive(active: boolean) {
-    this.active = active;
-
     await this.zone.setActive(active);
   }
 }

package/src/accessories/index.ts

@@ -1 +1,2 @@
-export * from './ZoneAccessory';
+export * from './ZoneBrightnessAccessory';
+export * from './ZoneEffectAccessory';

package/src/constants.ts

@@ -1,5 +1,6 @@
 import { ColorHSV, ColorSpace } from '@manganese/palette-kit-core';
 import { NativeEffect, NativeEffectType } from './types';
+import { SelectionAccessoryMode } from 'helpers-for-homebridge';
 
 export const OFF_COLOR: ColorHSV = {
   space: ColorSpace.HSV,
@@ -31,3 +32,5 @@ export const NATIVE_EFFECT_BASE: NativeEffect = {
   hasOverlay: false,
 };
 export const ZONE_AUTO_OFF_EVENT = 'zone_auto_off';
+export const ZONE_EFFECT_SELECTION_ACCESSORY_MODE: SelectionAccessoryMode =
+  'outlet';

package/src/platformFactory.ts

@@ -5,7 +5,7 @@ import { Palette } from '@manganese/palette-kit-core';
 import { PaletteClient } from '@manganese/palette-kit-client';
 
 import { PlatformConfiguration, Context } from './types';
-import { ZoneAccessory } from './accessories';
+import { ZoneBrightnessAccessory, ZoneEffectAccessory } from './accessories';
 import { ZONE_AUTO_OFF_EVENT } from './constants';
 import { Zone } from './Zone';
 
@@ -48,18 +48,28 @@ export default (homebridge: any) => {
 
     public async accessories(callback) {
       await this.context.paletteClient.connect();
-
-      const zoneAccessories = await Promise.all(
+      await Promise.all(
         Array.from(this.zones.values()).map(async (zone) => {
-          await zone.initialize();
+          return await zone.initialize();
+        })
+      );
 
-          const zoneAccessory = new ZoneAccessory(zone, this.context);
+      const zoneAccessories = await Promise.all(
+        Array.from(this.zones.values()).flatMap((zone) => {
+          const zoneEffectAccessory = new ZoneEffectAccessory(
+            zone,
+            this.context
+          );
+          const zoneBrightnessAccessory = new ZoneBrightnessAccessory(
+            zone,
+            this.context
+          );
 
           zone.on(ZONE_AUTO_OFF_EVENT, () => {
-            zoneAccessory.updateActive(false);
+            zoneEffectAccessory.updateActive(false);
           });
 
-          return zoneAccessory;
+          return [zoneEffectAccessory, zoneBrightnessAccessory];
         })
       );
 

package/dist/accessories/ZoneAccessory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ZoneAccessory.js","sourceRoot":"","sources":["../../src/accessories/ZoneAccessory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAA4D;AAI5D,MAAa,aAAc,SAAQ,2CAAkB;IACnD,YACmB,IAAU,EAC3B,OAAgB;QAEhB,KAAK,CACH;YACE,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,KAAK,EAAE,qBAAqB;YAC5B,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,EAAE;gBAC9D,OAAO;oBACL,IAAI,EAAE,mBAAmB,CAAC,IAAI;oBAC9B,EAAE,EAAE,mBAAmB,CAAC,EAAE;oBAC1B,aAAa,EAAE,mBAAmB,CAAC,aAAa;iBACjD,CAAC;YACJ,CAAC,CAAC;SACH,EACD,OAAO,CACR,CAAC;QAjBe,SAAI,GAAJ,IAAI,CAAM;QAsBrB,WAAM,GAAY,KAAK,CAAC;QAH9B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,CAAC;IAKwB,iBAAiB;;YACxC,OAAO,IAAI,CAAC,cAAc,CAAC;QAC7B,CAAC;KAAA;IAEwB,iBAAiB,CAAC,QAAgB;;YACzD,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;YAE/B,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC;KAAA;IAEwB,SAAS;;YAChC,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;KAAA;IAEwB,SAAS,CAAC,MAAe;;YAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YAErB,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;KAAA;CACF;AA9CD,sCA8CC"}