prerender updated - headless chrome

.dockerignore

@@ -0,0 +1,6 @@
+# Exclude all...
+*
+# ...but
+!lib
+!server.js
+!package.json

.gitignore

@@ -1 +1,2 @@
 node_modules
+.vscode

Dockerfile

@@ -1,18 +1,24 @@
-FROM node:latest
+FROM node:carbon
 
-MAINTAINER Pablo Ballester
+RUN apt-get update && apt-get install -y \
+	apt-transport-https \
+	ca-certificates \
+	curl \
+	gnupg \
+	--no-install-recommends \
+	&& curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+	&& echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+	&& apt-get update && apt-get install -y \
+	google-chrome-stable \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
-RUN echo deb http://ftp.debian.org/debian/ jessie main contrib non-free > /etc/apt/source.list
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
 
-RUN apt-get update -y && apt-get install -y \
-    python2.7 python-pip \
-    libfreetype6 libfontconfig
+COPY package.json /usr/src/app/
+RUN npm install
 
-RUN mkdir /data
+COPY . /usr/src/app
 
-ADD ./package.json /data/package.json
-RUN cd /data && npm install
-
-ADD . /data/
-
-CMD node /data/server.js
+CMD [ "npm", "start" ]

lib/redisCache.js

@@ -83,7 +83,7 @@ var cleanUrl = function(url) {
 };
 
 module.exports = {
-  beforePhantomRequest: function(req, res, next) {
+  requestReceived: function(req, res, next) {
     if (req.method !== 'GET' || redisOnline !== true) {
       return next();
     }
@@ -99,14 +99,14 @@ module.exports = {
     });
   },
 
-  afterPhantomRequest: function(req, res, next) {
+  pageLoaded: function(req, res, next) {
     if (redisOnline !== true) {
       return next();
     }
     // Don't cache anything that didn't result in a 200. This is to stop caching of 3xx/4xx/5xx status codes
     if (req.prerender.statusCode === 200) {
       var prerenderUrl = cleanUrl(req.prerender.url);
-      client.set(prerenderUrl, req.prerender.documentHTML, function(err, reply) {
+      client.set(prerenderUrl, req.prerender.content, function(err, reply) {
         // If library set to cache set an expiry on the key.
         if (!err && reply && ttl && ttl !== 0) {
           client.expire(prerenderUrl, ttl, function(err, didSetExpiry) {

lib/viewPort.js

@@ -4,17 +4,9 @@ var width = 1024; // 1440;
 var height = 1024; // 718;
 
 module.exports = {
-  onPhantomPageCreate: function (phantom, req, res, next) {
-    req.prerender.page.run(width, height, function (width, height, resolve) {
-      this.viewportSize = {
-        width: width,
-        height: height
-      };
-      resolve();
-    }).then(function () {
-      next();
-    }).catch(function (err) {
-      console.log('custom viewport size error', err);
-    });
+  requestReceived: function (req, res, next) {
+    req.prerender.width = width,
+    req.prerender.height = height
+    next();
   }
 };