Merge pull request #52 from panates/dev

Dev

Author: erayhanoglu

packages/dictionary/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hl7v2-dictionary",
   "description": "HL7 v2 parser, serializer, validator for NodeJS",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": "Panates",
   "license": "MIT",
   "private": true,

packages/hl7v2/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hl7v2",
   "description": "HL7 v2 parser, serializer, validator for NodeJS",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": "Panates",
   "license": "MIT",
   "private": true,
@@ -16,7 +16,7 @@
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2-dictionary": "^1.2.3"
+    "hl7v2-dictionary": "^1.2.4"
   },
   "devDependencies": {
     "expect": "^30.0.5"

packages/hl7v2/src/hl7-message.ts

@@ -18,6 +18,7 @@ import {
   ESCAPE_CHARACTER,
   FIELD_SEPARATOR,
   FS,
+  LF,
   REPETITION_SEPARATOR,
   SUBCOMPONENT_SEPARATOR,
   VT,
@@ -135,7 +136,7 @@ export class HL7Message {
     this.escapeCharacter = raw.escapeCharacter;
     this.subComponentSeparator = raw.subComponentSeparator;
 
-    const lines = raw.data.split(CR);
+    const lines = raw.data.replaceAll(CR + LF, CR).split(CR);
     const headerItems = raw.header.split(this.fieldSeparator);
     for (const [i, line] of lines.entries()) {
       if (!line) continue;

packages/net/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hl7v2-net",
   "description": "HL7 v2 server/client for NodeJS",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": "Panates",
   "license": "MIT",
   "private": true,
@@ -16,8 +16,8 @@
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2": "^1.2.3",
-    "hl7v2-dictionary": "^1.2.3"
+    "hl7v2": "^1.2.4",
+    "hl7v2-dictionary": "^1.2.4"
   },
   "devDependencies": {
     "expect": "^30.0.5"

packages/net/src/hl7-client.ts

@@ -70,7 +70,7 @@ export class Hl7Client extends AsyncEventEmitter<Hl7Client.Events> {
       return {
         address: this._options.host || '',
         port: this._options.port || 0,
-        family: 'tcp',
+        family: '',
       } satisfies AddressInfo;
     }
     return out as AddressInfo;

packages/net/src/hl7-socket.ts

@@ -19,6 +19,7 @@ export class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
   protected _frameStream: FrameStream;
   protected _waitPromises = new Set<Promise<any>>();
   protected _options: HL7Socket.Options;
+  protected _peerIp: string;
   responseTimeout?: number;
   /**
    * User defined property
@@ -36,7 +37,12 @@ export class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
       maxBufferSize: options?.maxBufferSize,
     });
     this._frameStream = frameStream;
-    socket.on('error', err => this.emit('error', err));
+    socket.on('error', (err: any) => {
+      if (err.code === 'ECONNRESET') {
+        err.message = `Connection reset by peer`;
+      }
+      this.emit('error', err);
+    });
     socket.pipe(frameStream);
     socket.on('connect', () => this.emit('connect'));
     socket.on('ready', () => this.emit('ready'));
@@ -51,6 +57,9 @@ export class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
       this.emit('data', data);
       this._onData(data);
     });
+    this._peerIp = (socket.address() as any)?.address || '';
+    if (this._peerIp.lastIndexOf(':') !== -1)
+      this._peerIp = this._peerIp.substring(this._peerIp.lastIndexOf(':') + 1);
   }
 
   get connected(): boolean {
@@ -78,8 +87,7 @@ export class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
   }
 
   peerIp() {
-    const address: any = this.socket.address();
-    return address.address;
+    return this._peerIp;
   }
 
   get writable() {