@alizadefaig/pos-server 1.2.20 → 1.2.22

package/app/socket/server.js

@@ -1,8 +1,24 @@
 const {Server} = require("socket.io");
 const axios = require("axios");
+const http = require("http");
+const https = require("https");
 const {getConfig} = require("../config");
 const {getLogger} = require("../logger/Log");
 const {socketSendByFilter} = require("../../utils");
+
+// Keep-alive agent — переиспользуем TCP-соединения к Laravel вместо новых на каждый запрос
+const httpAgent  = new http.Agent({  keepAlive: true, maxSockets: 64 });
+const httpsAgent = new https.Agent({ keepAlive: true, maxSockets: 64 });
+
+// Таймаут axios по классу события (ms)
+const PRINT_EVENTS  = new Set(['orders.sendToWorkshops', 'orders.printBillReceipt']);
+const FISCAL_EVENTS = new Set(['fiscal.register', 'fiscal.close']);
+function getUpstreamTimeout(event) {
+    if (FISCAL_EVENTS.has(event)) return 180000;
+    if (PRINT_EVENTS.has(event))  return 45000;
+    return 15000;
+}
+
 let serverSocket = null;
 module.exports = (server = null) => {
     if (server && !serverSocket) {
@@ -40,15 +56,39 @@ module.exports = (server = null) => {
                 // API-over-socket: frontend sends API calls over the existing WS connection
                 socket.on('api:request', async ({ request_id, event, data, headers }) => {
                     if (!request_id || !event) return;
+                    const ackEvent      = `api:ack:${request_id}`;
                     const responseEvent = `api:response:${request_id}`;
+                    const t0 = Date.now();
+                    console.log(`[api:req] ${event} id=${request_id.slice(0, 8)} terminal=${terminalId?.slice(0, 8)}`);
+
+                    // Немедленно подтверждаем получение — фронт знает что запрос дошёл
+                    socket.emit(ackEvent);
+
+                    // Прокидываем Idempotency-Key если прислан
+                    const idempotencyKey = headers?.['Idempotency-Key'] ?? headers?.['idempotency-key'];
+                    const upstreamHeaders = {
+                        'Content-Type': 'application/json',
+                        ...headers,
+                        ...(idempotencyKey ? { 'Idempotency-Key': idempotencyKey } : {}),
+                    };
+
                     try {
                         const response = await axios.post(
                             `${PROXY_TARGET}/api/${event}`,
                             data ?? {},
-                            { headers: { 'Content-Type': 'application/json', ...headers }, timeout: 15000 }
+                            {
+                                headers:    upstreamHeaders,
+                                timeout:    getUpstreamTimeout(event),
+                                httpAgent,
+                                httpsAgent,
+                            }
                         );
+                        const ms = Date.now() - t0;
+                        console.log(`[api:res] ${event} ✓ ${ms}ms id=${request_id.slice(0, 8)}`);
                         socket.emit(responseEvent, { success: true, data: response.data });
                     } catch (err) {
+                        const ms = Date.now() - t0;
+                        console.log(`[api:res] ${event} ✗ ${ms}ms status=${err?.response?.status} id=${request_id.slice(0, 8)}`);
                         socket.emit(responseEvent, { success: false, error: err?.response?.data ?? { message: err.message } });
                     }
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alizadefaig/pos-server",
-    "version": "1.2.20",
+    "version": "1.2.22",
     "description": "Server in express js with Proxy to Main server if need and will work with Electron JS",
     "homepage": "https://gitlab.com/faigalizade/pos-server#readme",
     "bugs": {

package/utils.js

@@ -99,6 +99,16 @@ const socketSendByFilter = ({companyId, eventName, data, to, toId, excepts}, ser
 
     if (!to) {
         serverSocket.to(companyId).emit(eventName, data);
+    } else if (to === 'terminal' && toId) {
+        const room = serverSocket.sockets.adapter.rooms.get(companyId);
+        if (room) {
+            for (const socketId of room) {
+                const sock = serverSocket.sockets.sockets.get(socketId);
+                if (sock && sock.terminalId === toId) {
+                    sock.emit(eventName, data);
+                }
+            }
+        }
     }
 }