From a9654f00c8fbc9934289d761843ddd071025013f Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 28 Aug 2026 17:20:28 +0000
Subject: [PATCH] =PHPStorm Code Inspection: fixed class reference errors (from getting rid of JVB() and replacing with direct class::getInstance; as well as general code sniffing, etc

---
 inc/managers/queue/Queue.php |   41 ++++++++++++++++++++++++++++++++---------
 1 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/inc/managers/queue/Queue.php b/inc/managers/queue/Queue.php
index 28abc4e..d0e359e 100644
--- a/inc/managers/queue/Queue.php
+++ b/inc/managers/queue/Queue.php
@@ -4,20 +4,32 @@
 	exit;
 }
 
+use Exception;
+use JVBase\Instance;
+use JVBase\managers\AdminPages;
+use JVBase\managers\Errors;
+use JVBase\rest\routes\QueueRoutes;
+use Throwable;
 use WP_Error;
 use WP_REST_Request;
 use WP_REST_Response;
 
 class Queue
 {
+	use Instance;
 	private Storage $storage;
 	private Processor $processor;
 	private TypeRegistry $registry;
 	public Executor $executor;
 	private Locker $locker;
 
-	public function __construct()
+	private QueueRoutes $routes;
+
+	private function __construct()
 	{
+		//Load routes
+		$this->routes = new QueueRoutes();
+
 		$this->storage = new Storage();
 		$this->registry = new TypeRegistry();
 		$this->locker = new Locker();
@@ -27,6 +39,7 @@
 
 		add_action('jvb_process_queue', [$this, 'checkQueue']);
 		add_action('jvb_queue_maintenance', [$this, 'maintenance']);
+		add_action('jvb_daily_snapshot', [$this->storage, 'snapshotDaily']);
 
 		if (!wp_next_scheduled('jvb_process_queue')) {
 			wp_schedule_event(time(), 'every-minute', 'jvb_process_queue');
@@ -34,6 +47,11 @@
 		if (!wp_next_scheduled('jvb_queue_maintenance')) {
 			wp_schedule_event(time(), 'hourly', 'jvb_queue_maintenance');
 		}
+		if (!wp_next_scheduled('jvb_daily_snapshot')) {
+			// Schedule for next 3am
+			$next3am = strtotime('tomorrow 3am', current_time('timestamp'));
+			wp_schedule_event($next3am, 'daily', 'jvb_daily_snapshot');
+		}
 
 		jvb_register_do_once('queue_admin_action_registered', [$this, 'registerAdminAction']);
 		add_filter(BASE.'admin_action_filter', [$this, 'adminActionFilter'], 10, 3);
@@ -88,8 +106,8 @@
 				'updated_existing' => false,
 			];
 
-		} catch (\Exception $e) {
-			JVB()->error()->log('queue', $e->getMessage(), $data, 'high');
+		} catch (Exception $e) {
+			Errors::getInstance()->log('queue', $e->getMessage(), $data, 'high');
 			return new WP_Error('queue_failed', $e->getMessage());
 		}
 	}
@@ -97,7 +115,7 @@
 	/**
 	 * Try to merge incoming operation into an existing pending/scheduled one.
 	 * Returns result array if merged, null if not.
-	 * @throws \Throwable
+	 * @throws Throwable
 	 */
 	private function tryMerge(Operation $incoming): ?array
 	{
@@ -166,7 +184,7 @@
 	public function maintenance(): void
 	{
 		$this->locker->withLock(function () {
-			$this->storage->resetStuckOperations(30);
+			$this->storage->resetStuckOperations();
 		});
 		$this->runQueueOnShutdown();
 	}
@@ -189,7 +207,7 @@
 	/**
 	 * Get a specific value from an operation - backwards compatibility
 	 */
-	public function getOperationValue(string $id, string $column, bool $decodeJson = true): mixed
+	public function getOperationValue(string $id, string $column, bool $decodeJson = true): \static|string|int|array|null
 	{
 		$op = $this->get($id);
 		if (!$op) {
@@ -336,7 +354,7 @@
 		// Use provided operation_id or generate one
 		$op->id = !empty($options['operation_id'])
 			? $options['operation_id']
-			: 'u' . $userId . '_' . uniqid('op_');
+			: self::generateID($userId);
 
 		$op->type = $type;
 		$op->userId = $userId;
@@ -397,7 +415,7 @@
 
 	private function runQueueOnShutdown(): void
 	{
-		if (!has_action('shutdown', [$this, 'processQueueOnShutdown'])) {
+		if (!has_action('shutdown', [$this, 'processQueueOnShutdown']) && $this->processor->hasAdequateResources()) {
 			add_action('shutdown', [$this, 'processQueueOnShutdown'], 100);
 		}
 	}
@@ -415,7 +433,7 @@
 
 	public function registerAdminAction():void
 	{
-		$admin = JVB()->admin();
+		$admin = AdminPages::getInstance();
 		$admin->registerAction(
 			'Restart Stuck Operations',
 			'restart-stuck-operations',
@@ -456,4 +474,9 @@
 				return $response;
 		}
 	}
+
+	public static function generateId(int $userID):string
+	{
+		return 'u' . $userID . '_' . uniqid('op_');
+	}
 }

--
Gitblit v1.10.0