@fleetbase/fleetops-engine 0.6.50 → 0.6.52

package/server/src/Support/Telematics/Providers/AbstractProvider.php

@@ -20,7 +20,7 @@ use Illuminate\Support\Str;
  */
 abstract class AbstractProvider implements TelematicProviderInterface
 {
-    protected Telematic $telematic;
+    protected ?Telematic $telematic  = null;
     protected array $credentials     = [];
     protected array $headers         = [];
     protected string $baseUrl        = '';
@@ -33,7 +33,7 @@ abstract class AbstractProvider implements TelematicProviderInterface
     public function connect(Telematic $telematic): void
     {
         $this->telematic   = $telematic;
-        $this->credentials = json_decode(Crypt::decryptString($telematic->credentials), true);
+        $this->credentials = $this->resolveCredentials($telematic);
         $this->prepareAuthentication();
     }
 
@@ -72,10 +72,9 @@ abstract class AbstractProvider implements TelematicProviderInterface
             Log::error('Provider API request failed', [
                 'correlation_id' => $correlationId,
                 'status'         => $response->status(),
-                'body'           => $response->body(),
             ]);
 
-            throw new \Exception('API request failed: ' . $response->body());
+            throw new \Exception('Provider API request failed with status ' . $response->status());
         }
 
         return $response->json();
@@ -88,7 +87,7 @@ abstract class AbstractProvider implements TelematicProviderInterface
      */
     protected function checkRateLimit(): void
     {
-        $key    = 'rate_limit:' . class_basename($this) . ':' . $this->telematic->uuid;
+        $key    = $this->rateLimitKey();
         $tokens = Cache::get($key, $this->burstSize);
 
         if ($tokens <= 0) {
@@ -103,7 +102,7 @@ abstract class AbstractProvider implements TelematicProviderInterface
      */
     protected function recordRequest(): void
     {
-        $key    = 'rate_limit:' . class_basename($this) . ':' . $this->telematic->uuid;
+        $key    = $this->rateLimitKey();
         $tokens = Cache::get($key, 0);
 
         // Refill tokens gradually
@@ -112,6 +111,28 @@ abstract class AbstractProvider implements TelematicProviderInterface
         }
     }
 
+    protected function rateLimitKey(): string
+    {
+        return 'rate_limit:' . class_basename($this) . ':' . ($this->telematic?->uuid ?? 'credential-test');
+    }
+
+    protected function resolveCredentials(Telematic $telematic): array
+    {
+        if (is_array($telematic->credentials)) {
+            return $telematic->credentials;
+        }
+
+        if (!$telematic->credentials) {
+            return [];
+        }
+
+        try {
+            return json_decode(Crypt::decryptString($telematic->credentials), true) ?? [];
+        } catch (\Throwable) {
+            return json_decode($telematic->credentials, true) ?? [];
+        }
+    }
+
     public function supportsWebhooks(): bool
     {
         return false;

package/server/src/Support/Telematics/Providers/AfaqyProvider.php

@@ -23,8 +23,9 @@ class AfaqyProvider extends AbstractProvider
 
         $this->credentials['token'] = $token;
         $this->headers              = [
-            'Accept'       => 'application/json',
-            'Content-Type' => 'application/json',
+            'Accept'        => 'application/json',
+            'Content-Type'  => 'application/json',
+            'Authorization' => 'Bearer ' . $token,
         ];
     }
 
@@ -78,7 +79,6 @@ class AfaqyProvider extends AbstractProvider
                     'last_update',
                     'counters',
                     'profile',
-                    'sensors',
                     'sensors_last_val',
                 ],
             ],
