Dhalang 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8181be50a21d8c3b688b3ba8aa7f683f1bd6101acc36b6623b2948ffd0462ca
-  data.tar.gz: 7f04e3437befb446f2e2a45b90f46ffe17e97c56d570299ac1852c4d3fd2ed9a
+  metadata.gz: ecb6dcd4c556f779b1a895ed19257904c10d4e5b34aa8574ffe4c9ac7f73f3e0
+  data.tar.gz: e76528a10c6c73d9729285161c04e5008dd3d4ea83e4891f1b4e798d6870f0c5
 SHA512:
-  metadata.gz: 5a45db0cb7cbf08828e99ebd1a86fdc8e3dc8ac1fb01d10d3c521b2bbe38168fdd93e79271fe766504a1868d9cec124390ec3bf65cf513354ee6c974f0e50e37
-  data.tar.gz: 6f56ec00f075b58242fdf55c5d49ca2cb545fcf3b249942c1c4a0f1b102623ce7d633b7db25bb5f04450b25b599580fd6a81c502e434710e282cfcd6ed1af8f0
+  metadata.gz: 634e1fc5e6a48a8ca4b3fa58673cc11bbe0b2780bb061a340c45d57f00b0a70a435c04cc74bf047e9df96cf7a1b0cbfd5e5daa7a206db0ff8fc7abe63ca49554
+  data.tar.gz: 1cdd94b326c1374a4a1c263c980cd6ee33f1b694388c455d1219a2d80d10fdba15ea025928bb3b88b218072e40f2c8590118532b6573076cf0204c18a52d313f

data/lib/Dhalang/version.rb

@@ -1,3 +1,3 @@
 module Dhalang
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/lib/js/dhalang.js

@@ -1,10 +1,13 @@
-const fs = require('fs')
+import fs from 'node:fs';
+import path from "node:path";
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
 
 /**
  * @typedef {Object} Configuration
  * @property {string} webPageUrl            - The url of the webpage to visit.
  * @property {string} tempFilePath          - The path of the tempfile to write the screenshot/pdf to.
- * @property {string} puppeteerModulePath   - The path of the Puppeteer module.
+ * @property {string} puppeteerPath         - The path of the Puppeteer module.
  * @property {string} imageType             - The type of image to save ( undefined for pdfgenerator ).
  * @property {UserOptions} userOptions      - User defined and default parameters to use when navigating to pages.
  * @property {Object} pdfOptions            - User defined and default parameters to use when creating PDFs. Note: Do not use directly, rather use {@link getConfiguredPdfOptions}.
@@ -43,7 +46,7 @@ const fs = require('fs')
  * @returns {Configuration}
  * The configuration object.
  */
