← All changes | includes/editor-assets-api.php +11 -103 4.2.0-dev2 → 3.35.0-dev4 View file →

		@@ -9,18 +9,8 @@
9	9	const ASSETS_DATA_URL = 'ASSETS_DATA_URL';
10	10
11	11	const ASSETS_DATA_KEY = 'ASSETS_DATA_KEY';
12	12
13		- const ASSETS_DATA_EXPIRATION = 'ASSETS_DATA_EXPIRATION';
14		-
15		- const DEFAULT_EXPIRATION_TIME = '+1 hour';
16		-
17		- const PRODUCTION_URL = 'https://assets.elementor.com';
18		- const STAGING_URL = 'https://assets.stg.elementor.red';
19		- const DEV_URL = 'https://assets.dev.builder.elementor.red';
20		-
21		- private static ?array $allowed_hosts = null;
22		-
23	13	public function __construct( array $config ) {
24	14	$this->config = $config;
25	15	}
26	16
		@@ -31,16 +21,10 @@
31	21	public function get_assets_data( $force_request = false ): array {
32	22	$assets_data = $this->get_transient( $this->config( static::ASSETS_DATA_TRANSIENT_KEY ) );
33	23
34	24	if ( $force_request || false === $assets_data ) {
35		- $fresh_data = $this->fetch_data();
36		-
37		- if ( empty( $fresh_data ) ) {
38		- return ! empty( $assets_data ) ? $assets_data : [];
39		- }
40		-
41		- $assets_data = $fresh_data;
42		- $this->set_transient( $this->config( static::ASSETS_DATA_TRANSIENT_KEY ), $assets_data, $this->get_expiration_time() );
	25	+ $assets_data = $this->fetch_data();
	26	+ $this->set_transient( $this->config( static::ASSETS_DATA_TRANSIENT_KEY ), $assets_data, '+1 hour' );
43	27	}
44	28
45	29	return $assets_data;
46	30	}
		@@ -45,15 +29,20 @@
45	29	return $assets_data;
46	30	}
47	31
48	32	private function fetch_data(): array {
49		- $url = $this->config( static::ASSETS_DATA_URL );
50		- $data = self::do_safe_get_request( $url );
	33	+ $response = wp_remote_get( $this->config( static::ASSETS_DATA_URL ) );
51	34
52		- if ( ! $this->has_valid_data( $data ) ) {
	35	+ if ( is_wp_error( $response ) ) {
53	36	return [];
54	37	}
55	38
	39	+ $data = json_decode( wp_remote_retrieve_body( $response ), true );
	40	+
	41	+ if ( empty( $data[ $this->config( static::ASSETS_DATA_KEY ) ] ) || ! is_array( $data[ $this->config( static::ASSETS_DATA_KEY ) ] ) ) {
	42	+ return [];
	43	+ }
	44	+
56	45	return $data[ $this->config( static::ASSETS_DATA_KEY ) ];
57	46	}
58	47
59	48	private function get_transient( $cache_key ) {
		@@ -69,9 +58,9 @@
69	58
70	59	return json_decode( $cache['value'], true );
71	60	}
72	61
73		- private function set_transient( $cache_key, $value, $expiration ): bool {
	62	+ private function set_transient( $cache_key, $value, $expiration = '+12 hours' ): bool {
74	63	$data = [
75	64	'timeout' => strtotime( $expiration, current_time( 'timestamp' ) ),
76	65	'value' => wp_json_encode( $value ),
77	66	];
		@@ -76,87 +65,6 @@
76	65	'value' => wp_json_encode( $value ),
77	66	];
78	67
79	68	return update_option( $cache_key, $data, false );
80		- }
81		-
82		- private function get_expiration_time(): string {
83		- $expiration = $this->config( static::ASSETS_DATA_EXPIRATION );
84		- return $expiration ? $expiration : static::DEFAULT_EXPIRATION_TIME;
85		- }
86		-
87		- private function has_valid_data( $data ): bool {
88		- if ( ! is_array( $data ) ) {
89		- return false;
90		- }
91		-
92		- $key = $this->config( static::ASSETS_DATA_KEY );
93		- return static::is_non_empty_array( $data[ $key ] ?? null );
94		- }
95		-
96		- public static function has_valid_nested_array( $data, array $nested_array_path ): bool {
97		- $current = $data;
98		-
99		- foreach ( $nested_array_path as $nested_key ) {
100		- if ( ! is_array( $current ) || ! array_key_exists( $nested_key, $current ) ) {
101		- return false;
102		- }
103		- $current = $current[ $nested_key ];
104		- }
105		-
106		- if ( ! static::is_non_empty_array( $current ) ) {
107		- return false;
108		- }
109		-
110		- return true;
111		- }
112		-
113		- public static function is_valid_data( $data ): bool {
114		- return static::is_non_empty_array( $data );
115		- }
116		-
117		- private static function is_non_empty_array( $value ): bool {
118		- return is_array( $value ) && ! empty( $value );
119		- }
120		-
121		- private static function get_allowed_hosts(): array {
122		- if ( null !== self::$allowed_hosts ) {
123		- return self::$allowed_hosts;
124		- }
125		-
126		- self::$allowed_hosts = array_values( array_filter( array_map(
127		- fn( $url ) => wp_parse_url( $url, PHP_URL_HOST ),
128		- [ self::PRODUCTION_URL, self::STAGING_URL, self::DEV_URL ]
129		- ) ) );
130		-
131		- return self::$allowed_hosts;
132		- }
133		-
134		- public static function is_allowed_url( $url ): bool {
135		- if ( ! is_string( $url ) || ! wp_http_validate_url( $url ) ) {
136		- return false;
137		- }
138		-
139		- if ( 'https' !== wp_parse_url( $url, PHP_URL_SCHEME ) ) {
140		- return false;
141		- }
142		-
143		- return in_array( wp_parse_url( $url, PHP_URL_HOST ), self::get_allowed_hosts(), true );
144		- }
145		-
146		- public static function do_safe_get_request( $url ) {
147		- if ( ! self::is_allowed_url( $url ) ) {
148		- return null;
149		- }
150		-
151		- $response = wp_safe_remote_get( $url, [
152		- 'timeout' => 5,
153		- 'limit_response_size' => 512 * KB_IN_BYTES,
154		- ] );
155		-
156		- if ( is_wp_error( $response ) || \WP_Http::OK !== (int) wp_remote_retrieve_response_code( $response ) ) {
157		- return null;
158		- }
159		-
160		- return json_decode( wp_remote_retrieve_body( $response ), true );
161	69	}
162	70	}