Merge branch 'main' of https://github.com/appwrite/appwrite into revert-7629-revert-7614-chore-usage-queue-health

src/Appwrite/Auth/Validator/Phone.php

@@ -32,7 +32,7 @@ class Phone extends Validator
      */
     public function isValid($value): bool
     {
-        return is_string($value) && !!\preg_match('/^\+[1-9]\d{1,14}$/', $value);
+        return is_string($value) && !!\preg_match('/^\+[1-9]\d{6,14}$/', $value);
     }
 
     /**

src/Appwrite/Extend/Exception.php

@@ -55,6 +55,7 @@ class Exception extends \Exception
     public const GENERAL_CODES_DISABLED            = 'general_codes_disabled';
     public const GENERAL_USAGE_DISABLED            = 'general_usage_disabled';
     public const GENERAL_NOT_IMPLEMENTED           = 'general_not_implemented';
+    public const GENERAL_BAD_REQUEST               = 'general_bad_request';
 
     /** Users */
     public const USER_COUNT_EXCEEDED               = 'user_count_exceeded';

src/Appwrite/Platform/Tasks/QueueRetry.php

@@ -7,7 +7,9 @@ use Utopia\CLI\Console;
 use Utopia\Platform\Action;
 use Utopia\Queue\Client;
 use Utopia\Queue\Connection;
+use Utopia\Validator\Integer;
 use Utopia\Validator\WhiteList;
+use Utopia\Validator\Wildcard;
 
 class QueueRetry extends Action
 {
@@ -35,21 +37,25 @@ class QueueRetry extends Action
                 Event::MIGRATIONS_QUEUE_NAME,
                 Event::HAMSTER_CLASS_NAME
             ]), 'Queue name')
+            ->param('limit', 0, new Wildcard(), 'jobs limit', true)
             ->inject('queue')
-            ->callback(fn ($name, $queue) => $this->action($name, $queue));
+            ->callback(fn ($name, $limit, $queue) => $this->action($name, $limit, $queue));
     }
 
     /**
      * @param string $name The name of the queue to retry jobs from
+     * @param  mixed $limit
      * @param Connection $queue
      */
-    public function action(string $name, Connection $queue): void
+    public function action(string $name, mixed $limit, Connection $queue): void
     {
+
         if (!$name) {
             Console::error('Missing required parameter $name');
             return;
         }
 
+        $limit = (int)$limit;
         $queueClient = new Client($name, $queue);
 
         if ($queueClient->countFailedJobs() === 0) {
@@ -59,6 +65,6 @@ class QueueRetry extends Action
 
         Console::log('Retrying failed jobs...');
 
-        $queueClient->retry();
+        $queueClient->retry($limit);
     }
 }