Chore: Upgrade dependencies and bump Node to LTS (#218)

* Upgrade node version to LTS (14.16.1)

* Upgrade lodash dep

* Upgrade and clean up deps

* upgrade node in pkg script

* upgrade pkg dep

* fix pkg script for Windows

* downgrade husky

Author: AgnesToulet

.circleci/config.yml

@@ -13,7 +13,7 @@ aliases:
 defaults: &defaults
   working_directory: ~/grafana-image-renderer
   docker:
-    - image: circleci/node:12.13.1-stretch
+    - image: circleci/node:14.16.1-stretch
 
 commands:
   install-grabpl:

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12-alpine AS base
+FROM node:14-alpine AS base
 
 ENV CHROME_BIN="/usr/bin/chromium-browser"
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"

debian.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12-slim AS base
+FROM node:14-slim AS base
 
 ENV CHROME_BIN="google-chrome-unstable"
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"

docs/remote_rendering_using_docker.md

@@ -263,7 +263,7 @@ nodejs_heap_space_size_available_bytes{space="new_large_object"} 1047488 1579444
 
 # HELP nodejs_version_info Node.js version info.
 # TYPE nodejs_version_info gauge
-nodejs_version_info{version="v12.13.1",major="12",minor="13",patch="1"} 1
+nodejs_version_info{version="v14.16.1",major="14",minor="16",patch="1"} 1
 
 # HELP grafana_image_renderer_service_http_request_duration_seconds duration histogram of http responses labeled with: status_code
 # TYPE grafana_image_renderer_service_http_request_duration_seconds histogram

package.json

@@ -25,22 +25,21 @@
     "express": "^4.16.3",
     "express-prom-bundle": "^5.1.5",
     "google-protobuf": "3.5.0",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "minimist": "^1.2.0",
     "morgan": "^1.9.0",
-    "mz": "^2.7.0",
     "prom-client": "^11.5.3",
-    "puppeteer": "^2.0.0",
-    "puppeteer-cluster": "^0.18.0",
+    "puppeteer": "^3.3.0",
+    "puppeteer-cluster": "^0.22.0",
     "unique-filename": "^1.1.0",
     "winston": "^3.2.1"
   },
   "devDependencies": {
     "@types/express": "^4.11.1",
-    "@types/node": "^10.0.9",
-    "husky": "^3.1.0",
+    "@types/node": "^14.14.41",
+    "husky": "^4.3.8",
     "lint-staged": "^9.5.0",
-    "pkg": "4.4.8",
+    "pkg": "^5.1.0",
     "prettier": "^1.19.1",
     "tsc-watch": "^4.2.3",
     "typescript": "^3.8.3"
@@ -64,9 +63,9 @@
   },
   "bin": "build/app.js",
   "engines": {
-    "node": ">=12 <13"
+    "node": ">=14 <15"
   },
   "volta": {
-    "node": "12.19.0"
+    "node": "14.16.1"
   }
 }

scripts/pkg.js

@@ -24,4 +24,4 @@ platform = platformTransform[platform] || platform;
 arch = archTransform[arch] || arch;
 const outputPath = "dist/" + (process.argv[3] || `plugin-${archArg}`);
 
-childProcess.execSync(`./node_modules/.bin/pkg -t node12-${platform}-${arch} . --out-path ${outputPath}`, {stdio: 'inherit'});
+childProcess.execSync(`"./node_modules/.bin/pkg" -t node14-${platform}-${arch} . --out-path ${outputPath}`, {stdio: 'inherit'});

src/service/http-server.ts

@@ -10,6 +10,19 @@ import { ServiceConfig } from '../config';
 import { metricsMiddleware } from './metrics_middleware';
 import { RenderOptions, HTTPHeaders } from '../browser/browser';
 
+export interface RenderRequest {
+  url: string;
+  width: number;
+  height: number;
+  deviceScaleFactor: number;
+  filePath: string;
+  renderKey: string;
+  domain: string;
+  timeout: number;
+  timezone: string;
+  encoding: string;
+}
+
 export class HttpServer {
   app: express.Express;
 
@@ -80,7 +93,7 @@ export class HttpServer {
     await this.browser.start();
   }
 
-  render = async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+  render = async (req: express.Request<any, any, any, RenderRequest, any>, res: express.Response, next: express.NextFunction) => {
     if (!req.query.url) {
       throw boom.badRequest('Missing url parameter');
     }