Correct removeDevice. (Koenkk#247)

Correct match responses.
xmow49 · Oct 29, 2020 · aa3882f · aa3882f
1 parent d0dc334
commit aa3882f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/adapter/zigate/adapter/zigateAdapter.ts b/src/adapter/zigate/adapter/zigateAdapter.ts
@@ -502,15 +502,15 @@ class ZiGateAdapter extends Adapter {
         }
     };
 
-    public removeDevice(networkAddress: number, ieeeAddr: string): Promise<void> {
+    public async removeDevice(networkAddress: number, ieeeAddr: string): Promise<void> {
         const payload = {
-            targetShortAddress: networkAddress,
+            targetAddress: ieeeAddr,
             extendedAddress: ieeeAddr
         };
 
         // @TODO test
-        return this.driver.sendCommand(ZiGateCommandCode.RemoveDevice, payload)
-            .then(() => Promise.resolve()).catch(() => Promise.reject());
+        await this.driver.sendCommand(ZiGateCommandCode.RemoveDevice, payload);
+        return Promise.resolve();
     };
 
     /**
@@ -543,7 +543,8 @@ class ZiGateAdapter extends Adapter {
         try {
             const result = await this.driver.sendCommand(
                 ZiGateCommandCode.RawAPSDataRequest, payload,
-                undefined, extraParameters
+                undefined, extraParameters,
+                disableResponse=(disableResponse || zclFrame.Header.frameControl.disableDefaultResponse),
             );
 
             if (result !== null) {

diff --git a/src/adapter/zigate/driver/commandType.ts b/src/adapter/zigate/driver/commandType.ts
@@ -184,7 +184,7 @@ export const ZiGateCommand: { [key: string]: ZiGateCommandType } = {
     },
     [ZiGateCommandCode.RemoveDevice]: {
         request: [
-            {name: 'targetShortAddress', parameterType: 'UINT16BE'}, // <target short address: uint64_t>
+            {name: 'targetAddress', parameterType: 'IEEEADDR'}, // <target address: uint64_t>
             {name: 'extendedAddress', parameterType: 'IEEEADDR'}, // <extended address: uint64_t>
         ],
         response: [
@@ -261,12 +261,12 @@ export const ZiGateCommand: { [key: string]: ZiGateCommandType } = {
                 {
                     receivedProperty: 'payload.sourceEndpoint',
                     matcher: equal,
-                    expectedProperty: 'payload.sourceEndpoint'
+                    expectedProperty: 'payload.destinationEndpoint'
                 },
                 {
                     receivedProperty: 'payload.destinationEndpoint',
                     matcher: equal,
-                    expectedProperty: 'payload.destinationEndpoint'
+                    expectedProperty: 'payload.sourceEndpoint'
                 },
                 {
                     receivedProperty: 'payload.profileID',

diff --git a/src/adapter/zigate/driver/zigate.ts b/src/adapter/zigate/driver/zigate.ts
@@ -79,7 +79,8 @@ export default class ZiGate extends EventEmitter {
         code: ZiGateCommandCode,
         payload?: ZiGateObjectPayload,
         timeout?: number,
-        extraParameters?: object
+        extraParameters?: object,
+        disableResponse: boolean = false
     ): Promise<ZiGateObject> {
 
         const waiters: Promise<ZiGateObject>[] = [];
@@ -98,9 +99,9 @@ export default class ZiGate extends EventEmitter {
 
                 const sendBuffer = frame.toBuffer();
                 debug.log('<-- send command ', sendBuffer);
+                debug.log(`DisableResponse: ${disableResponse}`);
 
-
-                if (Array.isArray(ziGateObject.command.response)) {
+                if (!disableResponse && Array.isArray(ziGateObject.command.response)) {
                     ziGateObject.command.response.forEach((rules) => {
                         waiters.push(
                             this.waitress.waitFor(