Commitdec9354

committed

cleanup client channel

1 parentbe25c8a commitdec9354Copy full SHA for dec9354

File tree

+23

-13

lines changed

+23

-13

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,19 @@ const Router = ({ children }: Props): React.ReactElement<CloneElementProps> \| nu`
`26`	`26`	`// event bus listener`
`27`	`27`	`React.useEffect(()=>{`
`28`	`28`	`constlistener='message'`
`29`		`-window.addEventListener(listener,send)`
	`29`	`+// propograte channel event to state machine`
	`30`	`+consthandler=(action:any)=>{`
	`31`	`+// NOTE: must call event.data, cannot destructure. VSCode acts odd`
	`32`	`+constevent=action.data`
	`33`	`+// ignore browser events from plugins`
	`34`	`+if(event.source){`
	`35`	`+return`
	`36`	`+}`
	`37`	`+send(event)`
	`38`	`+}`
	`39`	`+window.addEventListener(listener,handler)`
`30`	`40`	`return()=>{`
`31`		`-window.removeEventListener(listener,send)`
	`41`	`+window.removeEventListener(listener,handler)`
`32`	`42`	`}`
`33`	`43`	`},[])`
`34`	`44`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import*asCRfrom'typings'`
`2`		`-import{assign,Machine,MachineOptions}from'xstate'`
	`2`	`+import{assign,Machine,MachineOptions,actions}from'xstate'`
`3`	`3`	`importeditorActionsfrom'./actions/editor'`
`4`	`4`	`importcommandActionsfrom'./actions/command'`
`5`	`5`	`importcontextActionsfrom'./actions/context'`
`@@ -17,8 +17,8 @@ const createOptions = ({ editorSend }: any): MachineOptions<CR.MachineContext, C`
`17`	`17`	`delays:{},`
`18`	`18`	`})`
`19`	`19`
`20`		`-exportconstcreateMachine=(options:any)=>`
`21`		`-Machine<CR.MachineContext,CR.MachineStateSchema,CR.MachineEvent>(`
	`20`	`+exportconstcreateMachine=(options:any)=>{`
	`21`	`+returnMachine<CR.MachineContext,CR.MachineStateSchema,CR.MachineEvent>(`
`22`	`22`	`{`
`23`	`23`	`id:'root',`
`24`	`24`	`initial:'Start',`
`@@ -230,3 +230,4 @@ export const createMachine = (options: any) =>`
`230`	`230`	`},`
`231`	`231`	`createOptions(options),`
`232`	`232`	`)`
	`233`	`+}`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,37 +29,36 @@ export async function authenticate(context: CR.MachineContext): Promise<any> {`
`29`	`29`	`},`
`30`	`30`	`})`
`31`	`31`	`.catch(error=>{`
`32`		`-onError(error)`
	`32`	`+//onError(error)`
`33`	`33`	`console.log('ERROR: Authentication failed')`
`34`	`34`	`console.log(error.message)`
`35`	`35`	`// let message`
`36`	`36`	`if(error.message.match(/Networkerror:/)){`
`37`		`-throw{`
	`37`	`+returnPromise.reject({`
`38`	`38`	`error:{`
`39`	`39`	`title:'Network Error',`
`40`	`40`	`description:'Make sure you have an Internet connection. Restart and try again',`
`41`	`41`	`},`
`42`		`-}`
	`42`	`+})`
`43`	`43`	`}else{`
`44`		`-throw{`
	`44`	`+returnPromise.reject({`
`45`	`45`	`error:{`
`46`	`46`	`title:'Server Error',`
`47`	`47`	`description:error.message,`
`48`	`48`	`},`
`49`		`-}`
	`49`	`+})`
`50`	`50`	`}`
`51`	`51`	`})`
`52`	`52`
`53`	`53`	`if(!result\|\|!result.data){`
`54`	`54`	`consterror=newError('Authentication request responded with no data')`
`55`	`55`	`console.log(error)`
`56`		`-onError(error)`
	`56`	`+//onError(error)`
`57`	`57`	`return`
`58`	`58`	`}`
`59`	`59`	`const{ token}=result.data.editorLogin`
`60`		-console.log(`Token:${token}`)
`61`	`60`	`// add token to headers`
`62`	`61`	`setAuthToken(token)`
`63`	`62`	`// pass authenticated action back to state machine`
`64`		`-return`
	`63`	`+returnPromise.resolve()`
`65`	`64`	`}`

Comments

(0)