unhealthy on err

This commit is contained in:
Davor Hrg
2021-07-26 22:57:22 +02:00
parent 1bfba591ea
commit 438a9135e4
2 changed files with 26 additions and 10 deletions

View File

@@ -246,7 +246,13 @@ const makeScriptWorker = ({callback, convertToSolids})=>{
function runMain(params={}){
console.log('runMain');
let time = Date.now()
let solids = main(params)
let solids
try{
solids = main(params)
}catch(e){
callback({action:'entities', worker:'render', error:e.message, stack:e.stack.toString()}, transfer)
return
}
let solidsTime = Date.now() - time
scriptStats = `generate solids ${solidsTime}ms`
@@ -271,7 +277,13 @@ const makeScriptWorker = ({callback, convertToSolids})=>{
if(!initialized){
onInit = ()=>handlers.runScript({script,url, params})
}
let script_module = requireModule(url,script)
let script_module
try{
script_module = requireModule(url,script)
}catch(e){
callback({action:'entities', worker:'render', error:e.message, stack:e.stack.toString()})
return
}
main = script_module.exports.main
let gp = script_module.exports.getParameterDefinitions
if(gp){

View File

@@ -75,6 +75,9 @@ self.addEventListener('message', (e)=>worker.postMessage(e.data))
console.log('message from worker', e.data)
let data = e.data
if(data.action == 'entities'){
if(data.error){
response = createUnhealthyResponse( new Date(),data.error )
}else{
let group = new Group()
data.entities.map(CSG2Object3D).filter(o=>o).forEach(o=>group.add(o))
response = createHealthyResponse( {
@@ -83,6 +86,7 @@ self.addEventListener('message', (e)=>worker.postMessage(e.data))
consoleMessage: data.scriptStats,
date: new Date(),
})
}
callResolve()
}
})