@alizadefaig/pos-server 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alizadefaig/pos-server",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "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": {
@@ -10,6 +10,16 @@
         "type": "git",
         "url": "git+ssh://git@gitlab.com/faigalizade/pos-server.git"
     },
+    "dependencies": {
+        "axios": "^1.8.4",
+        "cors": "^2.8.5",
+        "express": "^5.1.0",
+        "form-data": "^4.0.2",
+        "multer": "^1.4.5-lts.2",
+        "sequelize": "^6.37.7",
+        "socket.io": "^4.8.1",
+        "socket.io-client": "^4.8.1"
+    },
     "license": "ISC",
     "author": "faigalizade@newave.az",
     "type": "commonjs",
@@ -20,18 +30,5 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "start": "node server.js"
-    },
-    "dependencies": {
-        "axios": "^1.8.4",
-        "cors": "^2.8.5",
-        "express": "^5.1.0",
-        "form-data": "^4.0.2",
-        "multer": "^1.4.5-lts.2",
-        "sequelize": "^6.37.7",
-        "socket.io": "^4.8.1",
-        "socket.io-client": "^4.8.1",
-        "cafetap-escpos-usb": "gitlab:faigalizade/escpos-usb",
-        "escpos": "^3.0.0-alpha.6",
-        "escpos-network": "^3.0.0-alpha.5"
     }
 }

package/routes/desktop/api/printers.js

@@ -24,12 +24,6 @@ const getUsbPrinters = async () => {
         });
         usbDevice.close();
     }
-    result.push({
-        type: 'USB',
-        name: 'Text',
-        vendor_id: 123,
-        product_id: 345
-    });
 
     return result;
 }
@@ -99,14 +93,16 @@ const getNetworkDevices = async () => {
 router.get('/printers.get', async (req, res) => {
     let usbPrinters = await getUsbPrinters();
     let networkPrinters = await getNetworkDevices();
-    axios.get(PROXY_TARGET + '/api/printers.get', {
+    const printers = [...usbPrinters, ...networkPrinters]
+    axios.post(PROXY_TARGET + '/api/printers.get', {
+        printers
+    },{
         headers: {...req.headers, host: new URL(PROXY_TARGET).host},
-    }).then(data => {
-        console.log(data.data);
+    }).then(({data}) => {
+        res.json(data);
+    }).catch(e => {
+        res.json([...usbPrinters, ...networkPrinters])
     })
-
-
-    res.json([...usbPrinters, ...networkPrinters]);
 });
 
 router.post('/printers.print', (req, res) => {
@@ -117,11 +113,18 @@ router.post('/printers.print', (req, res) => {
     const image = req.body.content;
     const printer = new escpos.Printer(device, {});
     const imageBuffer = Buffer.from(image, 'base64');
+    const timeOut = req.body.timeout || 5000;
+
+    let sent = false;
 
     device.open((err) => {
         if (err) {
             console.error('Ошибка подключения к принтеру:', err);
-            res.send(err).status(404);
+            sent = true;
+            res.json({
+                success: false,
+                error: err
+            })
             return;
         }
 
@@ -136,8 +139,19 @@ router.post('/printers.print', (req, res) => {
         printer.cut()
             .close();
 
-        res.send('ok');
+        sent = true;
+        res.json({
+            success: true
+        })
     });
+    setTimeout(() => {
+        if (!sent) {
+            res.json({
+                success: false,
+                error: 'timeout'
+            })
+        }
+    }, timeOut);
 })
 
 module.exports = router;