@mojaloop/sdk-scheme-adapter 12.0.2 → 12.2.1

package/.env.example

@@ -11,6 +11,7 @@ TEST_LISTEN_PORT=4002
 # environment, i.e. when you're running it locally against your own implementation.
 INBOUND_MUTUAL_TLS_ENABLED=false
 OUTBOUND_MUTUAL_TLS_ENABLED=false
+TEST_MUTUAL_TLS_ENABLED=false
 
 # Enable verification or incoming JWS signatures
 # Note that signatures will be required on incoming messages
@@ -42,6 +43,10 @@ OUT_CA_CERT_PATH=./secrets/cacert.pem
 OUT_CLIENT_CERT_PATH=./secrets/servercert.pem
 OUT_CLIENT_KEY_PATH=./secrets/serverkey.pem
 
+TEST_CA_CERT_PATH=./secrets/cacert.pem
+TEST_CLIENT_CERT_PATH=./secrets/servercert.pem
+TEST_CLIENT_KEY_PATH=./secrets/serverkey.pem
+
 # The number of space characters by which to indent pretty-printed logs. If set to zero, log events
 # will each be printed on a single line.
 LOG_INDENT=0
@@ -138,3 +143,11 @@ RESERVE_NOTIFICATION=true
 
 # resources API versions should be string in format: "resouceOneName=1.0,resourceTwoName=1.1"
 RESOURCE_VERSIONS="transfers=1.1,participants=1.1"
+
+# Management API websocket connection settings.
+# The Management API uses this for exchanging connector management messages.
+MGMT_API_WS_URL=127.0.0.1
+MGMT_API_WS_PORT=4005
+# Set to true to enable the use of PM4ML-related services e.g MCM, Management API service
+# when running the scheme-adapter as a mojaloop connector component within Payment Manager for Mojaloop.
+PM4ML_ENABLED=false

package/CHANGELOG.md

@@ -1,4 +1,33 @@
 # Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/thirdparty-api-svc)
