Added: Changes for BPP setup

shreyvishal · shreyvishal · commit a9537625a955 · 2025-04-24T20:49:40.000+05:30
diff --git a/install/beckn-onix.sh b/install/beckn-onix.sh
@@ -131,7 +131,7 @@ install_layer2_config() {
 
 # Function to install BAP Protocol Server
 install_bap_protocol_server() {
-    # start_support_services # Start MongoDB, RabbitMQ, and Redis services
+    start_support_services # Start MongoDB, RabbitMQ, and Redis services
      # POST containers are started, now update the configuration
     if [[ $1 ]]; then
         # If parameters are provided, use them to update the configuration
@@ -147,7 +147,6 @@ install_bap_protocol_server() {
 
     
     sleep 10
-    return
     
     docker volume create bap_client_config_volume
     docker volume create bap_network_config_volume
@@ -175,12 +174,12 @@ install_bap_protocol_server() {
     # Keep trying API call until we get 200 status
     status_code=0
     attempt=1
-    max_attempts=5
+    max_attempts=10
     
-    while [ $status_code -ne 200 ] && [ $attempt -le $max_attempts ]; do
-        echo "Attempt $attempt of $max_attempts to verify BAP protocol server..."
+    while [ $status_code -ne 200 ]; do
+        echo "Checking BAP protocol server health..."
         
-        response=$(curl -s -w "%{http_code}" --location "$bap_subscriber_url/status" \
+        response=$(curl -s -w "%{http_code}" --location "$bap_subscriber_url/health" \
             -H "Content-Type: application/json")
             
         status_code="${response: -3}"
@@ -195,11 +194,7 @@ install_bap_protocol_server() {
         fi
     done
     
-    if [ $status_code -ne 200 ]; then
-        echo "${RED}Failed to verify BAP protocol server after $max_attempts attempts${NC}"
-        exit 1
-    fi
-
+   
 
     echo "${BLUE}Registering BAP protocol server on the registry${NC}"
     create_network_participant "$registry_url" "application/json" "$bap_subscriber_id" "$bap_subscriber_key_id" "$bap_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type" "$api_key" "$np_domain"
@@ -210,21 +205,26 @@ install_bap_protocol_server() {
 
 # Function to install BPP Protocol Server without Sandbox
 install_bpp_protocol_server() {
-    start_support_services
+    start_support_services # Start MongoDB, RabbitMQ, and Redis services
+    # POST containers are started, now update the configuration 
     echo "${GREEN}................Installing Protocol Server for BPP................${NC}"
 
     if [[ $1 ]]; then
+        # If parameters are provided, use them to update the configuration
         registry_url=$1
         bpp_subscriber_id=$2
         bpp_subscriber_key_id=$3
         bpp_subscriber_url=$4
-        webhook_url=$5
-        bash scripts/update_bpp_config.sh $registry_url $bpp_subscriber_id $bpp_subscriber_key_id $bpp_subscriber_url $webhook_url $api_key $np_domain
+        webhook_url=$5 
+        source scripts/update_bpp_config.sh $registry_url $bpp_subscriber_id $bpp_subscriber_key_id $bpp_subscriber_url $webhook_url $api_key "$np_domain"
+    
     else
-        bash scripts/update_bpp_config.sh
+        # If no parameters are provided, use the default configuration
+        source scripts/update_bpp_config.sh
     fi
 
     sleep 10
+
     docker volume create bpp_client_config_volume
     docker volume create bpp_network_config_volume
     docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_client_config_volume:/target busybox cp /source/bpp-client.yml /target/default.yml
@@ -244,6 +244,33 @@ install_bpp_protocol_server() {
         install_layer2_config bpp-client
         install_layer2_config bpp-network
     fi
+
+    # Keep trying API call until we get 200 status
+    status_code=0
+    attempt=1
+    max_attempts=10
+
+    while [ $status_code -ne 200 ]; do
+        echo "Checking BPP protocol server health..."
+        
+        response=$(curl -s -w "%{http_code}" --location "$bpp_subscriber_url/health" \
+            -H "Content-Type: application/json")
+
+        status_code="${response: -3}"
+        
+        if [ $status_code -eq 200 ]; then
+            echo "${GREEN}BPP protocol server is up and running${NC}"
+            break
+        else
+            echo "${YELLOW}BPP protocol server not ready yet (status: $status_code). Retrying in 5 seconds...${NC}"
+            sleep 5
+            ((attempt++))
+        fi
+    done    
+
+    echo "${BLUE}Registering BPP protocol server on the registry${NC}"
+    create_network_participant "$registry_url" "application/json" "$bpp_subscriber_id" "$bpp_subscriber_key_id" "$bpp_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type" "$api_key" "$np_domain"
+
     echo "Protocol server BPP installation successful"
 }
 
@@ -373,7 +400,7 @@ validate_user() {
 
     # Replace '/subscribers' with '/login' for validation
     local login_url="${registry_url%/subscribers}/auth/local"
-    echo "login_url: $login_url"
+ 
     
     # Validate credentials using a POST request
     local response
@@ -387,7 +414,7 @@ validate_user() {
     if [ "$status_code" -eq 200 ]; then
         response_body="${response%???}"
         api_key=$(echo "$response_body" | jq -r '.jwt')
-        echo "api_key: $api_key"
+       
         return 0
     else
         response=$(curl -s -w "%{http_code}" --location "$login_url" \
@@ -523,24 +550,30 @@ completeSetup() {
         public_address=$bap_subscriber_url
 
         layer2_config
-        # install_package
+        install_package
         install_bap_protocol_server $registry_url $bap_subscriber_id $bap_subscriber_key_id $bap_subscriber_url
       
        
         ;;
     "BPP")
-        echo "${GREEN}................Installing Protocol Server for BPP................${NC}"
 
+        # Display installation header
+        echo "${GREEN}................Installing Protocol Server for BPP................${NC}"
+        
+        # Step 1: Get BPP Subscriber ID
         read -p "Enter BPP Subscriber ID: " bpp_subscriber_id
+        
+        # Step 2: Get and validate BPP Subscriber URL
         while true; do
             read -p "Enter BPP Subscriber URL: " bpp_subscriber_url
             if [[ $bpp_subscriber_url =~ ^(http|https):// ]]; then
-                break
+                break # Valid URL format, exit loop
             else
                 echo "${RED}Invalid URL format. Please enter a valid URL starting with http:// or https://.${NC}"
             fi
         done
 
+        # Step 3: Get and validate Webhook URL
         while true; do
             read -p "Enter Webhook URL: " webhook_url
             if [[ $webhook_url =~ ^(http|https):// ]]; then
@@ -550,19 +583,23 @@ completeSetup() {
             fi
         done
 
+        # Step 4: Get and validate Registry URL
         while true; do
             read -p "Enter the registry URL (e.g., https://registry.becknprotocol.io/subscribers): " registry_url
-            if [[ $registry_url =~ ^(http|https):// ]] && [[ $registry_url == */subscribers ]]; then
-                break
+            if [[ $registry_url =~ ^(http|https):// ]]; then
+                break # Valid URL format, exit loop
             else
                 echo "${RED}Please mention /subscribers in your registry URL${NC}"
             fi
         done
+
+        # Step 5: Validate user credentials
         validate_user
         if [ $? -eq 1 ]; then
             exit
         fi
 
+        # Step 6: Get and validate NP Domain
         get_np_domain $bpp_subscriber_id
         if [ $? -eq 1 ]; then
             exit
diff --git a/install/docker-compose-bap.yml b/install/docker-compose-bap.yml
@@ -1,8 +1,8 @@
 services:
   bap-client:
-    image: fidedocker/protocol-server
+    image: fidedocker/protocol-server:multiarch
     container_name: bap-client
-    platform: linux/amd64
+    # platform: linux/amd64
     networks:
       - beckn_network
     ports:
@@ -14,9 +14,9 @@ services:
       - bap_client_logs_volume:/usr/src/app/logs
 
   bap-network:
-    image: fidedocker/protocol-server
+    image: fidedocker/protocol-server:multiarch
     container_name: bap-network
-    platform: linux/amd64
+    # platform: linux/amd64
     networks:
       - beckn_network
     ports:
diff --git a/install/docker-compose-bpp.yml b/install/docker-compose-bpp.yml
@@ -1,8 +1,8 @@
 services:
   bpp-client:
-    image: fidedocker/protocol-server
+    image: fidedocker/protocol-server:multiarch
     container_name: bpp-client
-    platform: linux/amd64
+    # platform: linux/amd64
     networks:
       - beckn_network
     ports:
@@ -14,9 +14,9 @@ services:
       - bpp_client_logs_volume:/usr/src/app/logs
 
   bpp-network:
-    image: fidedocker/protocol-server
+    image: fidedocker/protocol-server:multiarch
     container_name: bpp-network
-    platform: linux/amd64
+    # platform: linux/amd64
     networks:
       - beckn_network
     ports:
diff --git a/install/protocol-server-data/bap-client.yaml-sample b/install/protocol-server-data/bap-client.yaml-sample
@@ -132,7 +132,15 @@ app:
     syncInterval: 30
     redis_db: 3
   
+  useHMACForWebhook: false
+  sharedKeyForWebhookHMAC: ""
+
   useLayer2Config: USE_LAYER_2_CONFIG
   mandateLayer2Config: MANDATE_LAYER_2_CONFIG
 
+  openAPIValidator:
+    cachedFileLimit: 5
+    initialFilesToCache: ""
+
+  streamOnSearch: false
   
diff --git a/install/protocol-server-data/bap-network.yaml-sample b/install/protocol-server-data/bap-network.yaml-sample
@@ -132,5 +132,14 @@ app:
     syncInterval: 30
     redis_db: 3
 
+  useHMACForWebhook: false
+  sharedKeyForWebhookHMAC: ""
+
   useLayer2Config: USE_LAYER_2_CONFIG
-  mandateLayer2Config: MANDATE_LAYER_2_CONFIG
+  mandateLayer2Config: MANDATE_LAYER_2_CONFIG
+
+  openAPIValidator:
+    cachedFileLimit: 5
+    initialFilesToCache: ""
+
+  streamOnSearch: false
diff --git a/install/protocol-server-data/bpp-client.yaml-sample b/install/protocol-server-data/bpp-client.yaml-sample
@@ -130,5 +130,14 @@ app:
     syncInterval: 30
     redis_db: 3
 
+  useHMACForWebhook: false
+  sharedKeyForWebhookHMAC: ""
+
   useLayer2Config: USE_LAYER_2_CONFIG
-  mandateLayer2Config: MANDATE_LAYER_2_CONFIG    
+  mandateLayer2Config: MANDATE_LAYER_2_CONFIG
+
+  openAPIValidator:
+    cachedFileLimit: 5
+    initialFilesToCache: ""
+
+  streamOnSearch: false 
diff --git a/install/protocol-server-data/bpp-network.yaml-sample b/install/protocol-server-data/bpp-network.yaml-sample
@@ -130,5 +130,14 @@ app:
     syncInterval: 30
     redis_db: 3
   
+  useHMACForWebhook: false
+  sharedKeyForWebhookHMAC: ""
+
   useLayer2Config: USE_LAYER_2_CONFIG
-  mandateLayer2Config: MANDATE_LAYER_2_CONFIG
+  mandateLayer2Config: MANDATE_LAYER_2_CONFIG
+
+  openAPIValidator:
+    cachedFileLimit: 5
+    initialFilesToCache: ""
+
+  streamOnSearch: false 
diff --git a/install/scripts/registry_entry.sh b/install/scripts/registry_entry.sh
@@ -45,14 +45,13 @@ create_network_participant() {
 EOF
 )
     echo "json_data: $json_data"
-
     response=$(curl --location "$registry_url/subscribers/subscribe" \
     --header "Authorization: Bearer $api_key" \
     --header "Content-Type: $content_type" \
     --data "$json_data" 2>&1)
     if [ $? -eq 0 ]; then
         
-        echo "${GREEN}Network Participant Entry is created. Please login to registry $registry_url and subscribe you Network Participant.${NC}"
+        echo "${GREEN}Network Participant Entry is created. And subscribed to the registry $registry_url. ${NC}"
     else
         echo "${RED}Error: $response${NC}"
     fi
diff --git a/install/scripts/update_bpp_config.sh b/install/scripts/update_bpp_config.sh
@@ -126,6 +126,7 @@ else
     done
 fi
 
-echo "Registering BPP protocol server on the registry"
+# Commenting out the create_network_participant function call from here as it will be called after the container is started
+# echo "Registering BPP protocol server on the registry"
 
-create_network_participant "$registry_url" "application/json" "$bpp_subscriber_id" "$bpp_subscriber_key_id" "$bpp_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type" "$api_key" "$np_domain"
+# create_network_participant "$registry_url" "application/json" "$bpp_subscriber_id" "$bpp_subscriber_key_id" "$bpp_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type" "$api_key" "$np_domain"
