homebridge-openwrt-control 0.0.2-beta.4 → 0.0.2-beta.40

package/config.schema.json

@@ -4,7 +4,7 @@
   "singular": true,
   "fixArrays": true,
   "strictValidation": true,
-  "headerDisplay": "This plugin works with OpenWrt Devices based on Dashboard API. Devices are exposed to HomeKit as separate accessories and each needs to be manually paired.",
+  "headerDisplay": "This plugin works with OpenWrt flashed devices. Devices are exposed to HomeKit as separate accessories and each needs to be manually paired.",
   "footerDisplay": "For documentation please see [GitHub repository](https://github.com/grzegorz914/homebridge-openwrt-control).",
   "schema": {
     "type": "object",
@@ -13,7 +13,7 @@
         "type": "array",
         "items": {
           "type": "object",
-          "title": "Network",
+          "title": "Device",
           "properties": {
             "name": {
               "title": "Name",

package/index.js

@@ -1,8 +1,8 @@
 import { join } from 'path';
 import { mkdirSync, existsSync, writeFileSync } from 'fs';
 import OpenWrt from './src/openwrt.js';
-import AccessPoint from './src/apdevice.js';
-import Switch from './src/swdevice.js';
+import AccessPoint from './src/accesspoint.js';
+import Switch from './src/switch.js';
 import ImpulseGenerator from './src/impulsegenerator.js';
 import { PluginName, PlatformName } from './src/constants.js';
 
@@ -14,7 +14,6 @@ class OpenWrtPlatform {
       return;
     }
     this.accessories = [];
-    this.devices = [];
 
     //check if prefs directory exist
     const prefDir = join(api.user.storagePath(), 'openWrt');
@@ -27,9 +26,9 @@ class OpenWrtPlatform {
 
     api.on('didFinishLaunching', async () => {
       for (const deviceConfig of config.devices) {
-        const { name, host, port, displayType } =deviceConfig;
-        if (!name || !host || !port || !displayType) {
-          log.warn(`Device: ${host || 'host missing'},  ${name || 'name missing'}, ${port || 'port missing'}${!displayType ? ', disply type disabled' : ''} in config, will not be published in the Home app`);
+        const { name, host, displayType } = deviceConfig;
+        if (!name || !host || !displayType) {
+          log.warn(`Device: ${host || 'host missing'},  ${name || 'name missing'}, ${!displayType ? ', display type disabled' : ''} in config, will not be published in the Home app`);
           continue;
         }
 
@@ -61,43 +60,45 @@ class OpenWrtPlatform {
           log.info(`Device: ${host} ${name}, Config: ${JSON.stringify(safeConfig, null, 2)}`);
         }
 
+        const configuredDevices = [];
         const refreshInterval = (deviceConfig.refreshInterval ?? 5) * 1000;
-        if (deviceConfig.accessPoint?.enable) this.devices.push('accessPoint');
-        if (deviceConfig.switch?.enable) this.devices.push('switch');
-
-        if (this.devices.length === 0) return;
-
-        const openWrt = new OpenWrt(deviceConfig)
-          .on('success', msg => logLevel.success && log.success(`Device: ${host}, ${msg}`))
-          .on('info', msg => log.info(`Device: ${host}, ${msg}`))
-          .on('debug', msg => log.info(`Device: ${host}, debug: ${msg}`))
-          .on('warn', msg => log.warn(`Device: ${host}, ${msg}`))
-          .on('error', msg => log.error(`Device: ${host}, ${msg}`))
-
-        const openWrtInfo = await openWrt.connect();
-        if (!openWrtInfo.state) {
-          if (logLevel.warn) log.warn(`Device: ${host} ${name}, no data received`);
-          return;
-        }
+        if (deviceConfig.accessPoint?.enable) configuredDevices.push('accessPoint');
+        if (deviceConfig.switch?.enable) configuredDevices.push('switch');
+        if (configuredDevices.length === 0) continue;
 
         try {
-          for (const device of this.devices) {
-            // create impulse generator
+          const openWrt = new OpenWrt(deviceConfig)
+            .on('success', msg => logLevel.success && log.success(`Device: ${host}, ${msg}`))
+            .on('info', msg => log.info(`Device: ${host} ${name}, ${msg}`))
+            .on('debug', msg => log.info(`Device: ${host} ${name}, debug: ${msg}`))
+            .on('warn', msg => log.warn(`Device: ${host} ${name}, ${msg}`))
+            .on('error', msg => log.error(`Device: ${host} ${name}, ${msg}`))
+
+          const openWrtInfo = await openWrt.connect();
+          if (!openWrtInfo.state) {
+            if (logLevel.warn) log.warn(`Device: ${host} ${name}, no data received`);
+            continue;
+          }
+
+          // start openwrt impulse generator
+          await openWrt.impulseGenerator.state(true, [{ name: 'connect', sampling: refreshInterval }], false);
+
+          // create impulse generator for every device
+          for (const device of configuredDevices) {
             const impulseGenerator = new ImpulseGenerator()
               .on('start', async () => {
                 try {
 
-                  // create device instance
-                  let type;
-                  switch (device) {
-                    case 'accessPoint': type = new AccessPoint(api, deviceConfig, openWrt, openWrtInfo); break;
-                    case 'switch': type = new Switch(api, deviceConfig, openWrt, openWrtInfo); break;
-                    default:
-                      if (logLevel.warn) log.warn(`Device: ${host} ${name}, unknown device: ${device}`);
-                      return;
+                  // create device clases
+                  const DeviceClasses = { accessPoint: AccessPoint, switch: Switch };
+                  const DeviceClass = DeviceClasses[device];
+
+                  if (!DeviceClass) {
+                    if (logLevel.warn) log.warn(`Device: ${host} ${name}, class not found for: ${device}`);
+                    return;
                   }
 
-                  type
+                  const type = new DeviceClass(api, deviceConfig, openWrt, openWrtInfo)
                     .on('devInfo', msg => logLevel.devInfo && log.info(msg))
                     .on('success', msg => logLevel.success && log.success(`Device: ${host} ${name}, ${msg}`))
                     .on('info', msg => log.info(`Device: ${host} ${name}, ${msg}`))
@@ -111,7 +112,7 @@ class OpenWrtPlatform {
                     if (logLevel.success) log.success(`Device: ${host} ${name}, Published as external accessory.`);
                   }
 
-                  // stop master impulse generator
+                  // stop accessory impulse generator
                   await impulseGenerator.state(false);
                 } catch (error) {
                   if (logLevel.error) log.error(`Device: ${host} ${name}, Start impulse generator error: ${error.message ?? error}, trying again.`);
@@ -121,12 +122,9 @@ class OpenWrtPlatform {
                 if (logLevel.debug) log.info(`Device: ${host} ${name}, Start impulse generator ${state ? 'started' : 'stopped'}.`);
               });
 
-            // start impulse generator
+            // start accessory impulse generator
             await impulseGenerator.state(true, [{ name: 'start', sampling: 120000 }]);
           }
-
-          // start openwrt impulse generator
-          await openWrt.impulseGenerator.state(true, [{ name: 'connect', sampling: refreshInterval }], false);
         } catch (error) {
           if (logLevel.error) log.error(`Device: ${host} ${name}, Did finish launching error: ${error.message ?? error}`);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
     "displayName": "OpenWrt Control",
     "name": "homebridge-openwrt-control",
-    "version": "0.0.2-beta.4",
+    "version": "0.0.2-beta.40",
     "description": "Homebridge plugin to control OpenWrt flashed devices.",
     "license": "MIT",
     "author": "grzegorz914",

package/src/{apdevice.js → accesspoint.js}

@@ -1,7 +1,7 @@
 import EventEmitter from 'events';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class AccessPointDevice extends EventEmitter {
+class AccessPoint extends EventEmitter {
     constructor(api, config, openWrt, openWrtInfo) {
         super();
 
@@ -12,6 +12,7 @@ class AccessPointDevice extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //config
+        this.host = config.host;
         this.name = config.accessPoint.name || openWrtInfo.systemInfo.hostname;
         this.accessPoint = config.accessPoint;
         this.logInfo = config.log?.info || false;
@@ -65,8 +66,8 @@ class AccessPointDevice extends EventEmitter {
                 this.mqtt1 = new Mqtt({
                     host: this.mqtt.host,
                     port: this.mqtt.port || 1883,
-                    clientId: this.mqtt.clientId ? `${this.savedInfo.manufacturer}_${this.mqtt.clientId}_${Math.random().toString(16).slice(3)}` : `${this.savedInfo.manufacturer}_${Math.random().toString(16).slice(3)}`,
-                    prefix: this.mqtt.prefix ? `${this.savedInfo.manufacturer}/${this.mqtt.prefix}/${this.name}` : `${this.savedInfo.manufacturer}/${this.name}`,
+                    clientId: this.mqtt.clientId ? `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}_${this.mqtt.clientId}_${Math.random().toString(16).slice(3)}` : `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}_${Math.random().toString(16).slice(3)}`,
+                    prefix: this.mqtt.prefix ? `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}/${this.mqtt.prefix}/${this.name}` : `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}/${this.name}`,
                     user: this.mqtt.auth?.user,
                     passwd: this.mqtt.auth?.passwd,
                     logWarn: this.logWarn,
@@ -121,23 +122,23 @@ class AccessPointDevice extends EventEmitter {
             //prepare accessory
             if (this.logDebug) this.emit('debug', `prepare accessory`);
             const accessoryName = this.name;
-            const accessoryUUID = AccessoryUUID.generate(this.openWrtInfo.systemInfo.hostname);
+            const accessoryUUID = AccessoryUUID.generate(this.host + this.openWrtInfo.systemInfo.system);
             const accessoryCategory = Categories.AIRPORT;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
             //prepare information service
             if (this.logDebug) this.emit('debug', `prepare information service`);
-            accessory.getService(Service.AccessoryInformation)
-                .setCharacteristic(Characteristic.Manufacturer, 'OpenWrt')
+            this.informationService = accessory.getService(Service.AccessoryInformation)
+                .setCharacteristic(Characteristic.Manufacturer, this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt')
                 .setCharacteristic(Characteristic.Model, this.openWrtInfo.systemInfo.model)
                 .setCharacteristic(Characteristic.SerialNumber, this.openWrtInfo.systemInfo.system)
-                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.description)
-                .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
+                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.version);
 
             if (this.logDebug) this.emit('debug', `prepare service`);
 
-            //device
+            //services
             this.services = [];
+            this.sensorServices = [];
             for (const ssid of this.ssids) {
                 const name = ssid.name;
                 if (this.logDebug) this.emit('debug', `prepare ssid: ${name} service`);
@@ -165,8 +166,6 @@ class AccessPointDevice extends EventEmitter {
 
                 if (this.accessPoint.sensor) {
                     if (this.logDebug) this.emit('debug', `prepare ssid: ${name} sensor service`);
-
-                    this.sensorServices = [];
                     const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}`);
                     sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                     sensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
@@ -192,39 +191,44 @@ class AccessPointDevice extends EventEmitter {
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
             this.emit('devInfo', `-------- Access Point ${this.name} --------`);
-            this.emit('devInfo', `Name: ${this.openWrtInfo.systemInfo.hostname}`);
-            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model}`);
+            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model || this.openWrtInfo.systemInfo.board_name}`);
             this.emit('devInfo', `System: ${this.openWrtInfo.systemInfo.system}`);
+            this.emit('devInfo', `Kernel: ${this.openWrtInfo.systemInfo.kernel}`);
             this.emit('devInfo', `Firmware: ${this.openWrtInfo.systemInfo.release?.description}`);
+            this.emit('devInfo', `Target: ${this.openWrtInfo.systemInfo.release?.target}`);
+            this.emit('devInfo', `SSIDs: ${this.ssids.length}`);
             this.emit('devInfo', `----------------------------------`);
 
             //openwrt client
             this.openWrt.on('systemInfo', (info) => {
-                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.description);
+                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
             })
+                .on('networkInfo', async (info) => {
+                })
                 .on('wirelessStatus', async (status) => {
                 })
                 .on('wirelessRadios', async (radios) => {
                 })
                 .on('ssids', async (ssids) => {
+                    this.ssids = ssids;
+
                     // sensors
                     for (let i = 0; i < ssids.length; i++) {
                         const ssid = ssids[i];
-
-                        const name = ssid[i].name;
-                        const state = ssid[i].state;
+                        const name = ssid.name;
+                        const state = ssid.state;
                         const serviceName = this.accessPoint.namePrefix ? `${this.name} ${name}` : name;
                         this.services?.[i]
                             ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
                             .updateCharacteristic(Characteristic.On, state);
 
                         this.sensorServices?.[i]
-                            ?.setCharacteristic(Characteristic.ConfiguredName, name)
-                            .updateCharacteristic(Characteristic.ContactSensorState, state ? 0 : 1);
+                            ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                            .updateCharacteristic(Characteristic.ContactSensorState, !state);
 
                         if (this.logInfo) {
-                            this.emit('info', `SSID name: ${ssid.name}`);
-                            this.emit('info', `Name: ${ssid.state}`);
+                            this.emit('info', `Name: ${ssid.name}`);
+                            this.emit('info', `State: ${ssid.state}`);
                             this.emit('info', `Mode: ${ssid.mode}`);
                         }
                     }
@@ -244,4 +248,4 @@ class AccessPointDevice extends EventEmitter {
         }
     }
 };
-export default AccessPointDevice;
+export default AccessPoint;

package/src/openwrt.js

@@ -1,16 +1,14 @@
-import EventEmitter from "events";
-import axios from "axios";
+import EventEmitter from 'events';
+import axios from 'axios';
 import Functions from './functions.js';
-import ImpulseGenerator from "./impulsegenerator.js";
+import ImpulseGenerator from './impulsegenerator.js';
 
 class OpenWrt extends EventEmitter {
     constructor(config) {
         super();
 
-        this.name = config.name;
-        this.host = config.host;
-        this.user = config.user;
-        this.passwd = config.passwd;
+        this.user = config.auth?.user || 'root';
+        this.passwd = config.auth?.passwd;
         this.logError = config.log?.error;
         this.logDebug = config.log?.debug;
 
@@ -26,7 +24,7 @@ class OpenWrt extends EventEmitter {
 
         this.functions = new Functions();
         this.axiosInstance = axios.create({
-            baseURL: `${config.host}/ubus`,
+            baseURL: `http://${config.host}/ubus`,
             timeout: 5000,
             headers: {
                 "Content-Type": "application/json"
@@ -34,11 +32,11 @@ class OpenWrt extends EventEmitter {
         });
 
         this.impulseGenerator = new ImpulseGenerator()
-            .on("connect", () => this.handleWithLock(async () => {
+            .on('connect', () => this.handleWithLock(async () => {
                 await this.connect();
             }))
-            .on("state", (state) => {
-                this.emit(state ? "success" : "warn", `Impulse generator ${state ? "started" : "stopped"}`);
+            .on('state', (state) => {
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 
@@ -49,8 +47,7 @@ class OpenWrt extends EventEmitter {
         try {
             await fn();
         } catch (error) {
-            this.emit("error", `Impulse generator error: ${error.message}`
-            );
+            this.emit('error', `Impulse generator error: ${error.message}`);
         } finally {
             this.lock = false;
         }
@@ -62,52 +59,53 @@ class OpenWrt extends EventEmitter {
             return this.sessionId;
         }
 
-        const response = await this.axiosInstance.post("", {
-            jsonrpc: "2.0",
+        const response = await this.axiosInstance.post('', {
+            jsonrpc: '2.0',
             id: 1,
-            method: "call",
-            params: ["00000000000000000000000000000000", "session", "login", { username: this.user, password: this.passwd }]
+            method: 'call',
+            params: ['00000000000000000000000000000000', 'session', 'login', { username: this.user, password: this.passwd }]
         });
 
         const result = response.data?.result?.[1];
-        if (!result?.ubus_rpc_session) {
-            throw new Error("ubus login failed");
-        }
+        if (!result?.ubus_rpc_session) throw new Error('Ubus login failed');
 
         this.sessionId = result.ubus_rpc_session;
         this.sessionExpiresAt = now + 240_000;
 
-        if (this.logDebug) this.emit("debug", `Ubus login OK`);
+        if (this.logDebug) this.emit('debug', `Ubus login OK`);
         return this.sessionId;
     }
 
     async ubusCall(service, method, params = {}) {
         const session = await this.login();
-
-        const response = await this.axiosInstance.post("", {
-            jsonrpc: "2.0",
+        const response = await this.axiosInstance.post('', {
+            jsonrpc: '2.0',
             id: 2,
-            method: "call",
+            method: 'call',
             params: [session, service, method, params]
         });
 
-        if (response.data?.error) {
-            throw new Error(response.data.error.message || "ubus call error");
-        }
+        if (this.logDebug) this.emit('debug', `Response: ${response}`);
+
+        if (response.data?.error) throw new Error(response.data.error.message || 'Ubus call error');
 
         return response.data.result[1];
     }
 
     async connect() {
+        const openWrtInfo = { state: false, systemInfo: {}, networkInfo: {}, wirelessStatus: {}, wirelessRadios: [], ssids: [] }
+
         try {
-            const openWrtInfo = { state: false, systemInfo: {}, wirelessStatus: {}, wirelessRadios: [], ssids: [] }
-            const systemInfo = await this.ubusCall("system", "board");
-            if (this.logDebug) this.emit("debug", `System info data: ${JSON.stringify(systemInfo, null, 2)}`);
+            const systemInfo = await this.ubusCall('system', 'board');
+            if (this.logDebug) this.emit('debug', `System info data: ${JSON.stringify(systemInfo, null, 2)}`);
 
-            const wirelessStatus = await this.ubusCall("network.wireless", "status");
-            if (this.logDebug) this.emit("debug", `Wireless status data: ${JSON.stringify(wirelessStatus, null, 2)}`);
+            const networkInfo = await this.ubusCall('network.device', 'status', { "name": "eth0" });
+            if (this.logDebug) this.emit('debug', `Network info data: ${JSON.stringify(networkInfo, null, 2)}`);
 
-            const wirelessRadios = Object.values(status.radios).map(radio => ({
+            const wirelessStatus = await this.ubusCall('network.wireless', 'status');
+            if (this.logDebug) this.emit('debug', `Wireless status data: ${JSON.stringify(wirelessStatus, null, 2)}`);
+
+            const wirelessRadios = Object.values(wirelessStatus.radios).map(radio => ({
                 name: radio.name,
                 state: radio.up === true,
                 interfaces: Object.values(radio.interfaces).map(i => ({
@@ -118,27 +116,29 @@ class OpenWrt extends EventEmitter {
             }));
 
             const ssids = wirelessRadios.flatMap(radio => radio.interfaces);
-            this.emit("systemInfo", systemInfo);
-            this.emit("wirelessStatus", wirelessStatus);
-            this.emit("wirelessRadios", wirelessRadios);
-            this.emit("ssids", ssids);
-
-            if (this.firstRun) {
-                this.emit("success", `Connect success`);
-                this.firstRun = false;
-            }
-
             openWrtInfo.state = true;
             openWrtInfo.systemInfo = systemInfo;
+            openWrtInfo.networkInfo = networkInfo;
             openWrtInfo.wirelessStatus = wirelessStatus;
             openWrtInfo.wirelessRadios = wirelessRadios;
             openWrtInfo.ssids = ssids;
 
-            if (this.logDebug) this.emit("debug", `OpenWrt Data: ${JSON.stringify(openWrtInfo, null, 2)}`);
+            if (this.firstRun) {
+                this.emit('success', `Connect success`);
+                this.firstRun = false;
+            }
+
+            // emit data
+            this.emit('systemInfo', systemInfo);
+            this.emit('networkInfo', networkInfo);
+            this.emit('wirelessStatus', wirelessStatus);
+            this.emit('wirelessRadios', wirelessRadios);
+            this.emit('ssids', ssids);
+
             return openWrtInfo;
         } catch (error) {
-            if (this.logError) this.emit("error", `Connect error: ${error.message}`);
-            return null;
+            if (this.logError) this.emit('error', `Connect error: ${error.message}`);
+            return openWrtInfo;
         }
     }
 
@@ -146,29 +146,29 @@ class OpenWrt extends EventEmitter {
         switch (type) {
             case 'ssid':
                 await this.handleWithLock(async () => {
-                    if (this.logDebug) this.emit("debug", `${state ? "Enabling" : "Disabling"} SSID ${ssidName}`);
+                    if (this.logDebug) this.emit('debug', `${state ? 'Enabling' : 'Disabling'} SSID ${ssidName}`);
 
-                    const status = await this.ubusCall("network.wireless", "status");
+                    const status = await this.ubusCall('network.wireless', 'status');
                     const iface = await this.functions.findIfaceBySsid(status, ssidName);
                     if (!iface) throw new Error(`SSID ${ssidName} not found`);
 
                     const section = iface.section;
                     if (!section) throw new Error(`No UCI section for SSID ${ssidName}`);
 
-                    await this.ubusCall("uci", "set",
+                    await this.ubusCall('uci', 'set',
                         {
-                            config: "wireless",
+                            config: 'wireless',
                             section: section,
                             values: {
-                                disabled: state ? "0" : "1"
+                                disabled: state ? '0' : '1'
                             }
                         }
                     );
 
-                    await this.ubusCall("uci", "commit", { config: "wireless" });
-                    await this.ubusCall("network.wireless", "reload", {});
+                    await this.ubusCall('uci', 'commit', { config: 'wireless' });
+                    await this.ubusCall('network.wireless', 'reload', {});
 
-                    if (this.logDebug) this.emit("debug", `Send SSID ${ssidName} ${state ? "enabled" : "disabled"}`);
+                    if (this.logDebug) this.emit('debug', `Send SSID ${ssidName} ${state ? 'enabled' : 'disabled'}`);
                 });
                 break;
             case 'switch':
@@ -177,5 +177,4 @@ class OpenWrt extends EventEmitter {
     }
 }
 
-export default OpenWrt;
-
+export default OpenWrt;

package/src/{swdevice.js → switch.js}

@@ -1,7 +1,7 @@
 import EventEmitter from 'events';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
-class SwitchDevice extends EventEmitter {
+class Switch extends EventEmitter {
     constructor(api, config, openWrt, openWrtInfo) {
         super();
 
@@ -12,8 +12,9 @@ class SwitchDevice extends EventEmitter {
         AccessoryUUID = api.hap.uuid;
 
         //config
-        this.name = config.switch.name || openWrtInfo.systemInfo.hostname;
-        this.switch = config.switch;
+        this.host = config.host;
+        this.name = config.accessPoint.name || openWrtInfo.systemInfo.hostname;
+        this.accessPoint = config.accessPoint;
         this.logInfo = config.log?.info || false;
         this.logDebug = config.log?.debug || false;
 
@@ -65,8 +66,8 @@ class SwitchDevice extends EventEmitter {
                 this.mqtt1 = new Mqtt({
                     host: this.mqtt.host,
                     port: this.mqtt.port || 1883,
-                    clientId: this.mqtt.clientId ? `${this.savedInfo.manufacturer}_${this.mqtt.clientId}_${Math.random().toString(16).slice(3)}` : `${this.savedInfo.manufacturer}_${Math.random().toString(16).slice(3)}`,
-                    prefix: this.mqtt.prefix ? `${this.savedInfo.manufacturer}/${this.mqtt.prefix}/${this.name}` : `${this.savedInfo.manufacturer}/${this.name}`,
+                    clientId: this.mqtt.clientId ? `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}_${this.mqtt.clientId}_${Math.random().toString(16).slice(3)}` : `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}_${Math.random().toString(16).slice(3)}`,
+                    prefix: this.mqtt.prefix ? `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}/${this.mqtt.prefix}/${this.name}` : `${this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt'}/${this.name}`,
                     user: this.mqtt.auth?.user,
                     passwd: this.mqtt.auth?.passwd,
                     logWarn: this.logWarn,
@@ -121,29 +122,30 @@ class SwitchDevice extends EventEmitter {
             //prepare accessory
             if (this.logDebug) this.emit('debug', `prepare accessory`);
             const accessoryName = this.name;
-            const accessoryUUID = AccessoryUUID.generate(this.openWrtInfo.systemInfo.hostname);
-            const accessoryCategory = Categories.ROUTER;
+            const accessoryUUID = AccessoryUUID.generate(this.host + this.openWrtInfo.systemInfo.system);
+            const accessoryCategory = Categories.AIRPORT;
             const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
             //prepare information service
             if (this.logDebug) this.emit('debug', `prepare information service`);
             accessory.getService(Service.AccessoryInformation)
-                .setCharacteristic(Characteristic.Manufacturer, 'OpenWrt')
+                .setCharacteristic(Characteristic.Manufacturer, this.openWrtInfo.systemInfo.release.distribution || 'OpenWrt')
                 .setCharacteristic(Characteristic.Model, this.openWrtInfo.systemInfo.model)
                 .setCharacteristic(Characteristic.SerialNumber, this.openWrtInfo.systemInfo.system)
-                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.description)
+                .setCharacteristic(Characteristic.FirmwareRevision, this.openWrtInfo.systemInfo.release?.version)
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
 
             if (this.logDebug) this.emit('debug', `prepare service`);
 
-            //device
+            //services
             this.services = [];
+            this.sensorServices = [];
             for (const port of this.ports) {
                 const name = port.name;
                 if (this.logDebug) this.emit('debug', `prepare port: ${name} service`);
 
-                const serviceName = this.accessPoint.namePrefix ? `${accessoryName} ${ssidName}` : ssidName;
-                const service = accessory.addService(Service.Switch, serviceName, `service${ssidName}`);
+                const serviceName = this.accessPoint.namePrefix ? `${accessoryName} ${name}` : name;
+                const service = accessory.addService(Service.Switch, serviceName, `service${name}`);
                 service.addOptionalCharacteristic(Characteristic.ConfiguredName);
                 service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                 service.getCharacteristic(Characteristic.On)
@@ -166,7 +168,6 @@ class SwitchDevice extends EventEmitter {
                 if (this.accessPoint.sensor) {
                     if (this.logDebug) this.emit('debug', `prepare port: ${name} sensor service`);
 
-                    this.sensorServices = [];
                     const sensorService = accessory.addService(Service.ContactSensor, serviceName, `sensorService${name}`);
                     sensorService.addOptionalCharacteristic(Characteristic.ConfiguredName);
                     sensorService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
@@ -191,39 +192,46 @@ class SwitchDevice extends EventEmitter {
             //start external integrations
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
-            this.emit('devInfo', `-------- Switch ${this.name} --------`);
-            this.emit('devInfo', `Name: ${this.openWrtInfo.systemInfo.hostname}`);
-            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model}`);
+            this.emit('devInfo', `-------- Access Point ${this.name} --------`);
+            this.emit('devInfo', `Model: ${this.openWrtInfo.systemInfo.model || this.openWrtInfo.systemInfo.board_name}`);
             this.emit('devInfo', `System: ${this.openWrtInfo.systemInfo.system}`);
+            this.emit('devInfo', `Kernel: ${this.openWrtInfo.systemInfo.kernel}`);
             this.emit('devInfo', `Firmware: ${this.openWrtInfo.systemInfo.release?.description}`);
+            this.emit('devInfo', `Target: ${this.openWrtInfo.systemInfo.release?.target}`);
+            this.emit('devInfo', `Ports: ${this.ports.length}`);
             this.emit('devInfo', `----------------------------------`);
 
             //openwrt client
             this.openWrt.on('systemInfo', (info) => {
-                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.description);
+                this.informationService?.updateCharacteristic(Characteristic.FirmwareRevision, info.release?.version);
             })
-                .on('switchStatus', async (status) => {
+                .on('networkInfo', async (info) => {
                 })
-                .on('switchPorts', async (ports) => {
+                .on('wirelessStatus', async (status) => {
+                })
+                .on('wirelessRadios', async (radios) => {
+                })
+                .on('ports', async (ports) => {
+                    this.ports = ports;
+
                     // sensors
                     for (let i = 0; i < ports.length; i++) {
                         const port = ports[i];
-
-                        const name = port[i].name;
-                        const state = port[i].state;
+                        const name = port.name;
+                        const state = port.state;
                         const serviceName = this.accessPoint.namePrefix ? `${this.name} ${name}` : name;
                         this.services?.[i]
                             ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
                             .updateCharacteristic(Characteristic.On, state);
 
                         this.sensorServices?.[i]
-                            ?.setCharacteristic(Characteristic.ConfiguredName, name)
-                            .updateCharacteristic(Characteristic.ContactSensorState, state ? 0 : 1);
+                            ?.setCharacteristic(Characteristic.ConfiguredName, serviceName)
+                            .updateCharacteristic(Characteristic.ContactSensorState, !state);
 
                         if (this.logInfo) {
-                            this.emit('info', `Port name: ${port.name}`);
-                            this.emit('info', `Name: ${port.state}`);
-                            this.emit('info', `Mode: ${port.mode}`);
+                            this.emit('info', `Name: ${ports.name}`);
+                            this.emit('info', `State: ${ports.state}`);
+                            this.emit('info', `Mode: ${ports.mode}`);
                         }
                     }
                 })
@@ -242,4 +250,4 @@ class SwitchDevice extends EventEmitter {
         }
     }
 };
-export default SwitchDevice;
+export default Switch;