Fixed activation and de-activation hooks. Fixed bug with plugin initialisation.

Author: colinmurphy

plugins/wpgraphql-logging/activation.php

@@ -9,9 +9,12 @@
 
 declare(strict_types=1);
 
+use WPGraphQL\Logging\Plugin;
+
 /**
  * Runs when the plugin is activated.
  */
 function wpgraphql_logging_activation_callback(): void {
+	Plugin::activate();
 	do_action( 'wpgraphql_logging_activate' );
 }

plugins/wpgraphql-logging/deactivation.php

@@ -10,9 +10,12 @@
  * @since 0.0.1
  */
 
+use WPGraphQL\Logging\Plugin;
+
 /**
  * Runs when the plugin is deactivated.
  */
 function wpgraphql_logging_deactivation_callback(): void {
+	Plugin::deactivate();
 	do_action( 'wpgraphql_logging_deactivate' );
 }

plugins/wpgraphql-logging/src/Events/QueryEventLifecycle.php

@@ -4,13 +4,16 @@
 
 namespace WPGraphQL\Logging\Events;
 
+use GraphQL\Executor\ExecutionResult;
+use GraphQL\Server\OperationParams;
 use Monolog\Level;
 use WPGraphQL\Logging\Logger\LoggerService;
+use WPGraphQL\Request;
 
 /**
  * WPGraphQL Query Event Lifecycle -
  *
- * POC @TODO - Add pub/sub for query events.
+ * Handles logging for GraphQL query lifecycle events.
  *
  * @package WPGraphQL\Logging
  *
@@ -29,7 +32,7 @@ class QueryEventLifecycle {
 	 *
 	 * @param \WPGraphQL\Logging\Logger\LoggerService $logger
 	 */
