async bug fixes and thumbnail uploads

Author: rizen

Pulumi.mjs

@@ -5,7 +5,7 @@ import { updateEnv } from './pulumi/env.mjs';
 
 const { uploadsBucket, uploadsAccessKey } = createUploads();
 const thumbnailsBucket = createThumbnails();
-const processUploadsFunctionUrl = createLambdaProcessUploads();
+const processUploadsFunctionUrl = createLambdaProcessUploads(thumbnailsBucket);
 updateEnv({
     uploadsBucket,
     uploadsAccessKey,

aws/lambda/func/processUpload/index.mjs

@@ -11,37 +11,51 @@ import { finished } from 'stream/promises';
 import Jimp from "jimp";
 
 export const handler = async (event) => {
-    const input = JSON.parse(event.body) || event;
-    const url = input.url;
-    const fileType = input.fileType;
-    const id = input.id;
+    let input = {};
+    let url = '';
+    let fileType = '';
+    let id = '';
+    let out = { "statusCode": 500, "body": { "error": { "code": 500, message: "Failed to start process" } } };
+    try {
+        input = 'body' in event ? JSON.parse(event.body) : event;
+        url = input.url;
+        fileType = input.fileType;
+        id = input.id;
+    }
+    catch {
+        out = formatError('Unable to initialize post processing, perhaps you did not send a valid json body.')
+    }
     try {
         if (['bmp', 'png', 'tiff', 'webp', 'tif', 'psd', 'svg', 'jpeg', 'jpg', 'gif', 'heic', 'heif', 'avci', 'avif', 'icns', 'ico', 'j2c', 'jp2', 'ktx', 'pnm', 'pam', 'pbm', 'pfm', 'pgm', 'ppm', 'tga', 'cur', 'dds'].includes(fileType)) {
-            return formatResponse(await getImageInfo(url));
+            out = formatResponse(await getImageInfo(url, id));
         }
         else if (['pdf'].includes(fileType)) {
-            return formatResponse(await getPdfInfo(url));
+            out = formatResponse(await getPdfInfo(url));
         }
         else if (['zip'].includes(fileType)) {
-            return formatResponse(await getZipInfo(url));
+            out = formatResponse(await getZipInfo(url));
+        }
+        else {
+            out = formatError(`File type ${fileType} cannot be processed by this service.`);
         }
-        return formatError(`File type ${fileType} cannot be processed by this service.`);
     }
-    catch {
-        return formatError(`Unable to process url ${url} of type ${fileType} for id ${id}.`);
+    catch (e) {
+        out = formatError(`Unable to process url ${url} of type ${fileType} for id ${id}, because ${JSON.stringify(e)}`);
     }
+    return out;
 };
 
+
 function formatError(message, code = 500) {
-    return context.succeed({
+    return {
         statusCode: code,
         body: {
             error: {
                 code,
                 message
             }
         }
-    })
+    }
 }
 
 function formatResponse(body) {
@@ -53,6 +67,8 @@ function formatResponse(body) {
 
 async function getZipInfo(url) {
     const filePath = await downloadFile(url);
+    if (!fs.existsSync(filePath))
+        return formatError(`Could not download file from ${url}`);
     const zip = new AdmZip(filePath);
     const zipEntries = zip.getEntries();
     const out = { files: [], sizeInBytes: getFileSize(filePath) };
@@ -68,13 +84,15 @@ async function getZipInfo(url) {
     return out;
 }
 
-async function getImageInfo(url) {
+async function getImageInfo(url, id) {
     const filePath = await downloadFile(url);
+    if (!fs.existsSync(filePath))
+        return formatError(`Could not download file from ${url}`);
     const out = sizeOf(filePath);
     if (['png', 'jpg', 'jpeg', 'gif', 'bmp', 'tif', 'tiff'].includes(out.type)) {
-        Jimp.read(filePath).then(image => {
-            image.resize(out.width > out.height ? 300 : Jimp.AUTO, out.width < out.height ? 300 : Jimp.AUTO).write('/tmp/thumbnail.png');
-        });
+        const image = await Jimp.read(filePath);
+        await image.resize(out.width > out.height ? 300 : Jimp.AUTO, out.width < out.height ? 300 : Jimp.AUTO).write('/tmp/thumbnail.png');
+        await uploadThumbnail('/tmp/thumbnail.png', `${id}.png`, process.env.AWS_THUMBNAILS_BUCKET);
         out.thumbnail = true;
     }
     delete out.type;

pulumi/lambda-process-uploads.mjs

@@ -4,7 +4,7 @@ import { local } from "@pulumi/command";
 //import * as archive from "@pulumi/archive";
 
 
-export const createLambdaProcessUploads = () => {
+export const createLambdaProcessUploads = (thumbnailsBucket) => {
     const projectName = pulumi.getProject();
 
     const createNodeModsZip = new local.Command('createNodeModsZip', {
@@ -48,6 +48,11 @@ export const createLambdaProcessUploads = () => {
         }),
         timeout: 60,
         memorySize: 512,
+        environment: {
+            variables: {
+                AWS_THUMBNAILS_BUCKET: thumbnailsBucket.id.apply(id => `"${id}"`),
+            }
+        },
         layers: [nodeModsLayer.arn],
         role: iamForLambda.arn,
     });