hl7v2-net 1.2.2 → 1.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/cjs/hl7-client.js +1 -1
  2. package/cjs/hl7-socket.js +21 -7
  3. package/esm/hl7-client.js +1 -1
  4. package/esm/hl7-socket.js +21 -7
  5. package/package.json +3 -3
  6. package/types/hl7-request.d.ts +1 -1
  7. package/types/hl7-socket.d.ts +2 -1
package/cjs/hl7-client.js CHANGED
@@ -56,7 +56,7 @@ class Hl7Client extends node_events_async_1.AsyncEventEmitter {
56
56
  return {
57
57
  address: this._options.host || '',
58
58
  port: this._options.port || 0,
59
- family: 'tcp',
59
+ family: '',
60
60
  };
61
61
  }
62
62
  return out;
package/cjs/hl7-socket.js CHANGED
@@ -19,7 +19,12 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
19
19
  maxBufferSize: options?.maxBufferSize,
20
20
  });
21
21
  this._frameStream = frameStream;
22
- socket.on('error', err => this.emit('error', err));
22
+ socket.on('error', (err) => {
23
+ if (err.code === 'ECONNRESET') {
24
+ err.message = `Connection reset by peer`;
25
+ }
26
+ this.emit('error', err);
27
+ });
23
28
  socket.pipe(frameStream);
24
29
  socket.on('connect', () => this.emit('connect'));
25
30
  socket.on('ready', () => this.emit('ready'));
@@ -32,6 +37,9 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
32
37
  this.emit('data', data);
33
38
  this._onData(data);
34
39
  });
40
+ this._peerIp = socket.address()?.address || '';
41
+ if (this._peerIp.lastIndexOf(':') !== -1)
42
+ this._peerIp = this._peerIp.substring(this._peerIp.lastIndexOf(':') + 1);
35
43
  }
36
44
  get connected() {
37
45
  return !this.socket.closed;
@@ -52,8 +60,7 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
52
60
  return this.socket.address();
53
61
  }
54
62
  peerIp() {
55
- const address = this.socket.address();
56
- return address.address;
63
+ return this._peerIp;
57
64
  }
58
65
  get writable() {
59
66
  return this.connected && this.socket.writable;
@@ -87,10 +94,17 @@ class HL7Socket extends node_events_async_1.AsyncEventEmitter {
87
94
  throw new Error('Socket is not connected');
88
95
  if (!this.socket.writable)
89
96
  throw new Error('Socket is not writable');
90
- let encoding = message.header.field(hl7v2_1.MSHSegment.CharacterSet).getValue();
91
- if (!encoding) {
92
- encoding = 'UTF-8';
93
- message.header.field(hl7v2_1.MSHSegment.CharacterSet).setValue(encoding);
97
+ let charset = message.header.field(hl7v2_1.MSHSegment.CharacterSet).getValue();
98
+ if (!charset) {
99
+ charset = 'UNICODE UTF-8';
100
+ message.header.field(hl7v2_1.MSHSegment.CharacterSet).setValue(charset);
101
+ }
102
+ let encoding = hl7v2_1.HL7Message.encodingMapping[charset] || charset || 'utf-8';
103
+ try {
104
+ iconv_lite_1.default.getEncoder(charset);
105
+ }
106
+ catch {
107
+ encoding = 'utf-8';
94
108
  }
95
109
  const str = message.toHL7String();
96
110
  const buf = iconv_lite_1.default.encode(str, encoding);
package/esm/hl7-client.js CHANGED
@@ -52,7 +52,7 @@ export class Hl7Client extends AsyncEventEmitter {
52
52
  return {
53
53
  address: this._options.host || '',
54
54
  port: this._options.port || 0,
55
- family: 'tcp',
55
+ family: '',
56
56
  };
57
57
  }
58
58
  return out;
package/esm/hl7-socket.js CHANGED
@@ -15,7 +15,12 @@ export class HL7Socket extends AsyncEventEmitter {
15
15
  maxBufferSize: options?.maxBufferSize,
16
16
  });
17
17
  this._frameStream = frameStream;
18
- socket.on('error', err => this.emit('error', err));
18
+ socket.on('error', (err) => {
19
+ if (err.code === 'ECONNRESET') {
20
+ err.message = `Connection reset by peer`;
21
+ }
22
+ this.emit('error', err);
23
+ });
19
24
  socket.pipe(frameStream);
20
25
  socket.on('connect', () => this.emit('connect'));
21
26
  socket.on('ready', () => this.emit('ready'));
@@ -28,6 +33,9 @@ export class HL7Socket extends AsyncEventEmitter {
28
33
  this.emit('data', data);
29
34
  this._onData(data);
30
35
  });
36
+ this._peerIp = socket.address()?.address || '';
37
+ if (this._peerIp.lastIndexOf(':') !== -1)
38
+ this._peerIp = this._peerIp.substring(this._peerIp.lastIndexOf(':') + 1);
31
39
  }
