diff --git a/src/app.ts b/src/app.ts index 9ba50137..6516b984 100644 --- a/src/app.ts +++ b/src/app.ts @@ -13,24 +13,19 @@ import { OrganizationController } from "./controllers/OrganizationController"; import logMiddleware from "./middlewares/logs"; import { CommandController } from "./controllers/CommandController"; -import { WebSocketServer } from "ws"; -import http from "http"; +// import { WebSocketServer } from "ws"; +// import http from "http"; -export const wss = new WebSocketServer({ noServer: true, - path: "/api/vi/org/socket", - }); +// export const wss = new WebSocketServer({ noServer: true, +// path: "/api/v1/org/socket", +// }); async function main() { await AppDataSource.initialize(); const app = express(); // สร้างเซิร์ฟเวอร์ HTTP - const server = http.createServer(app); - - // socket.instance = new Server(server, { - // cors: { origin: "*" }, - // path: "/api/v1/org/socket", - // }); + // const server = http.createServer(app); app.use( cors({ @@ -82,14 +77,14 @@ async function main() { }); // app.listen(APP_PORT, APP_HOST, () => console.log(`Listening on: http://localhost:${APP_PORT}`)); - // app.listen( - // APP_PORT, - // APP_HOST, - // () => ( - // console.log(`[APP] Application is running on: http://localhost:${APP_PORT}`), - // console.log(`[APP] Swagger on: http://localhost:${APP_PORT}/api-docs`) - // ), - // ); + app.listen( + APP_PORT, + APP_HOST, + () => ( + console.log(`[APP] Application is running on: http://localhost:${APP_PORT}`), + console.log(`[APP] Swagger on: http://localhost:${APP_PORT}/api-docs`) + ), + ); async function runMessageQueue() { try { await rabbitmqInit(); @@ -102,36 +97,36 @@ async function main() { runMessageQueue(); // การจัดการคำขออัปเกรดจาก HTTP เป็น WebSocket - server.on("upgrade", (request:any, socket:any, head:any) => { - console.log("🔹 Handling upgrade request..."); - wss.handleUpgrade(request, socket, head, (ws:any) => { - console.log("🔹 WebSocket connection established"); - wss.emit("connection", ws, request); - }); - }); + // server.on("upgrade", (request:any, socket:any, head:any) => { + // console.log("🔹 Handling upgrade request..."); + // wss.handleUpgrade(request, socket, head, (ws:any) => { + // console.log("🔹 WebSocket connection established"); + // wss.emit("connection", ws, request); + // }); + // }); - wss.on("connection", (ws:any) => { - console.log("✅ Client connected to WebSocket"); + // wss.on("connection", (ws:any) => { + // console.log("✅ Client connected to WebSocket"); - ws.on("close", () => { - console.log("❌ Client disconnected"); - }); + // ws.on("close", () => { + // console.log("❌ Client disconnected"); + // }); - ws.on("error", (error:any) => { - console.error("WebSocket error:", error); - }); - }); + // ws.on("error", (error:any) => { + // console.error("WebSocket error:", error); + // }); + // }); - // ตั้งค่า Express routes - app.get('/', (req, res) => { - res.send('Hello from Express!'); - }); + // // ตั้งค่า Express routes + // app.get('/', (req, res) => { + // res.send('Hello from Express!'); + // }); - server.listen(APP_PORT, APP_HOST, () => { - console.log(`[APP] Application is running on: http://${APP_HOST}:${APP_PORT}`); - console.log(`[APP] Swagger on: http://${APP_HOST}:${APP_PORT}/api-docs`); - console.log("[APP] HTTP Server is listening on current port"); - }); + // server.listen(APP_PORT, APP_HOST, () => { + // console.log(`[APP] Application is running on: http://${APP_HOST}:${APP_PORT}`); + // console.log(`[APP] Swagger on: http://${APP_HOST}:${APP_PORT}/api-docs`); + // console.log("[APP] HTTP Server is listening on current port"); + // }); } diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 08fc9bf7..75d50cc7 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -32,8 +32,8 @@ import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer"; import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee"; import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster"; -import { WebSocket } from "ws"; -import { wss } from "../app"; +// import { WebSocket } from "ws"; +// import { wss } from "../app"; @Route("api/v1/org/report") @Tags("Report") @@ -3566,19 +3566,19 @@ export class ReportController extends Controller { } // console.log(">>",data); - wss.clients.forEach((client: any) => { - if (client.readyState === WebSocket.OPEN) { - const message = JSON.stringify({ template: "report2", reportName: "report2", data: { data } }); - console.log("📤 Sending data to client:", message); - client.send(message, (err:any) => { - if (err) { - console.error("❌ Error sending message:", err); - } - }); - } - }); + // wss.clients.forEach((client: any) => { + // if (client.readyState === WebSocket.OPEN) { + // const message = JSON.stringify({ template: "report2", reportName: "report2", data: { data } }); + // console.log("📤 Sending data to client:", message); + // client.send(message, (err:any) => { + // if (err) { + // console.error("❌ Error sending message:", err); + // } + // }); + // } + // }); - // return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } }); + return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } }); } /**