Add ind:cmd for cmdids: 'on', 'offWithEffect', 'step', 'stop'. Koenkk…

…/zigbee2mqtt#36 (comment)
Koenkk · Jun 23, 2018 · bc13acc · bc13acc
1 parent 6510114
commit bc13acc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/lib/components/af.js b/lib/components/af.js
@@ -23,6 +23,8 @@ var af = {
     _seq: 0
 };
 
+var debug = require('debug')('zigbee-shepherd:af');
+
 af.send = function (srcEp, dstEp, cId, rawPayload, opt, callback) {
     // srcEp maybe a local app ep, or a remote ep
     var deferred = Q.defer(),
@@ -571,6 +573,8 @@ function dispatchIncomingMsg(type, msg) {
         mandatoryEvent; // bridged event
     var coord = af.controller.getCoord();
 
+    debug(`dispatchIncomingMsg(): type: ${type}, msg: ${msg}`);
+
     if (msg.hasOwnProperty('endpoint')) {                                               // dataConfirm, reflectError
         if(!coord) return;
         targetEp = coord.getEndpoint(msg.endpoint);                  //  => find local ep, such a message is going to local ep
@@ -664,6 +668,10 @@ function dispatchIncomingMsg(type, msg) {
             if (frameType === 0 && msg.zclMsg.cmdId === 'report')
                 af.controller.getShepherd().emit('ind:reported', targetEp, msg.clusterid, msg.zclMsg.payload);
 
+            const cmdIDs = ['on', 'offWithEffect', 'step', 'stop'];
+            if (frameType === 1 && cmdIDs.includes(msg.zclMsg.cmdId) && msg.zclMsg.payload)
+                af.controller.getShepherd().emit('ind:cmd', targetEp, msg.clusterid, msg.zclMsg.payload, msg.zclMsg.cmdId);
+
             if (frameType === 0)         // foundation
                 dispatchTo = targetEp.onZclFoundation;
             else if (frameType === 1)    // functional

diff --git a/lib/shepherd.js b/lib/shepherd.js
@@ -112,6 +112,17 @@ function ZShepherd(path, opts) {
         self.emit('ind', { type: 'devChange', endpoints: [ ep ], data: notifData });
     });
 
+    this.on('ind:cmd', function (ep, cId, payload, cmdId) {
+        const cIdString = zclId.cluster(cId);
+        const type = `cmd${cmdId.charAt(0).toUpperCase() + cmdId.substr(1)}`;
+        const notifData = {};
+
+        notifData.cid = cIdString ? cIdString.key : cId;
+        notifData.data = payload;
+
+        self.emit('ind', { type: type, endpoints: [ ep ], data: notifData });
+    });
+
     this.on('ind:statusChange', function (ep, cId, payload) {
         var cIdString = zclId.cluster(cId),
             notifData = {