Merge pull request #46 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.1.4",
+  "version": "1.1.5",
   "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.1.4",
+  "version": "1.1.5",
   "author": "Panates",
   "license": "MIT",
   "private": true,
@@ -16,7 +16,7 @@
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2-dictionary": "^1.1.4"
+    "hl7v2-dictionary": "^1.1.5"
   },
   "devDependencies": {
     "expect": "^30.0.5"

packages/net/package.json

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

packages/net/src/hl7-client.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 { HL7RequestContext } from './h-l7-request-context.js';
@@ -50,10 +51,30 @@ export class Hl7Client extends AsyncEventEmitter<Hl7Client.Events> {
     return this._socket?.connected ?? false;
   }
 
+  get closed(): boolean {
+    return this._socket?.closed ?? true;
+  }
+
   get readyState() {
     return this._socket?.readyState || 'closed';
   }
 
+  get uri(): string {
+    return this._options.host + ':' + this._options.port;
+  }
+
+  address(): AddressInfo {
+    const out = this._socket?.address();
+    if (!(out as any)?.address) {
+      return {
+        address: this._options.host || '',
+        port: this._options.port || 0,
+        family: 'tcp',
+      } satisfies AddressInfo;
+    }
+    return out as AddressInfo;
+  }
+
   get connectTimeout(): number | undefined {
     return this._options.connectTimeout;
   }
@@ -93,17 +114,19 @@ export class Hl7Client extends AsyncEventEmitter<Hl7Client.Events> {
 
       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);

packages/net/src/hl7-socket.ts

@@ -5,7 +5,7 @@ import { Socket } from 'net';
 import { AsyncEventEmitter } from 'node-events-async';
 import { FrameStream } from './helpers/frame-stream.js';
 
-export class HL7Socket extends AsyncEventEmitter {
+export class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
   readonly socket: Socket;
   protected _messageHooks = new Set<(resp: HL7Message) => boolean>();
   protected _frameStream: FrameStream;
@@ -32,7 +32,9 @@ 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');
@@ -71,6 +73,11 @@ export class HL7Socket extends AsyncEventEmitter {
     return this.socket.address();
   }
 
+  uri() {
+    const address: any = this.socket.address();
+    return address.address + ':' + address.port;
+  }
+
   get writable() {
     return this.connected && this.socket.writable;
   }
@@ -112,7 +119,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: any) {
       this.emit('error', err);
       throw err;
@@ -189,15 +196,13 @@ export 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];
   }
 
   export interface Options {