Changeset 3366120

Timestamp:

09/23/2025 02:14:52 AM (4 months ago)

Author:

adunblock

Message:

Prepare for version 1.1.0 release.

Location:

ad-unblock/trunk

Files:

• ad-unblock.php (modified) (7 diffs)
• assets/js/admin.js (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• uninstall.php (modified) (1 diff)

ad-unblock/trunk/ad-unblock.php

@@ -4 +4 @@
  * Plugin Name: Ad Unblock
  * Description: Integrates your WordPress site with Ad Unblock service to recover ad revenue lost to ad blockers.
- * Version: 1.0.6
+ * Version: 1.1.0
  * Author: Ad Unblock
  * Author URI: https://ad-unblock.com
@@ -17 +17 @@
 }
 
-define('AD_UNBLOCK_VERSION', '1.0.6');
+define('AD_UNBLOCK_VERSION', '1.1.0');
 define('AD_UNBLOCK_PLUGIN_DIR', plugin_dir_path(__FILE__));
 define('AD_UNBLOCK_PLUGIN_URL', plugin_dir_url(__FILE__));
@@ -380 +380 @@
                 <strong><?php esc_html_e('Cache Expires:', 'ad-unblock'); ?></strong>
                 <?php if ($status['cache_expires']): ?>
-                    <?php echo esc_html($status['cache_expires']); ?>
+                    <span class="cache-expires-time" data-timestamp="<?php echo esc_attr($status['cache_expires']); ?>">
+                        <?php echo esc_html(date('Y-m-d H:i:s', $status['cache_expires'])); ?> (server time)
+                    </span>
                     <br><small>(<?php echo esc_html($status['time_until_expiry']); ?>s remaining)</small>
                 <?php else: ?>
@@ -486 +488 @@
         $cache_key = 'ad_unblock_script_sources_' . get_current_blog_id();
         $error_cache_key = $cache_key . '_error';
-        $cached = get_transient($cache_key);
-
-        // Check if we're in an error state
-        $error_cached = get_transient($error_cache_key);
-
-        if (false !== $cached && false === $error_cached) {
-            return $cached;
-        }
-
-        // If we have cached data but are in error state, try again after shorter interval
-        if (false !== $cached && false !== $error_cached) {
-            // Try API call, but have fallback to stale cache
-            $response = wp_remote_get(self::API_ENDPOINT, array('timeout' => 10));
-
-            if (!is_wp_error($response) && 200 === wp_remote_retrieve_response_code($response)) {
-                // Success! Clear error state and update cache
-                delete_transient($error_cache_key);
-                $body = wp_remote_retrieve_body($response);
-                $script_sources = json_decode($body, true);
-
-                if (is_array($script_sources) && !empty($script_sources)) {
-                    set_transient($cache_key, $script_sources, self::CACHE_DURATION);
-                    return $script_sources;
-                }
+
+        // Get cached data and check if it's valid
+        $cached_data = get_transient($cache_key);
+        $is_cache_valid = $this->is_cache_data_valid($cached_data);
+        $is_in_error_state = $this->is_in_error_state($error_cache_key);
+
+        // Return valid cache if not in error state
+        if ($is_cache_valid && !$is_in_error_state) {
+            return $cached_data['data'];
+        }
+
+        // Try to fetch fresh data from API
+        $fresh_data = $this->fetch_script_sources_from_api();
+
+        // If API call succeeded, update cache and return fresh data
+        if (false !== $fresh_data) {
+            $this->refresh_script_sources_cache($cache_key, $error_cache_key, $fresh_data);
+            return $fresh_data;
+        }
+
+        // API failed - set error state
+        $this->set_error_state($error_cache_key);
+
+        // Return stale cache if available, otherwise empty array
+        if ($cached_data && isset($cached_data['data']) && is_array($cached_data['data'])) {
+            return $cached_data['data'];
+        }
+
+        return array();
+    }
+
+    /**
+     * Check if cached data is valid and not expired
+     */
+    private function is_cache_data_valid($cached_data)
+    {
+        return false !== $cached_data &&
+               is_array($cached_data) &&
+               isset($cached_data['timestamp'], $cached_data['data']) &&
+               is_array($cached_data['data']) &&
+               !empty($cached_data['data']) &&
+               (time() - $cached_data['timestamp']) < self::CACHE_DURATION;
+    }
+
+    /**
+     * Check if we're currently in an error state
+     */
+    private function is_in_error_state($error_cache_key)
+    {
+        $error_data = get_transient($error_cache_key);
+        if (false === $error_data || !is_array($error_data) || !isset($error_data['timestamp'])) {
+            return false;
+        }
+
+        // Consider error state active for 60 seconds
+        return (time() - $error_data['timestamp']) < 60;
+    }
+
+    /**
+     * Fetch script sources from API
+     */
+    private function fetch_script_sources_from_api()
+    {
+        $response = wp_remote_get(self::API_ENDPOINT, array('timeout' => 10));
+
+        if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
+            return false;
+        }
+
+        $body = wp_remote_retrieve_body($response);
+        if (empty($body)) {
+            return false;
+        }
+
+        $script_sources = json_decode($body, true);
+
+        // Validate JSON structure and content
+        if (!is_array($script_sources) || empty($script_sources)) {
+            return false;
+        }
+
+        // Additional validation: ensure all items are strings (URLs)
+        foreach ($script_sources as $source) {
+            if (!is_string($source) || empty($source)) {
+                return false;
             }
-
-            // Still failing, return stale cache and extend error period
-            set_transient($error_cache_key, true, 60);
-            return $cached;
-        }
-
-        // No cache at all, try API
-        $response = wp_remote_get(self::API_ENDPOINT, array('timeout' => 10));
-
-        if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
-            // Set error state and return empty (no previous cache to fall back to)
-            set_transient($error_cache_key, true, 60);
-            return array();
-        }
-
-        $body = wp_remote_retrieve_body($response);
-        $script_sources = json_decode($body, true);
-
-        if (!is_array($script_sources) || empty($script_sources)) {
-            set_transient($error_cache_key, true, 60);
-            return array();
-        }
-
-        // Success!
-        set_transient($cache_key, $script_sources, self::CACHE_DURATION);
+        }
+
         return $script_sources;
