Merge pull request #20 from sambaiz/revert-17-v1.1support

Revert "puppeteer 1.1.1 & headless-chromium 66.0.3348.0"

Author: sambaiz

README.md

@@ -49,13 +49,15 @@ In that case, put Chrome in S3 and download it at container startup so startup t
 Run `npm run package-nochrome`, deploy the package.zip, and set following env valiables on Lambda.
 
 - `CHROME_BUCKET`(required): S3 bucket where Chrome is put
-- `CHROME_KEY`(optional): S3 key. default: `headless-chromium.tar.gz`
+- `CHROME_KEY`(optional): S3 key. default: `headless_shell.tar.gz`
 
-## Build Headless Chromium (optional)
+## Build Headless-Chrome (optional)
 
-This kit includes Chromium built using [serverless-chrome](https://github.com/adieuadieu/serverless-chrome)'s [ec2-build.sh](https://github.com/adieuadieu/serverless-chrome/blob/master/docs/chrome.md#with-aws-ec2) script because official build Chrome installed by Puppeteer has problems about running on Lambda (missing shared library etc.).
+This kit includes Chrome built by myself because official build Chrome installed by Puppeteer has problems about running on Lambda (missing shared library etc.).
 
-If you want to use own build, link to `headless-chromium.tar.gz` in `chrome` dir.
+If you want to use latest chrome, run chrome/buildChrome.sh on EC2 having at least 16GB memory and 30GB volume. 
+See also [serverless-chrome](https://github.com/adieuadieu/serverless-chrome/blob/master/chrome/README.md).
+Once you build it, link to `headless_shell.tar.gz` in `chrome` dir.
 
 ## Article
 

chrome/headless-chromium-66.0.3348.0-amazonlinux-2017-03.tar.gz renamed to chrome/HeadlessChrome-63.0.3213.0.tar.gz

@@ -0,0 +1,35 @@
+# build headless chrome on EC2
+# https://github.com/adieuadieu/serverless-chrome/blob/master/chrome/README.md
+
+# sudo su
+
+yum install -y git redhat-lsb python bzip2 tar pkgconfig atk-devel alsa-lib-devel bison binutils brlapi-devel bluez-libs-devel bzip2-devel cairo-devel cups-devel dbus-devel dbus-glib-devel expat-devel fontconfig-devel freetype-devel gcc-c++ GConf2-devel glib2-devel glibc.i686 gperf glib2-devel gtk2-devel gtk3-devel java-1.*.0-openjdk-devel libatomic libcap-devel libffi-devel libgcc.i686 libgnome-keyring-devel libjpeg-devel libstdc++.i686 libX11-devel libXScrnSaver-devel libXtst-devel libxkbcommon-x11-devel ncurses-compat-libs nspr-devel nss-devel pam-devel pango-devel pciutils-devel pulseaudio-libs-devel zlib.i686 httpd mod_ssl php php-cli python-psutil wdiff --enablerepo=epel
+
+cd ~
+git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+echo "export PATH=$PATH:$HOME/depot_tools" >> ~/.bash_profile
+source ~/.bash_profile
+
+mkdir Chromium
+cd Chromium
+fetch --no-history chromium
+cd src
+
+# use /tmp instead of /dev/shm
+# https://groups.google.com/a/chromium.org/forum/#!msg/headless-dev/qqbZVZ2IwEw/CPInd55OBgAJ
+sed -i -e "s/use_dev_shm = true;/use_dev_shm = false;/g" base/files/file_util_posix.cc
+
+mkdir -p out/Headless
+echo 'import("//build/args/headless.gn")' > out/Headless/args.gn
+echo 'is_debug = false' >> out/Headless/args.gn
+echo 'symbol_level = 0' >> out/Headless/args.gn
+echo 'is_component_build = false' >> out/Headless/args.gn
+echo 'remove_webcore_debug_symbols = true' >> out/Headless/args.gn
+echo 'enable_nacl = false' >> out/Headless/args.gn
+gn gen out/Headless
+ninja -C out/Headless headless_shell
+
+cd out/Headless
+tar -zcvf /home/ec2-user/headless_shell.tar.gz headless_shell 
+
+# scp [email protected]:~/headless_shell.tar.gz .

chrome/buildChrome.sh

@@ -0,0 +1 @@
+HeadlessChrome-63.0.3213.0.tar.gz

chrome/headless-chromium.tar.gz

@@ -3,15 +3,15 @@
   "version": "0.9.4",
   "description": "Starter Kit for running Headless-Chrome by Puppeteer on AWS Lambda",
   "scripts": {
-    "package": "npm run package-prepare && cp chrome/headless-chromium.tar.gz dist && cd dist && zip -rq ../package.zip .",
+    "package": "npm run package-prepare && cp chrome/headless_shell.tar.gz dist && cd dist && zip -rq ../package.zip .",
     "package-nochrome": "npm run package-prepare && cd dist && zip -rq ../package.zip .",
     "package-prepare": "npm run lint && npm run babel && cp -r package.json dist && cd dist && PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 npm install --production",
     "babel": "rm -rf dist && mkdir dist && ./node_modules/.bin/babel src --out-dir dist",
     "local": "npm run babel && cp -r node_modules dist && node dist/starter-kit/local.js",
     "lint": "./node_modules/.bin/eslint src"
   },
   "dependencies": {
-    "puppeteer": "^1.1.1",
+    "puppeteer": "^0.10.2",
     "tar": "^4.0.1"
   },
   "devDependencies": {

chrome/headless_shell.tar.gz

@@ -9,14 +9,14 @@ const launchOptionForLambda = [
     '--single-process',
 ];
 
-const localChromePath = path.join('headless-chromium.tar.gz');
+const localChromePath = path.join('headless_shell.tar.gz');
 const remoteChromeS3Bucket = process.env.CHROME_BUCKET;
-const remoteChromeS3Key = process.env.CHROME_KEY || 'headless-chromium.tar.gz';
+const remoteChromeS3Key = process.env.CHROME_KEY || 'headless_shell.tar.gz';
 
 const setupChromePath = path.join(path.sep, 'tmp');
 const executablePath = path.join(
     setupChromePath,
-    'headless-chromium'
+    'headless_shell'
 );
 
 const DEBUG = process.env.DEBUG;

package.json

@@ -1848,9 +1848,9 @@ punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-puppeteer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.1.1.tgz#adbf25e49f5ef03443c10ab8e09a954ca0c7bfee"
+puppeteer@^0.10.2:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-0.10.2.tgz#b4a959a722bf626ca481f2aeba11fdb810f2c98f"
   dependencies:
     debug "^2.6.8"
     extract-zip "^1.6.5"