@medplum/agent 2.0.30 → 2.0.32

package/installer.nsi

@@ -0,0 +1,224 @@
+# Medplum Agent Installer Builder
+# For use with NSIS 3.0+
+# See: https://nsis.sourceforge.io/
+
+!define COMPANY_NAME             "Medplum"
+!define APP_NAME                 "Medplum Agent"
+!define SERVICE_NAME             "MedplumAgent"
+!define INSTALLER_FILE_NAME      "medplum-agent-installer.exe"
+!define DEFAULT_BASE_URL         "https://api.medplum.com/"
+
+Name                             "${APP_NAME}"
+OutFile                          "${INSTALLER_FILE_NAME}"
+VIProductVersion                 "1.0.0.0"
+VIAddVersionKey ProductName      "${APP_NAME}"
+VIAddVersionKey Comments         "${APP_NAME}"
+VIAddVersionKey CompanyName      "${COMPANY_NAME}"
+VIAddVersionKey LegalCopyright   "${COMPANY_NAME}"
+VIAddVersionKey FileDescription  "${APP_NAME}"
+VIAddVersionKey FileVersion      1
+VIAddVersionKey ProductVersion   1
+VIAddVersionKey InternalName     "${APP_NAME}"
+VIAddVersionKey LegalTrademarks  "${COMPANY_NAME}"
+VIAddVersionKey OriginalFilename "${INSTALLER_FILE_NAME}"
+
+InstallDir "$PROGRAMFILES64\${APP_NAME}"
+
+!include "nsDialogs.nsh"
+
+RequestExecutionLevel admin
+
+Var WelcomeDialog
+Var WelcomeLabel
+Var alreadyInstalled
+Var baseUrl
+Var clientId
+Var clientSecret
+Var agentId
+
+# The onInit handler is called when the installer is nearly finished initializing.
+# See: https://nsis.sourceforge.io/Reference/.onInit
+Function .onInit
+    ${If} ${FileExists} "$INSTDIR\winsw.xml"
+        StrCpy $alreadyInstalled 1
+    ${EndIf}
+FunctionEnd
+
+Page custom WelcomePage
+Page custom InputPage InputPageLeave
+Page instfiles
+
+# The WelcomePage is a simple static screen that displays a friendly message.
+Function WelcomePage
+    nsDialogs::Create 1018
+    Pop $WelcomeDialog
+
+    ${If} $WelcomeDialog == error
+        Abort
+    ${EndIf}
+
+    ${NSD_CreateLabel} 0 0 100% 50u "Welcome to the ${APP_NAME} Installer!$\r$\n$\r$\nClick next to continue."
+    Pop $WelcomeLabel
+
+    nsDialogs::Show
+FunctionEnd
+
+# The InputPage captures all of the user input for the agent.
+Function InputPage
+    ${If} $alreadyInstalled == 1
+        Abort ; This skips the page
+    ${EndIf}
+
+    nsDialogs::Create 1018
+    Pop $0
+
+    StrCpy $baseUrl "${DEFAULT_BASE_URL}"
+    ${NSD_CreateLabel} 0 0 30% 12u "Base URL:"
+    Pop $R0
+    ${NSD_CreateText} 35% 0 65% 12u $baseUrl
+    Pop $R1
+
+    ${NSD_CreateLabel} 0 15u 30% 12u "Client ID:"
+    Pop $R2
+    ${NSD_CreateText} 35% 15u 65% 12u $clientId
+    Pop $R3
+
+    ${NSD_CreateLabel} 0 30u 30% 12u "Client Secret:"
+    Pop $R4
+    ${NSD_CreateText} 35% 30u 65% 12u $clientSecret
+    Pop $R5
+
+    ${NSD_CreateLabel} 0 45u 30% 12u "Agent ID:"
+    Pop $R6
+    ${NSD_CreateText} 35% 45u 65% 12u $agentId
+    Pop $R7
+
+    ${NSD_SetFocus} $R3
+    nsDialogs::Show
+FunctionEnd
+
+Function InputPageLeave
+    ${NSD_GetText} $R1 $baseUrl
+    ${NSD_GetText} $R3 $clientId
+    ${NSD_GetText} $R5 $clientSecret
+    ${NSD_GetText} $R7 $agentId
+FunctionEnd
+
+# Main installation entry point.
+Section
+    DetailPrint "${APP_NAME}"
+    SetOutPath "$INSTDIR"
+
+    ${If} $alreadyInstalled == 1
+        Call UpgradeApp
+    ${Else}
+        Call InstallApp
+    ${EndIf}
+
+SectionEnd
+
+# Upgrade an existing installation.
+# This only copies files, and restarts the Windows Service.
+# It does not modify the existing configuration settings.
+Function UpgradeApp
+
+    # Stop the service
+    DetailPrint "Stopping service..."
+    ExecWait "winsw.exe stop --force" $1
+    DetailPrint "Stop service returned $1"
+
+    # Sleep for 3 seconds to let the service fully stop
+    # We cannot write the new version of the exe while the process is running
+    DetailPrint "Sleeping..."
+    Sleep 3000
+
+    # Copy the new files to the installation directory
+    File dist\medplum-agent-win-x64.exe
+    File README.md
+
+    # Start the service
+    DetailPrint "Starting service..."
+    ExecWait "winsw.exe start" $1
+    DetailPrint "Start service returned $1"
+
+FunctionEnd
+
+# Do the actual installation.
+# Install all of the files.
+# Install the Windows Service.
+Function InstallApp
+    # Print user input
+    DetailPrint "Base URL: $baseUrl"
+    DetailPrint "Client ID: $clientId"
+    DetailPrint "Client Secret: $clientSecret"
+    DetailPrint "Agent ID: $agentId"
+
+    # Copy the service files to the root directory
+    File ..\..\node_modules\node-windows\bin\winsw\winsw.exe
+    File dist\medplum-agent-win-x64.exe
+    File README.md
+
+    # Create the winsw.xml config file
+    # See config file format: https://github.com/winsw/winsw/blob/v3/docs/xml-config-file.md
+    FileOpen $9 winsw.xml w
+    FileWrite $9 "<service>$\r$\n"
+    FileWrite $9 "<id>${SERVICE_NAME}</id>$\r$\n"
+    FileWrite $9 "<name>${APP_NAME}</name>$\r$\n"
+    FileWrite $9 "<description>Securely connects local devices to ${COMPANY_NAME} cloud</description>$\r$\n"
+    FileWrite $9 "<executable>$INSTDIR\medplum-agent-win-x64.exe</executable>$\r$\n"
+    FileWrite $9 "<arguments>$\"$baseUrl$\" $\"$clientId$\" $\"$clientSecret$\" $\"$agentId$\"</arguments>$\r$\n"
+    FileWrite $9 "<startmode>Automatic</startmode>$\r$\n"
+    FileWrite $9 "</service>$\r$\n"
+    FileClose $9
+
+    # Install the service
+    DetailPrint "Installing service..."
+    ExecWait "winsw.exe install" $1
+    DetailPrint "Install returned $1"
+
+    # Start the service
+    DetailPrint "Starting service..."
+    ExecWait "winsw.exe start" $1
+    DetailPrint "Start service returned $1"
+
+    # Create the uninstaller
+    DetailPrint "Creating the uninstaller..."
+    SetOutPath $INSTDIR
+    WriteUninstaller "$INSTDIR\uninstall.exe"
+
+    # Register the uninstaller
+    DetailPrint "Registering the uninstaller..."
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${SERVICE_NAME}" "DisplayName" "${APP_NAME}"
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${SERVICE_NAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${SERVICE_NAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+    DetailPrint "Uninstaller complete"
+
+    # Create Start menu shortcuts
+    DetailPrint "$SMPROGRAMS\${APP_NAME}\${APP_NAME} Uninstall.lnk"
+    CreateDirectory "$SMPROGRAMS\${APP_NAME}"
+    CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} Uninstall.lnk" "$INSTDIR\uninstall.exe"
+
+FunctionEnd
+
+# Start the uninstaller
+Section Uninstall
+
+    # Uninstall the service
+    DetailPrint "Uninstalling service..."
+    SetOutPath "$INSTDIR"
+    ExecWait "winsw.exe uninstall" $1
+    DetailPrint "Uninstall returned $1"
+
+    # Get out of the service directory so we can delete it
+    SetOutPath "$PROGRAMFILES64"
+
+    # Uninstall the Start menu shortcuts
+    RMDir /r /REBOOTOK "$SMPROGRAMS\${APP_NAME}"
+
+    # Delete the files
+    RMDir /r /REBOOTOK "$INSTDIR"
+
+    # Unregister the program
+    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${SERVICE_NAME}"
+
+SectionEnd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/agent",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "description": "Medplum Agent",
   "author": "Medplum <hello@medplum.com>",
   "license": "Apache-2.0",
@@ -18,7 +18,8 @@
     "build": "npm run clean && tsc && node esbuild.mjs",
     "test": "jest",
     "agent": "ts-node src/main.ts",
-    "package": "pkg ./dist/cjs/index.cjs --targets node18-win-x64 --output dist/medplum-agent-win-x64.exe"
+    "package": "pkg ./dist/cjs/index.cjs --targets node18-win-x64 --output dist/medplum-agent-win-x64.exe --options no-warnings",
+    "installer": "makensis installer.nsi"
   },
   "dependencies": {
     "@medplum/core": "*",

package/src/main.test.ts

@@ -1,5 +1,5 @@
-import { allOk, Hl7Message } from '@medplum/core';
-import { Bot, Resource } from '@medplum/fhirtypes';
+import { allOk, createReference, Hl7Message } from '@medplum/core';
+import { Agent, Bot, Endpoint, Resource } from '@medplum/fhirtypes';
 import { Hl7Client } from '@medplum/hl7';
 import { MockClient } from '@medplum/mock';
 import { Server } from 'mock-socket';
@@ -9,6 +9,7 @@ jest.mock('node-windows');
 
 const medplum = new MockClient();
 let bot: Bot;
+let endpoint: Endpoint;
 
 describe('Agent', () => {
   beforeAll(async () => {
@@ -19,18 +20,26 @@ describe('Agent', () => {
     });
 
     bot = await medplum.createResource<Bot>({ resourceType: 'Bot' });
+
+    endpoint = await medplum.createResource<Endpoint>({
+      resourceType: 'Endpoint',
+      address: 'mllp://0.0.0.0:56000',
+    });
   });
 
   test('Runs successfully', async () => {
-    const app = new App(medplum, { botId: bot.id as string });
-    app.start();
-    app.stop();
-    app.stop();
-  });
+    const agent = await medplum.createResource<Agent>({
+      resourceType: 'Agent',
+      channel: [
+        {
+          endpoint: createReference(endpoint),
+          targetReference: createReference(bot),
+        },
+      ],
+    });
 
-  test('Use system event log', async () => {
-    const app = new App(medplum, { botId: bot.id as string, useSystemEventLog: true });
-    app.start();
+    const app = new App(medplum, agent.id as string);
+    await app.start();
     app.stop();
     app.stop();
   });
@@ -66,8 +75,18 @@ describe('Agent', () => {
       });
     });
 
-    const app = new App(medplum, { botId: bot.id as string });
-    app.start();
+    const agent = await medplum.createResource<Agent>({
+      resourceType: 'Agent',
+      channel: [
+        {
+          endpoint: createReference(endpoint),
+          targetReference: createReference(bot),
+        },
+      ],
+    });
+
+    const app = new App(medplum, agent.id as string);
+    await app.start();
 
     const client = new Hl7Client({
       host: 'localhost',

package/src/main.ts

@@ -1,66 +1,97 @@
-import { Hl7Message, MedplumClient } from '@medplum/core';
+import { Hl7Message, MedplumClient, resolveId } from '@medplum/core';
+import { AgentChannel, Bot, Endpoint, Reference } from '@medplum/fhirtypes';
 import { Hl7Connection, Hl7MessageEvent, Hl7Server } from '@medplum/hl7';
-import { readFileSync } from 'fs';
 import { EventLogger } from 'node-windows';
 import WebSocket from 'ws';
 
-export interface AgentConfig {
-  botId: string;
-  useSystemEventLog?: boolean;
-}
-
 export class App {
   readonly log: EventLogger;
-  readonly server: Hl7Server;
-  readonly connections: Connection[] = [];
-
-  constructor(readonly medplum: MedplumClient, readonly config: AgentConfig) {
-    if (config.useSystemEventLog) {
-      this.log = new EventLogger({
-        source: 'MedplumService',
-        eventLog: 'SYSTEM',
-      });
-    } else {
-      this.log = {
-        info: console.log,
-        warn: console.warn,
-        error: console.error,
-      } as EventLogger;
+  readonly channels: AgentHl7Channel[];
+
+  constructor(
+    readonly medplum: MedplumClient,
+    readonly agentId: string
+  ) {
+    this.log = {
+      info: console.log,
+      warn: console.warn,
+      error: console.error,
+    } as EventLogger;
+
+    this.channels = [];
+  }
+
+  async start(): Promise<void> {
+    this.log.info('Medplum service starting...');
+
+    const agent = await this.medplum.readResource('Agent', this.agentId);
+
+    for (const definition of agent.channel as AgentChannel[]) {
+      const endpoint = await this.medplum.readReference(definition.endpoint as Reference<Endpoint>);
+      const channel = new AgentHl7Channel(this, definition, endpoint);
+      channel.start();
+      this.channels.push(channel);
     }
 
+    this.log.info('Medplum service started successfully');
+  }
+
+  stop(): void {
+    this.log.info('Medplum service stopping...');
+    this.channels.forEach((channel) => channel.stop());
+    this.log.info('Medplum service stopped successfully');
+  }
+}
+
+export class AgentHl7Channel {
+  readonly server: Hl7Server;
+  readonly connections: AgentHl7ChannelConnection[] = [];
+
+  constructor(
+    readonly app: App,
+    readonly definition: AgentChannel,
+    readonly endpoint: Endpoint
+  ) {
     this.server = new Hl7Server((connection) => {
-      this.log.info('HL7 connection established');
-      this.connections.push(new Connection(this, connection));
+      this.app.log.info('HL7 connection established');
+      this.connections.push(new AgentHl7ChannelConnection(this, connection));
     });
   }
 
   start(): void {
-    this.log.info('Medplum service starting...');
-    this.server.start(56000);
-    this.log.info('Medplum service started successfully');
+    const address = new URL(this.endpoint.address as string);
+    this.app.log.info(`Channel starting on ${address}`);
+    this.server.start(parseInt(address.port, 10));
+    this.app.log.info('Channel started successfully');
   }
 
   stop(): void {
-    this.log.info('Medplum service stopping...');
+    this.app.log.info('Channel stopping...');
     for (const connection of this.connections) {
       connection.close();
     }
     this.server.stop();
-    this.log.info('Medplum service stopped successfully');
+    this.app.log.info('Channel stopped successfully');
   }
 }
 
-export class Connection {
+export class AgentHl7ChannelConnection {
   readonly webSocket: WebSocket;
   readonly webSocketQueue: Hl7Message[] = [];
   readonly hl7ConnectionQueue: Hl7Message[] = [];
   live = false;
 
-  constructor(readonly app: App, readonly hl7Connection: Hl7Connection) {
+  constructor(
+    readonly channel: AgentHl7Channel,
+    readonly hl7Connection: Hl7Connection
+  ) {
+    const app = channel.app;
+    const medplum = app.medplum;
+
     // Add listener immediately to handle incoming messages
     this.hl7Connection.addEventListener('message', (event) => this.handler(event));
 
-    const webSocketUrl = new URL(this.app.medplum.getBaseUrl());
+    const webSocketUrl = new URL(medplum.getBaseUrl());
     webSocketUrl.protocol = webSocketUrl.protocol === 'https:' ? 'wss:' : 'ws:';
     webSocketUrl.pathname = '/ws/agent';
     console.log('Connecting to WebSocket:', webSocketUrl.href);
@@ -72,8 +103,9 @@ export class Connection {
       this.webSocket.send(
         JSON.stringify({
           type: 'connect',
-          accessToken: this.app.medplum.getAccessToken(),
-          botId: this.app.config.botId,
+          accessToken: medplum.getAccessToken(),
+          agentId: channel.app.agentId,
+          botId: resolveId(channel.definition.targetReference as Reference<Bot>),
         })
       );
     });
@@ -119,6 +151,7 @@ export class Connection {
           this.webSocket.send(
             JSON.stringify({
               type: 'transmit',
+              forwardedFor: this.hl7Connection.socket.remoteAddress,
               message: msg.toString(),
             })
           );
@@ -143,6 +176,15 @@ export class Connection {
 }
 
 if (typeof require !== 'undefined' && require.main === module) {
-  const config = JSON.parse(readFileSync('medplum.config.json', 'utf8'));
-  new App(new MedplumClient(config), config).start();
+  if (process.argv.length < 6) {
+    console.log('Usage: node medplum-agent.js <baseUrl> <clientId> <clientSecret> <agentId>');
+    process.exit(1);
+  }
+
+  const [_node, _script, baseUrl, clientId, clientSecret, agentId] = process.argv;
+  const medplum = new MedplumClient({ baseUrl, clientId });
+  medplum
+    .startClientLogin(clientId, clientSecret)
+    .then(() => new App(medplum, agentId).start())
+    .catch(console.error);
 }