@@ -110,26 +110,33 @@ class AfaqyProvider extends AbstractProvider
     public function normalizeDevice(array $payload): array
     {
         $lastUpdate = $payload['last_update'] ?? [];
+        $profile    = $payload['profile'] ?? [];
 
         return [
-            'external_id'     => $payload['_id'] ?? $payload['id'] ?? null,
-            'device_name'     => $payload['name'] ?? data_get($payload, 'profile.plate_number') ?? 'Unknown Unit',
-            'device_provider' => 'afaqy',
-            'device_model'    => data_get($payload, 'profile.model') ?? $payload['device'] ?? null,
-            'imei'            => $payload['imei'] ?? null,
-            'phone'           => $payload['sim_number'] ?? null,
-            'vin'             => data_get($payload, 'profile.vin'),
-            'status'          => ($payload['active'] ?? false) ? 'active' : 'inactive',
-            'location'        => [
+            'device_id'    => $payload['_id'] ?? $payload['id'] ?? null,
+            'name'         => $payload['name'] ?? data_get($payload, 'profile.plate_number') ?? 'Unknown Unit',
+            'provider'     => 'afaqy',
+            'model'        => data_get($payload, 'profile.model') ?? $payload['device'] ?? null,
+            'imei'         => $payload['imei'] ?? null,
+            'phone'        => $payload['sim_number'] ?? null,
+            'vin'          => data_get($payload, 'profile.vin'),
+            'status'       => ($payload['active'] ?? false) ? 'active' : 'inactive',
+            'online'       => $payload['active'] ?? null,
+            'last_seen_at' => $this->parseTimestamp($lastUpdate['dtt'] ?? $lastUpdate['dts'] ?? null),
+            'location'     => [
                 'lat' => $lastUpdate['lat'] ?? null,
                 'lng' => $lastUpdate['lng'] ?? null,
             ],
             'meta' => [
-                'raw'          => $payload,
-                'plate_number' => data_get($payload, 'profile.plate_number'),
-                'driver_id'    => $payload['driver_id'] ?? null,
-                'last_update'  => $this->normalizeEvent($payload),
-                'capabilities' => [
+                'provider_unit_id' => $payload['_id'] ?? $payload['id'] ?? null,
+                'plate_number'     => data_get($profile, 'plate_number'),
+                'vehicle_type'     => data_get($profile, 'vehicle_type'),
+                'fuel_type'        => data_get($profile, 'fuel_type'),
+                'device_serial'    => $payload['device_serial'] ?? null,
+                'sim_number'       => $payload['sim_number'] ?? null,
+                'driver_id'        => $payload['driver_id'] ?? null,
+                'last_update'      => $this->compactLastUpdate($lastUpdate),
+                'capabilities'     => [
                     'tracking'       => isset($lastUpdate['lat'], $lastUpdate['lng']),
                     'odometer'       => data_get($payload, 'counters.odometer') !== null,
                     'fuel_level'     => $this->extractFuelLevel($payload) !== null,
@@ -145,7 +152,9 @@ class AfaqyProvider extends AbstractProvider
 
         return [
             'external_id' => $payload['_id'] ?? $payload['id'] ?? null,
+            'device_id'   => $payload['_id'] ?? $payload['id'] ?? null,
             'event_type'  => $payload['event'] ?? $payload['event_type'] ?? 'telemetry_update',
+            'message'     => $payload['message'] ?? $payload['event'] ?? null,
             'occurred_at' => $this->parseTimestamp($lastUpdate['dtt'] ?? $lastUpdate['dts'] ?? null),
             'location'    => [
                 'lat' => $lastUpdate['lat'] ?? data_get($lastUpdate, 'loc.coordinates.1'),
@@ -175,12 +184,16 @@ class AfaqyProvider extends AbstractProvider
     {
         return [
             [
-                'name'        => 'base_url',
-                'label'       => 'Base URL',
-                'type'        => 'text',
-                'placeholder' => 'https://api.afaqy.sa',
-                'required'    => false,
-                'validation'  => 'nullable|url',
+                'name'          => 'base_url',
+                'label'         => 'Base URL',
+                'type'          => 'text',
+                'placeholder'   => 'https://api.afaqy.sa',
+                'required'      => false,
+                'advanced'      => true,
+                'is_endpoint'   => true,
+                'default_value' => 'https://api.afaqy.sa',
+                'help_text'     => 'Optional override. Leave blank to use the default AFAQY API host.',
+                'validation'    => 'nullable|url',
             ],
             [
                 'name'        => 'username',
@@ -227,7 +240,7 @@ class AfaqyProvider extends AbstractProvider
             ]);
 
         if ($response->failed()) {
-            throw new \RuntimeException('AFAQY authentication failed: ' . $response->body());
+            throw new \RuntimeException('AFAQY authentication failed with status ' . $response->status());
         }
 
         $token = data_get($response->json(), 'data.token');
@@ -243,15 +256,31 @@ class AfaqyProvider extends AbstractProvider
     {
         $response = Http::withHeaders($this->headers)
             ->timeout(30)
-            ->post($this->baseUrl . $endpoint . '?token=' . urlencode($this->credentials['token']), $payload);
+            ->post($this->baseUrl . $endpoint, array_merge(['token' => $this->credentials['token']], $payload));
 
         if ($response->failed()) {
-            throw new \RuntimeException('AFAQY API request failed: ' . $response->body());
+            throw new \RuntimeException('AFAQY API request failed with status ' . $response->status());
         }
 
         return $response->json() ?? [];
     }
 
+    protected function compactLastUpdate(array $lastUpdate): array
+    {
+        $params = $lastUpdate['params'] ?? $lastUpdate['prms'] ?? [];
+
+        return array_filter([
+            'occurred_at' => $this->parseTimestamp($lastUpdate['dtt'] ?? $lastUpdate['dts'] ?? null),
+            'lat'         => $lastUpdate['lat'] ?? null,
+            'lng'         => $lastUpdate['lng'] ?? null,
+            'speed'       => $lastUpdate['speed'] ?? $lastUpdate['spd'] ?? null,
+            'heading'     => $lastUpdate['angle'] ?? $lastUpdate['ang'] ?? null,
+            'altitude'    => $lastUpdate['alt'] ?? null,
+            'satellites'  => $params['sat'] ?? null,
+            'protocol'    => $params['protocol'] ?? null,
+        ], fn ($value) => $value !== null);
+    }
+
     protected function parseTimestamp($value): ?string
     {
         if (!$value) {

package/server/src/Support/Telematics/Providers/FlespiProvider.php

@@ -97,6 +97,7 @@ class FlespiProvider extends AbstractProvider
     {
         return [
             'external_id' => $payload['id'] ?? null,
+            'device_id'   => $payload['device.id'] ?? null,
             'event_type'  => $payload['event.enum'] ?? 'telemetry_update',
             'occurred_at' => isset($payload['timestamp']) ? date('Y-m-d H:i:s', $payload['timestamp']) : now(),
             'location'    => [

package/server/src/Support/Telematics/Providers/GeotabProvider.php

@@ -131,6 +131,7 @@ class GeotabProvider extends AbstractProvider
     {
         return [
             'external_id' => $payload['id'] ?? null,
+            'device_id'   => $payload['device']['id'] ?? $payload['deviceId'] ?? null,
             'event_type'  => $payload['type'] ?? 'status_data',
             'occurred_at' => $payload['dateTime'] ?? now(),
             'meta'        => $payload,

package/server/src/Support/Telematics/Providers/SafeeProvider.php

@@ -13,13 +13,13 @@ use Illuminate\Support\Facades\Http;
  */
 class SafeeProvider extends AbstractProvider
 {
-    protected string $baseUrl        = '';
+    protected string $baseUrl        = 'https://api.safee.com';
     protected int $requestsPerMinute = 3000;
     protected ?string $accessToken   = null;
 
     protected function prepareAuthentication(): void
     {
-        $this->baseUrl     = rtrim($this->credentials['api_base_url'] ?? $this->credentials['server_uri'] ?? '', '/');
+        $this->baseUrl     = rtrim($this->credentials['api_base_url'] ?? $this->credentials['server_uri'] ?? $this->baseUrl, '/');
         $this->accessToken = $this->credentials['access_token'] ?? $this->authenticate();
         $scheme            = $this->credentials['authorization_scheme'] ?? 'Bearer';
 
@@ -90,17 +90,21 @@ class SafeeProvider extends AbstractProvider
 
     public function normalizeDevice(array $payload): array
     {
-        $position = $this->extractPosition($payload);
+        $position  = $this->extractPosition($payload);
+        $rawStatus = $payload['status'] ?? $payload['vehicleStatus'] ?? null;
+        $status    = $this->normalizeVehicleStatus($rawStatus);
 
         return [
-            'external_id'     => $payload['id'] ?? data_get($payload, 'vehicle.id') ?? null,
-            'device_name'     => $payload['name'] ?? $payload['plateNumber'] ?? data_get($payload, 'vehicle.name') ?? 'Unknown Vehicle',
-            'device_provider' => 'safee',
-            'device_model'    => $payload['model'] ?? data_get($payload, 'device.model') ?? null,
-            'imei'            => data_get($payload, 'device.imei') ?? data_get($payload, 'device.serial') ?? null,
-            'vin'             => $payload['vin'] ?? null,
-            'status'          => $this->normalizeVehicleStatus($payload['status'] ?? $payload['vehicleStatus'] ?? null),
-            'location'        => [
+            'device_id'    => $payload['id'] ?? data_get($payload, 'vehicle.id') ?? null,
+            'name'         => $payload['name'] ?? $payload['plateNumber'] ?? data_get($payload, 'vehicle.name') ?? 'Unknown Vehicle',
+            'provider'     => 'safee',
+            'model'        => $payload['model'] ?? data_get($payload, 'device.model') ?? null,
+            'imei'         => data_get($payload, 'device.imei') ?? data_get($payload, 'device.serial') ?? null,
+            'vin'          => $payload['vin'] ?? null,
+            'status'       => $status,
+            'online'       => $rawStatus ? $status === 'active' : null,
+            'last_seen_at' => $this->parseTimestamp($payload['date'] ?? $payload['deviceTime'] ?? $payload['time'] ?? null),
+            'location'     => [
                 'lat' => $position['lat'] ?? null,
                 'lng' => $position['lng'] ?? null,
             ],
@@ -126,7 +130,9 @@ class SafeeProvider extends AbstractProvider
 
         return [
             'external_id' => $payload['id'] ?? data_get($payload, 'vehicle.id') ?? null,
+            'device_id'   => $payload['id'] ?? data_get($payload, 'vehicle.id') ?? null,
             'event_type'  => data_get($payload, 'event.code') ?? data_get($payload, 'event.name') ?? 'telemetry_update',
+            'message'     => data_get($payload, 'event.name') ?? data_get($payload, 'event.message') ?? null,
             'occurred_at' => $this->parseTimestamp($payload['date'] ?? $payload['deviceTime'] ?? $payload['time'] ?? null),
             'location'    => [
                 'lat' => $position['lat'] ?? null,
@@ -156,12 +162,16 @@ class SafeeProvider extends AbstractProvider
     {
         return [
             [
-                'name'        => 'server_uri',
-                'label'       => 'Server URI',
-                'type'        => 'text',
-                'placeholder' => 'https://tracking.example.com',
-                'required'    => true,
-                'validation'  => 'required|url',
+                'name'          => 'server_uri',
+                'label'         => 'Server URI',
+                'type'          => 'text',
+                'placeholder'   => 'https://api.safee.com',
+                'required'      => false,
+                'advanced'      => true,
+                'is_endpoint'   => true,
+                'default_value' => 'https://api.safee.com',
+                'help_text'     => 'Optional override. Leave blank to use the default Safee API host.',
+                'validation'    => 'nullable|url',
             ],
             [
                 'name'        => 'realm_id',
@@ -203,13 +213,13 @@ class SafeeProvider extends AbstractProvider
 
     protected function authenticate(): string
     {
-        foreach (['server_uri', 'realm_id', 'client_id', 'client_secret', 'username', 'password'] as $field) {
+        foreach (['realm_id', 'client_id', 'client_secret', 'username', 'password'] as $field) {
             if (empty($this->credentials[$field])) {
                 throw new \InvalidArgumentException("Safee credential '{$field}' is required.");
             }
         }
 
-        $tokenUrl = rtrim($this->credentials['server_uri'], '/') . '/auth/realms/' . $this->credentials['realm_id'] . '/protocol/openid-connect/token';
+        $tokenUrl = $this->baseUrl . '/auth/realms/' . $this->credentials['realm_id'] . '/protocol/openid-connect/token';
 
         $response = Http::asForm()
             ->acceptJson()
@@ -223,7 +233,7 @@ class SafeeProvider extends AbstractProvider
             ]);
 
         if ($response->failed()) {
-            throw new \RuntimeException('Safee authentication failed: ' . $response->body());
+            throw new \RuntimeException('Safee authentication failed with status ' . $response->status());
         }
 
         $token = $response->json('access_token');
@@ -242,7 +252,7 @@ class SafeeProvider extends AbstractProvider
             ->get($this->baseUrl . $endpoint);
 
         if ($response->failed()) {
-            throw new \RuntimeException('Safee API request failed: ' . $response->body());
+            throw new \RuntimeException('Safee API request failed with status ' . $response->status());
         }
 
         return $response->json() ?? [];
@@ -255,7 +265,7 @@ class SafeeProvider extends AbstractProvider
             ->post($this->baseUrl . $endpoint, $payload);
 
         if ($response->failed()) {
-            throw new \RuntimeException('Safee API request failed: ' . $response->body());
+            throw new \RuntimeException('Safee API request failed with status ' . $response->status());
         }
 
         return $response->json() ?? [];

package/server/src/Support/Telematics/Providers/SamsaraProvider.php

@@ -94,6 +94,7 @@ class SamsaraProvider extends AbstractProvider
     {
         return [
             'external_id' => $payload['id'] ?? null,
+            'device_id'   => $payload['vehicle']['id'] ?? $payload['vehicleId'] ?? null,
             'event_type'  => $payload['eventType'] ?? 'vehicle_update',
             'occurred_at' => $payload['time'] ?? now(),
             'location'    => [
@@ -135,7 +136,8 @@ class SamsaraProvider extends AbstractProvider
         if (isset($payload['data'])) {
             foreach ($payload['data'] as $item) {
                 if (isset($item['vehicle'])) {
-                    $devices[] = $this->normalizeDevice($item['vehicle']);
+                    $devices[]         = $this->normalizeDevice($item['vehicle']);
+                    $item['vehicleId'] = $item['vehicle']['id'] ?? null;
                 }
 
                 $events[] = $this->normalizeEvent($item);