From 42836b6b38ed9e67b298fa2450afedfc956c0287 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 11 Feb 2022 14:43:47 -0800 Subject: [PATCH] Simplify startup of the puppeteer service - Run on port 9090 so we don't conflict with other services - Route the docker-compose requests to the host network - Dont require preview bucket information on startup --- docker-compose.yml | 2 +- packages/puppeteer-parse/index.js | 9 +++++++-- packages/puppeteer-parse/package.json | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bf9f093f5..4ba5ab4d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,7 +57,7 @@ services: - SSO_JWT_SECRET=some_sso_secret - CLIENT_URL=http://localhost:3000 - GATEWAY_URL=http://localhost:8080/api - - PUPPETEER_TASK_HANDLER_URL=http://localhost:9090/ + - PUPPETEER_TASK_HANDLER_URL=http://host.docker.internal:9090/ - REMINDER_TASK_HANDLER_URL=/svc/reminders/trigger depends_on: migrate: diff --git a/packages/puppeteer-parse/index.js b/packages/puppeteer-parse/index.js index f5bfc3723..b2a47ccbd 100644 --- a/packages/puppeteer-parse/index.js +++ b/packages/puppeteer-parse/index.js @@ -25,8 +25,8 @@ const { pdfHandler } = require('./pdf-handler'); const { mediumHandler } = require('./medium-handler'); const storage = new Storage(); -const previewBucket = storage.bucket(process.env.PREVIEW_IMAGE_BUCKET); -const ALLOWED_ORIGINS = process.env.ALLOWED_ORIGINS.split(','); +const ALLOWED_ORIGINS = process.env.ALLOWED_ORIGINS ? process.env.ALLOWED_ORIGINS.split(',') : []; +const previewBucket = process.env.PREVIEW_IMAGE_BUCKET ? storage.bucket(process.env.PREVIEW_IMAGE_BUCKET) : undefined; Sentry.GCPFunction.init({ dsn: process.env.SENTRY_DSN, @@ -402,6 +402,11 @@ exports.preview = Sentry.GCPFunction.wrapHttpFunction(async (req, res) => { }, }); + if (!process.env.PREVIEW_IMAGE_BUCKET) { + logger.error(`PREVIEW_IMAGE_BUCKET not set`) + return res.sendStatus(500); + } + const url = getUrl(req); console.log('preview request url', url); diff --git a/packages/puppeteer-parse/package.json b/packages/puppeteer-parse/package.json index 8e1cafb66..50e1cdbdf 100644 --- a/packages/puppeteer-parse/package.json +++ b/packages/puppeteer-parse/package.json @@ -20,7 +20,7 @@ "@google-cloud/functions-framework": "^1.7.1" }, "scripts": { - "start": "npx functions-framework --target=puppeteer", + "start": "npx functions-framework --port=9090 --target=puppeteer", "start_preview": "npx functions-framework --target=preview", "test": "yarn mocha" }