-	protected function __construct(readonly LoggerService $logger) {
+	protected function __construct( readonly LoggerService $logger ) {
 	}
 
 	/**
@@ -42,20 +45,26 @@ public static function init(): QueryEventLifecycle {
 			self::$instance = new self( $logger );
 			self::$instance->setup();
 		}
+
 		return self::$instance;
 	}
 
 	/**
 	 * Logs the pre-request event for a GraphQL query.
+	 * This method is hooked into 'do_graphql_request'.
 	 *
-	 * @param string $query The GraphQL query.
-	 * @param mixed  $variables The variables for the query.
-	 * @param string $operation_name The name of the operation.
+	 * @param string      $query The GraphQL query string.
+	 * @param string|null $operation_name The name of the operation. Made nullable.
+	 * @param array|null  $variables The variables for the query. Made nullable.
 	 */
-	public function log_pre_request( $query, $variables, $operation_name ): void {
-
+	public function log_pre_request( string $query, ?string $operation_name, ?array $variables ): void {
 		try {
-			$context = [];
+			$context = [
+				'query'          => $query,
+				'variables'      => $variables,
+				'operation_name' => $operation_name,
+			];
+
 			$context = apply_filters( 'wpgraphql_logging_pre_request_context', $context, $query, $variables, $operation_name );
 			$level   = apply_filters( 'wpgraphql_logging_pre_request_level', Level::Info, $query, $variables, $operation_name );
 			$this->logger->log( $level, 'WPGraphQL Incoming Request', $context );
@@ -67,34 +76,93 @@ public function log_pre_request( $query, $variables, $operation_name ): void {
 
 	/**
 	 * Logs the post-request event for a GraphQL query.
+	 * This method is now hooked into 'graphql_after_execute'.
 	 *
-	 * @param mixed                $response The response from the GraphQL request.
-	 * @param mixed                $result The result of the GraphQL request.
-	 * @param string               $operation_name The name of the operation.
-	 * @param string               $query The GraphQL query.
-	 * @param array<string, mixed> $variables The variables for the query.
+	 * @param \GraphQL\Executor\ExecutionResult|array<int, \GraphQL\Executor\ExecutionResult> $response The GraphQL execution result(s).
+	 * This can be a single ExecutionResult object or an array of them for batch requests.
+	 * @param \WPGraphQL\Request                                                              $request_instance The WPGraphQL Request instance.
 	 */
-	public function log_post_request( $response, $result, string $operation_name, string $query, array $variables ): void {
+	public function log_post_request( $response, Request $request_instance ): void {
+		// Extract relevant data from the WPGraphQL Request instance
+		$params         = $request_instance->get_params(); // Can be OperationParams or array of OperationParams
+		$query          = null;
+		$operation_name = null;
+		$variables      = null;
+		$status_code    = 200; // Default success status
+
+		// Handle single or batch requests to get query details
+		if ( $params instanceof OperationParams ) {
+			$query          = $params->query;
+			$operation_name = $params->operation;
+			$variables      = $params->variables;
+		} elseif ( is_array( $params ) && ! empty( $params[0] ) && $params[0] instanceof OperationParams ) {
+			$query          = $params[0]->query;
+			$operation_name = $params[0]->operation;
+			$variables      = $params[0]->variables;
+		}
+
+		// Determine status code if available (WPGraphQL Router sets this)
+		if ( class_exists( '\WPGraphQL\Router' ) && property_exists( '\WPGraphQL\Router', '$http_status_code' ) ) {
+			$status_code = \WPGraphQL\Router::$http_status_code;
+		}
+
+		// Extract data and errors from the ExecutionResult object(s)
+		$response_data   = null;
+		$response_errors = null;
+
+		if ( $response instanceof ExecutionResult ) {
+			$response_data   = $response->data;
+			$response_errors = $response->errors;
+		} elseif ( is_array( $response ) && ! empty( $response[0] ) && $response[0] instanceof ExecutionResult ) {
+			// For batch requests, aggregate data/errors from all results
+			$response_data   = array_map( static fn( $res ) => $res->data, $response );
+			$response_errors = array_reduce( $response, static fn( $carry, $res ) => array_merge( $carry, $res->errors ?? [] ), [] );
+			if ( empty( $response_errors ) ) {
+				$response_errors = null; // Ensure it's null if no errors
+			}
+		}
+
 
 		try {
-			$context = [];
+			$context = [
+				'query'           => $query,
+				'operation_name'  => $operation_name,
+				'variables'       => $variables,
+				'status_code'     => $status_code,
+				'response_data'   => $response_data,
+				'response_errors' => $response_errors,
+			];
 			$level   = Level::Info;
-			$context = apply_filters( 'wpgraphql_logging_post_request_context', $context, $response, $result, $operation_name, $query, $variables );
-			$level   = apply_filters( 'wpgraphql_logging_post_request_level', $level, $response, $result, $operation_name, $query, $variables );
+
+			// Apply filters for context and level
+			$context = apply_filters( 'wpgraphql_logging_post_request_context', $context, $response, $request_instance );
+			$level   = apply_filters( 'wpgraphql_logging_post_request_level', $level, $response, $request_instance );
+
 			$this->logger->log( $level, 'WPGraphQL Outgoing Response', $context );
+
+			// Log errors specifically if present in the response
+			if ( ! empty( $response_errors ) ) {
+				$this->logger->error(
+					'GraphQL query completed with errors.',
+					[
+						'query'          => $query,
+						'operation_name' => $operation_name,
+						'status_code'    => $status_code,
+						'errors'         => array_map( static fn( $error ) => $error->getMessage(), $response_errors ), // Extract message from error object
+						'full_errors'    => $response_errors, // Include full error details for debugging
+					]
+				);
+			}
 		} catch ( \Throwable $e ) {
 			// @TODO - Handle logging errors gracefully.
-			error_log( 'Error in log_post_request: ' . $e->getMessage() );  // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
+			error_log( 'Error in log_post_request: ' . $e->getMessage() . ' in ' . $e->getFile() . ' on line ' . $e->getLine() );
 		}
 	}
 
 	/**
 	 * Register actions and filters.
 	 */
 	protected function setup(): void {
-
-		// @TODO: Update POC and use pub/sub for query events.
-
 		/**
 		 * @psalm-suppress HookNotFound
 		 */
@@ -103,6 +171,6 @@ protected function setup(): void {
 		/**
 		 * @psalm-suppress HookNotFound
 		 */
-		add_action( 'graphql_process_http_request_response', [ $this, 'log_post_request' ], 10, 5 );
+		add_action( 'graphql_after_execute', [ $this, 'log_post_request' ], 10, 2 );
 	}
 }

plugins/wpgraphql-logging/src/Hooks/.gitkeep

@@ -5,7 +5,7 @@
 namespace WPGraphQL\Logging;
 
 use WPGraphQL\Logging\Events\QueryEventLifecycle;
-use WPGraphQL\Logging\Hooks\PluginHooks;
+use WPGraphQL\Logging\Logger\Database\DatabaseEntity;
 
 /**
  * Plugin class for WPGraphQL Logging.
@@ -51,7 +51,6 @@ public static function init(): self {
 	 * Initialize the plugin admin, frontend & api functionality.
 	 */
 	public function setup(): void {
-		PluginHooks::init();
 		QueryEventLifecycle::init();
 	}
 
@@ -78,4 +77,19 @@ public function __wakeup(): void {
 		// De-serializing instances of the class is forbidden.
 		_doing_it_wrong( __METHOD__, 'De-serializing instances of the plugin Main class is not allowed.', '0.0.1' );
 	}
+
+	/**
+	 * Activation callback for the plugin.
+	 */
+	public static function activate(): void {
+		DatabaseEntity::create_table();
+	}
+
+	/**
+	 * Deactivation callback for the plugin.
+	 */
+	public static function deactivate(): void {
+		// @TODO: Add configuration to determine if the table should be dropped on deactivation.
+		DatabaseEntity::drop_table();
+	}
 }

plugins/wpgraphql-logging/src/Hooks/PluginHooks.php

@@ -140,4 +140,6 @@ function wpgraphql_logging_load_textdomain(): void {
 add_action( 'init', 'wpgraphql_logging_load_textdomain', 1, 0 );
 
 /** @psalm-suppress HookNotFound */
-wpgraphql_logging_init();
+add_action( 'plugins_loaded', function() : void {
+	wpgraphql_logging_init();
+ }, 10, 0 );