feat!: add option to handle iso20022 requests

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 setup: true
 orbs:
-  build: mojaloop/build@1.0.22
+  build: mojaloop/build@1.0.25
 workflows:
   setup:
     jobs:

.gitignore

@@ -60,3 +60,5 @@ devspace*
 
 # General Ignore
 *IGNORE*
+
+.rush

config/default.json

@@ -1,4 +1,5 @@
 {
+  "API_TYPE": "fspiop",
   "HUB_PARTICIPANT": {
     "ID": 1,
     "NAME": "Hub"
@@ -8,7 +9,17 @@
     "type": "redis-cluster",
     "proxyConfig": {
       "cluster": [
-        { "host": "redis-node-0", "port": 6379 }
+        { "host": "localhost", "port": 6379 }
+      ]
+    }
+  },
+  "ORIGINAL_PAYLOAD_STORAGE": "",
+  "PAYLOAD_CACHE": {
+    "enabled": true,
+    "type": "redis-cluster",
+    "connectionConfig": {
+      "cluster": [
+        { "host": "localhost", "port": 6379 }
       ]
     }
   },
@@ -22,18 +33,21 @@
   },
   "PROTOCOL_VERSIONS": {
     "CONTENT": {
-      "DEFAULT": "1.1",
+      "DEFAULT": "2.0",
       "VALIDATELIST": [
         "1.1",
-        "1.0"
+        "1.0",
+        "2.0"
       ]
     },
     "ACCEPT": {
-      "DEFAULT": "1",
+      "DEFAULT": "2",
       "VALIDATELIST": [
         "1",
         "1.0",
-        "1.1"
+        "1.1",
+        "2",
+        "2.0"
       ]
     }
   },

docker-compose.yml

@@ -2,11 +2,17 @@ networks:
   ml-mojaloop-net:
     name: ml-mojaloop-net
 
+# @see https://uninterrupted.tech/blog/hassle-free-redis-cluster-deployment-using-docker/
 x-redis-node: &REDIS_NODE
   image: docker.io/bitnami/redis-cluster:6.2.14
   environment: &REDIS_ENVS
     ALLOW_EMPTY_PASSWORD: yes
-    REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
+    REDIS_CLUSTER_DYNAMIC_IPS: no
+    REDIS_CLUSTER_ANNOUNCE_IP: ${REDIS_CLUSTER_ANNOUNCE_IP}
+    REDIS_NODES: redis-node-0:6379 redis-node-1:9301 redis-node-2:9302 redis-node-3:9303 redis-node-4:9304 redis-node-5:9305
+  healthcheck:
+    test: [ "CMD", "redis-cli", "ping" ]
+    timeout: 2s
   networks:
     - ml-mojaloop-net
 
@@ -30,16 +36,51 @@ services:
       - ./docker/wait4:/opt/app/wait4
     networks:
       - ml-mojaloop-net
+    extra_hosts:
+      - "redis-node-0:host-gateway"
     user: 'root'
     depends_on:
       - central-ledger
       - kafka
+      - redis-node-0
     healthcheck:
       test: ["CMD", "sh", "-c" ,"set -e;apk --no-cache add curl;curl --fail http://localhost:3000/health"]
       timeout: 20s
       retries: 10
       interval: 30s
 
+  ml-api-adapter-iso:
+    image: mojaloop/ml-api-adapter:local
+    container_name: ml_ml-api-adapter-iso
+    build:
+      context: .
+    # command: sh -c "node /opt/app/wait4/wait4.js ml-api-adapter-iso && node src/api/index.js"
+    command: sh -c "/opt/app/wait4/wait4.js ml-api-adapter && node --inspect=0.0.0.0:9229 src/api/index.js"
+    ports:
+      - "4000:3000"
+      - "9229:9229" # for debugging
+    environment:
+      - LOG_LEVEL=info
+      - CSL_LOG_TRANSPORT=file
+      - MLAPI_ENDPOINT_SOURCE_URL=http://ml-api-adapter-endpoint:4545
+    volumes:
+      - ./docker/ml-api-adapter/default_iso.json:/opt/app/config/default.json
+      - ./docker/wait4:/opt/app/wait4
+    networks:
+      - ml-mojaloop-net
+    extra_hosts:
+      - "redis-node-0:host-gateway"
+    user: 'root'
+    depends_on:
+      - central-ledger
+      - kafka
+      - redis-node-0
+    healthcheck:
+      test: ["CMD", "sh", "-c" ,"apk --no-cache add curl", ";", "curl", "--fail", "http://localhost:3000/health"]
+      timeout: 20s
+      retries: 10
+      interval: 30s
+
   # a special server for testing integration callbacks
   ml-api-adapter-endpoint:
     image: mojaloop/ml-api-adapter:local