+### [12.2.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.2.0...v12.2.1) (2022-04-21)
+
+
+### Chore
+
+* **deps:** bump validator from 13.6.0 to 13.7.0 ([#309](https://github.com/mojaloop/sdk-scheme-adapter/issues/309)) ([3800820](https://github.com/mojaloop/sdk-scheme-adapter/commit/3800820b095fa86147189e836817c49b380b6814))
+
+## [12.2.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.1.0...v12.2.0) (2022-04-21)
+
+
+### Features
+
+* port use payee FSPID as GET /parties destination header if provided ([#301](https://github.com/mojaloop/sdk-scheme-adapter/issues/301)) ([3ad0ba5](https://github.com/mojaloop/sdk-scheme-adapter/commit/3ad0ba5f745b459ff6d9484c83ac3f384faf34b2))
+
+## [12.1.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.0.2...v12.1.0) (2022-04-21)
+
+
+### Features
+
+* port control client and service from ml connector ([#308](https://github.com/mojaloop/sdk-scheme-adapter/issues/308)) ([e6c963c](https://github.com/mojaloop/sdk-scheme-adapter/commit/e6c963c5e5faa17f6a39e0b70f34c3e3717ba090))
+
+
+### Chore
+
+* **deps:** bump async from 2.6.3 to 2.6.4 ([#305](https://github.com/mojaloop/sdk-scheme-adapter/issues/305)) ([a20d7fd](https://github.com/mojaloop/sdk-scheme-adapter/commit/a20d7fd0c324fcac948b30e5521fd798e387c6d3))
+* **deps:** bump minimist from 1.2.5 to 1.2.6 ([#307](https://github.com/mojaloop/sdk-scheme-adapter/issues/307)) ([cf33fdc](https://github.com/mojaloop/sdk-scheme-adapter/commit/cf33fdc7691d29f07e36ea2460c2686333e5f449))
+* **deps:** bump trim-off-newlines from 1.0.1 to 1.0.3 ([#306](https://github.com/mojaloop/sdk-scheme-adapter/issues/306)) ([086bee6](https://github.com/mojaloop/sdk-scheme-adapter/commit/086bee692f6c5ab12c7e3bcdd6ff8688d26ff69d))
+* **deps:** bump urijs from 1.19.10 to 1.19.11 ([#304](https://github.com/mojaloop/sdk-scheme-adapter/issues/304)) ([17aebdc](https://github.com/mojaloop/sdk-scheme-adapter/commit/17aebdcae89169540a32d3ae61f7dadab24868c1))
+
 ### [12.0.2](https://github.com/mojaloop/sdk-scheme-adapter/compare/v12.0.1...v12.0.2) (2022-04-19)
 
 

package/audit-resolve.json

@@ -414,6 +414,26 @@
       "decision": "ignore",
       "madeAt": 1649898257344,
       "expiresAt": 1652490250295
+    },
+    "1070030|@mojaloop/central-services-shared>widdershins>markdown-it": {
+      "decision": "ignore",
+      "madeAt": 1650460940438,
+      "expiresAt": 1653052932045
+    },
+    "1070030|@mojaloop/central-services-shared>shins>markdown-it": {
+      "decision": "ignore",
+      "madeAt": 1650459472663,
+      "expiresAt": 1653051469252
+    },
+    "1068154|@mojaloop/central-services-shared>shins>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1650459474362,
+      "expiresAt": 1653051469252
+    },
+    "1068155|@mojaloop/central-services-shared>shins>sanitize-html": {
+      "decision": "ignore",
+      "madeAt": 1650459475376,
+      "expiresAt": 1653051469252
     }
   },
   "rules": {},

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "12.0.2",
+  "version": "12.2.1",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "index.js",
   "types": "index.d.ts",
   "engines": {
     "node": "=16.x"
   },
+  "_moduleAliases": {
+    "~": "src"
+  },
   "scripts": {
     "audit:resolve": "SHELL=sh resolve-audit --production",
     "audit:check": "SHELL=sh check-audit --production",
@@ -65,6 +68,7 @@
     "dotenv": "^10.0.0",
     "env-var": "^7.0.1",
     "express": "^4.17.2",
+    "fast-json-patch": "^3.1.1",
     "javascript-state-machine": "^3.1.0",
     "js-yaml": "^4.1.0",
     "json-schema-ref-parser": "^9.0.9",

package/src/ControlAgent/index.js

@@ -0,0 +1,221 @@
+/**************************************************************************
+ *  (C) Copyright ModusBox Inc. 2020 - All rights reserved.               *
+ *                                                                        *
+ *  This file is made available under the terms of the license agreement  *
+ *  specified in the corresponding source code repository.                *
+ *                                                                        *
+ *  ORIGINAL AUTHOR:                                                      *
+ *       Matt Kingston - matt.kingston@modusbox.com                       *
+ **************************************************************************/
+
+// This server has deliberately been written separate from any other server in the SDK. There is
+// some reasonable argument that it could be part of the outbound or test server. It has not been
+// incorporated in either as, at the time of writing, it is intended to be maintained in a
+// proprietary fork. Therefore, keeping it independent of other servers will avoid the maintenance
+// burden that would otherwise be associated with incorporating it with those.
+//
+// It inherits from the Server class from the 'ws' websocket library for Node, which in turn
+// inherits from EventEmitter. We exploit this to emit an event when a reconfigure message is sent
+// to this server. Then, when this server's reconfigure method is called, it reconfigures itself
+// and sends a message to all clients notifying them of the new application configuration.
+//
+// It expects new configuration to be supplied as an array of JSON patches. It therefore exposes
+// the current configuration to
+
+const assert = require('assert').strict;
+const ws = require('ws');
+const jsonPatch = require('fast-json-patch');
+const randomPhrase = require('~/lib/randomphrase');
+
+
+/**************************************************************************
+ * The message protocol messages, verbs, and errors
+ *************************************************************************/
+const MESSAGE = {
+    CONFIGURATION: 'CONFIGURATION',
+    ERROR: 'ERROR',
+};
+
+const VERB = {
+    READ: 'READ',
+    NOTIFY: 'NOTIFY',
+    PATCH: 'PATCH'
+};
+
+const ERROR = {
+    UNSUPPORTED_MESSAGE: 'UNSUPPORTED_MESSAGE',
+    UNSUPPORTED_VERB: 'UNSUPPORTED_VERB',
+    JSON_PARSE_ERROR: 'JSON_PARSE_ERROR',
+};
+
+/**************************************************************************
+ * Events emitted by the control client
+ *************************************************************************/
+const EVENT = {
+    RECONFIGURE: 'RECONFIGURE',
+};
+
+/**************************************************************************
+ * Private convenience functions
+ *************************************************************************/
+const serialise = JSON.stringify;
+const deserialise = (msg) => {
+    //reviver function
+    return JSON.parse(msg.toString(), (k, v) => {
+        if (
+            v !== null            &&
+          typeof v === 'object' &&
+          'type' in v           &&
+          v.type === 'Buffer'   &&
+          'data' in v           &&
+          Array.isArray(v.data)) {
+            return new Buffer(v.data);
+        }
+        return v;
+    });
+};
+
+const buildMsg = (verb, msg, data, id = randomPhrase()) => serialise({
+    verb,
+    msg,
+    data,
+    id,
+});
+
+const buildPatchConfiguration = (oldConf, newConf, id) => {
+    const patches = jsonPatch.compare(oldConf, newConf);
+    return buildMsg(VERB.PATCH, MESSAGE.CONFIGURATION, patches, id);
+};
+
+/**************************************************************************
+ * build
+ *
+ * Public object exposing an API to build valid protocol messages.
+ * It is not the only way to build valid messages within the protocol.
+ *************************************************************************/
+const build = {
+    CONFIGURATION: {
+        PATCH: buildPatchConfiguration,
+        READ: (id) => buildMsg(VERB.READ, MESSAGE.CONFIGURATION, {}, id),
+        NOTIFY: (config, id) => buildMsg(VERB.NOTIFY, MESSAGE.CONFIGURATION, config, id),
+    },
+    ERROR: {
+        NOTIFY: {
+            UNSUPPORTED_MESSAGE: (id) => buildMsg(VERB.NOTIFY, MESSAGE.ERROR, ERROR.UNSUPPORTED_MESSAGE, id),
+            UNSUPPORTED_VERB: (id) => buildMsg(VERB.NOTIFY, MESSAGE.ERROR, ERROR.UNSUPPORTED_VERB, id),
+            JSON_PARSE_ERROR: (id) => buildMsg(VERB.NOTIFY, MESSAGE.ERROR, ERROR.JSON_PARSE_ERROR, id),
+        }
+    },
+};
+
+/**************************************************************************
+ * Client
+ *
+ * The Control Client. Client for the websocket control API.
+ * Used to hot-restart the SDK.
+ *
+ * logger    - Logger- see SDK logger used elsewhere
+ * address   - address of control server
+ * port      - port of control server
+ *************************************************************************/
+class Client extends ws {
+    /**
+     * Consider this a private constructor.
+     * `Client` instances outside of this class should be created via the `Create(...args)` static method.
+     */
+    constructor({ address = 'localhost', port, logger, appConfig }) {
+        super(`ws://${address}:${port}`);
+        this._logger = logger;
+        this._appConfig = appConfig;
+    }
+
+    // Really only exposed so that a user can import only the client for convenience
+    get Build() {
+        return build;
+    }
+
+    static Create(...args) {
+        return new Promise((resolve, reject) => {
+            const client = new Client(...args);
+            client.on('open', () => resolve(client));
+            client.on('error', (err) => reject(err));
+            client.on('message', client._handle);
+        });
+    }
+
+    async send(msg) {
+        const data = typeof msg === 'string' ? msg : serialise(msg);
+        this._logger.push({ data }).log('Sending message');
+        return new Promise((resolve) => super.send.call(this, data, resolve));
+    }
+
+    // Receive a single message
+    async receive() {
+        return new Promise((resolve) => this.once('message', (data) => {
+            const msg = deserialise(data);
+            this._logger.push({ msg }).log('Received');
+            resolve(msg);
+        }));
+    }
+
+    // Close connection
+    async stop() {
+        this._logger.log('Control client shutting down...');
+        this.close();
+    }
+
+    reconfigure({ logger = this._logger, port = 0, appConfig = this._appConfig }) {
+        assert(port === this._socket.remotePort, 'Cannot reconfigure running port');
+        return () => {
+            this._logger = logger;
+            this._appConfig = appConfig;
+            this._logger.log('restarted');
+        };
+    }
+
+    // Handle incoming message from the server.
+    _handle(data) {
+        // TODO: json-schema validation of received message- should be pretty straight-forward
+        // and will allow better documentation of the API
+        let msg;
+        try {
+            msg = deserialise(data);
+        } catch (err) {
+            this._logger.push({ data }).log('Couldn\'t parse received message');
+            this.send(build.ERROR.NOTIFY.JSON_PARSE_ERROR());
+        }
+        this._logger.push({ msg }).log('Handling received message');
+        switch (msg.msg) {
+            case MESSAGE.CONFIGURATION:
+                switch (msg.verb) {
+                    case VERB.NOTIFY:
+                    case VERB.PATCH: {
+                        const dup = JSON.parse(JSON.stringify(this._appConfig)); // fast-json-patch explicitly mutates
+                        jsonPatch.applyPatch(dup, msg.data);
+                        this._logger.push({ oldConf: this._appConfig, newConf: dup }).log('Emitting new configuration');
+                        this.emit(EVENT.RECONFIGURE, dup);
+                        break;
+                    }
+                    default:
+                        this.send(build.ERROR.NOTIFY.UNSUPPORTED_VERB(msg.id));
+                        break;
+                }
+                break;
+            default:
+                this.send(build.ERROR.NOTIFY.UNSUPPORTED_MESSAGE(msg.id));
+                break;
+        }
+
+    }
+}
+
+
+
+module.exports = {
+    Client,
+    build,
+    MESSAGE,
+    VERB,
+    ERROR,
+    EVENT,
+};

package/src/ControlServer/handlers.js

@@ -0,0 +1,63 @@
+/**************************************************************************
+ *  (C) Copyright ModusBox Inc. 2019 - All rights reserved.               *
+ *                                                                        *
+ *  This file is made available under the terms of the license agreement  *
+ *  specified in the corresponding source code repository.                *
+ *                                                                        *
+ *  ORIGINAL AUTHOR:                                                      *
+ *       James Bush - james.bush@modusbox.com                             *
+ **************************************************************************/
+
+'use strict';
+
+const healthCheck = async(ctx) => {
+    ctx.response.status = 204;
+    ctx.response.body = '';
+};
+
+
+/**
+ * Handles a GET /requests/{ID} request. This is a test support method that allows the caller
+ * to see the body of a previous incoming request.
+ */
+const getRequestById = async(ctx) => {
+    try {
+        const req = await ctx.state.cache.get(`request_${ctx.state.path.params.ID}`);
+        ctx.response.status = 200;
+        ctx.response.body = req;
+    }
+    catch(err) {
+        ctx.status = 500;
+        ctx.response.body = err;
+    }
+};
+
+
+/**
+ * Handles a GET /callbacks/{ID} request. This is a test support method that allows the caller
+ * to see the body of a previous incoming callback.
+ */
+const getCallbackById = async(ctx) => {
+    try {
+        const req = await ctx.state.cache.get(`callback_${ctx.state.path.params.ID}`);
+        ctx.response.status = 200;
+        ctx.response.body = req;
+    }
+    catch(err) {
+        ctx.status = 500;
+        ctx.response.body = err;
+    }
+};
+
+
+module.exports = {
+    '/': {
+        get: healthCheck
+    },
+    '/requests/{ID}': {
+        get: getRequestById
+    },
+    '/callbacks/{ID}': {
+        get: getCallbackById
+    },
+};