@applitools/eyes-storybook 3.53.8 → 3.53.9

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [3.53.9](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook@3.53.8...js/eyes-storybook@3.53.9) (2025-02-23)
+
+
+### Bug Fixes
+
+* page pool hang ([#2803](https://github.com/Applitools-Dev/sdk/issues/2803)) ([249043a](https://github.com/Applitools-Dev/sdk/commit/249043a4a31b358cbc3a06728d0fc493156d3c83))
+
+
+### Dependencies
+
+* @applitools/ufg-client bumped to 1.16.5
+  #### Bug Fixes
+
+  * fix offline - url was replaced before resource fetched for url resources ([#2802](https://github.com/Applitools-Dev/sdk/issues/2802)) ([a67f86a](https://github.com/Applitools-Dev/sdk/commit/a67f86aabd56c59fb6cfa58578b1e8b3c31d2197))
+* @applitools/core bumped to 4.31.3
+  #### Bug Fixes
+
+  * fix offline - url was replaced before resource fetched for url resources ([#2802](https://github.com/Applitools-Dev/sdk/issues/2802)) ([a67f86a](https://github.com/Applitools-Dev/sdk/commit/a67f86aabd56c59fb6cfa58578b1e8b3c31d2197))
+
+
+
+* @applitools/eyes bumped to 1.32.2
+
+
 ## [3.53.8](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook@3.53.7...js/eyes-storybook@3.53.8) (2025-02-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-storybook",
-  "version": "3.53.8",
+  "version": "3.53.9",
   "description": "",
   "keywords": [
     "applitools",
@@ -53,14 +53,14 @@
     "up:framework": "cd test/fixtures/storybook-versions/${APPLITOOLS_FRAMEWORK_VERSION} && npm ci"
   },
   "dependencies": {
-    "@applitools/core": "4.31.2",
+    "@applitools/core": "4.31.3",
     "@applitools/driver": "1.20.4",
-    "@applitools/eyes": "1.32.1",
+    "@applitools/eyes": "1.32.2",
     "@applitools/functional-commons": "1.6.0",
     "@applitools/logger": "2.1.0",
     "@applitools/monitoring-commons": "1.0.19",
     "@applitools/spec-driver-puppeteer": "1.4.24",
-    "@applitools/ufg-client": "1.16.4",
+    "@applitools/ufg-client": "1.16.5",
     "@applitools/utils": "1.7.7",
     "boxen": "4.2.0",
     "chalk": "3.0.0",

package/src/pagePool.js

@@ -1,6 +1,6 @@
 'use strict';
 
-function createPagePool({initPage, logger}) {
+function createPagePool({initPage, logger, freePageTimeout = 300_000}) {
   let counter = 0;
   const fullPageObjs = [];
   logger.log(`[page pool] created`);
@@ -48,22 +48,38 @@ function createPagePool({initPage, logger}) {
     pagePool.addToPool(newPageId);
   }
 
-  async function getFreePage() {
-    logger.log(`[page pool] waiting for free page`);
+  async function getFreePage(tryCount = 0) {
+    logger.log(`[page pool] waiting for free page, tryCount=${tryCount}`);
     await currWaitOnFreePage;
+    const availablePages = fullPageObjs.filter(p => p.isInPool());
+    // wait up to 5 minutes
+    if (availablePages.length === 0) {
+      const INTERVAL = 500;
+      if (tryCount < freePageTimeout / INTERVAL) {
+        logger.log(`[page pool] no available pages, retrying to get free page...`);
+        await new Promise(r => setTimeout(r, INTERVAL));
+        return getFreePage(tryCount + 1);
+      } else {
+        throw new Error('Could not find free page, timed out after waiting 5 minutes');
+      }
+    }
+    logger.log(`[page pool] waiting on pages ${availablePages.map(({pageId}) => pageId)}`);
     currWaitOnFreePage = Promise.race(
-      fullPageObjs
-        .filter(p => p.isInPool())
-        .map(async p => {
-          await p.waitUntilFree();
-          return p;
-        }),
+      availablePages.map(async p => {
+        await p.waitUntilFree();
+        return p;
+      }),
     );
 
     const fullPageObj = await currWaitOnFreePage;
-    fullPageObj.occupyPage();
-    logger.log(`[page pool] free page found: ${fullPageObj.pageId}`);
-    return toSmallPageObj(fullPageObj);
+    if (fullPageObj.isInPool()) {
+      fullPageObj.occupyPage();
+      logger.log(`[page pool] free page found: ${fullPageObj.pageId}`);
+      return toSmallPageObj(fullPageObj);
+    } else {
+      logger.log(`[page pool] free page found, but it is no longer in pool: ${fullPageObj.pageId}`);
+      return getFreePage(tryCount + 1);
+    }
   }
 
   async function createPage() {
@@ -91,7 +107,9 @@ function createPagePool({initPage, logger}) {
     }
 
     async function waitUntilFree() {
+      logger.log(`[page ${pageId}] waitUntilFree before`);
       await workPromise;
+      logger.log(`[page ${pageId}] waitUntilFree after`);
     }
 
     function occupyPage() {
@@ -101,10 +119,13 @@ function createPagePool({initPage, logger}) {
     }
 
     function removePage() {
+      logger.log(`[page ${pageId}] removePage`);
       fullPageObjs.splice(
         fullPageObjs.findIndex(p => p.pageId === pageId),
         1,
       );
+      isActive = false;
+      resolveWork && resolveWork();
     }
 
     function isInPool() {
@@ -112,6 +133,7 @@ function createPagePool({initPage, logger}) {
     }
 
     function addToPool() {
+      logger.log(`[page ${pageId}] addToPool`);
       isActive = true;
       createdAt = Date.now();
     }