@alizadefaig/pos-server 1.2.5-dev.1 → 1.2.6

package/app/logger/Server.js

@@ -1,10 +1,10 @@
 class Server {
     log(data) {
-        console.log(data);
+        // console.log(data);
     }
 
     error(data) {
-        console.error(data);
+        // console.error(data);
     }
 
     info(data) {

package/app/proxy.js

@@ -94,7 +94,6 @@ const loadProxy = (app) => {
             }
         });
     } else {
-        console.log('HTTP-PROXY')
         const proxy = createProxyMiddleware({
             target: PROXY_TARGET,
             changeOrigin,

package/app/socket/client.js

@@ -1,5 +1,4 @@
 const {io} = require("socket.io-client");
-const serverSocket = require('../socket/server')();
 let clientSocket = null;
 module.exports = (target, companyId, terminalId) => {
     if (!clientSocket && companyId) {
@@ -14,7 +13,7 @@ module.exports = (target, companyId, terminalId) => {
 
     if (clientSocket) {
         clientSocket.onAny((eventName, ...args) => {
-            serverSocket.to(companyId).emit(eventName, ...args);
+            // serverSocket.to(companyId).emit(eventName, ...args);
         })
     }
 

package/app/socket/server.js

@@ -19,8 +19,7 @@ module.exports = (server = null) => {
             const companyId = socket.handshake.query.company_id;
             const terminalId = socket.handshake.query.terminal_id;
             let userId = socket.handshake.query.user_id;
-            // const isProxy = socket.handshake.query.is_proxy_server ?? false;
-            const isProxy = false;
+            const isProxy = socket.handshake.query.is_proxy_server ?? false;
             const PROXY_TARGET = getConfig().apiUrl;
 
             socket.join(companyId);
@@ -30,7 +29,6 @@ module.exports = (server = null) => {
             socket.isProxy = isProxy;
 
             if (!isProxy) {
-
                 axios.post(`${PROXY_TARGET}/api/socket/connection`, {
                     companyId,
                     terminalId,
@@ -67,18 +65,18 @@ module.exports = (server = null) => {
                     });
                 });
 
-                // socket.on('broadcast', (data) => {
-                //     console.log(companyId, data.eventName, data.data);
-                // })
-
                 socket.onAny((eventName, ...data) => {
-                    // socketSendByFilter('company', companyId, eventName, {
-                    //     terminal: [terminalId],
-                    // }, ...args);
+                    axios.post(`${PROXY_TARGET}/api/socket/${eventName}`, {
+                        companyId,
+                        terminalId,
+                        userId,
+                        data
+                    }).catch((err) => {
+                        logger.error(err);
+                    });
                     socket.to(companyId).emit(eventName, ...data);
                 });
             } else {
-                console.log('Proxy');
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alizadefaig/pos-server",
-    "version": "1.2.5-dev.1",
+    "version": "1.2.6",
     "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": {
@@ -19,9 +19,11 @@
         "express": "^5.1.0",
         "form-data": "^4.0.2",
         "http-proxy-middleware": "^3.0.5",
+        "lodash": "^4.17.21",
         "moment": "^2.30.1",
         "multer": "^1.4.5-lts.2",
         "sequelize": "^6.37.7",
+        "sharp": "^0.34.1",
         "socket.io": "^4.8.1",
         "socket.io-client": "^4.8.1",
         "uuid": "^11.1.0"

package/routes/common/socket.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const {socketSendByFilter} = require("../../utils");
+const {socketSendByFilter, findKeyByValue} = require("../../utils");
 const serverSocket = require("../../app/socket/server")();
 const router = express.Router();
 
@@ -51,4 +51,41 @@ router.all('/socket', (req, res) => {
     });
 });
 
+router.post('/socket/request', (req, res) => {
+    const eventName = req.body?.event ?? null;
+    const data = req.body?.data ?? null;
+    const requestId = req.body.request_id;
+    const terminalId = req.body?.terminal_id ?? '9ec525b4-7e0b-422b-a6e1-486290578c8c';
+    const timeOut = req.body.time_out ?? 10000;
+
+    const requestEventName = `request:${eventName}:${requestId}`;
+    const responseEventName = `response:${eventName}:${requestId}`;
+    let isSent = false;
+    const socket = findKeyByValue(serverSocket.sockets.sockets, 'terminalId', terminalId);
+    if (!socket) {
+        return res.json({
+            success: false,
+            message: 'No socket',
+        }).status(404);
+    }
+
+    socket.emit(requestEventName, data);
+    socket.once(responseEventName, (data) => {
+        if (!isSent) {
+            isSent = true;
+            res.json(data);
+        }
+    });
+
+    setTimeout(() => {
+        if (!isSent) {
+            isSent = true;
+            res.json({
+                success: false,
+                message: 'Timeout error'
+            }).status(408)
+        }
+    }, timeOut)
+})
+
 module.exports = router;

package/routes/desktop/api/printers.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
 const escpos = require('escpos');
-const {getIpAddress, ipRange, getPrinterDevice} = require("../../../utils");
+const {getIpAddress, ipRange, getPrinterDevice, splitImageByHeight} = require("../../../utils");
 const net = require('net');
 escpos.USB = require('@alizadefaig/cafetap-escpos-usb');
 escpos.Network = require('escpos-network');
@@ -41,9 +41,9 @@ const getStringDescriptor = async (device, index) => {
     });
 }
 
-const getNetworkDevices = async () => {
+const getNetworkDevices = async (timeOut = 1000) => {
     let networkDevices = [];
-    const connectionTimeout = 1000;
+    const connectionTimeout = timeOut;
     const ip = await getIpAddress();
     if (!ip) {
         return [];
@@ -109,18 +109,27 @@ router.get('/printers.get', async (req, res) => {
 });
 
 router.post('/printers.print', async (req, res) => {
-    const device = getPrinterDevice(req.body.printer)
+    const device = getPrinterDevice(req.body.printer);
+    const printMethod = req.body.print_method || 'raster';
+    const printMode = req.body.density || 'dhdw';
     if (!device) {
         return res.send('bad').status(404);
     }
-    const imageContent = req.body.content.replace(/\r?\n|\r/g, '').replace(/^data:image\/\w+;base64,/, '');
+
+    const contentsBuffer = await splitImageByHeight(req.body.content, 576);
+    const images = await new Promise(async (resolve, reject) => {
+        let _images = [];
+        for (const buffer of contentsBuffer) {
+            const image = await new Promise((resolve, reject) => {
+                escpos.Image.load(buffer, 'image/png', (i) => {
+                    resolve(i);
+                });
+            })
+            _images.push(image);
+        }
+        resolve(_images);
+    });
     const printer = new escpos.Printer(device, {});
-    const imageBuffer = Buffer.from(imageContent, 'base64');
-    const image = await new Promise((resolve) => {
-        escpos.Image.load(imageBuffer, 'image/png', (i) => {
-            resolve(i);
-        })
-    })
     const timeOut = req.body.timeout || 5000;
 
     let sent = false;
@@ -139,7 +148,13 @@ router.post('/printers.print', async (req, res) => {
             return;
         }
 
-        printer.raster(image);
+        images.map(image => {
+            if (printMethod === 'raster') {
+                printer.raster(image, printMode);
+            } else {
+                printer.image(image, printMode);
+            }
+        });
         if (req.body.bell) {
             printer.beep(req.body.bell_count || 2, req.body.bell_time || 3);
         }

package/server.js

@@ -47,11 +47,13 @@ const runExpress = (conf = null) => {
 
     // ===== Init Platform
     app.get('/init', (req, res) => {
-        if (!clientSocket && !appConfig.isServer) {
-            if (req.header('company-id') && req.header('terminal-id')) {
-                clientSocket = require('./app/socket/client')(PROXY_TARGET, req.header('company-id'));
-            }
-        }
+        // const companyId = req.header('company-id');
+        // const terminalId = req.header('terminal-id');
+        //
+        // if (!appConfig.isServer && companyId && terminalId) {
+        //     console.log('Connecting to socket');
+        //     clientSocket = require('./app/socket/client')(PROXY_TARGET, companyId, terminalId);
+        // }
         res.send('ok');
     });
 

package/utils.js

@@ -1,7 +1,7 @@
 const {readdirSync, existsSync} = require("node:fs");
 const {extname, join} = require("node:path");
 const {networkInterfaces} = require("os");
-const escpos = require("escpos");
+const sharp = require("sharp");
 
 function loadRoutes(app, routesDir, prefix = '') {
     if (!existsSync(routesDir)) {
@@ -102,11 +102,52 @@ const socketSendByFilter = ({companyId, eventName, data, to, toId, excepts}, ser
     }
 }
 
+
+function findKeyByValue(map, targetKey, targetValue) {
+    for (const item of map.values()) {
+        console.log(item);
+        if (item[targetKey] === targetValue) {
+            return item;
+        }
+    }
+    return null;
+}
+
+
+async function splitImageByHeight(base64Data, partHeight = 1000, toWidth = 576) {
+    const base64 = base64Data.replace(/^data:image\/\w+;base64,/, '');
+    const buffer = Buffer.from(base64, 'base64');
+
+    const imageMeta = await sharp(buffer).metadata();
+    const { width, height } = imageMeta;
+
+    const numParts = Math.ceil(height / partHeight);
+    const parts = [];
+
+    for (let i = 0; i < numParts; i++) {
+        const top = i * partHeight;
+        const currentHeight = Math.min(partHeight, height - top);
+
+        const partBuffer = await sharp(buffer)
+            .extract({ left: 0, top, width, height: currentHeight })
+            .resize({width: toWidth})
+            .greyscale()
+            .png()
+            .toBuffer();
+
+        parts.push(partBuffer);
+    }
+
+    return parts;
+}
+
 module.exports = {
     loadRoutes,
     getIpAddress,
     ipRange,
     getPrinterDevice,
     streamToString,
-    socketSendByFilter
+    socketSendByFilter,
+    findKeyByValue,
+    splitImageByHeight
 }