32
40
  get connected() {
33
41
  return !this.socket.closed;
@@ -48,8 +56,7 @@ export class HL7Socket extends AsyncEventEmitter {
48
56
  return this.socket.address();
49
57
  }
50
58
  peerIp() {
51
- const address = this.socket.address();
52
- return address.address;
59
+ return this._peerIp;
53
60
  }
54
61
  get writable() {
55
62
  return this.connected && this.socket.writable;
@@ -83,10 +90,17 @@ export class HL7Socket extends AsyncEventEmitter {
83
90
  throw new Error('Socket is not connected');
84
91
  if (!this.socket.writable)
85
92
  throw new Error('Socket is not writable');
86
- let encoding = message.header.field(MSHSegment.CharacterSet).getValue();
87
- if (!encoding) {
88
- encoding = 'UTF-8';
89
- message.header.field(MSHSegment.CharacterSet).setValue(encoding);
93
+ let charset = message.header.field(MSHSegment.CharacterSet).getValue();
94
+ if (!charset) {
95
+ charset = 'UNICODE UTF-8';
96
+ message.header.field(MSHSegment.CharacterSet).setValue(charset);
97
+ }
98
+ let encoding = HL7Message.encodingMapping[charset] || charset || 'utf-8';
99
+ try {
100
+ iconv.getEncoder(charset);
101
+ }
102
+ catch {
103
+ encoding = 'utf-8';
90
104
  }
91
105
  const str = message.toHL7String();
92
106
  const buf = iconv.encode(str, encoding);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "hl7v2-net",
3
3
  "description": "HL7 v2 server/client for NodeJS",
4
- "version": "1.2.2",
4
+ "version": "1.2.4",
5
5
  "author": "Panates",
6
6
  "license": "MIT",
7
7
  "dependencies": {
@@ -15,8 +15,8 @@
15
15
  "uid": "^2.0.2"
16
16
  },
17
17
  "peerDependencies": {
18
- "hl7v2": "^1.2.2",
19
- "hl7v2-dictionary": "^1.2.2"
18
+ "hl7v2": "^1.2.4",
19
+ "hl7v2-dictionary": "^1.2.4"
20
20
  },
21
21
  "type": "module",
22
22
  "exports": {
package/types/hl7-request.d.ts CHANGED
@@ -4,5 +4,5 @@ export declare class HL7Request {
4
4
  readonly socket: HL7Socket;
5
5
  readonly message: HL7Message;
6
6
  constructor(socket: HL7Socket, message: HL7Message);
7
- peerIp(): any;
7
+ peerIp(): string;
8
8
  }
package/types/hl7-socket.d.ts CHANGED
@@ -9,6 +9,7 @@ export declare class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
9
9
  protected _frameStream: FrameStream;
10
10
  protected _waitPromises: Set<Promise<any>>;
11
11
  protected _options: HL7Socket.Options;
12
+ protected _peerIp: string;
12
13
  responseTimeout?: number;
13
14
  /**
14
15
  * User defined property
@@ -22,7 +23,7 @@ export declare class HL7Socket extends AsyncEventEmitter<HL7Socket.Events> {
22
23
  get maxBufferSize(): number;
23
24
  set maxBufferSize(value: number);
24
25
  address(): {} | import("net").AddressInfo;
25
- peerIp(): any;
26
+ peerIp(): string;
26
27
  get writable(): boolean;
27
28
  close(waitRunningHandlers?: number): Promise<void>;
28
29
  sendMessage(message: HL7Message): void;