zigbee-herdsman 0.42.1 → 0.42.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (67) hide show
  1. package/.release-please-manifest.json +1 -1
  2. package/CHANGELOG.md +8 -0
  3. package/dist/adapter/adapter.d.ts +4 -4
  4. package/dist/adapter/adapter.d.ts.map +1 -1
  5. package/dist/adapter/deconz/adapter/deconzAdapter.d.ts +4 -4
  6. package/dist/adapter/deconz/adapter/deconzAdapter.d.ts.map +1 -1
  7. package/dist/adapter/deconz/adapter/deconzAdapter.js +48 -64
  8. package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
  9. package/dist/adapter/ember/adapter/emberAdapter.d.ts +4 -4
  10. package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
  11. package/dist/adapter/ember/adapter/emberAdapter.js +38 -48
  12. package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
  13. package/dist/adapter/ember/adapter/oneWaitress.d.ts +2 -2
  14. package/dist/adapter/ember/adapter/oneWaitress.d.ts.map +1 -1
  15. package/dist/adapter/ember/adapter/oneWaitress.js +5 -3
  16. package/dist/adapter/ember/adapter/oneWaitress.js.map +1 -1
  17. package/dist/adapter/events.d.ts +5 -14
  18. package/dist/adapter/events.d.ts.map +1 -1
  19. package/dist/adapter/events.js +1 -2
  20. package/dist/adapter/events.js.map +1 -1
  21. package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts +3 -3
  22. package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map +1 -1
  23. package/dist/adapter/ezsp/adapter/ezspAdapter.js +37 -47
  24. package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
  25. package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts +3 -3
  26. package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map +1 -1
  27. package/dist/adapter/z-stack/adapter/zStackAdapter.js +31 -44
  28. package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
  29. package/dist/adapter/zigate/adapter/zigateAdapter.d.ts +4 -5
  30. package/dist/adapter/zigate/adapter/zigateAdapter.d.ts.map +1 -1
  31. package/dist/adapter/zigate/adapter/zigateAdapter.js +21 -38
  32. package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
  33. package/dist/adapter/zigate/driver/zigate.d.ts.map +1 -1
  34. package/dist/adapter/zigate/driver/zigate.js +1 -9
  35. package/dist/adapter/zigate/driver/zigate.js.map +1 -1
  36. package/dist/controller/controller.d.ts +1 -2
  37. package/dist/controller/controller.d.ts.map +1 -1
  38. package/dist/controller/controller.js +53 -56
  39. package/dist/controller/controller.js.map +1 -1
  40. package/dist/controller/greenPower.d.ts +2 -1
  41. package/dist/controller/greenPower.d.ts.map +1 -1
  42. package/dist/controller/greenPower.js +30 -30
  43. package/dist/controller/greenPower.js.map +1 -1
  44. package/dist/controller/helpers/request.js +2 -2
  45. package/dist/controller/helpers/request.js.map +1 -1
  46. package/dist/controller/helpers/requestQueue.js +12 -12
  47. package/dist/controller/helpers/requestQueue.js.map +1 -1
  48. package/dist/controller/helpers/zclFrameConverter.js +5 -5
  49. package/dist/controller/model/device.d.ts +1 -1
  50. package/dist/controller/model/device.d.ts.map +1 -1
  51. package/dist/controller/model/device.js +21 -22
  52. package/dist/controller/model/device.js.map +1 -1
  53. package/dist/controller/model/endpoint.d.ts +1 -2
  54. package/dist/controller/model/endpoint.d.ts.map +1 -1
  55. package/dist/controller/model/endpoint.js +17 -14
  56. package/dist/controller/model/endpoint.js.map +1 -1
  57. package/dist/zcl/index.js +3 -1
  58. package/dist/zcl/index.js.map +1 -1
  59. package/dist/zcl/zclFrame.d.ts +7 -11
  60. package/dist/zcl/zclFrame.d.ts.map +1 -1
  61. package/dist/zcl/zclFrame.js +36 -91
  62. package/dist/zcl/zclFrame.js.map +1 -1
  63. package/dist/zcl/zclHeader.d.ts +14 -5
  64. package/dist/zcl/zclHeader.d.ts.map +1 -1
  65. package/dist/zcl/zclHeader.js +72 -0
  66. package/dist/zcl/zclHeader.js.map +1 -1
  67. package/package.json +2 -2
