hl7v2 0.9.1 → 0.12.0

package/lib/HL7Field.js

@@ -14,8 +14,10 @@ class HL7Field {
    * @param {HL7Segment} segment
    * @param {string} name
    * @param {Object} def
+   * @param {Object} [customDict]
+   * @param {Object} [customDict.fields]
    */
-  constructor(segment, name, def) {
+  constructor(segment, name, def, customDict) {
     Object.defineProperty(this, '_segment', {
       value: segment,
       enumerable: false
@@ -23,6 +25,7 @@ class HL7Field {
     this._name = name;
     this._def = def;
     this._data = null;
+    this._customDict = customDict;
   }
 
   /**
@@ -131,7 +134,7 @@ class HL7Field {
 
   add() {
     this._data = this._data || [];
-    const data = new HL7FieldData(this, this._def);
+    const data = new HL7FieldData(this, this._def, undefined, this._customDict);
     const k = this._data.length;
     this._data.push(data);
     Object.defineProperty(this, k, {

package/lib/HL7FieldData.js

@@ -15,8 +15,10 @@ class HL7FieldData {
    * @param {HL7Field} field
    * @param {Object} def
    * @param {Number} level
+   * @param {Object} [customDict]
+   * @param {Object} [customDict.fields]
    */
-  constructor(field, def, level) {
+  constructor(field, def, level, customDict) {
     Object.defineProperty(this, '_field', {
       value: field,
       enumerable: false
@@ -25,8 +27,11 @@ class HL7FieldData {
     this._level = level || 0;
     this._items = null;
     this._value = null;
+    this._customDict = customDict;
 
     const dict = require('./dictionary/' + this.message.version);
+    if (this._customDict && this._customDict.fields)
+      dict.fields = {...dict.fields, ...this._customDict.fields};
     const fldDict = dict.fields[def.dt];
     /* istanbul ignore next */
     if (!fldDict)
@@ -50,7 +55,7 @@ class HL7FieldData {
   defineComponent(sequence, def) {
     this._items = this._items || [];
     const index = sequence - 1;
-    const comp = new HL7FieldData(this._field, def, 1);
+    const comp = new HL7FieldData(this._field, def, 1, this._customDict);
     Object.defineProperty(this, sequence, {
       get: () => this._items[index],
       enumerable: false

package/lib/HL7Message.js

@@ -25,11 +25,13 @@ class HL7Message {
 
   /**
    * @param {Object} [options]
+   * @param {Object} [options.customDict]
    */
   constructor(options) {
     options = options || {};
     this.version = options.version;
     this._segments = [];
+    this._customDict = options.customDict;
   }
 
   /**
@@ -68,7 +70,7 @@ class HL7Message {
    * @return {HL7Segment}
    */
   add(type) {
-    const segment = new HL7Segment(this);
+    const segment = new HL7Segment(this, {customDict: this._customDict});
     segment.parse(type);
     this.segments.push(segment);
     return segment;
@@ -94,15 +96,21 @@ class HL7Message {
 
   /**
    *
-   * @param {Buffer|Uint8Array|string} buf
+   * @param {Buffer|string} buf
    * @param {Object} [options]
    * @param {string} [options.encoding='utf8']
+   * @param {Object} [options.customDict]
    * @private
    */
   parse(buf, options) {
     this._segments = [];
+
+    let customDict = this._customDict;
+    if (options && options.customDict)
+      customDict = options.customDict;
+
     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 +129,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,11 +148,11 @@ 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;
-      const segment = new HL7Segment(this);
+      const segment = new HL7Segment(this, {customDict});
       try {
         segment.parse(line);
       } catch (e) {
@@ -164,7 +175,7 @@ class HL7Message {
   }
 
   static parse(input, options) {
-    const msg = new HL7Message();
+    const msg = new HL7Message(options);
     msg.parse(input, options);
     return msg;
   }

package/lib/HL7Segment.js

@@ -27,14 +27,32 @@ class HL7Segment {
   /**
    *
    * @param {HL7Message} message
+   * @param {Object} [options]
+   * @param {Object} [options.customDict]
    */
-  constructor(message) {
+  constructor(message, options) {
     Object.defineProperty(this, '_message', {
       value: message,
       enumerable: false
     });
     this._type = null;
     this._fields = null;
+    if (options && options.customDict)
+      this._customDict = options.customDict;
+  }
+
+  getDict(version) {
+    const dict = require(path.resolve(__dirname, 'dictionary', version));
+    return {
+      fields: {
+        ...dict.fields,
+        ...(this._customDict || {}).fields
+      },
+      segments: {
+        ...dict.segments,
+        ...(this._customDict || {}).segments
+      }
+    };
   }
 
   /**
@@ -71,7 +89,7 @@ class HL7Segment {
     if (typeof def !== 'object')
       throw new ArgumentError('You must provide config object');
 
-    const dict = require(path.resolve(__dirname, 'dictionary', this.message.version));
+    const dict = this.getDict(this.message.version);
     const dataType = def.dt;
     const fldDict = dict.fields[dataType];
     if (!fldDict)
@@ -81,7 +99,7 @@ class HL7Segment {
     const name = def.desc ?
         capitalizeFirst(def.desc).replace(/[^\w]/g, '') :
         'CustomField' + sequence;
-    const field = this._fields[index] = new HL7Field(this, name, def);
+    const field = this._fields[index] = new HL7Field(this, name, def, this._customDict);
     delete this[sequence];
     delete this[name];
     Object.defineProperty(this, sequence, {
@@ -107,7 +125,7 @@ class HL7Segment {
 
     const segmentType = values[0];
     const sequence = values[1];
-    const dict = require(path.resolve(__dirname, 'dictionary', this.message.version));
+    const dict = this.getDict(this.message.version);
     const segDict = dict.segments[segmentType];
     if (!segDict) {
       const e = new ParseError('Unknown HL7 segment type (%s)', segmentType);

package/lib/exchange/HL7Client.js

@@ -17,10 +17,25 @@ class HL7Client extends EventEmitter {
 
   /**
    *
-   * @param {net.Socket} [socket]
+   * @param {net.Socket|Object} [param1]
+   * @param {Object} [param2]
+   * @param {Object} [param2.customDict]
    */
-  constructor(socket) {
+  constructor(param1, param2) {
     super();
+    let options;
+    let socket = undefined;
+    if (param2 !== undefined) {
+      socket = param1;
+      options = param2 || {};
+    } else if (param1 instanceof net.Socket) {
+      socket = param1;
+    } else {
+      options = param1;
+    }
+
+    if (options && options.customDict)
+      this._customDict = options.customDict;
     if (socket && !(socket instanceof net.Socket))
       throw new ArgumentError('You can provide Socket instance as fist argument');
     this._extSocket = socket;
@@ -147,7 +162,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);
@@ -214,7 +229,7 @@ class HL7Client extends EventEmitter {
   send(msg) {
     return new Promise(resolve => {
       if (typeof msg === 'string')
-        msg = HL7Message.parse(msg);
+        msg = HL7Message.parse(msg, {customDict: this._customDict});
 
       /* istanbul ignore next */
       if (!(msg instanceof HL7Message))
@@ -228,7 +243,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;
@@ -248,7 +263,7 @@ class HL7Client extends EventEmitter {
   sendReceive(msg, timeout) {
     return Promise.resolve().then(() => {
       if (typeof msg === 'string')
-        msg = HL7Message.parse(msg);
+        msg = HL7Message.parse(msg, {customDict: this._customDict});
     }).then(() => this.send(msg))
         .then(() => {
 
@@ -293,7 +308,7 @@ class HL7Client extends EventEmitter {
   _onHL7Data(data) {
     let msg;
     try {
-      msg = HL7Message.parse(data, {encoding: this.encoding});
+      msg = HL7Message.parse(data, {encoding: this.encoding, customDict: this._customDict});
     } catch (e) /* istanbul ignore next */ {
       e.message = 'Invalid HL7 data received from server. ' + e.message;
       this.emitSafe('error', e);

package/lib/exchange/HL7Server.js

@@ -22,12 +22,13 @@ 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]
    * @param {string} [param2.key]
    * @param {boolean} [param2.rejectUnauthorized]
+   * @param {Object} [param2.customDict]
    */
   constructor(param1, param2) {
     super();
@@ -56,6 +57,7 @@ class HL7Server extends EventEmitter {
         options.maxBufferPerSocket : 5;
     this.shutdownWait = options.shutdownWait;
     this._controlIdSeq = 0;
+    this._customDict = options.customDict;
 
     this._connectionListener = (socket) => this._onConnect(socket);
     this._closeListener = (...args) => this.emitSafe('close', ...args);
@@ -220,14 +222,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, customDict: this._customDict});
       socket._errorCount = 0;
     } catch (e) {
       const ack = this._createACK(msg, 'AR',
@@ -288,14 +290,14 @@ class HL7Server extends EventEmitter {
     return new Promise(resolve => {
       /* istanbul ignore next: same in client */
       if (typeof msg === 'string')
-        msg = HL7Message.parse(msg);
+        msg = HL7Message.parse(msg, {customDict: this._customDict});
 
       /* istanbul ignore next */
       if (!(msg instanceof HL7Message))
         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)
@@ -318,7 +320,8 @@ class HL7Server extends EventEmitter {
    */
   _createACK(req, ackCode, textMessage) {
     const ack = new HL7Message({
-      version: (req && req.MSH.VersionId.value) || '2.5'
+      version: (req && req.MSH.VersionId.value) || '2.5',
+      customDict: this._customDict
     });
     const msh = ack.add('MSH');
     msh[3].value = this.applicationName;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hl7v2",
   "description": "HL7 v2 parser, serializer, validator and tcp client/server for NodeJS",
-  "version": "0.9.1",
+  "version": "0.12.0",
   "author": "Panates Ltd.",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"