anikeen/print-cli
1
0
Fork 0
mirror of https://github.com/anikeen-com/print-cli.git synced 2026-04-28 12:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance printer handling by merging existing ESC/POS printers with new configurations and adding support for ESC/POS job processing

Browse Source
This commit is contained in:
René Preuß
2026-04-05 14:27:50 +02:00
parent 621b6cb5c0
commit 414d7ace21
4 changed files with 92 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Commands/Autowire.php
View File

@@ -64,6 +64,13 @@ class Autowire extends Command
if ($response->successful()) {
$newPrinters = $response->json('printers', []);
// Keep all escpos printers from the old config
$existingPrinters = $contig->get('printers', []);
$escposPrinters = array_filter($existingPrinters, function ($printer) {
return isset($printer['driver']) && strtolower($printer['driver']) === 'escpos';
});
// Merge escpos printers with new printers, allow duplicates
$allPrinters = array_merge($newPrinters, $escposPrinters);
if (empty($newPrinters)) {
$this->info('No new printers found to autowire.');
} else {
@@ -73,7 +80,7 @@ class Autowire extends Command
}
$this->setConfig([
...$contig->toArray(),
'printers' => $newPrinters,
'printers' => $allPrinters,
]);
} else {
throw new Exception('Failed to autowire printers: ' . $response->body());

43
app/Commands/Serve.php
View File

@@ -10,6 +10,8 @@ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use LaravelZero\Framework\Commands\Command;
use Nyra\EscPos\JobRunner;
use Nyra\EscPos\Printer;
use Smalot\Cups\Builder\Builder;
use Smalot\Cups\Manager\JobManager;
use Smalot\Cups\Manager\PrinterManager;
@@ -36,7 +38,7 @@ class Serve extends Command
*/
protected $description = 'Command description';
private $counter = 0;
private int $counter = 0;
/**
* Execute the console command.
@@ -108,7 +110,13 @@ class Serve extends Command
foreach ($jobs as $job) {
try {
$this->handleJob($config, $job);
/** @var array $printer */
$printer = $config->getPrinters()->firstWhere('id', $job['printer_id']);
match ($printer['driver']) {
'cups' => $this->handleCupsJob($config, $job, $printer),
'escpos' => $this->handleEscposJob($config, $job, $printer),
default => $this->error(sprintf('Unsupported driver %s for job %s', $job['driver'], $job['id'])),
};
} catch (Throwable $e) {
$this->error($e->getMessage());
}
@@ -119,9 +127,8 @@ class Serve extends Command
* @throws RequestException
* @throws ConnectionException
*/
private function handleJob(Config $config, array $job): void
private function handleCupsJob(Config $config, array $job, array $printer): void
{
$printer = $config->getPrinters()->firstWhere('id', $job['printer_id']);
[$username, $password] = $this->getConfig()->getPrinterCredentials($printer);
if (!empty($job['data']['preview'])) {
@@ -149,14 +156,14 @@ class Serve extends Command
$jobManager = new JobManager($builder, $client, $responseParser);
$content = file_get_contents($job['file_url']);
Storage::put($filename = sprintf('pdfs/%s.pdf', Str::random(16)), $content);
Storage::put($filename = sprintf('pdfs/%s.pdf', Str::random()), $content);
$printerJob = new Job();
$printerJob->setName(sprintf('job-%s', $job['id']));
$printerJob->setCopies(1);
$printerJob->setPageRanges('1');
$printerJob->addFile(Storage::path($filename));
$printerJob->addAttribute('media', "Custom.{$pointWidth}x{$pointHeight}");
$printerJob->addAttribute('media', "Custom.{$pointWidth}x$pointHeight");
$printerJob->addAttribute('fit-to-page', true);
if (!$jobManager->send($printer, $printerJob)) {
@@ -170,6 +177,30 @@ class Serve extends Command
$this->info(sprintf('Job %s completed as %s', $job['id'], $printerJob->getId()));
}
/**
* @throws RequestException
* @throws ConnectionException
*/
private function handleEscposJob(Config $config, array $job, array $printer): void
{
try {
$uri = parse_url($printer['uri']);
$host = $uri['host'] ?? 'localhost';
$post = $uri['port'] ?? 9100;
$printer = (new Printer($host, $post, 48))->connect();
$runner = new JobRunner();
$content = file_get_contents($job['file_url']);
$runner->run($printer, $content);
$this->markCompleted($config, $job, 0);
$this->info(sprintf('ESC/POS job %s completed', $job['id']));
} catch (Throwable $e) {
$this->markFailed($config, $job, 'Failed to print ESC/POS job: ' . $e->getMessage());
$this->error(sprintf('Failed to print ESC/POS job %s: %s', $job['id'], $e->getMessage()));
}
}
/**
* @throws RequestException
* @throws ConnectionException