@alizadefaig/pos-server 1.2.18 → 1.2.20

package/app/socket/server.js

@@ -37,6 +37,22 @@ module.exports = (server = null) => {
                     logger.error(error);
                 });
 
+                // 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 responseEvent = `api:response:${request_id}`;
+                    try {
+                        const response = await axios.post(
+                            `${PROXY_TARGET}/api/${event}`,
+                            data ?? {},
+                            { headers: { 'Content-Type': 'application/json', ...headers }, timeout: 15000 }
+                        );
+                        socket.emit(responseEvent, { success: true, data: response.data });
+                    } catch (err) {
+                        socket.emit(responseEvent, { success: false, error: err?.response?.data ?? { message: err.message } });
+                    }
+                });
+
                 socket.on('setUserId', (id) => {
                     userId = id;
 
@@ -66,6 +82,7 @@ module.exports = (server = null) => {
                 });
 
                 socket.onAny((eventName, ...data) => {
+                    if (eventName.startsWith('api:')) return; // handled by api:request handler
                     axios.post(`${PROXY_TARGET}/api/socket/${eventName}`, {
                         companyId,
                         terminalId,

package/app/tcp.js

@@ -37,49 +37,25 @@ module.exports = function (io = null) {
                         // Обработка полного сообщения
                         try {
                             const rawData = messageBuffer.toString('utf8');
-                            let payload = JSON.parse(rawData);
-                            let profiling = {};
-                            if (payload.hasOwnProperty('profiling')) {
-                                profiling = payload.profiling;
-                                profiling['12_connection_received'] = connectedAt;
-                                payload = payload.data;
-                            }
-
-
-                            // payload содержит: event, company_id, to_id, data и т.д.
-
-                            // Логика отправки в Socket.IO
-                            // Пример: отправляем в конкретную комнату или всем
+                            const payload = JSON.parse(rawData);
 
                             const companyId = payload.company_id;
                             const eventName = payload.event;
                             const data = payload.data;
 
                             if (!companyId || !data || !eventName) {
-                                return res.json({
-                                    success: false,
-                                    message: 'Required fields is not set',
-                                });
+                                console.error('Required fields is not set', payload);
+                                return;
                             }
 
                             const to = payload.to;
                             const excepts = payload.excepts;
                             const toId = payload.toId;
-                            const now = Date.now();
-                            // const nowUtc = moment.utc();
 
-                            const logger = getLogger();
-                            // logger.info(`Start: ${now} ${companyId} - ${JSON.stringify(payload)}`)
-                            console.log(`Start: ${now} ${companyId} - ${JSON.stringify(payload)}`);
-                            profiling['13_sent_to_websocket'] = Date.now();
                             socketSendByFilter({
                                 companyId,
                                 eventName,
-                                data: {
-                                    ...data,
-                                    profiling: profiling,
-                                    // _server_time: nowUtc?.valueOf()
-                                },
+                                data,
                                 to,
                                 toId,
                                 excepts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alizadefaig/pos-server",
-    "version": "1.2.18",
+    "version": "1.2.20",
     "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": {
@@ -39,4 +39,4 @@
         "test": "echo \"Error: no test specified\" && exit 1",
         "start": "node server.js"
     }
-}
+}

package/routes/desktop/api/printers.js

@@ -95,12 +95,20 @@ router.get('/printers.get', async (req, res) => {
     let usbPrinters = await getUsbPrinters();
     let networkPrinters = await getNetworkDevices();
     const printers = [...usbPrinters, ...networkPrinters]
+    const headers = { ...req.headers };
+    delete headers['accept-encoding'];
     axios.post(PROXY_TARGET + '/api/printers.get', {
         printers,
         body: req.body,
         params: req.query
     }, {
-        headers: {...req.headers, host: new URL(PROXY_TARGET).host, Accept: 'application/json'},
+        headers: {
+            ...headers,
+            host: new URL(PROXY_TARGET).host,
+            Accept: 'application/json',
+            // Можно явно указать безопасные методы
+            'Accept-Encoding': 'gzip, deflate, br'
+        }
     }).then(({data}) => {
         res.json(data);
     }).catch(e => {
@@ -114,6 +122,11 @@ router.get('/printers.getUsbPrinters', async (req, res) => {
 })
 
 router.post('/printers.print', async (req, res) => {
+    if (process.env.APP_DEBUG === 'true') {
+        await new Promise(resolve => setTimeout(resolve, 100));
+        return res.json({ success: true, mock: true });
+    }
+
     const device = getPrinterDevice(req.body.printer);
     const printMethod = req.body.print_method || 'raster';
     const printMode = req.body.mode;