+    }
+
+    /**
+     * Refresh script sources cache with fresh data and clear error state
+     */
+    private function refresh_script_sources_cache($cache_key, $error_cache_key, $script_sources)
+    {
+        // Clear error state since we have fresh data
+        delete_transient($error_cache_key);
+
+        // Store fresh data with timestamp
+        $cache_data = array(
+            'data' => $script_sources,
+            'timestamp' => time()
+        );
+        set_transient($cache_key, $cache_data, WEEK_IN_SECONDS);
+    }
+
+    /**
+     * Set error state with timestamp
+     */
+    private function set_error_state($error_cache_key)
+    {
+        $error_data = array(
+            'timestamp' => time()
+        );
+        set_transient($error_cache_key, $error_data, HOUR_IN_SECONDS);
     }
 
@@ -559 +626 @@
         $script_url = reset($script_sources);
 
-        // Get cache status for meta tag
+        // Get cache status and full cached data for meta tag
         $cache_status = $this->get_cache_status();
-        
+        $cache_key = 'ad_unblock_script_sources_' . get_current_blog_id();
+        $cached_data = get_transient($cache_key);
+
         // Prepare cache details for meta tag
         $cache_details = array(
@@ -569 +638 @@
             'sources_count' => $cache_status['cache_data_count'],
             'expires_in' => $cache_status['time_until_expiry'],
-            'timestamp' => time()
+            'timestamp' => time(),
+            'cached_sources' => $script_sources,
+            'cache_timestamp' => (false !== $cached_data && is_array($cached_data) && isset($cached_data['timestamp'])) ? $cached_data['timestamp'] : null
         );
 
@@ -721 +792 @@
         $cache_key = 'ad_unblock_script_sources_' . get_current_blog_id();
         $error_cache_key = $cache_key . '_error';
-        $cached = get_transient($cache_key);
-        $error_cached = get_transient($error_cache_key);
-        $timeout = get_option('_transient_timeout_' . $cache_key);
+        $cached_data = get_transient($cache_key);
+        $error_data = get_transient($error_cache_key);
+
+        $has_cache = false;
+        $cache_timestamp = null;
+        $cache_data_count = 0;
+        $time_until_expiry = 0;
+        $cache_expires = null;
+
+        // Check if we have valid cached data with timestamp
+        if (false !== $cached_data && is_array($cached_data) && isset($cached_data['timestamp'], $cached_data['data'])) {
+            $has_cache = true;
+            $cache_timestamp = $cached_data['timestamp'];
+            $cache_data_count = is_array($cached_data['data']) ? count($cached_data['data']) : 0;
+            $cache_expiry_time = $cache_timestamp + self::CACHE_DURATION;
+            $time_until_expiry = max(0, $cache_expiry_time - time());
+            $cache_expires = $cache_expiry_time;
+        }
+
+        // Check error state - only consider recent errors (within 60 seconds)
+        $has_error = false;
+        if (false !== $error_data && is_array($error_data) && isset($error_data['timestamp'])) {
+            $has_error = (time() - $error_data['timestamp']) < 60;
+        }
 
         return array(
-            'has_cache' => false !== $cached,
-            'has_error' => false !== $error_cached,
-            'cache_expires' => $timeout ? date('Y-m-d H:i:s', $timeout) : null,
-            'cache_data_count' => is_array($cached) ? count($cached) : 0,
-            'time_until_expiry' => $timeout ? max(0, $timeout - time()) : 0
+            'has_cache' => $has_cache,
+            'has_error' => $has_error,
+            'cache_expires' => $cache_expires,
+            'cache_data_count' => $cache_data_count,
+            'time_until_expiry' => $time_until_expiry
         );
     }

ad-unblock/trunk/assets/js/admin.js

@@ -1 +1 @@
 jQuery(document).ready(function ($) {
+  // Convert server timestamps to local time
+  $('.cache-expires-time').each(function() {
+    var timestamp = $(this).data('timestamp');
+    if (timestamp) {
+      var date = new Date(timestamp * 1000);
+      $(this).text(date.toLocaleString() + ' (local time)');
+    }
+  });
   // Initialize Select2 dropdowns
   $(".ad-unblock-term-selector").each(function () {
@@ -129 +137 @@
     var expirationHtml = "";
     if (status.cache_expires) {
+      var expirationDate = new Date(status.cache_expires * 1000);
       expirationHtml =
-        status.cache_expires +
-        "<br><small>(" +
+        '<span class="cache-expires-time" data-timestamp="' + status.cache_expires + '">' +
+        expirationDate.toLocaleString() + " (local time)" +
+        "</span><br><small>(" +
         status.time_until_expiry +
         "s remaining)</small>";

ad-unblock/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.0
 Tested up to: 6.8
-Stable tag: 1.0.6
+Stable tag: 1.1.0
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -75 +75 @@
 == Changelog ==
 
+= 1.1.0 =
+* Fix an issue that cached resource is not refreshed properly when external cache object is enabled
+
 = 1.0.6 =
 * Improved cache management

ad-unblock/trunk/uninstall.php

@@ -4 +4 @@
  *
  * @link       https://ad-unblock.com
- * @since      1.0.6
+ * @since      1.1.0
  *
  * @package    Ad_Unblock