Merge pull request #21 from achmadhadikurnia/main

fix bugs retry on http client and add request timeout feature
kanekescom · Feb 24, 2024 · f074b8a · f074b8a
2 parents eafc08e + 2886cf3
commit f074b8a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 108 deletions.
diff --git a/config/siasn-api.php b/config/siasn-api.php
@@ -2,57 +2,12 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Mode
-    |--------------------------------------------------------------------------
-    |
-    | This value determines the "mode" your SIASN API is currently running in.
-    | This may determine how you prefer to configure various services the
-    | application utilizes.
-    |
-    | Supported: "training", "production"
-    |
-    */
-
     'mode' => env('SIASN_MODE', 'training'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Debug Mode
-    |--------------------------------------------------------------------------
-    |
-    | When in debug mode, detailed error messages with stack traces will be
-    | shown on every error that occurs within your application. If disabled,
-    | a simple generic error page is shown.
-    |
-    */
-
     'http_verify' => (bool) env('SIASN_HTTP_VERIFY', true),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Debug Mode
-    |--------------------------------------------------------------------------
-    |
-    | When in debug mode, detailed error messages with stack traces will be
-    | shown on every error that occurs within your application. If disabled,
-    | a simple generic error page is shown.
-    |
-    */
-
     'debug' => (bool) env('SIASN_DEBUG', env('APP_DEBUG')),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Credentials
-    |--------------------------------------------------------------------------
-    |
-    | This options is for storing credentials for SIASN API Manager and SIASN
-    | SSO API
-    |
-    */
-
     'apim' => [
         'production' => [
             'url' => 'https://apimws.bkn.go.id/oauth2/token',
@@ -87,43 +42,20 @@
         ],
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Constanta
-    |--------------------------------------------------------------------------
-    |
-    | This options is for storing the param for SIASN API.
-    |
-    */
-
     'const' => [
         'instansi_id' => env('SIASN_CONST_INSTANSI_ID'),
         'satuan_kerja_id' => env('SIASN_CONST_SATUAN_KERJA_ID'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Token Age
-    |--------------------------------------------------------------------------
-    |
-    | This option is to cache token ages in seconds.
-    |
-    */
-
     'token_age' => [
         'apim' => env('SIASN_APIM_TOKEN_AGE', 3600 - 60),
         'sso' => env('SIASN_SSO_TOKEN_AGE', 43200 - 60),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Timeout
-    |--------------------------------------------------------------------------
-    |
-    | This option determine the time limit for getting a response in seconds
-    |
-    */
+    'max_request_attempts' => env('SIASN_REQUEST_ATTEMPTS', 3),
+
+    'max_request_wait_attempts' => env('SIASN_REQUEST_WAIT_ATTEMPTS', 3),
 
-    'timeout' => env('SIASN_TIMEOUT', 60),
+    'request_timeout' => env('SIASN_TIMEOUT', 60),
 
 ];
diff --git a/src/Credentials/Apim.php b/src/Credentials/Apim.php
@@ -22,14 +22,16 @@ public static function getToken(): Response
             throw new InvalidApimCredentialsException('password must be set');
         }
 
-        return Http::withOptions([
-            'debug' => Config::getDebug(),
-            'verify' => Config::getHttpVerify(),
-        ])->withBasicAuth(
-            $credential->username,
-            $credential->password
-        )->post($credential->url, [
-            'grant_type' => $credential->grant_type,
-        ]);
+        return Http::timeout(config('siasn-api.request_timeout'))
+            ->retry(config('siasn-api.max_request_attempts'), config('siasn-api.max_request_wait_attempts'))
+            ->withOptions([
+                'debug' => Config::getDebug(),
+                'verify' => Config::getHttpVerify(),
+            ])->withBasicAuth(
+                $credential->username,
+                $credential->password
+            )->post($credential->url, [
+                'grant_type' => $credential->grant_type,
+            ]);
     }
 }
diff --git a/src/Credentials/Sso.php b/src/Credentials/Sso.php
@@ -26,14 +26,18 @@ public static function getToken(): Response
             throw new InvalidSsoCredentialsException('password must be set');
         }
 
-        return Http::asForm()->withOptions([
-            'debug' => Config::getDebug(),
-            'verify' => Config::getHttpVerify(),
-        ])->post($credential->url, [
-            'grant_type' => $credential->grant_type,
-            'client_id' => $credential->client_id,
-            'username' => $credential->username,
-            'password' => $credential->password,
-        ]);
+        return Http::timeout(config('siasn-api.request_timeout'))
+            ->asForm()
+            ->retry(config('siasn-api.max_request_attempts'), config('siasn-api.max_request_wait_attempts'))
+            ->withOptions([
+                'debug' => Config::getDebug(),
+                'verify' => Config::getHttpVerify(),
+            ])
+            ->post($credential->url, [
+                'grant_type' => $credential->grant_type,
+                'client_id' => $credential->client_id,
+                'username' => $credential->username,
+                'password' => $credential->password,
+            ]);
     }
 }
diff --git a/src/Siasn.php b/src/Siasn.php
@@ -14,15 +14,16 @@ class Siasn extends ClassExtender
 {
     public function __construct()
     {
-        $this->class = Http::timeout(config('siasn-api.timeout'))
-            ->retry(2, 0, function (Exception $exception, PendingRequest $request) {
+        $this->class = Http::timeout(config('siasn-api.request_timeout'))
+            ->retry(config('siasn-api.max_request_attempts'), config('siasn-api.max_request_wait_attempts'), function (Exception $exception, PendingRequest $request) {
                 if (! $exception instanceof RequestException || $exception->response->status() !== 401) {
                     return false;
                 }
 
                 Token::forget();
 
-                $request->withToken(Token::getApimToken()->access_token);
+                $request
+                    ->withToken(Token::getApimToken()->access_token);
 
                 return true;
             })
@@ -37,23 +38,25 @@ public function withSso()
     {
         $ssoToken = Token::getSsoToken();
 
-        return $this->class->withHeaders([
-            'Auth' => "{$ssoToken->token_type} {$ssoToken->access_token}",
-        ])->retry(2, 0, function (Exception $exception, PendingRequest $request) {
-            if (! $exception instanceof RequestException || $exception->response->status() !== 401) {
-                return false;
-            }
+        return $this->class
+            ->retry(config('siasn-api.max_request_attempts'), config('siasn-api.max_request_wait_attempts'), function (Exception $exception, PendingRequest $request) {
+                if (! $exception instanceof RequestException || $exception->response->status() !== 401) {
+                    return false;
+                }
 
-            Token::forget();
-            $ssoToken = Token::getSsoToken();
+                Token::forget();
+                $ssoToken = Token::getSsoToken();
 
-            $request
-                ->withToken(Token::getApimToken()->access_token)
-                ->withHeaders([
-                    'Auth' => "{$ssoToken->token_type} {$ssoToken->access_token}",
-                ]);
+                $request
+                    ->withToken(Token::getApimToken()->access_token)
+                    ->withHeaders([
+                        'Auth' => "{$ssoToken->token_type} {$ssoToken->access_token}",
+                    ]);
 
-            return true;
-        });
+                return true;
+            })
+            ->withHeaders([
+                'Auth' => "{$ssoToken->token_type} {$ssoToken->access_token}",
+            ]);
     }
 }