apps-mqtt 1.0.2 → 2.0.0

package/package.json

@@ -1,14 +1,21 @@
 {
   "name": "apps-mqtt",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "",
-  "main": "src/index.js",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
   "scripts": {
-    "serve": "nodemon src/index.js"
+    "serve": "nodemon --exec ts-node src/index.ts",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "log4js": "^6.1.0",
     "mqtt": "^4.3.7"
   },
+  "devDependencies": {
+    "@types/node": "^22.10.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3"
+  },
   "license": "ISC"
 }

package/src/broker/emitters.ts

@@ -0,0 +1,20 @@
+import * as log4js from 'log4js';
+import type { MqttClient } from 'mqtt';
+
+const logger = log4js.getLogger('emitter');
+let mqtt_client: MqttClient | null = null;
+
+export class Emitters {
+
+  static set_client(client: MqttClient): void {
+    mqtt_client = client;
+  }
+
+  static emit(channel: string, data: any): void {
+    if (!channel) {
+      throw new Error('Channel is not specified');
+    }
+    logger.debug(`emit: ${channel} message: ${JSON.stringify(data)}`);
+    mqtt_client!.publish(channel, data);
+  }
+}

package/src/broker/index.ts

@@ -0,0 +1,9 @@
+import { Listeners } from './listeners';
+import { Subscriber } from './subcribers';
+import { Emitters } from './emitters';
+
+export {
+  Listeners,
+  Subscriber,
+  Emitters,
+};

package/src/broker/listeners.ts

@@ -0,0 +1,32 @@
+import * as log4js from 'log4js';
+import type { MqttClient } from 'mqtt';
+import { TOPICS } from '../constants';
+
+const logger = log4js.getLogger('listeners');
+
+export class Listeners {
+
+  client: MqttClient;
+
+  constructor(client: MqttClient) {
+    this.client = client;
+  }
+
+  start(): void {
+    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);
+      }
+    });
+  }
+}

package/src/broker/subcribers.ts

@@ -0,0 +1,40 @@
+import * as log4js from 'log4js';
+import type { MqttClient } from 'mqtt';
+import { TOPICS } from '../constants';
+import { Emitters } from './emitters';
+
+const logger = log4js.getLogger('subscriber');
+
+export class Subscriber {
+
+  client: MqttClient;
+  devices: any[];
+
+  constructor(client: MqttClient, devices: any[]) {
+    this.client = client;
+    this.devices = devices;
+  }
+
+  parse(topic: string, message: string): void {
+    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}`);
+    }
+  }
+}

package/src/constants.ts

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

package/src/index.ts

@@ -0,0 +1,5 @@
+import { Mqtt } from './mqtt';
+
+export {
+  Mqtt,
+};

package/src/mqtt.ts

@@ -0,0 +1,53 @@
+import * as mqtt from 'mqtt';
+import type { MqttClient } from 'mqtt';
+import * as log4js from 'log4js';
+import { Subscriber } from './broker/subcribers';
+
+export interface MqttConfig {
+  path: string;
+  username?: string;
+  password?: string;
+}
+
+export class Mqtt {
+
+  logger: log4js.Logger;
+  config: MqttConfig;
+  client: MqttClient;
+  devices: any[];
+  listener: any;
+  subscriber: Subscriber | null;
+
+  constructor(config: MqttConfig) {
+    this.logger = log4js.getLogger('mqtt');
+    this.config = config;
+    this.client = mqtt.connect(config.path, {
+      username: config.username,
+      password: config.password,
+    });
+    this.devices = [];
+    this.listener = null;
+    this.subscriber = null;
+  }
+
+  start(): void {
+    this.client.on('connect', () => {
+      this.logger.info(`mqtt successful connection: ${this.config.path}`);
+    });
+
+    this.client.on('error', (err) => {
+      console.log(err);
+      this.logger.error(err);
+    });
+
+    this.client.on('message', (topic, message) => {
+      const data = message.toString();
+      this.logger.debug(`on: ${topic} message: ${data}`);
+      try {
+        this.subscriber!.parse(topic, data);
+      } catch (err) {
+        this.logger.error(err);
+      }
+    });
+  }
+}

package/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2019",
+    "lib": ["ES2019"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "strict": true,
+    "useUnknownInCatchVariables": false,
+    "noEmit": true,
+    "rootDir": "src"
+  },
+  "include": ["src/**/*.ts"],
+  "ts-node": {
+    "files": true
+  }
+}

package/src/emitter.js

@@ -1,42 +0,0 @@
-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,9 +0,0 @@
-const { Mqtt, listeners, subscribers } = require('./mqtt');
-const { Emitter } = require('./emitter');
-
-module.exports = {
-  Mqtt,
-  Emitter,
-  listeners,
-  subscribers,
-};

package/src/listeners.js

@@ -1,23 +0,0 @@
-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,45 +0,0 @@
-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, db) {
-    this.logger = log4js.getLogger('mqtt');
-    this.db = db;
-    this.config = config;
-    this.client  = mqtt.connect(config.path, {
-    username: config.username,
-    password: config.password,
-    });
-    listeners.start(this.db, this.client);
-    subscribers.start(this.db, this.client);
-    Emitter.set_client(this.client);
-  }
-
-  start() {
-    this.client.on('connect', () => {
-      this.logger.info(`mqtt successful connection: ${this.config.path}`);
-    });
-
-    this.client.on('error', (err) => {
-      this.logger.error(err);
-    });
-
-    this.client.on('message', (topic, message) => {
-      const data = message.toString();
-      this.logger.debug(`on: ${topic} message: ${data}`);
-      try {
-        subscribers.parse(topic, data);
-      } catch (err) {
-        this.logger.error(err);
-      }
-    });
-  }
-}
-
-module.exports = { Mqtt, listeners, subscribers };

package/src/subcribers.js

@@ -1,30 +0,0 @@
-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 };