fix: URLs for tadoX and improve tadoX detection logic

Author: mattdavis90

src/index.ts

@@ -113,14 +113,16 @@ export class Tado {
   #username?: string;
   #password?: string;
   #firstLogin: boolean;
-  #isX: boolean;
+  #forceX: boolean;
+  #xLookup: { [key: number]: boolean };
 
-  constructor(username?: string, password?: string) {
+  constructor(username?: string, password?: string, forceX?: boolean) {
     this.#username = username;
     this.#password = password;
     this.#httpsAgent = new Agent({ keepAlive: true });
+    this.#forceX = forceX ?? false;
     this.#firstLogin = true;
-    this.#isX = false;
+    this.#xLookup = {};
   }
 
   async #login(): Promise<void> {
@@ -139,10 +141,9 @@ export class Tado {
     if (this.#firstLogin) {
       try {
         const me = await this.getMe();
-        if (me.homes.length > 0) {
-          const home_id = me.homes[0].id;
+        for (const { id: home_id } of me.homes) {
           const home = await this.getHome(home_id);
-          this.#isX = home.generation == "LINE_X";
+          this.#xLookup[home_id] = home.generation == "LINE_X";
         }
       } catch (err) {
         console.error(`Could not determine TadoX status: ${err}`);
@@ -187,8 +188,8 @@ export class Tado {
     return this.#accessToken;
   }
 
-  get isX(): boolean {
-    return this.#isX;
+  isHomeX(home_id: number): boolean {
+    return this.#forceX || this.#xLookup[home_id] || false;
   }
 
   /**
@@ -353,7 +354,7 @@ export class Tado {
    * @returns A promise that resolves to an array of Device objects.
    */
   getDevices(home_id: number): Promise<Device[]> {
-    if (this.#isX) {
+    if (this.isHomeX(home_id)) {
       return this.apiCallX(`/homes/${home_id}/roomsAndDevices`);
     } else {
       return this.apiCall(`/api/v2/homes/${home_id}/devices`);
@@ -584,7 +585,7 @@ export class Tado {
    * @returns A promise that resolves to an array of Zone objects.
    */
   getZones(home_id: number): Promise<Zone[]> {
-    if (this.#isX) {
+    if (this.isHomeX(home_id)) {
       return this.apiCallX(`/homes/${home_id}/rooms`);
     } else {
       return this.apiCall(`/api/v2/homes/${home_id}/zones`);
@@ -599,7 +600,7 @@ export class Tado {
    * @returns  A promise that resolves to the state of the specified zone.
    */
   getZoneState(home_id: number, zone_id: number): Promise<ZoneState> {
-    if (this.#isX) {
+    if (this.isHomeX(home_id)) {
       return this.apiCallX(`/homes/${home_id}/rooms/${zone_id}`);
     } else {
       return this.apiCall(`/api/v2/homes/${home_id}/zones/${zone_id}/state`);
@@ -835,7 +836,7 @@ export class Tado {
    * @deprecated Use {@link clearZoneOverlays} instead.
    */
   clearZoneOverlay(home_id: number, zone_id: number): Promise<void> {
-    if (this.#isX) {
+    if (this.isHomeX(home_id)) {
       return this.apiCallX(`/homes/${home_id}/rooms/${zone_id}/resumeSchedule`, "post", {});
     } else {
       return this.apiCall(`/api/v2/homes/${home_id}/zones/${zone_id}/overlay`, "delete");
@@ -957,12 +958,8 @@ export class Tado {
       };
     }
 
-    if (this.#isX) {
-      return this.apiCallX(
-        `/api/v2/homes/${home_id}/rooms/${zone_id}/manualControl`,
-        "post",
-        config,
-      );
+    if (this.isHomeX(home_id)) {
+      return this.apiCallX(`/homes/${home_id}/rooms/${zone_id}/manualControl`, "post", config);
     } else {
       return this.apiCall(`/api/v2/homes/${home_id}/zones/${zone_id}/overlay`, "put", config);
     }
@@ -976,7 +973,7 @@ export class Tado {
    * @returns A promise that resolves when the overlays are cleared.
    */
   async clearZoneOverlays(home_id: number, zone_ids: number[]): Promise<void> {
-    if (this.#isX) {
+    if (this.isHomeX(home_id)) {
       for (const zone_id of zone_ids) {
         return this.apiCallX(`/homes/${home_id}/rooms/${zone_id}/resumeSchedule`, "post", {});
       }
@@ -1122,10 +1119,10 @@ export class Tado {
       config.push(overlay_config);
     }
 
-    if (this.#isX) {
+    if (this.isHomeX(home_id)) {
       for (const c of config) {
         return this.apiCallX(
-          `/api/v2/homes/${home_id}/rooms/${c.room}/manualControl`,
+          `/homes/${home_id}/rooms/${c.room}/manualControl`,
           "post",
           c.overlay,
         );

test/index.ts

@@ -119,7 +119,7 @@ describe("High-level API tests (v2)", async () => {
 
     tado = new Tado();
     await tado.login("username", "password");
-    expect(tado.isX).to.equal(false);
+    expect(tado.isHomeX(1907)).to.equal(false);
   });
 
   afterEach(async () => {
@@ -849,7 +849,7 @@ describe("High-level API tests (TadoX)", async () => {
 
     tado = new Tado();
     await tado.login("username", "password");
-    expect(tado.isX).to.equal(true);
+    expect(tado.isHomeX(1907)).to.equal(true);
   });
 
   afterEach(async () => {
@@ -894,7 +894,7 @@ describe("High-level API tests (TadoX)", async () => {
       .reply(200, zone_capabilities_response);
 
     nock("https://hops.tado.com")
-      .post("/api/v2/homes/1907/rooms/1/manualControl")
+      .post("/homes/1907/rooms/1/manualControl")
       .reply(200, (_uri, req) => {
         return req;
       });
@@ -903,4 +903,53 @@ describe("High-level API tests (TadoX)", async () => {
 
     expect(typeof response).to.equal("object");
   });
+
+  it("Should clear multiple zone overlays", async () => {
+    nock("https://hops.tado.com")
+      .post("/homes/1907/rooms/1/resumeSchedule")
+      .reply(200, {})
+      .post("/homes/1907/rooms/2/resumeSchedule")
+      .reply(200, {});
+
+    const response = await tado.clearZoneOverlays(1907, [1, 2]);
+
+    expect(typeof response).to.equal("object");
+  });
+
+  it("Should allow multiple zone overlays", async () => {
+    nock("https://my.tado.com")
+      .get("/api/v2/homes/1907/zones/1/capabilities")
+      .reply(200, zone_capabilities_response)
+      .get("/api/v2/homes/1907/zones/2/capabilities")
+      .reply(200, zone_capabilities_response);
+
+    nock("https://hops.tado.com")
+      .post("/homes/1907/rooms/1/manualControl")
+      .reply(200, {})
+      .post("/homes/1907/rooms/2/manualControl")
+      .reply(200, {});
+
+    const response = await tado.setZoneOverlays(
+      1907,
+      [
+        {
+          power: "ON",
+          temperature: {
+            celsius: 25,
+          },
+          zone_id: 1,
+        },
+        {
+          power: "ON",
+          temperature: {
+            celsius: 25,
+          },
+          zone_id: 2,
+        },
+      ],
+      "AUTO",
+    );
+
+    expect(typeof response).to.equal("object");
+  });
 });