anikeen/print-cli
1
0
Fork 0
mirror of https://github.com/anikeen-com/print-cli.git synced 2026-03-13 13:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling

Browse Source
This commit is contained in:
René Preuß
2024-08-18 21:20:11 +02:00
parent 60ace31331
commit 5d0caeda1c
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Commands/ServeCommand.php
View File

@@ -2,6 +2,7 @@
namespace App\Commands; namespace App\Commands;
use Illuminate\Http\Client\ConnectionException;
use Illuminate\Http\Client\RequestException; use Illuminate\Http\Client\RequestException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
@@ -35,16 +36,33 @@ class ServeCommand extends Command
/** /**
* Execute the console command. * Execute the console command.
* @throws RequestException
*/ */
public function handle(): void public function handle(): void
{
try {
$this->serve();
} catch (Throwable $e) {
if ($e instanceof RequestException && $e->response->status() === 422) {
$this->error('Please check your configuration and try again.');
$this->error($e->response->json()['message']);
} else {
$this->error($e->getMessage());
}
}
}
/**
* @throws RequestException
* @throws ConnectionException
*/
private function serve(): void
{ {
$this->info('Starting service...'); $this->info('Starting service...');
$yaml = $this->getConfiguration(); $yaml = $this->getConfiguration();
$printerIds = array_map(fn($printer) => $printer['id'], $yaml['printers']); $printerIds = array_map(fn($printer) => $printer['id'], $yaml['printers']);
$response = Http::patch(sprintf('%s/api/printers/register', $yaml['base_url']), [ $response = Http::acceptJson()->patch(sprintf('%s/api/printers/register', $yaml['base_url']), [
'printers' => $yaml['printers'], 'printers' => $yaml['printers'],
]); ]);
@@ -54,7 +72,7 @@ class ServeCommand extends Command
do { do {
try { try {
$response = Http::get(sprintf('%s/api/printers/jobs', $yaml['base_url']), [ $response = Http::acceptJson()->get(sprintf('%s/api/printers/jobs', $yaml['base_url']), [
'printer_ids' => $printerIds, 'printer_ids' => $printerIds,
]); ]);
@@ -98,6 +116,7 @@ class ServeCommand extends Command
/** /**
* @throws RequestException * @throws RequestException
* @throws ConnectionException
*/ */
private function handleJob(array $job, mixed $yaml): void private function handleJob(array $job, mixed $yaml): void
{ {
@@ -150,10 +169,11 @@ class ServeCommand extends Command
/** /**
* @throws RequestException * @throws RequestException
* @throws ConnectionException
*/ */
private function markCompleted(array $job, mixed $yaml, int $jobId): void private function markCompleted(array $job, mixed $yaml, int $jobId): void
{ {
$response = Http::patch(sprintf('%s/api/printers/jobs/%s/complete', $yaml['base_url'], $job['id']), [ $response = Http::acceptJson()->patch(sprintf('%s/api/printers/jobs/%s/complete', $yaml['base_url'], $job['id']), [
'job_id' => $jobId, 'job_id' => $jobId,
]); ]);
$response->throw(); $response->throw();
@@ -161,10 +181,11 @@ class ServeCommand extends Command
/** /**
* @throws RequestException * @throws RequestException
* @throws ConnectionException
*/ */
private function markFailed(array $job, mixed $yaml, string $reason): void private function markFailed(array $job, mixed $yaml, string $reason): void
{ {
$response = Http::patch(sprintf('%s/api/printers/jobs/%s/fail', $yaml['base_url'], $job['id']), [ $response = Http::acceptJson()->patch(sprintf('%s/api/printers/jobs/%s/fail', $yaml['base_url'], $job['id']), [
'reason' => $reason, 'reason' => $reason,
]); ]);
$response->throw(); $response->throw();