feat: support multiple printers

softwaregroup-bg · Jul 26, 2017 · cbd1a98 · cbd1a98
1 parent 5032bcb
commit cbd1a98
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/ndc.js b/ndc.js
@@ -4,6 +4,7 @@ var defaultFormat = require('./ndc.messages');
 
 function NDC(config, validator, logger) {
     this.fieldSeparator = config.fieldSeparator || '\u001c';
+    this.groupSeparator = config.groupSeparator || '\u001d';
     this.val = validator || null;
     this.log = logger || {};
     this.codes = {};
@@ -528,10 +529,18 @@ NDC.prototype.encode = function(message, $meta, context) {
         // bufferString += command.messageClass;
         command.fieldsSplit.forEach((field) => {
             if (field.length) {
-                if (field === 'FS') {
-                    bufferString += this.fieldSeparator;
-                } else {
-                    bufferString += message[field] || '';
+                switch (field) {
+                    case 'FS':
+                        bufferString += this.fieldSeparator;
+                        break;
+                    case 'GS':
+                        bufferString += this.groupSeparator;
+                        break;
+                    case 'printers':
+                        bufferString += (message[field] || []).map(printer => printer.printer + printer.printerData).join(this.groupSeparator);
+                        break;
+                    default:
+                        bufferString += message[field] || '';
                 }
             }
         });

diff --git a/ndc.messages.json b/ndc.messages.json
@@ -340,7 +340,7 @@
             "messageClass": "4",
             "messageSubclass": ""
         },
-        "fields": "messageClass,responseFlag,FS,luno,FS,timeVariantNumber,FS,nextState,FS,type1Notes,type2Notes,type3Notes,type4Notes,FS,sernum,function,screen,screenUpdate,screenMessage,FS,coordination,cardReturn,printer,printerData"
+        "fields": "messageClass,responseFlag,FS,luno,FS,timeVariantNumber,FS,nextState,FS,type1Notes,type2Notes,type3Notes,type4Notes,FS,sernum,function,screen,screenUpdate,screenMessage,FS,coordination,cardReturn,printers"
     },
     "tmAlert2": {
         "mtid": "request",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ut-codec",
-  "version": "5.10.1",
+  "version": "5.10.2-printer.1",
   "main": "./index.js",
   "dependencies": {
     "iconv-lite": "0.4.15",