2.0.5

.gitlab-ci.yml

@@ -124,7 +124,7 @@ pages:
   stage: metadata
   script:
     - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci command npm install -g @git.zone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc

changelog.md

@@ -0,0 +1,33 @@
+# Changelog
+
+## 2025-02-25 - 2.0.5 - fix(dependencies)
+Update dependencies including Puppeteer and node types.
+
+- Updated Puppeteer version from ^22.6.4 to ^24.3.0.
+- Updated @types/node version from ^20.12.7 to ^22.13.5.
+
+## 2025-02-25 - 2.0.4 - fix(IncognitoBrowser)
+Enhance IncognitoBrowser error handling and process management
+
+- Improve error handling during browser disconnection and process management.
+- Ensure safe re-launch of the browser if it disconnects while the status is 'started'.
+- Add logging for critical operations like launching without sandbox.
+
+## 2024-04-12 to 2024-05-29 - 2.0.3 - Minor Updates
+Various minor updates and configuration changes were made during this period.
+
+- Updated project description.
+- Updated TypeScript configuration.
+
+## 2023-07-10 to 2024-04-12 - 2.0.2 - Organizational and Configuration Updates
+This release cycle focused on organizational changes and configuration updates.
+
+- Switched to new organization scheme.
+- Updated `npmextra.json` to include new git host information.
+- Made updates to TypeScript configuration.
+
+## 2022-03-24 to 2022-07-18 - 2.0.0 to 2.0.1 - Core Updates and Fixes
+During these versions, significant internal changes were made with continued improvements.
+
+- **BREAKING CHANGE:** Switched to ECMAScript Modules (ESM) format.
+- Multiple fixes in the core module, enhancing stability.

npmextra.json

@@ -2,17 +2,30 @@
   "gitzone": {
     "projectType": "npm",
     "module": {
-      "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "githost": "code.foss.global",
+      "gitscope": "push.rocks",
       "gitrepo": "smartpuppeteer",
       "shortDescription": "simplified access to puppeteer",
-      "npmPackagename": "@pushrocks/smartpuppeteer",
+      "npmPackagename": "@push.rocks/smartpuppeteer",
       "license": "MIT",
-      "projectDomain": "push.rocks"
+      "projectDomain": "push.rocks",
+      "description": "Provides simplified access to Puppeteer for automation and testing purposes.",
+      "keywords": [
+        "puppeteer",
+        "automation",
+        "browser automation",
+        "web scraping",
+        "testing",
+        "headless browsing",
+        "incognito browsing"
+      ]
     }
   },
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "tsdoc": {
+    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
   }
 }

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "@pushrocks/smartpuppeteer",
-  "version": "2.0.0",
+  "name": "@push.rocks/smartpuppeteer",
+  "version": "2.0.5",
   "private": false,
-  "description": "simplified access to puppeteer",
+  "description": "Provides simplified access to Puppeteer for automation and testing purposes.",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
   "type": "module",
@@ -13,17 +13,16 @@
     "build": "tsbuild --web --allowimplicitany"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.60",
-    "@gitzone/tstest": "^1.0.69",
-    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^17.0.23",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
+    "@git.zone/tsbuild": "^2.1.63",
+    "@git.zone/tsrun": "^1.2.46",
+    "@git.zone/tstest": "^1.0.71",
+    "@push.rocks/tapbundle": "^5.0.8",
+    "@types/node": "^22.13.5"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartshell": "^2.0.30",
-    "puppeteer": "^13.5.1",
+    "@push.rocks/smartdelay": "^3.0.1",
+    "@push.rocks/smartshell": "^3.0.3",
+    "puppeteer": "^24.3.0",
     "tree-kill": "^1.2.2"
   },
   "files": [
@@ -40,5 +39,19 @@
   ],
   "browserslist": [
     "last 1 chrome versions"
-  ]
+  ],
+  "keywords": [
+    "puppeteer",
+    "automation",
+    "browser automation",
+    "web scraping",
+    "testing",
+    "headless browsing",
+    "incognito browsing"
+  ],
+  "homepage": "https://code.foss.global/push.rocks/smartpuppeteer",
+  "repository": {
+    "type": "git",
+    "url": "https://code.foss.global/push.rocks/smartpuppeteer.git"
+  }
 }

