@fleetbase/fleetops-engine 0.6.29 → 0.6.30

package/server/src/Support/OSRM.php

@@ -6,6 +6,7 @@ use Fleetbase\FleetOps\Support\Encoding\Polyline;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class OSRM
@@ -60,7 +61,13 @@ class OSRM
         }
 
         // Convert the array of Point objects into an OSRM-compatible string
-        $coordinates = array_map(function (Point $point) {
+        // Ensure all points are Point objects, not SpatialExpression
+        $coordinates = array_map(function ($point) {
+            // Convert to Point if it's a SpatialExpression or other type
+            if (!$point instanceof Point) {
+                $point = Utils::getPointFromMixed($point);
+            }
+
             return "{$point->getLng()},{$point->getLat()}";
         }, $points);
 
@@ -79,23 +86,31 @@ class OSRM
     public static function getRouteFromCoordinatesString(string $coordinates, array $queryParameters = [])
     {
         $cacheKey    = 'getRouteFromCoordinatesString:' . md5($coordinates . serialize($queryParameters));
-        $url         = self::$baseUrl . "/route/v1/driving/{$coordinates}";
-        $response    = Http::get($url, $queryParameters);
-        $data        = $response->json();
-
-        // Check for the presence of the encoded polyline in each route and decode it if found
-        if (isset($data['routes']) && is_array($data['routes'])) {
-            foreach ($data['routes'] as &$route) {
-                if (isset($route['geometry'])) {
-                    $route['waypoints'] = self::decodePolyline($route['geometry']);
+
+        try {
+            $url         = self::$baseUrl . "/route/v1/driving/{$coordinates}";
+            $response    = Http::timeout(1)->get($url, $queryParameters);
+            $data        = $response->json();
+
+            // Check for the presence of the encoded polyline in each route and decode it if found
+            if (isset($data['routes']) && is_array($data['routes'])) {
+                foreach ($data['routes'] as &$route) {
+                    if (isset($route['geometry'])) {
+                        $route['waypoints'] = self::decodePolyline($route['geometry']);
+                    }
                 }
             }
-        }
 
-        // Store the result in the cache for 60 minutes
-        Cache::put($cacheKey, $data, 60 * 60);
+            // Store the result in the cache for 60 minutes
+            Cache::put($cacheKey, $data, 60 * 60);
 
-        return $data;
+            return $data;
+        } catch (\Exception $e) {
+            Log::warning('OSRM request timeout or error', ['error' => $e->getMessage(), 'coordinates' => $coordinates]);
+
+            // Return empty response structure on error
+            return ['code' => 'Error', 'routes' => []];
+        }
     }
 
     /**
@@ -116,7 +131,7 @@ class OSRM
 
         $coordinates = "{$location->getLng()},{$location->getLat()}";
         $url         = self::$baseUrl . "/nearest/v1/driving/{$coordinates}";
-        $response    = Http::get($url, $queryParameters);
+        $response    = Http::timeout(1)->get($url, $queryParameters);
         $result      = $response->json();
 
         Cache::put($cacheKey, $result, 60 * 60);
@@ -140,12 +155,16 @@ class OSRM
             return Cache::get($cacheKey);
         }
 
-        $coordinates = implode(';', array_map(function (Point $point) {
+        $coordinates = implode(';', array_map(function ($point) {
+            if (!$point instanceof Point) {
+                $point = Utils::getPointFromMixed($point);
+            }
+
             return "{$point->getLng()},{$point->getLat()}";
         }, $points));
 
         $url      = self::$baseUrl . "/table/v1/driving/{$coordinates}";
-        $response = Http::get($url, $queryParameters);
+        $response = Http::timeout(1)->get($url, $queryParameters);
         $result   = $response->json();
 
         Cache::put($cacheKey, $result, 60 * 60);
@@ -169,12 +188,16 @@ class OSRM
             return Cache::get($cacheKey);
         }
 
-        $coordinates = implode(';', array_map(function (Point $point) {
+        $coordinates = implode(';', array_map(function ($point) {
+            if (!$point instanceof Point) {
+                $point = Utils::getPointFromMixed($point);
+            }
+
             return "{$point->getLng()},{$point->getLat()}";
         }, $points));
 
         $url      = self::$baseUrl . "/trip/v1/driving/{$coordinates}";
-        $response = Http::get($url, $queryParameters);
+        $response = Http::timeout(1)->get($url, $queryParameters);
         $data     = $response->json();
 
         Cache::put($cacheKey, $data, 60 * 60);
@@ -192,12 +215,16 @@ class OSRM
      */
     public static function getMatch(array $points, array $queryParameters = [])
     {
-        $coordinates = implode(';', array_map(function (Point $point) {
+        $coordinates = implode(';', array_map(function ($point) {
+            if (!$point instanceof Point) {
+                $point = Utils::getPointFromMixed($point);
+            }
+
             return "{$point->getLng()},{$point->getLat()}";
         }, $points));
         $url = self::$baseUrl . "/match/v1/driving/{$coordinates}";
 
-        $response = Http::get($url, $queryParameters);
+        $response = Http::timeout(1)->get($url, $queryParameters);
 
         return $response->json();
     }
@@ -216,7 +243,7 @@ class OSRM
     {
         $url = self::$baseUrl . "/tile/v1/car/{$z}/{$x}/{$y}.mvt";
 
-        $response = Http::get($url, $queryParameters);
+        $response = Http::timeout(1)->get($url, $queryParameters);
 
         return $response->body();
     }

package/server/src/Support/OrderTracker.php

@@ -11,6 +11,7 @@ use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
@@ -184,6 +185,14 @@ class OrderTracker
             return -1;
         }
 
+        // Convert SpatialExpression to Point objects
+        $start = Utils::getPointFromMixed($start);
+        $end   = Utils::getPointFromMixed($end);
+
+        if (!$start || !$end) {
+            return -1;
+        }
+
         try {
             $response = OSRM::getRoute($start, $end);
             if (isset($response['code']) && $response['code'] === 'Ok') {
@@ -211,6 +220,14 @@ class OrderTracker
         $start              = $this->getDriverCurrentLocation();
         $end                = $waypoint->location;
 
+        // Convert SpatialExpression to Point objects
+        $start = Utils::getPointFromMixed($start);
+        $end   = Utils::getPointFromMixed($end);
+
+        if (!$start || !$end) {
+            return -1;
+        }
+
         try {
             $response           = OSRM::getRoute($start, $end);
             if (isset($response['code']) && $response['code'] === 'Ok') {
@@ -238,6 +255,14 @@ class OrderTracker
         $start    = $this->getDriverCurrentLocation();
         $end      = $this->payload->getDropoffOrLastWaypoint()->location;
 
+        // Convert SpatialExpression to Point objects
+        $start = Utils::getPointFromMixed($start);
+        $end   = Utils::getPointFromMixed($end);
+
+        if (!$start || !$end) {
+            return -1;
+        }
+
         try {
             $response = OSRM::getRoute($start, $end);
             if (isset($response['code']) && $response['code'] === 'Ok') {
@@ -487,41 +512,88 @@ class OrderTracker
 
     public function eta(): array
     {
-        // Load missing waypoints and places
-        $waypoints = $this->payload->getAllStops();
-
-        // ETA's
-        $eta = [];
-        foreach ($waypoints as $waypoint) {
-            $eta[$waypoint->uuid] = $this->getWaypointETA($waypoint);
-        }
+        // Generate cache key based on order UUID and updated_at timestamp
+        $cacheKey = 'order_eta:' . $this->order->uuid . ':' . optional($this->order->updated_at)->timestamp;
+
+        // Return cached data if available
+        return Cache::remember($cacheKey, 60, function () {
+            // Load missing waypoints and places
+            $waypoints = $this->payload->getAllStops();
+
+            // ETA's
+            $eta = [];
+            foreach ($waypoints as $waypoint) {
+                $eta[$waypoint->uuid] = $this->getWaypointETA($waypoint);
+            }
 
-        return $eta;
+            return $eta;
+        });
     }
 
     /**
      * Get all key tracker information as an array.
+     * Cached for 60 seconds to avoid repeated OSRM calls.
      */
     public function toArray(): array
     {
-        $estimatedCompletionTime = $this->getEstimatedCompletionTime();
-        $orderProgressPercentage = $this->getOrderProgressPercentage();
-
-        return [
-            'driver_current_location'             => $this->getDriverCurrentLocation(),
-            'progress_percentage'                 => $orderProgressPercentage,
-            'total_distance'                      => $this->getTotalDistance(),
-            'completed_distance'                  => $this->getCompletedDistance(),
-            'current_destination_eta'             => $this->getCurrentDestinationETA(),
-            'completion_eta'                      => $this->getCompletionETA(),
-            'estimated_completion_time'           => $estimatedCompletionTime,
-            'estimated_completion_time_formatted' => $estimatedCompletionTime instanceof Carbon ? $estimatedCompletionTime->format('M jS, Y H:i') : null,
-            'start_time'                          => $this->getOrderStartTime(),
-            'completion_time'                     => $this->getOrderCompletionTime(),
-            'current_destination'                 => $this->getCurrentDestination(),
-            'next_destination'                    => $this->getNextDestination(),
-            'first_waypoint_completed'            => $orderProgressPercentage > 10,
-            'last_waypoint_completed'             => $orderProgressPercentage === 100 || $this->order->status === 'completed',
-        ];
+        // Generate cache key based on order UUID and updated_at timestamp
+        $cacheKey = 'order_tracker:' . $this->order->uuid . ':' . optional($this->order->updated_at)->timestamp;
+
+        // Return cached data if available
+        return Cache::remember($cacheKey, 60, function () {
+            // Early return for completed orders - skip expensive OSRM calls
+            if (in_array($this->order->status, ['completed', 'canceled'])) {
+                return [
+                    'driver_current_location'             => null,
+                    'progress_percentage'                 => 100,
+                    'total_distance'                      => 0,
+                    'completed_distance'                  => 0,
+                    'current_destination_eta'             => 0,
+                    'completion_eta'                      => 0,
+                    'estimated_completion_time'           => null,
+                    'estimated_completion_time_formatted' => null,
+                    'start_time'                          => $this->getOrderStartTime(),
+                    'completion_time'                     => $this->getOrderCompletionTime(),
+                    'current_destination'                 => null,
+                    'next_destination'                    => null,
+                    'first_waypoint_completed'            => true,
+                    'last_waypoint_completed'             => true,
+                ];
+            }
+
+            // Wrap OSRM-dependent calculations in try-catch for graceful degradation
+            try {
+                $totalDistance         = $this->getTotalDistance();
+                $completedDistance     = $this->getCompletedDistance();
+                $currentDestinationEta = $this->getCurrentDestinationETA();
+                $completionEta         = $this->getCompletionETA();
+            } catch (\Exception $e) {
+                Log::warning('OrderTracker: Failed to calculate distances/ETAs', ['error' => $e->getMessage()]);
+                $totalDistance         = 0;
+                $completedDistance     = 0;
+                $currentDestinationEta = 0;
+                $completionEta         = 0;
+            }
+
+            $estimatedCompletionTime = $this->getEstimatedCompletionTime();
+            $orderProgressPercentage = $this->getOrderProgressPercentage();
+
+            return [
+                'driver_current_location'             => $this->getDriverCurrentLocation(),
+                'progress_percentage'                 => $orderProgressPercentage,
+                'total_distance'                      => $totalDistance,
+                'completed_distance'                  => $completedDistance,
+                'current_destination_eta'             => $currentDestinationEta,
+                'completion_eta'                      => $completionEta,
+                'estimated_completion_time'           => $estimatedCompletionTime,
+                'estimated_completion_time_formatted' => $estimatedCompletionTime instanceof Carbon ? $estimatedCompletionTime->format('M jS, Y H:i') : null,
+                'start_time'                          => $this->getOrderStartTime(),
+                'completion_time'                     => $this->getOrderCompletionTime(),
+                'current_destination'                 => $this->getCurrentDestination(),
+                'next_destination'                    => $this->getNextDestination(),
+                'first_waypoint_completed'            => $orderProgressPercentage > 10,
+                'last_waypoint_completed'             => $orderProgressPercentage === 100 || $this->order->status === 'completed',
+            ];
+        });
     }
 }

package/translations/en-us.yaml

@@ -7,7 +7,8 @@ common:
   bulk-dispatch: Bulk Dispatch
   dispatch-orders: Dispatch Orders
   dispatch-order: Dispatch Order
-  assign-driver: Dispatch Orders
+  assign-driver: Assign Driver
+  assign-drivers: Assign Drivers
   no-driver-assigned: No driver assigned
   details: Details
   name: Name
@@ -604,6 +605,7 @@ order:
     tracking-number: Tracking Number
     vehicle-assigned: Vehicle Assigned
     view-activity: View Activity
+    no-order-activity: No order activity
     waypoint-actions: Waypoint Actions
     documents-files: Documents & Files
     order-metadata: Order Metadata