From 143ff89c959387c001536eb45ce95597d9b5333e Mon Sep 17 00:00:00 2001 From: "kody.low" Date: Mon, 9 Sep 2024 11:38:43 -0700 Subject: [PATCH] feat: gateway uis for each gateway type --- mprocs-nix-gateway.yml | 17 ++++++++++++++++- scripts/mprocs-nix-gateway.sh | 26 +++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/mprocs-nix-gateway.yml b/mprocs-nix-gateway.yml index 3fe1b0ef..dd046172 100644 --- a/mprocs-nix-gateway.yml +++ b/mprocs-nix-gateway.yml @@ -24,12 +24,27 @@ procs: shell: tail -n +0 -F $FM_LOGS_DIR/bitcoind.log devimint: shell: tail -n +0 -F $FM_LOGS_DIR/devimint.log - gateway-ui: + gateway-ui-cln: shell: bash --init-file scripts/mprocs-nix-gateway.sh stop: SIGKILL env: PORT: '3004' BROWSER: none + GATEWAY_TYPE: cln + gateway-ui-lnd: + shell: bash --init-file scripts/mprocs-nix-gateway.sh + stop: SIGKILL + env: + PORT: '3005' + BROWSER: none + GATEWAY_TYPE: lnd + gateway-ui-ldk: + shell: bash --init-file scripts/mprocs-nix-gateway.sh + stop: SIGKILL + env: + PORT: '3006' + BROWSER: none + GATEWAY_TYPE: ldk guardian-ui-1: shell: bash --init-file scripts/mprocs-nix-guardian-manual.sh stop: SIGKILL diff --git a/scripts/mprocs-nix-gateway.sh b/scripts/mprocs-nix-gateway.sh index ddd6bff1..7c992cba 100644 --- a/scripts/mprocs-nix-gateway.sh +++ b/scripts/mprocs-nix-gateway.sh @@ -13,8 +13,32 @@ if [ "$STATUS" = "ERROR" ]; then exit 1 fi +# Check if argument is provided +if [ -z "$GATEWAY_TYPE" ]; then + echo "Error: GATEWAY_TYPE is required for gateway-ui dev. Use 'cln', 'lnd', or 'ldk'." + exit 1 +fi + # Configure UI env from devimint env -export REACT_APP_FM_GATEWAY_API=$FM_GATEWAY_API_ADDR +LOCAL_GATEWAY_API_ADDR=$FM_GATEWAY_API_ADDR + +# Handle which gateway to connect to +if [ "$GATEWAY_TYPE" = "cln" ]; then + LOCAL_GATEWAY_API_ADDR="$FM_GATEWAY_API_ADDR" +elif [ "$GATEWAY_TYPE" = "lnd" ]; then + LOCAL_GATEWAY_API_ADDR=$(echo "$FM_GATEWAY_API_ADDR" | sed -E 's/:([0-9]+)$/:'"$(($(echo "$FM_GATEWAY_API_ADDR" | sed -E 's/.*:([0-9]+)$/\1/') + 1))"'/') +elif [ "$GATEWAY_TYPE" = "ldk" ]; then + LOCAL_GATEWAY_API_ADDR=$(echo "$FM_GATEWAY_API_ADDR" | sed -E 's/:([0-9]+)$/:'"$(($(echo "$FM_GATEWAY_API_ADDR" | sed -E 's/.*:([0-9]+)$/\1/') + 2))"'/') +else + echo "Error: Invalid gateway type. Use 'cln', 'lnd', or 'ldk'." + exit 1 +fi + +echo "Starting gateway-ui on $LOCAL_GATEWAY_API_ADDR" +echo "Gateway type: $GATEWAY_TYPE" +echo "Local gateway api addr: $LOCAL_GATEWAY_API_ADDR" + +export REACT_APP_FM_GATEWAY_API=$LOCAL_GATEWAY_API_ADDR export REACT_APP_FM_GATEWAY_PASSWORD=$FM_GATEWAY_PASSWORD yarn dev:gateway-ui