@zimo-elektronik/zcan 1.0.57 → 1.0.59

package/src/network/networkGroup.ts

@@ -4,7 +4,7 @@ import MX10 from '../MX10';
 import {Buffer} from 'buffer';
 import {PingResponseExtended} from '../common/models';
 import { Query } from '../docs_entrypoint';
-import { MsgPortClose } from './networkMsg';
+import { MsgPing, MsgPortClose } from './networkMsg';
 import { MsgMode } from '../common/enums';
 
 /**
@@ -13,22 +13,51 @@ import { MsgMode } from '../common/enums';
  */
 export default class NetworkGroup
 {
-	public readonly onPingResponse = new Subject<PingResponseExtended>();
+	public readonly onPing = new Subject<MsgPing>();
 	public readonly onPortClose = new Subject<MsgPortClose>();
 
+	private pingQ: Query<MsgPing> | undefined = undefined;
 	private portCloseQ: Query<MsgPortClose> | undefined = undefined;
 
 	private mx10: MX10;
-	pingTimeout: NodeJS.Timeout | null = null;
 
 	constructor(mx10: MX10)
 	{
 		this.mx10 = mx10;
 	}
 
-	ping(mode = 0b10)
+	// ping(mode = 0b10)
+	// {
+	// 	this.mx10.sendData(0x0a, 0x00, [{value: this.mx10.mx10NID, length: 2}], mode);
+	// }
+
+	async ping(nid = 0xc000)
 	{
-		this.mx10.sendData(0x0a, 0x00, [{value: this.mx10.mx10NID, length: 2}], mode);
+		if(this.pingQ !== undefined && !await this.pingQ.lock()) {
+			this.mx10.logInfo.next("mx10.ping: failed to acquire lock");
+			return undefined;
+		}
+		this.pingQ = new Query(MsgPing.header(MsgMode.CMD, nid), this.onPing);
+		this.pingQ.log = ((msg) => {
+			this.mx10.logInfo.next(msg);
+		});
+		this.pingQ.tx = ((header) => {
+			const msg = new MsgPing(header, nid);
+			this.mx10.logInfo.next('ping query tx: ' + JSON.stringify(msg));
+			this.mx10.sendMsg(msg, true);
+		});
+		this.pingQ.match = ((msg) => {
+			this.mx10.logInfo.next('ping query rx: ' + JSON.stringify(msg));
+			if(nid & 0xff)
+				return msg.header.nid === nid;
+			return ((msg.header.nid||0) & 0xff00) === (nid & 0xff00);
+		});
+		this.pingQ.subscribe(false);
+		const rv = await this.pingQ.run(100);
+		this.mx10.logInfo.next("mx10.ping.rv: " + JSON.stringify(rv));
+		this.pingQ.unlock();
+		this.pingQ = undefined;
+		return rv;
 	}
 
 	async portClose()
@@ -64,47 +93,59 @@ export default class NetworkGroup
 	{
 		switch (command) {
 			case 0x00:
-				this.pingResponse(size, mode, nid, buffer);
+				this.parsePing(size, mode, nid, buffer);
 				break;
 		}
 	}
 
 	// 0x0A.0x00
-	pingResponse(size: number, mode: number, nid: number, _buffer: Buffer)
+	parsePing(size: number, mode: number, nid: number, buffer: Buffer)
 	{
-		if(!this.onPingResponse.observed)
+		if(!this.onPing.observed)
 			return;
+
+		this.mx10.logInfo.next('parsePing from 0x' + nid.toString(16) + ': ' + JSON.stringify(buffer));
+
+		if(mode < MsgMode.EVT) {
+			const nid = buffer.readUInt16LE(0);
+			this.onPing.next(new MsgPing(MsgPing.header(mode, nid)));
+		} else {
+			const masterUid = buffer.readUInt32LE(0);
+			const type = buffer.readUInt16LE(4);
+			const session = buffer.readUInt16LE(6);
+			this.onPing.next(new MsgPing(MsgPing.header(mode, nid), masterUid, type, session));
+		}
 	
-		if (size === 8) {
-			// TODO IMPLEMENT DETAIL READOUT
+		// if (size === 8) {
+		// 	// TODO IMPLEMENT DETAIL READOUT
 
-			if (!this.mx10.mx10NID) {
-				this.mx10.mx10NID = nid;
-			}
-			this.mx10.connected = true;
+		// 	if (!this.mx10.mx10NID) {
+		// 		this.mx10.mx10NID = nid;
+		// 	}
+		// 	this.mx10.connected = true;
 
-			// TODO reconnect when uuid has changed
-			// const uuid = buffer.readUInt32LE(0);
+		// 	// TODO reconnect when uuid has changed
+		// 	// const uuid = buffer.readUInt32LE(0);
 
-			// this.mx10.reconnectLogic();
+		// 	// this.mx10.reconnectLogic();
 
-			if (this.pingTimeout)
-				clearTimeout(this.pingTimeout);
+		// 	if (this.pingTimeout)
+		// 		clearTimeout(this.pingTimeout);
 
-			this.pingTimeout = setTimeout(() => {
-				this.mx10.connected = false;
-				this.onPingResponse.next({
-					connected: this.mx10.connected,
-				});
-				this.mx10.logInfo.next('No ping for 2 seconds, disconnected');
-			}, 2000);
-		} else {
-			throw new Error(
-				'LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
-					size.toString(),
-			);
-		}
+		// 	this.pingTimeout = setTimeout(() => {
+		// 		this.mx10.connected = false;
+		// 		this.onPingResponse.next({
+		// 			connected: this.mx10.connected,
+		// 		});
+		// 		this.mx10.logInfo.next('No ping for 2 seconds, disconnected');
+		// 	}, 2000);
+		// } else {
+		// 	throw new Error(
+		// 		'LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
+		// 			size.toString(),
+		// 	);
+		// }
 
-		this.onPingResponse.next({connected: this.mx10.connected});
+		// this.onPingResponse.next({connected: this.mx10.connected});
 	}
 }

package/src/network/networkMsg.ts

@@ -31,4 +31,25 @@ export class MsgPortClose extends Message
 		super(header);
 		super.push({value: myNid, length: 2});
 	}
+}
+
+export class MsgPing extends Message
+{
+	public static header(mode: MsgMode, nid: number): Header
+	{return {group: 0xa, cmd: 0x0, mode: mode, nid: nid}}
+
+	constructor(header: Header, masterUid?: number, type?: number, session?: number)
+	{
+		super(header);
+		if(header.mode < MsgMode.EVT)
+			return;
+		super.push({value: masterUid || 0, length: 4});
+		super.push({value: type || 0, length: 2});
+		super.push({value: session || 0, length: 2});
+	}
+
+	nid() {return this.header.nid as number;}
+	masterUid() {return this.data[0].value as number;}
+	type() {return this.data[0].value as number;}
+	session() {return this.data[0].value as number;}
 }