Merge branch 'imap-idle-polling-mechanism' of github.com:Shadow243/cypht into imap-idle-polling-mechanism

Author: Shadow243

.env.example

@@ -212,7 +212,7 @@ WIN_CACERT_DIR=
 
 JS_EXCLUDE_DEPS=
 
-QUEUE_CONNECTION=database
+QUEUE_DRIVER=database
 
 AWS_ACCESS_KEY_ID='your-aws-access-key'
 AWS_SECRET_ACCESS_KEY='your-aws-secret-key'

config/queue.php

@@ -0,0 +1,13 @@
+<?php
+return [
+    /*
+    | -------------
+    | Queue Support
+    | -------------
+    |
+    | Configure Queue details below to use it for queueing.
+    */
+    'queue_enabled' => env('QUEUE_ENABLED', false),
+
+    'queue_driver' => env('QUEUE_DRIVER', 'database'),
+];

services/Core/Commands/Hm_QueueWorkCommand.php

@@ -29,7 +29,7 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $connection = $input->getArgument('connection') ?: env('QUEUE_CONNECTION', 'database');
+        $connection = $input->getArgument('connection') ?: env('QUEUE_DRIVER', 'database');
         $queue = $input->getOption('queue') ?: 'default';
 
         $output->writeln("Processing jobs from the [$queue] on connection [$connection]...");

services/Core/Hm_Container.php

@@ -6,7 +6,7 @@
 use Hm_Redis;
 use Hm_AmazonSQS;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Services\Providers\{ Hm_CommandServiceProvider, Hm_EventServiceProvider, Hm_SchedulerServiceProvider, Hm_QueueServiceProvider };
