Merge branch 'alt-endpoint-env' into 'develop'

Make alternate API endpoints customisable via env variable

See merge request !54

.eslintignore

+jsPDF.min.js
+SlateEditor/
+assets

.eslintrc

@@ -12,11 +12,6 @@ find node_modules/eslint-config-airbnb -name '*.js'|xargs sed -i "s/': 2/': 1/"
         "node": true,
         "es6": true
     },
-    "ignorePatterns": [
-        "jsPDF.min.js",
-        "SlateEditor/",
-        "assets"
-    ],
     "rules": {
         "max-len": 0,
         /*[1, 160, 4],*/

config/custom-environment-variables.json

@@ -33,6 +33,7 @@
   "steemd_connection_server": "SDC_SERVER_STEEMD_URL",
   "steemd_use_appbase": "SDC_USE_APPBASE",
   "chain_id": "SDC_CHAIN_ID",
+  "alternative_api_endpoints": "SDC_ALT_API_ENDPOINTS",
   "address_prefix": "SDC_ADDRESS_PREFIX",
   "conveyor_posting_wif": "CONVEYOR_POSTING_WIF",
   "conveyor_username": "CONVEYOR_USERNAME",
@@ -47,5 +48,5 @@
   "steem_market_token": "STEEM_MARKET_TOKEN",
   "cookie_consent_enabled": "SDC_ENABLE_COOKIE_CONSENT",
   "cookie_consent_api_key": "SDC_COOKIE_CONSENT_KEY",
-  "esteem_elastic_search_api_key": "ESTEEM_ELASTIC_SEARCH_API_KEY" 
+  "esteem_elastic_search_api_key": "ESTEEM_ELASTIC_SEARCH_API_KEY"
 }

config/default.json

@@ -39,7 +39,7 @@
   "steemd_connection_server": "https://api.hive.blog",
   "steemd_use_appbase": false,
   "chain_id": "0000000000000000000000000000000000000000000000000000000000000000",
-  "alternative_api_endpoints": ["https://api.hive.blog", "https://anyx.io"],
+  "alternative_api_endpoints": "https://api.hive.blog https://anyx.io",
   "failover_threshold": 3,
   "address_prefix": "STM",
   "conveyor_posting_wif": false,

docker-compose.prod.yml

@@ -29,7 +29,8 @@ services:
             SDC_SITE_DOMAIN: hive.blog
             SDC_IMAGE_PROXY_PREFIX: https://images.hive.blog/
             SDC_UPLOAD_IMAGE_URL: https://images.hive.blog
-            SDC_HELMET_CONNECTSRC: "'self' hive.blog https://hive.blog https://api.hive.blog https://anyx.io api.blocktrades.us https://images.hive.blog"
+            SDC_ALT_API_ENDPOINTS: "https://api.hive.blog https://anyx.io https://api.openhive.network https://api.hivekings.com"
+            SDC_HELMET_CONNECTSRC: "'self' hive.blog https://hive.blog https://images.hive.blog https://api.hive.blog https://anyx.io https://api.openhive.network https://api.hivekings.com"
             WALLET_URL: https://wallet.hive.blog
         networks:
             - reverse-proxy

src/app/Main.js

@@ -83,24 +83,23 @@ function runApp(initial_state) {
         cmd(CMD_LOG_O);
     }
 
-    const config = initial_state.offchain.config;
+    const { config } = initial_state.offchain;
+    const alternativeApiEndpoints = config.alternative_api_endpoints;
+    const currentApiEndpoint =
+        localStorage.getItem('user_preferred_api_endpoint') === null
+            ? config.steemd_connection_client
+            : localStorage.getItem('user_preferred_api_endpoint');
+
     steem.api.setOptions({
-        url:
-            localStorage.getItem('user_preferred_api_endpoint') === null
-                ? config.steemd_connection_client
-                : localStorage.getItem('user_preferred_api_endpoint'),
+        url: currentApiEndpoint,
         retry: true,
         useAppbaseApi: !!config.steemd_use_appbase,
-        alternative_api_endpoints: config.alternative_api_endpoints,
+        alternative_api_endpoints: alternativeApiEndpoints,
         failover_threshold: config.failover_threshold,
     });
     steem.config.set('address_prefix', config.address_prefix);
     steem.config.set('chain_id', config.chain_id);
