EZSP: Attempt to handle correctly and reconnect on errors.

src/adapter/ezsp/driver/commands.ts

@@ -86,6 +86,8 @@ export interface EZSPFrameDesc {
     ID: number,
     request: ParamsDesc,
     response: ParamsDesc,
+    minV?: number,
+    maxV?: number
 }
 
 export const FRAMES: {[key: string]: EZSPFrameDesc} = {
@@ -2231,6 +2233,7 @@ export const FRAMES: {[key: string]: EZSPFrameDesc} = {
             newChildId: EmberNodeId,
             newParentId: EmberNodeId
         },
+        maxV: 8
     },
     incomingNetworkStatusHandler: {
         ID: 0x00C4,
@@ -2239,6 +2242,7 @@ export const FRAMES: {[key: string]: EZSPFrameDesc} = {
             errorCode: uint8_t,
             target: EmberNodeId
         },
+        minV: 9
     },
     setSourceRouteDiscoveryMode: {
         ID: 0x005a,

src/adapter/ezsp/driver/driver.ts

@@ -224,7 +224,7 @@ export class Driver extends EventEmitter {
 
         this.multicast = new Multicast(this);
         await this.multicast.startup([]);
-        await this.multicast.subscribe(242, greenPowerGroup);
+        await this.multicast.subscribe(greenPowerGroup, 242);
         // await this.multicast.subscribe(1, 901);
         return result;
     }

src/adapter/ezsp/driver/ezsp.ts

@@ -59,20 +59,26 @@ export class EZSPFrameData {
     /* eslint-disable-next-line @typescript-eslint/no-explicit-any*/
     [name: string]: any;
 
-    static createFrame(frame_id: number, isRequest: boolean, params: ParamsDesc | Buffer): EZSPFrameData {
+    static createFrame(
+        ezspv: number, frame_id: number, isRequest: boolean, params: ParamsDesc | Buffer
+    ): EZSPFrameData {
         const names = FRAME_NAMES_BY_ID[frame_id];
         if (!names) {
             throw new Error(`Unrecognized frame FrameID ${frame_id}`);
         }
         let frm: EZSPFrameData;
         names.every((frameName)=>{
+            const frameDesc = EZSPFrameData.getFrame(frameName);
+            if ((frameDesc.maxV && frameDesc.maxV < ezspv) || (frameDesc.minV && frameDesc.minV > ezspv)) {
+                return true;
+            }
             try {
-                frm = new EZSPFrameData(frameName, false, params);
-                return false;
+                frm = new EZSPFrameData(frameName, isRequest, params);
             } catch (error) {
                 debug.error(`Frame ${frameName} parsing error: ${error.stack}`);
                 return true;
             }
+            return false;
         });
         return frm;
     }
@@ -288,6 +294,7 @@ export class Ezsp extends EventEmitter {
         if (force) {
             clearTimeout(this.watchdogTimer);
         }
+        this.queue.clear();
         await this.serialDriver.close();
     }
 
@@ -317,7 +324,11 @@ export class Ezsp extends EventEmitter {
                 data = data.subarray(2);
             }
         }
-        const frm = EZSPFrameData.createFrame(frame_id, false, data);
+        const frm = EZSPFrameData.createFrame(this.ezspV, frame_id, false, data);
+        if (!frm) {
+            debug.error(`Unparsed frame 0x${frame_id.toString(16)}. Skipped`);
+            return;
+        }
         debug.log(`<== 0x${frame_id.toString(16)}: ${JSON.stringify(frm)}`);
         const handled = this.waitress.resolve({
             frameId: frame_id,

src/adapter/ezsp/driver/uart.ts

@@ -50,7 +50,7 @@ export class SerialDriver extends EventEmitter {
     constructor() {
         super();
         this.initialized = false;
-        this.queue = new Queue(8);
+        this.queue = new Queue(1);
         this.waitress = new Waitress<EZSPPacket, EZSPPacketMatcher>(
             this.waitressValidator, this.waitressTimeoutFormatter);
     }
@@ -287,6 +287,7 @@ export class SerialDriver extends EventEmitter {
     async reset(): Promise<void> {
         debug('Uart reseting');
         this.parser.reset();
+        this.queue.clear();
         return this.queue.execute<void>(async (): Promise<void> => {
             debug(`--> Write reset`);
             const waiter = this.waitFor(-1, 10000).start();
@@ -305,24 +306,25 @@ export class SerialDriver extends EventEmitter {
 
     public close(): Promise<void> {
         return new Promise((resolve, reject): void => {
+            this.queue.clear();
             if (this.initialized) {
                 if (this.portType === 'serial') {
                     this.serialPort.flush((): void => {
                         this.serialPort.close((error): void => {
                             this.initialized = false;
+                            this.emit('close');
                             error == null ?
                                 resolve() :
                                 reject(new Error(`Error while closing serialport '${error}'`));
-                            this.emit('close');
                         });
                     });
                 } else {
                     this.socketPort.destroy();
                     resolve();
                 }
             } else {
-                resolve();
                 this.emit('close');
+                resolve();
             }
         });
     }

test/adapter/ezsp/frame.test.ts

@@ -2,17 +2,28 @@ import {EZSPFrameData} from '../../../src/adapter/ezsp/driver/ezsp';
 
 describe('FRAME Parsing', () => {
     it('changeSourceRouteHandler', async () => {
-        const frm = EZSPFrameData.createFrame(0x00C4, false, Buffer.from('05e399a000', 'hex'));
+        const frm = EZSPFrameData.createFrame(8, 0x00C4, false, Buffer.from('05e399a000', 'hex'));
         expect(frm._cls_).toBe('changeSourceRouteHandler');
         expect(frm._id_).toBe(0x00C4);
         expect(frm.newChildId).toBe(0xe305);
         expect(frm.newParentId).toBe(0xa099);
     });
+    it('changeSourceRouteHandler', async () => {
+        const frm = EZSPFrameData.createFrame(9, 0x00C4, false, Buffer.from('05e399a000', 'hex'));
+        expect(frm._cls_).toBe('incomingNetworkStatusHandler');
+        expect(frm._id_).toBe(0x00C4);
+        expect(frm.errorCode).toBe(0x05);
+        expect(frm.target).toBe(0x99e3);
+    });
     it('incomingNetworkStatusHandler', async () => {
-        const frm = EZSPFrameData.createFrame(0x00C4, false, Buffer.from('0b044e', 'hex'));
+        const frm = EZSPFrameData.createFrame(9, 0x00C4, false, Buffer.from('0b044e', 'hex'));
         expect(frm._cls_).toBe('incomingNetworkStatusHandler');
         expect(frm._id_).toBe(0x00C4);
         expect(frm.errorCode).toBe(0x0b);
         expect(frm.target).toBe(0x4e04);
     });
+    it('incomingNetworkStatusHandler', async () => {
+        const frm = EZSPFrameData.createFrame(8, 0x00C4, false, Buffer.from('0b044e', 'hex'));
+        expect(frm).toBe(undefined);
+    });
 });

test/adapter/ezsp/uart.test.ts

@@ -101,10 +101,10 @@ describe('UART', () => {
         serialDriver.sendDATA(Buffer.from([1,2,3]));
         serialDriver.sendDATA(Buffer.from([1,2,3]));
         serialDriver.sendDATA(Buffer.from([1,2,3]));
-        expect(writeBufferSpy).toHaveBeenCalledTimes(9);
+        expect(writeBufferSpy).toHaveBeenCalledTimes(2);
         // send another 2 frame - not counted, until resolve 8 promices
         serialDriver.sendDATA(Buffer.from([1,2,3]));
         serialDriver.sendDATA(Buffer.from([1,2,3]));
-        expect(writeBufferSpy).toHaveBeenCalledTimes(9);
+        expect(writeBufferSpy).toHaveBeenCalledTimes(2);
     });
 });