@alizadefaig/pos-server 1.1.5 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alizadefaig/pos-server",
-    "version": "1.1.5",
+    "version": "1.2.0",
     "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,17 @@
         "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",
         "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"
+        "socket.io-client": "^4.8.1"
     },
     "license": "ISC",
     "author": "faigalizade@newave.az",

package/routes/desktop/api/printers.js

@@ -107,14 +107,19 @@ 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);
     }
-    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;
@@ -130,15 +135,18 @@ router.post('/printers.print', (req, res) => {
             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;
@@ -146,6 +154,7 @@ router.post('/printers.print', (req, res) => {
             success: true
         })
     });
+
     setTimeout(() => {
         if (!sent) {
             res.json({