@hexonet/semantic-release-whmcs 5.0.28 → 5.0.29

package/HISTORY.md

@@ -1,3 +1,11 @@
+## [5.0.29](https://github.com/centralnicgroup-opensource/rtldev-middleware-semantic-release-whmcs/compare/v5.0.28...v5.0.29) (2024-09-23)
+
+
+### Bug Fixes
+
+* **deps:** bump debug from 4.3.6 to 4.3.7 ([a76c9c6](https://github.com/centralnicgroup-opensource/rtldev-middleware-semantic-release-whmcs/commit/a76c9c65e60d19c2369c711a7168cdb651b2a45c))
+* **deps:** bump puppeteer from 23.3.0 to 23.4.0 ([7e62d3d](https://github.com/centralnicgroup-opensource/rtldev-middleware-semantic-release-whmcs/commit/7e62d3d4d05c3b939fd9157dde7fa7b48f10717d))
+
 ## [5.0.28](https://github.com/centralnicgroup-opensource/rtldev-middleware-semantic-release-whmcs/compare/v5.0.27...v5.0.28) (2024-09-05)
 
 

package/lib/delete-marketplace-version.js

@@ -3,14 +3,11 @@ import debugConfig from "debug";
 import { fileURLToPath } from "node:url";
 const debug = debugConfig("semantic-release:whmcs");
 const __filename = fileURLToPath(import.meta.url);
+
 /**
- * A method to publish the module update on whmcs market place
+ * A method to publish the module update on WHMCS marketplace
  */
 export default async (pluginConfig, context) => {
-  // if (!context.logger) {
-  //    context.logger = console;
-  // }
-
   const sep = "+++++++++++++++++++++++++++++++++++++++++++++++++++";
   const out = `\n${sep}\n${__filename}\n${sep}\n`;
 
@@ -27,55 +24,51 @@ export default async (pluginConfig, context) => {
   if (!result) {
     return result;
   }
+
   const { page, navOpts, gotoOpts, selectorOpts, productid, urlbase } = püppi.config;
 
-  // strip markdown links from notes as not allowed to keep
   try {
-    // navigate to product administration
+    // Navigate to product administration
     const url = `${urlbase}/product/${productid}/edit#versions`;
     await page.goto(url, gotoOpts);
-    debug("product page loaded at %s", url);
-    // open versions tab (instead of doing it via url)
-    // let selector = '#nav-tabs li a[href="#versions"]';
-    // await page.waitForSelector(selector, selectorOpts);
-    // await page.click(selector);
+    debug("Product page loaded at %s", url);
+
+    // Fetch all version rows
+    const rows = await page.$$("tr"); // Get all rows in the table
 
-    // delete version
-    // xpath improvements / changes with v16.1.0
-    // -> https://github.com/puppeteer/puppeteer/pull/8730
-    // https://github.com/puppeteer/puppeteer/blob/d1681ec06b7c3db4b51c20b17b3339f852efbd4d/test/src/queryhandler.spec.ts
-    let elements = [];
-    do {
-      const xpath = `xpath/.//td[contains(., "Version ${version}")]/following-sibling::td/a[contains(@class, "btn-styled-red")]`;
-      await page.waitForSelector(xpath, selectorOpts);
-      debug("XPath found.");
-      const nav = page.waitForNavigation(navOpts);
-      elements = await page.$$(xpath);
-      if (elements.length) {
-        debug("Delete Button - click.");
-        await elements[0].hover();
-        await elements[0].click();
-        debug("Delete Button - clicked.");
-        await nav;
-        debug("Navigation finished.");
-        // confirm deletion
-        const selector = "button.btn-styled-red";
-        await page.waitForSelector(selector, selectorOpts);
-        debug("deletion confirmation button available");
-        debug("click confirmation button");
-        await page.clickAndNavigate(selector);
-        debug("clicked confirmation button");
-        await nav;
-        debug("WHMCS Marketplace deleting product version succeeded.");
+    let deleteButton = null;
+
+    // Loop through rows to find the one containing the specified version
+    for (const row of rows) {
+      const textContent = await row.evaluate((el) => el.textContent);
+      if (textContent.includes(`Version ${version}`)) {
+        // Found the correct row, now look for the delete button
+        deleteButton = await row.$("a.btn-styled-red");
+        break; // Exit the loop once found
       }
-    } while (elements.length);
-  } catch (error) {
-    // while loop and having all versions deleted
-    if (!/waiting for selector `.\/\//i.test(error.message)) {
-      debug("Deleting product version failed.", error.message);
-      await page.browser().close();
+    }
+
+    if (!deleteButton) {
+      debug(`Delete button for version ${version} not found.`);
       return false;
     }
+
+    // Click the delete button and wait for navigation
+    debug("Clicking the delete button.");
+    await Promise.all([deleteButton.click(), page.waitForNavigation(navOpts)]);
+
+    // Confirm deletion by clicking the confirmation button
+    const confirmSelector = "button.btn-styled-red";
+    await page.waitForSelector(confirmSelector, selectorOpts);
+    debug("Deletion confirmation button available.");
+
+    await Promise.all([page.click(confirmSelector), page.waitForNavigation(navOpts)]);
+
+    debug("Clicked confirmation button. WHMCS Marketplace product version deleted successfully.");
+  } catch (error) {
+    debug("Deleting product version failed.", error.message);
+    await page.browser().close();
+    return false;
   }
 
   await page.browser().close();

package/lib/puppet.js

@@ -10,14 +10,14 @@ export default async (context) => {
     // logger: logger,
     gotoOpts: {
       waitUntil: ["load", "domcontentloaded"],
-      timeout: 240000,
+      timeout: 60 * 1000 * 10,
     },
     navOpts: {
       waitUntil: ["networkidle0"],
-      timeout: 240000,
+      timeout: 60 * 1000 * 5,
     },
     selectorOpts: {
-      timeout: 60000,
+      timeout: 60 * 1000 * 5,
     },
     logger: context.logger,
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hexonet/semantic-release-whmcs",
   "description": "`semantic-release` plugin for auto-publishing on WHMCS marketplace",
-  "version": "5.0.28",
+  "version": "5.0.29",
   "private": false,
   "type": "module",
   "publishConfig": {
@@ -87,7 +87,7 @@
     "aggregate-error": "^5.0.0",
     "debug": "^4.3.4",
     "github-api": "^3.4.0",
-    "puppeteer": "^23.1.0",
+    "puppeteer": ">=23.4.0",
     "yargs": "^17.7.1"
   }
 }