martin/mqtt_server
martin/mqtt_server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert from es6

Browse Source
This commit is contained in:
martin 2017-01-09 22:46:39 +00:00
parent 65bc6987d4
commit 59fb466313
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/mqtt/mqttClient.js
View File

@ -1,4 +1,7 @@
import mqtt from 'mqtt'; 'use strict';
const mqtt = require('mqtt');
const request = require('request');
let util = require('util');
const logger = require('log4js').getLogger(); const logger = require('log4js').getLogger();
// Var db = require('../server/db-connector').dbConnection; // Var db = require('../server/db-connector').dbConnection;
@ -34,7 +37,7 @@ const mqttClient = function(events) {
const d = new Date(); const d = new Date();
this.lastMsg = d.getTime(); this.lastMsg = d.getTime();
events.on('sendIFTTT', mode => { events.on('sendIFTTT', function(mode) {
let d; let d;
const url = ['https://maker.ifttt.com/trigger/', mode, '/with/key/cWvECkeiyAPwmiOPBkXL2D'].join(''); const url = ['https://maker.ifttt.com/trigger/', mode, '/with/key/cWvECkeiyAPwmiOPBkXL2D'].join('');
@ -135,24 +138,24 @@ const mqttClient = function(events) {
const options = { const options = {
keepalive: 3600, keepalive: 3600,
clientId: `a:${orgId}:${Date.now()}`, clientId: 'a:' + orgId + ':' + Date.now(),
username: userName, username: userName,
password: new Buffer(appKey) password: new Buffer(appKey)
}; };
this.client = mqtt.connect(`mqtt://${orgId}silvrtree.co.uk`, options); this.client = mqtt.connect('mqtt://' + orgId + 'silvrtree.co.uk', options);
this.client.on('connect', () => { this.client.on('connect', function() {
this.connected = true; this.connected = true;
logger.info('Connected to Silvr Broker'); logger.info('Connected to Silvr Broker');
this.fanTimer(); this.fanTimer();
this.logTemp(); this.logTemp();
}); }.bind(this));
this.client.subscribe('livingroomTemp'); this.client.subscribe('livingroomTemp');
this.client.on('message', (topic, message) => { this.client.on('message', function(topic, message) {
const json = JSON.parse(message.toString()); const json = JSON.parse(message.toString());
logger.debug(json); logger.debug(json);
@ -171,7 +174,7 @@ const mqttClient = function(events) {
const data = {id: 'temperature', data: {mode: globalMode, temp: this.livingRoom.temp}}; const data = {id: 'temperature', data: {mode: globalMode, temp: this.livingRoom.temp}};
events.emit('sendSocket', data); events.emit('sendSocket', data);
}); }.bind(this));
this.isConnected = function() { this.isConnected = function() {
return this.connected; return this.connected;
@ -179,4 +182,4 @@ const mqttClient = function(events) {
}; };
export {mqttClient}; module.exports.mqttClient = mqttClient;