Merge branch 'develop' into 'main'

v3.4 updates

See merge request signalytic/client-external/streamline/streamline-emr!28

.gitignore

@@ -1,3 +1,4 @@
 build-packages
 .local
 vendor/
+.vscode/

config.json

@@ -1,7 +1,7 @@
 {
   "name": "streamline-emr",
   "org": "streamline",
-  "version": "2.3",
+  "version": "3.4",
   "platforms": [
     "linux/arm64"
   ]

docker/Dockerfile.streamline-emr.arm64

@@ -1 +1 @@
-FROM streamlinehealth/streamline:signalytic
+FROM streamline:signalytic_latest

install.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) Wendepunkt Medical Innovations, Inc - All Rights Reserved.
-# Unauthorized copying of this file, via any medium is strictly prohibited.
-# Proprietary and confidential
-#
-# For information: dev@signalytic.ca
-#
-
-#
-# Install the streamline-emr application
-#
-# The caller of this script must check the exit value and possibly do a 
-# roll-back if it is non-zero. If the exit value is non-zero services have not
-# been restarted.
-#
-# Note: This version resets data from v1 installations
-
-LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-if [ "$EUID" -ne 0 ]
-  then echo "Please run as root"
-  exit 1
-fi
-
-set -e
-
-APP_SLUG="streamline_emr"
-ORG_SLUG="streamline"
-INSTALL_ROOT="/var/signalytic/clientapps/${ORG_SLUG}/${APP_SLUG}"
-VERSION_FILE="${INSTALL_ROOT}/version"
-DATA_ROOT="${INSTALL_ROOT}/data"
-
-# stop the application (if installed)
-if [ -f ${INSTALL_ROOT}/stop ]; then
-  ${INSTALL_ROOT}/stop
-fi
-
-# reset data for any v1 or v2.0 installations
-if grep -q "^1." ${VERSION_FILE} || grep -q "^2.0" ${VERSION_FILE}; then
-  echo "demo installation detected (v$(cat ${VERSION_FILE})) - resetting data"
-  rm -rf ${DATA_ROOT}
-fi
-
-# copy root files (if present)
-if [ -d "${LOCATION}/root" ] && [ -n "$(ls -A ${LOCATION}/root)" ]; then
-  echo "importing root files"
-  cp -rfv $LOCATION/root/* /
-fi
-
-# import docker images (if present)
-for f in $(find $LOCATION/images -name "*.img" 2>/dev/null);do
-  echo "importing docker image: $f"
-  docker load -i $f
-done
-for f in $(find $LOCATION/images -name "*.img.xz" 2>/dev/null);do
-  echo "importing docker image: $f"
-  xz -d -c $f | docker load
-done
-
-# start the application
-${INSTALL_ROOT}/start

package

@@ -5,6 +5,5 @@ LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CONFIG=${CONFIG:-${LOCATION}/config.json}
 SRC=${SRC:-${LOCATION}/src}
 BUILD_DIR=${BUILD_DIR:-${LOCATION}/build-packages}
-INSTALL_SCRIPT=${LOCATION}/install.sh
 
-${LOCATION}/hosted-app-utils/package ${CONFIG} ${SRC} ${INSTALL_SCRIPT} output=${BUILD_DIR} $@
+${LOCATION}/hosted-app-utils/package ${CONFIG} ${SRC} output=${BUILD_DIR} $@

scripts/clientappctl

@@ -0,0 +1,171 @@
+#! /usr/bin/env python3
+
+import sys, os, argparse, json, shutil, tempfile, subprocess, traceback
+
+def run_script(script_path: str) -> int:
+    """
+    Helper to handle subprocess execution
+    Args:
+        script_path (str): script path to execute
+    Returns:
+        int: 0 if both succeed, 1 if any step fails
+    """
+    if not os.path.exists(script_path):
+        print(f"Error: Script not found at {script_path}", file=sys.stderr)
+        return 1
+
+    try:
+        subprocess.run(f'{script_path}', check=True, capture_output=True, text=True)
+        return 0
+    except subprocess.CalledProcessError as e:
+        print(f"Error: {os.path.basename(script_path)} failed (Exit {e.returncode})", file=sys.stderr)
+        print(f"Details: {e.stderr.strip() or e.stdout.strip()}", file=sys.stderr)
+        return 1
+    except PermissionError:
+        print(f"Error: {os.path.basename(script_path)} is not executable. Check permissions.", file=sys.stderr)
+        return 1
+
+def handle_start(src_dir, install_path):
+    """
+    Start application
+
+    Args:
+        src_dir (str): Path to source directory (Working directory)
+        install_path (str): Path to target installation directory
+    Returns:
+        int: 0 -> success
+    """
+
+    try:
+        # disable app
+        if os.path.exists(os.path.join(install_path, 'disable')):
+            subprocess.check_output(f'{install_path}/disable')
+
+        # copy all source files to installation path
+        shutil.copytree(src_dir, install_path, dirs_exist_ok=True)
+
+        # start application
+        if run_script(f'{install_path}/start') != 0:
+            return 1
+
+        return 0
+    except Exception as ex:
+        print(f'Error: {ex}')
+        return 1
+
+def handle_stop(install_path: str):
+    """
+    Stop application
+    Args:
+        install_path (str): Path to installation directory
+    Returns:
+        int: 0 -> success
+    """
+
+    if not os.path.exists(os.path.join(install_path, 'stop')):
+        print(f"Error: stop script not found at {install_path}")
+        return 1
+
+    try:
+        # stop application
+        if run_script(f'{install_path}/stop') != 0:
+            return 1
+
+        return 0
+    except subprocess.CalledProcessError as e:
+        print(f"Error: Stop script failed with exit code {e.returncode}")
+        print(f"Output: {e.stderr or e.stdout}")
+        return 1
+
+def handle_restart(src_path: str, install_path: str):
+    """
+    Restart application
+    Args:
+        install_path (str): Path to installation directory
+    Returns:
+        int: 0 -> success
+    """
+    if handle_stop(install_path) != 0:
+        print("Restart aborted: Stop script execution failed.", file=sys.stderr)
+        return 1
+
+    if handle_start(src_path, install_path) != 0:
+        print("Restart aborted: Start script execution failed.", file=sys.stderr)
+        return 1
+
+    print('Application restarted successfully.')
+    return 0
+
+
+# script constants
+utils_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
+working_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+src_path = os.path.join(working_dir, 'src')
+CONFIG_JSON = os.path.join(working_dir, 'config.json')
+
+templates_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'hosted-app-utils', 'templates'))
+
+template_files = {
+    f'{templates_dir}/start': f'{working_dir}/src/start',
+    f'{templates_dir}/stop': f'{working_dir}/src/stop',
+    f'{templates_dir}/disable': f'{working_dir}/src/disable'
+}
+
+# command line arguments
+parser = argparse.ArgumentParser(
+    prog="clientappctl",
+    description="Manage client application operations. [ start, stop, restart ]")
+
+parser.add_argument("-c", "--config", default=CONFIG_JSON, help=f"Path to application configuration (default: {CONFIG_JSON})")
+
+subparsers = parser.add_subparsers(dest="command", required=True)
+
+start_parser = subparsers.add_parser("start", help="Start the application")
+stop_parser = subparsers.add_parser("stop", help="Stop the application")
+restart_parser = subparsers.add_parser("restart", help="Restart the application")
+
+def main() -> int:
+    # parse user args
+    args = parser.parse_args()
+
+    # load configuration
+    try:
+        config_path = args.config
+        if not os.path.exists(config_path):
+            raise ValueError("Configuration not found.")
+
+        with open(config_path) as f:
+            config_data = json.load(f)
+            name_slug = config_data['name'].strip().replace(' ', '_').replace('-', '_').lower()
+            org_slug  = config_data['org'].strip().replace(' ', '_').replace('-', '_').lower()
+            version   = config_data['version']
+
+        install_path = f'/var/signalytic/clientapps/{org_slug}/{name_slug}'
+
+        # copy temp files into working dir
+        for src, dest in template_files.items():
+            if not os.path.exists(src):
+                continue
+            shutil.copy(src, dest)
+
+        if args.command == "start":
+            print(f"Starting app: {config_data['name']}-{version}")
+
+            if not os.path.exists(install_path):
+                os.makedirs(install_path)
+            return handle_start(src_path, install_path)
+        elif args.command == "stop":
+            print(f"Stopping app: {config_data['name']}-{version}")
+            return handle_stop(install_path)
+        elif args.command == "restart":
+            print(f"Restarting app: {config_data['name']}-{version}")
+            return handle_restart(src_path, install_path)
+        else:
+            raise ValueError('Invalid operation passed.')
+
+    except Exception as ex:
+        print(f'Error: {ex}')
+        return 1
+
+if __name__ == '__main__':
+  sys.exit(main())

src/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   streamline-emr:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:2.3
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:3.4
     container_name: streamline-emr
     restart: unless-stopped
     volumes:
@@ -18,18 +18,26 @@ services:
       retries: 5
 
   statistics:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:2.3
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:3.1
     container_name: streamline-emr-statistics
     restart: unless-stopped
-    volumes:
-      - "${STATISTICS_ENV:-./resources/statistics.env}:/app/statistics.env"
-      - "${STATISTICS_DATA_DIR:-./statistics_data}:/app"
+    environment:
+      SERVER: https://impactdashboard.streamlinehealth.tech/
+      SERVER_ENDPOINT: signalytic/receive_data
+      SERVER_STATUS_URL: signalytic/status
+      DB_HOST: streamline-emr
+      DB_DATABASE: streamline
+      DB_USERNAME: root
+      DB_PASSWORD: streamline
+      REDIS_HOST: streamline-emr-redis
+      REDIS_PORT: 6379
+      REDIS_TTL: 432000
     depends_on:
       - streamline-emr
       - redis
 
   redis:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/redis/arm64:2.3
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/redis/arm64:v3
     container_name: streamline-emr-redis
     restart: unless-stopped
     volumes:

src/resources/statistics.env

@@ -1,15 +0,0 @@
-# server endpoint
-SERVER=https://impactdashboard.streamlinehealth.tech/
-SERVER_ENDPOINT=signalytic/receive_data
-SERVER_STATUS_URL=signalytic/status
-
-# Database variables
-DB_HOST=streamline-emr
-DB_DATABASE=streamline
-DB_USERNAME=root
-DB_PASSWORD=streamline
-
-# Redis variables
-REDIS_HOST=streamline-emr-redis
-REDIS_PORT=6379
-REDIS_TTL=432000  # 5Days