← All changes | includes/API/V1/Traits/WCPOS_REST_API.php +35 -35 1.10.6 → 1.10.21 View file →

		@@ -12,13 +12,14 @@
12	12	use WCPOS\WooCommercePOS\Logger;
13	13	use WCPOS\WooCommercePOS\Services\Barcode_Field;
14	14	use WCPOS\WooCommercePOS\Services\Pos_Order_Audit;
15	15	use WCPOS\WooCommercePOS\Services\Settings;
	16	+use WCPOS\WooCommercePOS\Sync\Meta_Normalizer;
16	17	use WCPOS\WooCommercePOS\Sync\Pos_Uuid;
	18	+use WCPOS\WooCommercePOS\Sync\Response_Telemetry;
17	19	use WP_Error;
18	20	use WP_REST_Request;
19	21	use WP_REST_Response;
20		-use Exception;
21	22
22	23	/**
23	24	* Shared helpers for all WCPOS REST API controllers.
24	25	*/
		@@ -123,22 +124,37 @@
123	124	* @return array
124	125	*/
125	126	public function wcpos_parse_meta_data( WC_Data $object ): array {
126	127	$raw_meta = $object->get_meta_data();
127		- $meta_data = array_map(
128		- function ( $meta_data ) {
129		- $data = $meta_data->get_data();
130		- return array_merge(
131		- $data,
132		- array(
133		- 'key' => $meta_data->key,
134		- 'value' => $meta_data->value,
135		- )
136		- );
137		- },
138		- $raw_meta
139		- );
	128	+ $meta_data = array();
	129	+ $dropped = false;
140	130
	131	+ foreach ( $raw_meta as $index => $meta ) {
	132	+ // One monstrous value is what kills the request, and the count monitor below
	133	+ // cannot see it: a record can hold a single meta entry that serializes to a
	134	+ // gigabyte, sail past every threshold on the NUMBER of entries, and then fatal
	135	+ // the response encoder. Measure the value and withhold it, same budget as the
	136	+ // v2 sync lane applies in Meta_Normalizer.
	137	+ if ( Meta_Normalizer::exceeds_value_budget( $meta->value ) ) {
	138	+ Meta_Normalizer::note_oversized_meta( (string) $meta->key, (int) $meta->id );
	139	+ $dropped = true;
	140	+ continue;
	141	+ }
	142	+
	143	+ $meta_data[ $index ] = array_merge(
	144	+ $meta->get_data(),
	145	+ array(
	146	+ 'key' => $meta->key,
	147	+ 'value' => $meta->value,
	148	+ )
	149	+ );
	150	+ }
	151	+
	152	+ if ( $dropped ) {
	153	+ // A list with a hole JSON-encodes as an object; the wire expects a list.
	154	+ $meta_data = array_values( $meta_data );
	155	+ }
	156	+
141	157	// Monitor meta count and log if thresholds exceeded.
142	158	$this->wcpos_monitor_meta_count( $object, $raw_meta );
143	159
144	160	return $meta_data;
		@@ -445,30 +461,14 @@
445	461
446	462	/**
447	463	* Get server load average.
448	464	*
	465	+ * Same source as the v2 lane's `X-Server-Load`. The former Windows branch
	466	+ * tested `stristr( PHP_OS, 'win' )`, which also matches `Darwin`, so every
	467	+ * macOS host shelled out to `wmic` on each bulk-ID request.
	468	+ *
449	469	* @return array The load average.
450	470	*/
451	471	public function get_server_load() {
452		- try {
453		- if ( stristr( PHP_OS, 'win' ) ) {
454		- // Use WMIC to get load percentage from Windows.
455		- $load = @shell_exec( 'wmic cpu get loadpercentage /all' ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
456		- if ( $load ) {
457		- $load = explode( "\n", $load );
458		- if ( isset( $load[1] ) ) {
459		- $load = intval( $load[1] );
460		- return array( $load, $load, $load ); // Mimic the array structure of sys_getloadavg().
461		- }
462		- }
463		- } elseif ( function_exists( 'sys_getloadavg' ) ) {
464		- return sys_getloadavg();
465		- }
466		- } catch ( Exception $e ) {
467		- // Log the error for debugging purposes.
468		- Logger::log( 'Error getting server load: ' . $e->getMessage() );
469		- }
470		-
471		- // Fallback if no method is available or an error occurs.
472		- return array( 0, 0, 0 );
	472	+ return Response_Telemetry::server_load();
473	473	}
474	474	}