Connection\Manager: is_connected: Memoize (#39361)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10996753141

Upstream-Ref: Automattic/jetpack@202fec8

vendor/automattic/jetpack-connection/src/class-manager.php

@@ -80,6 +80,20 @@ class Manager {
 	 */
 	private static $disconnected_users = array();
 
+	/**
+	 * Cached connection status.
+	 *
+	 * @var bool|null True if the site is connected, false if not, null if not determined yet.
+	 */
+	private static $is_connected = null;
+
+	/**
+	 * Tracks whether connection status invalidation hooks have been added.
+	 *
+	 * @var bool
+	 */
+	private static $connection_invalidators_added = false;
+
 	/**
 	 * Initialize the object.
 	 * Make sure to call the "Configure" first.
@@ -140,6 +154,8 @@ public static function configure() {
 		add_action( 'deleted_user', array( $manager, 'disconnect_user_force' ), 9, 1 );
 		add_action( 'remove_user_from_blog', array( $manager, 'disconnect_user_force' ), 9, 1 );
 
+		$manager->add_connection_status_invalidation_hooks();
+
 		// Set up package version hook.
 		add_filter( 'jetpack_package_versions', __NAMESPACE__ . '\Package_Version::send_package_version_to_tracker' );
 
@@ -157,6 +173,27 @@ public static function configure() {
 		Partner::init();
 	}
 
+	/**
+	 * Adds hooks to invalidate the memoized connection status.
+	 */
+	private function add_connection_status_invalidation_hooks() {
+		if ( self::$connection_invalidators_added ) {
+			return;
+		}
+
+		// Force is_connected() to recompute after important actions.
+		add_action( 'jetpack_site_registered', array( $this, 'reset_connection_status' ) );
+		add_action( 'jetpack_site_disconnected', array( $this, 'reset_connection_status' ) );
+		add_action( 'jetpack_sync_register_user', array( $this, 'reset_connection_status' ) );
+		add_action( 'pre_update_jetpack_option_id', array( $this, 'reset_connection_status' ) );
+		add_action( 'pre_update_jetpack_option_blog_token', array( $this, 'reset_connection_status' ) );
+		add_action( 'pre_update_jetpack_option_user_token', array( $this, 'reset_connection_status' ) );
+		add_action( 'pre_update_jetpack_option_user_tokens', array( $this, 'reset_connection_status' ) );
+		add_action( 'switch_blog', array( $this, 'reset_connection_status' ) );
+
+		self::$connection_invalidators_added = true;
+	}
+
 	/**
 	 * Sets up the XMLRPC request handlers.
 	 *
@@ -596,9 +633,31 @@ public function is_registered() {
 	 * @return bool
 	 */
 	public function is_connected() {
-		$has_blog_id    = (bool) \Jetpack_Options::get_option( 'id' );
-		$has_blog_token = (bool) $this->get_tokens()->get_access_token();
-		return $has_blog_id && $has_blog_token;
+		if ( self::$is_connected === null ) {
+			if ( ! self::$connection_invalidators_added ) {
+				$this->add_connection_status_invalidation_hooks();
+			}
+
+			$has_blog_id = (bool) \Jetpack_Options::get_option( 'id' );
+			if ( $has_blog_id ) {
+				$has_blog_token     = (bool) $this->get_tokens()->get_access_token();
+				self::$is_connected = ( $has_blog_id && $has_blog_token );
+			} else {
+				// Short-circuit, no need to check for tokens if there's no blog ID.
+				self::$is_connected = false;
+			}
+		}
+		return self::$is_connected;
+	}
+
+	/**
+	 * Resets the memoized connection status.
+	 * This will force the connection status to be recomputed on the next check.
+	 *
+	 * @since 5.0.0-alpha
+	 */
+	public function reset_connection_status() {
+		self::$is_connected = null;
 	}
 
 	/**

vendor/automattic/jetpack-stats-admin/composer.json

@@ -8,7 +8,7 @@
 		"automattic/jetpack-connection": "^5.0.0-alpha",
 		"automattic/jetpack-constants": "^2.0.4",
 		"automattic/jetpack-plans": "^0.4.10",
-		"automattic/jetpack-stats": "^0.13.2",
+		"automattic/jetpack-stats": "^0.13.3-alpha",
 		"automattic/jetpack-status": "^4.0.1",
 		"automattic/jetpack-jitm": "^3.1.22"
 	},

vendor/automattic/jetpack-stats/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.13.3-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [0.13.2] - 2024-09-05
 ### Changed
 - Update dependencies. [#39253]
@@ -182,6 +186,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixing static method which was called without self reference. [#26640]
 
+[0.13.3-alpha]: https://github.com/Automattic/jetpack-stats/compare/v0.13.2...v0.13.3-alpha
 [0.13.2]: https://github.com/Automattic/jetpack-stats/compare/v0.13.1...v0.13.2
 [0.13.1]: https://github.com/Automattic/jetpack-stats/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/Automattic/jetpack-stats/compare/v0.12.5...v0.13.0

vendor/automattic/jetpack-stats/src/class-package-version.php

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '0.13.2';
+	const PACKAGE_VERSION = '0.13.3-alpha';
 
 	const PACKAGE_SLUG = 'stats';