fix(ignore): Export ZclHeader type Koenkk/zigbee2mqtt#19129

Koenkk · Oct 7, 2023 · 69fb9f1 · 69fb9f1
1 parent cb5dd54
commit 69fb9f1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/src/controller/model/endpoint.ts b/src/controller/model/endpoint.ts
@@ -883,15 +883,15 @@ class Endpoint extends Entity {
 
     public waitForCommand(
         clusterKey: number | string, commandKey: number | string, transactionSequenceNumber: number, timeout: number,
-    ): {promise: Promise<{header: KeyValue; payload: KeyValue}>; cancel: () => void} {
+    ): {promise: Promise<{header: Zcl.ZclHeader; payload: KeyValue}>; cancel: () => void} {
         const cluster = Zcl.Utils.getCluster(clusterKey);
         const command = cluster.getCommand(commandKey);
         const waiter = Entity.adapter.waitFor(
             this.deviceNetworkAddress, this.ID, Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER,
             transactionSequenceNumber, cluster.ID, command.ID, timeout
         );
 
-        const promise = new Promise<{header: KeyValue; payload: KeyValue}>((resolve, reject) => {
+        const promise = new Promise<{header: Zcl.ZclHeader; payload: KeyValue}>((resolve, reject) => {
             waiter.promise.then(
                 (payload) => resolve({header: payload.frame.Header, payload: payload.frame.Payload}),
                 (error) => reject(error),

diff --git a/src/zcl/index.ts b/src/zcl/index.ts
@@ -10,6 +10,7 @@ import PowerSource from './definition/powerSource';
 import EndpointDeviceType from './definition/endpointDeviceType';
 import ManufacturerCode from './definition/manufacturerCode';
 import ZclFrame from './zclFrame';
+import ZclHeader from './zclHeader';
 import ZclStatusError from './zclStatusError';
 import * as TsType from './tstype';
 
@@ -28,4 +29,5 @@ export {
     FrameControl,
     EndpointDeviceType,
     ZclStatusError,
+    ZclHeader,
 };
diff --git a/src/zcl/zclFrame.ts b/src/zcl/zclFrame.ts
@@ -1,4 +1,5 @@
-import {Direction, Foundation, DataType, BuffaloZclDataType, FrameControl} from './definition';
+import {Direction, Foundation, DataType, BuffaloZclDataType} from './definition';
+import ZclHeader from './zclHeader';
 import * as Utils from './utils';
 import BuffaloZcl from './buffaloZcl';
 import {TsType as BuffaloTsType} from '../buffalo';
@@ -10,13 +11,6 @@ const MINIMAL_FRAME_LENGTH = 3;
 // eslint-disable-next-line
 type ZclPayload = any;
 
-interface ZclHeader {
-    frameControl: FrameControl;
-    manufacturerCode: number;
-    transactionSequenceNumber: number;
-    commandIdentifier: number;
-}
-
 const ListTypes: number[] = [
     BuffaloZclDataType.LIST_UINT8,
     BuffaloZclDataType.LIST_UINT16,

diff --git a/src/zcl/zclHeader.ts b/src/zcl/zclHeader.ts
@@ -0,0 +1,10 @@
+import {FrameControl} from './definition';
+
+interface ZclHeader {
+    frameControl: FrameControl;
+    manufacturerCode: number;
+    transactionSequenceNumber: number;
+    commandIdentifier: number;
+}
+
+export default ZclHeader;