Public/node-red-contrib-mi-devices
2
0
Fork 0
Code Pull Requests Activity

fix(gateway): set password to send write commands

Browse Source
This commit is contained in:
Pierre CLEMENT
2018-02-20 22:33:47 +01:00
parent c81fb2db33
commit 7bff50da16
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/devices/Gateway.ts
View File

@@ -9,17 +9,21 @@ import {Color} from "../utils/Color";
export class Gateway extends events.EventEmitter {
static iv: Buffer = Buffer.from([0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58, 0x56, 0x2e]);
protected lastToken: string;
protected password: string;
protected _password: string;
private _subdevices: { [sid: string]: GatewaySubdevice } = {};
constructor(public sid: string, public ip: string) {
super();
}
get key(): string {
if (!this.lastToken || !this.password) return null;
set password(password: string) {
this._password = password;
}
var cipher = crypto.createCipheriv('aes-128-cbc', this.password, Gateway.iv);
get key(): string {
if (!this.lastToken || !this._password) return null;
var cipher = crypto.createCipheriv('aes-128-cbc', this._password, Gateway.iv);
var key = cipher.update(Buffer.from(this.lastToken), "ascii", "hex");
cipher.final('hex');
@@ -30,7 +34,6 @@ export class Gateway extends events.EventEmitter {
if (msg.data) {
if (msg.model === "gateway" && msg.sid === this.sid && msg.token) {
this.lastToken = msg.token;
this.setLight(100, {red: 255, green: 0, blue: 0});
}
}

1
src/devices/GatewayServer.ts
View File

@@ -157,6 +157,7 @@ export class GatewayServer extends events.EventEmitter {
}
sendToGateway(sid: string, message: any) {
console.log(message);
if (this.server && this._gateways[sid]) {
let msg = Buffer.from(JSON.stringify(message));
this.server.send(msg, 0, msg.length, GatewayServer.SERVER_PORT, this._gateways[sid].ip);

15
src/nodes/gateway/GatewayConfigurator.ts
View File

@@ -56,12 +56,15 @@ export default (RED: Red) => {
protected setGateway() {
this._gateway = GatewayServer.getInstance().getGateway(this.sid);
this._gateway && this._gateway.on("subdevice-values-updated", (sid: string) => {
let subdevice = this._gateway.getSubdevice(sid);
if (subdevice) {
(<any> this).emit('subdevice-update', subdevice);
}
});
if (this._gateway) {
this._gateway.password = this.key;
this._gateway.on("subdevice-values-updated", (sid: string) => {
let subdevice = this._gateway.getSubdevice(sid);
if (subdevice) {
(<any> this).emit('subdevice-update', subdevice);
}
});
}
}
get gateway(): Gateway {