@alizadefaig/pos-server 1.1.5 → 1.2.1

package/app/config.js

@@ -0,0 +1,18 @@
+let config = {
+    "isServer": true,
+    "apiUrl": "https://admin.cafepos.az",
+    "debug": false,
+    "port": 3005
+}
+
+const getConfig = () => {
+    return config;
+}
+
+const setConfig = (conf) => {
+    config = conf || {};
+}
+module.exports = {
+    getConfig,
+    setConfig
+}

package/app/logger/Local.js

@@ -0,0 +1,24 @@
+const {getConfig} = require("../config");
+
+class Local {
+    constructor() {
+        this.path = getConfig().path;
+    }
+    log(data) {
+        console.log(data);
+    }
+
+    error(data) {
+        console.error(data);
+    }
+
+    info(data) {
+        console.info(data);
+    }
+
+    warning(data) {
+        console.warn(data);
+    }
+}
+
+module.exports = Local;

package/app/logger/Log.js

@@ -0,0 +1,25 @@
+const Server = require("./Server");
+const Local = require("./Local");
+const {getConfig} = require("../config");
+
+class Log {
+    loggers = {
+        'server': Server,
+        'local': Local,
+    }
+    static logger = null;
+    static getLogger() {
+        if (!Log.logger) {
+            Log.logger = new Log(getConfig().isServer ? "server" : 'local')
+        }
+
+        return Log.logger;
+    }
+    constructor(logger) {
+        if (!Log.logger) {
+            Log.logger = new this.loggers[logger];
+        }
+        return Log.logger
+    }
+}
+module.exports = Log;

package/app/logger/Server.js

@@ -0,0 +1,18 @@
+class Server {
+    log(data) {
+        console.log(data);
+    }
+
+    error(data) {
+        console.error(data);
+    }
+
+    info(data) {
+        console.info(data);
+    }
+
+    warning(data) {
+        console.warn(data);
+    }
+}
+module.exports = Server;

package/app/proxy.js

@@ -0,0 +1,100 @@
+const axios = require("../lib/axios");
+const {getConfig} = require("./config");
+const {getLogger} = require("./logger/Log");
+const {createProxyMiddleware, fixRequestBody} = require("http-proxy-middleware");
+const moment = require("moment");
+const { v4: uuidv4 } = require('uuid');
+
+
+
+function isLocalRoute(req, app) {
+    const path = req.path;
+    const method = req.method.toLowerCase();
+    console.log(app._router);
+    // Проверяем стек роутов Express
+    return app._router.stack.some((layer) => {
+        if (!layer.route) return false; // Это не роут
+        if (!layer.route.methods[method]) return false; // Метод не совпадает (GET, POST и т.д.)
+        return layer.route.path === path; // Путь совпадает
+    });
+}
+
+// const
+const loadProxy = (app) => {
+    let appConfig = getConfig();
+    let PROXY_TARGET = appConfig.apiUrl;
+    const logger = getLogger();
+    const proxy = createProxyMiddleware({
+        target: PROXY_TARGET,
+        changeOrigin: false,
+        on: {
+            proxyReq: (proxyReq, req, res, options) => {
+                const traceId = uuidv4();
+                const timeStamp = moment.utc().unix();
+                proxyReq.setHeader('trace-id', traceId);
+                req.traceId = traceId;
+                logger.log({
+                    traceId,
+                    timeStamp,
+                    request: {
+                        headers: req.headers,
+                        method: req.method,
+                        url: req.url,
+                        body: req.data,
+                        params: req.params,
+                    }
+                })
+                return fixRequestBody(proxyReq, req);
+            },
+            proxyRes: (proxyRes, req, res, options) => {
+                const traceId = req.traceId;
+                const timeStamp = moment.utc().unix();
+                // proxyRes.setHeader('Content-Type', 'application/json');
+
+
+                let body = Buffer.from('');
+
+                proxyRes.on('data', (chunk) => {
+                    body = Buffer.concat([body, chunk]);
+                });
+
+                proxyRes.on('end', () => {
+                    const responseBody = body.toString('utf8');
+
+                    let response = responseBody;
+                    try {
+                        response = JSON.parse(responseBody);
+                    } catch (e) {
+                        response = responseBody;
+                    }
+
+                    logger.log({
+                        traceId,
+                        timeStamp,
+                        response
+                    })
+                });
+            },
+            error: (err, req, res, target) => {
+                const traceId = req.traceId;
+                const timeStamp = moment.utc().unix();
+                logger.error({
+                    traceId,
+                    timeStamp,
+                    error: err
+                })
+
+                res.end(JSON.stringify({
+                    error: 'Bad Gateway',
+                    message: err.message,
+                    traceId: req.traceId || null,
+                }));
+            }
+        },
+        selfHandleResponse: false
+    });
+    app.use(proxy);
+}
+module.exports = {
+    loadProxy
+}

