Stability bugfix

greezlu · Oct 31, 2023 · 181c532 · 181c532
1 parent ef066c4
commit 181c532
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -30,14 +30,16 @@ More in the [documentation.](https://docs.capsolver.com/guide/captcha/ReCaptchaV
 
 Request:
 ```php
-$solution = $solver->recaptchaV3([
-    'type'          => \Capsolver\Solvers\Token\ReCaptchaV3::TASK,
-    'websiteURL'    => 'https://www.google.com/recaptcha/api2/demo',
-    'websiteKey'    => '6Le-wvkSAAAAAPBMRTvw0Q4Muexq9bi0DJwx_mJ-',
-    'pageAction'    => 'verify',
-    'minScore'      => 0.6,
-    'proxy'         => 'http:ip:port:user:pass'
-]);
+$solution = $solver->recaptchaV3(
+    \Capsolver\Solvers\Token\ReCaptchaV3::TASK,
+    [
+      'websiteURL'    => 'https://www.google.com/recaptcha/api2/demo',
+      'websiteKey'    => '6Le-wvkSAAAAAPBMRTvw0Q4Muexq9bi0DJwx_mJ-',
+      'pageAction'    => 'verify',
+      'minScore'      => 0.6,
+      'proxy'         => 'http:ip:port:user:pass'
+    ]
+);
 ```
 
 Response:
@@ -54,7 +56,7 @@ If case of an error solver throws an instance of `CapsolverException` exception.
 
 ```php
 try {
-    $solution = $solver->recaptchaV3([]);
+    $solution = $solver->recaptchaV3('', []);
 } catch (\Capsolver\Exceptions\RequestException $error) {
     // Error happened before api request
 } catch (\Capsolver\Exceptions\ResponseException $error) {

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "greezlu/capsolver-php",
     "type": "library",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "autoload": {
         "psr-4": {
             "Capsolver\\": "src/"
@@ -15,7 +15,8 @@
     ],
     "require": {
         "php": ">=7.4",
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "ext-json": "*"
     },
     "license": "MIT"
 }
diff --git a/src/Abstracts/RecognitionAbstract.php b/src/Abstracts/RecognitionAbstract.php
@@ -5,9 +5,18 @@
 namespace Capsolver\Abstracts;
 
 use Capsolver\Exceptions\CapsolverException;
+use Capsolver\Interfaces\SolverInterface;
 
-abstract class RecognitionAbstract extends TaskAbstract
+abstract class RecognitionAbstract
+    extends TaskAbstract
+    implements SolverInterface
 {
+    /**
+     * @param array $params
+     * @return array
+     */
+    abstract public function solve(array $params): array;
+
     /**
      * @param array $request
      * @return array

diff --git a/src/Abstracts/TaskAbstract.php b/src/Abstracts/TaskAbstract.php
@@ -10,7 +10,18 @@
 
 abstract class TaskAbstract
 {
-    private const HOST = 'https://api.capsolver.com/';
+    protected const HOST = 'https://api.capsolver.com/';
+
+    private string $key;
+
+    /**
+     * @param string $key
+     */
+    public function __construct(
+        string $key
+    ) {
+        $this->key = $key;
+    }
 
     /**
      * @param array $request
@@ -22,7 +33,7 @@ protected function createTask(array $request): array
     {
         return $this->send(
             self::HOST . 'createTask',
-            $this->encode($request)
+            $this->encode($this->hydrate($request))
         );
     }
 
@@ -36,21 +47,20 @@ protected function getTaskResult(array $request): array
     {
         return $this->send(
             self::HOST . 'getTaskResult',
-            $this->encode($request)
+            $this->encode($this->hydrate($request, false))
         );
     }
 
     /**
-     * @param array $request
      * @return array
      *
      * @throws CapsolverException
      */
-    protected function getBalance(array $request): array
+    protected function getBalance(): array
     {
         return $this->send(
             self::HOST . 'getBalance',
-            $this->encode($request)
+            $this->encode($this->hydrate([], false))
         );
     }
 
@@ -62,6 +72,24 @@ protected function getBalance(array $request): array
      */
     abstract protected function process(array $request): array;
 
+    /**
+     * @param array $params
+     * @param bool $isTask
+     * @return array
+     */
+    private function hydrate(
+        array $params,
+        bool $isTask = true
+    ): array {
+        $request = $isTask
+            ? ['task' => $params]
+            : $params;
+
+        $request['clientKey'] = $this->key;
+
+        return $request;
+    }
+
     /**
      * @param array $data
      * @return string

diff --git a/src/Abstracts/TokenAbstract.php b/src/Abstracts/TokenAbstract.php
@@ -5,9 +5,18 @@
 namespace Capsolver\Abstracts;
 
 use Capsolver\Exceptions\CapsolverException;
+use Capsolver\Interfaces\SolverInterface;
 
-abstract class TokenAbstract extends TaskAbstract
+abstract class TokenAbstract
+    extends TaskAbstract
+    implements SolverInterface
 {
+    /**
+     * @param array $params
+     * @return array
+     */
+    abstract public function solve(array $params): array;
+
     /**
      * @param array $request
      * @return array

diff --git a/src/CapsolverClient.php b/src/CapsolverClient.php
@@ -5,6 +5,7 @@
 namespace Capsolver;
 
 use Capsolver\Exceptions\CapsolverException;
+use Capsolver\Solvers\Token\ReCaptchaV3;
 
 class CapsolverClient
 {
@@ -20,26 +21,18 @@ public function __construct(
     }
 
     /**
+     * @param string $type
      * @param array $params
      * @return array
      *
      * @throws CapsolverException
      */
-    public function recaptchaV3(array $params): array
-    {
-        $solver = new \Capsolver\Solvers\Token\ReCaptchaV3();
-        return $solver->solve($this->hydrate($params));
-    }
-
-    /**
-     * @param array $params
-     * @return array
-     */
-    private function hydrate(array $params): array
-    {
-        return [
-            'clientKey' => $this->key,
-            'task'      => $params
-        ];
+    public function recaptchaV3(
+        string $type,
+        array $params
+    ): array {
+        $params['type'] = $type;
+        $solver = new ReCaptchaV3($this->key);
+        return $solver->solve($params);
     }
 }
diff --git a/src/Interfaces/SolverInterface.php b/src/Interfaces/SolverInterface.php
@@ -9,10 +9,10 @@
 interface SolverInterface
 {
     /**
-     * @param array $request
+     * @param array $params
      * @return array
      *
      * @throws CapsolverException
      */
-    public function solve(array $request): array;
+    public function solve(array $params): array;
 }
diff --git a/src/Solvers/Token/ReCaptchaV3.php b/src/Solvers/Token/ReCaptchaV3.php
@@ -6,10 +6,9 @@
 
 use Capsolver\Exceptions\CapsolverException;
 use Capsolver\Exceptions\RequestException;
-use Capsolver\Interfaces\SolverInterface;
 use Capsolver\Abstracts\TokenAbstract;
 
-class ReCaptchaV3 extends TokenAbstract implements SolverInterface
+class ReCaptchaV3 extends TokenAbstract
 {
     public const TASK                       = 'ReCaptchaV3Task';
     public const ENTERPRISE_TASK            = 'ReCaptchaV3EnterpriseTask';
@@ -18,25 +17,25 @@ class ReCaptchaV3 extends TokenAbstract implements SolverInterface
     public const M1_TASK_PROXYLESS          = 'ReCaptchaV3M1TaskProxyLess';
 
     /**
-     * @param array $request
+     * @param array $params
      * @return array
      *
      * @throws CapsolverException
      */
     public function solve(
-        array $request
+        array $params
     ): array {
-        $this->validate($request);
-        return $this->process($request);
+        $this->validate($params);
+        return $this->process($params);
     }
 
     /**
-     * @param array $request
+     * @param array $params
      * @return void
      *
      * @throws RequestException
      */
-    private function validate(array $request): void
+    private function validate(array $params): void
     {
         $allowedTypes = [
             self::TASK,
@@ -46,7 +45,7 @@ private function validate(array $request): void
             self::M1_TASK_PROXYLESS
         ];
 
-        $type = $request['task']['type'] ?? '';
+        $type = $params['type'] ?? '';
 
         if (!in_array($type, $allowedTypes)) {
             throw new RequestException(