added timezone support

Author: torkelo

src/app.ts

@@ -12,8 +12,6 @@ async function main() {
   if (command === undefined) {
     const logger = new PluginLogger();
     const browser = new Browser(logger);
-    await browser.start();
-
     const plugin = new GrpcPlugin(logger, browser);
     plugin.start();
   }
@@ -26,9 +24,8 @@ async function main() {
 
     const logger = new ConsoleLogger();
     const browser = new Browser(logger);
-    await browser.start();
-
     const server = new HttpServer({port: argv.port}, logger, browser);
+
     server.start();
 
   } else {

src/browser.ts

@@ -1,24 +1,13 @@
 import * as os from 'os';
 import * as puppeteer from 'puppeteer';
 import { Logger } from './logger';
-import { registerExitCleanUp } from './exit';
 import uniqueFilename = require('unique-filename');
 
 export class Browser {
-  private instance;
 
   constructor(private log: Logger) {
   }
 
-  async start() {
-    this.log.info("Starting chrome");
-    this.instance = await puppeteer.launch();
-
-    registerExitCleanUp(() => {
-      this.instance.close();
-    });
-  }
-
   validateOptions(options) {
     options.width = parseInt(options.width) || 1000;
     options.height = parseInt(options.height) || 500;
@@ -34,40 +23,57 @@ export class Browser {
   }
 
   async render(options) {
-    const page = await this.instance.newPage();
-
-    this.validateOptions(options);
-
-    await page.setViewport({
-      width: options.width,
-      height: options.height,
-      deviceScaleFactor: 1,
-    });
-
-    await page.setCookie({
-      'name': 'renderKey',
-      'value': options.renderKey,
-      'domain': options.domain,
-    });
-
-    await page.goto(options.url);
-
-    // wait for all panels to render
-    await page.waitForFunction(() => {
-      var panelCount = document.querySelectorAll('.panel').length;
-      return (<any>window).panelsRendered >= panelCount;
-    }, {
-      timeout: options.timeout * 1000
-    });
-
-    if (!options.filePath) {
-      options.filePath = uniqueFilename(os.tmpdir()) + '.png';
+    let browser;
+    let page;
+    let env = Object.assign({}, process.env);
+
+    try {
+      this.validateOptions(options);
+
+      // set env timezone
+      env.TZ = options.timezone || process.env.TZ;
+
+      browser = await puppeteer.launch({env: env});
+      page = await browser.newPage();
+
+      await page.setViewport({
+        width: options.width,
+        height: options.height,
+        deviceScaleFactor: 1,
+      });
+
+      await page.setCookie({
+        'name': 'renderKey',
+        'value': options.renderKey,
+        'domain': options.domain,
+      });
+
+      await page.goto(options.url);
+
+      // wait for all panels to render
+      await page.waitForFunction(() => {
+        var panelCount = document.querySelectorAll('.panel').length;
+        return (<any>window).panelsRendered >= panelCount;
+      }, {
+        timeout: options.timeout * 1000
+      });
+
+      if (!options.filePath) {
+        options.filePath = uniqueFilename(os.tmpdir()) + '.png';
+      }
+
+      await page.screenshot({path: options.filePath});
+
+      return { filePath: options.filePath };
+
+    } finally {
+      if (page) {
+        await page.close();
+      }
+      if (browser) {
+        await browser.close();
+      }
     }
-
-    await page.screenshot({path: options.filePath});
-    page.close();
-
-    return { filePath: options.filePath };
   }
 }