cleanup client channel

web-app/src/components/Router/index.tsx

@@ -26,9 +26,19 @@ const Router = ({ children }: Props): React.ReactElement<CloneElementProps> | nu
   // event bus listener
   React.useEffect(() => {
     const listener = 'message'
-    window.addEventListener(listener, send)
+    // propograte channel event to state machine
+    const handler = (action: any) => {
+      // NOTE: must call event.data, cannot destructure. VSCode acts odd
+      const event = action.data
+      // ignore browser events from plugins
+      if (event.source) {
+        return
+      }
+      send(event)
+    }
+    window.addEventListener(listener, handler)
     return () => {
-      window.removeEventListener(listener, send)
+      window.removeEventListener(listener, handler)
     }
   }, [])
 

web-app/src/services/state/machine.ts

@@ -1,5 +1,5 @@
 import * as CR from 'typings'
-import { assign, Machine, MachineOptions } from 'xstate'
+import { assign, Machine, MachineOptions, actions } from 'xstate'
 import editorActions from './actions/editor'
 import commandActions from './actions/command'
 import contextActions from './actions/context'
@@ -17,8 +17,8 @@ const createOptions = ({ editorSend }: any): MachineOptions<CR.MachineContext, C
   delays: {},
 })
 
-export const createMachine = (options: any) =>
-  Machine<CR.MachineContext, CR.MachineStateSchema, CR.MachineEvent>(
+export const createMachine = (options: any) => {
+  return Machine<CR.MachineContext, CR.MachineStateSchema, CR.MachineEvent>(
     {
       id: 'root',
       initial: 'Start',
@@ -230,3 +230,4 @@ export const createMachine = (options: any) =>
     },
     createOptions(options),
   )
+}

web-app/src/services/state/services/authenticate.ts

@@ -29,37 +29,36 @@ export async function authenticate(context: CR.MachineContext): Promise<any> {
       },
     })
     .catch(error => {
-      onError(error)
+      // onError(error)
       console.log('ERROR: Authentication failed')
       console.log(error.message)
       // let message
       if (error.message.match(/Network error:/)) {
-        throw {
+        return Promise.reject({
           error: {
             title: 'Network Error',
             description: 'Make sure you have an Internet connection. Restart and try again',
           },
-        }
+        })
       } else {
-        throw {
+        return Promise.reject({
           error: {
             title: 'Server Error',
             description: error.message,
           },
-        }
+        })
       }
     })
 
   if (!result || !result.data) {
     const error = new Error('Authentication request responded with no data')
     console.log(error)
-    onError(error)
+    // onError(error)
     return
   }
   const { token } = result.data.editorLogin
-  console.log(`Token: ${token}`)
   // add token to headers
   setAuthToken(token)
   // pass authenticated action back to state machine
-  return
+  return Promise.resolve()
 }