hl7v2 0.9.0 → 0.11.0

package/lib/HL7Message.js

@@ -94,7 +94,7 @@ class HL7Message {
 
   /**
    *
-   * @param {Buffer|Uint8Array|string} buf
+   * @param {Buffer|string} buf
    * @param {Object} [options]
    * @param {string} [options.encoding='utf8']
    * @private
@@ -102,7 +102,7 @@ class HL7Message {
   parse(buf, options) {
     this._segments = [];
     let str;
-    if (buf instanceof Uint8Array) {
+    if (buf instanceof Buffer) {
       let encoding = (options && options.encoding) || 'utf8';
       /* Character set detection */
       const sep = FIELD_SEPARATOR.charCodeAt(0);
@@ -121,8 +121,11 @@ class HL7Message {
         }
       } while (l > 0 && l < crIdx);
       str = iconv.decode(buf, encoding.replace(/^UNICODE/, ''));
-    } else
-      str = String(buf);
+    } else if (typeof buf === 'string') {
+      str = buf;
+    } else {
+      throw new ArgumentError('You must provide string or Buffer argument');
+    }
 
     if (str.startsWith(VT))
       str = str.substring(1);
@@ -137,7 +140,7 @@ class HL7Message {
     if (!str.startsWith('MSH'))
       throw new ParseError('Message must start with (MSH) segment');
 
-    const lines = str.split(/\r|\r\n|\n/);
+    const lines = str.split(CR);
     for (const [i, line] of lines.entries()) {
       if (!line)
         continue;

package/lib/exchange/HL7Client.js

@@ -147,7 +147,7 @@ class HL7Client extends EventEmitter {
       this._buffer.on('block', data => this._onHL7Data(data));
 
       this._socket = socket = socket ||
-          (opts.cert ? tls.connect(opts) : net.connect(opts));
+          (opts.protocol === 'mllps' || opts.cert ? tls.connect(opts) : net.connect(opts));
 
       socket.removeListener('connect', this._connectionListener);
       socket.removeListener('secureConnect', this._connectionListener);
@@ -228,7 +228,7 @@ class HL7Client extends EventEmitter {
         msg.MSH.MessageControlId.value = ++this._controlIdSeq;
 
       const str = msg.toHL7();
-      let charset = 'utf8';
+      let charset = this.encoding || 'utf8';
       if (msg.MSH[18]) {
         if (this.encoding && !msg.MSH[18].value)
           msg.MSH[18].value = this.encoding;

package/lib/exchange/HL7MessageRouter.js

@@ -44,6 +44,8 @@ class HL7MessageRouter extends Callable {
    * @private
    */
   __call__(req, ...args) {
+    if (!req) 
+      throw new Error('Request was undefined');
     return waterfall.some([...this._handlers,
       this._defaultHandler], (next, o) => {
       if (!o.handler)

package/lib/exchange/HL7Server.js

@@ -22,7 +22,7 @@ class HL7Server extends EventEmitter {
    * @param {Object} [param2]
    * @param {string} [param2.applicationName]
    * @param {string} [param2.facilityName]
-   * @param {string} [param2.defaultEncoding]
+   * @param {string} [param2.encoding]
    * @param {string} [param2.defaultVersion]
    * @param {number} [param2.maxBufferPerSocket]
    * @param {string} [param2.cert]
@@ -220,14 +220,14 @@ class HL7Server extends EventEmitter {
   /**
    *
    * @param {net.Socket} socket
-   * @param {string} block
+   * @param {Buffer} block
    * @private
    */
   _onHl7Block(socket, block) {
     let msg;
     // Parse message
     try {
-      msg = HL7Message.parse(block, {encoding: this.defaultEncoding});
+      msg = HL7Message.parse(block, {encoding: this.encoding});
       socket._errorCount = 0;
     } catch (e) {
       const ack = this._createACK(msg, 'AR',
@@ -254,6 +254,7 @@ class HL7Server extends EventEmitter {
           socket.remoteAddress + '. ' + e.message;
       e.socket = socket;
       this.emitSafe('error', e);
+      return;
     }
     socket._messageQueue.add(msg);
     this._router(msg, socket)
@@ -294,7 +295,7 @@ class HL7Server extends EventEmitter {
         throw new ArgumentError('You must provide HL7Message or string argument');
 
       const str = msg.toHL7();
-      let charset = 'utf8';
+      let charset = this.encoding || 'utf8';
       /* istanbul ignore next: same in client */
       if (msg.MSH[18]) {
         if (this.encoding && !msg.MSH[18].value)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hl7v2",
   "description": "HL7 v2 parser, serializer, validator and tcp client/server for NodeJS",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "author": "Panates Ltd.",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -28,9 +28,9 @@
   },
   "devDependencies": {
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.14.0",
+    "eslint": "^8.1.0",
     "eslint-config-google": "^0.14.0",
-    "mocha": "^8.2.1",
+    "mocha": "^9.1.3",
     "nyc": "^15.1.0",
     "rejected-or-not": "^2.0.0"
   },