@@ -50,7 +91,7 @@ services:
     ports:
       - "4545:4545"
     environment:
-      - LOG_LEVEL=info
+      - LOG_LEVEL=debug
       - CSL_LOG_TRANSPORT=file
       - ENDPOINT_PORT=4545
     volumes:
@@ -234,6 +275,7 @@ services:
     environment:
       <<: *REDIS_ENVS
       REDIS_CLUSTER_CREATOR: yes
+      REDIS_PORT_NUMBER: 6379
     depends_on:
       - redis-node-1
       - redis-node-2
@@ -242,19 +284,49 @@ services:
       - redis-node-5
     ports:
       - "6379:6379"
-
+      - "16379:16379"
   redis-node-1:
     container_name: redis-node-1
     <<: *REDIS_NODE
+    environment:
+      <<: *REDIS_ENVS
+      REDIS_PORT_NUMBER: 9301
+    ports:
+      - "9301:9301"
+      - "19301:19301"
   redis-node-2:
     container_name: redis-node-2
     <<: *REDIS_NODE
+    environment:
+      <<: *REDIS_ENVS
+      REDIS_PORT_NUMBER: 9302
+    ports:
+      - "9302:9302"
+      - "19302:19302"
   redis-node-3:
     container_name: redis-node-3
     <<: *REDIS_NODE
+    environment:
+      <<: *REDIS_ENVS
+      REDIS_PORT_NUMBER: 9303
+    ports:
+      - "9303:9303"
+      - "19303:19303"
   redis-node-4:
     container_name: redis-node-4
     <<: *REDIS_NODE
+    environment:
+      <<: *REDIS_ENVS
+      REDIS_PORT_NUMBER: 9304
+    ports:
+      - "9304:9304"
+      - "19304:19304"
   redis-node-5:
     container_name: redis-node-5
     <<: *REDIS_NODE
+    environment:
+      <<: *REDIS_ENVS
+      REDIS_PORT_NUMBER: 9305
+    ports:
+      - "9305:9305"
+      - "19305:19305"

docker/env.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Retrieve the external IP address of the host machine (on macOS)
+# or the IP address of the docker0 interface (on Linux)
+get_external_ip() {
+  if [ "$(uname)" = "Linux" ]; then
+    echo "$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d/ -f1)"
+  else
+    # Need to find a way to support Windows here
+    echo "$(route get ifconfig.me | grep interface | sed -e 's/.*: //' | xargs ipconfig getifaddr)"
+  fi
+}
+
+# set/override dynamic variables
+export REDIS_CLUSTER_ANNOUNCE_IP=$(get_external_ip)

docker/ml-api-adapter/default.json

@@ -1,4 +1,15 @@
 {
+  "API_TYPE": "fspiop",
+  "ORIGINAL_PAYLOAD_STORAGE": "",
+  "PAYLOAD_CACHE": {
+    "enabled": true,
+    "type": "redis-cluster",
+    "connectionConfig": {
+      "cluster": [
+        { "host": "redis-node-0", "port": 6379 }
+      ]
+    }
+  },
   "PROXY_CACHE": {
     "enabled": true,
     "type": "redis-cluster",
@@ -21,11 +32,22 @@
     "generateTimeout": 30000
   },
   "PROTOCOL_VERSIONS": {
-    "CONTENT": "1.1",
+    "CONTENT": {
+      "DEFAULT": "2.0",
+      "VALIDATELIST": [
+        "1.1",
+        "1.0",
+        "2.0"
+      ]
+    },
     "ACCEPT": {
+      "DEFAULT": "2",
       "VALIDATELIST": [
         "1",
-        "1.1"
+        "1.0",
+        "1.1",
+        "2",
+        "2.0"
       ]
     }
   },