+use Services\Providers\{Hm_CommandServiceProvider, Hm_EventServiceProvider, Hm_SchedulerServiceProvider, Hm_QueueServiceProvider};
 
 class Hm_Container
 {
@@ -19,46 +19,50 @@ private function __clone() {}
     public static function setContainer(ContainerBuilder $containerBuilder): ContainerBuilder
     {
         if (self::$container === null) {
-            self::$container = $containerBuilder; 
+            self::$container = $containerBuilder;
         }
 
         return self::$container;
     }
 
     public static function bind(): ContainerBuilder
     {
-        // Register Hm_DB
-        self::$container->set('db.connection', Hm_DB::connect(self::$container->get('config')));
-
-        self::$container->register('db', Hm_DB::class)
-        ->setShared(true);
-
-        // Register Hm_Redis
-        $redis = new Hm_Redis(self::$container->get('config'));
-        $redis->connect();
-        self::$container->set('redis.connection', $redis->getInstance());
-        self::$container->register('redis', Hm_Redis::class)->setArgument(0, self::$container->get('config'))
-
-        ->setShared(true);
-
-        // Register Hm_AmazonSQS
-        self::$container->set('amazon.sqs.connection', Hm_AmazonSQS::connect(self::$container->get('config')));
-        self::$container->register('amazon.sqs',Hm_AmazonSQS::class)
-        ->setShared(true);
+        $config = self::$container->get('config');
+
+        if ($config->get('queue_enabled')) {
+
+            if ($config->get('queue_driver') === 'database') {
+                // Register Hm_DB
+                self::$container->set('db.connection', Hm_DB::connect(self::$container->get('config')));
+        
+                self::$container->register('db', Hm_DB::class)->setShared(true);
+            } else if ($config->get('queue_driver') === 'redis') {
+                // Register Hm_Redis
+                $redis = new Hm_Redis($config);
+                $redis->connect();
+                self::$container->set('redis.connection', $redis->getInstance());
+                self::$container->register('redis', Hm_Redis::class)->setArgument(0, self::$container->get('config'))->setShared(true);
+            } else if ($config->get('queue_enabled') && $config->get('queue_driver') === 'sqs') {
+                // Register Hm_AmazonSQS
+                self::$container->set('amazon.sqs.connection', Hm_AmazonSQS::connect(self::$container->get('config')));
+                self::$container->register('amazon.sqs', Hm_AmazonSQS::class)
+                    ->setShared(true);
+            }
+        }
 
         // Register Hm_CommandServiceProvider
         self::$container->register('command.serviceProvider', Hm_CommandServiceProvider::class)
-        ->setShared(true);
+            ->setShared(true);
 
         // Register Hm_QueueServiceProvider
-        self::$container->register('queue.ServiceProvider',Hm_QueueServiceProvider::class)
-        ->setShared(true);
+        self::$container->register('queue.ServiceProvider', Hm_QueueServiceProvider::class)
+            ->setShared(true);
 
         self::$container->register('scheduler.ServiceProvider', Hm_SchedulerServiceProvider::class)
-        ->setShared(true);
+            ->setShared(true);
 
         self::$container->register('event.ServiceProvider', Hm_EventServiceProvider::class)
-        ->setShared(true);
+            ->setShared(true);
 
         return self::$container;
     }

services/Core/Scheduling/Hm_CacheMutex.php

@@ -18,7 +18,7 @@ public function __construct(Hm_Cache $cache)
     /**
      * Create a lock for the task.
      *
-     * @param Task $task The task instance
+     * @param Hm_CommandTask $task The task instance
      * @param int $expiresAt Time in seconds for the lock expiration
      * @return bool Returns true if the lock was created, false otherwise
      */

services/Core/Scheduling/Hm_ScheduledTask.php

@@ -30,12 +30,15 @@ public function __construct(callable $callback, $name = '', $description = '', $
         $this->expression = $expression;
     }
 
+    public function getName()
+    {   
+        return $this->name;
+    }
+
     public function isDue()
-    {
-        
+    {   
         if ($this->isEnabled) {
             $this->calculateNextRunTime();
-            dd($this->isEnabled);
             return $this->nextRunTime <= new \DateTime('now', new \DateTimeZone($this->timezone));
         }
         return false;
@@ -114,6 +117,7 @@ private function calculateNextRunTime()
 
         // Calculate next minute
         $nextMinute = $this->getNextFieldValue($next->format('i'), $minuteField, 0, 59);
+
         if ($nextMinute !== null) {
 
             $next->setTime($next->format('H'), $nextMinute);
@@ -153,7 +157,7 @@ private function calculateNextRunTime()
         $nextDayOfWeek = $this->getNextFieldValue($next->format('w'), $dayOfWeekField, 0, 6);
 
         if ($nextDayOfWeek !== null) {
-            while ($next->format('w') !== $nextDayOfWeek) {
+            while (intval($next->format('w')) !== $nextDayOfWeek) {
                 $next->modify('+1 day');
             }
         } else {

services/Core/Scheduling/Hm_Scheduler.php

@@ -6,6 +6,7 @@
 use Hm_Debug;
 use Hm_Msgs;
 use Hm_Session_Setup;
+use Services\Core\Hm_Container;
 
 class Hm_Scheduler
 {
@@ -19,7 +20,7 @@ public function __construct($config)
 
     public function command($command)
     {
-        $cache = new Hm_Cache($this->config, new Hm_Session_Setup($this->config));
+        $cache = new Hm_Cache($this->config, Hm_Container::getContainer()->get('session'));
         $commandTask = new Hm_CommandTask($command, new Hm_CacheMutex($cache));
         $this->tasks[] = $commandTask;
         return $commandTask;

services/Hm_ConsoleKernel.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Services;
+
+use Services\Core\Scheduling\Hm_Scheduler;
+use Services\Core\Hm_Container;
+
+class Hm_ConsoleKernel
+{
+    protected $scheduler;
+
+    public function __construct(Hm_Scheduler $scheduler)
+    {
+        $this->scheduler = $scheduler;
+
+    }
+
+    /**
+     * Define the application's command schedule.
+     */
+    public function schedule()
+    {
+        // Register tasks with the scheduler
+        $this->scheduler->command('check:mail')
+            ->everyMinute()
+            ->withoutOverlapping();
+    }
+}

services/Hm_bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 use Services\Core\Hm_Container;
-use Services\Hm_ConsoleKernal;
+use Services\Hm_ConsoleKernel;
 use Symfony\Component\ErrorHandler\ErrorHandler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -62,6 +62,6 @@
 $queueServiceProvider->register($config, $session);
 
 // Create a new Kernel instance
-$kernel = (new Hm_ConsoleKernal($containerBuilder->get('scheduler')))->schedule();
+$kernel = (new Hm_ConsoleKernel($containerBuilder->get('scheduler')))->schedule();
 
 return [$containerBuilder, $config];

services/Jobs/Hm_ProcessNewEmail.php

@@ -13,8 +13,6 @@ class Hm_ProcessNewEmail extends Hm_BaseJob implements Hm_ShouldQueue
 {
     use Hm_Dispatchable, Hm_InteractsWithQueue, Hm_Serializes;
 
-    public string $driver = 'sqs';
-
     public string $email;
 
     public function __construct(string $email)