Merge pull request #1 from maulik9898/dev

Dev

docker-compose.yml

@@ -7,15 +7,13 @@ services:
       - db
     ports:
       - "3000:3000"
-      - "1883:1883"
-      - "5555:5555"
+      - "5555:5555" 
     environment:
       DATABASE_URL: "postgresql://postgres:postgres@db:5432/postgres?schema=public"
       PORT: 3000
       ADMIN_EMAIL: [email protected]
       ADMIN_PASSWORD: 1234
       JWT_SECRET: ABCDEF
-      MQTTPORT: 1883
 
   adminer:
       image: adminer

index.ts

@@ -1,7 +1,6 @@
 import express, { Express, Request, Response } from 'express';
 import dotenv from 'dotenv';
-import aedes  from 'aedes';
-import { createServer  } from 'aedes-server-factory';
+import  aedes  from 'aedes';
 import prisma from "./src/lib/prisma.lib";
 import { router } from './src/routes/routes';
 import { authenticate,authorizePublish,authorizeSubscribe } from './src/middleware/aedesAuth.middleware';
@@ -10,6 +9,9 @@ import morgan from 'morgan'
 import helmet from 'helmet';
 import { main } from './prisma/seed';
 import { errorLogger, errorMiddleware } from './src/middleware/error.middleware';
+import { createWebSocketStream, Server } from 'ws'
+import {createServer} from 'http'
+
 
 main()
   .catch((e) => {
@@ -43,12 +45,6 @@ app.use('/',router)
 app.use(errorLogger)
 app.use(errorMiddleware)
 
-app.listen(port, () => {
-  console.log(`⚡️[api-server]: Server is running at ${port} port`);
-});
-
-const mqttPort = process.env.MQTTPORT || 1883;
-
 export const broker = aedes()
 
 
@@ -61,12 +57,16 @@ broker.on('clientDisconnect', clientDisconnect)
 
 
 
-const server = createServer(broker)
-
+const httpServer = createServer(app)
+const wsServer = new Server({server: httpServer})
+wsServer.on('connection',(conn , req) => {
+  var stream = createWebSocketStream(conn)
+  broker.handle(stream)
+})
 
 
-server.listen(mqttPort, function () {
-  console.log(`⚡️[mqtt-server]: Server is running at ${mqttPort}`)
+httpServer.listen(port, function () {
+  console.log(`⚡️[server]: Server is running at ${port}`)
 });
 
 

package.json

@@ -16,7 +16,6 @@
   "dependencies": {
     "@prisma/client": "^3.13.0",
     "aedes": "^0.46.3",
-    "aedes-server-factory": "^0.2.1",
     "bcrypt": "^5.0.1",
     "bcryptjs": "^2.4.3",
     "dotenv": "^16.0.0",
@@ -25,14 +24,16 @@
     "helmet": "^5.0.2",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
-    "prisma": "^3.13.0"
+    "prisma": "^3.13.0",
+    "ws": "^8.6.0"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
     "@types/express": "^4.17.13",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/morgan": "^1.9.3",
     "@types/node": "^17.0.31",
+    "@types/ws": "^8.5.3",
     "concurrently": "^7.1.0",
     "nodemon": "^2.0.16",
     "ts-node": "^10.7.0",