hl7v2-net 1.2.3 → 1.2.4

package/cjs/hl7-client.js

@@ -56,7 +56,7 @@ class Hl7Client extends node_events_async_1.AsyncEventEmitter {
             return {
                 address: this._options.host || '',
                 port: this._options.port || 0,
-                family: 'tcp',
+                family: '',
             };
         }
         return out;

package/cjs/hl7-socket.js

@@ -19,7 +19,12 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
             maxBufferSize: options?.maxBufferSize,
         });
         this._frameStream = frameStream;
-        socket.on('error', err => this.emit('error', err));
+        socket.on('error', (err) => {
+            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'));
@@ -32,6 +37,9 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
             this.emit('data', data);
             this._onData(data);
         });
+        this._peerIp = socket.address()?.address || '';
+        if (this._peerIp.lastIndexOf(':') !== -1)
+            this._peerIp = this._peerIp.substring(this._peerIp.lastIndexOf(':') + 1);
     }
     get connected() {
         return !this.socket.closed;
@@ -52,8 +60,7 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
         return this.socket.address();
     }
     peerIp() {
-        const address = this.socket.address();
-        return address.address;
+        return this._peerIp;
     }
     get writable() {
         return this.connected && this.socket.writable;

package/esm/hl7-client.js

@@ -52,7 +52,7 @@ export class Hl7Client extends AsyncEventEmitter {
             return {
                 address: this._options.host || '',
                 port: this._options.port || 0,
-                family: 'tcp',
+                family: '',
             };
         }
         return out;

package/esm/hl7-socket.js

@@ -15,7 +15,12 @@ export class HL7Socket extends AsyncEventEmitter {
             maxBufferSize: options?.maxBufferSize,
         });
         this._frameStream = frameStream;
-        socket.on('error', err => this.emit('error', err));
+        socket.on('error', (err) => {
+            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'));
@@ -28,6 +33,9 @@ export class HL7Socket extends AsyncEventEmitter {
             this.emit('data', data);
             this._onData(data);
         });
+        this._peerIp = socket.address()?.address || '';
+        if (this._peerIp.lastIndexOf(':') !== -1)
+            this._peerIp = this._peerIp.substring(this._peerIp.lastIndexOf(':') + 1);
     }
     get connected() {
         return !this.socket.closed;
@@ -48,8 +56,7 @@ export class HL7Socket extends AsyncEventEmitter {
         return this.socket.address();
     }
     peerIp() {
-        const address = this.socket.address();
-        return address.address;
+        return this._peerIp;
     }
     get writable() {
         return this.connected && this.socket.writable;

package/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",
   "dependencies": {
@@ -15,8 +15,8 @@
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2": "^1.2.3",
-    "hl7v2-dictionary": "^1.2.3"
+    "hl7v2": "^1.2.4",
+    "hl7v2-dictionary": "^1.2.4"
   },
   "type": "module",
   "exports": {

package/types/hl7-request.d.ts

@@ -4,5 +4,5 @@ export declare class HL7Request {
     readonly socket: HL7Socket;
     readonly message: HL7Message;
     constructor(socket: HL7Socket, message: HL7Message);
-    peerIp(): any;
+    peerIp(): string;
 }

package/types/hl7-socket.d.ts

@@ -9,6 +9,7 @@ export declare class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
     protected _frameStream: FrameStream;
     protected _waitPromises: Set<Promise<any>>;
     protected _options: HL7Socket.Options;
+    protected _peerIp: string;
     responseTimeout?: number;
     /**
      * User defined property
@@ -22,7 +23,7 @@ export declare class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
     get maxBufferSize(): number;
     set maxBufferSize(value: number);
     address(): {} | import("net").AddressInfo;
-    peerIp(): any;
+    peerIp(): string;
     get writable(): boolean;
     close(waitRunningHandlers?: number): Promise<void>;
     sendMessage(message: HL7Message): void;