apps-mqtt 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-mqtt",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/emitter.js

@@ -0,0 +1,42 @@
+const log4js = require('log4js');
+
+const logger = log4js.getLogger('emitter');
+let mqtt_client = null;
+
+class Emitter {
+  static set_client(client) {
+    mqtt_client = client;
+  }
+
+  static emit(channel, data) {
+    if (!channel) {
+      throw new Error('channel is undefined');
+    }
+    if (!data) {
+      throw new Error('data is undefined');
+    }
+
+    logger.debug(`emit: ${channel} message: ${JSON.stringify(data)}`);
+    mqtt_client.publish(channel, JSON.stringify(data));
+  }
+}
+
+// setInterval(() => {
+//   Emitter.emit('/v1/emails', {})
+// }, 2000);
+
+// setTimeout(() => {
+//   Emitter.emit('/v1/emails', {
+//     from: {
+//       name: 'visitor',
+//       email: 'visitor@wargos-solutions.com',
+//     },
+//     to: {
+//       name: 'visitor',
+//       email: 'rolf.mtwo@outlook.com',
+//     },
+//     html: 'test generatir'
+//   })
+// }, 5000);
+
+module.exports = { Emitter };

package/src/index.js

@@ -1,5 +1,9 @@
-const { Mqtt } = require('./mqtt');
+const { Mqtt, listeners, subscribers } = require('./mqtt');
+const { Emitter } = require('./emitter');
 
 module.exports = {
   Mqtt,
+  Emitter,
+  listeners,
+  subscribers,
 };

package/src/listeners.js

@@ -0,0 +1,23 @@
+const log4js = require('log4js');
+
+class Listeners {
+  start(db, client) {
+    this.db = db;
+    this.client = client;
+    this.logger = log4js.getLogger('listeners');
+    this.handlers = {};
+  }
+
+  subscribe(topic, callback) {
+    this.client.subscribe(topic, (err) => {
+      if (err) {
+        this.logger.error(err);
+        return;
+      }
+      this.logger.debug(`new topic subscription: ${topic}`);
+      callback();
+    });
+  }
+}
+
+module.exports = { Listeners };

package/src/mqtt.js

@@ -1,17 +1,24 @@
-var mqtt = require('mqtt');
+const mqtt = require('mqtt');
 const log4js = require('log4js');
+const { Emitter } = require('./emitter');
+const { Listeners } = require('./listeners');
+const { Subscribers } = require('./subcribers');
+
+const listeners = new Listeners();
+const subscribers = new Subscribers();
 
 class Mqtt {
-  constructor(config) {
+  constructor(config, db) {
     this.logger = log4js.getLogger('mqtt');
+    this.db = db;
     this.config = config;
     this.client  = mqtt.connect(config.path, {
     username: config.username,
     password: config.password,
     });
-    this.devices = [];
-    this.listener = null;
-    this.subscriber = null;
+    listeners.start(this.db, this.client);
+    subscribers.start(this.db, this.client);
+    Emitter.set_client(this.client);
   }
 
   start() {
@@ -20,7 +27,6 @@ class Mqtt {
     });
 
     this.client.on('error', (err) => {
-      console.log(err);
       this.logger.error(err);
     });
 
@@ -28,7 +34,7 @@ class Mqtt {
       const data = message.toString();
       this.logger.debug(`on: ${topic} message: ${data}`);
       try {
-        subscriber.parse(topic, data);
+        subscribers.parse(topic, data);
       } catch (err) {
         this.logger.error(err);
       }
@@ -36,4 +42,4 @@ class Mqtt {
   }
 }
 
-module.exports = { Mqtt };
+module.exports = { Mqtt, listeners, subscribers };

package/src/subcribers.js

@@ -0,0 +1,30 @@
+const log4js = require('log4js');
+
+class Subscribers {
+  start(db, client) {
+    this.db = db;
+    this.client = client;
+    this.handlers = {};
+    this.logger = log4js.getLogger('subscriber');
+  }
+
+  parse(topic, message) {
+    const data = JSON.parse(message);
+    try {
+      const callback = this.handlers[topic];
+      if (callback) {
+        callback(data);
+      } else {
+        this.logger.debug(`no handler for this topic: ${topic}`);
+      }
+    } catch (err) {
+      this.logger.error(err);
+    }
+  }
+
+  listen(topic, callback) {
+    this.handlers[topic] = callback;
+  }
+}
+
+module.exports = { Subscribers };

package/src/broker/emitters.js

@@ -1,23 +0,0 @@
-const log4js = require('log4js');
-
-const logger = log4js.getLogger('emitter');
-let mqtt_client = null;
-
-class Emitters {
-
-  static set_client(client) {
-    mqtt_client = client;
-  }
-
-  static emit(channel, data) {
-    if (!channel) {
-      throw new Error('Channel is not specified');
-    }
-    logger.debug(`emit: ${channel} message: ${JSON.stringify(data)}`);
-    mqtt_client.publish(channel, data);
-  }
-}
-
-module.exports = {
-  Emitters
-};

package/src/broker/index.js

@@ -1,9 +0,0 @@
-const { Listeners } = require('./listeners');
-const { Subscriber } = require('./subcribers');
-const { Emitters } = require('./emitters');
-
-module.exports = {
-  Listeners,
-  Subscriber,
-  Emitters,
-};

package/src/broker/listeners.js

@@ -1,32 +0,0 @@
-const log4js = require('log4js');
-const { TOPICS } = require('../constants');
-
-const logger = log4js.getLogger('listeners');
-
-class Listeners {
-  constructor(client) {
-    this.client = client;
-  }
-
-  start() {
-    this.client.subscribe(TOPICS.HEARTBEAT, (err) => {
-      if (err) {
-        logger.error(err);
-      }
-    });
-    this.client.subscribe(TOPICS.NEW_DEVICE, (err) => {
-      if (err) {
-        logger.error(err);
-      }
-    });
-    this.client.subscribe('inTopic', (err) => {
-      if (err) {
-        logger.error(err);
-      }
-    });
-  }
-}
-
-module.exports = {
-  Listeners
-};

package/src/broker/subcribers.js

@@ -1,39 +0,0 @@
-const log4js = require('log4js');
-const { TOPICS } = require('../constants');
-const { Emitters } = require('./emitters');
-
-const logger = log4js.getLogger('subscriber');
-
-class Subscriber {
-  constructor(client, devices) {
-    this.client = client;
-    this.devices = devices;
-  }
-
-  parse(topic, message) {
-    const data = JSON.parse(message);
-    switch (topic) {
-      case TOPICS.NEW_DEVICE:
-        this.devices.push(data);
-        
-        Emitters.emit(
-          TOPICS.START.replace('/+/', `/${data.d}/`), "{ r: 'wargos' }"
-        );
-        break;
-      case TOPICS.HEARTBEAT:
-        logger.info('heartbeat:', data);
-        break;
-
-      case 'inTopic':
-        logger.info('inTopic');
-        break;
-        
-      default:
-        throw new Error(`topic does not exist: ${topic}`, data);
-    }
-  }
-}
-
-module.exports = {
-  Subscriber
-};

package/src/constants.js

@@ -1,10 +0,0 @@
-const TOPICS = {
-  NEW_DEVICE: '/v1/device',
-  HEARTBEAT: '/v1/heartbeat',
-  START: '/v1/+/start',
-  STOP: '/v1/+/stop',
-};
-
-module.exports = {
-  TOPICS
-}