Merge branch 'master' of git.moenext.com:mycard/sso-renderer

Dockerfile

 FROM node:lts-bullseye-slim as base
 LABEL Author="Nanahira <nanahira@momobako.com>"
 
-RUN apt update && apt -y install python3 build-essential git chromium libnss3 libfreetype6-dev libharfbuzz-bin libharfbuzz-dev ca-certificates fonts-freefont-otf fonts-freefont-ttf fonts-noto-cjk fonts-noto-cjk-extra fonts-wqy-microhei fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*
+RUN apt update && apt -y install python3 build-essential git chromium libnss3 libfreetype6-dev libharfbuzz-bin libharfbuzz-dev ca-certificates fonts-freefont-otf fonts-freefont-ttf fonts-noto-cjk fonts-noto-cjk-extra fonts-wqy-microhei fonts-wqy-zenhei tini && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*
 WORKDIR /usr/src/app
 COPY ./package*.json ./
 
@@ -17,4 +17,5 @@ COPY --from=builder /usr/src/app/dist ./dist
 COPY ./config.example.yaml ./config.yaml
 
 EXPOSE 3000
+ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD [ "npm", "run", "start:prod" ]

src/puppeteer/puppeteer.service.ts

@@ -35,10 +35,12 @@ export class PuppeteerService
     action: (page: Page) => Promise<T>,
   ) {
     const page = await this.browser.newPage();
-    await page.goto(url, { waitUntil: 'networkidle0', timeout: 300000 });
-    const result = await action(page);
-    await page.close();
-    return result;
+    try {
+      await page.goto(url, { waitUntil: 'networkidle0', timeout: 300000 });
+      return await action(page);
+    } finally {
+      await page.close();
+    }
   }
 
   render(url: string) {