Add singleton-based plugin loading mechanism

Introduce Nodeinfo class with centralized initialization pattern:
- Singleton pattern with get_instance() for global access
- Consolidated hook registration in register_hooks()
- Admin hooks separated into register_admin_hooks()
- Static activate/deactivate methods for plugin lifecycle
- Simplified main plugin file to use new class

Author: pfefferle

includes/class-nodeinfo.php

@@ -0,0 +1,154 @@
+<?php
+/**
+ * Nodeinfo Class
+ *
+ * @package Nodeinfo
+ */
+
+namespace Nodeinfo;
+
+use Nodeinfo\Controller\Nodeinfo as Controller_Nodeinfo;
+use Nodeinfo\Controller\Nodeinfo2 as Controller_Nodeinfo2;
+use Nodeinfo\Integration\Nodeinfo10;
+use Nodeinfo\Integration\Nodeinfo11;
+use Nodeinfo\Integration\Nodeinfo20;
+use Nodeinfo\Integration\Nodeinfo21;
+use Nodeinfo\Integration\Nodeinfo22;
+
+/**
+ * Nodeinfo Class
+ *
+ * @package Nodeinfo
+ */
+class Nodeinfo {
+	/**
+	 * Instance of the class.
+	 *
+	 * @var Nodeinfo
+	 */
+	private static $instance;
+
+	/**
+	 * Text domain.
+	 *
+	 * @var string
+	 */
+	const TEXT_DOMAIN = 'nodeinfo';
+
+	/**
+	 * Whether the class has been initialized.
+	 *
+	 * @var boolean
+	 */
+	private $initialized = false;
+
+	/**
+	 * Get the instance of the class.
+	 *
+	 * @return Nodeinfo
+	 */
+	public static function get_instance() {
+		if ( null === self::$instance ) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Do not allow multiple instances of the class.
+	 */
+	private function __construct() {
+		// Do nothing.
+	}
+
+	/**
+	 * Initialize the plugin.
+	 */
+	public function init() {
+		if ( $this->initialized ) {
+			return;
+		}
+
+		$this->register_hooks();
+		$this->register_admin_hooks();
+
+		// Load language files.
+		\load_plugin_textdomain(
+			self::TEXT_DOMAIN,
+			false,
+			\dirname( \plugin_basename( NODEINFO_PLUGIN_FILE ) ) . '/languages'
+		);
+
+		$this->initialized = true;
+	}
+
+	/**
+	 * Register hooks.
+	 */
+	public function register_hooks() {
+		// Initialize NodeInfo version integrations.
+		\add_action( 'init', array( Nodeinfo10::class, 'init' ) );
+		\add_action( 'init', array( Nodeinfo11::class, 'init' ) );
+		\add_action( 'init', array( Nodeinfo20::class, 'init' ) );
+		\add_action( 'init', array( Nodeinfo21::class, 'init' ) );
+		\add_action( 'init', array( Nodeinfo22::class, 'init' ) );
+
+		// Register REST routes.
+		\add_action( 'rest_api_init', array( $this, 'register_routes' ) );
+
+		// Add WebFinger and Host-Meta discovery.
+		\add_filter( 'webfinger_user_data', array( Controller_Nodeinfo::class, 'jrd' ), 10, 3 );
+		\add_filter( 'webfinger_post_data', array( Controller_Nodeinfo::class, 'jrd' ), 10, 3 );
+		\add_filter( 'host_meta', array( Controller_Nodeinfo::class, 'jrd' ) );
+
+		// Add rewrite rules for well-known endpoints.
+		\add_action( 'init', array( $this, 'add_rewrite_rules' ), 1 );
+	}
+
+	/**
+	 * Register admin hooks.
+	 */
+	public function register_admin_hooks() {
+		// Initialize Site Health checks.
+		\add_action( 'admin_init', array( Health_Check::class, 'init' ) );
+	}
+
+	/**
+	 * Register REST API routes.
+	 */
+	public function register_routes() {
+		$nodeinfo_controller = new Controller_Nodeinfo();
+		$nodeinfo_controller->register_routes();
+
+		$nodeinfo2_controller = new Controller_Nodeinfo2();
+		$nodeinfo2_controller->register_routes();
+	}
+
+	/**
+	 * Add rewrite rules for well-known endpoints.
+	 */
+	public function add_rewrite_rules() {
+		\add_rewrite_rule( '^.well-known/nodeinfo', 'index.php?rest_route=/nodeinfo/discovery', 'top' );
+		\add_rewrite_rule( '^.well-known/x-nodeinfo2', 'index.php?rest_route=/nodeinfo2/1.0', 'top' );
+	}
+
+	/**
+	 * Flush rewrite rules.
+	 *
+	 * Should be called on plugin activation.
+	 */
+	public static function activate() {
+		self::get_instance()->add_rewrite_rules();
+		\flush_rewrite_rules();
+	}
+
+	/**
+	 * Deactivate the plugin.
+	 *
+	 * Should be called on plugin deactivation.
+	 */
+	public static function deactivate() {
+		\flush_rewrite_rules();
+	}
+}

nodeinfo.php

@@ -32,65 +32,17 @@
 require_once NODEINFO_PLUGIN_DIR . 'includes/class-nodeinfo-endpoint.php';
 
 /**
- * Initialize the plugin.
- */
-function nodeinfo_init() {
-	// Initialize NodeInfo version integrations.
-	Nodeinfo\Integration\Nodeinfo10::init();
-	Nodeinfo\Integration\Nodeinfo11::init();
-	Nodeinfo\Integration\Nodeinfo20::init();
-	Nodeinfo\Integration\Nodeinfo21::init();
-	Nodeinfo\Integration\Nodeinfo22::init();
-
-	// Register REST routes.
-	add_action( 'rest_api_init', 'nodeinfo_register_routes' );
-
-	// Add WebFinger and Host-Meta discovery.
-	add_filter( 'webfinger_user_data', array( Nodeinfo\Controller\Nodeinfo::class, 'jrd' ), 10, 3 );
-	add_filter( 'webfinger_post_data', array( Nodeinfo\Controller\Nodeinfo::class, 'jrd' ), 10, 3 );
-	add_filter( 'host_meta', array( Nodeinfo\Controller\Nodeinfo::class, 'jrd' ) );
-}
-add_action( 'init', 'nodeinfo_init', 9 );
-
-/**
- * Initialize admin-only features.
- */
-function nodeinfo_admin_init() {
-	// Initialize Site Health checks.
-	Nodeinfo\Health_Check::init();
-}
-add_action( 'admin_init', 'nodeinfo_admin_init' );
-
-/**
- * Register REST API routes.
- */
-function nodeinfo_register_routes() {
-	$nodeinfo_controller = new Nodeinfo\Controller\Nodeinfo();
-	$nodeinfo_controller->register_routes();
-
-	$nodeinfo2_controller = new Nodeinfo\Controller\Nodeinfo2();
-	$nodeinfo2_controller->register_routes();
-}
-
-/**
- * Add rewrite rules for well-known endpoints.
+ * Plugin initialization function.
+ *
+ * @return Nodeinfo\Nodeinfo The plugin instance.
  */
-function nodeinfo_add_rewrite_rules() {
-	add_rewrite_rule( '^.well-known/nodeinfo', 'index.php?rest_route=/nodeinfo/discovery', 'top' );
-	add_rewrite_rule( '^.well-known/x-nodeinfo2', 'index.php?rest_route=/nodeinfo2/1.0', 'top' );
+function nodeinfo_plugin() {
+	return Nodeinfo\Nodeinfo::get_instance();
 }
-add_action( 'init', 'nodeinfo_add_rewrite_rules', 1 );
 
-/**
- * Flush rewrite rules on activation.
- */
-function nodeinfo_activate() {
-	nodeinfo_add_rewrite_rules();
-	flush_rewrite_rules();
-}
-register_activation_hook( __FILE__, 'nodeinfo_activate' );
+// Initialize the plugin.
+nodeinfo_plugin()->init();
 
-/**
- * Flush rewrite rules on deactivation.
- */
-register_deactivation_hook( __FILE__, 'flush_rewrite_rules' );
+// Register activation and deactivation hooks.
+register_activation_hook( __FILE__, array( Nodeinfo\Nodeinfo::class, 'activate' ) );
+register_deactivation_hook( __FILE__, array( Nodeinfo\Nodeinfo::class, 'deactivate' ) );