-    steem.config.set('failover_threshold', config.failover_threshold);
-    steem.config.set(
-        'alternative_api_endpoints',
-        config.alternative_api_endpoints
-    );
+
     window.$STM_Config = config;
     plugins(config);
     if (initial_state.offchain.serverBusy) {

src/app/components/modules/Settings.jsx

@@ -233,22 +233,38 @@ class Settings extends React.Component {
         this.props.setUserPreferences(userPreferences);
     };
 
+    getPreferredApiEndpoint = () => {
+        let preferred_api_endpoint = $STM_Config.steemd_connection_client;
+
+        if (
+            typeof window !== 'undefined' &&
+            localStorage.getItem('user_preferred_api_endpoint')
+        ) {
+            preferred_api_endpoint = localStorage.getItem(
+                'user_preferred_api_endpoint'
+            );
+        }
+
+        return preferred_api_endpoint;
+    };
+
     generateAPIEndpointOptions = () => {
-        let endpoints = api.config.get('alternative_api_endpoints');
-        let preferred_api_endpoint = '';
-        if (typeof window !== 'undefined')
-            preferred_api_endpoint =
-                localStorage.getItem('user_preferred_api_endpoint') === null
-                    ? 'https://api.hive.blog'
-                    : localStorage.getItem('user_preferred_api_endpoint');
+        const endpoints = api.config.get('alternative_api_endpoints');
+
         if (endpoints === null || endpoints === undefined) {
             return null;
         }
-        let entries = [];
-        for (var endpoint of endpoints) {
-            if (endpoint === preferred_api_endpoint) continue; //this one is always present even if the api config call fails
-            let entry = <option value={endpoint}>{endpoint}</option>;
-            entries.push(entry);
+
+        const preferred_api_endpoint = this.getPreferredApiEndpoint();
+        const entries = [];
+        for (let ei = 0; ei < endpoints.length; ei += 1) {
+            const endpoint = endpoints[ei];
+
+            //this one is always present even if the api config call fails
+            if (endpoint !== preferred_api_endpoint) {
+                const entry = <option value={endpoint}>{endpoint}</option>;
+                entries.push(entry);
+            }
         }
         return entries;
     };
@@ -292,13 +308,7 @@ class Settings extends React.Component {
             progress,
         } = this.state;
 
-        let preferred_api_endpoint = 'https://api.hive.blog';
-        if (typeof window !== 'undefined') {
-            preferred_api_endpoint =
-                localStorage.getItem('user_preferred_api_endpoint') === null
-                    ? 'https://api.hive.blog'
-                    : localStorage.getItem('user_preferred_api_endpoint');
-        }
+        const preferred_api_endpoint = this.getPreferredApiEndpoint();
 
         return (
             <div className="Settings">

src/server/index.js

@@ -16,6 +16,10 @@ require('module').Module._initPaths();
 // Load Intl polyfill
 // require('utils/intl-polyfill')(require('./config/init').locales);
 
+const alternativeApiEndpoints = config
+    .get('alternative_api_endpoints')
+    .split(' ');
+
 global.$STM_Config = {
     fb_app: config.get('facebook_app_id'),
     steemd_connection_client: config.get('steemd_connection_client'),
@@ -31,7 +35,7 @@ global.$STM_Config = {
     google_analytics_id: config.get('google_analytics_id'),
     wallet_url: config.get('wallet_url'),
     failover_threshold: config.get('failover_threshold'),
-    alternative_api_endpoints: config.get('alternative_api_endpoints'),
+    alternative_api_endpoints: alternativeApiEndpoints,
 };
 
 const WebpackIsomorphicTools = require('webpack-isomorphic-tools');
@@ -52,16 +56,11 @@ global.webpackIsomorphicTools.server(ROOT, () => {
             randomize: true,
         },
         useAppbaseApi: !!config.steemd_use_appbase,
-        alternative_api_endpoints: config.get('alternative_api_endpoints'),
+        alternative_api_endpoints: alternativeApiEndpoints,
         failover_threshold: config.get('failover_threshold'),
     });
     steem.config.set('address_prefix', config.get('address_prefix'));
     steem.config.set('chain_id', config.get('chain_id'));
-    steem.config.set(
-        'alternative_api_endpoints',
-        config.get('alternative_api_endpoints')
-    );
-    steem.config.set('failover_threshold', config.get('failover_threshold'));
 
     // const CliWalletClient = require('shared/api_client/CliWalletClient').default;
     // if (process.env.NODE_ENV === 'production') connect_promises.push(CliWalletClient.instance().connect_promise());