The stls from CadQuery and OpenSCAD are not compressed and so we're throwing away bandwidth and taking a performance hit by not gziping. Gzip for s3 basically needs to be gziped before upload and than have 'content-type' : 'text/stl' 'content-encoding' : 'gzip' set. https://stackoverflow.com/questions/8080824/how-to-serve-gzipped-assets-from-amazon-s3 The obvious part that needs to change is putObject in app/api/src/docker/common/utils.js but there might be a few more nuances. resolves #391
65 lines
2.0 KiB
JavaScript
65 lines
2.0 KiB
JavaScript
const { makeFile, runCommand } = require('../common/utils')
|
|
const { nanoid } = require('nanoid')
|
|
|
|
const OPENSCAD_COMMON = `xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" openscad`
|
|
|
|
/** Removes our generated/hash filename with just "main.scad", so that it's a nice message in the IDE */
|
|
const cleanOpenScadError = (error) =>
|
|
error.replace(/["|']\/tmp\/.+\/main.scad["|']/g, "'main.scad'")
|
|
|
|
module.exports.runScad = async ({
|
|
file,
|
|
settings: {
|
|
size: { x = 500, y = 500 } = {},
|
|
camera: {
|
|
position = { x: 40, y: 40, z: 40 },
|
|
rotation = { x: 55, y: 0, z: 25 },
|
|
dist = 200,
|
|
} = {},
|
|
} = {}, // TODO add view settings
|
|
} = {}) => {
|
|
const tempFile = await makeFile(file, '.scad', nanoid)
|
|
const { x: rx, y: ry, z: rz } = rotation
|
|
const { x: px, y: py, z: pz } = position
|
|
const cameraArg = `--camera=${px},${py},${pz},${rx},${ry},${rz},${dist}`
|
|
const fullPath = `/tmp/${tempFile}/output.png`
|
|
const command = [
|
|
OPENSCAD_COMMON,
|
|
`-o ${fullPath}`,
|
|
cameraArg,
|
|
`--imgsize=${x},${y}`,
|
|
`--colorscheme CadHub`,
|
|
`/tmp/${tempFile}/main.scad`,
|
|
`&& gzip ${fullPath}`,
|
|
].join(' ')
|
|
console.log('command', command)
|
|
|
|
try {
|
|
const consoleMessage = await runCommand(command, 15000)
|
|
return { consoleMessage, fullPath }
|
|
} catch (dirtyError) {
|
|
const error = cleanOpenScadError(dirtyError)
|
|
return { error }
|
|
}
|
|
}
|
|
|
|
module.exports.stlExport = async ({ file } = {}) => {
|
|
const tempFile = await makeFile(file, '.scad', nanoid)
|
|
const fullPath = `/tmp/${tempFile}/output.stl`
|
|
const command = [
|
|
OPENSCAD_COMMON,
|
|
`--export-format=binstl`,
|
|
`-o ${fullPath}`,
|
|
`/tmp/${tempFile}/main.scad`,
|
|
`&& gzip ${fullPath}`,
|
|
].join(' ')
|
|
|
|
try {
|
|
// lambda will time out before this, we might need to look at background jobs if we do git integration stl generation
|
|
const consoleMessage = await runCommand(command, 60000)
|
|
return { consoleMessage, fullPath }
|
|
} catch (error) {
|
|
return { error, fullPath }
|
|
}
|
|
}
|