improve error handling if unable to reach icp4d master node

Author: Christian Guy

lib/MessageHandler.js

@@ -125,7 +125,7 @@ export default class MessageHandler {
   }
 
   handleIcp4dUrlNotSet() {
-    const notification = this.handleError('IBM Cloud Private for Data URL not specified',
+    const notification = this.handleError('IBM Cloud Private for Data URL is not specified, is invalid, or is unreachable',
       {
         detail: 'Specify the IBM Cloud Private for Data URL or build with IBM Cloud Streaming Analytics in the build-ibmstreams package settings.',
         notificationButtons: [

lib/actions/index.js

@@ -58,6 +58,12 @@ export const clearQueuedAction = () => ({
   type: actions.CLEAR_QUEUED_ACTION
 });
 
+export const checkIcp4dHostExists = (successFn, errorFn) => ({
+  type: actions.CHECK_ICP4D_HOST_EXISTS,
+  successFn,
+  errorFn
+});
+
 export const authenticateIcp4d = (username, password, rememberPassword) => ({
   type: actions.AUTHENTICATE_ICP4D,
   username,
@@ -243,6 +249,7 @@ export const actions = {
   SET_PASSWORD: 'SET_PASSWORD',
   SET_REMEMBER_PASSWORD: 'SET_REMEMBER_PASSWORD',
   SET_FORM_DATA_FIELD: 'SET_FORM_DATA_FIELD',
+  CHECK_ICP4D_HOST_EXISTS: 'CHECK_ICP4D_HOST_EXISTS',
   AUTHENTICATE_ICP4D: 'AUTHENTICATE_ICP4D',
   AUTHENTICATE_STREAMS_INSTANCE: 'AUTHENTICATE_STREAMS_INSTANCE',
   SET_ICP4D_AUTH_TOKEN: 'SET_ICP4D_AUTH_TOKEN',
@@ -286,6 +293,7 @@ export const actions = {
 
   POST_PACKAGE_ACTIVATED: 'POST_PACKAGE_ACTIVATED',
   POST_ERROR: 'POST_ERROR',
+  POST_CHECK_ICP4D_HOST_EXISTS: 'POST_CHECK_ICP4D_HOST_EXISTS',
   POST_GET_BUILD_ARTIFACTS_FULFILLED: 'POST_GET_BUILD_ARTIFACTS_FULFILLED',
   POST_DOWNLOAD_ARTIFACTS: 'POST_DOWNLOAD_ARTIFACTS',
   POST_SUBMIT_APPLICATIONS: 'POST_SUBMIT_APPLICATIONS',

lib/epics/index.js

@@ -322,6 +322,19 @@ const openStreamsConsoleEpic = (action, state) => action.pipe(
   map(() => ({ type: actions.POST_OPEN_STREAMS_CONSOLE }))
 );
 
+const icp4dHostExistsEpic = (action, state) => action.pipe(
+  ofType(actions.CHECK_ICP4D_HOST_EXISTS),
+  withLatestFrom(state),
+  mergeMap(([a, s]) => StreamsRestUtils.icp4d.icp4dHostExists(s).pipe(
+    tap((response) => a.successFn()),
+    catchError(error => {
+      a.errorFn();
+      return of(handleError(a, error));
+    })
+  )),
+  map(() => ({ type: actions.POST_CHECK_ICP4D_HOST_EXISTS }))
+);
+
 const icp4dAuthEpic = (action, state) => action.pipe(
   ofType(actions.AUTHENTICATE_ICP4D),
   withLatestFrom(state),
@@ -474,6 +487,7 @@ const rootEpic = combineEpics(
   openStreamsConsoleEpic,
 
   instanceSelectedEpic,
+  icp4dHostExistsEpic,
   icp4dAuthEpic,
   streamsAuthEpic,
   getStreamsInstancesEpic,

lib/reducers/index.js

@@ -130,13 +130,18 @@ const streamsV5Build = (state = [], action) => {
         streamsAuthError: action.authError
       };
     case actions.RESET_AUTH:
-      return _.omit(state, [
-        'icp4dAuthToken',
-        'icp4dAuthError',
-        'streamsInstances',
-        'selectedInstance',
-        'streamsAuthError'
-      ]);
+      return {
+        ..._.omit(state, [
+          'currentLoginStep',
+          'icp4dAuthToken',
+          'icp4dAuthError',
+          'streamsInstances',
+          'selectedInstance',
+          'streamsAuthError',
+          'username'
+        ]),
+        currentLoginStep: 1
+      };
     case actions.NEW_BUILD:
       return {
         ...state,

lib/spl-build.js

@@ -32,7 +32,8 @@ import {
   setUseIcp4dMasterNodeHost,
   resetAuth,
   packageActivated,
-  refreshToolkits
+  refreshToolkits,
+  checkIcp4dHostExists
 } from './actions';
 import getStore from './redux-store/configure-store';
 import StateSelector from './util/state-selectors';
@@ -405,9 +406,7 @@ export default {
     if (selectedComp) {
       this.mainCompositeSelectorPanel.hide();
       if (this.apiVersion === CONF_API_VERSION_V5) {
-        // todo
         const fqn = this.namespace ? `${this.namespace}::${selectedComp}` : `${selectedComp}`;
-        // const appRoot = SourceArchiveUtils.getApplicationRoot(atom.project.getPaths(), selectedFilePath);
         const toolkitRootPath = atom.config.get(CONF_TOOLKITS_PATH);
         let messageHandler = MessageHandlerRegistry.get(fqn);
         if (!messageHandler) {
@@ -473,11 +472,7 @@ export default {
 
   buildMake(action) {
     if (this.apiVersion === CONF_API_VERSION_V5) {
-      if (StateSelector.getIcp4dUrl(getStore().getState())) {
-        this.buildMakeV5(action);
-      } else {
-        this.handleIcp4durlNotSet();
-      }
+      this.handleV5Action(() => this.buildMakeV5(action));
     } else {
       this.buildMakeV4(action);
     }
@@ -555,11 +550,7 @@ export default {
 
   buildApp(action) {
     if (this.apiVersion === CONF_API_VERSION_V5) {
-      if (StateSelector.getIcp4dUrl(getStore().getState())) {
-        this.buildAppV5(action);
-      } else {
-        this.handleIcp4dUrlNotSet();
-      }
+      this.handleV5Action(() => this.buildAppV5(action));
     } else {
       this.buildAppV4(action);
     }
@@ -705,11 +696,7 @@ export default {
   */
   submit() {
     if (this.apiVersion === CONF_API_VERSION_V5) {
-      if (StateSelector.getIcp4dUrl(getStore().getState())) {
-        this.submitV5();
-      } else {
-        this.handleIcp4dUrlNotSet();
-      }
+      this.handleV5Action(() => this.submitV5());
     } else {
       this.submitV4();
     }
@@ -732,17 +719,16 @@ export default {
 
   openConsole() {
     if (this.apiVersion === CONF_API_VERSION_V5) {
-      if (StateSelector.getIcp4dUrl(getStore().getState())) {
+      const openConsoleFn = () => {
         const consoleUrlString = StateSelector.getStreamsConsoleUrl(getStore().getState());
         if (consoleUrlString) {
           try {
             const consoleUrl = new URL(consoleUrlString); /* eslint-disable-line compat/compat */
             MessageHandlerRegistry.openUrl(`${consoleUrl}`);
           } catch (err) { /* */ }
         }
-      } else {
-        this.handleIcp4dUrlNotSet();
-      }
+      };
+      this.handleV5Action(openConsoleFn);
     } else {
       this.streamingAnalyticsCredentials = atom.config.get(CONF_STREAMING_ANALYTICS_CREDENTIALS);
       this.consoleService = this.consumeConsoleService({ id: name, name });
@@ -765,15 +751,24 @@ export default {
 
   openIcp4dDashboard() {
     if (this.apiVersion === CONF_API_VERSION_V5) {
-      const icp4dUrlString = StateSelector.getIcp4dUrl(getStore().getState());
-      if (icp4dUrlString) {
+      const openDashboard = () => {
         try {
-          const icp4dUrl = new URL(icp4dUrlString); /* eslint-disable-line compat/compat */
+          const icp4dUrl = new URL(StateSelector.getIcp4dUrl(getStore().getState())); /* eslint-disable-line compat/compat */
           MessageHandlerRegistry.openUrl(`${icp4dUrl}/zen/#/homepage`);
         } catch (err) { /* */ }
-      } else {
-        this.handleIcp4dUrlNotSet();
-      }
+      };
+      this.handleV5Action(openDashboard);
+    }
+  },
+
+  handleV5Action(callbackFn) {
+    const icp4dUrl = StateSelector.getIcp4dUrl(getStore().getState());
+    if (icp4dUrl) {
+      const successFn = callbackFn;
+      const errorFn = () => this.handleIcp4dUrlNotSet(this.handleV5Action.bind(this, callbackFn));
+      getStore().dispatch(checkIcp4dHostExists(successFn, errorFn));
+    } else {
+      this.handleIcp4dUrlNotSet(this.handleV5Action.bind(this, callbackFn));
     }
   },
 

lib/util/streams-rest-v5.js

@@ -332,6 +332,15 @@ function getToolkitIndex(state, toolkitId) {
  *  Helper functions
  */
 
+function icp4dHostExists(state) {
+  const options = {
+    method: 'HEAD',
+    url: StateSelector.getIcp4dUrl(state),
+    timeout: 2000
+  };
+  return observableRequest(baseRequest, options);
+}
+
 function getIcp4dToken(state, username, password) {
   const options = {
     method: 'POST',
@@ -430,6 +439,7 @@ const toolkit = {
 };
 
 const icp4d = {
+  icp4dHostExists,
   getServiceInstances,
   getIcp4dToken,
   getStreamsAuthToken