package/app/socket/client.js

@@ -1,17 +1,19 @@
 const {io} = require("socket.io-client");
 const serverSocket = require('../socket/server')();
 let clientSocket = null;
-module.exports = (target, companyId) => {
+module.exports = (target, companyId, terminalId) => {
     if (!clientSocket && companyId) {
         clientSocket = io(target, {
             query: {
-                company_id: companyId
+                company_id: companyId,
+                terminal_id: terminalId,
+                is_proxy_server: true,
             }
         });
     }
 
     if (clientSocket) {
-        clientSocket.onAny((companyId, eventName, ...args) => {
+        clientSocket.onAny((eventName, ...args) => {
             serverSocket.to(companyId).emit(eventName, ...args);
         })
     }

package/app/socket/server.js

@@ -1,4 +1,8 @@
 const {Server} = require("socket.io");
+const axios = require("axios");
+const {getConfig} = require("../config");
+const {getLogger} = require("../logger/Log");
+const {socketSendByFilter} = require("../../utils");
 let serverSocket = null;
 module.exports = (server = null) => {
     if (server && !serverSocket) {
@@ -6,15 +10,76 @@ module.exports = (server = null) => {
             cors: {
                 origin: '*'
             }
-        })
+        });
+
+        const logger = getLogger();
+
 
         serverSocket.on('connection', (socket) => {
-            socket.join(socket.handshake.query.company_id);
             const companyId = socket.handshake.query.company_id;
-            const terminalId = socket.handshake.query.terminalId;
-            socket.onAny((eventName, ...args) => {
-                serverSocket.to(companyId).emit(eventName, terminalId, ...args);
-            });
+            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 PROXY_TARGET = getConfig().apiUrl;
+
+            socket.join(companyId);
+            socket.terminalId = terminalId;
+            socket.companyId = companyId;
+            socket.userId = userId;
+            socket.isProxy = isProxy;
+
+            if (!isProxy) {
+
+                axios.post(`${PROXY_TARGET}/api/socket/connection`, {
+                    companyId,
+                    terminalId,
+                    userId,
+                }).catch(error => {
+                    logger.error(error);
+                });
+
+                socket.on('setUserId', (id) => {
+                    userId = id;
+
+                    axios.post(`${PROXY_TARGET}/api/socket/setUserId`, {
+                        companyId,
+                        terminalId,
+                        userId,
+                    }).catch((err) => {
+                        logger.error(err);
+                    });
+
+
+                    if (id) {
+                        socket.userId = id;
+                    }
+                });
+
+
+                socket.on('disconnect', () => {
+                    axios.post(`${PROXY_TARGET}/api/socket/disconnect`, {
+                        companyId,
+                        terminalId,
+                        userId,
+                    }).catch((err) => {
+                        logger.error(err);
+                    });
+                });
+
+                // socket.on('broadcast', (data) => {
+                //     console.log(companyId, data.eventName, data.data);
+                // })
+
+                socket.onAny((eventName, ...data) => {
+                    // socketSendByFilter('company', companyId, eventName, {
+                    //     terminal: [terminalId],
+                    // }, ...args);
+                    socket.to(companyId).emit(eventName, ...data);
+                });
+            } else {
+                console.log('Proxy');
+            }
         });
     }
 

package/lib/axios.js

@@ -1,7 +1,44 @@
 const axios = require("axios");
-const {appConfig} = require("../server");
+const {getConfig} = require("../app/config");
+const {streamToString} = require("../utils");
+const {getLogger} = require("../app/logger/Log");
+const {response} = require("express");
+const logger = getLogger();
 const instance = axios.create({
-    baseURL: appConfig.apiUrl
+    baseURL: getConfig().apiUrl
+});
+instance.interceptors.request.use((config) => {
+    const traceId = Date.now().toString();
+    config.headers['trace-id'] = traceId;
+    logger.log({
+        traceId,
+        request: {
+            headers: config.headers,
+            method: config.method,
+            url: config.url,
+            data: config.data,
+        }
+    })
+    return config;
+})
+
+instance.interceptors.response.use((response) => {
+    /**
+     * @var request:Cli
+     */
+    const traceId = response.request.getHeader('trace-id');
+    logger.log({
+        traceId,
+        response: response.data,
+    });
+    return response;
+}, (error) => {
+    const traceId = error.request.getHeader('trace-id');
+    logger.error({
+        traceId,
+        error: error.response.data
+    });
+    throw error;
 })
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alizadefaig/pos-server",
-    "version": "1.1.5",
+    "version": "1.2.1",
     "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": {
@@ -11,17 +11,20 @@
         "url": "git+ssh://git@gitlab.com/faigalizade/pos-server.git"
     },
     "dependencies": {
+        "@alizadefaig/cafetap-escpos-usb": "^1.0.1",
         "axios": "^1.8.4",
         "cors": "^2.8.5",
+        "escpos": "^3.0.0-alpha.6",
+        "escpos-network": "^3.0.0-alpha.5",
         "express": "^5.1.0",
         "form-data": "^4.0.2",
+        "http-proxy-middleware": "^3.0.5",
+        "moment": "^2.30.1",
         "multer": "^1.4.5-lts.2",
         "sequelize": "^6.37.7",
         "socket.io": "^4.8.1",
         "socket.io-client": "^4.8.1",
-        "@alizadefaig/cafetap-escpos-usb": "^1.0.1",
-        "escpos": "^3.0.0-alpha.6",
-        "escpos-network": "^3.0.0-alpha.5"
+        "uuid": "^11.1.0"
     },
     "license": "ISC",
     "author": "faigalizade@newave.az",

package/routes/common/socket.js

@@ -0,0 +1,54 @@
+const express = require('express');
+const {socketSendByFilter} = require("../../utils");
+const serverSocket = require("../../app/socket/server")();
+const router = express.Router();
+
+
+router.all('/socket', (req, res) => {
+    /**
+     * @var to [company|terminal|user]
+     */
+
+    const companyId = req.body?.company_id || req.query?.company_id;
+    const eventName = (req.body?.event || req.query?.event) ?? null;
+    const data = (req.body?.data || req.query?.data) ?? null;
+
+    if (!companyId || !data || !eventName) {
+        return res.json({
+            success: false,
+            message: 'Required fields is not set',
+        });
+    }
+
+    const to = (req.body?.to || req.query?.to) ?? null;
+    const excepts = (req.body?.excepts || req.query?.excepts) ?? null;
+    const toId = (req.body?.to_id || req.query?.to_id) ?? null;
+
+    if (to && ['terminal', 'user'].includes(to)) {
+        if (!toId) {
+            return res.json({
+                success: false,
+                message: 'To ID is missing',
+            })
+        }
+
+        return res.json({
+            success: false,
+            message: 'To is incorrect',
+        })
+    }
+
+    socketSendByFilter({
+        companyId,
+        eventName,
+        data,
+        to,
+        toId,
+        excepts
+    }, serverSocket);
+    res.send({
+        success: true,
+    });
+});
+
+module.exports = router;

package/routes/desktop/api/printers.js

@@ -6,7 +6,8 @@ const net = require('net');
 escpos.USB = require('@alizadefaig/cafetap-escpos-usb');
 escpos.Network = require('escpos-network');
 const axios = require('axios');
-const appConfig = require("../../../config.json");
+const {getConfig} = require("../../../app/config");
+const appConfig = getConfig();
 
 let PROXY_TARGET = appConfig.apiUrl || 'http://localhost:8000';
 const getUsbPrinters = async () => {
@@ -107,47 +108,62 @@ router.get('/printers.get', async (req, res) => {
     })
 });
 
-router.post('/printers.print', (req, res) => {
+router.post('/printers.print', async (req, res) => {
     const device = getPrinterDevice(req.body.printer)
     if (!device) {
-        res.send('bad').status(404);
+        return res.send('bad').status(404);
     }
-    const image = req.body.content;
+    const imageContent = req.body.content.replace(/\r?\n|\r/g, '').replace(/^data:image\/\w+;base64,/, '');
     const printer = new escpos.Printer(device, {});
-    const imageBuffer = Buffer.from(image, 'base64');
+    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;
 
     device.open((err) => {
         if (err) {
-            console.error('Ошибка подключения к принтеру:', err);
-            sent = true;
-            res.json({
-                success: false,
-                error: err
-            })
+            if (!sent) {
+                sent = true;
+                res.json({
+                    success: false,
+                    error: 'connection_error',
+                    message: err
+                })
+                return;
+            }
             return;
         }
 
-        printer.image(imageBuffer, 's8');
+        printer.raster(image);
         if (req.body.bell) {
-            printer.beep(2, 3);
+            printer.beep(req.body.bell_count || 2, req.body.bell_time || 3);
         }
-        if (req.body.bell) {
-            printer.cashdraw(2);
+        if (req.body.cashdraw) {
+            printer.cashdraw(req.body.cashdraw_pin || 2);
         }
 
-        printer.cut()
+        printer
+            .newLine()
+            .newLine()
+            .cut()
             .close();
 
-        sent = true;
-        res.json({
-            success: true
-        })
+        if (!sent) {
+            sent = true;
+            res.json({
+                success: true,
+            })
+        }
     });
+
     setTimeout(() => {
         if (!sent) {
+            sent = true;
             res.json({
                 success: false,
                 error: 'timeout'

package/server.js

@@ -3,108 +3,79 @@ const app = express();
 const http = require('http');
 const cors = require('cors')
 const server = http.createServer(app);
-const multer = require('multer');
 const {join} = require("node:path");
+const {loadRoutes, streamToString, getIpAddress} = require("./utils");
+const {getConfig, setConfig} = require("./app/config");
+const {loadProxy} = require("./app/proxy");
+const multer = require('multer');
+const {getLogger} = require("./app/logger/Log");
+
+
+
+
 const upload = multer();
-const axios = require("axios");
-const {loadRoutes, streamToString} = require("./utils");
-const appConfig = require("./config.json");
-const FormData = require("form-data");
-app.use(express.json());
-app.use(express.urlencoded({extended: true})); // Для обработки form-urlencoded
-app.use(upload.any()); // Позволяет обрабатывать файлы
+app.use(express.json({limit: '500mb'}));
+app.use(express.urlencoded({extended: true, limit: '500mb'}));
+app.use(upload.any());
 app.use(cors());
+
+
+
+
+
+let isServer = true;
+let serverSocket = null;
+let clientSocket = null;
+
+
 const runExpress = (conf = null) => {
-    const appConfig = conf || require('./config.json');
+    if (conf) {
+        setConfig(conf);
+    }
+    const appConfig = conf || getConfig();
     let PROXY_TARGET = appConfig.apiUrl;
     const port = appConfig.port;
-    const isServer = appConfig.isServer;
-    const serverSocket = require('./app/socket/server')(server);
-    let clientSocket = null;
-    app.get('/up', (req, res) => {
+    isServer = appConfig.isServer;
+    serverSocket = require('./app/socket/server')(server);
+
+
+
+    // ==== Server Health checker
+    app.get('/health', (req, res) => {
         res.send('ok');
     });
 
-
+    // ===== Init Platform
     app.get('/init', (req, res) => {
-        if (!appConfig.isServer && clientSocket && req.header('company-id')) {
-            clientSocket = require('./app/socket/client')(PROXY_TARGET, req.header('company-id'));
+        if (!clientSocket && !appConfig.isServer) {
+            if (req.header('company-id') && req.header('terminal-id')) {
+                clientSocket = require('./app/socket/client')(PROXY_TARGET, req.header('company-id'));
+            }
         }
         res.send('ok');
     });
 
 
+    // ==== Load Platform Based Routes ====
     loadRoutes(app, join(__dirname, ('routes/' + (appConfig.isServer ? 'server' : 'desktop'))));
-    loadRoutes(app, join(__dirname, ('routes/common')));
-    app.use(async (req, res, next) => {
-        try {
-            const targetUrl = PROXY_TARGET + req.originalUrl;
-            const config = {
-                method: req.method,
-                url: targetUrl,
-                headers: {...req.headers, host: new URL(PROXY_TARGET).host},
-                responseType: 'stream'
-            };
-
-            if (req.body && Object.keys(req.body).length > 0) {
-                config.data = req.body;
-            }
-
-            if (req.files && req.files.length > 0) {
-                const FormData = require('form-data');
-                const form = new FormData();
-                req.files.forEach(file => {
-                    form.append(file.fieldname, file.buffer, file.originalname);
-                });
-
-                Object.entries(req.body).forEach(([key, value]) => {
-                    form.append(key, value);
-                });
-
-                config.data = form;
-                config.headers = {...config.headers, ...form.getHeaders(), 'Accept': 'application/json'};
-            }
 
-            const response = await axios(config);
 
+    // ==== Load Common Routes ====
+    loadRoutes(app, join(__dirname, ('routes/common')));
 
-            res.status(response.status);
-            // Object.entries(response.headers).forEach(([key, value]) => {
-            //     res.setHeader(key, value);
-            // });
-
-            const responseData = await streamToString(response.data);
-
-
-            if (typeof responseData === 'string' || Buffer.isBuffer(responseData)) {
-                res.send(responseData);
-            } else {
-                res.json(responseData);
-            }
-
-        } catch (error) {
-            if (error.response) {
-                // Если сервер вернул ответ с ошибкой
-                res.status(error.response.status);
-
-
-                if (error.response.data && typeof error.response.data === 'object') {
-                    const details = await streamToString(error.response.data)
-                    res.json({error: 'Ошибка от проксируемого сервера', details});
-                } else {
-                    res.send(error.response.data);
-                }
-            } else {
-                // Внутренняя ошибка сервера (например, таймаут или потеря связи)
-                res.status(500).json({error: 'Внутренняя ошибка прокси', details: error.message});
-            }
+    // ==== Load Proxy ====
+    loadProxy(app);
 
 
-            console.error('Ошибка при проксировании запроса:', error.message);
+    // ==== Start Listen ====
+    const hostname = appConfig.host || 'localhost';
+    server.listen(port, hostname, async () => {
+        if (hostname === 'localhost') {
+            console.log(`Server started on  ${hostname} http://${hostname}:${port}`);
+        } else {
+            const host = await getIpAddress();
+            console.log(`Server started on ${hostname} http://${host}:${port}`);
         }
-    });
-    server.listen(port, appConfig.host || 'localhost', () => {
-        console.log('Server started on: ' + port);
     })
 }
 

package/tests/usbPrinterTest.js

@@ -0,0 +1,20 @@
+const escpos = require("escpos");
+escpos.USB = require('@alizadefaig/cafetap-escpos-usb');
+device = new escpos.USB(8137, 8214);
+console.log(device);
+// console.log(base64Str);
+
+const printer = new escpos.Printer(device, {});
+
+
+
+
+device.open((err) => {
+    console.log('asd')
+    if (err) {
+        console.log(err)
+    }
+    printer.text('Hello World!');
+
+    printer.newLine().newLine().cut().close();
+});

package/utils.js

@@ -1,6 +1,7 @@
 const {readdirSync, existsSync} = require("node:fs");
 const {extname, join} = require("node:path");
 const {networkInterfaces} = require("os");
+const escpos = require("escpos");
 
 function loadRoutes(app, routesDir, prefix = '') {
     if (!existsSync(routesDir)) {
@@ -66,7 +67,7 @@ function getPrinterDevice(printer) {
     let device = null;
     try {
         if (printer.type === 'USB') {
-            device = new escpos.USB(printer.vendor_id, printer.product_id);
+            device = new escpos.USB(+printer.vendor_id, +printer.product_id);
         } else {
             device = new escpos.Network(printer.ip_address);
         }
@@ -91,10 +92,21 @@ const streamToString = async (stream) => {
     }
 };
 
+const socketSendByFilter = ({companyId, eventName, data, to, toId, excepts}, serverSocket = null) => {
+    if (!serverSocket) {
+        serverSocket = require('./app/socket/server')();
+    }
+
+    if (!to) {
+        serverSocket.to(companyId).emit(eventName, data);
+    }
+}
+
 module.exports = {
     loadRoutes,
     getIpAddress,
     ipRange,
     getPrinterDevice,
-    streamToString
+    streamToString,
+    socketSendByFilter
 }

package/config.json

@@ -1,6 +0,0 @@
-{
-    "isServer": true,
-    "apiUrl": "https://admin.cafepos.az",
-    "debug": false,
-    "port": 3005
-}

package/routes/server/socket.js

@@ -1,19 +0,0 @@
-const express = require('express');
-const serverSocket = require("../../app/socket/server")();
-const router = express.Router();
-
-
-router.all('/socket', (req, res) => {
-    const companyId = req.body?.company_id || req.query?.company_id;
-    const eventName = req.body?.event || req.query?.event;
-    const data = req.body?.data || req.query?.data;
-    if (!companyId || !eventName || !data) {
-        return res.send('ok');
-    }
-    serverSocket
-        .to(companyId)
-        .emit(eventName, data);
-    res.send('ok');
-});
-
-module.exports = router;