Fixing date parsing for oxylabs change

qschmick · qschmick · commit 2dabc2b24d41 · 2025-09-08T08:55:38.000-04:00
diff --git a/database/migrations/2000_01_01_000001_create_oxylabs_api_reqeust_logger_table.php b/database/migrations/2000_01_01_000001_create_oxylabs_api_reqeust_logger_table.php
@@ -37,7 +37,7 @@ public function up(): void
             $table->json('response_headers')
                 ->nullable();
             // Internal exceptions that occurred during the request
-            $table->string('exception')
+            $table->string('exception', 512)
                 ->nullable();
             // When the request was resolved to the millisecond
             $table->timestamp('occurred_at', 3)->index();
diff --git a/src/DTOs/Amazon/AmazonPricingResult.php b/src/DTOs/Amazon/AmazonPricingResult.php
@@ -23,9 +23,9 @@ public function __construct(
         public readonly int $status_code,
         public readonly ?string $type = null,
         public readonly ?string $parser_type = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?string $parser_preset = null,
     ) {}
diff --git a/src/DTOs/Amazon/AmazonProductResult.php b/src/DTOs/Amazon/AmazonProductResult.php
@@ -17,9 +17,9 @@ public function __construct(
         public readonly bool $is_render_forced,
         public readonly int $status_code,
         public readonly string $parser_type,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?string $parser_preset = null,
     ) {}
diff --git a/src/DTOs/Amazon/AmazonProductResultContent.php b/src/DTOs/Amazon/AmazonProductResultContent.php
@@ -98,9 +98,9 @@ public function __construct(
         public readonly ?bool $amazon_choice = null,
         public readonly ?float $coupon_discount_percentage = null,
         public readonly ?string $parent_asin = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?bool $is_prime_pantry = null,
     ) {}
diff --git a/src/DTOs/Amazon/AmazonResult.php b/src/DTOs/Amazon/AmazonResult.php
@@ -20,9 +20,9 @@ public function __construct(
         public readonly bool $is_render_forced,
         public readonly int $status_code,
         public readonly ?string $parser_type = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?string $parser_preset = null,
     ) {}
diff --git a/src/DTOs/Amazon/AmazonSellerResult.php b/src/DTOs/Amazon/AmazonSellerResult.php
@@ -16,9 +16,9 @@ public function __construct(
         public readonly string $job_id,
         public readonly int $status_code,
         public readonly string $parser_type,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
     ) {}
 }
diff --git a/src/DTOs/Google/GoogleShoppingPricingResult.php b/src/DTOs/Google/GoogleShoppingPricingResult.php
@@ -22,9 +22,9 @@ public function __construct(
         public readonly bool $is_render_forced,
         public readonly int $status_code,
         public readonly string $parser_type,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?string $parser_preset = null,
     ) {}
diff --git a/src/DTOs/Google/GoogleShoppingProductResult.php b/src/DTOs/Google/GoogleShoppingProductResult.php
@@ -17,9 +17,9 @@ public function __construct(
         public readonly bool $is_render_forced,
         public readonly int $status_code,
         public readonly string $parser_type,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?string $parser_preset = null,
     ) {}
diff --git a/src/DTOs/PushPullJob.php b/src/DTOs/PushPullJob.php
@@ -11,14 +11,14 @@
 class PushPullJob extends Data
 {
     public function __construct(
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly Carbon $created_at,
         public readonly string $domain,
         public readonly string $id,
         public readonly bool $parse,
         public readonly string $source,
         public readonly string $status,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly Carbon $updated_at,
         public readonly ?bool $xhr = null,
         public readonly ?int $client_id = null,
diff --git a/src/DTOs/PushPullJobResponse.php b/src/DTOs/PushPullJobResponse.php
@@ -12,7 +12,7 @@ class PushPullJobResponse extends Data
     public function __construct(
         public readonly int $client_id,
         public readonly array $context,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly string $created_at,
         public readonly string $domain,
         public readonly ?string $geo_location,
@@ -32,7 +32,7 @@ public function __construct(
         public readonly ?string $storage_type = null,
         public readonly ?string $storage_url = null,
         public readonly ?string $subdomain = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?string $updated_at = null,
         public readonly ?string $user_agent_type = null,
         public readonly ?string $locale = null,
diff --git a/src/DTOs/UniversalResult.php b/src/DTOs/UniversalResult.php
@@ -19,9 +19,9 @@ public function __construct(
         public readonly string $job_id,
         public readonly bool $is_render_forced,
         public readonly int $status_code,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?UniversalSession $session_info = null,
         public readonly ?UniversalResultRequest $_request = null,
diff --git a/src/DTOs/Walmart/WalmartProductResult.php b/src/DTOs/Walmart/WalmartProductResult.php
@@ -21,9 +21,9 @@ public function __construct(
         public readonly int $status_code,
         public readonly ?string $type = null,
         public readonly ?string $parser_type = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $created_at = null,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $updated_at = null,
         public readonly ?string $parser_preset = null,
     ) {}
diff --git a/src/OxylabsApiClient.php b/src/OxylabsApiClient.php
@@ -129,31 +129,39 @@ protected function makeRequest(
             $logger->save();
         }
 
-        /**
-         * @var Response $response
-         */
-        $response = retry($retryCount ?? 0, function () use ($request, $method, $payload): PromiseInterface|Response {
-            if (strtolower($method) === 'post') {
-                return Http::withHeaders($request->getHeaders())
-                    ->post($request->getUri(), $payload)
-                    ->throw();
-            } else {
-                return Http::withHeaders($request->getHeaders())
-                    ->get($request->getUri())
-                    ->throw();
-            }
-        }, 2000);
-
-        if (config('oxylabs-api.request_logging_enabled', true)) {
-            if ($logResponseBody) {
-                $logger->updateFromResponse($response->toPsrResponse());
-            } else {
-                $logger->response_code = $response->getStatusCode();
-                $logger->response_headers = $response->getHeaders();
+        try {
+            /**
+             * @var Response $response
+             */
+            $response = retry($retryCount ?? 0, function () use ($request, $method, $payload): PromiseInterface|Response {
+                if (strtolower($method) === 'post') {
+                    return Http::withHeaders($request->getHeaders())
+                        ->post($request->getUri(), $payload)
+                        ->throw();
+                } else {
+                    return Http::withHeaders($request->getHeaders())
+                        ->get($request->getUri())
+                        ->throw();
+                }
+            }, 2000);
 
+        } catch (Throwable $e) {
+            if (config('oxylabs-api.request_logging_enabled', true) && $logger) {
+                $logger->exception = substr($e->getMessage(), 0, 512);
                 $logger->save();
             }
-
+            throw $e;
+        } finally {
+            if (config('oxylabs-api.request_logging_enabled', true) && $logger && $response) {
+                if ($logResponseBody) {
+                    $logger->updateFromResponse($response->toPsrResponse());
+                } else {
+                    $logger->response_code = $response->getStatusCode();
+                    $logger->response_headers = $response->getHeaders();
+
+                    $logger->save();
+                }
+            }
         }
 
         return $response;
diff --git a/tests/Fixtures/google_shopping_pricing_result.json b/tests/Fixtures/google_shopping_pricing_result.json
@@ -241,7 +241,7 @@
         ],
         "parse_status_code": 12000
       },
-      "created_at": "2025-07-14 02:37:04",
+      "created_at": "2025-07-14 02:37:04.000",
       "updated_at": "2025-07-14 02:37:06",
       "page": 1,
       "url": "https://www.google.com/shopping/product/9643822540334825608/offers",
