2.0.0

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -36,6 +39,7 @@ auditProductionDependencies:
     - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
+  allow_failure: true
 
 auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

package.json

@@ -1,30 +1,30 @@
 {
   "name": "@pushrocks/smartpuppeteer",
-  "version": "1.0.21",
+  "version": "2.0.0",
   "private": false,
   "description": "simplified access to puppeteer",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "(tstest test/)",
+    "test": "tstest test/",
-    "build": "(tsbuild --web)",
+    "build": "tsbuild --web --allowimplicitany"
-    "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.60",
-    "@gitzone/tstest": "^1.0.52",
+    "@gitzone/tstest": "^1.0.69",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^14.14.20",
+    "@types/node": "^17.0.23",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartenv": "^4.0.16",
+    "@pushrocks/smartshell": "^2.0.30",
-    "@types/puppeteer": "^5.4.2",
+    "puppeteer": "^13.5.1",
-    "puppeteer": "^5.5.0"
+    "tree-kill": "^1.2.2"
   },
   "files": [
     "ts/**/*",

test/test.ts

@@ -1,11 +1,19 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartpuppeteer from '../ts/index';
+import * as smartpuppeteer from '../ts/index.js';
 
 tap.test('first test', async (tools) => {
   const headlessBrowser = await smartpuppeteer.getEnvAwareBrowserInstance({
     forceNoSandbox: true,
   });
+  const page = await headlessBrowser.newPage();
   await headlessBrowser.close();
 });
 
+tap.test('should get and stop an Incognito browser', async () => {
+  const incognitoInstance = new smartpuppeteer.IncognitoBrowser();
+  await incognitoInstance.start();
+  const page = await incognitoInstance.browser.newPage();
+  await incognitoInstance.stop();
+});
+
 tap.start();

ts/index.ts

@@ -1,8 +1,8 @@
 // module exports
 
-export * from './smartpuppeteer.classes.smartpuppeteer';
+export * from './smartpuppeteer.classes.smartpuppeteer.js';
-export * from './smartpuppeteer.classes.incognitobrowser';
+export * from './smartpuppeteer.classes.incognitobrowser.js';
 
 // direct exports
-import { puppeteer } from './smartpuppeteer.plugins';
+import { puppeteer } from './smartpuppeteer.plugins.js';
 export { puppeteer };

ts/smartpuppeteer.classes.incognitobrowser.ts

@@ -1,5 +1,5 @@
-import { getEnvAwareBrowserInstance } from './smartpuppeteer.classes.smartpuppeteer';
+import { getEnvAwareBrowserInstance } from './smartpuppeteer.classes.smartpuppeteer.js';
-import * as plugins from './smartpuppeteer.plugins';
+import * as plugins from './smartpuppeteer.plugins.js';
 
 export class IncognitoBrowser {
   public status: 'started' | 'stopped' = 'stopped';
@@ -13,7 +13,7 @@ export class IncognitoBrowser {
   public async start() {
     this.status = 'started';
     this.browser = await getEnvAwareBrowserInstance();
-    this.browser.addListener('disconnected', async (eventArg) => {
+    this.browser.on('disconnected', async (eventArg) => {
       try {
         this.browser.removeAllListeners();
       } catch (err) {}
@@ -28,13 +28,14 @@ export class IncognitoBrowser {
    */
   public async stop() {
     this.status = 'stopped';
+    plugins.treeKill(this.browser.process().pid, 'SIGKILL');
     await this.browser.close();
   }
 
   /**
    * rotate
    */
-  public async rotateBrowser () {
+  public async rotateBrowser() {
     this.browser.close().catch();
     this.browser = await getEnvAwareBrowserInstance();
   }

ts/smartpuppeteer.classes.smartpuppeteer.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartpuppeteer.plugins';
+import * as plugins from './smartpuppeteer.plugins.js';
 
 export interface IEnvAwareOptions {
   forceNoSandbox?: boolean;
@@ -7,7 +7,6 @@ export interface IEnvAwareOptions {
 export const getEnvAwareBrowserInstance = async (
   optionsArg: IEnvAwareOptions = {}
 ): Promise<plugins.puppeteer.Browser> => {
-  const smartenv = new plugins.smartenv.Smartenv();
   const options: IEnvAwareOptions = {
     ...{
       forceNoSandbox: false,
@@ -25,7 +24,16 @@ export const getEnvAwareBrowserInstance = async (
   console.log(chromeArgs);
   headlessBrowser = await plugins.puppeteer.launch({
     args: chromeArgs,
-    pipe: true
+    pipe: true,
+    headless: true,
+    ...(() => {
+      const returnObject: any = {};
+      const googleChrome = plugins.smartshell.which.sync('google-chrome');
+      if (googleChrome) {
+        returnObject.executablePath = googleChrome;
+      }
+      return returnObject;
+    })(),
   });
 
   return headlessBrowser;

ts/smartpuppeteer.plugins.ts

@@ -5,11 +5,12 @@ export { os };
 
 // @pushrocks scope
 import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartenv from '@pushrocks/smartenv';
+import * as smartshell from '@pushrocks/smartshell';
 
-export { smartdelay, smartenv };
+export { smartdelay, smartshell };
 
 // third party scope
 import puppeteer from 'puppeteer';
+import treeKill from 'tree-kill';
 
-export { puppeteer };
+export { puppeteer, treeKill };