[updates-check] [api] [cache] Improved the updates check API response caching.

Author: fajardoleo

includes/class-freemius.php

@@ -20815,7 +20815,7 @@ private function _fetch_newer_version( $plugin_id = false, $flush = true, $expir
          *
          * @return bool|FS_Plugin_Tag
          */
-        function get_update( $plugin_id = false, $flush = true, $expiration = WP_FS__TIME_24_HOURS_IN_SEC, $newer_than = false ) {
+        function get_update( $plugin_id = false, $flush = true, $expiration = FS_Plugin_Updater::UPDATES_CHECK_CACHE_EXPIRATION, $newer_than = false ) {
             $this->_logger->entrance();
 
             if ( ! is_numeric( $plugin_id ) ) {
@@ -22484,7 +22484,7 @@ private function check_updates(
             $background = false,
             $plugin_id = false,
             $flush = true,
-            $expiration = WP_FS__TIME_24_HOURS_IN_SEC,
+            $expiration = FS_Plugin_Updater::UPDATES_CHECK_CACHE_EXPIRATION,
             $newer_than = false
         ) {
             $this->_logger->entrance();

includes/class-fs-api.php

@@ -318,9 +318,12 @@ function get( $path = '/', $flush = false, $expiration = WP_FS__TIME_24_HOURS_IN
 				$flush = true;
 			}
 
-			$cached_result = self::$_cache->get( $cache_key );
+			$has_valid_cache = self::$_cache->has_valid( $cache_key, $expiration );
+			$cached_result   = $has_valid_cache ?
+				self::$_cache->get( $cache_key ) :
+				null;
 
-			if ( $flush || ! self::$_cache->has_valid( $cache_key, $expiration ) ) {
+			if ( $flush || is_null( $cached_result ) ) {
 				$result = $this->call( $path );
 
 				if ( ! is_object( $result ) || isset( $result->error ) ) {

includes/class-fs-plugin-updater.php

@@ -37,6 +37,8 @@ class FS_Plugin_Updater {
 
         private static $_upgrade_basename = null;
 
+        const UPDATES_CHECK_CACHE_EXPIRATION = ( WP_FS__TIME_24_HOURS_IN_SEC / 24 );
+
         #--------------------------------------------------------------------------------
         #region Singleton
         #--------------------------------------------------------------------------------
@@ -530,7 +532,7 @@ function pre_set_site_transient_update_plugins_filter( $transient_data ) {
                 $new_version = $this->_fs->get_update(
                     false,
                     fs_request_get_bool( 'force-check' ),
-                    WP_FS__TIME_24_HOURS_IN_SEC / 24,
+                    FS_Plugin_Updater::UPDATES_CHECK_CACHE_EXPIRATION,
                     $current_plugin_version
                 );
 
@@ -1188,7 +1190,7 @@ private static function get_tested_wp_version( $tested_up_to ) {
          * @return object
          */
         private function get_latest_download_details( $addon_id = false, $newer_than = false, $fetch_readme = true ) {
-            return $this->_fs->_fetch_latest_version( $addon_id, true, WP_FS__TIME_24_HOURS_IN_SEC, $newer_than, $fetch_readme );
+            return $this->_fs->_fetch_latest_version( $addon_id, true, FS_Plugin_Updater::UPDATES_CHECK_CACHE_EXPIRATION, $newer_than, $fetch_readme );
         }
 
         /**

includes/fs-plugin-info-dialog.php

@@ -238,7 +238,7 @@ function _get_addon_info_filter( $data, $action = '', $args = null ) {
                 $latest = $this->_fs->_fetch_latest_version(
                     $selected_addon->id,
                     true,
-                    WP_FS__TIME_24_HOURS_IN_SEC,
+                    FS_Plugin_Updater::UPDATES_CHECK_CACHE_EXPIRATION,
                     $current_addon_version
                 );
 

start.php

@@ -15,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	$this_sdk_version = '2.7.0';
+	$this_sdk_version = '2.7.0.1';
 
 	#region SDK Selection Logic --------------------------------------------------------------------
 

templates/account.php

@@ -22,8 +22,8 @@
 	 * @var FS_Plugin_Tag $update
 	 */
 	$update = $fs->has_release_on_freemius() ?
-        $fs->get_update( false, false, WP_FS__TIME_24_HOURS_IN_SEC / 24 ) :
-        null;
+		$fs->get_update( false, false ) :
+		null;
 
 	if ( is_object($update) ) {
 		/**