1.0.10

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,10 +18,11 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 snyk:
   stage: security
@@ -31,89 +32,89 @@ snyk:
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - priv
 
-testSTABLE:
+testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -121,5 +122,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpuppeteer",
-  "version": "1.0.6",
+  "version": "1.0.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -145,6 +145,17 @@
         "@pushrocks/smartpromise": "^3.0.6"
       }
     },
+    "@pushrocks/smartenv": {
+      "version": "4.0.8",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartenv/-/smartenv-4.0.8.tgz",
+      "integrity": "sha512-gKEL1/ogJwss2b/xjbOen5s+9geT5XUvNXuD1qUpc1t5P9w0BaXXuLw7vz1pVRxb/NWtmPLRIdVbAxL1OmmwCg==",
+      "requires": {
+        "@pushrocks/smartparam": "^1.0.4",
+        "@pushrocks/smartpromise": "^3.0.6",
+        "@types/node": "^12.12.7",
+        "is-wsl": "^2.1.1"
+      }
+    },
     "@pushrocks/smartevent": {
       "version": "2.0.3",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartevent/-/smartevent-2.0.3.tgz",
@@ -244,7 +255,6 @@
       "version": "1.0.4",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartparam/-/smartparam-1.0.4.tgz",
       "integrity": "sha512-UAqhnTQGBaJRptTK3qTd47Yt2ZTrAWByteow4auSNZD+k0xrpY9mTPPgKh0IwsURe0cZhj7zYNpGiekhKkL4rA==",
-      "dev": true,
       "requires": {
         "@pushrocks/smartpromise": "^2.0.5",
         "is-promise": "^2.1.0",
@@ -254,8 +264,7 @@
         "@pushrocks/smartpromise": {
           "version": "2.0.5",
           "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
-          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
-          "dev": true
+          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
         }
       }
     },
@@ -268,8 +277,7 @@
     "@pushrocks/smartpromise": {
       "version": "3.0.6",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.0.6.tgz",
-      "integrity": "sha512-vlQlBGNVIjfClgnsfgQBU6GIKcskYSFzEcKLt18ngPzPEcjKklXcxaqzLXpnoxR+KBh30QPE8255ncYHXuPPOg==",
-      "dev": true
+      "integrity": "sha512-vlQlBGNVIjfClgnsfgQBU6GIKcskYSFzEcKLt18ngPzPEcjKklXcxaqzLXpnoxR+KBh30QPE8255ncYHXuPPOg=="
     },
     "@pushrocks/smartrequest": {
       "version": "1.1.42",
@@ -999,8 +1007,7 @@
     "is-promise": {
       "version": "2.1.0",
       "resolved": "https://verdaccio.lossless.one/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
     },
     "is-stream": {
       "version": "1.1.0",
@@ -1008,6 +1015,11 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-wsl": {
+      "version": "2.1.1",
+      "resolved": "https://verdaccio.lossless.one/is-wsl/-/is-wsl-2.1.1.tgz",
+      "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog=="
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://verdaccio.lossless.one/isarray/-/isarray-1.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpuppeteer",
-  "version": "1.0.6",
+  "version": "1.0.10",
   "private": false,
   "description": "simplified access to puppeteer",
   "main": "dist/index.js",
@@ -21,15 +21,17 @@
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
+    "@pushrocks/smartenv": "^4.0.8",
     "@types/puppeteer": "^1.20.2",
     "puppeteer": "^2.0.0"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -18,9 +18,18 @@ simplified access to puppeteer
 
 ## Usage
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

ts/index.ts

@@ -1,25 +1,7 @@
-import puppeteer from 'puppeteer';
+// module exports
 
-export interface IEnvAwareOptions {
-  forceNoSandbox?: boolean;
-}
-
-export const getEnvAwareBrowserInstance = async (optionsArg: IEnvAwareOptions = {}): Promise<puppeteer.Browser> => {
-  const options: IEnvAwareOptions = {
-    ...{
-      forceNoSandbox: false
-    },
-    ...optionsArg
-  }
-  
-  let chromeArgs: string[] = [];
-  if (process.env.CI || options.forceNoSandbox) {
-    chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']);
-  }
-  const headlessBrowser = await puppeteer.launch({
-    args: chromeArgs
-  });
-  return headlessBrowser;
-};
+export * from './smartpuppeteer.classes.smartpuppeteer';
 
+// direct exports
+import { puppeteer } from './smartpuppeteer.plugins';
 export { puppeteer };

ts/smartpuppeteer.classes.smartpuppeteer.ts

@@ -0,0 +1,50 @@
+import * as plugins from './smartpuppeteer.plugins';
+
+export interface IEnvAwareOptions {
+  forceNoSandbox?: boolean;
+}
+
+export const getEnvAwareBrowserInstance = async (
+  optionsArg: IEnvAwareOptions = {}
+): Promise<plugins.puppeteer.Browser> => {
+  const smartenv = new plugins.smartenv.Smartenv();
+  const options: IEnvAwareOptions = {
+    ...{
+      forceNoSandbox: false
+    },
+    ...optionsArg
+  };
+
+  let chromeArgs: string[] = [];
+  if ((process.env.CI || options.forceNoSandbox) && !smartenv.isWsl) {
+    chromeArgs = chromeArgs.concat([
+      '--no-sandbox',
+      '--disable-setuid-sandbox',
+      // '--disable-dev-shm-usage'
+    ]);
+  }
+
+  let headlessBrowser: plugins.puppeteer.Browser;
+  if (!smartenv.isWsl) {
+    // lets get the actual instance
+    console.log('launching puppeteer bundled chrome');
+    headlessBrowser = await plugins.puppeteer.launch({
+      args: chromeArgs
+    });
+  } else {
+    console.log('Detected WSL. Using chromium.');
+    headlessBrowser = await plugins.puppeteer.launch({
+      args: [
+        '--disable-gpu',
+        '--disable-dev-shm-usage',
+        '--disable-setuid-sandbox',
+        '--no-first-run',
+        '--no-sandbox',
+        '--no-zygote',
+        '--single-process'
+      ]
+    });
+  }
+
+  return headlessBrowser;
+};

ts/smartpuppeteer.plugins.ts

@@ -0,0 +1,9 @@
+// @pushrocks scope
+import * as smartenv from '@pushrocks/smartenv';
+
+export { smartenv };
+
+// third party scope
+import puppeteer from 'puppeteer';
+
+export { puppeteer };