Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: stop bind event handler in configureAccessory and add missing config check #2

Merged
merged 2 commits into from
Jul 31, 2024
Merged

fix: stop bind event handler in configureAccessory and add missing config check #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10a4239
chore: Refactor CGDGarageDoor class and improve logging
KieraDOG Jul 31, 2024
5badb3a
fix: stop bind event handler in configureAccessory and add missing co…
KieraDOG Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/CGDGarageDoor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,32 @@ export class CGDGarageDoor {
const { deviceHostname, deviceLocalKey } = this.config;
const response = await fetch(`http://${deviceHostname}/api?key=${deviceLocalKey}&${cmd}=${value}`);

const data = await response.json();

this.log.debug(response.status.toString());
this.log.debug(JSON.stringify(data));

if (!response.ok) {
this.log.error(`Failed to run command: ${cmd}=${value}`);

return;
}

if (this.status?.[cmd]) {
this.log.debug(`Setting ${cmd} to ${softValue}`);
this.status[cmd] = softValue;
}

return response.json();
return data;
};

private refreshStatus = async () => {
this.log.debug('Getting status...');

const data = await this.run({ cmd: 'status', value: 'json' });
const data = await this.run({ cmd: 'status', value: 'json', softValue: (new Date()).toLocaleString() });

if (!data) {
this.log.error(`Device not found: ${JSON.stringify(data)}`);
this.log.error('Can not get status!');

return;
}
Expand All @@ -65,27 +77,22 @@ export class CGDGarageDoor {

private getDoorState = (): DoorState => {
if (this.status?.door.startsWith('Closed')) {
this.log.debug('Door is closed!');
return DoorState.Closed;
}

if (this.status?.door.startsWith('Opened')) {
this.log.debug('Door is opened!');
return DoorState.Opened;
}

if (this.status?.door.startsWith('Closing')) {
this.log.debug('Door is closing!');
return DoorState.Closing;
}

if (this.status?.door.startsWith('Opening')) {
this.log.debug('Door is opening!');
return DoorState.Opening;
}

if (this.status?.door.startsWith('Stop')) {
this.log.debug('Door is stopped!');
return DoorState.Stopped;
}

Expand Down
98 changes: 47 additions & 51 deletions src/platform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,64 @@ export class CGDCameraPlatform implements DynamicPlatformPlugin {

private readonly accessories: PlatformAccessory[] = [];

private cgdGarageDoor: CGDGarageDoor;
private refreshInterval?: NodeJS.Timer;

constructor(log: Logging, config: PlatformConfig, api: API) {
this.log = log;
this.api = api;

log.info('Platform finished initializing!');
this.log('Platform finished initializing!');

const { deviceHostname, deviceLocalKey } = config;
if (!deviceHostname || !deviceLocalKey) {
this.log.warn('Missing required configuration parameters');
return;
}

this.cgdGarageDoor = new CGDGarageDoor(this.log, {
const cgdGarageDoor = new CGDGarageDoor(this.log, {
deviceHostname,
deviceLocalKey,
});

api.on(APIEvent.DID_FINISH_LAUNCHING, () => {
this.addAccessory(deviceHostname);
this.log('Did finish launching');
this.addAccessory(deviceHostname, cgdGarageDoor);
});

api.on(APIEvent.SHUTDOWN, () => {
this.removeAccessories();
this.log('SHUTDOWN');
if (this.refreshInterval) {
clearInterval(this.refreshInterval);
}
});
}

configureAccessory(accessory: PlatformAccessory): void {
this.log('Configuring accessory %s', accessory.displayName);
this.accessories.push(accessory);
}

async addAccessory(name: string, cgdGarageDoor: CGDGarageDoor) {
await cgdGarageDoor.poolStatus();

this.log('Adding new accessory with name %s', name);

const uuid = this.api.hap.uuid.generate(name);

const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
if (existingAccessory) {
this.log('Accessory with name %s already exists', name);
this.configureGarageDoorAccessory(existingAccessory, cgdGarageDoor);
return;
}

const accessory = new this.api.platformAccessory(name, uuid);
this.configureGarageDoorAccessory(accessory, cgdGarageDoor);
this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
this.log('Accessory with name %s added', name);
}

configureGarageDoorAccessory(accessory: PlatformAccessory, cgdGarageDoor: CGDGarageDoor) {
accessory.on(PlatformAccessoryEvent.IDENTIFY, () => {
this.log('%s identified!', accessory.displayName);
});
Expand All @@ -56,69 +86,35 @@ export class CGDCameraPlatform implements DynamicPlatformPlugin {
const garageDoorOpener = accessory.getService(this.api.hap.Service.GarageDoorOpener) || accessory.addService(new this.api.hap.Service.GarageDoorOpener(accessory.displayName));

garageDoorOpener.getCharacteristic(this.api.hap.Characteristic.CurrentDoorState)
.onGet(() => this.cgdGarageDoor.getDoorCurrentState());
.onGet(() => cgdGarageDoor.getDoorCurrentState());

garageDoorOpener.getCharacteristic(this.api.hap.Characteristic.TargetDoorState)
.onGet(() => this.cgdGarageDoor.getDoorTargetState())
.onSet((value) => this.cgdGarageDoor.setDoorTargetState(+value));
.onGet(() => cgdGarageDoor.getDoorTargetState())
.onSet((value) => cgdGarageDoor.setDoorTargetState(+value));

const lightbulb = accessory.getService(this.api.hap.Service.Lightbulb) || accessory.addService(new this.api.hap.Service.Lightbulb(accessory.displayName));

lightbulb.getCharacteristic(this.api.hap.Characteristic.On)
.onGet(() => this.cgdGarageDoor.getLightbulb())
.onSet((value) => this.cgdGarageDoor.setLightbulb(value));
.onGet(() => cgdGarageDoor.getLightbulb())
.onSet((value) => cgdGarageDoor.setLightbulb(value));

const vacationSwitch = accessory.getService(this.api.hap.Service.Switch) || accessory.addService(new this.api.hap.Service.Switch(accessory.displayName));

vacationSwitch.getCharacteristic(this.api.hap.Characteristic.On)
.onGet(() => this.cgdGarageDoor.getVacation())
.onSet((value) => this.cgdGarageDoor.setVacation(value));
.onGet(() => cgdGarageDoor.getVacation())
.onSet((value) => cgdGarageDoor.setVacation(value));

this.refreshInterval = setInterval(() => {
garageDoorOpener
.getCharacteristic(this.api.hap.Characteristic.CurrentDoorState).updateValue(this.cgdGarageDoor.getDoorCurrentState());
.getCharacteristic(this.api.hap.Characteristic.CurrentDoorState).updateValue(cgdGarageDoor.getDoorCurrentState());

lightbulb
.getCharacteristic(this.api.hap.Characteristic.On).updateValue(this.cgdGarageDoor.getLightbulb());
.getCharacteristic(this.api.hap.Characteristic.On).updateValue(cgdGarageDoor.getLightbulb());

vacationSwitch
.getCharacteristic(this.api.hap.Characteristic.On).updateValue(this.cgdGarageDoor.getVacation());
}, 4000);
}

async addAccessory(name: string) {
await this.cgdGarageDoor.poolStatus();

this.log.info('Adding new accessory with name %s', name);
.getCharacteristic(this.api.hap.Characteristic.On).updateValue(cgdGarageDoor.getVacation());
}, 2000);

const uuid = this.api.hap.uuid.generate(name);

const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);

if (existingAccessory) {
this.log.info('Accessory with name %s already exists', name);

this.configureAccessory(existingAccessory);

return;
}

const accessory = new this.api.platformAccessory(name, uuid);

this.configureAccessory(accessory);

this.accessories.push(accessory);
this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, this.accessories);
}

removeAccessories() {
this.log.info('Removing all accessories');

this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, this.accessories);
this.accessories.splice(0, this.accessories.length);

if (this.refreshInterval) {
clearInterval(this.refreshInterval);
}
this.log('Garage Door Accessory %s configured!', accessory.displayName);
}
}
Loading