hl7v2-net 1.1.5 → 1.2.0

package/cjs/hl7-client.js

@@ -5,7 +5,8 @@ const tslib_1 = require("tslib");
 const node_net_1 = tslib_1.__importDefault(require("node:net"));
 const node_tls_1 = tslib_1.__importDefault(require("node:tls"));
 const node_events_async_1 = require("node-events-async");
-const h_l7_request_context_js_1 = require("./h-l7-request-context.js");
+const hl7_request_js_1 = require("./hl7-request.js");
+const hl7_response_js_1 = require("./hl7-response.js");
 const hl7_router_js_1 = require("./hl7-router.js");
 const hl7_socket_js_1 = require("./hl7-socket.js");
 class Hl7Client extends node_events_async_1.AsyncEventEmitter {
@@ -150,10 +151,11 @@ class Hl7Client extends node_events_async_1.AsyncEventEmitter {
         this._router.use(handler, priority);
     }
     _onMessage(message) {
-        const context = new h_l7_request_context_js_1.HL7RequestContext(this._socket, message);
-        this._router.handle(context, () => {
-            if (context.error)
-                this.emit('error', context.error);
+        const req = new hl7_request_js_1.HL7Request(this._socket, message);
+        const res = new hl7_response_js_1.HL7Response(req);
+        this._router.handle(req, res, () => {
+            if (res.errors.length)
+                this.emit('error', res.errors[0]);
         });
     }
 }

package/cjs/hl7-request.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HL7Request = void 0;
+class HL7Request {
+    constructor(socket, message) {
+        this.socket = socket;
+        this.message = message;
+    }
+    peerIp() {
+        return this.socket.peerIp();
+    }
+}
+exports.HL7Request = HL7Request;

package/cjs/hl7-response.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HL7Response = void 0;
+const hl7v2_1 = require("hl7v2");
+class HL7Response {
+    constructor(request) {
+        this._finished = false;
+        this.errors = [];
+        this.request = request;
+        this.message = request.message.createAck();
+        request.socket.once('send', () => {
+            this._finished = true;
+        });
+    }
+    get socket() {
+        return this.request.socket;
+    }
+    get finished() {
+        return this._finished;
+    }
+    failed(error) {
+        const msa = this.message.getSegment('MSA');
+        if (msa?.field(hl7v2_1.MSASegment.AcknowledgmentCode).getValue() !== 'AE')
+            this.message = this.request.message.createNak(this.errors);
+        this.errors.push(error);
+        this.message.addError(error);
+    }
+}
+exports.HL7Response = HL7Response;

package/cjs/hl7-router.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HL7Router = void 0;
-const tslib_1 = require("tslib");
-const node_process_1 = tslib_1.__importDefault(require("node:process"));
-const hl7v2_dictionary_1 = require("hl7v2-dictionary");
-const hl7_exchange_error_js_1 = require("./helpers/hl7-exchange-error.js");
 class HL7Router {
     constructor() {
         this._handlerStack = new Map();
@@ -20,7 +16,7 @@ class HL7Router {
         list.push(handler);
         this._needPrepare = true;
     }
-    handle(context, callback) {
+    handle(req, res, callback) {
         this._prepareStack(true);
         let handlerIdx = -1;
         let callbackCalled = false;
@@ -28,35 +24,35 @@ class HL7Router {
             if (callbackCalled)
                 return;
             callbackCalled = true;
-            context.removeListener('finish', onFinish);
             callback();
         };
-        const onFinish = () => doCallback();
-        context.once('finish', onFinish);
-        const next = (err) => {
-            if (context.finished)
-                return;
-            context.error = context.error || err;
+        const next = async () => {
             try {
                 handlerIdx++;
                 const handler = this._handlers[handlerIdx];
                 if (handler) {
-                    handler(context, next);
+                    if (handler.length < 3) {
+                        await handler(req, res);
+                        next();
+                        return;
+                    }
+                    handler(req, res, next);
                     return;
                 }
                 doCallback();
+                return;
             }
             catch (e) {
-                next(e);
+                res.failed(e);
+                return next();
             }
         };
-        next();
+        return next();
     }
-    _prepareStack(final) {
+    _prepareStack(root) {
         if (!this._needPrepare)
             return;
         this._needPrepare = false;
-        this._handlers = [];
         Array.from(this._handlerStack.keys())
             .sort()
             .forEach(p => {
@@ -70,23 +66,11 @@ class HL7Router {
                     this._handlers.push(h);
             }
         });
-        if (final) {
-            const finalHandler = (ctx) => {
-                if (ctx.finished)
+        if (root) {
+            const finalHandler = (req, res) => {
+                if (res.finished)
                     return;
-                const error = ctx.error ||
-                    new hl7_exchange_error_js_1.HL7ExchangeError('There is not handler to process this message', {
-                        request: ctx.request,
-                    });
-                const ack = ctx.request.createAck('AE', error);
-                if ((node_process_1.default?.env.NODE_ENV || '').startsWith('dev')) {
-                    const errSeg = ack.getSegment('ERR');
-                    if (errSeg)
-                        errSeg
-                            .field(hl7v2_dictionary_1.ERRSegment.DiagnosticInformation)
-                            .setValue(error.stack);
-                }
-                ctx.end(ack);
+                req.socket.sendMessage(res.message);
             };
             this._handlers.push(finalHandler);
         }

package/cjs/hl7-server.js

@@ -4,9 +4,12 @@ exports.HL7Server = void 0;
 const tslib_1 = require("tslib");
 const node_net_1 = tslib_1.__importDefault(require("node:net"));
 const node_tls_1 = tslib_1.__importDefault(require("node:tls"));
+const hl7v2_1 = require("hl7v2");
 const node_events_async_1 = require("node-events-async");
-const h_l7_request_context_js_1 = require("./h-l7-request-context.js");
+const uid_1 = require("uid");
 const hl7_exchange_error_js_1 = require("./helpers/hl7-exchange-error.js");
+const hl7_request_js_1 = require("./hl7-request.js");
+const hl7_response_js_1 = require("./hl7-response.js");
 const hl7_router_js_1 = require("./hl7-router.js");
 const hl7_socket_js_1 = require("./hl7-socket.js");
 class HL7Server extends node_events_async_1.AsyncEventEmitter {
@@ -196,21 +199,23 @@ class HL7Server extends node_events_async_1.AsyncEventEmitter {
     }
     _onMessage(message, socket) {
         const waitPromise = new Promise(resolve => {
-            const context = new h_l7_request_context_js_1.HL7RequestContext(socket, message);
+            if (!message.header.field(hl7v2_1.MSHSegment.MessageControlID).getValue())
+                message.header.field(hl7v2_1.MSHSegment.MessageControlID).setValue((0, uid_1.uid)(8));
+            const req = new hl7_request_js_1.HL7Request(socket, message);
+            const res = new hl7_response_js_1.HL7Response(req);
             const timeoutTimer = setTimeout(() => {
                 try {
-                    const error = new hl7_exchange_error_js_1.HL7ExchangeError('Response timeout');
-                    const ack = context.request.createAck('AE', error);
-                    context.end(ack);
+                    res.failed(new hl7_exchange_error_js_1.HL7ExchangeError('Response timeout'));
+                    res.socket.sendMessage(res.message);
                 }
                 finally {
                     resolve();
                 }
             }, this.responseTimeout || 30000).unref();
-            this._router.handle(context, () => {
+            this._router.handle(req, res, () => {
                 clearTimeout(timeoutTimer);
-                if (context.error)
-                    this.emit('error', context.error, socket);
+                if (res.errors.length)
+                    this.emit('error', res.errors[0], socket);
                 resolve();
             });
         });

package/cjs/hl7-socket.js

@@ -56,9 +56,9 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
     address() {
         return this.socket.address();
     }
-    uri() {
+    peerIp() {
         const address = this.socket.address();
-        return address.address + ':' + address.port;
+        return address.address;
     }
     get writable() {
         return this.connected && this.socket.writable;
@@ -101,7 +101,7 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
             const buf = iconv_lite_1.default.encode(str, encoding);
             this.socket.write(hl7v2_1.VT);
             this.socket.write(buf);
-            this.socket.end(hl7v2_1.FS + hl7v2_1.CR);
+            this.socket.write(hl7v2_1.FS + hl7v2_1.CR);
             this.emit('send', message);
         }
         catch (err) {

package/cjs/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./h-l7-request-context.js"), exports);
 tslib_1.__exportStar(require("./helpers/hl7-exchange-error.js"), exports);
 tslib_1.__exportStar(require("./hl7-client.js"), exports);
+tslib_1.__exportStar(require("./hl7-request.js"), exports);
+tslib_1.__exportStar(require("./hl7-response.js"), exports);
 tslib_1.__exportStar(require("./hl7-router.js"), exports);
 tslib_1.__exportStar(require("./hl7-server.js"), exports);
 tslib_1.__exportStar(require("./hl7-socket.js"), exports);

package/esm/hl7-client.js

@@ -1,7 +1,8 @@
 import net from 'node:net';
 import tls from 'node:tls';
 import { AsyncEventEmitter } from 'node-events-async';
-import { HL7RequestContext } from './h-l7-request-context.js';
+import { HL7Request } from './hl7-request.js';
+import { HL7Response } from './hl7-response.js';
 import { HL7Router } from './hl7-router.js';
 import { HL7Socket } from './hl7-socket.js';
 export class Hl7Client extends AsyncEventEmitter {
@@ -146,10 +147,11 @@ export class Hl7Client extends AsyncEventEmitter {
         this._router.use(handler, priority);
     }
     _onMessage(message) {
-        const context = new HL7RequestContext(this._socket, message);
-        this._router.handle(context, () => {
-            if (context.error)
-                this.emit('error', context.error);
+        const req = new HL7Request(this._socket, message);
+        const res = new HL7Response(req);
+        this._router.handle(req, res, () => {
+            if (res.errors.length)
+                this.emit('error', res.errors[0]);
         });
     }
 }

package/esm/hl7-request.js

@@ -0,0 +1,9 @@
+export class HL7Request {
+    constructor(socket, message) {
+        this.socket = socket;
+        this.message = message;
+    }
+    peerIp() {
+        return this.socket.peerIp();
+    }
+}

package/esm/hl7-response.js

@@ -0,0 +1,25 @@
+import { MSASegment } from 'hl7v2';
+export class HL7Response {
+    constructor(request) {
+        this._finished = false;
+        this.errors = [];
+        this.request = request;
+        this.message = request.message.createAck();
+        request.socket.once('send', () => {
+            this._finished = true;
+        });
+    }
+    get socket() {
+        return this.request.socket;
+    }
+    get finished() {
+        return this._finished;
+    }
+    failed(error) {
+        const msa = this.message.getSegment('MSA');
+        if (msa?.field(MSASegment.AcknowledgmentCode).getValue() !== 'AE')
+            this.message = this.request.message.createNak(this.errors);
+        this.errors.push(error);
+        this.message.addError(error);
+    }
+}

package/esm/hl7-router.js

@@ -1,6 +1,3 @@
-import process from 'node:process';
-import { ERRSegment } from 'hl7v2-dictionary';
-import { HL7ExchangeError } from './helpers/hl7-exchange-error.js';
 export class HL7Router {
     constructor() {
         this._handlerStack = new Map();
@@ -16,7 +13,7 @@ export class HL7Router {
         list.push(handler);
         this._needPrepare = true;
     }
-    handle(context, callback) {
+    handle(req, res, callback) {
         this._prepareStack(true);
         let handlerIdx = -1;
         let callbackCalled = false;
@@ -24,35 +21,35 @@ export class HL7Router {
             if (callbackCalled)
                 return;
             callbackCalled = true;
-            context.removeListener('finish', onFinish);
             callback();
         };
-        const onFinish = () => doCallback();
-        context.once('finish', onFinish);
-        const next = (err) => {
-            if (context.finished)
-                return;
-            context.error = context.error || err;
+        const next = async () => {
             try {
                 handlerIdx++;
                 const handler = this._handlers[handlerIdx];
                 if (handler) {
-                    handler(context, next);
+                    if (handler.length < 3) {
+                        await handler(req, res);
+                        next();
+                        return;
+                    }
+                    handler(req, res, next);
                     return;
                 }
                 doCallback();
+                return;
             }
             catch (e) {
-                next(e);
+                res.failed(e);
+                return next();
             }
         };
-        next();
+        return next();
     }
-    _prepareStack(final) {
+    _prepareStack(root) {
         if (!this._needPrepare)
             return;
         this._needPrepare = false;
-        this._handlers = [];
         Array.from(this._handlerStack.keys())
             .sort()
             .forEach(p => {
@@ -66,23 +63,11 @@ export class HL7Router {
                     this._handlers.push(h);
             }
         });
-        if (final) {
-            const finalHandler = (ctx) => {
-                if (ctx.finished)
+        if (root) {
+            const finalHandler = (req, res) => {
+                if (res.finished)
                     return;
-                const error = ctx.error ||
-                    new HL7ExchangeError('There is not handler to process this message', {
-                        request: ctx.request,
-                    });
-                const ack = ctx.request.createAck('AE', error);
-                if ((process?.env.NODE_ENV || '').startsWith('dev')) {
-                    const errSeg = ack.getSegment('ERR');
-                    if (errSeg)
-                        errSeg
-                            .field(ERRSegment.DiagnosticInformation)
-                            .setValue(error.stack);
-                }
-                ctx.end(ack);
+                req.socket.sendMessage(res.message);
             };
             this._handlers.push(finalHandler);
         }

package/esm/hl7-server.js

@@ -1,8 +1,11 @@
 import net from 'node:net';
 import tls from 'node:tls';
+import { MSHSegment } from 'hl7v2';
 import { AsyncEventEmitter } from 'node-events-async';
-import { HL7RequestContext } from './h-l7-request-context.js';
+import { uid } from 'uid';
 import { HL7ExchangeError } from './helpers/hl7-exchange-error.js';
+import { HL7Request } from './hl7-request.js';
+import { HL7Response } from './hl7-response.js';
 import { HL7Router } from './hl7-router.js';
 import { HL7Socket } from './hl7-socket.js';
 export class HL7Server extends AsyncEventEmitter {
@@ -192,21 +195,23 @@ export class HL7Server extends AsyncEventEmitter {
     }
     _onMessage(message, socket) {
         const waitPromise = new Promise(resolve => {
-            const context = new HL7RequestContext(socket, message);
+            if (!message.header.field(MSHSegment.MessageControlID).getValue())
+                message.header.field(MSHSegment.MessageControlID).setValue(uid(8));
+            const req = new HL7Request(socket, message);
+            const res = new HL7Response(req);
             const timeoutTimer = setTimeout(() => {
                 try {
-                    const error = new HL7ExchangeError('Response timeout');
-                    const ack = context.request.createAck('AE', error);
-                    context.end(ack);
+                    res.failed(new HL7ExchangeError('Response timeout'));
+                    res.socket.sendMessage(res.message);
                 }
                 finally {
                     resolve();
                 }
             }, this.responseTimeout || 30000).unref();
-            this._router.handle(context, () => {
+            this._router.handle(req, res, () => {
                 clearTimeout(timeoutTimer);
-                if (context.error)
-                    this.emit('error', context.error, socket);
+                if (res.errors.length)
+                    this.emit('error', res.errors[0], socket);
                 resolve();
             });
         });

package/esm/hl7-socket.js

@@ -52,9 +52,9 @@ export class HL7Socket extends AsyncEventEmitter {
     address() {
         return this.socket.address();
     }
-    uri() {
+    peerIp() {
         const address = this.socket.address();
-        return address.address + ':' + address.port;
+        return address.address;
     }
     get writable() {
         return this.connected && this.socket.writable;
@@ -97,7 +97,7 @@ export class HL7Socket extends AsyncEventEmitter {
             const buf = iconv.encode(str, encoding);
             this.socket.write(VT);
             this.socket.write(buf);
-            this.socket.end(FS + CR);
+            this.socket.write(FS + CR);
             this.emit('send', message);
         }
         catch (err) {

package/esm/index.js

@@ -1,6 +1,7 @@
-export * from './h-l7-request-context.js';
 export * from './helpers/hl7-exchange-error.js';
 export * from './hl7-client.js';
+export * from './hl7-request.js';
+export * from './hl7-response.js';
 export * from './hl7-router.js';
 export * from './hl7-server.js';
 export * from './hl7-socket.js';

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "hl7v2-net",
   "description": "HL7 v2 server/client for NodeJS",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "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.5",
-    "hl7v2-dictionary": "^1.1.5"
+    "hl7v2": "^1.2.0",
+    "hl7v2-dictionary": "^1.2.0"
   },
   "type": "module",
   "exports": {

package/types/hl7-request.d.ts

@@ -0,0 +1,8 @@
+import type { HL7Message } from 'hl7v2';
+import type { HL7Socket } from './hl7-socket.js';
+export declare class HL7Request {
+    readonly socket: HL7Socket;
+    readonly message: HL7Message;
+    constructor(socket: HL7Socket, message: HL7Message);
+    peerIp(): any;
+}

package/types/hl7-response.d.ts

@@ -0,0 +1,13 @@
+import { HL7Message } from 'hl7v2';
+import type { HL7Request } from './hl7-request.js';
+import type { HL7Socket } from './hl7-socket.js';
+export declare class HL7Response {
+    protected _finished: boolean;
+    readonly request: HL7Request;
+    errors: Error[];
+    message: HL7Message;
+    constructor(request: HL7Request);
+    get socket(): HL7Socket;
+    get finished(): boolean;
+    failed(error: Error): void;
+}

package/types/hl7-router.d.ts

@@ -1,10 +1,11 @@
-import type { HL7RequestContext } from './h-l7-request-context.js';
-import { HL7Middleware } from './types.js';
+import { HL7Request } from './hl7-request.js';
+import { HL7Response } from './hl7-response.js';
+import type { HL7Middleware } from './types.js';
 export declare class HL7Router {
-    protected _handlerStack: Map<number, (HL7Router | HL7Middleware)[]>;
+    protected _handlerStack: Map<number, (HL7Middleware | HL7Router)[]>;
     protected _needPrepare: boolean;
     protected _handlers: HL7Middleware[];
     use(handler: HL7Middleware | HL7Router, priority?: number): void;
-    handle(context: HL7RequestContext, callback: () => void): void;
-    protected _prepareStack(final?: boolean): void;
+    handle(req: HL7Request, res: HL7Response, callback: () => void): void | Promise<void>;
+    protected _prepareStack(root?: boolean): void;
 }

package/types/hl7-socket.d.ts

@@ -22,7 +22,7 @@ export declare class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
     get maxBufferSize(): number;
     set maxBufferSize(value: number);
     address(): {} | import("net").AddressInfo;
-    uri(): string;
+    peerIp(): any;
     get writable(): boolean;
     close(waitRunningHandlers?: number): Promise<void>;
     sendMessage(message: HL7Message): void;

package/types/index.d.cts

@@ -1,6 +1,7 @@
-export * from './h-l7-request-context.js';
 export * from './helpers/hl7-exchange-error.js';
 export * from './hl7-client.js';
+export * from './hl7-request.js';
+export * from './hl7-response.js';
 export * from './hl7-router.js';
 export * from './hl7-server.js';
 export * from './hl7-socket.js';

package/types/index.d.ts

@@ -1,6 +1,7 @@
-export * from './h-l7-request-context.js';
 export * from './helpers/hl7-exchange-error.js';
 export * from './hl7-client.js';
+export * from './hl7-request.js';
+export * from './hl7-response.js';
 export * from './hl7-router.js';
 export * from './hl7-server.js';
 export * from './hl7-socket.js';

package/types/types.d.ts

@@ -1,3 +1,4 @@
-import type { HL7RequestContext } from './h-l7-request-context.js';
-export type NextFunction = (error?: Error) => void;
-export type HL7Middleware = (context: HL7RequestContext, next: NextFunction) => void;
+import { HL7Request } from './hl7-request.js';
+import { HL7Response } from './hl7-response.js';
+export type NextFunction = () => void | Promise<void>;
+export type HL7Middleware = ((req: HL7Request, res: HL7Response) => void) | ((req: HL7Request, res: HL7Response) => Promise<void>) | ((req: HL7Request, res: HL7Response, next: NextFunction) => void);

package/cjs/h-l7-request-context.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HL7RequestContext = void 0;
-const hl7v2_1 = require("hl7v2");
-const node_events_async_1 = require("node-events-async");
-const uid_1 = require("uid");
-class HL7RequestContext extends node_events_async_1.AsyncEventEmitter {
-    constructor(socket, message) {
-        super();
-        this._finished = false;
-        this.socket = socket;
-        this.request = message;
-        if (!message.header.field(hl7v2_1.MSHSegment.MessageControlID).getValue())
-            message.header.field(hl7v2_1.MSHSegment.MessageControlID).setValue((0, uid_1.uid)(8));
-    }
-    get finished() {
-        return this._finished || !this.socket.connected;
-    }
-    end(message) {
-        if (this.finished || !this.socket.connected)
-            return;
-        if (message)
-            this.socket.sendMessage(message);
-        this._finished = true;
-        this.emit('finish', message);
-    }
-}
-exports.HL7RequestContext = HL7RequestContext;

package/esm/h-l7-request-context.js

@@ -1,24 +0,0 @@
-import { MSHSegment } from 'hl7v2';
-import { AsyncEventEmitter } from 'node-events-async';
-import { uid } from 'uid';
-export class HL7RequestContext extends AsyncEventEmitter {
-    constructor(socket, message) {
-        super();
-        this._finished = false;
-        this.socket = socket;
-        this.request = message;
-        if (!message.header.field(MSHSegment.MessageControlID).getValue())
-            message.header.field(MSHSegment.MessageControlID).setValue(uid(8));
-    }
-    get finished() {
-        return this._finished || !this.socket.connected;
-    }
-    end(message) {
-        if (this.finished || !this.socket.connected)
-            return;
-        if (message)
-            this.socket.sendMessage(message);
-        this._finished = true;
-        this.emit('finish', message);
-    }
-}

package/types/h-l7-request-context.d.ts

@@ -1,12 +0,0 @@
-import { HL7Message } from 'hl7v2';
-import { AsyncEventEmitter } from 'node-events-async';
-import { HL7Socket } from './hl7-socket.js';
-export declare class HL7RequestContext extends AsyncEventEmitter {
-    protected _finished: boolean;
-    readonly socket: HL7Socket;
-    readonly request: HL7Message;
-    error?: Error;
-    constructor(socket: HL7Socket, message: HL7Message);
-    get finished(): boolean;
-    end(message?: HL7Message): void;
-}