Skip to content

perf: memoize the browser's CDP connection #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugo-fasone wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: memoize the browser's CDP connection #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Pages/CommonPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,12 @@ public function getSelector($selector, $replacements = [])

public function __call($name, $arguments)
{
if (!is_null($this->getPage()) && method_exists($this->getPage(), $name)) {
call_user_func_array([$this->getPage(), $name], $arguments);
// getPage() rouvre une connexion CDP : les trois évaluations d'origine
// (condition, method_exists, invocation) triplaient chaque appel proxifié.
$page = $this->getPage();

if (!is_null($page) && method_exists($page, $name)) {
call_user_func_array([$page, $name], $arguments);
}
}

Expand Down
52 changes: 39 additions & 13 deletions src/Tests/TestsSuite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ private static function buildVisualBlock(int $startIndex): array
*/
public static array $extraHttpHeaders = [];

/**
* Navigateur déjà connecté et URI du socket associé : sans cette mémoïsation,
* getBrowser() rouvre une WebSocket et un handshake CDP par appel.
*/
protected static $browserInstance = null;
protected static ?string $browserInstanceSocket = null;

protected $draft = false;
protected $groups = 'all';

Expand Down Expand Up @@ -386,6 +393,19 @@ public static function getBrowser(bool $headless = true, bool $force = true)
}
}

// Socket disparu/changé ou navigateur mort : le cache est périmé. isConnected()
// ne lit que l'état local de la socket, sans aller-retour CDP.
if (self::$browserInstance !== null) {
if ($socket !== null
&& self::$browserInstanceSocket === $socket
&& self::$browserInstance->getConnection()->isConnected()) {
return self::$browserInstance;
}

self::$browserInstance = null;
self::$browserInstanceSocket = null;
}

try {
if ($socket === null) {
if (!$force) {
Expand Down Expand Up @@ -426,7 +446,8 @@ public static function getBrowser(bool $headless = true, bool $force = true)
for ($attempt = 0; $attempt < 3; $attempt++) {
try {
$browser = (new BrowserFactory())->createBrowser($options);
\file_put_contents($socketFile, $browser->getSocketUri());
$socket = $browser->getSocketUri();
\file_put_contents($socketFile, $socket);
$lastError = null;
break;
} catch (\Throwable $e2) {
Expand All @@ -440,6 +461,9 @@ public static function getBrowser(bool $headless = true, bool $force = true)
}
}

self::$browserInstance = $browser;
self::$browserInstanceSocket = $socket;

return $browser;
}

Expand All @@ -450,23 +474,25 @@ public static function getPage()
// getTargetInfo() on null ». On réessaie quelques fois avant d'échouer.
for ($try = 1; ; $try++) {
try {
$pages = TestsSuite::getBrowser()?->getPages();
$createdNew = false;
// Un seul getBrowser() et une seule énumération par tentative : on ne
// réénumère qu'après un createPage() effectif.
$browser = TestsSuite::getBrowser();
$pages = $browser?->getPages();

if (count($pages) == 0) {
TestsSuite::getBrowser()?->createPage();
$createdNew = true;
}
$browser?->createPage();

// Si on vient de créer la page (aucune n'existait), les en-têtes
// persistants (ex. Authorization Basic Auth) doivent y être appliqués
// AVANT que le consommateur n'y navigue. Sans ça, un goToUrl() ferait
// sa navigation sans Basic Auth → 401 → chrome-error. Les chemins
// via goToPage font déjà applyExtraHttpHeaders eux-mêmes.
if ($createdNew) {
// Si on vient de créer la page (aucune n'existait), les en-têtes
// persistants (ex. Authorization Basic Auth) doivent y être appliqués
// AVANT que le consommateur n'y navigue. Sans ça, un goToUrl() ferait
// sa navigation sans Basic Auth → 401 → chrome-error. Les chemins
// via goToPage font déjà applyExtraHttpHeaders eux-mêmes.
TestsSuite::applyExtraHttpHeaders();

$pages = $browser?->getPages();
}

return TestsSuite::getBrowser()?->getPages()[0];
return $pages[0];
} catch (\Throwable $e) {
if ($try >= 3) {
throw $e;
Expand Down