-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Code deduplication; fixed accessory manufacturer/model/serial/name info
- Loading branch information
Showing
13 changed files
with
229 additions
and
654 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,107 @@ | ||
| import { LogMessageEvent, PingMessageEvent, StateUpdateMessageEvent } from '../utils/eventsource'; | ||
| import { CharacteristicValue, Logger, PlatformAccessory, Service, WithUUID } from 'homebridge'; | ||
| import { LogMessageEvent, PingMessageEvent, StateUpdateMessageEvent, StateUpdateRecord } from '../utils/eventsource'; | ||
| import { BlaQHomebridgePluginPlatform } from '../platform'; | ||
| import { BlaQTextSensorEvent } from '../types'; | ||
|
|
||
| export interface BaseBlaQAccessory { | ||
| export interface BaseBlaQAccessoryInterface { | ||
| setAPIBaseURL: (apiBaseURL: string) => void; | ||
| handleStateEvent: (stateEvent: StateUpdateMessageEvent) => void; | ||
| handleLogEvent?: (logEvent: LogMessageEvent) => void; | ||
| handlePingEvent?: (pingEvent: PingMessageEvent) => void; | ||
| } | ||
|
|
||
| export type BaseBlaQAccessoryConstructorParams = { | ||
| accessory: PlatformAccessory; | ||
| apiBaseURL: string; | ||
| friendlyName: string; | ||
| platform: BlaQHomebridgePluginPlatform; | ||
| serialNumber: string; | ||
| }; | ||
|
|
||
| export const correctAPIBaseURL = (inputURL: string) => { | ||
| let correctedAPIBaseURL = inputURL; | ||
| if(!correctedAPIBaseURL.includes('://')){ | ||
| correctedAPIBaseURL = `http://${correctedAPIBaseURL}`; | ||
| } | ||
| if(correctedAPIBaseURL.endsWith('/')){ | ||
| correctedAPIBaseURL = correctedAPIBaseURL.slice(0, -1); | ||
| } | ||
| return correctedAPIBaseURL; | ||
| }; | ||
|
|
||
| export class BaseBlaQAccessory implements BaseBlaQAccessoryInterface { | ||
| protected apiBaseURL: string; | ||
| protected firmwareVersion?: string; | ||
| protected readonly accessory: PlatformAccessory; | ||
| protected readonly accessoryInformationService: Service; | ||
| protected readonly logger: Logger; | ||
| protected readonly friendlyName: string; | ||
| protected readonly platform: BlaQHomebridgePluginPlatform; | ||
| protected readonly serialNumber: string; | ||
|
|
||
| constructor({ | ||
| accessory, | ||
| apiBaseURL, | ||
| friendlyName, | ||
| platform, | ||
| serialNumber, | ||
| }: BaseBlaQAccessoryConstructorParams){ | ||
| this.platform = platform; | ||
| this.logger = this.platform.logger; | ||
| this.accessory = accessory; | ||
| this.friendlyName = friendlyName; | ||
| this.serialNumber = serialNumber; | ||
| this.apiBaseURL = correctAPIBaseURL(apiBaseURL); | ||
| this.accessoryInformationService = this.getOrAddService(this.platform.service.AccessoryInformation); | ||
| // set accessory information | ||
| this.accessoryInformationService | ||
| .setCharacteristic(this.platform.characteristic.Manufacturer, 'Konnected') | ||
| .setCharacteristic(this.platform.characteristic.Model, 'GDO BlaQ') | ||
| .setCharacteristic(this.platform.characteristic.SerialNumber, this.serialNumber) | ||
| .setCharacteristic(this.platform.characteristic.Name, this.friendlyName); | ||
| // Publish firmware version; this may not be initialized yet, so we set a getter. | ||
| // Note that this is against the AccessoryInformation service, not the GDO service. | ||
| this.accessoryInformationService | ||
| .getCharacteristic(this.platform.characteristic.FirmwareRevision) | ||
| .onGet(this.getFirmwareVersion.bind(this)); | ||
| } | ||
|
|
||
| protected getOrAddService(service: WithUUID<typeof Service> | Service): Service{ | ||
| return this.accessory.getService(service as WithUUID<typeof Service>) || | ||
| this.accessory.addService(service as Service); | ||
| } | ||
|
|
||
| handleStateEvent(stateEvent: StateUpdateMessageEvent){ | ||
| try { | ||
| const stateInfo = JSON.parse(stateEvent.data) as StateUpdateRecord; | ||
| if (['text_sensor-esphome_version', 'text_sensor-firmware_version'].includes(stateInfo.id)) { | ||
| const b = stateInfo as BlaQTextSensorEvent; | ||
| if (b.value && b.value === b.state) { | ||
| this.setFirmwareVersion(b.value); | ||
| } else { | ||
| this.logger.error('Mismatched firmware versions in value/state:', b.value, b.state); | ||
| this.firmwareVersion = undefined; | ||
| } | ||
| } | ||
| } catch(e) { | ||
| this.logger.error('Cannot deserialize message:', stateEvent); | ||
| this.logger.error('Deserialization yielded:', e); | ||
| } | ||
| } | ||
|
|
||
| getFirmwareVersion(): CharacteristicValue { | ||
| return this.firmwareVersion || ''; | ||
| } | ||
|
|
||
| protected setFirmwareVersion(version: string) { | ||
| this.firmwareVersion = version; | ||
| this.accessoryInformationService.setCharacteristic( | ||
| this.platform.characteristic.FirmwareRevision, | ||
| version, | ||
| ); | ||
| } | ||
|
|
||
| setAPIBaseURL(url: string){ | ||
| this.apiBaseURL = correctAPIBaseURL(url); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.