Cache refactoring

bootstrap.php

@@ -2,6 +2,11 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
+use NewfoldLabs\WP\Module\Performance\Cache\CacheFeatureHooks;
+use NewfoldLabs\WP\Module\Installer\Services\PluginInstaller;
+
+use function NewfoldLabs\WP\ModuleLoader\container;
+
 if ( function_exists( 'add_filter' ) ) {
 	add_filter(
 		'newfold/features/filter/register',
@@ -11,6 +16,23 @@ function ( $features ) {
 	);
 }
 
-new PerformanceFeatureHooks();
+// Activate Jetpack Boost on fresh installation.
+if ( function_exists( 'add_action' ) ) {
+	add_action(
+		'activated_plugin',
+		function ( $plugin ) {
+			if ( container()->plugin()->basename === $plugin &&
+				container()->has( 'isFreshInstallation' ) &&
+				container()->get( 'isFreshInstallation' ) &&
+				isset( $_REQUEST['action'] ) && // phpcs:ignore WordPress.Security.NonceVerification
+				'activate' === $_REQUEST['action'] // phpcs:ignore WordPress.Security.NonceVerification
+			) {
+				PluginInstaller::install( 'jetpack-boost', true );
+			}
+		}
+	);
+}
+
+new CacheFeatureHooks();
 
 require_once __DIR__ . '/includes/BurstSafetyMode/init.php';

components/cacheExclusion/index.js

@@ -9,13 +9,16 @@ const CacheExclusion = ( { methods, constants } ) => {
 	const [ isError, setIsError ] = methods.useState( false );
 	const [ isSaved, setIsSaved ] = methods.useState( false );
 	const [ currentValue, setCurrentValue ] = methods.useState(
-		methods.NewfoldRuntime.sdk.cacheExclusion
+		methods.NewfoldRuntime.sdk.cache.exclusion
 	);
+
 	const [ cacheExclusion, setCacheExclusion ] = methods.useState(
-		methods.NewfoldRuntime.sdk.cacheExclusion
+		methods.NewfoldRuntime.sdk.cache.exclusion
 	);
+
+
 	const apiUrl = methods.NewfoldRuntime.createApiUrl(
-		'/newfold-performance/v1/cache-exclusion/update'
+		'/newfold-performance/v1/cache/settings'
 	);
 
 	const handleCacheExclusionChange = ( e ) => {
@@ -45,18 +48,17 @@ const CacheExclusion = ( { methods, constants } ) => {
 	};
 
 	methods.useUpdateEffect( () => {
-		methods.setStore( {
-			...constants.store,
-			CacheExclusion: cacheExclusion,
-		} );
 
 		methods.makeNotice(
-			'cache-exlusion-notice',
+			'cache-exclusion-notice',
 			constants.text.cacheExclusionTitle,
 			! isError ? constants.text.cacheExclusionSaved : isError,
 			! isError ? 'success' : 'error',
 			5000
 		);
+
+		setIsSaved( false );
+
 	}, [ isSaved, isError ] );
 
 	return (

components/cacheSettings/index.js

@@ -3,7 +3,14 @@ import { Container, RadioGroup } from '@newfold/ui-component-library';
 
 const CacheSettings = ( { methods, constants, Components } ) => {
 	const [ cacheLevel, setCacheLevel ] = methods.useState(
-		constants.store.cacheLevel
+		methods.NewfoldRuntime.sdk.cache.level
+	);
+
+	const { store, setStore } = methods.useContext( methods.AppStore );
+
+
+	const apiUrl = methods.NewfoldRuntime.createApiUrl(
+		'/newfold-performance/v1/cache/settings'
 	);
 
 	const cacheOptions = [
@@ -49,25 +56,31 @@ const CacheSettings = ( { methods, constants, Components } ) => {
 	};
 
 	const getCacheLevelNoticeText = () => {
-		return cacheOptions[ cacheLevel ].notice;
+		return cacheOptions[ store.cacheLevel ].notice;
 	};
 
 	const handleCacheLevelChange = ( e ) => {
-		methods.newfoldSettingsApiFetch(
-			{ cacheLevel: parseInt( e.target.value ) },
-			methods.setError,
-			() => {
+
+		methods
+			.apiFetch( {
+				url: apiUrl,
+				method: 'POST',
+				data: { cacheLevel: parseInt( e.target.value ) },
+			} )
+			.then( () => {
 				setCacheLevel( parseInt( e.target.value ) );
-			}
-		);
+
+				setStore(prevState => ({
+					...prevState,
+					cacheLevel: parseInt( e.target.value ),
+				}))
+			} )
+			.catch( ( error ) => {
+				methods.setError
+			} );
 	};
 
 	methods.useUpdateEffect( () => {
-		methods.setStore( {
-			...constants.store,
-			cacheLevel,
-		} );
-
 		methods.makeNotice(
 			'cache-level-change-notice',
 			getCacheLevelNoticeTitle(),
@@ -95,7 +108,7 @@ const CacheSettings = ( { methods, constants, Components } ) => {
 								<RadioGroup.Radio
 									defaultChecked={
 										option.value ===
-										constants.store.cacheLevel
+										methods.NewfoldRuntime.sdk.cache.level
 									}
 									id={ 'cache-level-' + option.value }
 									label={ option.label }

components/clearCache/index.js

@@ -1,22 +1,38 @@
 import { Button, Container } from '@newfold/ui-component-library';
 
 const ClearCache = ( { methods, constants } ) => {
+
+	const apiUrl = methods.NewfoldRuntime.createApiUrl(
+		'/newfold-performance/v1/cache/settings'
+	);
+
+	const { store, setStore } = methods.useContext( methods.AppStore );
+
 	const clearCache = () => {
-		methods.newfoldPurgeCacheApiFetch(
-			{},
-			methods.setError,
-			( response ) => {
+
+
+		methods
+			.apiFetch( {
+				url: apiUrl,
+				method: 'DELETE',
+			} )
+			.then( () => {
 				methods.makeNotice(
 					'disable-old-posts-comments-notice',
 					constants.text.clearCacheNoticeTitle,
 					null,
 					'success',
 					5000
 				);
-			}
-		);
+			} )
+			.catch( ( error ) => {
+				methods.setError( error )
+			} );
 	};
 
+	const cacheLevel = store.cacheLevel ?? methods.NewfoldRuntime.sdk.cache.level;
+
+
 	return (
 		<Container.SettingsField
 			title={ constants.text.clearCacheTitle }
@@ -25,7 +41,7 @@ const ClearCache = ( { methods, constants } ) => {
 			<Button
 				variant="secondary"
 				className="clear-cache-button"
-				disabled={ constants.store.cacheLevel > 0 ? false : true }
+				disabled={ cacheLevel > 0 ? false : true }
 				onClick={ clearCache }
 			>
 				{ constants.text.clearCacheButton }

components/linkPrefetch/index.js

@@ -10,6 +10,8 @@ const LinkPrefetch = ( { methods, constants } ) => {
 	const [ settings, setSettings ] = methods.useState(
 		methods.NewfoldRuntime.sdk.linkPrefetch.settings
 	);
+	const { store, setStore } = methods.useContext( methods.AppStore );
+
 	const [ ignoreKeywords, setIgnoreKeywords ] = methods.useState(
 		settings.ignoreKeywords
 	);
@@ -45,10 +47,11 @@ const LinkPrefetch = ( { methods, constants } ) => {
 	};
 
 	methods.useUpdateEffect( () => {
-		methods.setStore( {
-			...constants.store,
+
+		setStore(prevState => ({
+			...prevState,
 			linkPrefetch: settings,
-		} );
+		}))
 
 		methods.makeNotice(
 			'link-prefetch-change-notice',

components/performance/index.js

@@ -18,8 +18,9 @@ import { default as LinkPrefetch } from '../linkPrefetch/';
  * @param {*} props
  * @return
  */
-const Performance = ( { methods, constants, Components, ...props } ) => {
+const Performance = ( { constants, methods, Components, ...props } ) => {
 	const { store, setStore } = methods.useContext( methods.AppStore );
+
 	const [ isError, setError ] = methods.useState( false );
 
 	const notify = methods.useNotification();
@@ -41,7 +42,7 @@ const Performance = ( { methods, constants, Components, ...props } ) => {
 			autoDismiss: duration,
 		} );
 	};
-	constants.store = store;
+
 	methods.makeNotice = makeNotice;
 	methods.setStore = setStore;
 	methods.setError = setError;

components/skip404/index.js

@@ -7,7 +7,7 @@ import { NewfoldRuntime } from '@newfold/wp-module-runtime';
 
 const Skip404 = ( { methods, constants } ) => {
 	const [ skip404, setSkip404 ] = methods.useState(
-		NewfoldRuntime.sdk.performance.skip404
+		NewfoldRuntime.sdk.skip404.is_active
 	);
 
 	const getSkip404NoticeTitle = () => {
@@ -17,7 +17,7 @@ const Skip404 = ( { methods, constants } ) => {
 	const handleSkip404Change = () => {
 		const value = ! skip404;
 		apiFetch( {
-			path: 'newfold-performance/v1/settings',
+			path: 'newfold-performance/v1/skip404',
 			method: 'POST',
 			data: {
 				field: {

includes/BurstSafetyMode/Browser.php

@@ -1,7 +1,6 @@
 <?php
 namespace NewfoldLabs\WP\Module\Performance\BurstSafetyMode;
 
-use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\ResponseHeaderManager;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 
 /**
@@ -20,7 +19,7 @@ class Browser {
 	 */
 	public function __construct() {
 		$responseHeaderManager = new ResponseHeaderManager();
-		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', BURST_SAFETY_CACHE_LEVEL );
+		$responseHeaderManager->add_header( 'X-Newfold-Cache-Level', BURST_SAFETY_CACHE_LEVEL );
 		$this->addRules();
 	}
 

includes/BurstSafetyMode/ResponseHeaderManager.php

@@ -36,7 +36,7 @@ public function __construct() {
 	 *
 	 * @return array
 	 */
-	public function parseHeaders() {
+	public function parse_headers() {
 
 		$headers = array();
 
@@ -63,10 +63,10 @@ public function parseHeaders() {
 	 * @param string $name  Header name
 	 * @param string $value Header value
 	 */
-	public function addHeader( string $name, string $value ) {
-		$this->setHeaders(
+	public function add_header( string $name, string $value ) {
+		$this->set_headers(
 			array_merge(
-				$this->parseHeaders(),
+				$this->parse_headers(),
 				array( $name => $value )
 			)
 		);
@@ -77,38 +77,38 @@ public function addHeader( string $name, string $value ) {
 	 *
 	 * @param string[] $headers Headers to add.
 	 */
-	public function addHeaders( array $headers ) {
-		$headers = array_merge( $this->parseHeaders(), $headers );
-		$this->setHeaders( $headers );
+	public function add_headers( array $headers ) {
+		$headers = array_merge( $this->parse_headers(), $headers );
+		$this->set_headers( $headers );
 	}
 
 	/**
 	 * Remove a header.
 	 *
 	 * @param string $name Header name
 	 */
-	public function removeHeader( $name ) {
-		$headers = $this->parseHeaders();
+	public function remove_header( $name ) {
+		$headers = $this->parse_headers();
 		unset( $headers[ $name ] );
-		$this->setHeaders( $headers );
+		$this->set_headers( $headers );
 	}
 
 	/**
 	 * Remove all headers.
 	 */
-	public function removeAllHeaders() {
-		$this->setHeaders( array() );
+	public function remove_all_headers() {
+		$this->set_headers( array() );
 	}
 
 	/**
 	 * Set headers.
 	 *
 	 * @param array $headers Headers to set.
 	 */
-	public function setHeaders( array $headers ) {
+	public function set_headers( array $headers ) {
 
 		if ( empty( $headers ) ) {
-			$this->htaccess->removeContent();
+			$this->htaccess->remove_content();
 
 			return;
 		}

includes/BurstSafetyMode/init.php

@@ -2,33 +2,24 @@
 
 use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\Skip404 as BurstSkip404;
 use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\Browser as BurstBrowser;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser as CacheBrowser;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404 as CacheSkip404;
-use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;
-
+use NewfoldLabs\WP\Module\Performance\Cache\Types\Browser as CacheBrowser;
+use NewfoldLabs\WP\Module\Performance\Cache\ResponseHeaderManager;
 
 $newfold_burst_safety_mode = function_exists( 'get_option' ) ? (bool) get_option( 'newfold_burst_safety_mode', false ) : false;
 $newfold_cache_level       = function_exists( 'newfold_cache_level' ) ? (int) get_option( 'newfold_cache_level', 0 ) : 0;
 
 // Check if Performance feature is enabled and it's necessary reset the cache options
-if ( class_exists( 'NewfoldLabs\WP\Module\Performance\PerformanceFeatureHooks' ) ) {
+if ( class_exists( 'NewfoldLabs\WP\Module\Performance\Performance' ) ) {
 	if ( $newfold_burst_safety_mode ) {
 		$browser = new CacheBrowser();
 		$browser::maybeAddRules( $newfold_cache_level );
 
-		$skip_404_handling = (bool) get_option( 'newfold_skip_404_handling', true );
-
-		if ( ! $skip_404_handling ) {
-			$skip404 = new CacheSkip404();
-			$skip404::maybeAddRules( false );
-		}
-
 		$response_header_manager = new ResponseHeaderManager();
-		$response_header_manager->addHeader( 'X-Newfold-Cache-Level', $newfold_cache_level );
+		$response_header_manager->add_header( 'X-Newfold-Cache-Level', $newfold_cache_level );
 
 		delete_option( 'newfold_burst_safety_mode' );
 	}
-} elseif ( ! $newfold_burst_safety_mode ) {
+} elseif ( ! $newfold_burst_safety_mode && defined( 'BLUEHOST_PLUGIN_DIR' ) ) {
 		$files_to_include = array(
 			'htaccess'                => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/htaccess.php',
 			'htaccess_functions'      => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/functions.php',