Successfully controlling wiz bulbs
This commit is contained in:
parent
c3a6882413
commit
d73dead5d4
4
.prettierrc
Normal file
4
.prettierrc
Normal file
@ -0,0 +1,4 @@
|
||||
{
|
||||
"tabWidth": 4,
|
||||
"useTabs": false
|
||||
}
|
3
.vscode/launch.json
vendored
3
.vscode/launch.json
vendored
@ -11,7 +11,8 @@
|
||||
"preLaunchTask": "build",
|
||||
"program": "/Users/brandonwatson/.nvm/versions/node/v14.15.0/lib/node_modules/homebridge/bin/homebridge",
|
||||
"env": {
|
||||
"HOMEBRIDGE_OPTS": "/Users/brandonwatson/.homebridge"
|
||||
"HOMEBRIDGE_OPTS": "/Users/brandonwatson/.homebridge",
|
||||
"LOG_LEVEL": "debug"
|
||||
},
|
||||
"sourceMaps": true
|
||||
}
|
||||
|
1950
package-lock.json
generated
1950
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -29,6 +29,7 @@
|
||||
"dependencies": {
|
||||
"@types/node-cron": "^2.0.3",
|
||||
"@types/suncalc": "^1.8.0",
|
||||
"@watsonb8/wiz-lib": "^1.0.1-62427.0",
|
||||
"node-cron": "^2.0.3",
|
||||
"node-hue-api": "^4.0.5",
|
||||
"suncalc": "^1.8.0"
|
||||
|
@ -8,6 +8,8 @@ import { IConfig } from "./models/iConfig";
|
||||
import { GetTimesResult, getTimes } from "suncalc";
|
||||
import HueError = require("node-hue-api/lib/HueError");
|
||||
import cron from "node-cron";
|
||||
import { WizBulb } from "@watsonb8/wiz-lib/build/wizBulb";
|
||||
import { colorTemperature2rgb, Pilot, RGB } from "@watsonb8/wiz-lib";
|
||||
|
||||
let Service: HAPNodeJS.Service;
|
||||
let Characteristic: HAPNodeJS.Characteristic;
|
||||
@ -20,6 +22,7 @@ export interface IFluxProps {
|
||||
log: any;
|
||||
homebridge: any;
|
||||
hue: Api;
|
||||
wizBulbs: Array<WizBulb>;
|
||||
config: IConfig;
|
||||
}
|
||||
|
||||
@ -37,6 +40,7 @@ export class FluxAccessory implements IAccessory {
|
||||
private _hue: Api;
|
||||
|
||||
private _lights: Array<Light> = [];
|
||||
private _wizLights: Array<WizBulb> = [];
|
||||
|
||||
private _times: GetTimesResult;
|
||||
|
||||
@ -49,6 +53,7 @@ export class FluxAccessory implements IAccessory {
|
||||
Characteristic = props.api.hap.Characteristic;
|
||||
this._homebridge = props.homebridge;
|
||||
this._isActive = false;
|
||||
this._wizLights = props.wizBulbs;
|
||||
|
||||
this._times = getTimes(
|
||||
new Date(),
|
||||
@ -57,8 +62,7 @@ export class FluxAccessory implements IAccessory {
|
||||
);
|
||||
|
||||
//Schedule job to refresh times
|
||||
cron
|
||||
.schedule(
|
||||
cron.schedule(
|
||||
"0 12 * * *",
|
||||
() => {
|
||||
this._times = getTimes(
|
||||
@ -71,8 +75,7 @@ export class FluxAccessory implements IAccessory {
|
||||
{
|
||||
scheduled: true,
|
||||
}
|
||||
)
|
||||
.start();
|
||||
).start();
|
||||
|
||||
this._hue = props.hue;
|
||||
this.name = this._config.name;
|
||||
@ -159,9 +162,7 @@ export class FluxAccessory implements IAccessory {
|
||||
}
|
||||
};
|
||||
|
||||
private colorTempToRgb = (
|
||||
kelvin: number
|
||||
): { red: number; green: number; blue: number } => {
|
||||
private colorTempToRgb = (kelvin: number): RGB => {
|
||||
var temp = kelvin / 100;
|
||||
var red, green, blue;
|
||||
if (temp <= 66) {
|
||||
@ -185,9 +186,9 @@ export class FluxAccessory implements IAccessory {
|
||||
blue = 255;
|
||||
}
|
||||
return {
|
||||
red: this.clamp(red, 0, 255),
|
||||
green: this.clamp(green, 0, 255),
|
||||
blue: this.clamp(blue, 0, 255),
|
||||
r: this.clamp(red, 0, 255),
|
||||
g: this.clamp(green, 0, 255),
|
||||
b: this.clamp(blue, 0, 255),
|
||||
};
|
||||
};
|
||||
|
||||
@ -205,7 +206,7 @@ export class FluxAccessory implements IAccessory {
|
||||
return "_hueError" in object;
|
||||
};
|
||||
|
||||
private setLights = async (state: LightState) => {
|
||||
private setHueLights = async (state: LightState) => {
|
||||
const promises: Array<Promise<unknown> | PromiseLike<unknown>> = [];
|
||||
this._lights.map(async (light: Light) => {
|
||||
try {
|
||||
@ -226,6 +227,16 @@ export class FluxAccessory implements IAccessory {
|
||||
await Promise.all(promises);
|
||||
};
|
||||
|
||||
private setWizLights = async (rgb: RGB, fade: number): Promise<void> => {
|
||||
await Promise.all(
|
||||
this._wizLights.map(async (bulb) => {
|
||||
const pilot = await bulb.get();
|
||||
bulb.set(rgb, pilot?.dimming, fade);
|
||||
})
|
||||
);
|
||||
return;
|
||||
};
|
||||
|
||||
/**
|
||||
* Helper function to generate a UUID
|
||||
*/
|
||||
@ -259,7 +270,8 @@ export class FluxAccessory implements IAccessory {
|
||||
) => {
|
||||
const now = this.getNow().getTime();
|
||||
const percentComplete =
|
||||
(now - startTime.getTime()) / (endTime.getTime() - startTime.getTime());
|
||||
(now - startTime.getTime()) /
|
||||
(endTime.getTime() - startTime.getTime());
|
||||
const tempRange = Math.abs(startTemp - endTemp);
|
||||
const tempOffset = tempRange * percentComplete;
|
||||
return startTemp - tempOffset;
|
||||
@ -332,20 +344,25 @@ export class FluxAccessory implements IAccessory {
|
||||
}
|
||||
|
||||
//Set lights
|
||||
const rgb = this.colorTempToRgb(newTemp);
|
||||
if (rgb && newTemp !== 0) {
|
||||
const hueRGB = this.colorTempToRgb(newTemp);
|
||||
const wizRGB = colorTemperature2rgb(newTemp);
|
||||
if (hueRGB && newTemp !== 0) {
|
||||
const lightState = new LightState();
|
||||
lightState
|
||||
.transitionInMillis(
|
||||
this._config.transition ? this._config.transition : 5000
|
||||
)
|
||||
.rgb(
|
||||
rgb.red ? rgb.red : 0,
|
||||
rgb.green ? rgb.green : 0,
|
||||
rgb.blue ? rgb.blue : 0
|
||||
.rgb(hueRGB.r ?? 0, hueRGB.g ?? 0, hueRGB.b ?? 0);
|
||||
await this.setHueLights(lightState);
|
||||
await this.setWizLights(
|
||||
wizRGB,
|
||||
this._config.transition ? this._config.transition / 1000 : 5
|
||||
);
|
||||
this._log(
|
||||
`Adjusting light temp to ${newTemp}, ${JSON.stringify(
|
||||
hueRGB
|
||||
)}`
|
||||
);
|
||||
await this.setLights(lightState);
|
||||
this._log(`Adjusting light temp to ${newTemp}, ${JSON.stringify(rgb)}`);
|
||||
}
|
||||
|
||||
await Sleep(this._config.delay ? this._config.delay : 60000);
|
||||
|
83
src/index.ts
83
src/index.ts
@ -1,10 +1,12 @@
|
||||
import { IConfig } from "./models/iConfig";
|
||||
import { v3 } from 'node-hue-api';
|
||||
import { v3 } from "node-hue-api";
|
||||
import LocalBootstrap = require("node-hue-api/lib/api/http/LocalBootstrap");
|
||||
import Api = require("node-hue-api/lib/api/Api");
|
||||
import { Sleep } from "./sleep";
|
||||
import { IAccessory } from "./models/iAccessory";
|
||||
import { FluxAccessory } from "./fluxAccessory";
|
||||
import { WizBulb } from "@watsonb8/wiz-lib/build/wizBulb";
|
||||
import discover from "@watsonb8/wiz-lib/build/discovery";
|
||||
|
||||
let Accessory: any;
|
||||
let Homebridge: any;
|
||||
@ -16,13 +18,8 @@ let Homebridge: any;
|
||||
export default function (homebridge: any) {
|
||||
Homebridge = homebridge;
|
||||
Accessory = homebridge.platformAccessory;
|
||||
homebridge.registerPlatform(
|
||||
'homebridge-flux',
|
||||
'Flux',
|
||||
FluxPlatform,
|
||||
true
|
||||
);
|
||||
};
|
||||
homebridge.registerPlatform("homebridge-flux", "Flux", FluxPlatform, true);
|
||||
}
|
||||
|
||||
class FluxPlatform {
|
||||
log: any = {};
|
||||
@ -31,50 +28,76 @@ class FluxPlatform {
|
||||
config: IConfig;
|
||||
hue: Api | undefined;
|
||||
|
||||
|
||||
constructor(log: any, config: any, api: any) {
|
||||
this.log = log;
|
||||
this.api = api;
|
||||
this.config = config;
|
||||
this.log('INFO - Registering Flux platform');
|
||||
this.api.on('didFinishLaunching', this.didFinishLaunching.bind(this));
|
||||
this.log("INFO - Registering Flux platform");
|
||||
this.api.on("didFinishLaunching", this.didFinishLaunching.bind(this));
|
||||
}
|
||||
|
||||
private connectWiz = async () => {
|
||||
if (!this.config) {
|
||||
return;
|
||||
}
|
||||
|
||||
return await discover();
|
||||
};
|
||||
|
||||
private connectHue = async () => {
|
||||
if (!this.config) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.config.userName && this.config.clientKey) {
|
||||
this.hue = await v3.api.createLocal(this.config.ipAddress).connect(this.config.userName, this.config.clientKey, undefined);
|
||||
this.hue = await v3.api
|
||||
.createLocal(this.config.ipAddress)
|
||||
.connect(
|
||||
this.config.userName,
|
||||
this.config.clientKey,
|
||||
undefined
|
||||
);
|
||||
this.log("Using existing connection info");
|
||||
} else {
|
||||
const unauthenticatedApi = await v3.api.createLocal(this.config.ipAddress).connect(undefined, undefined, undefined);
|
||||
const unauthenticatedApi = await v3.api
|
||||
.createLocal(this.config.ipAddress)
|
||||
.connect(undefined, undefined, undefined);
|
||||
let createdUser;
|
||||
let connected = false
|
||||
let connected = false;
|
||||
while (!connected) {
|
||||
try {
|
||||
this.log("Creating hue user. Push link button")
|
||||
createdUser = await unauthenticatedApi.users.createUser("homebridge", "HueChase");
|
||||
this.log("Creating hue user. Push link button");
|
||||
createdUser = await unauthenticatedApi.users.createUser(
|
||||
"homebridge",
|
||||
"HueChase"
|
||||
);
|
||||
|
||||
this.hue = await v3.api.createLocal(this.config.ipAddress).connect(createdUser.username, createdUser.clientKey, undefined);
|
||||
this.hue = await v3.api
|
||||
.createLocal(this.config.ipAddress)
|
||||
.connect(
|
||||
createdUser.username,
|
||||
createdUser.clientKey,
|
||||
undefined
|
||||
);
|
||||
this.log("Connected to Hue Bridge");
|
||||
this.log(`UserName: ${createdUser.username}, ClientKey: ${createdUser.clientkey}`)
|
||||
this.log(
|
||||
`UserName: ${createdUser.username}, ClientKey: ${createdUser.clientkey}`
|
||||
);
|
||||
connected = true;
|
||||
|
||||
} catch (err: any) {
|
||||
if (err.getHueErrorType() === 101) {
|
||||
this.log('The Link button on the bridge was not pressed. Please press the Link button and try again.');
|
||||
this.log(
|
||||
"The Link button on the bridge was not pressed. Please press the Link button and try again."
|
||||
);
|
||||
Sleep(5000);
|
||||
} else {
|
||||
this.log(`Unexpected Error: ${err.message}`);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Handler for didFinishLaunching
|
||||
@ -88,18 +111,24 @@ class FluxPlatform {
|
||||
* Called by homebridge to gather accessories.
|
||||
* @param callback
|
||||
*/
|
||||
public accessories = async (callback: (accessories: Array<IAccessory>) => void) => {
|
||||
public accessories = async (
|
||||
callback: (accessories: Array<IAccessory>) => void
|
||||
) => {
|
||||
//Connect to hue bridge
|
||||
await this.connectHue();
|
||||
const wizBulbs = await this.connectWiz();
|
||||
|
||||
this.accessoryList.push(new FluxAccessory({
|
||||
this.accessoryList.push(
|
||||
new FluxAccessory({
|
||||
api: this.api,
|
||||
log: this.log,
|
||||
homebridge: Homebridge,
|
||||
hue: this.hue!,
|
||||
config: this.config
|
||||
}));
|
||||
wizBulbs: wizBulbs ?? [],
|
||||
config: this.config,
|
||||
})
|
||||
);
|
||||
|
||||
callback(this.accessoryList);
|
||||
}
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user