@medplum/agent 2.1.11 → 2.1.13

package/installer.nsi

@@ -39,7 +39,8 @@ 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"
+    ReadRegStr $0 HKLM "SYSTEM\CurrentControlSet\Services\${SERVICE_NAME}" "ImagePath"
+    ${If} $0 != ""
         StrCpy $alreadyInstalled 1
     ${EndIf}
 FunctionEnd
@@ -124,8 +125,8 @@ Function UpgradeApp
 
     # Stop the service
     DetailPrint "Stopping service..."
-    ExecWait "winsw.exe stop --force" $1
-    DetailPrint "Stop service returned $1"
+    ExecWait "sc.exe stop ${SERVICE_NAME}" $1
+    DetailPrint "Exit code $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
@@ -138,7 +139,7 @@ Function UpgradeApp
 
     # Start the service
     DetailPrint "Starting service..."
-    ExecWait "winsw.exe start" $1
+    ExecWait "sc.exe start ${SERVICE_NAME}" $1
     DetailPrint "Start service returned $1"
 
 FunctionEnd
@@ -154,32 +155,25 @@ Function InstallApp
     DetailPrint "Agent ID: $agentId"
 
     # Copy the service files to the root directory
-    File ..\..\node_modules\node-windows\bin\winsw\winsw.exe
+    File ..\..\node_modules\node-shawl\bin\shawl-v1.3.0-legal.txt
+    File ..\..\node_modules\node-shawl\bin\shawl-v1.3.0-win64.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"
+    # Create the service
+    DetailPrint "Creating service..."
+    ExecWait "shawl-v1.3.0-win64.exe add --name $\"${SERVICE_NAME}$\" -- $\"$INSTDIR\medplum-agent-win-x64.exe$\" $\"$baseUrl$\" $\"$clientId$\" $\"$clientSecret$\" $\"$agentId$\"" $1
+    DetailPrint "Exit code $1"
+
+    # Set service description
+    DetailPrint "Setting service description..."
+    ExecWait "sc.exe description $\"${SERVICE_NAME}$\" $\"Securely connects local devices to ${COMPANY_NAME} cloud$\"" $1
+    DetailPrint "Exit code $1"
 
     # Start the service
     DetailPrint "Starting service..."
-    ExecWait "winsw.exe start" $1
-    DetailPrint "Start service returned $1"
+    ExecWait "sc.exe start $\"${SERVICE_NAME}$\"" $1
+    DetailPrint "Exit code $1"
 
     # Create the uninstaller
     DetailPrint "Creating the uninstaller..."
@@ -203,11 +197,20 @@ FunctionEnd
 # Start the uninstaller
 Section Uninstall
 
-    # Uninstall the service
-    DetailPrint "Uninstalling service..."
-    SetOutPath "$INSTDIR"
-    ExecWait "winsw.exe uninstall" $1
-    DetailPrint "Uninstall returned $1"
+    # Stop the service
+    DetailPrint "Stopping service..."
+    ExecWait "sc.exe stop ${SERVICE_NAME}" $1
+    DetailPrint "Exit code $1"
+
+    # Sleep for 3 seconds to let the service fully stop
+    # We cannot delete the file until the service is fully stopped
+    DetailPrint "Sleeping..."
+    Sleep 3000
+
+    # Deleting the service
+    DetailPrint "Deleting service..."
+    ExecWait "sc.exe delete ${SERVICE_NAME}" $1
+    DetailPrint "Exit code $1"
 
     # Get out of the service directory so we can delete it
     SetOutPath "$PROGRAMFILES64"
@@ -219,6 +222,7 @@ Section Uninstall
     RMDir /r /REBOOTOK "$INSTDIR"
 
     # Unregister the program
+    DeleteRegKey HKLM "SYSTEM\CurrentControlSet\Services\${SERVICE_NAME}"
     DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${SERVICE_NAME}"
 
 SectionEnd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/agent",
-  "version": "2.1.11",
+  "version": "2.1.13",
   "description": "Medplum Agent",
   "homepage": "https://www.medplum.com/",
   "repository": {
@@ -13,22 +13,24 @@
   "scripts": {
     "agent": "ts-node src/main.ts",
     "build": "npm run clean && tsc && node esbuild.mjs",
+    "build:exe": "pkg ./dist/cjs/index.cjs --targets node18-win-x64 --output dist/medplum-agent-win-x64.exe --options no-warnings",
+    "build:installer": "makensis installer.nsi",
+    "build:all": "npm run build && npm run build:exe && npm run build:installer",
     "clean": "rimraf dist",
-    "installer": "makensis installer.nsi",
-    "package": "pkg ./dist/cjs/index.cjs --targets node18-win-x64 --output dist/medplum-agent-win-x64.exe --options no-warnings",
     "test": "jest"
   },
   "dependencies": {
     "@medplum/core": "*",
     "@medplum/hl7": "*",
+    "node-shawl": "1.3.0",
     "node-windows": "1.0.0-beta.8",
     "ws": "8.14.2"
   },
   "devDependencies": {
     "@medplum/fhirtypes": "*",
     "@medplum/mock": "*",
-    "@types/node-windows": "0.1.4",
-    "@types/ws": "8.5.7",
+    "@types/node-windows": "0.1.6",
+    "@types/ws": "8.5.9",
     "mock-socket": "9.3.1",
     "pkg": "5.8.1"
   },

package/src/main.ts

@@ -219,16 +219,26 @@ export class AgentHl7ChannelConnection {
   }
 }
 
-if (typeof require !== 'undefined' && require.main === module) {
-  if (process.argv.length < 6) {
+async function main(argv: string[]): Promise<void> {
+  if (argv.length < 6) {
     console.log('Usage: node medplum-agent.js <baseUrl> <clientId> <clientSecret> <agentId>');
     process.exit(1);
   }
+  const [_node, _script, baseUrl, clientId, clientSecret, agentId] = argv;
 
-  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);
+  await medplum.startClientLogin(clientId, clientSecret);
+
+  const app = new App(medplum, agentId);
+  await app.start();
+
+  process.on('SIGINT', () => {
+    console.log('\ngracefully shutting down from SIGINT (Crtl-C)');
+    app.stop();
+    process.exit();
+  });
+}
+
+if (typeof require !== 'undefined' && require.main === module) {
+  main(process.argv).catch(console.error);
 }