Use new hilo api (#45)

SanterreJo · Feb 23, 2024 · c143382 · c143382
1 parent f91165c
commit c143382
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 36 deletions.
diff --git a/src/devices/Light.ts b/src/devices/Light.ts
@@ -1,8 +1,8 @@
 import axios from "axios";
 import { API, CharacteristicValue, PlatformAccessory } from "homebridge";
-import { automationApi } from "../hiloApi";
 import { HiloDevice } from "./HiloDevice";
 import { DeviceValue, HiloAccessoryContext } from "./types";
+import { hiloApi } from "../hiloApi";
 
 export class Light extends HiloDevice<
 	"LightDimmer" | "LightSwitch" | "ColorBulb" | "WhiteBulb"
@@ -60,8 +60,8 @@ export class Light extends HiloDevice<
 		const on = value as boolean;
 		this.logger.debug(`Setting ${this.device.name} ${on ? "on" : "off"}`);
 		try {
-			await automationApi.put(
-				`/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
+			await hiloApi.put(
+				`/Automation/v1/api/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
 				{ OnOff: on }
 			);
 		} catch (error) {
@@ -83,8 +83,8 @@ export class Light extends HiloDevice<
 			`Setting ${this.device.name} brightness to ${brightness}`
 		);
 		try {
-			await automationApi.put(
-				`/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
+			await hiloApi.put(
+				`/Automation/v1/api/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
 				{ Intensity: brightness / 100 }
 			);
 		} catch (error) {

diff --git a/src/devices/Outlet.ts b/src/devices/Outlet.ts
@@ -1,8 +1,8 @@
 import axios from "axios";
 import { API, CharacteristicValue, PlatformAccessory } from "homebridge";
-import { automationApi } from "../hiloApi";
 import { HiloDevice } from "./HiloDevice";
 import { DeviceValue, HiloAccessoryContext } from "./types";
+import { hiloApi } from "../hiloApi";
 
 export class Outlet extends HiloDevice<"Outlet"> {
 	constructor(
@@ -40,8 +40,8 @@ export class Outlet extends HiloDevice<"Outlet"> {
 		const on = value as boolean;
 		this.logger.debug(`Setting ${this.device.name} ${on ? "on" : "off"}`);
 		try {
-			await automationApi.put(
-				`/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
+			await hiloApi.put(
+				`/Automation/v1/api/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
 				{ OnOff: on }
 			);
 		} catch (error) {

diff --git a/src/devices/Thermostat.ts b/src/devices/Thermostat.ts
@@ -1,8 +1,8 @@
 import axios from "axios";
 import { API, CharacteristicValue, PlatformAccessory } from "homebridge";
-import { automationApi } from "../hiloApi";
 import { HiloDevice } from "./HiloDevice";
 import { DeviceValue, HiloAccessoryContext } from "./types";
+import { hiloApi } from "../hiloApi";
 
 export class Thermostat extends HiloDevice<"Thermostat"> {
 	constructor(
@@ -113,8 +113,8 @@ export class Thermostat extends HiloDevice<"Thermostat"> {
 			`Setting ${this.device.name} target temparature to ${targetTemperature}`
 		);
 		try {
-			await automationApi.put(
-				`/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
+			await hiloApi.put(
+				`/Automation/v1/api/Locations/${this.device.locationId}/Devices/${this.device.id}/Attributes`,
 				{ TargetTemperature: targetTemperature }
 			);
 		} catch (error) {

diff --git a/src/hilo.ts b/src/hilo.ts
@@ -10,12 +10,7 @@ import * as signalR from "@microsoft/signalr";
 import { getConfig, HiloConfig, setConfig } from "./config";
 import { getLogger, setLogger, signalRLogger } from "./logger";
 import { setApi } from "./api";
-import {
-	automationApi,
-	eventsApi,
-	getWsAccessToken,
-	negotiate,
-} from "./hiloApi";
+import { getWsAccessToken, hiloApi, negotiate } from "./hiloApi";
 import {
 	Device,
 	DeviceValue,
@@ -253,8 +248,8 @@ class Hilo implements DynamicPlatformPlugin {
 			return;
 		}
 		try {
-			const response = await eventsApi.get<EventsResponse>(
-				`/Locations/${location.id}/Events`,
+			const response = await hiloApi.get<EventsResponse>(
+				`/GDService/v1/api/Locations/${location.id}/Events`,
 				{ params: { active: true } }
 			);
 			const challenges = response.data;
@@ -291,9 +286,12 @@ type LocationsResponse = Array<Location>;
 async function fetchLocations() {
 	getLogger().debug("Fetching locations");
 	try {
-		const response = await automationApi.get<LocationsResponse>("/Locations", {
-			params: { force: true },
-		});
+		const response = await hiloApi.get<LocationsResponse>(
+			"/Automation/v1/api/Locations",
+			{
+				params: { force: true },
+			}
+		);
 		return response.data;
 	} catch (error) {
 		getLogger().error(
@@ -308,8 +306,8 @@ type DevicesResponse = Array<Device>;
 async function fetchDevices(location: Location) {
 	getLogger().debug("Fetching devices for location", location.name);
 	try {
-		const response = await automationApi.get<DevicesResponse>(
-			`/Locations/${location.id}/Devices`,
+		const response = await hiloApi.get<DevicesResponse>(
+			`/Automation/v1/api/Locations/${location.id}/Devices`,
 			{
 				params: { force: true },
 			}

diff --git a/src/hiloApi.ts b/src/hiloApi.ts
@@ -119,7 +119,7 @@ type NegotiateResponse = {
 };
 export async function negotiate() {
 	getLogger().debug("Negotiating websocket connection");
-	const response = await hubApi.post<NegotiateResponse>(
+	const response = await hiloApi.post<NegotiateResponse>(
 		"/DeviceHub/negotiate",
 		{},
 		{
@@ -156,14 +156,8 @@ export function setupAutoRefreshToken(expiresIn: number) {
 	}, expiresIn * 1000 - 1000 * 60 * 5); // 5 minutes before expiration
 }
 
-export const automationApi = axios.create({
-	baseURL: "https://apim.hiloenergie.com/Automation/v1/api",
-});
-export const eventsApi = axios.create({
-	baseURL: "https://apim.hiloenergie.com/GDService/v1/api",
-});
-export const hubApi = axios.create({
-	baseURL: "https://automation.hiloenergie.com",
+export const hiloApi = axios.create({
+	baseURL: "https://api.hiloenergie.com",
 });
 
 const authInterceptor = async (config: AxiosRequestConfig) => {
@@ -197,9 +191,7 @@ const authInterceptor = async (config: AxiosRequestConfig) => {
 	return config;
 };
 
-automationApi.interceptors.request.use(authInterceptor);
-eventsApi.interceptors.request.use(authInterceptor);
-hubApi.interceptors.request.use(authInterceptor);
+hiloApi.interceptors.request.use(authInterceptor);
 
 const unableToLogin = (e: unknown) =>
 	getLogger().error(