Merge pull request #13 from baranwang/feat/1.3

feat: 新增支持过滤设备配置

.vscode/settings.json

@@ -7,5 +7,13 @@
   "eslint.enable": true,
   "cSpell.words": [
     "Haier"
+  ],
+  "json.schemas": [
+    {
+      "fileMatch": [
+        "lerna.json"
+      ],
+      "url": "../node_modules/lerna/schemas/lerna-schema.json"
+    }
   ]
 }

lerna.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
+  "$schema": "./node_modules/lerna/schemas/lerna-schema.json",
   "version": "1.2.3",
   "packages": ["packages/*"],
   "command": {

package.json

@@ -1,8 +1,9 @@
 {
-  "name": "root",
+  "name": "hb-haier",
   "private": true,
   "scripts": {
-    "build": "lerna run build"
+    "build": "lerna run build",
+    "dev": "lerna watch -- lerna run build --scope=\\$LERNA_PACKAGE_NAME"
   },
   "workspaces": [
     "packages/*"

packages/plugin/package.json

@@ -5,8 +5,8 @@
   "description": "海尔智家 Homebridge 插件",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",
-    "build": "rimraf ./dist && tsc",
-    "watch": "nodemon"
+    "dev": "nodemon",
+    "build": "rimraf ./dist && tsc"
   },
   "repository": {
     "type": "git",

packages/plugin/src/accessories/base.ts

@@ -46,6 +46,7 @@ export class BaseAccessory {
       this.onDevDigitalModelUpdate();
       return devDigitalModel;
     } catch (error) {
+      this.platform.log.error('获取设备数据失败', error);
       return this.accessory.context.devDigitalModel;
     } finally {
       this.devDigitalModelPromise = undefined;

packages/plugin/src/platform.ts

@@ -17,7 +17,11 @@ export class HaierHomebridgePlatform implements DynamicPlatformPlugin {
 
   private discoveryInterval?: NodeJS.Timeout;
 
-  constructor(public readonly log: Logger, public readonly config: PlatformConfig, public readonly api: API) {
+  constructor(
+    public readonly log: Logger,
+    public readonly config: PlatformConfig,
+    public readonly api: API,
+  ) {
     this.log.debug('平台初始化完成', this.config.name);
 
     this.api.on('didFinishLaunching', () => {
@@ -40,15 +44,18 @@ export class HaierHomebridgePlatform implements DynamicPlatformPlugin {
   }
 
   discoverDevices() {
-    const { familyId } = this.config;
-
+    const { familyId, disabledDevices = [] } = this.config;
     if (!familyId) {
       this.log.error('请在 config.json 中配置 familyId');
       return;
     }
 
     this.haierApi.getDevicesByFamilyId(familyId).then(devices => {
-      devices.forEach(device => this.handleDevice(device));
+      devices.forEach(device => {
+        if (!disabledDevices.includes(device.baseInfo.deviceId)) {
+          this.handleDevice(device);
+        }
+      });
     });
   }
 
@@ -77,8 +84,9 @@ export class HaierHomebridgePlatform implements DynamicPlatformPlugin {
       this.api.updatePlatformAccessories([existingAccessory]);
       new AccessoryClass(this, existingAccessory);
     } else {
-      this.log.info('Adding new accessory:', device.baseInfo.deviceName);
-      const accessory = new this.api.platformAccessory<HaierPlatformAccessoryContext>(device.baseInfo.deviceName, uuid);
+      const displayName = this.getDeviceName(device);
+      this.log.info('Adding new accessory:', displayName);
+      const accessory = new this.api.platformAccessory<HaierPlatformAccessoryContext>(displayName, uuid);
       accessory.context = {
         deviceInfo: device,
       };
@@ -88,12 +96,13 @@ export class HaierHomebridgePlatform implements DynamicPlatformPlugin {
   }
 
   private isDeviceIneligible(device: DeviceInfo): boolean {
+    const displayName = this.getDeviceName(device);
     if (!device.baseInfo.permission.auth.control) {
-      this.log.warn('设备', device.baseInfo.deviceName, '没有控制权限');
+      this.log.warn('设备', displayName, '没有控制权限');
       return true;
     }
     if (!device.extendedInfo.bindType) {
-      this.log.warn('设备', device.baseInfo.deviceName, '不支持云端控制');
+      this.log.warn('设备', displayName, '不支持云端控制');
       return true;
     }
     return false;
@@ -108,4 +117,8 @@ export class HaierHomebridgePlatform implements DynamicPlatformPlugin {
         return undefined;
     }
   }
+
+  private getDeviceName(device: DeviceInfo) {
+    return `${device.extendedInfo.room} - ${device.baseInfo.deviceName}`;
+  }
 }

packages/shared/package.json

@@ -4,22 +4,9 @@
   "types": "./dist/types/index.d.ts",
   "main": "./dist/lib/index.js",
   "module": "./dist/es/index.js",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "import": "./dist/es/index.js",
-      "require": "./dist/lib/index.js",
-      "types": "./dist/types/index.d.ts"
-    },
-    "./dist/*": {
-      "import": "./dist/es/*",
-      "require": "./dist/lib/*",
-      "types": "./dist/types/*"
-    }
-  },
   "scripts": {
-    "build": "modern build",
-    "build:watch": "modern build -w"
+    "dev": "modern build -w",
+    "build": "modern build"
   },
   "files": [
     "dist"

packages/shared/src/api/index.ts

@@ -90,7 +90,7 @@ export class HaierApi {
       const body = config.data ? JSON.stringify(config.data) : '';
       const signStr = `${url.pathname}${url.search}${body}${APP_ID}${APP_KEY}${timestamp}`;
       config.headers.sign = sha256(signStr);
-      this.logger.debug('request:', url.toString(), JSON.stringify(config.data));
+      this.logger.debug('request:', url.toString(), config.data ? JSON.stringify(config.data) : undefined);
       return config;
     });
     this.axios.interceptors.response.use(

packages/ui-renderer/package.json

@@ -2,14 +2,14 @@
   "name": "@hb-haier/ui-renderer",
   "version": "1.2.3",
   "scripts": {
-    "dev": "rsbuild dev --open",
-    "build": "rsbuild build",
-    "preview": "rsbuild preview"
+    "dev": "rsbuild dev",
+    "build": "rsbuild build"
   },
   "dependencies": {
     "@hb-haier/shared": "1.2.3",
     "ahooks": "^3.7.10",
     "rc-field-form": "^1.41.0",
+    "rc-select": "^14.11.0",
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.1",
     "react-dom": "^18.2.0"

packages/ui-renderer/rsbuild.config.ts

@@ -4,7 +4,12 @@ import { pluginReact } from '@rsbuild/plugin-react';
 export default defineConfig({
   plugins: [pluginReact()],
   html: {
+    inject: 'body',
     template: './static/index.html',
     title: '',
   },
+  output: {
+    assetPrefix: './',
+    legalComments: 'none',
+  }
 });