dhti-cli 0.5.0 → 0.6.0

package/dist/commands/compose.js

@@ -59,6 +59,7 @@ export default class Compose extends Command {
         const mcpFhir = ['mcp-fhir', 'fhir', 'postgres-db'];
         const mcpx = ['mcpx'];
         const docktor = ['mcpx'];
+        const medplum = ['medplum-server', 'medplum-app', 'postgres-db', 'redis', 'mpclient'];
         const _modules = {
             cqlFhir,
             fhir,
@@ -73,6 +74,7 @@ export default class Compose extends Command {
             openmrs,
             redis,
             webui,
+            medplum,
         };
         try {
             const masterData = yaml.load(fs.readFileSync(path.join(RESOURCES_DIR, 'docker-compose-master.yml'), 'utf8'));

package/dist/commands/mimic.d.ts

@@ -7,6 +7,7 @@ export default class Mimic extends Command {
     static examples: string[];
     static flags: {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/mimic.js

@@ -11,9 +11,18 @@ export default class Mimic extends Command {
             default: false,
             description: 'Show what changes would be made without actually making them',
         }),
+        token: Flags.string({
+            char: 't',
+            description: 'Bearer token for authentication (optional)',
+        }),
     };
     async run() {
         const { args, flags } = await this.parse(Mimic);
+        // Ensure server URL ends with /$import
+        let serverUrl = args.server;
+        if (!serverUrl.endsWith('/$import')) {
+            serverUrl = serverUrl.replace(/\/$/, '') + '/$import';
+        }
         const mimic_request = `{
 
   "resourceType": "Parameters",
@@ -148,25 +157,34 @@ export default class Mimic extends Command {
 
 }`;
         if (flags['dry-run']) {
-            console.log(chalk.yellow(`[DRY RUN] Would send POST request to: ${args.server}`));
+            console.log(chalk.yellow(`[DRY RUN] Would send POST request to: ${serverUrl}`));
             console.log(chalk.cyan('[DRY RUN] Request headers:'));
             console.log(chalk.green('  Content-Type: application/fhir+json'));
             console.log(chalk.green('  Prefer: respond-async'));
+            if (flags.token) {
+                console.log(chalk.green('  Authorization: Bearer <token>'));
+            }
             console.log(chalk.cyan('[DRY RUN] Request body:'));
             console.log(mimic_request);
             return;
         }
+        // Build request headers
+        const headers = {
+            'Content-Type': 'application/fhir+json',
+            Prefer: 'respond-async',
+        };
+        if (flags.token) {
+            headers.Authorization = `Bearer ${flags.token}`;
+        }
         // send a POST request to the server with the mimic_request body
-        const response = await fetch(args.server, {
+        const response = await fetch(serverUrl, {
             body: mimic_request,
-            headers: {
-                'Content-Type': 'application/fhir+json',
-                Prefer: 'respond-async',
-            },
+            headers,
             method: 'POST',
         });
         if (!response.ok) {
             console.error(`Error: ${response.status} ${response.statusText}`);
+            this.exit(1);
         }
     }
 }

package/dist/resources/docker-compose-master.yml

@@ -173,7 +173,7 @@ services:
       - LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES=${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-false}
 
   postgres-db:
-    image: postgres
+    image: postgres:17
     restart: "unless-stopped"
     environment:
       - POSTGRES_USER=postgres
@@ -183,6 +183,12 @@ services:
       - 5432:5432
     volumes:
       - postgres-db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
   redis:
     image: redislabs/redisearch:2.8.8
@@ -191,6 +197,12 @@ services:
     restart: "unless-stopped"
     volumes:
       - redis-db:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
 
   redis-commander:
     image: rediscommander/redis-commander:latest
@@ -234,14 +246,111 @@ services:
       - "3000:3000"
     # environment:
     #   - MCPX_PORT=9000
-    #   - MCPX_SERVER_URL="http://10.0.0.211:9000"
+    #   - MCPX_SERVER_URL="http://localhost:9000"
     #   - VITE_MCPX_SERVER_PORT=9000
-    #   - VITE_MCPX_SERVER_URL="http://10.0.0.211:9000"
+    #   - VITE_MCPX_SERVER_URL="http://localhost:9000"
     restart: unless-stopped
     volumes:
       - mcpx-config:/lunar/packages/mcpx-server/config
     privileged: true
 
+  # Medplum server container
+  medplum-server:
+    image: medplum/medplum-server:latest
+    restart: always
+    depends_on:
+      postgres-db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    ports:
+      - '8103:8103'
+    volumes:
+      # Conditionally define a volume for a `medplum.config.json` if one is specified by the MEDPLUM_CONFIG_PATH env var
+      - ${MEDPLUM_CONFIG_PATH:-./medplum.config.json}:/usr/src/medplum/packages/server/medplum.config.json
+    entrypoint: >
+      sh -c "
+      if [ -n '${MEDPLUM_CONFIG_PATH}' ]; then
+        echo 'Config file found, running with custom config'
+        node --require ./packages/server/dist/otel/instrumentation.js packages/server/dist/index.js file:/usr/src/medplum/packages/server/medplum.config.json
+      else
+        echo 'No config file found, running with default env settings'
+        node --require ./packages/server/dist/otel/instrumentation.js packages/server/dist/index.js env
+      fi
+      "
+    environment:
+      MEDPLUM_PORT: 8103
+      MEDPLUM_BASE_URL: 'http://localhost:8103/'
+      MEDPLUM_APP_BASE_URL: 'http://localhost:3103/'
+      MEDPLUM_STORAGE_BASE_URL: 'http://localhost:8103/storage/'
+
+      MEDPLUM_DATABASE_HOST: 'postgres-db'
+      MEDPLUM_DATABASE_PORT: 5432
+      MEDPLUM_DATABASE_DBNAME: 'postgres'
+      MEDPLUM_DATABASE_USERNAME: 'postgres'
+      MEDPLUM_DATABASE_PASSWORD: 'postgres'
+
+      MEDPLUM_REDIS_HOST: 'redis'
+      MEDPLUM_REDIS_PORT: 6379
+      # MEDPLUM_REDIS_PASSWORD: 'medplum'
+
+      MEDPLUM_BINARY_STORAGE: 'file:./binary/'
+      MEDPLUM_SUPPORT_EMAIL: '\"Medplum\" <support@medplum.com>'
+      MEDPLUM_GOOGLE_CLIENT_ID: '397236612778-c0b5tnjv98frbo1tfuuha5vkme3cmq4s.apps.googleusercontent.com'
+      MEDPLUM_GOOGLE_CLIENT_SECRET: ''
+      MEDPLUM_RECAPTCHA_SITE_KEY: '6LfHdsYdAAAAAC0uLnnRrDrhcXnziiUwKd8VtLNq'
+      MEDPLUM_RECAPTCHA_SECRET_KEY: '6LfHdsYdAAAAAH9dN154jbJ3zpQife3xaiTvPChL'
+      MEDPLUM_MAX_JSON_SIZE: '1mb'
+      MEDPLUM_MAX_BATCH_SIZE: '50mb'
+      MEDPLUM_BOT_LAMBDA_ROLE_ARN: ''
+      MEDPLUM_BOT_LAMBDA_LAYER_NAME: 'medplum-bot-layer'
+      MEDPLUM_VM_CONTEXT_BOTS_ENABLED: 'true'
+      MEDPLUM_DEFAULT_BOT_RUNTIME_VERSION: 'vmcontext'
+      MEDPLUM_ALLOWED_ORIGINS: '*'
+      MEDPLUM_INTROSPECTION_ENABLED: 'true'
+      MEDPLUM_SHUTDOWN_TIMEOUT_MILLISECONDS: 30000
+
+    healthcheck:
+      test:
+        # We use Node's fetch for healthcheck because this image doesn't have a curl or wget installed
+        [
+          'CMD',
+          'node',
+          '-e',
+          'fetch("http://localhost:8103/healthcheck").then(r => r.json()).then(console.log).catch(() => { process.exit(1); })',
+        ]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+
+  # Medplum app container (web UI)
+  medplum-app:
+    image: medplum/medplum-app:latest
+    restart: always
+    # depends_on:
+    #   medplum-server:
+    #     condition: service_healthy
+    ports:
+      - '3103:3000'
+    healthcheck:
+      test: ['CMD', 'curl', '-f', 'http://localhost:3103']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  mpclient:
+    image: beapen/mpclient:15.0
+    ports:
+      - "8111:8111"
+    restart: "unless-stopped"
+    environment:
+      - PORT=8111
+      - MPCLIENT_BASE_URL=http://localhost:8111
+      - MEDPLUM_TOKEN_URL=http://medplum-server:8103/oauth2/token
+      - MEDPLUM_CLIENT_ID=client-id
+      - MEDPLUM_CLIENT_SECRET=secret
+    depends_on:
+      - medplum-server
 
 volumes:
   openmrs-data: ~

package/oclif.manifest.json

@@ -457,6 +457,14 @@
           "name": "dry-run",
           "allowNo": false,
           "type": "boolean"
+        },
+        "token": {
+          "char": "t",
+          "description": "Bearer token for authentication (optional)",
+          "name": "token",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -566,5 +574,5 @@
       ]
     }
   },
-  "version": "0.5.0"
+  "version": "0.6.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dhti-cli",
   "description": "DHTI CLI",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "author": "Bell Eapen",
   "bin": {
     "dhti-cli": "bin/run.js"