Commit335a9c7

committed

filter events by source=coderoad

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent060ad10 commit335a9c7Copy full SHA for 335a9c7

File tree

+21

-7

lines changed

+21

-7

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ class Channel implements Channel {`
`20`	`20`
`21`	`21`	`// receive from webview`
`22`	`22`	`publicreceive=async(action:T.Action):Promise<void>=>{`
	`23`	`+if(action.source!=='coderoad'){`
	`24`	`+// filter out events from other extensions`
	`25`	`+return`
	`26`	`+}`
	`27`	`+`
`23`	`28`	`// action may be an object.type or plain string`
`24`	`29`	`constactionType:string=typeofaction==='string' ?action :action.type`
`25`	`30`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,11 @@ const createReactWebView = ({ extensionPath, channel }: ReactWebViewProps): Outp`
`56`	`56`
`57`	`57`	`// Handle messages from the webview`
`58`	`58`	`constreceive=channel.receive`
`59`		`-constsend=(action:T.Action)=>panel.webview.postMessage(action)`
	`59`	`+constsend=(action:T.Action)=>`
	`60`	`+panel.webview.postMessage({`
	`61`	`+ ...action,`
	`62`	`+source:'coderoad',// filter events on client by source. origin is not reliable`
	`63`	`+})`
`60`	`64`
`61`	`65`	`panel.webview.onDidReceiveMessage(receive,null,disposables)`
`62`	`66`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ export interface Position {`
`49`	`49`	`// current tutorial state`
`50`	`50`
`51`	`51`	`exportinterfaceAction{`
	`52`	`+source?:'coderoad'// filter received actions by this`
`52`	`53`	`type:string`
`53`	`54`	`payload?:any`
`54`	`55`	`meta?:any`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,10 @@ declare let acquireVsCodeApi: any`
`16`	`16`	`consteditor=acquireVsCodeApi()`
`17`	`17`	`consteditorSend=(action:T.Action)=>{`
`18`	`18`	logger(`TO EXT: "${action.type}"`)
`19`		`-returneditor.postMessage(action)`
	`19`	`+returneditor.postMessage({`
	`20`	`+ ...action,`
	`21`	`+source:'coderoad',// filter events by source on editor side`
	`22`	`+})`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`// router finds first state match of <Route path='' />`
`@@ -31,14 +34,15 @@ const useStateMachine = (): Output => {`
`31`	`34`	`// event bus listener`
`32`	`35`	`React.useEffect(()=>{`
`33`	`36`	`constlistener='message'`
`34`		`-//propograte channel event to state machine`
	`37`	`+//propagate channel event to state machine`
`35`	`38`	`consthandler=(event:any)=>{`
`36`		`-// ensure events are coming from coderoad webview`
`37`		`-if(!event.origin.match(/^vscode-webview/)){`
`38`		`-return`
`39`		`-}`
`40`	`39`	`// NOTE: must call event.data, cannot destructure. VSCode acts odd`
`41`	`40`	`constaction=event.data`
	`41`	`+`
	`42`	`+if(action.source!=='coderoad'){`
	`43`	`+// filter out events from other extensions`
	`44`	`+return`
	`45`	`+}`
`42`	`46`	`sendWithLog(action)`
`43`	`47`	`}`
`44`	`48`	`window.addEventListener(listener,handler)`

Comments

(0)