Merge branch 'master' into kagiura/mobility

Author: zwliew

.circleci/config.yml

@@ -92,7 +92,9 @@ jobs:
           command: |
             set -e
             yarn test --runInBand --reporters=default --reporters=jest-junit
-            yarn codecov --disable=gcov -f ./coverage/coverage-final.json
+            if [ "${CIRCLE_BRANCH}" != "master" ] && [ "${CIRCLE_BRANCH}" != "production" ]; then
+              yarn codecov --disable=gcov -f ./coverage/coverage-final.json
+            fi
       - run:
           name: Integration tests
           environment:

export/package.json

@@ -18,18 +18,19 @@
   },
   "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",
     "http-graceful-shutdown": "2.4.0",
+    "joi": "^17.12.3",
     "koa": "2.14.2",
     "koa-router": "10.1.1",
     "koa-views": "6.3.1",
     "lodash": "4.17.21",
     "nodemon": "2.0.22",
-    "pug": "3.0.2",
-    "puppeteer-core": "10.4.0"
+    "pug": "3.0.3",
+    "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/data.ts

@@ -2,6 +2,7 @@ import path from 'path';
 import fs from 'fs-extra';
 import axios from 'axios';
 import _ from 'lodash';
+import Joi from 'joi';
 import type { Middleware } from 'koa';
 
 import config from './config';
@@ -60,20 +61,26 @@ export const parseExportData: Middleware<State> = (ctx, next) => {
 export function validateExportData(data: PageData) {
   if (!_.isObject(data)) throw new Error('data should be an object');
 
-  if (!_.isInteger(data.semester) || data.semester < 1 || data.semester > 4) {
-    throw new Error('Invalid semester');
-  }
-
-  // TODO: Improve these validation
-  if (!_.isObject(data.timetable)) {
-    throw new Error('Invalid timetable');
-  }
-
-  if (!_.isObject(data.settings)) {
-    throw new Error('Invalid settings');
-  }
+  const timetableSchema = Joi.object().pattern(
+    Joi.string(),
+    Joi.object().pattern(Joi.string(), Joi.string()),
+  );
+  const themeSchema = Joi.object({
+    id: Joi.string(),
+    timetableOrientation: Joi.string().valid('HORIZONTAL', 'VERTICAL'),
+    showTitle: Joi.boolean(),
+  });
+  const pageDataSchema = Joi.object({
+    semester: Joi.number().integer().greater(0).less(5),
+    timetable: timetableSchema,
+    settings: Joi.object({
+      hiddenInTimeTable: Joi.array().items(Joi.string()),
+    }),
+    theme: themeSchema,
+  });
 
-  if (!_.isObject(data.theme)) {
-    throw new Error('Invalid theme');
+  const result = pageDataSchema.validate(data, { allowUnknown: true });
+  if (result.error !== undefined) {
+    throw new Error(JSON.stringify(result.error));
   }
 }

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();