@evops/lightwaverf 1.0.5 → 1.0.7

package/.dist/LightwaveAccount.d.ts

@@ -1,5 +1,63 @@
 import Debug, { Debugger } from "debug";
 import { LightwaveDevice } from "./LightwaveDevice";
+type LightwaveRfResponse = {
+    UserProfile: {
+        estate: {};
+        location: {};
+        room: Record<string, {
+            room_id: string;
+            name: string;
+            created: string;
+            updated: string;
+            user_id: string;
+            location_id: string;
+            zone_id: string;
+            active: string;
+            room_number: string;
+            wfl_id: string;
+            mood_1: string;
+            mood_2: string;
+            mood_3: string;
+            image_hash: string;
+            image_ext: string;
+            rank: string;
+            zone: [];
+            mood: [];
+        }>;
+        device: Record<string, {
+            device_id: string;
+            name: string;
+            location_id: string;
+            room_id: string;
+            zone_id: string;
+            created: string;
+            updated: string;
+            user_id: string;
+            active: string;
+            device_type_id: string;
+            device_type_value: string;
+            device_number: string;
+            wfl_id: string;
+            serial: string;
+            dm_id: string;
+            last_command_id: string;
+            last_command: string;
+            last_command_value: string;
+            rank: string;
+            energy_rank: string;
+            trigger_rank: string;
+            heating_rank: string;
+            unit_rate: string;
+            device_type_name: string;
+            wfl_code: string;
+            is_heating: string;
+        }>;
+        timer: {};
+        event: {};
+        mood: {};
+        user: {};
+    };
+};
 export declare class LightwaveAccount {
     debug: Debug.Debugger;
     email: string;
@@ -7,5 +65,6 @@ export declare class LightwaveAccount {
     mainDebug: Debug.Debugger;
     constructor(debug: Debugger, email: string, pin: string);
     getConfiguration(callback?: (devices: LightwaveDevice[], error: any) => void): Promise<LightwaveDevice[] | undefined>;
-    parseRooms(lightwaveResponse: any, callback?: (devices: LightwaveDevice[], error: Error | null) => void): LightwaveDevice[] | undefined;
+    parseRooms(lightwaveResponse: LightwaveRfResponse["UserProfile"], callback?: (devices: LightwaveDevice[], error: Error | null) => void): LightwaveDevice[] | undefined;
 }
+export {};

package/.dist/LightwaveAccount.js

@@ -20,11 +20,22 @@ class LightwaveAccount {
         this.debug("Getting rooms from LightWave");
         var self = this;
         var host = "https://control-api.lightwaverf.com";
-        function assertResponse(response) {
+        async function assertResponse(response) {
             if (!response.ok) {
-                throw new Error("Network response was not ok: " + response.statusText);
+                const responseText = await response.text();
+                throw new Error("Network response was not ok: " + response.statusText, {
+                    cause: responseText,
+                });
+            }
+            try {
+                return response.json();
+            }
+            catch (error) {
+                const responseText = await response.text();
+                throw new Error("Failed to parse response as JSON", {
+                    cause: responseText,
+                });
             }
-            return response.json();
         }
         let token = "";
         try {
@@ -45,7 +56,7 @@ class LightwaveAccount {
                 },
             });
             const something = await assertResponse(deviceTypeResponse);
-            const userProfileResponse = await fetch(host + "/v1/user_profile?nested=1", {
+            const userProfileResponse = await fetch(host + "/v1/user_profile?nested=0", {
                 headers: {
                     "X-LWRF-token": token,
                     "X-LWRF-platform": "ios",
@@ -64,13 +75,14 @@ class LightwaveAccount {
         }
     }
     parseRooms(lightwaveResponse, callback) {
-        this.debug("Parsing lightwaveResponse: ", lightwaveResponse.content.estates[0].locations[0].zones[0].rooms[0]
-            .devices);
-        const home = lightwaveResponse.content.estates[0].locations[0].zones[0];
+        this.debug("Parsing lightwaveResponse: ", lightwaveResponse.estate);
+        const roomInfos = Object.values(lightwaveResponse.room);
+        const deviceInfos = Object.values(lightwaveResponse.device);
         const devices = [];
-        for (var i = 0; i < home.rooms.length; i++) {
-            var r = home.rooms[i];
-            this.debug("Room " + r.name + " with " + r.devices?.length + " devices");
+        for (var i = 0; i < roomInfos.length; i++) {
+            const roomInfo = roomInfos[i];
+            const roomDevices = deviceInfos.filter((d) => d.room_id === roomInfo.room_id);
+            this.debug("Room " + roomInfo.name + " with " + roomDevices.length + " devices");
             // Get device types
             //   O: On/Off Switch
             //   D: Dimmer
@@ -81,12 +93,12 @@ class LightwaveAccount {
             //   M: Mood (active)
             //   o: All Off
             var deviceTypeMapping = new Map();
-            deviceTypeMapping.set(1, LightwaveDevice_1.LightwaveDeviceType.OnOff);
-            deviceTypeMapping.set(2, LightwaveDevice_1.LightwaveDeviceType.Dimmer);
-            deviceTypeMapping.set(3, LightwaveDevice_1.LightwaveDeviceType.OnOff);
-            for (var j = 0; j < r.devices?.length; j++) {
-                var d = r.devices[j];
-                const device = new LightwaveDevice_1.LightwaveDevice(this.mainDebug, r.room_number, d.device_number, r.name, d.name, deviceTypeMapping.get(d.device_type_id));
+            deviceTypeMapping.set("1", LightwaveDevice_1.LightwaveDeviceType.OnOff);
+            deviceTypeMapping.set("2", LightwaveDevice_1.LightwaveDeviceType.Dimmer);
+            deviceTypeMapping.set("3", LightwaveDevice_1.LightwaveDeviceType.OnOff);
+            for (var j = 0; j < roomDevices?.length; j++) {
+                const deviceInfo = roomDevices[j];
+                const device = new LightwaveDevice_1.LightwaveDevice(this.mainDebug, Number(roomInfo.room_number), Number(deviceInfo.device_number), roomInfo.name, deviceInfo.name, deviceTypeMapping.get(deviceInfo.device_type_id));
                 devices.push(device);
             }
         }

package/.dist/LightwaveAccount.test.js

@@ -10,7 +10,7 @@ const LightwaveAccount_1 = require("./LightwaveAccount");
 (0, vitest_1.describe)("LightwaveAccount tests", () => {
     fetch_vcr_1.default.configure({
         fixturePath: __dirname + "/.fixtures",
-        mode: "playback",
+        mode: "record",
     });
     global.fetch = fetch_vcr_1.default;
     (0, vitest_1.beforeEach)(() => {
@@ -19,8 +19,8 @@ const LightwaveAccount_1 = require("./LightwaveAccount");
         debug_1.default.enable(process.env.DEBUG);
     });
     (0, vitest_1.it)("should parse configuration into rooms", async () => {
-        const account = new LightwaveAccount_1.LightwaveAccount((0, debug_1.default)("lightwave-rf:test"), "some@user.com", "1234");
+        const account = new LightwaveAccount_1.LightwaveAccount((0, debug_1.default)("lightwave-rf:test"), "stan@wozniak.com", "2212");
         const devices = await account.getConfiguration();
-        (0, vitest_1.expect)(devices?.length).toBe(20);
+        (0, vitest_1.expect)(devices?.length).toBe(19);
     });
 });

package/.dist/index.test.js

@@ -21,17 +21,16 @@ const _1 = __importDefault(require("."));
     (0, vitest_1.it)("should allow device linking", async () => {
         lw = new _1.default({
             email: "some@user.com",
-            pin: "1234",
+            pin: "12341234",
         });
         // const devices = await lw.getDevices();
         await lw.connect();
         await lw.ensureRegistration();
-        await lw.lwClient.disconnect();
     });
     (0, vitest_1.it)("should turn device on", async () => {
         lw = new _1.default({
             email: "some@user.com",
-            pin: "1234",
+            pin: "12341234",
             // Disabling link display updates as they cause buffer issues in the link
             // device
             linkDisplayUpdates: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@evops/lightwaverf",
   "description": "Lightwave RF client library",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "exports": {
     ".": {
       "types": "./.dist/index.d.ts",

package/.dist/Queue.d.ts

@@ -1,7 +0,0 @@
-export declare class Queue<T> {
-    items: T[];
-    busy: boolean;
-    get length(): number;
-    add(item: T): void;
-    next(): T | undefined;
-}

package/.dist/Queue.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Queue = void 0;
-class Queue {
-    items = [];
-    busy = false;
-    get length() {
-        return this.items.length;
-    }
-    add(item) {
-        this.items.push(item);
-    }
-    next() {
-        return this.items.shift();
-    }
-}
-exports.Queue = Queue;