Add stl download for OpenSCAD and CadQuery IDEs

Resolves #330.

app/api/src/docker/openscad/openscad.js

@@ -1,4 +1,4 @@
-const { runScad } = require('./runScad')
+const { runScad, stlExport } = require('./runScad')
 const middy = require('middy')
 const { cors } = require('middy/middlewares')
 const AWS = require('aws-sdk')
@@ -12,25 +12,52 @@ const {
 
 const s3 = new AWS.S3()
 
+const openScadStlKey = (eventBody) => {
+  const { file } = JSON.parse(eventBody)
+  return `${makeHash(JSON.stringify(file))}.stl`
+}
+
 const preview = async (req, _context, callback) => {
   _context.callbackWaitsForEmptyEventLoop = false
   const eventBody = req.body
   console.log('eventBody', eventBody)
   const key = `${makeHash(eventBody)}.png`
+  const stlKey = openScadStlKey(eventBody)
+
   console.log('key', key)
 
+  const stlParams = {
+    Bucket: process.env.BUCKET,
+    Key: stlKey,
+  }
+
   const params = {
     Bucket: process.env.BUCKET,
     Key: key,
   }
-  const previousAsset = await checkIfAlreadyExists(params, s3)
+  const [previousAssetStl, previousAssetPng] = await Promise.all([
+    checkIfAlreadyExists(stlParams, s3),
+    checkIfAlreadyExists(params, s3),
+  ])
+  const type = previousAssetStl.isAlreadyInBucket ? 'stl' : 'png'
+  const previousAsset = previousAssetStl.isAlreadyInBucket
+    ? previousAssetStl
+    : previousAssetPng
   if (previousAsset.isAlreadyInBucket) {
     console.log('already in bucket')
     const response = {
       statusCode: 200,
       body: JSON.stringify({
-        url: getObjectUrl(params, s3),
-        consoleMessage: previousAsset.consoleMessage,
+        url: getObjectUrl(
+          {
+            Bucket: process.env.BUCKET,
+            Key: previousAssetStl.isAlreadyInBucket ? stlKey : key,
+          },
+          s3
+        ),
+        consoleMessage:
+          previousAsset.consoleMessage || previousAssetPng.consoleMessage,
+        type,
       }),
     }
     callback(null, response)
@@ -50,39 +77,46 @@ const preview = async (req, _context, callback) => {
   })
 }
 
-// const stl = async (req, _context, callback) => {
-//   _context.callbackWaitsForEmptyEventLoop = false
-//   const eventBody = Buffer.from(req.body, 'base64').toString('ascii')
-//   console.log(eventBody, 'eventBody')
-//   const { file } = JSON.parse(eventBody)
-//   const { error, result, tempFile } = await stlExport({ file })
-//   if (error) {
-//     const response = {
-//       statusCode: 400,
-//       body: { error, tempFile },
-//     }
-//     callback(null, response)
-//   } else {
-//     console.log(`got result in route: ${result}, file is: ${tempFile}`)
-//     const fs = require('fs')
-//     const stl = fs.readFileSync(`/tmp/${tempFile}/output.stl`, {
-//       encoding: 'base64',
-//     })
-//     console.log('encoded stl', stl)
-//     const response = {
-//       statusCode: 200,
-//       headers: {
-//         'content-type': 'application/stl',
-//       },
-//       body: stl,
-//       isBase64Encoded: true,
-//     }
-//     console.log('callback fired')
-//     callback(null, response)
-//   }
-// }
+const stl = async (req, _context, callback) => {
+  _context.callbackWaitsForEmptyEventLoop = false
+  const eventBody = req.body
+  console.log(eventBody, 'eventBody')
+  const stlKey = openScadStlKey(eventBody)
+
+  console.log('key', stlKey)
+
+  const params = {
+    Bucket: process.env.BUCKET,
+    Key: stlKey,
+  }
+  console.log('original params', params)
+  const previousAsset = await checkIfAlreadyExists(params, s3)
+  if (previousAsset.isAlreadyInBucket) {
+    console.log('already in bucket')
+    const response = {
+      statusCode: 200,
+      body: JSON.stringify({
+        url: getObjectUrl({ ...params }, s3),
+        consoleMessage: previousAsset.consoleMessage,
+      }),
+    }
+    callback(null, response)
+    return
+  }
+  const { file } = JSON.parse(eventBody)
+  const { error, consoleMessage, fullPath } = await stlExport({ file })
+  await storeAssetAndReturnUrl({
+    error,
+    callback,
+    fullPath,
+    consoleMessage,
+    key: stlKey,
+    s3,
+    params,
+  })
+}
 
 module.exports = {
-  // stl: middy(stl).use(cors()),
+  stl: middy(stl).use(cors()),
   preview: middy(loggerWrap(preview)).use(cors()),
 }

app/api/src/docker/openscad/runScad.js

@@ -35,14 +35,15 @@ module.exports.runScad = async ({
 
 module.exports.stlExport = async ({ file } = {}) => {
   const tempFile = await makeFile(file, '.scad', nanoid)
+  const fullPath = `/tmp/${tempFile}/output.stl`
 
   try {
-    const result = await runCommand(
-      `openscad -o /tmp/${tempFile}/output.stl /tmp/${tempFile}/main.scad`,
-      300000 // 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(
+      `xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" openscad -o ${fullPath} /tmp/${tempFile}/main.scad`,
+      60000 // lambda will time out before this, we might need to look at background jobs if we do git integration stl generation
     )
-    return { result, tempFile }
+    return { consoleMessage, fullPath }
   } catch (error) {
-    return { error, tempFile }
+    return { error, fullPath }
   }
 }

app/api/src/docker/serverless.yml

@@ -63,18 +63,21 @@ functions:
     timeout: 25
     environment:
       BUCKET: cad-preview-bucket-prod-001
-  # openscadstl:
-  #   image:
-  #     name: openscadimage
-  #     command:
-  #       - openscad.stl
-  #     entryPoint:
-  #       - '/entrypoint.sh'
-  #   events:
-  #     - http:
-  #         path: openscad/stl
-  #         method: post
-  #   timeout: 30
+  openscadstl:
+    image:
+      name: openscadimage
+      command:
+        - openscad.stl
+      entryPoint:
+        - '/entrypoint.sh'
+    events:
+      - http:
+          path: openscad/stl
+          method: post
+          cors: true
+    timeout: 30
+    environment:
+      BUCKET: cad-preview-bucket-prod-001
   cadquerystl:
     image:
       name: cadqueryimage