readme.hints.md

@@ -0,0 +1 @@
+ 

readme.md

@@ -1,46 +1,133 @@
-# @pushrocks/smartpuppeteer
+# @push.rocks/smartpuppeteer
 simplified access to puppeteer
 
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartpuppeteer)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartpuppeteer)
-* [github.com (source mirror)](https://github.com/pushrocks/smartpuppeteer)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartpuppeteer/)
+## Install
+To install `@push.rocks/smartpuppeteer` in your project, run the following command using npm:
 
-## Status for master
-
-Status Category | Status Badge
--- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartpuppeteer/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartpuppeteer/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartpuppeteer)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartpuppeteer)](https://lossless.cloud)
-TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
-node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartpuppeteer)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartpuppeteer)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartpuppeteer)](https://lossless.cloud)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
-
-## Usage
-
-Use TypeScript for best in class intellisense.
-
-```typescript
-const headlessBrowser = await smartpuppeteer.getEnvAwareBrowserInstance({
-  forceNoSandbox: true, // if you really want no sandbox, you can do this. Otherwise its starting things as necessary
-});
-await headlessBrowser.close();
+```sh
+npm install @push.rocks/smartpuppeteer --save
 ```
 
-## Contribution
+Or using yarn:
 
-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). :)
+```sh
+yarn add @push.rocks/smartpuppeteer
+```
 
-For further information read the linked docs at the top of this readme.
+## Usage
+`@push.rocks/smartpuppeteer` simplifies interaction with Puppeteer, providing easier ways to launch Puppeteer instances considering environment constraints, such as running in a CI pipeline or as root, which necessitates certain flags for Chrome.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+Here, we give a comprehensive guide to using `@push.rocks/smartpuppeteer` in various scenarios, using ESM syntax and TypeScript.
 
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)
+### Basic Setup
+Firstly, let’s set up the basic environment for using `@push.rocks/smartpuppeteer`:
+
+```typescript
+import { getEnvAwareBrowserInstance, IncognitoBrowser, puppeteer } from '@push.rocks/smartpuppeteer';
+
+// Usually, you would initialize the browser instance at the start of your script or application logic
+const initializeBrowser = async () => {
+  const browser = await getEnvAwareBrowserInstance({
+    forceNoSandbox: true, // A flag useful for certain environments; use it with caution
+  });
+  return browser;
+};
+```
+
+### Opening a Page and Navigating
+After obtaining a browser instance, you commonly want to open a page and navigate to a URL:
+
+```typescript
+const openPage = async (browser: puppeteer.Browser) => {
+  const page = await browser.newPage();
+  await page.goto('https://www.example.com');
+  const pageTitle = await page.title();
+  console.log(`Page title: ${pageTitle}`);
+  // Always close the browser after you are done to free resources
+  await browser.close();
+};
+
+// Utilize the async function
+initializeBrowser()
+  .then(openPage)
+  .catch(console.error);
+```
+
+### Using Incognito Mode for Isolated Sessions
+`@push.rocks/smartpuppeteer` offers easy management of incognito sessions, allowing isolated environments within the same browser instance:
+
+```typescript
+const useIncognitoBrowser = async () => {
+  const incognitoBrowser = new IncognitoBrowser();
+  await incognitoBrowser.start(); // Initializes a new incognito browser instance
+  const context = await incognitoBrowser.getNewIncognitoContext();
+  const page = await context.newPage();
+  await page.goto('https://www.privacyfocusedsite.com');
+  // Perform actions in the isolated session
+  // Tidy up
+  await incognitoBrowser.stop(); // Stops the incognito browser and closes all its pages and contexts
+};
+
+useIncognitoBrowser()
+  .then(() => console.log('Incognito session used successfully'))
+  .catch(console.error);
+```
+
+### Advanced Configuration
+`@push.rocks/smartpuppeteer` allows further customization for launching the Puppeteer browser, such as disabling the sandbox environment (not recommended for production).
+
+### Handling Browser Events
+It's important to handle browser events, such as disconnections, which might occur due to various reasons:
+
+```typescript
+const browserWithEventHandling = async () => {
+  const browser = await getEnvAwareBrowserInstance();
+  browser.on('disconnected', () => {
+    console.log('Browser disconnected. Handling reconnection...');
+    // Implement reconnection logic here
+  });
+  // Utilize the browser for tasks
+};
+
+browserWithEventHandling()
+  .then(() => console.log('Handled browser events successfully'))
+  .catch(console.error);
+```
+
+### Rotation of Browsers and Pages
+In scenarios such as web scraping or automated testing, you might want to rotate between browser instances or pages to manage memory usage or simulate new sessions:
+
+```typescript
+const rotateBrowserInstances = async (incognitoBrowser: IncognitoBrowser) => {
+  // Assuming incognitoBrowser is already initialized and started
+  await incognitoBrowser.rotateBrowser(); // Closes the current browser and starts a new instance
+  // Now you have a fresh browser instance
+};
+
+// Example usage
+const incognitoBrowser = new IncognitoBrowser();
+incognitoBrowser.start()
+  .then(() => rotateBrowserInstances(incognitoBrowser))
+  .catch(console.error);
+```
+
+`@push.rocks/smartpuppeteer` with its encapsulated features and simplified API provides an efficient way to harness the power of Puppeteer without getting bogged down by its complexities. Whether you are handling web scraping, automated testing, or any task requiring browser automation, `@push.rocks/smartpuppeteer` streamlines the process, making it more accessible and manageable even for those new to Puppeteer.
+
+## License and Legal Information
+
+This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. 
+
+**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
+
+### Trademarks
+
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
+
+### Company Information
+
+Task Venture Capital GmbH  
+Registered at District court Bremen HRB 35230 HB, Germany
+
+For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
+
+By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

test/test.ts

@@ -1,11 +1,26 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as smartpuppeteer from '../ts/index.js';
 
-tap.test('first test', async (tools) => {
+tap.test('should use pipe', async (tools) => {
   const headlessBrowser = await smartpuppeteer.getEnvAwareBrowserInstance({
-    forceNoSandbox: true,
+    forceNoSandbox: false,
   });
   const page = await headlessBrowser.newPage();
+  await page.goto('https://lossless.com');
+  console.log(await page.title());
+  expect(headlessBrowser.wsEndpoint()).toEqual('');
+  await headlessBrowser.close();
+});
+
+tap.test('should use websocket', async (tools) => {
+  const headlessBrowser = await smartpuppeteer.getEnvAwareBrowserInstance({
+    forceNoSandbox: false,
+    usePipe: false,
+  });
+  const page = await headlessBrowser.newPage();
+  await page.goto('https://lossless.com');
+  console.log(await page.title());
+  expect(headlessBrowser.wsEndpoint()).not.toEqual('');
   await headlessBrowser.close();
 });
 

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @push.rocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartpuppeteer',
+  version: '2.0.5',
+  description: 'Provides simplified access to Puppeteer for automation and testing purposes.'
+}

ts/smartpuppeteer.classes.incognitobrowser.ts

@@ -3,20 +3,24 @@ import * as plugins from './smartpuppeteer.plugins.js';
 
 export class IncognitoBrowser {
   public status: 'started' | 'stopped' = 'stopped';
-  public browser: plugins.puppeteer.Browser;
+  public browser!: plugins.puppeteer.Browser;
 
   constructor() {}
 
   /**
-   * starts the IncognitoBrowser
+   * Starts the IncognitoBrowser instance.
+   * It launches the browser using environment-aware options and sets up a listener
+   * to automatically re-launch if the browser disconnects while the status is 'started'.
    */
-  public async start() {
+  public async start(): Promise<void> {
     this.status = 'started';
     this.browser = await getEnvAwareBrowserInstance();
-    this.browser.on('disconnected', async (eventArg) => {
+    this.browser.on('disconnected', async () => {
       try {
         this.browser.removeAllListeners();
-      } catch (err) {}
+      } catch (err) {
+        // Optionally handle the error.
+      }
       if (this.status === 'started') {
         this.browser = await getEnvAwareBrowserInstance();
       }
@@ -24,27 +28,41 @@ export class IncognitoBrowser {
   }
 
   /**
-   * stops the IncognitoBrowser
+   * Stops the IncognitoBrowser instance.
+   * It forcefully kills the browser process (if needed) and then closes the browser.
    */
-  public async stop() {
+  public async stop(): Promise<void> {
     this.status = 'stopped';
-    plugins.treeKill(this.browser.process().pid, 'SIGKILL');
+    const pid = this.browser.process()?.pid;
+    if (pid) {
+      plugins.treeKill(pid, 'SIGKILL');
+    }
     await this.browser.close();
   }
 
   /**
-   * rotate
+   * Rotates the browser instance.
+   * It closes the current browser and launches a new one.
    */
-  public async rotateBrowser() {
-    this.browser.close().catch();
+  public async rotateBrowser(): Promise<void> {
+    try {
+      await this.browser.close();
+    } catch (err) {
+      // Ignore errors if the browser is already closed.
+    }
     this.browser = await getEnvAwareBrowserInstance();
   }
 
+  /**
+   * Returns a new incognito browser context.
+   * This uses Puppeteer's createIncognitoBrowserContext() API, which is the
+   * correct method for creating isolated sessions.
+   */
   public async getNewIncognitoContext(): Promise<plugins.puppeteer.BrowserContext> {
-    if (this.browser) {
+    if (!this.browser) {
+      throw new Error('You need to start the IncognitoBrowser instance first');
+    }
+    // @ts-ignore
     return this.browser.createIncognitoBrowserContext();
-    } else {
-      throw new Error('you need to start the IncognitoBrowser instance first');
-    }
   }
 }

ts/smartpuppeteer.classes.smartpuppeteer.ts

@@ -2,38 +2,50 @@ import * as plugins from './smartpuppeteer.plugins.js';
 
 export interface IEnvAwareOptions {
   forceNoSandbox?: boolean;
+  usePipe?: boolean;
 }
 
 export const getEnvAwareBrowserInstance = async (
   optionsArg: IEnvAwareOptions = {}
 ): Promise<plugins.puppeteer.Browser> => {
   const options: IEnvAwareOptions = {
-    ...{
     forceNoSandbox: false,
-    },
     ...optionsArg,
   };
 
   let chromeArgs: string[] = [];
-  if (process.env.CI || options.forceNoSandbox || plugins.os.userInfo().username === 'root') {
+  if (
+    process.env.CI ||
+    options.forceNoSandbox ||
+    plugins.os.userInfo().username === 'root'
+  ) {
     chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']);
+    console.warn('********************************************************');
+    console.warn('WARNING: Launching browser without sandbox. This can be insecure!');
+    console.warn('********************************************************');
   }
 
-  let headlessBrowser: plugins.puppeteer.Browser;
-  console.log('launching puppeteer bundled chrome with arguments:');
+  // Automatically choose an executable if available: prefer google-chrome, then chromium, then chromium-browser.
+  const execPath =
+    plugins.smartshell.which.sync('google-chrome') ||
+    plugins.smartshell.which.sync('chromium') ||
+    plugins.smartshell.which.sync('chromium-browser');
+
+  const executablePathOptions = execPath ? { executablePath: execPath } : {};
+
+  console.log('Launching puppeteer browser with arguments:');
   console.log(chromeArgs);
-  headlessBrowser = await plugins.puppeteer.launch({
-    args: chromeArgs,
-    pipe: true,
-    headless: true,
-    ...(() => {
-      const returnObject: any = {};
-      const googleChrome = plugins.smartshell.which.sync('google-chrome');
-      if (googleChrome) {
-        returnObject.executablePath = googleChrome;
+  if (execPath) {
+    console.log(`Using executable: ${execPath}`);
+  } else {
+    console.log('No specific browser executable found; falling back to Puppeteer default.');
   }
-      return returnObject;
-    })(),
+
+  const headlessBrowser = await plugins.puppeteer.launch({
+    args: chromeArgs,
+    pipe: options.usePipe !== undefined ? options.usePipe : true,
+    headless: true,
+    ...executablePathOptions,
   });
 
   return headlessBrowser;

ts/smartpuppeteer.plugins.ts

@@ -4,8 +4,8 @@ import * as os from 'os';
 export { os };
 
 // @pushrocks scope
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartshell from '@pushrocks/smartshell';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartshell from '@push.rocks/smartshell';
 
 export { smartdelay, smartshell };
 

tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}