hl7v2-net 1.1.4 → 1.1.6

package/cjs/hl7-client.js

@@ -40,9 +40,26 @@ class Hl7Client extends node_events_async_1.AsyncEventEmitter {
     get connected() {
         return this._socket?.connected ?? false;
     }
+    get closed() {
+        return this._socket?.closed ?? true;
+    }
     get readyState() {
         return this._socket?.readyState || 'closed';
     }
+    get uri() {
+        return this._options.host + ':' + this._options.port;
+    }
+    address() {
+        const out = this._socket?.address();
+        if (!out?.address) {
+            return {
+                address: this._options.host || '',
+                port: this._options.port || 0,
+                family: 'tcp',
+            };
+        }
+        return out;
+    }
     get connectTimeout() {
         return this._options.connectTimeout;
     }
@@ -76,17 +93,17 @@ class Hl7Client extends node_events_async_1.AsyncEventEmitter {
             const socket = (this._socket = new hl7_socket_js_1.HL7Socket(tcpSocket, this._options));
             socket.on('connect', () => this.emit('connect'));
             socket.on('ready', () => this.emit('ready'));
-            socket.on('lookup', listener => this.emit('lookup', listener));
+            socket.on('lookup', (err, address, family, host) => this.emit('lookup', err, address, family, host));
             socket.on('close', () => {
                 this._socket = undefined;
                 this.emit('close');
             });
             socket.on('error', err => this.emit('error', err));
             socket.on('message', message => {
-                this.emit('message', message, socket);
+                this.emit('message', message);
                 this._onMessage(message);
             });
-            socket.on('send', message => this.emit('send', message, socket));
+            socket.on('send', message => this.emit('send', message));
             const onReady = () => {
                 clearTimeout(timeoutTimer);
                 tcpSocket.removeListener('error', onError);

package/cjs/hl7-socket.js

@@ -23,7 +23,7 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
         socket.pipe(frameStream);
         socket.on('connect', () => this.emit('connect'));
         socket.on('ready', () => this.emit('ready'));
-        socket.on('lookup', listener => this.emit('lookup', listener));
+        socket.on('lookup', (err, address, family, host) => this.emit('lookup', err, address, family, host));
         socket.on('timeout', () => socket.destroy());
         socket.on('close', () => {
             this.emit('close');
@@ -56,6 +56,10 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
     address() {
         return this.socket.address();
     }
+    uri() {
+        const address = this.socket.address();
+        return address.address + ':' + address.port;
+    }
     get writable() {
         return this.connected && this.socket.writable;
     }
@@ -98,7 +102,7 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
             this.socket.write(hl7v2_1.VT);
             this.socket.write(buf);
             this.socket.end(hl7v2_1.FS + hl7v2_1.CR);
-            this.emit('send', message, this.socket);
+            this.emit('send', message);
         }
         catch (err) {
             this.emit('error', err);

package/esm/hl7-client.js

@@ -36,9 +36,26 @@ export class Hl7Client extends AsyncEventEmitter {
     get connected() {
         return this._socket?.connected ?? false;
     }
+    get closed() {
+        return this._socket?.closed ?? true;
+    }
     get readyState() {
         return this._socket?.readyState || 'closed';
     }
+    get uri() {
+        return this._options.host + ':' + this._options.port;
+    }
+    address() {
+        const out = this._socket?.address();
+        if (!out?.address) {
+            return {
+                address: this._options.host || '',
+                port: this._options.port || 0,
+                family: 'tcp',
+            };
+        }
+        return out;
+    }
     get connectTimeout() {
         return this._options.connectTimeout;
     }
@@ -72,17 +89,17 @@ export class Hl7Client extends AsyncEventEmitter {
             const socket = (this._socket = new HL7Socket(tcpSocket, this._options));
             socket.on('connect', () => this.emit('connect'));
             socket.on('ready', () => this.emit('ready'));
-            socket.on('lookup', listener => this.emit('lookup', listener));
+            socket.on('lookup', (err, address, family, host) => this.emit('lookup', err, address, family, host));
             socket.on('close', () => {
                 this._socket = undefined;
                 this.emit('close');
             });
             socket.on('error', err => this.emit('error', err));
             socket.on('message', message => {
-                this.emit('message', message, socket);
+                this.emit('message', message);
                 this._onMessage(message);
             });
-            socket.on('send', message => this.emit('send', message, socket));
+            socket.on('send', message => this.emit('send', message));
             const onReady = () => {
                 clearTimeout(timeoutTimer);
                 tcpSocket.removeListener('error', onError);

package/esm/hl7-socket.js

@@ -19,7 +19,7 @@ export class HL7Socket extends AsyncEventEmitter {
         socket.pipe(frameStream);
         socket.on('connect', () => this.emit('connect'));
         socket.on('ready', () => this.emit('ready'));
-        socket.on('lookup', listener => this.emit('lookup', listener));
+        socket.on('lookup', (err, address, family, host) => this.emit('lookup', err, address, family, host));
         socket.on('timeout', () => socket.destroy());
         socket.on('close', () => {
             this.emit('close');
@@ -52,6 +52,10 @@ export class HL7Socket extends AsyncEventEmitter {
     address() {
         return this.socket.address();
     }
+    uri() {
+        const address = this.socket.address();
+        return address.address + ':' + address.port;
+    }
     get writable() {
         return this.connected && this.socket.writable;
     }
@@ -94,7 +98,7 @@ export class HL7Socket extends AsyncEventEmitter {
             this.socket.write(VT);
             this.socket.write(buf);
             this.socket.end(FS + CR);
-            this.emit('send', message, this.socket);
+            this.emit('send', message);
         }
         catch (err) {
             this.emit('error', err);

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "hl7v2-net",
   "description": "HL7 v2 server/client for NodeJS",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@jsopen/objects": "^2.0.2",
-    "iconv-lite": "^0.6.3",
+    "iconv-lite": "^0.7.0",
     "is-typedarray": "^1.0.0",
     "node-events-async": "^1.2.0",
     "ts-gems": "^3.11.3",
@@ -15,8 +15,8 @@
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2": "^1.1.4",
-    "hl7v2-dictionary": "^1.1.4"
+    "hl7v2": "^1.1.6",
+    "hl7v2-dictionary": "^1.1.6"
   },
   "type": "module",
   "exports": {

package/types/hl7-client.d.ts

@@ -1,6 +1,7 @@
 import net from 'node:net';
 import tls from 'node:tls';
 import { HL7Message } from 'hl7v2';
+import { AddressInfo } from 'net';
 import { AsyncEventEmitter } from 'node-events-async';
 import { StrictOmit } from 'ts-gems';
 import { HL7Router } from './hl7-router.js';
@@ -28,7 +29,10 @@ export declare class Hl7Client extends AsyncEventEmitter<Hl7Client.Events> {
      */
     protected constructor(options: Hl7Client.NetConnectOptions | Hl7Client.TlsConnectOptions);
     get connected(): boolean;
+    get closed(): boolean;
     get readyState(): net.SocketReadyState;
+    get uri(): string;
+    address(): AddressInfo;
     get connectTimeout(): number | undefined;
     set connectTimeout(value: number | null);
     get responseTimeout(): number | undefined;

package/types/hl7-socket.d.ts

@@ -3,7 +3,7 @@ import { HL7Message } from 'hl7v2';
 import { Socket } from 'net';
 import { AsyncEventEmitter } from 'node-events-async';
 import { FrameStream } from './helpers/frame-stream.js';
-export declare class HL7Socket extends AsyncEventEmitter {
+export declare class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
     readonly socket: Socket;
     protected _messageHooks: Set<(resp: HL7Message) => boolean>;
     protected _frameStream: FrameStream;
@@ -22,6 +22,7 @@ export declare class HL7Socket extends AsyncEventEmitter {
     get maxBufferSize(): number;
     set maxBufferSize(value: number);
     address(): {} | import("net").AddressInfo;
+    uri(): string;
     get writable(): boolean;
     close(waitRunningHandlers?: number): Promise<void>;
     sendMessage(message: HL7Message): void;
@@ -36,10 +37,13 @@ export declare namespace HL7Socket {
         close: [];
         error: [error: Error];
         lookup: [
-            listener: (err: Error, address: string, family: string | number, host: string) => void
+            err: Error,
+            address: string,
+            family: string | number,
+            host: string
         ];
-        message: [message: HL7Message, socket: HL7Socket];
-        send: [message: HL7Message, socket: HL7Socket];
+        message: [message: HL7Message];
+        send: [message: HL7Message];
     }
     interface Options {
         responseTimeout?: number;