nets-service-sdk 1.1.16 → 1.1.18

package/dist/index.js

@@ -12,16 +12,15 @@ var require_utils_helper = __commonJS({
       return String(num).padStart(totalLength, "0");
     };
     module2.exports.xorCalculation = (value) => {
-      const splitted_arr = value.match(/[\w]{2}/g);
-      let response = "";
-      _.map(splitted_arr, (value2, i) => {
-        if (i == 0) {
-          response = value2;
-        } else {
-          response = xor(response, value2);
-        }
-      });
-      return response.toUpperCase();
+      if (!value) return "00";
+      const splitted_arr = value.match(/[0-9A-Fa-f]{2}/g);
+      if (!splitted_arr) return "00";
+      let res = Buffer.from(splitted_arr[0], "hex");
+      for (let i = 1; i < splitted_arr.length; i++) {
+        const nextByte = Buffer.from(splitted_arr[i], "hex");
+        res[0] ^= nextByte[0];
+      }
+      return res.toString("hex").toUpperCase();
     };
     String.prototype.toHexString = function() {
       var res = [];
@@ -32,12 +31,6 @@ var require_utils_helper = __commonJS({
       }
       return res.join("").toUpperCase();
     };
-    function xor(hex1, hex2) {
-      const buf1 = Buffer.from(hex1, "hex");
-      const buf2 = Buffer.from(hex2, "hex");
-      const bufResult = buf1.map((b, i) => b ^ buf2[i]);
-      return bufResult.toString("hex");
-    }
     String.prototype.toAsciiString = function() {
       return this.match(/.{1,2}/g).map(function(v) {
         return String.fromCharCode(parseInt(v, 16));
@@ -75,9 +68,10 @@ var require_winston = __commonJS({
       const parts = callingModule.filename.split(path.sep);
       return path.join(parts[parts.length - 1], parts.pop());
     };
-    var myFormat = printf(
-      ({ level, message, label: label2, timestamp: timestamp2 }) => `${timestamp2} [${label2}] ${level}: ${message}`
-    );
+    var myFormat = printf(({ level, message, label: label2, timestamp: timestamp2 }) => {
+      const versionPrefix = global.appVersion ? `[v${global.appVersion}] ` : "";
+      return `${timestamp2} [${label2}] ${versionPrefix}${level}: ${message}`;
+    });
     var logger = (module3) => createLogger({
       format: combine(label({ label: getLabel(module3) }), timestamp(), myFormat),
       transports: [
@@ -190,7 +184,25 @@ var require_queue = __commonJS({
 var require_sendMessage = __commonJS({
   "src/sendMessage.js"(exports2, module2) {
     var logger = require_winston()(module2);
+    var path = require("path");
+    var fs = require("fs");
+    var sdkVersion = "unknown";
+    try {
+      const pkgPath = path.resolve(__dirname, "../package.json");
+      if (fs.existsSync(pkgPath)) {
+        const pkg2 = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+        sdkVersion = pkg2.version;
+      }
+    } catch (err) {
+      logger.error({ level: "error", message: `Error reading SDK package.json: ${err.message}` });
+    }
     module2.exports.sendMessage = (room = "clientRoom", tag, msg) => {
+      if (typeof msg === "object" && msg !== null) {
+        msg.sdkVersion = sdkVersion;
+        if (global.appVersion) {
+          msg.appVersion = global.appVersion;
+        }
+      }
       logger.log({
         level: "info",
         message: JSON.stringify(msg)
@@ -898,9 +910,17 @@ var require_responseHandler = __commonJS({
       if (!hexValue || hexValue.length < 4) return false;
       const value = hexValue.substring(2, hexValue.length - 2);
       const xor = xorCalculation(value).toUpperCase();
-      const lrcCheck = hexValue.substring(hexValue.length - 2, hexValue.length).toUpperCase();
-      logger.info({ level: "info", message: `LRC Check: Calculated ${xor} vs Received ${lrcCheck}` });
-      return xor === lrcCheck;
+      const lrcReceived = hexValue.substring(hexValue.length - 2, hexValue.length).toUpperCase();
+      const isMatch = xor === lrcReceived;
+      if (!isMatch) {
+        logger.error({
+          level: "error",
+          message: `LRC Mismatch! Calculated: ${xor}, Received: ${lrcReceived}. Checked range (hex): ${value.substring(0, 20)}...${value.substring(value.length - 10)}`
+        });
+      } else {
+        logger.info({ level: "info", message: `LRC Correct: ${xor}` });
+      }
+      return isMatch;
     };
   }
 });
@@ -1068,7 +1088,7 @@ var require_communication = __commonJS({
     };
     module2.exports.processIncomingData = () => {
       while (dataBuffer.length > 0) {
-        if (dataBuffer[0] === 6 || dataBuffer[0] === 21) {
+        if ((dataBuffer[0] === 6 || dataBuffer[0] === 21) && (dataBuffer.length === 1 || dataBuffer[1] !== 2)) {
           const byte = dataBuffer[0];
           ackOrNack = Buffer.from([byte]);
           dataBuffer = dataBuffer.slice(1);
@@ -1103,10 +1123,26 @@ var require_communication = __commonJS({
           }
         }
         if (dataBuffer.length < 3) break;
-        const lenBytes = dataBuffer.slice(1, 3).toString("hex");
-        const bodyLen = parseInt(lenBytes, 10);
-        const expectedFrameSize = 1 + 2 + bodyLen + 2;
-        if (dataBuffer.length < expectedFrameSize) break;
+        const bcdLenStr = dataBuffer.slice(1, 3).toString("hex");
+        const bcdLen = parseInt(bcdLenStr, 10);
+        const binLen = dataBuffer.readUInt16BE(1);
+        let bodyLen = bcdLen;
+        let expectedFrameSize = 1 + 2 + bodyLen + 2;
+        if (dataBuffer.length >= expectedFrameSize && dataBuffer[3 + bodyLen] === 3) {
+        } else if (dataBuffer.length >= 1 + 2 + binLen + 2 && dataBuffer[3 + binLen] === 3) {
+          bodyLen = binLen;
+          expectedFrameSize = 1 + 2 + bodyLen + 2;
+        }
+        if (dataBuffer.length < expectedFrameSize) {
+          const etxIndex = dataBuffer.indexOf(3, 3);
+          if (etxIndex !== -1 && dataBuffer.length > etxIndex + 1) {
+            const frame = dataBuffer.slice(0, etxIndex + 2);
+            dataBuffer = dataBuffer.slice(etxIndex + 2);
+            exports2.handleFullMessage(frame);
+            continue;
+          }
+          break;
+        }
         if (dataBuffer[3 + bodyLen] === 3) {
           const frame = dataBuffer.slice(0, expectedFrameSize);
           dataBuffer = dataBuffer.slice(expectedFrameSize);
@@ -1251,6 +1287,56 @@ var require_communication = __commonJS({
   }
 });
 
+// package.json
+var require_package = __commonJS({
+  "package.json"(exports2, module2) {
+    module2.exports = {
+      name: "nets-service-sdk",
+      version: "1.1.18",
+      description: "Utility functions for Nets Service",
+      source: "src/index.js",
+      main: "dist/index.js",
+      module: "dist/index.module.js",
+      unpkg: "dist/index.umd.js",
+      scripts: {
+        build: "esbuild src/index.js --bundle --platform=node --packages=external --outfile=dist/index.js",
+        watch: "microbundle watch",
+        test: 'echo "Error: no test specified" && exit 1'
+      },
+      keywords: [
+        "nets",
+        "payment",
+        "terminal",
+        "pos",
+        "sqlite",
+        "transaction",
+        "serial",
+        "payment-gateway"
+      ],
+      author: "dineshhv",
+      license: "ISC",
+      files: [
+        "dist"
+      ],
+      dependencies: {
+        "better-sqlite3": "^12.5.0",
+        "dollars-to-cents": "^1.0.3",
+        lodash: "^4.17.21",
+        moment: "^2.29.4",
+        "node-cron": "^4.2.1",
+        request: "^2.88.2",
+        serialport: "^10.5.0",
+        "socket.io-client": "^4.7.2",
+        winston: "^3.8.2"
+      },
+      devDependencies: {
+        esbuild: "^0.27.0",
+        microbundle: "^0.15.1"
+      }
+    };
+  }
+});
+
 // src/index.js
 var utilsHelper = require_utils_helper();
 var winston = require_winston();
@@ -1262,7 +1348,9 @@ var hexRequest = require_hexRequest();
 var httpRequest = require_httpRequest();
 var parser = require_parser();
 var responseHandler = require_responseHandler();
+var pkg = require_package();
 module.exports = {
+  version: pkg.version,
   ...utilsHelper,
   logger: winston,
   manageConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nets-service-sdk",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "Utility functions for Nets Service",
   "source": "src/index.js",
   "main": "dist/index.js",