move some vars to base class

ioBroker · Jul 8, 2024 · 6ac7609 · 6ac7609
1 parent d8fa49a
commit 6ac7609
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 35 deletions.
diff --git a/src/matter/BaseServerNode.ts b/src/matter/BaseServerNode.ts
@@ -1,4 +1,10 @@
 import { GeneralNode, MessageResponse } from './GeneralNode';
+import type { MatterAdapter } from '../main';
+import { ServerNode } from '@project-chip/matter.js/node';
+
+export interface BaseCreateOptions {
+    adapter: MatterAdapter;
+}
 
 export enum NodeStates {
     Creating = 'creating',
@@ -21,8 +27,21 @@ export interface NodeStateResponse {
 }
 
 export abstract class BaseServerNode implements GeneralNode {
-    abstract advertise(): Promise<void>;
-    abstract factoryReset(): Promise<void>;
+    protected adapter: MatterAdapter;
+    protected serverNode?: ServerNode;
+
+    protected constructor(options: BaseCreateOptions) {
+        this.adapter = options.adapter;
+    }
+
+    async advertise(): Promise<void> {
+        await this.serverNode?.advertiseNow();
+    }
+
+    async factoryReset(): Promise<void> {
+        await this.serverNode?.factoryReset();
+    }
+
     abstract getState(): Promise<NodeStateResponse>;
 
     async handleCommand(command: string, _message: ioBroker.MessagePayload): Promise<MessageResponse> {

diff --git a/src/matter/BridgedDevicesNode.ts b/src/matter/BridgedDevicesNode.ts
@@ -15,9 +15,9 @@ import { AggregatorEndpoint } from '@project-chip/matter.js/endpoint/definitions
 import {
     BridgedDeviceBasicInformationServer
 } from '@project-chip/matter.js/behavior/definitions/bridged-device-basic-information';
-import { BaseServerNode, ConnectionInfo, NodeStateResponse, NodeStates } from './BaseServerNode';
+import { BaseCreateOptions, BaseServerNode, ConnectionInfo, NodeStateResponse, NodeStates } from './BaseServerNode';
 
-export interface BridgeCreateOptions {
+export interface BridgeCreateOptions extends BaseCreateOptions {
     adapter: MatterAdapter;
     parameters: BridgeOptions,
     devices: GenericDevice[];
@@ -36,14 +36,11 @@ export interface BridgeOptions {
 class BridgedDevices extends BaseServerNode {
     private parameters: BridgeOptions;
     private readonly devices: GenericDevice[];
-    private serverNode?: ServerNode;
     private devicesOptions: BridgeDeviceDescription[];
-    private adapter: MatterAdapter;
     private commissioned: boolean | null = null;
 
     constructor(options: BridgeCreateOptions) {
-        super();
-        this.adapter = options.adapter;
+        super(options);
         this.parameters = options.parameters;
         this.devices = options.devices;
         this.devicesOptions = options.devicesOptions;
@@ -188,7 +185,7 @@ class BridgedDevices extends BaseServerNode {
         if (!this.serverNode?.lifecycle.isCommissioned) {
             if (this.commissioned !== false) {
                 this.commissioned = false;
-                await this.adapter.setStateAsync(`bridges.${this.parameters.uuid}.commissioned`, this.commissioned, true);
+                await this.adapter.setState(`bridges.${this.parameters.uuid}.commissioned`, this.commissioned, true);
             }
             const { qrPairingCode, manualPairingCode } = this.serverNode?.state.commissioning.pairingCodes;
             return {
@@ -199,7 +196,7 @@ class BridgedDevices extends BaseServerNode {
         } else {
             if (this.commissioned !== true) {
                 this.commissioned = true;
-                await this.adapter.setStateAsync(`bridges.${this.parameters.uuid}.commissioned`, this.commissioned, true);
+                await this.adapter.setState(`bridges.${this.parameters.uuid}.commissioned`, this.commissioned, true);
             }
 
             const activeSessions = Object.values(this.serverNode.state.sessions.sessions);
@@ -240,14 +237,6 @@ class BridgedDevices extends BaseServerNode {
         }
     }
 
-    async advertise(): Promise<void> {
-        await this.serverNode?.advertiseNow();
-    }
-
-    async factoryReset(): Promise<void> {
-        await this.serverNode?.factoryReset();
-    }
-
     async start(): Promise<void> {
         if (!this.serverNode) {
             return;

diff --git a/src/matter/DeviceNode.ts b/src/matter/DeviceNode.ts
@@ -10,10 +10,9 @@ import VENDOR_IDS from './vendorIds';
 import type { MatterAdapter } from '../main';
 import { ServerNode } from '@project-chip/matter.js/node';
 import { SessionsBehavior } from '@project-chip/matter.js/behavior/system/sessions';
-import { BaseServerNode, NodeStateResponse, NodeStates } from './BaseServerNode';
+import { BaseCreateOptions, BaseServerNode, NodeStateResponse, NodeStates } from './BaseServerNode';
 
-export interface DeviceCreateOptions {
-    adapter: MatterAdapter;
+export interface DeviceCreateOptions extends BaseCreateOptions {
     parameters: DeviceOptions,
     device: GenericDevice;
     deviceOptions: DeviceDescription;
@@ -31,14 +30,11 @@ export interface DeviceOptions {
 class Device extends BaseServerNode {
     private parameters: DeviceOptions;
     private readonly device: GenericDevice;
-    private serverNode?: ServerNode;
     private deviceOptions: DeviceDescription;
-    private adapter: MatterAdapter;
     private commissioned: boolean | null = null;
 
     constructor(options: DeviceCreateOptions) {
-        super();
-        this.adapter = options.adapter;
+        super(options);
         this.parameters = options.parameters;
         this.device = options.device;
         this.deviceOptions = options.deviceOptions;
@@ -170,7 +166,7 @@ class Device extends BaseServerNode {
         if (!this.serverNode?.lifecycle.isCommissioned) {
             if (this.commissioned !== false) {
                 this.commissioned = false;
-                await this.adapter.setStateAsync(`devices.${this.parameters.uuid}.commissioned`, this.commissioned, true);
+                await this.adapter.setState(`devices.${this.parameters.uuid}.commissioned`, this.commissioned, true);
             }
             const { qrPairingCode, manualPairingCode } = this.serverNode?.state.commissioning.pairingCodes;
             return {
@@ -181,7 +177,7 @@ class Device extends BaseServerNode {
         } else {
             if (this.commissioned !== true) {
                 this.commissioned = true;
-                await this.adapter.setStateAsync(`devices.${this.parameters.uuid}.commissioned`, this.commissioned, true);
+                await this.adapter.setState(`devices.${this.parameters.uuid}.commissioned`, this.commissioned, true);
             }
 
             const activeSessions = Object.values(this.serverNode.state.sessions.sessions);
@@ -222,14 +218,6 @@ class Device extends BaseServerNode {
         }
     }
 
-    async advertise(): Promise<void> {
-        await this.serverNode?.advertiseNow();
-    }
-
-    async factoryReset(): Promise<void> {
-        await this.serverNode?.factoryReset();
-    }
-
     async start(): Promise<void> {
         if (!this.serverNode) return;
         await this.serverNode.bringOnline();