fix(export): restore timetable exports through better versioning (#3736)

Author: kokrui

export/package.json

@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@sentry/node": "5.30.0",
-    "@sparticuz/chromium": "92.0.0",
+    "@sparticuz/chromium": "^123.0.0",
     "axios": "0.27.2",
     "bunyan": "1.8.15",
     "fs-extra": "9.1.0",
@@ -30,7 +30,7 @@
     "lodash": "4.17.21",
     "nodemon": "2.0.22",
     "pug": "3.0.3",
-    "puppeteer-core": "10.4.0"
+    "puppeteer-core": "22.6.4"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.13",

export/src/app.ts

@@ -29,8 +29,8 @@ router
       typeof width !== 'undefined' &&
       !Number.isNaN(height) && // accept floats
       !Number.isNaN(width) && // accept floats
-      height > 0 &&
-      width > 0
+      Number(height) > 0 &&
+      Number(width) > 0
     ) {
       options = {
         ...options,

export/src/handler.ts

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/node';
-import type { NowApiHandler, NowRequest, NowResponse } from '@vercel/node';
+import type { VercelApiHandler, VercelRequest, VercelResponse } from '@vercel/node';
 import type { Page } from 'puppeteer-core';
 
 import * as render from './render-serverless';
@@ -38,9 +38,9 @@ function setUpSentry() {
  * @returns A Vercel serverless function handler.
  */
 export function makeExportHandler<T>(
-  parseExportData: (request: NowRequest) => T,
-  performExport: (response: NowResponse, page: Page, data: T) => void | Promise<void>,
-): NowApiHandler {
+  parseExportData: (request: VercelRequest) => T,
+  performExport: (response: VercelResponse, page: Page, data: T) => void | Promise<void>,
+): VercelApiHandler {
   return async function handler(request, response) {
     try {
       throwIfAcademicYearNotSet();

export/src/render-serverless.ts

@@ -23,11 +23,15 @@ async function setViewport(page: Page, options: ViewportOptions = {}) {
 }
 
 export async function open(url: string) {
+  const executablePath = await chromium.executablePath();
+
+  chromium.setGraphicsMode = false;
+
   const browser = await puppeteer.launch({
     // devtools: !!process.env.DEVTOOLS, // TODO: Query string && NODE_ENV === 'development'?
     args: chromium.args,
     defaultViewport: chromium.defaultViewport,
-    executablePath: await chromium.executablePath,
+    executablePath: executablePath,
     headless: chromium.headless,
   });
 

export/src/render.ts

@@ -25,14 +25,9 @@ async function setViewport(page: Page, options: ViewportOptions = {}) {
 
 export async function launch() {
   const browser = await puppeteer.launch({
+    headless: true,
     executablePath: config.chromeExecutable,
     devtools: !!process.env.DEVTOOLS,
-    args: [
-      '--headless',
-      '--disable-gpu',
-      '--disable-software-rasterizer',
-      '--disable-dev-shm-usage',
-    ],
   });
 
   const page = await browser.newPage();