-exports.getConfiguration = function () {
+export function getConfiguration() {
     return JSON.parse(process.argv[2])
 }
 
@@ -53,10 +56,15 @@ exports.getConfiguration = function () {
  * @returns {Promise<Object>}
  * The launched instance of Puppeteer.
  */
-exports.launchPuppeteer = async function (configuration) {
-    module.paths.push(configuration.puppeteerPath);
-    const puppeteer = require('puppeteer');
-    const launchArgs = ['--no-sandbox', '--disable-setuid-sandbox'].concat(configuration.userOptions.chromeOptions).filter((item, index, self) => self.indexOf(item) === index);
+export async function launchPuppeteer(configuration){
+    const require = createRequire(
+        path.join(configuration.puppeteerPath, "package.json")
+    );
+    const resolved = require.resolve("puppeteer");
+    const puppeteer = await import(pathToFileURL(resolved).href);
+    const launchArgs = ['--no-sandbox', '--disable-setuid-sandbox']
+        .concat(configuration.userOptions.chromeOptions)
+        .filter((item, index, self) => self.indexOf(item) === index);
 
     if (configuration.userOptions['browserWebsocketUrl'] !== "") {
         return await puppeteer.connect( {
@@ -76,7 +84,7 @@ exports.launchPuppeteer = async function (configuration) {
  * @param {Object} page - The Puppeteer page object to configure.
  * @param {UserOptions} userOptions - The user options to use.
  */
-exports.configure = async function (page, userOptions) {
+export async function configure(page, userOptions) {
     if (userOptions.userAgent !== "") {
         await page.setUserAgent(userOptions.userAgent)
     }
@@ -95,16 +103,16 @@ exports.configure = async function (page, userOptions) {
  * @param {Object} page - The Puppeteer page object to use for navigation.
  * @param {Configuration} configuration - The configuration to use. 
  */
-exports.navigate = async function (page, configuration) {
+export async function navigate(page, configuration) {
     const navigationWaitForSelector = configuration.userOptions.navigationWaitForSelector;
     const navigationWaitForXPath = configuration.userOptions.navigationWaitForXPath;
 
-    await page.goto(configuration.webPageUrl, this.getNavigationParameters(configuration));
+    await page.goto(configuration.webPageUrl, getNavigationParameters(configuration));
 
     if (navigationWaitForSelector !== "") {
-        await page.waitForSelector(navigationWaitForSelector, this.getWaitingParameters(configuration));
+        await page.waitForSelector(navigationWaitForSelector, getWaitingParameters(configuration));
     } else if (navigationWaitForXPath !== "") {
-        await page.waitForXPath(navigationWaitForXPath, this.getWaitingParameters(configuration));
+        await page.waitForXPath(navigationWaitForXPath, getWaitingParameters(configuration));
     } else {
         await new Promise(r => setTimeout(r, 250));
     }
@@ -116,7 +124,7 @@ exports.navigate = async function (page, configuration) {
  * @param {UserOptions} configuration - The configuration to use.
  * @returns {Object} - pdfOptions
  */
-exports.getConfiguredPdfOptions = async function (page, configuration) {
+export async function getConfiguredPdfOptions(page, configuration) {
     const pdfOptions = configuration.pdfOptions
 
     if (pdfOptions['headerTemplateFile'] !== '') {
@@ -155,7 +163,7 @@ exports.getConfiguredPdfOptions = async function (page, configuration) {
  * @returns {NavigationParameters}
  * The extracted navigation parameters.
  */
-exports.getNavigationParameters = function (configuration) {
+export function getNavigationParameters(configuration) {
     return {
         timeout: configuration.userOptions.navigationTimeout,
         waitUntil: configuration.userOptions.navigationWaitUntil
@@ -169,7 +177,7 @@ exports.getNavigationParameters = function (configuration) {
  * @returns {WaitingParameters} 
  * The extracted waiting parameters.
  */
-exports.getWaitingParameters = function (configuration) {
+export function getWaitingParameters(configuration) {
     return {
         timeout: configuration.userOptions.navigationTimeout
     }

data/lib/js/html-scraper.js

@@ -1,17 +1,17 @@
 'use strict';
-const dhalang = require('./dhalang');
-const fs = require('node:fs');
+import {getConfiguration, launchPuppeteer, configure, navigate} from './dhalang.js';
+import fs from 'node:fs';
 
 const scrapeHtml = async () => {
-    const configuration = dhalang.getConfiguration();
+    const configuration = getConfiguration();
 
     let browser;
     let page;
     try {
-        browser = await dhalang.launchPuppeteer(configuration);
+        browser = await launchPuppeteer(configuration);
         page = await browser.newPage();
-        await dhalang.configure(page, configuration.userOptions);
-        await dhalang.navigate(page, configuration);
+        await configure(page, configuration.userOptions);
+        await navigate(page, configuration);
         const html = await page.content();
         fs.writeFileSync(configuration.tempFilePath, html);
     } catch (error) {

data/lib/js/pdf-generator.js

@@ -1,17 +1,17 @@
 'use strict';
-const dhalang = require('./dhalang');
+import {getConfiguration, getConfiguredPdfOptions, launchPuppeteer, configure, navigate} from './dhalang.js';
 
 const createPdf = async () => {
-    const configuration = dhalang.getConfiguration();
+    const configuration = getConfiguration();
 
     let browser;
     let page;
     try {
-        browser = await dhalang.launchPuppeteer(configuration);
+        browser = await launchPuppeteer(configuration);
         page = await browser.newPage();
-        await dhalang.configure(page, configuration.userOptions);
-        await dhalang.navigate(page, configuration);
-        const pdfOptions = await dhalang.getConfiguredPdfOptions(page, configuration);
+        await configure(page, configuration.userOptions);
+        await navigate(page, configuration);
+        const pdfOptions = await getConfiguredPdfOptions(page, configuration);
         await page.pdf({
             ...{
                 path: configuration.tempFilePath

data/lib/js/screenshot-generator.js

@@ -1,16 +1,16 @@
 'use strict';
-const dhalang = require('./dhalang')
+import {getConfiguration, launchPuppeteer, configure, navigate} from './dhalang.js';
 
 const createScreenshot = async () => {
-    const configuration = dhalang.getConfiguration();
+    const configuration = getConfiguration();
 
     let browser;
     let page;
     try {
-        browser = await dhalang.launchPuppeteer(configuration);
+        browser = await launchPuppeteer(configuration);
         page = await browser.newPage();
-        await dhalang.configure(page, configuration.userOptions);
-        await dhalang.navigate(page, configuration);
+        await configure(page, configuration.userOptions);
+        await navigate(page, configuration);
 
         await page.screenshot({
             ...{