unhealthy on err
This commit is contained in:
@@ -246,7 +246,13 @@ const makeScriptWorker = ({callback, convertToSolids})=>{
|
|||||||
function runMain(params={}){
|
function runMain(params={}){
|
||||||
console.log('runMain');
|
console.log('runMain');
|
||||||
let time = Date.now()
|
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
|
let solidsTime = Date.now() - time
|
||||||
scriptStats = `generate solids ${solidsTime}ms`
|
scriptStats = `generate solids ${solidsTime}ms`
|
||||||
|
|
||||||
@@ -271,7 +277,13 @@ const makeScriptWorker = ({callback, convertToSolids})=>{
|
|||||||
if(!initialized){
|
if(!initialized){
|
||||||
onInit = ()=>handlers.runScript({script,url, params})
|
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
|
main = script_module.exports.main
|
||||||
let gp = script_module.exports.getParameterDefinitions
|
let gp = script_module.exports.getParameterDefinitions
|
||||||
if(gp){
|
if(gp){
|
||||||
|
|||||||
@@ -75,14 +75,18 @@ self.addEventListener('message', (e)=>worker.postMessage(e.data))
|
|||||||
console.log('message from worker', e.data)
|
console.log('message from worker', e.data)
|
||||||
let data = e.data
|
let data = e.data
|
||||||
if(data.action == 'entities'){
|
if(data.action == 'entities'){
|
||||||
let group = new Group()
|
if(data.error){
|
||||||
data.entities.map(CSG2Object3D).filter(o=>o).forEach(o=>group.add(o))
|
response = createUnhealthyResponse( new Date(),data.error )
|
||||||
response = createHealthyResponse( {
|
}else{
|
||||||
type: 'geometry',
|
let group = new Group()
|
||||||
data: group,
|
data.entities.map(CSG2Object3D).filter(o=>o).forEach(o=>group.add(o))
|
||||||
consoleMessage: data.scriptStats,
|
response = createHealthyResponse( {
|
||||||
date: new Date(),
|
type: 'geometry',
|
||||||
})
|
data: group,
|
||||||
|
consoleMessage: data.scriptStats,
|
||||||
|
date: new Date(),
|
||||||
|
})
|
||||||
|
}
|
||||||
callResolve()
|
callResolve()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user