@@ -141,8 +141,7 @@ class Controller extends events_1.default.EventEmitter {
141
141
  this.greenPower.on(tstype_1.GreenPowerEvents.deviceJoined, this.onDeviceJoinedGreenPower.bind(this));
142
142
  // Register adapter events
143
143
  this.adapter.on(adapter_1.Events.Events.deviceJoined, this.onDeviceJoined.bind(this));
144
- this.adapter.on(adapter_1.Events.Events.zclData, (data) => this.onZclOrRawData('zcl', data));
145
- this.adapter.on(adapter_1.Events.Events.rawData, (data) => this.onZclOrRawData('raw', data));
144
+ this.adapter.on(adapter_1.Events.Events.zclPayload, this.onZclPayload.bind(this));
146
145
  this.adapter.on(adapter_1.Events.Events.disconnected, this.onAdapterDisconnected.bind(this));
147
146
  this.adapter.on(adapter_1.Events.Events.deviceAnnounce, this.onDeviceAnnounce.bind(this));
148
147
  this.adapter.on(adapter_1.Events.Events.deviceLeave, this.onDeviceLeave.bind(this));
@@ -267,8 +266,7 @@ class Controller extends events_1.default.EventEmitter {
267
266
  this.databaseSave();
268
267
  // Unregister adapter events
269
268
  this.adapter.removeAllListeners(adapter_1.Events.Events.deviceJoined);
270
- this.adapter.removeAllListeners(adapter_1.Events.Events.zclData);
271
- this.adapter.removeAllListeners(adapter_1.Events.Events.rawData);
269
+ this.adapter.removeAllListeners(adapter_1.Events.Events.zclPayload);
272
270
  this.adapter.removeAllListeners(adapter_1.Events.Events.disconnected);
273
271
  this.adapter.removeAllListeners(adapter_1.Events.Events.deviceAnnounce);
274
272
  this.adapter.removeAllListeners(adapter_1.Events.Events.deviceLeave);
@@ -513,29 +511,29 @@ class Controller extends events_1.default.EventEmitter {
513
511
  logger_1.logger.debug(`Not interviewing '${payload.ieeeAddr}', completed '${device.interviewCompleted}', in progress '${device.interviewing}'`, NS);
514
512
  }
515
513
  }
516
- isZclDataPayload(dataPayload, type) {
517
- return type === 'zcl';
518
- }
519
- async onZclOrRawData(dataType, dataPayload) {
520
- const logDataPayload = JSON.parse(JSON.stringify(dataPayload));
521
- if (dataType === 'zcl') {
522
- delete logDataPayload.frame.Cluster;
514
+ async onZclPayload(payload) {
515
+ let frame = undefined;
516
+ try {
517
+ frame = zcl_1.ZclFrame.fromBuffer(payload.clusterID, payload.header, payload.data);
518
+ }
519
+ catch (error) {
520
+ logger_1.logger.debug(`Failed to parse frame: ${error}`, NS);
523
521
  }
524
- logger_1.logger.debug(`Received '${dataType}' data '${JSON.stringify(logDataPayload)}'`, NS);
522
+ logger_1.logger.debug(`Received payload: clusterID=${payload.clusterID}, address=${payload.address}, groupID=${payload.groupID}, `
523
+ + `endpoint=${payload.endpoint}, destinationEndpoint=${payload.destinationEndpoint}, wasBroadcast=${payload.wasBroadcast}, `
524
+ + `linkQuality=${payload.linkquality}, frame=${frame?.toString()}`, NS);
525
525
  let gpDevice = null;
526
- if (this.isZclDataPayload(dataPayload, dataType)) {
527
- if (dataPayload.frame.Cluster.name === 'touchlink') {
528
- // This is handled by touchlink
529
- return;
530
- }
531
- else if (dataPayload.frame.Cluster.name === 'greenPower') {
532
- await this.greenPower.onZclGreenPowerData(dataPayload);
533
- // lookup encapsulated gpDevice for further processing
534
- gpDevice = model_1.Device.byNetworkAddress(dataPayload.frame.Payload.srcID & 0xFFFF);
535
- }
526
+ if (frame?.cluster.name === 'touchlink') {
527
+ // This is handled by touchlink
528
+ return;
529
+ }
530
+ else if (frame?.cluster.name === 'greenPower') {
531
+ await this.greenPower.onZclGreenPowerData(payload, frame);
532
+ // lookup encapsulated gpDevice for further processing
533
+ gpDevice = model_1.Device.byNetworkAddress(frame.payload.srcID & 0xFFFF);
536
534
  }
537
- let device = gpDevice ? gpDevice : (typeof dataPayload.address === 'string' ?
538
- model_1.Device.byIeeeAddr(dataPayload.address) : model_1.Device.byNetworkAddress(dataPayload.address));
535
+ let device = gpDevice ? gpDevice : (typeof payload.address === 'string' ?
536
+ model_1.Device.byIeeeAddr(payload.address) : model_1.Device.byNetworkAddress(payload.address));
539
537
  /**
540
538
  * Handling of re-transmitted Xiaomi messages.
541
539
  * https://github.com/Koenkk/zigbee2mqtt/issues/1238
@@ -548,65 +546,64 @@ class Controller extends events_1.default.EventEmitter {
548
546
  * Handling these message would result in false state updates.
549
547
  * The group ID attribute of these message defines the network address of the end device.
550
548
  */
551
- if (device?.manufacturerName === 'LUMI' && device?.type == 'Router' && dataPayload.groupID) {
552
- logger_1.logger.debug(`Handling re-transmitted Xiaomi message ${device.networkAddress} -> ${dataPayload.groupID}`, NS);
553
- device = model_1.Device.byNetworkAddress(dataPayload.groupID);
549
+ if (device?.manufacturerName === 'LUMI' && device?.type == 'Router' && payload.groupID) {
550
+ logger_1.logger.debug(`Handling re-transmitted Xiaomi message ${device.networkAddress} -> ${payload.groupID}`, NS);
551
+ device = model_1.Device.byNetworkAddress(payload.groupID);
554
552
  }
555
553
  if (!device) {
556
- logger_1.logger.debug(`'${dataType}' data is from unknown device with address '${dataPayload.address}', skipping...`, NS);
554
+ logger_1.logger.debug(`Data is from unknown device with address '${payload.address}', skipping...`, NS);
557
555
  return;
558
556
  }
559
557
  device.updateLastSeen();
560
558
  //no implicit checkin for genPollCtrl data because it might interfere with the explicit checkin
561
- if (!this.isZclDataPayload(dataPayload, dataType) || !dataPayload.frame.isCluster("genPollCtrl")) {
559
+ if (!frame?.isCluster("genPollCtrl")) {
562
560
  device.implicitCheckin();
563
561
  }
564
- device.linkquality = dataPayload.linkquality;
565
- let endpoint = device.getEndpoint(dataPayload.endpoint);
562
+ device.linkquality = payload.linkquality;
563
+ let endpoint = device.getEndpoint(payload.endpoint);
566
564
  if (!endpoint) {
567
- logger_1.logger.debug(`'${dataType}' data is from unknown endpoint '${dataPayload.endpoint}' from device with ` +
568
- `network address '${dataPayload.address}', creating it...`, NS);
569
- endpoint = device.createEndpoint(dataPayload.endpoint);
565
+ logger_1.logger.debug(`Data is from unknown endpoint '${payload.endpoint}' from device with ` +
566
+ `network address '${payload.address}', creating it...`, NS);
567
+ endpoint = device.createEndpoint(payload.endpoint);
570
568
  }
571
569
  // Parse command for event
572
570
  let type = undefined;
573
571
  let data;
574
572
  let clusterName = undefined;
575
573
  const meta = {};
576
- if (this.isZclDataPayload(dataPayload, dataType)) {
577
- const frame = dataPayload.frame;
578
- const command = frame.getCommand();
579
- clusterName = frame.Cluster.name;
580
- meta.zclTransactionSequenceNumber = frame.Header.transactionSequenceNumber;
581
- meta.manufacturerCode = frame.Header.manufacturerCode;
582
- meta.frameControl = frame.Header.frameControl;
583
- if (frame.isGlobal()) {
574
+ if (frame) {
575
+ const command = frame.command;
576
+ clusterName = frame.cluster.name;
577
+ meta.zclTransactionSequenceNumber = frame.header.transactionSequenceNumber;
578
+ meta.manufacturerCode = frame.header.manufacturerCode;
579
+ meta.frameControl = frame.header.frameControl;
580
+ if (frame.header.isGlobal) {
584
581
  if (frame.isCommand('report')) {
585
582
  type = 'attributeReport';
586
- data = helpers_1.ZclFrameConverter.attributeKeyValue(dataPayload.frame, device.manufacturerID);
583
+ data = helpers_1.ZclFrameConverter.attributeKeyValue(frame, device.manufacturerID);
587
584
  }
588
585
  else if (frame.isCommand('read')) {
589
586
  type = 'read';
590
- data = helpers_1.ZclFrameConverter.attributeList(dataPayload.frame, device.manufacturerID);
587
+ data = helpers_1.ZclFrameConverter.attributeList(frame, device.manufacturerID);
591
588
  }
592
589
  else if (frame.isCommand('write')) {
593
590
  type = 'write';
594
- data = helpers_1.ZclFrameConverter.attributeKeyValue(dataPayload.frame, device.manufacturerID);
591
+ data = helpers_1.ZclFrameConverter.attributeKeyValue(frame, device.manufacturerID);
595
592
  }
596
593
  else {
597
594
  /* istanbul ignore else */
598
595
  if (frame.isCommand('readRsp')) {
599
596
  type = 'readResponse';
600
- data = helpers_1.ZclFrameConverter.attributeKeyValue(dataPayload.frame, device.manufacturerID);
597
+ data = helpers_1.ZclFrameConverter.attributeKeyValue(frame, device.manufacturerID);
601
598
  }
602
599
  }
603
600
  }
604
601
  else {
605
602
  /* istanbul ignore else */
606
- if (frame.isSpecific()) {
603
+ if (frame.header.isSpecific) {
607
604
  if (Events.CommandsLookup[command.name]) {
608
605
  type = Events.CommandsLookup[command.name];
609
- data = dataPayload.frame.Payload;
606
+ data = frame.payload;
610
607
  }
611
608
  else {
612
609
  logger_1.logger.debug(`Skipping command '${command.name}' because it is missing from the lookup`, NS);
@@ -621,19 +618,19 @@ class Controller extends events_1.default.EventEmitter {
621
618
  property.set(value, device);
622
619
  }
623
620
  }
624
- endpoint.saveClusterAttributeKeyValue(frame.Cluster.ID, data);
621
+ endpoint.saveClusterAttributeKeyValue(frame.cluster.ID, data);
625
622
  }
626
623
  }
627
624
  else {
628
625
  type = 'raw';
629
- data = dataPayload.data;
630
- const name = zcl_1.Utils.getCluster(dataPayload.clusterID).name;
626
+ data = payload.data;
627
+ const name = zcl_1.Utils.getCluster(payload.clusterID).name;
631
628
  clusterName = Number.isNaN(Number(name)) ? name : Number(name);
632
629
  }
633
630
  if (type && data) {
634
- const endpoint = device.getEndpoint(dataPayload.endpoint);
635
- const linkquality = dataPayload.linkquality;
636
- const groupID = dataPayload.groupID;
631
+ const endpoint = device.getEndpoint(payload.endpoint);
632
+ const linkquality = payload.linkquality;
633
+ const groupID = payload.groupID;
637
634
  const eventData = {
638
635
  type: type, device, endpoint, data, linkquality, groupID, cluster: clusterName, meta
639
636
  };
@@ -643,8 +640,8 @@ class Controller extends events_1.default.EventEmitter {
643
640
  else {
644
641
  this.selfAndDeviceEmit(device, Events.Events.lastSeenChanged, { device, reason: 'messageNonEmitted' });
645
642
  }
646
- if (this.isZclDataPayload(dataPayload, dataType)) {
647
- await device.onZclData(dataPayload, endpoint);
643
+ if (frame) {
644
+ await device.onZclData(payload, frame, endpoint);
648
645
  }
649
646
  }
650
647
  }
@@ -1 +1 @@
1
- {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller/controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller/controller.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,13 @@
1
1
  /// <reference types="node" />
2
2
  import { Adapter, Events as AdapterEvents } from '../adapter';
3
+ import * as Zcl from '../zcl';
3
4
  import events from 'events';
4
5
  declare class GreenPower extends events.EventEmitter {
5
6
  private adapter;
6
7
  constructor(adapter: Adapter);
7
8
  private encryptSecurityKey;
8
9
  private sendPairingCommand;
9
- onZclGreenPowerData(dataPayload: AdapterEvents.ZclDataPayload): Promise<void>;
10
+ onZclGreenPowerData(dataPayload: AdapterEvents.ZclPayload, frame: Zcl.ZclFrame): Promise<void>;
10
11
  permitJoin(time: number, networkAddress: number): Promise<void>;
11
12
  }
12
13
  export default GreenPower;
@@ -1 +1 @@
1
- {"version":3,"file":"greenPower.d.ts","sourceRoot":"","sources":["../../src/controller/greenPower.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,OAAO,EAAE,MAAM,IAAI,aAAa,EAAC,MAAM,YAAY,CAAC;AAI5D,OAAO,MAAM,MAAM,QAAQ,CAAC;AAU5B,cAAM,UAAW,SAAQ,MAAM,CAAC,YAAY;IACxC,OAAO,CAAC,OAAO,CAAU;gBAEN,OAAO,EAAE,OAAO;IAKnC,OAAO,CAAC,kBAAkB;YAyBZ,kBAAkB;IAuCnB,mBAAmB,CAAC,WAAW,EAAE,aAAa,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAgI7E,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB/E;AAED,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"greenPower.d.ts","sourceRoot":"","sources":["../../src/controller/greenPower.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,OAAO,EAAE,MAAM,IAAI,aAAa,EAAC,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAC;AAG9B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAU5B,cAAM,UAAW,SAAQ,MAAM,CAAC,YAAY;IACxC,OAAO,CAAC,OAAO,CAAU;gBAEN,OAAO,EAAE,OAAO;IAKnC,OAAO,CAAC,kBAAkB;YAyBZ,kBAAkB;IAuCnB,mBAAmB,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgI9F,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB/E;AAED,eAAe,UAAU,CAAC"}
@@ -61,7 +61,7 @@ class GreenPower extends events_1.default.EventEmitter {
61
61
  return Buffer.concat([encrypted, cipher.final()]);
62
62
  }
63
63
  /* eslint-disable-next-line @typescript-eslint/no-explicit-any*/
64
- async sendPairingCommand(payload, dataPayload) {
64
+ async sendPairingCommand(payload, dataPayload, frame) {
65
65
  logger_1.logger.debug(`Payload.Options: ${payload.options} wasBroadcast: ${dataPayload.wasBroadcast}`, NS);
66
66
  // Set sink address based on communication mode
67
67
  switch ((payload.options >> 5) & 3) {
@@ -81,22 +81,22 @@ class GreenPower extends events_1.default.EventEmitter {
81
81
  logger_1.logger.error(`Unhandled applicationID: ${(payload.options & 7)}`, NS);
82
82
  return;
83
83
  }
84
- const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, null, zclTransactionSequenceNumber_1.default.next(), 'pairing', 33, payload);
84
+ const replyFrame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, null, zclTransactionSequenceNumber_1.default.next(), 'pairing', 33, payload);
85
85
  // Not sure how correct this is - according to GP spec Pairing command is
86
86
  // to be sent as broadcast unless communication mode is 0b11 - in which case
87
87
  // the proxy MAY send it as unicast to selected proxy.
88
88
  // This attempts to mirror logic from commit 92f77cc5.
89
89
  if (dataPayload.wasBroadcast) {
90
- return this.adapter.sendZclFrameToAll(242, frame, 242);
90
+ return this.adapter.sendZclFrameToAll(242, replyFrame, 242);
91
91
  }
92
92
  else {
93
- return this.adapter.sendZclFrameToEndpoint(null, dataPayload.frame.Payload.gppNwkAddr, 242, frame, 10000, false, false, 242);
93
+ return this.adapter.sendZclFrameToEndpoint(null, frame.payload.gppNwkAddr, 242, replyFrame, 10000, false, false, 242);
94
94
  }
95
95
  }
96
- async onZclGreenPowerData(dataPayload) {
96
+ async onZclGreenPowerData(dataPayload, frame) {
97
97
  let payload = {};
98
98
  try {
99
- switch (dataPayload.frame.Payload.commandID) {
99
+ switch (frame.payload.commandID) {
100
100
  /* istanbul ignore next */
101
101
  case undefined:
102
102
  logger_1.logger.error(`Received undefined command from '${dataPayload.address}'`, NS);
@@ -108,8 +108,8 @@ class GreenPower extends events_1.default.EventEmitter {
108
108
  logger_1.logger.error(`Commissioning request with string type address unsupported for '${dataPayload.address}'`, NS);
109
109
  break;
110
110
  }
111
- const rxOnCap = dataPayload.frame.Payload.commandFrame.options & 0b10;
112
- const key = this.encryptSecurityKey(dataPayload.frame.Payload.srcID, dataPayload.frame.Payload.commandFrame.securityKey);
111
+ const rxOnCap = frame.payload.commandFrame.options & 0b10;
112
+ const key = this.encryptSecurityKey(frame.payload.srcID, frame.payload.commandFrame.securityKey);
113
113
  // RX capable GPD needs GP Commissioning Reply
114
114
  if (rxOnCap) {
115
115
  logger_1.logger.debug("RxOnCap set -> supports bidirectional communication", NS);
@@ -118,25 +118,25 @@ class GreenPower extends events_1.default.EventEmitter {
118
118
  // Commissioning reply
119
119
  payload = {
120
120
  options: 0,
121
- tempMaster: dataPayload.frame.Payload.gppNwkAddr,
121
+ tempMaster: frame.payload.gppNwkAddr,
122
122
  tempMasterTx: networkParameters.channel - 11,
123
- srcID: dataPayload.frame.Payload.srcID,
123
+ srcID: frame.payload.srcID,
124
124
  gpdCmd: 0xf0,
125
125
  gpdPayload: {
126
126
  commandID: 0xf0,
127
127
  options: 0b00000000, // Disable encryption
128
- // securityKey: [...dataPayload.frame.Payload.commandFrame.securityKey],
129
- // keyMic: dataPayload.frame.Payload.commandFrame.keyMic,
128
+ // securityKey: [...frame.payload.commandFrame.securityKey],
129
+ // keyMic: frame.payload.commandFrame.keyMic,
130
130
  }
131
131
  };
132
- const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, null, zclTransactionSequenceNumber_1.default.next(), 'response', 33, payload);
133
- await this.adapter.sendZclFrameToAll(242, frame, 242);
132
+ const replyFrame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, null, zclTransactionSequenceNumber_1.default.next(), 'response', 33, payload);
133
+ await this.adapter.sendZclFrameToAll(242, replyFrame, 242);
134
134
  payload = {
135
135
  options: 0b0000000110101000, // Disable encryption
136
- srcID: dataPayload.frame.Payload.srcID,
137
- deviceID: dataPayload.frame.Payload.commandFrame.deviceID,
136
+ srcID: frame.payload.srcID,
137
+ deviceID: frame.payload.commandFrame.deviceID,
138
138
  };
139
- await this.sendPairingCommand(payload, dataPayload);
139
+ await this.sendPairingCommand(payload, dataPayload, frame);
140
140
  }
141
141
  else {
142
142
  // Communication mode:
@@ -148,17 +148,17 @@ class GreenPower extends events_1.default.EventEmitter {
148
148
  }
149
149
  payload = {
150
150
  options: opt,
151
- srcID: dataPayload.frame.Payload.srcID,
152
- deviceID: dataPayload.frame.Payload.commandFrame.deviceID,
153
- frameCounter: dataPayload.frame.Payload.commandFrame.outgoingCounter,
151
+ srcID: frame.payload.srcID,
152
+ deviceID: frame.payload.commandFrame.deviceID,
153
+ frameCounter: frame.payload.commandFrame.outgoingCounter,
154
154
  gpdKey: [...key],
155
155
  };
156
- await this.sendPairingCommand(payload, dataPayload);
156
+ await this.sendPairingCommand(payload, dataPayload, frame);
157
157
  }
158
158
  const eventData = {
159
- sourceID: dataPayload.frame.Payload.srcID,
160
- deviceID: dataPayload.frame.Payload.commandFrame.deviceID,
161
- networkAddress: dataPayload.frame.Payload.srcID & 0xFFFF,
159
+ sourceID: frame.payload.srcID,
160
+ deviceID: frame.payload.commandFrame.deviceID,
161
+ networkAddress: frame.payload.srcID & 0xFFFF,
162
162
  };
163
163
  this.emit(tstype_1.GreenPowerEvents.deviceJoined, eventData);
164
164
  break;
@@ -172,24 +172,24 @@ class GreenPower extends events_1.default.EventEmitter {
172
172
  // Channel notification
173
173
  payload = {
174
174
  options: 0,
175
- tempMaster: dataPayload.frame.Payload.gppNwkAddr,
176
- tempMasterTx: dataPayload.frame.Payload.commandFrame.nextChannel,
177
- srcID: dataPayload.frame.Payload.srcID,
175
+ tempMaster: frame.payload.gppNwkAddr,
176
+ tempMasterTx: frame.payload.commandFrame.nextChannel,
177
+ srcID: frame.payload.srcID,
178
178
  gpdCmd: 0xf3,
179
179
  gpdPayload: {
180
180
  commandID: 0xf3,
181
181
  options: networkParameters.channel - 11,
182
182
  }
183
183
  };
184
- const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, null, zclTransactionSequenceNumber_1.default.next(), 'response', 33, payload);
185
- await this.adapter.sendZclFrameToAll(242, frame, 242);
184
+ const replyFrame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, null, zclTransactionSequenceNumber_1.default.next(), 'response', 33, payload);
185
+ await this.adapter.sendZclFrameToAll(242, replyFrame, 242);
186
186
  break;
187
187
  /* istanbul ignore next */
188
188
  case 0xA1: // GP Manufacturer-specific Attribute Reporting
189
189
  break;
190
190
  default:
191
191
  // NOTE: this is spammy because it logs everything that is handed back to Controller without special processing here
192
- logger_1.logger.debug(`Received unhandled command '0x${dataPayload.frame.Payload.commandID.toString(16)}' from '${dataPayload.address}'`, NS);
192
+ logger_1.logger.debug(`Received unhandled command '0x${frame.payload.commandID.toString(16)}' from '${dataPayload.address}'`, NS);
193
193
  }
194
194
  }
195
195
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"greenPower.js","sourceRoot":"","sources":["../../src/controller/greenPower.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"greenPower.js","sourceRoot":"","sources":["../../src/controller/greenPower.ts"],"names":[],"mappings":"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"}
@@ -38,8 +38,8 @@ class Request {
38
38
  this.func = func;
39
39
  this.frame = frame;
40
40
  this.expires = timeout + Date.now();
41
- this.sendPolicy = sendPolicy ?? (typeof frame.getCommand !== 'function' ?
42
- undefined : Request.defaultSendPolicy[frame.getCommand().ID]);
41
+ this.sendPolicy = sendPolicy ?? (!frame.command ?
42
+ undefined : Request.defaultSendPolicy[frame.command.ID]);
43
43
  this.resolveQueue = resolve === undefined ?
44
44
  new Array() : new Array(resolve);
45
45
  this.rejectQueue = reject === undefined ?
@@ -1 +1 @@
1
- {"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/controller/helpers/request.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/controller/helpers/request.ts"],"names":[],"mappings":"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"}
@@ -54,36 +54,36 @@ class RequestQueue extends Set {
54
54
  });
55
55
  }
56
56
  filter(newRequest) {
57
- if (this.size === 0 || !(typeof newRequest.frame.getCommand === 'function')) {
57
+ if (this.size === 0 || !(newRequest.frame.command)) {
58
58
  return;
59
59
  }
60
- const clusterID = newRequest.frame.Cluster.ID;
61
- const payload = newRequest.frame.Payload;
62
- const commandID = newRequest.frame.getCommand().ID;
63
- logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): ZCL ${newRequest.frame.getCommand().name} ` +
60
+ const clusterID = newRequest.frame.cluster.ID;
61
+ const payload = newRequest.frame.payload;
62
+ const commandID = newRequest.frame.command.ID;
63
+ logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): ZCL ${newRequest.frame.command.name} ` +
64
64
  `command, filter requests. Before: ${this.size}`, NS);
65
65
  for (const request of this) {
66
- if (request?.frame?.Cluster?.ID === undefined || typeof request.frame.getCommand !== 'function') {
66
+ if (request?.frame?.cluster?.ID === undefined || !request.frame.command) {
67
67
  continue;
68
68
  }
69
69
  if (['bulk', 'queue', 'immediate'].includes(request.sendPolicy)) {
70
70
  continue;
71
71
  }
72
72
  /* istanbul ignore else */
73
- if (request.frame.Cluster.ID === clusterID && request.frame.getCommand().ID === commandID) {
73
+ if (request.frame.cluster.ID === clusterID && request.frame.command.ID === commandID) {
74
74
  /* istanbul ignore else */
75
75
  if (newRequest.sendPolicy === 'keep-payload'
76
- && JSON.stringify(request.frame.Payload) === JSON.stringify(payload)) {
76
+ && JSON.stringify(request.frame.payload) === JSON.stringify(payload)) {
77
77
  logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Merge duplicate request`, NS);
78
78
  this.delete(request);
79
79
  newRequest.moveCallbacks(request);
80
80
  }
81
81
  else if ((newRequest.sendPolicy === 'keep-command' || newRequest.sendPolicy === 'keep-cmd-undiv') &&
82
- Array.isArray(request.frame.Payload)) {
83
- const filteredPayload = request.frame.Payload.filter((oldEl) => !payload.find((newEl) => oldEl.attrId === newEl.attrId));
82
+ Array.isArray(request.frame.payload)) {
83
+ const filteredPayload = request.frame.payload.filter((oldEl) => !payload.find((newEl) => oldEl.attrId === newEl.attrId));
84
84
  if (filteredPayload.length == 0) {
85
85
  logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Remove & reject request`, NS);
86
- if (JSON.stringify(request.frame.Payload) === JSON.stringify(payload)) {
86
+ if (JSON.stringify(request.frame.payload) === JSON.stringify(payload)) {
87
87
  newRequest.moveCallbacks(request);
88
88
  }
89
89
  else {
@@ -93,7 +93,7 @@ class RequestQueue extends Set {
93
93
  }
94
94
  else if (newRequest.sendPolicy !== 'keep-cmd-undiv') {
95
95
  // remove all duplicate attributes if we shall not write undivided
96
- request.frame.Payload = filteredPayload;
96
+ request.frame.payload = filteredPayload;
97
97
  logger_1.logger.debug(`Request Queue (${this.deviceIeeeAddress}/${this.ID}): Remove commands from request`, NS);
98
98
  }
99
99
  }