Fixes #4576 - Windows 1252 character encoding (#4594)

* Fixes #4576 - Windows 1252 character encoding * Add encoding as Endpoint.address query param * Added cli options
medplum · May 27, 2024 · 2dcd87f · 2dcd87f
1 parent cb88f36
commit 2dcd87f
Show file tree

Hide file tree

Showing 15 changed files with 230 additions and 64 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/agent/package.json b/packages/agent/package.json
@@ -26,6 +26,7 @@
     "@medplum/core": "3.1.6",
     "@medplum/hl7": "3.1.6",
     "dcmjs-dimse": "0.1.27",
+    "iconv-lite": "0.6.3",
     "node-windows": "1.0.0-beta.8",
     "ws": "8.17.0"
   },

diff --git a/packages/agent/src/app.ts b/packages/agent/src/app.ts
@@ -521,6 +521,7 @@ export class App {
     const client = new Hl7Client({
       host: address.hostname,
       port: Number.parseInt(address.port, 10),
+      encoding: address.searchParams.get('encoding') ?? undefined,
     });
 
     client

diff --git a/packages/agent/src/hl7.ts b/packages/agent/src/hl7.ts
@@ -30,8 +30,9 @@ export class AgentHl7Channel extends BaseChannel {
     }
     this.started = true;
     const address = new URL(this.getEndpoint().address as string);
+    const encoding = address.searchParams.get('encoding') ?? undefined;
     this.log.info(`Channel starting on ${address}...`);
-    this.server.start(Number.parseInt(address.port, 10));
+    this.server.start(Number.parseInt(address.port, 10), encoding);
     this.log.info('Channel started successfully');
   }
 

diff --git a/packages/cli/esbuild.mjs b/packages/cli/esbuild.mjs
@@ -26,6 +26,7 @@ const options = {
     'commander',
     'dotenv',
     'fast-glob',
+    'iconv-lite',
     'node-fetch',
     'tar',
   ],

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -55,6 +55,7 @@
     "commander": "12.1.0",
     "dotenv": "16.4.5",
     "fast-glob": "3.3.2",
+    "iconv-lite": "0.6.3",
     "node-fetch": "2.7.0",
     "tar": "7.1.0"
   },

diff --git a/packages/cli/src/hl7.ts b/packages/cli/src/hl7.ts
@@ -11,6 +11,7 @@ const send = createMedplumCommand('send')
   .argument('[body]', 'Optional HL7 message body')
   .option('--generate-example', 'Generate a sample HL7 message')
   .option('--file <file>', 'Read the HL7 message from a file')
+  .option('--encoding <encoding>', 'The encoding to use')
   .action(async (host, port, body, options) => {
     if (options.generateExample) {
       body = generateSampleHl7Message();
@@ -25,6 +26,7 @@ const send = createMedplumCommand('send')
     const client = new Hl7Client({
       host,
       port: Number.parseInt(port, 10),
+      encoding: options.encoding,
     });
 
     try {
@@ -38,15 +40,16 @@ const send = createMedplumCommand('send')
 const listen = createMedplumCommand('listen')
   .description('Starts an HL7 v2 MLLP server')
   .argument('<port>')
-  .action(async (port) => {
+  .option('--encoding <encoding>', 'The encoding to use')
+  .action(async (port, options) => {
     const server = new Hl7Server((connection) => {
       connection.addEventListener('message', ({ message }) => {
         console.log(message.toString().replaceAll('\r', '\n'));
         connection.send(message.buildAck());
       });
     });
 
-    server.start(Number.parseInt(port, 10));
+    server.start(Number.parseInt(port, 10), options.encoding);
     console.log('Listening on port ' + port);
   });
 

diff --git a/packages/hl7/README.md b/packages/hl7/README.md
@@ -2,6 +2,12 @@
 
 Server and client.
 
+## Character Encoding
+
+List of iconv-lite character encodings
+
+See: https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings
+
 ## License
 
 Apache 2.0. Copyright &copy; Medplum 2023
diff --git a/packages/hl7/esbuild.mjs b/packages/hl7/esbuild.mjs
@@ -14,7 +14,7 @@ const options = {
   tsconfig: 'tsconfig.json',
   minify: true,
   sourcemap: true,
-  external: ['@medplum/core', 'dataloader', 'rfc6902'],
+  external: ['@medplum/core', 'iconv-lite'],
 };
 
 esbuild

diff --git a/packages/hl7/package.json b/packages/hl7/package.json
@@ -53,7 +53,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@medplum/core": "3.1.6"
+    "@medplum/core": "3.1.6",
+    "iconv-lite": "0.6.3"
   },
   "devDependencies": {
     "@medplum/fhirtypes": "3.1.6"

diff --git a/packages/hl7/src/client.ts b/packages/hl7/src/client.ts
@@ -6,19 +6,22 @@ import { Hl7Connection } from './connection';
 export interface Hl7ClientOptions {
   host: string;
   port: number;
+  encoding?: string;
 }
 
 export class Hl7Client extends Hl7Base {
   options: Hl7ClientOptions;
   host: string;
   port: number;
+  encoding?: string;
   connection?: Hl7Connection;
 
   constructor(options: Hl7ClientOptions) {
     super();
     this.options = options;
     this.host = this.options.host;
     this.port = this.options.port;
+    this.encoding = this.options.encoding;
   }
 
   connect(): Promise<Hl7Connection> {
@@ -28,7 +31,7 @@ export class Hl7Client extends Hl7Base {
 
     return new Promise((resolve, reject) => {
       const socket = connect({ host: this.host, port: this.port }, () => {
-        this.connection = new Hl7Connection(socket);
+        this.connection = new Hl7Connection(socket, this.encoding);
         socket.off('error', reject);
         resolve(this.connection);
       });