Added onResponseCode query listen method

ufee · Sep 16, 2022 · 781de1d · 781de1d
1 parent 4c78af8
commit 781de1d
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -219,6 +219,9 @@ $amo->queries->setDelay(0.5); // default: 0.15 sec
 ```
 Пользовательская отладка запросов (обновлено с вводом oAuth)
 ```php
+$amo->queries->onResponseCode(429, function(\Ufee\Amo\Base\Models\QueryModel $query) {
+	echo 'Resp code 429, retry '.$query->retries."\n";
+});
 $amo->queries->listen(function(\Ufee\Amo\Base\Models\QueryModel $query) {
     $code = $query->response->getCode();
     echo $query->startDate().' - ['.$query->method.'] '.$query->getUrl()."\n";

diff --git a/src/Api/Oauth/Query.php b/src/Api/Oauth/Query.php
@@ -14,7 +14,7 @@ class Query extends QueryModel
      */
     public function execute()
     {
-        $this->retries++;
+        $this->attributes['retries']++;
         $instance = $this->instance();
 
 		$oauth = $instance->getOauth();
@@ -49,13 +49,15 @@ public function execute()
         );
         curl_close($this->curl);
 		$this->attributes['curl'] = null;
+		$code = $this->response->getCode();
+		$instance->queries->pushByCode($code, $this);
 
-		while ($this->response->getCode() == 429 && $this->retries <= 24) {
+		if ($code == 429 && $this->retries <= 7) {
 			// for limit requests
 			sleep(1);
 			return $this->setCurl()->execute();
 		}
-		if ($this->response->getCode() == 401 && $this->retry) {
+		if ($code == 401 && $this->retry) {
 			// multiserver refresh token fix
 			sleep(1);
 			$oauth = $instance->getOauth(true);
@@ -66,7 +68,7 @@ public function execute()
 			$this->setRetry(false);
             return $this->execute();
 		}
-		if (in_array($this->response->getCode(), [502,504]) && $this->retry) {
+		if (in_array($code, [502,504]) && $this->retry) {
 			// for random api errors
 			sleep(1);
             $this->setCurl();

diff --git a/src/Api/Query.php b/src/Api/Query.php
@@ -13,7 +13,7 @@ class Query extends QueryModel
      */
     public function execute()
     {
-        $this->retries++;
+        $this->attributes['retries']++;
         $instance = $this->instance();
         $last_time = 1;
         if ($last_query = $instance->queries->last()) {
@@ -34,21 +34,23 @@ public function execute()
         );
         curl_close($this->curl);
 		$this->attributes['curl'] = null;
+		$code = $this->response->getCode();
+		$instance->queries->pushByCode($code, $this);
 
-        if (!in_array($this->response->getCode(), [200, 204]) && file_exists($instance->queries->getCookiePath())) {
+        if (!in_array($code, [200, 204]) && file_exists($instance->queries->getCookiePath())) {
            @unlink($instance->queries->getCookiePath());
         }
-        while ($this->response->getCode() == 401 && $this->url != $instance::AUTH_URL && $this->retries <= 3 && $instance->hasAutoAuth()) {
+        if ($code == 401 && $this->url != $instance::AUTH_URL && $this->retries <= 3 && $instance->hasAutoAuth()) {
             $instance->authorize();
             $instance->queries->refreshSession();
             $this->setCurl();
             return $this->execute();
         }
-		while ($this->response->getCode() == 429 && $this->retries <= 24) {
+		if ($code == 429 && $this->retries <= 24) {
 			sleep(1);
 			return $this->setCurl()->execute();
 		}
-		if (in_array($this->response->getCode(), [502,504]) && $this->retry) {
+		if (in_array($code, [502,504]) && $this->retry) {
 			sleep(1);
             $this->setCurl();
 			$this->setRetry(false);
@@ -58,9 +60,9 @@ public function execute()
         $this->attributes['execution_time'] = round($this->end_time - $this->start_time, 5);
         $this->attributes['memory_usage'] = memory_get_peak_usage(true)/1024/1024;
         $this->generateHash();
-        $instance->queries->pushQuery($this, in_array($this->response->getCode(), [200]));
+        $instance->queries->pushQuery($this, in_array($code, [200]));
 
-		if (!$instance->hasSession() && in_array($this->response->getCode(), [200, 204])) {
+		if (!$instance->hasSession() && in_array($code, [200, 204])) {
             $instance->queries->refreshSession();
 		}
         return $this;

diff --git a/src/Base/Models/Oauth/QueryModel.php b/src/Base/Models/Oauth/QueryModel.php
@@ -22,7 +22,8 @@ class QueryModel extends \Ufee\Amo\Base\Models\QueryModel
 			'sleep_time',
 			'hash',
 			'memory_usage',
-			'headers'
+			'headers',
+			'retries'
 		],
 		$hidden = [
 			'account_id',
@@ -32,7 +33,6 @@ class QueryModel extends \Ufee\Amo\Base\Models\QueryModel
 			'response'
 		],
 		$attributes = [],
-		$retries = 0,
 		$cookie = [];
 
     /**
@@ -51,6 +51,7 @@ public function __construct(Oauthapi &$instance, $service_class = '')
 		$this->attributes['account_id'] = $instance->getAuth('id');
 		$this->attributes['service'] = $service_class;
 		$this->attributes['retry'] = true;
+		$this->attributes['retries'] = 0;
 		$this->_boot();
 	}
 

diff --git a/src/Base/Models/QueryModel.php b/src/Base/Models/QueryModel.php
@@ -22,7 +22,8 @@ class QueryModel
 			'sleep_time',
 			'hash',
 			'memory_usage',
-			'headers'
+			'headers',
+			'retries'
 		],
 		$hidden = [
 			'account_id',
@@ -32,7 +33,6 @@ class QueryModel
 			'response'
 		],
 		$attributes = [],
-		$retries = 0,
 		$cookie = [];
 
     /**
@@ -51,6 +51,7 @@ public function __construct(Amoapi &$instance, $service_class = '')
 		$this->attributes['account_id'] = $instance->getAuth('id');
 		$this->attributes['service'] = $service_class;
 		$this->attributes['retry'] = true;
+		$this->attributes['retries'] = 0;
 		$this->_boot();
 	}
 

diff --git a/src/Collections/QueryCollection.php b/src/Collections/QueryCollection.php
@@ -21,6 +21,7 @@ class QueryCollection extends \Ufee\Amo\Base\Collections\Collection
         $refresh_time = 900,
         $cookie_file,
         $_listener,
+		$_listener_by_code = [],
         $logger = null,
         $_logs = false,
         $_cache_initialized = false;
@@ -139,6 +140,20 @@ public function pushQuery(QueryModel $query, $save = true)
         return $this;
 	}
 
+    /**
+     * Push queries by code
+     * @param integer $code - 200,403,429,500,502,504,..
+	 * @param QueryModel $query
+	 * @return QueryCollection
+     */
+    public function pushByCode($code, QueryModel $query)
+    {
+		if (array_key_exists($code, $this->_listener_by_code) && is_callable($this->_listener_by_code[$code])) {
+			call_user_func($this->_listener_by_code[$code], $query);
+		}
+		return $this;
+	}
+
     /**
      * Initialize cache queries
 	 * @return QueryCollection
@@ -219,6 +234,18 @@ public function listen(callable $callback)
         $this->_listener = $callback;
         return $this;
     }
+
+    /**
+     * Debug queries by code
+	 * @param integer $code - 200,403,429,500,502,504,..
+	 * @param callable $callback
+	 * @return QueryCollection
+     */
+    public function onResponseCode($code, callable $callback)
+    {
+        $this->_listener_by_code[intval($code)] = $callback;
+        return $this;
+    }
 
     /**
      * Flush cache queries