homebridge-ipark-hb 1.2.2 → 1.2.4

package/index.js

@@ -1,5 +1,5 @@
 let Service, Characteristic;
-const LightbulbPlugin = require("./lightbulb");
+const Lightbulb = require("./lightbulb");
 
 module.exports = (api) => {
     Service = api.hap.Service;
@@ -13,7 +13,6 @@ class Platform {
         this.config = config;
         this.api = api;
         this.accessories = [];
-        this.lightulb = new LightbulbPlugin(log, config, api);
         api.on("didFinishLaunching", async () => {
             await this.initialize();
         });

package/lightbulb.js

@@ -1,180 +1,291 @@
+// const axios = require("axios");
+
+// // let Service, Characteristic;
+
+// module.exports = (api) => {
+//     api.registerPlatform("ipark-hb", "IPARKHB", LightbulbPlugin);
+// };
+
+// class LightbulbPlugin {
+//     constructor(log, config, api) {
+//         this.log = log;
+//         this.api = api;
+//         this.config = config;
+//         this.Service = this.api.hap.Service;
+//         this.Characteristic = this.api.hap.Characteristic;
+//         this.name = "IPARK Light";
+//         this.accessories = [];
+//         this.token = null;
+//         this.http = (accessToken) =>
+//             axios.create({
+//                 baseURL: "https://idj1.hdc-smart.com/v2/api/features",
+//                 timeout: 5000,
+//                 headers: {
+//                     "access-token": accessToken,
+//                     "Content-Type": "application/json",
+//                 },
+//             });
+
+//         api.on("didFinishLaunching", () => this.discoverDevices());
+//     }
+//     async handleOnGet(acc) {
+//         try {
+//             this.token = await this.getAccessToken();
+//             const path =
+//                 acc.context.type === "livinglight"
+//                     ? `/livinglight/${acc.context.room}/apply`
+//                     : `/light/${acc.context.room}/apply`;
+
+//             const res = await this.http(this.token).get(path);
+//             if (!res.data || !res.data.units) return false;
+
+//             const device = res.data.units.find(
+//                 (u) => u.unit === acc.context.unit,
+//             );
+//             return device?.state === "on";
+//         } catch (e) {
+//             this.log.error("Failed: Get", e.message);
+//             return false;
+//         }
+//     }
+//     async handleOnSet(acc, value) {
+//         try {
+//             this.token = await this.getAccessToken();
+//             const path =
+//                 acc.context.type === "livinglight"
+//                     ? `/livinglight/${acc.context.room}/apply`
+//                     : `/light/${acc.context.room}/apply`;
+
+//             await this.http(this.token).put(path, {
+//                 unit: acc.context.unit,
+//                 state: value ? "on" : "off",
+//             });
+//         } catch (e) {
+//             this.log.error("Failed: Set", e.message);
+//         }
+//     }
+//     configureAccessory(acc) {
+//         this.accessories.push(acc);
+//     }
+//     async getAccessToken() {
+//         try {
+//             const res = await axios.post(
+//                 "https://center.hdc-smart.com/v3/auth/login",
+//                 "V2",
+//                 {
+//                     headers: {
+//                         Authorization: this.config.auth,
+//                         "X-API-KEY": this.config.apiKey,
+//                     },
+//                 },
+//             );
+
+//             return res.data["access-token"];
+//         } catch (e) {
+//             this.log.error("Authentication failed", e.message);
+//             return null;
+//         }
+//     }
+//     async discoverDevices() {
+//         this.token = await this.getAccessToken();
+//         let allLights = [];
+//         // living room
+//         try {
+//             const res = await this.http(this.token).get(`/livinglight/1/apply`);
+
+//             if (res.data.result !== "fail") {
+//                 const roomName = res.data.map?.name || "Living Room";
+//                 const units = res.data.units || [];
+
+//                 for (const u of units) {
+//                     allLights.push({
+//                         id: `living-1-${u.unit}`,
+//                         type: "livinglight",
+//                         room: 1,
+//                         unit: u.unit,
+//                         name: u.name || `${roomName} ${u.unit}`,
+//                     });
+//                 }
+
+//                 this.log.info(`Living room: ${units.length} devices`);
+//             }
+//         } catch (e) {
+//             this.log.error("Living room discovery failed", e.message);
+//         }
+
+//         // other rooms
+//         let j = 1;
+//         while (true) {
+//             try {
+//                 const res = await this.http(this.token).get(
+//                     `/light/${j}/apply`,
+//                 );
+//                 if (res.data.result !== "ok") break;
+
+//                 const roomName = res.data.map?.name || `Room ${j}`;
+//                 const units = res.data.units || [];
+
+//                 for (const u of units) {
+//                     allLights.push({
+//                         id: `room-${j}-${u.unit}`,
+//                         type: "light",
+//                         room: j,
+//                         unit: u.unit,
+//                         name: u.name || `${roomName} ${u.unit}`,
+//                     });
+//                 }
+
+//                 this.log.info(`Room ${j}: ${units.length} devices`);
+//                 j++;
+//             } catch (e) {
+//                 this.log.error(`Room ${j} discovery failed`, e.message);
+//                 break;
+//             }
+//         }
+
+//         for (const light of allLights) {
+//             const uuid = this.api.hap.uuid.generate(light.id);
+//             let acc = this.accessories.find((a) => a.UUID === uuid);
+
+//             if (!acc) {
+//                 acc = new this.api.platformAccessory(light.name, uuid);
+//                 acc.context = light;
+
+//                 this.setupAccessory(acc);
+
+//                 this.api.registerPlatformAccessories("ipark-hb", "IPARKHB", [
+//                     acc,
+//                 ]);
+//                 this.log.info(`Added ${light.name}`);
+//             } else {
+//                 acc.context = light;
+//                 this.setupAccessory(acc);
+//             }
+//         }
+//         const validUUIDs = allLights.map((l) =>
+//             this.api.hap.uuid.generate(l.id),
+//         );
+//     }
+
+//     setupAccessory(acc) {
+//         const service =
+//             acc.getService(this.Service.Lightbulb) ||
+//             acc.addService(this.Service.Lightbulb);
+
+//         service
+//             .getCharacteristic(this.Characteristic.On)
+//             .onGet(() => this.handleOnGet(acc))
+//             .onSet((value) => this.handleOnSet(acc, value));
+//     }
+// }
 const axios = require("axios");
 
-// let Service, Characteristic;
-
-module.exports = (api) => {
-    api.registerPlatform("ipark-hb", "IPARKHB", LightbulbPlugin);
-};
-
-class LightbulbPlugin {
-    constructor(log, config, api) {
-        this.log = log;
-        this.api = api;
-        this.config = config;
-        this.Service = this.api.hap.Service;
-        this.Characteristic = this.api.hap.Characteristic;
-        this.name = "IPARK Light";
-        this.accessories = [];
-        this.token = null;
-        this.http = (accessToken) =>
-            axios.create({
-                baseURL: "https://idj1.hdc-smart.com/v2/api/features",
-                timeout: 5000,
-                headers: {
-                    "access-token": accessToken,
-                    "Content-Type": "application/json",
-                },
-            });
-
-        api.on("didFinishLaunching", () => this.discoverDevices());
-    }
-    async handleOnGet(acc) {
-        try {
-            this.token = await this.getAccessToken();
-            const path =
-                acc.context.type === "livinglight"
-                    ? `/livinglight/${acc.context.room}/apply`
-                    : `/light/${acc.context.room}/apply`;
-
-            const res = await this.http(this.token).get(path);
-            if (!res.data || !res.data.units) return false;
-
-            const device = res.data.units.find(
-                (u) => u.unit === acc.context.unit,
-            );
-            return device?.state === "on";
-        } catch (e) {
-            this.log.error("Failed: Get", e.message);
-            return false;
-        }
-    }
-    async handleOnSet(acc, value) {
-        try {
-            this.token = await this.getAccessToken();
-            const path =
-                acc.context.type === "livinglight"
-                    ? `/livinglight/${acc.context.room}/apply`
-                    : `/light/${acc.context.room}/apply`;
-
-            await this.http(this.token).put(path, {
-                unit: acc.context.unit,
-                state: value ? "on" : "off",
-            });
-        } catch (e) {
-            this.log.error("Failed: Set", e.message);
-        }
-    }
-    configureAccessory(acc) {
-        this.accessories.push(acc);
-    }
-    async getAccessToken() {
-        try {
-            const res = await axios.post(
-                "https://center.hdc-smart.com/v3/auth/login",
-                "V2",
-                {
-                    headers: {
-                        Authorization: this.config.auth,
-                        "X-API-KEY": this.config.apiKey,
-                    },
-                },
-            );
-
-            return res.data["access-token"];
-        } catch (e) {
-            this.log.error("Authentication failed", e.message);
-            return null;
-        }
+class Lightbulb {
+    constructor(platform, acc) {
+        this.platform = platform;
+        this.acc = acc;
+
+        const Service = platform.api.hap.Service;
+        const Characteristic = platform.api.hap.Characteristic;
+
+        const service =
+            acc.getService(Service.Lightbulb) ||
+            acc.addService(Service.Lightbulb);
+
+        service
+            .getCharacteristic(Characteristic.On)
+            .onGet(this.onGet.bind(this))
+            .onSet(this.onSet.bind(this));
     }
-    async discoverDevices() {
-        this.token = await this.getAccessToken();
+
+    static async discoverDevices(platform) {
+        const token = await platform.getAccessToken();
+        if (!token) return [];
+
+        const http = platform.http(token);
         let allLights = [];
+
         // living room
         try {
-            const res = await this.http(this.token).get(`/livinglight/1/apply`);
-
-            if (res.data.result !== "fail") {
-                const roomName = res.data.map?.name || "Living Room";
+            const res = await http.get(`/livinglight/1/apply`);
+            if (res.data?.result !== "fail") {
                 const units = res.data.units || [];
-
                 for (const u of units) {
                     allLights.push({
                         id: `living-1-${u.unit}`,
                         type: "livinglight",
                         room: 1,
                         unit: u.unit,
-                        name: u.name || `${roomName} ${u.unit}`,
+                        name: u.name || `Living ${u.unit}`,
                     });
                 }
-
-                this.log.info(`Living room: ${units.length} devices`);
             }
-        } catch (e) {
-            this.log.error("Living room discovery failed", e.message);
-        }
+        } catch {}
 
         // other rooms
-        let j = 1;
+        let i = 1;
         while (true) {
             try {
-                const res = await this.http(this.token).get(
-                    `/light/${j}/apply`,
-                );
-                if (res.data.result !== "ok") break;
+                const res = await http.get(`/light/${i}/apply`);
+                if (res.data?.result !== "ok") break;
 
-                const roomName = res.data.map?.name || `Room ${j}`;
                 const units = res.data.units || [];
-
                 for (const u of units) {
                     allLights.push({
-                        id: `room-${j}-${u.unit}`,
+                        id: `room-${i}-${u.unit}`,
                         type: "light",
-                        room: j,
+                        room: i,
                         unit: u.unit,
-                        name: u.name || `${roomName} ${u.unit}`,
+                        name: u.name || `Room ${i} ${u.unit}`,
                     });
                 }
 
-                this.log.info(`Room ${j}: ${units.length} devices`);
-                j++;
-            } catch (e) {
-                this.log.error(`Room ${j} discovery failed`, e.message);
+                i++;
+            } catch {
                 break;
             }
         }
 
-        for (const light of allLights) {
-            const uuid = this.api.hap.uuid.generate(light.id);
-            let acc = this.accessories.find((a) => a.UUID === uuid);
-
-            if (!acc) {
-                acc = new this.api.platformAccessory(light.name, uuid);
-                acc.context = light;
+        return allLights;
+    }
 
-                this.setupAccessory(acc);
+    async onGet() {
+        const { platform, acc } = this;
 
-                this.api.registerPlatformAccessories("ipark-hb", "IPARKHB", [
-                    acc,
-                ]);
-                this.log.info(`Added ${light.name}`);
-            } else {
-                acc.context = light;
-                this.setupAccessory(acc);
-            }
+        if (!platform.token) {
+            platform.token = await platform.getAccessToken();
         }
-        const validUUIDs = allLights.map((l) =>
-            this.api.hap.uuid.generate(l.id),
+
+        const path =
+            acc.context.type === "livinglight"
+                ? `/livinglight/${acc.context.room}/apply`
+                : `/light/${acc.context.room}/apply`;
+
+        const res = await platform.http(platform.token).get(path);
+        const device = res.data?.units?.find(
+            (u) => u.unit === acc.context.unit,
         );
+
+        return device?.state === "on";
     }
 
-    setupAccessory(acc) {
-        const service =
-            acc.getService(this.Service.Lightbulb) ||
-            acc.addService(this.Service.Lightbulb);
+    async onSet(value) {
+        const { platform, acc } = this;
 
-        service
-            .getCharacteristic(this.Characteristic.On)
-            .onGet(() => this.handleOnGet(acc))
-            .onSet((value) => this.handleOnSet(acc, value));
+        if (!platform.token) {
+            platform.token = await platform.getAccessToken();
+        }
+
+        const path =
+            acc.context.type === "livinglight"
+                ? `/livinglight/${acc.context.room}/apply`
+                : `/light/${acc.context.room}/apply`;
+
+        await platform.http(platform.token).put(path, {
+            unit: acc.context.unit,
+            state: value ? "on" : "off",
+        });
     }
 }
+
+module.exports = Lightbulb;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "homebridge-ipark-hb",
-    "version": "1.2.2",
+    "version": "1.2.4",
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"

package/publish

@@ -0,0 +1,3 @@
+./update $1
+npm version $2
+npm publish