mirror of
https://github.com/usetrmnl/byos_laravel.git
synced 2026-03-14 12:23:33 +00:00
refactor: improve readability of FetchProxyCloudResponses
This commit is contained in:
Benjamin Nussbaum
parent
e9986b424d
commit
aaefcdda49
2 changed files with 197 additions and 214 deletions
|
|
@ -7,6 +7,7 @@ use Exception;
|
|||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Bus\Dispatchable;
|
||||
use Illuminate\Http\Client\Response;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
|
|
@ -18,100 +19,126 @@ class FetchProxyCloudResponses implements ShouldQueue
|
|||
{
|
||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||
|
||||
/**
|
||||
* Execute the job.
|
||||
*/
|
||||
public function handle(): void
|
||||
{
|
||||
Device::where('proxy_cloud', true)->each(function ($device): void {
|
||||
if (! $device->getNextPlaylistItem()) {
|
||||
try {
|
||||
$response = Http::withHeaders([
|
||||
'id' => $device->mac_address,
|
||||
'access-token' => $device->api_key,
|
||||
'width' => 800,
|
||||
'height' => 480,
|
||||
'rssi' => $device->last_rssi_level,
|
||||
'battery_voltage' => $device->last_battery_voltage,
|
||||
'refresh-rate' => $device->default_refresh_interval,
|
||||
'fw-version' => $device->last_firmware_version,
|
||||
'accept-encoding' => 'identity;q=1,chunked;q=0.1,*;q=0',
|
||||
'user-agent' => 'ESP32HTTPClient',
|
||||
])->get(config('services.trmnl.proxy_base_url').'/api/display');
|
||||
|
||||
$device->update([
|
||||
'proxy_cloud_response' => $response->json(),
|
||||
]);
|
||||
|
||||
$imageUrl = $response->json('image_url');
|
||||
$filename = $response->json('filename');
|
||||
|
||||
parse_str(parse_url($imageUrl)['query'] ?? '', $queryParams);
|
||||
$imageType = urldecode($queryParams['response-content-type'] ?? 'image/bmp');
|
||||
$imageExtension = $imageType === 'image/png' ? 'png' : 'bmp';
|
||||
|
||||
if (Str::contains($imageUrl, '.png')) {
|
||||
$imageExtension = 'png';
|
||||
}
|
||||
|
||||
\Log::info("Response data: $imageUrl. Image Extension: $imageExtension");
|
||||
if (isset($imageUrl)) {
|
||||
try {
|
||||
$imageContents = Http::get($imageUrl)->body();
|
||||
if (! Storage::disk('public')->exists("images/generated/{$filename}.{$imageExtension}")) {
|
||||
Storage::disk('public')->put(
|
||||
"images/generated/{$filename}.{$imageExtension}",
|
||||
$imageContents
|
||||
);
|
||||
}
|
||||
|
||||
$device->update([
|
||||
'current_screen_image' => $filename,
|
||||
]);
|
||||
} catch (Exception $e) {
|
||||
Log::error("Failed to download and save image for device: {$device->mac_address}", [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Log::info("Successfully updated proxy cloud response for device: {$device->mac_address}");
|
||||
|
||||
if ($device->last_log_request) {
|
||||
try {
|
||||
Http::withHeaders([
|
||||
'id' => $device->mac_address,
|
||||
'access-token' => $device->api_key,
|
||||
'width' => 800,
|
||||
'height' => 480,
|
||||
'rssi' => $device->last_rssi_level,
|
||||
'battery_voltage' => $device->last_battery_voltage,
|
||||
'refresh-rate' => $device->default_refresh_interval,
|
||||
'fw-version' => $device->last_firmware_version,
|
||||
'accept-encoding' => 'identity;q=1,chunked;q=0.1,*;q=0',
|
||||
'user-agent' => 'ESP32HTTPClient',
|
||||
])->post(config('services.trmnl.proxy_base_url').'/api/log', $device->last_log_request);
|
||||
|
||||
// Only clear the pending log request if the POST succeeded
|
||||
$device->update([
|
||||
'last_log_request' => null,
|
||||
]);
|
||||
} catch (Exception $e) {
|
||||
// Do not fail the entire proxy fetch if the log upload fails
|
||||
Log::error("Failed to upload device log for device: {$device->mac_address}", [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Exception $e) {
|
||||
Log::error("Failed to fetch proxy cloud response for device: {$device->mac_address}", [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
} else {
|
||||
if ($device->getNextPlaylistItem()) {
|
||||
Log::info("Skipping device: {$device->mac_address} as it has a pending playlist item.");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
$response = $this->fetchDisplayResponse($device);
|
||||
$device->update([
|
||||
'proxy_cloud_response' => $response->json(),
|
||||
]);
|
||||
|
||||
$this->processImage($device, $response);
|
||||
$this->uploadLogRequest($device);
|
||||
|
||||
Log::info("Successfully updated proxy cloud response for device: {$device->mac_address}");
|
||||
} catch (Exception $e) {
|
||||
Log::error("Failed to fetch proxy cloud response for device: {$device->mac_address}", [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private function fetchDisplayResponse(Device $device): Response
|
||||
{
|
||||
/** @var Response $response */
|
||||
$response = Http::withHeaders($this->getDeviceHeaders($device))
|
||||
->get(config('services.trmnl.proxy_base_url').'/api/display');
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
private function getDeviceHeaders(Device $device): array
|
||||
{
|
||||
return [
|
||||
'id' => $device->mac_address,
|
||||
'access-token' => $device->api_key,
|
||||
'width' => 800,
|
||||
'height' => 480,
|
||||
'rssi' => $device->last_rssi_level,
|
||||
'battery_voltage' => $device->last_battery_voltage,
|
||||
'refresh-rate' => $device->default_refresh_interval,
|
||||
'fw-version' => $device->last_firmware_version,
|
||||
'accept-encoding' => 'identity;q=1,chunked;q=0.1,*;q=0',
|
||||
'user-agent' => 'ESP32HTTPClient',
|
||||
];
|
||||
}
|
||||
|
||||
private function processImage(Device $device, Response $response): void
|
||||
{
|
||||
$imageUrl = $response->json('image_url');
|
||||
$filename = $response->json('filename');
|
||||
|
||||
if ($imageUrl === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$imageExtension = $this->determineImageExtension($imageUrl);
|
||||
Log::info("Response data: $imageUrl. Image Extension: $imageExtension");
|
||||
|
||||
try {
|
||||
$imageContents = Http::get($imageUrl)->body();
|
||||
$filePath = "images/generated/{$filename}.{$imageExtension}";
|
||||
|
||||
if (! Storage::disk('public')->exists($filePath)) {
|
||||
Storage::disk('public')->put($filePath, $imageContents);
|
||||
}
|
||||
|
||||
$device->update([
|
||||
'current_screen_image' => $filename,
|
||||
]);
|
||||
} catch (Exception $e) {
|
||||
Log::error("Failed to download and save image for device: {$device->mac_address}", [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
private function determineImageExtension(?string $imageUrl): string
|
||||
{
|
||||
if ($imageUrl === null) {
|
||||
return 'bmp';
|
||||
}
|
||||
|
||||
if (Str::contains($imageUrl, '.png')) {
|
||||
return 'png';
|
||||
}
|
||||
|
||||
$parsedUrl = parse_url($imageUrl);
|
||||
if ($parsedUrl === false || ! isset($parsedUrl['query'])) {
|
||||
return 'bmp';
|
||||
}
|
||||
|
||||
parse_str($parsedUrl['query'], $queryParams);
|
||||
$imageType = urldecode($queryParams['response-content-type'] ?? 'image/bmp');
|
||||
|
||||
return $imageType === 'image/png' ? 'png' : 'bmp';
|
||||
}
|
||||
|
||||
private function uploadLogRequest(Device $device): void
|
||||
{
|
||||
if (! $device->last_log_request) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
Http::withHeaders($this->getDeviceHeaders($device))
|
||||
->post(config('services.trmnl.proxy_base_url').'/api/log', $device->last_log_request);
|
||||
|
||||
$device->update([
|
||||
'last_log_request' => null,
|
||||
]);
|
||||
} catch (Exception $e) {
|
||||
Log::error("Failed to upload device log for device: {$device->mac_address}", [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue