Commit32f7a1b

committed

better interrupting of input

1 parent1f13ebe commit32f7a1bCopy full SHA for 32f7a1b

File tree

+12

-13

lines changed

+12

-13

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export const runCode = async ({code, source}) => {`
`73`	`73`	`if(awaitingInput){`
`74`	`74`	`constmessageId=awaitingInput;`
`75`	`75`	`awaitingInput=false;`
`76`		`-(awaitchannelPromise).writeInput(code,messageId);`
	`76`	`+(awaitchannelPromise).writeInput(JSON.stringify({text:code}),messageId);`
`77`	`77`	`bookSetState("processing",true);`
`78`	`78`	`return;`
`79`	`79`	`}`
`@@ -112,8 +112,14 @@ export const runCode = async ({code, source}) => {`
`112`	`112`	`letinterrupted=false;`
`113`	`113`	`letinterruptResolver;`
`114`	`114`	`constinterruptPromise=newPromise(r=>interruptResolver=r);`
`115`		`-interrupt=()=>{`
`116`		`-doInterrupt();`
	`115`	`+interrupt=async()=>{`
	`116`	`+if(awaitingInput){`
	`117`	`+constmessageId=awaitingInput;`
	`118`	`+awaitingInput=false;`
	`119`	`+(awaitchannelPromise).writeInput(JSON.stringify({interrupted:true}),messageId);`
	`120`	`+}else{`
	`121`	`+doInterrupt();`
	`122`	`+}`
`117`	`123`	`interrupted=true;`
`118`	`124`	`}`
`119`	`125`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,16 +69,9 @@ async function runCode(entry, channel, interruptBuffer, outputCallback, inputCal`
`69`	`69`	`constfullInputCallback=(data)=>{`
`70`	`70`	`constmessageId=Math.random()+" "+newDate();`
`71`	`71`	`inputCallback(messageId,toObject(data));`
`72`		`-functioncheckInterrupt(){`
`73`		`-returninterruptBuffer?.[0]===2;`
`74`		`-}`
`75`		`-constresult=readChannel(`
`76`		`-channel,`
`77`		`-messageId,`
`78`		`-{checkInterrupt}`
`79`		`-);`
`80`		`-if(result===null){`
`81`		`-returnresult;`
	`72`	`+constresult=JSON.parse(readChannel(channel,messageId)).text;`
	`73`	`+if(result==null){`
	`74`	`+returnnull;`
`82`	`75`	`}`
`83`	`76`	`returnresult+"\n";`
`84`	`77`	`}`

Comments

(0)