This commit is contained in:
AdisakKanthawilang 2025-03-05 17:29:07 +07:00
parent 205034ab4d
commit dd02c81008
2 changed files with 53 additions and 58 deletions

View file

@ -13,24 +13,19 @@ import { OrganizationController } from "./controllers/OrganizationController";
import logMiddleware from "./middlewares/logs"; import logMiddleware from "./middlewares/logs";
import { CommandController } from "./controllers/CommandController"; import { CommandController } from "./controllers/CommandController";
import { WebSocketServer } from "ws"; // import { WebSocketServer } from "ws";
import http from "http"; // import http from "http";
export const wss = new WebSocketServer({ noServer: true, // export const wss = new WebSocketServer({ noServer: true,
path: "/api/vi/org/socket", // path: "/api/v1/org/socket",
}); // });
async function main() { async function main() {
await AppDataSource.initialize(); await AppDataSource.initialize();
const app = express(); const app = express();
// สร้างเซิร์ฟเวอร์ HTTP // สร้างเซิร์ฟเวอร์ HTTP
const server = http.createServer(app); // const server = http.createServer(app);
// socket.instance = new Server(server, {
// cors: { origin: "*" },
// path: "/api/v1/org/socket",
// });
app.use( app.use(
cors({ 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(`Listening on: http://localhost:${APP_PORT}`));
// app.listen( app.listen(
// APP_PORT, APP_PORT,
// APP_HOST, APP_HOST,
// () => ( () => (
// console.log(`[APP] Application is running on: http://localhost:${APP_PORT}`), console.log(`[APP] Application is running on: http://localhost:${APP_PORT}`),
// console.log(`[APP] Swagger on: http://localhost:${APP_PORT}/api-docs`) console.log(`[APP] Swagger on: http://localhost:${APP_PORT}/api-docs`)
// ), ),
// ); );
async function runMessageQueue() { async function runMessageQueue() {
try { try {
await rabbitmqInit(); await rabbitmqInit();
@ -102,36 +97,36 @@ async function main() {
runMessageQueue(); runMessageQueue();
// การจัดการคำขออัปเกรดจาก HTTP เป็น WebSocket // การจัดการคำขออัปเกรดจาก HTTP เป็น WebSocket
server.on("upgrade", (request:any, socket:any, head:any) => { // server.on("upgrade", (request:any, socket:any, head:any) => {
console.log("🔹 Handling upgrade request..."); // console.log("🔹 Handling upgrade request...");
wss.handleUpgrade(request, socket, head, (ws:any) => { // wss.handleUpgrade(request, socket, head, (ws:any) => {
console.log("🔹 WebSocket connection established"); // console.log("🔹 WebSocket connection established");
wss.emit("connection", ws, request); // wss.emit("connection", ws, request);
}); // });
}); // });
wss.on("connection", (ws:any) => { // wss.on("connection", (ws:any) => {
console.log("✅ Client connected to WebSocket"); // console.log("✅ Client connected to WebSocket");
ws.on("close", () => { // ws.on("close", () => {
console.log("❌ Client disconnected"); // console.log("❌ Client disconnected");
}); // });
ws.on("error", (error:any) => { // ws.on("error", (error:any) => {
console.error("WebSocket error:", error); // console.error("WebSocket error:", error);
}); // });
}); // });
// ตั้งค่า Express routes // // ตั้งค่า Express routes
app.get('/', (req, res) => { // app.get('/', (req, res) => {
res.send('Hello from Express!'); // res.send('Hello from Express!');
}); // });
server.listen(APP_PORT, APP_HOST, () => { // server.listen(APP_PORT, APP_HOST, () => {
console.log(`[APP] Application is running on: http://${APP_HOST}:${APP_PORT}`); // 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] Swagger on: http://${APP_HOST}:${APP_PORT}/api-docs`);
console.log("[APP] HTTP Server is listening on current port"); // console.log("[APP] HTTP Server is listening on current port");
}); // });
} }

View file

@ -32,8 +32,8 @@ import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer";
import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee"; import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee";
import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster"; import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster";
import { WebSocket } from "ws"; // import { WebSocket } from "ws";
import { wss } from "../app"; // import { wss } from "../app";
@Route("api/v1/org/report") @Route("api/v1/org/report")
@Tags("Report") @Tags("Report")
@ -3566,19 +3566,19 @@ export class ReportController extends Controller {
} }
// console.log(">>",data); // console.log(">>",data);
wss.clients.forEach((client: any) => { // wss.clients.forEach((client: any) => {
if (client.readyState === WebSocket.OPEN) { // if (client.readyState === WebSocket.OPEN) {
const message = JSON.stringify({ template: "report2", reportName: "report2", data: { data } }); // const message = JSON.stringify({ template: "report2", reportName: "report2", data: { data } });
console.log("📤 Sending data to client:", message); // console.log("📤 Sending data to client:", message);
client.send(message, (err:any) => { // client.send(message, (err:any) => {
if (err) { // if (err) {
console.error("❌ Error sending message:", 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 } });
} }
/** /**