Merge remote-tracking branch 'origin/main' into feature/extras

Author: gwleuverink

resources/js/electron-plugin/dist/server/api/system.js

@@ -62,15 +62,17 @@ router.get('/printers', (req, res) => __awaiter(void 0, void 0, void 0, function
     });
 }));
 router.post('/print', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    const { printer, html } = req.body;
+    const { printer, html, settings } = req.body;
     let printWindow = new BrowserWindow({
         show: false,
     });
+    const defaultSettings = {
+        silent: true,
+        deviceName: printer,
+    };
+    const mergedSettings = Object.assign(Object.assign({}, defaultSettings), (settings && typeof settings === 'object' ? settings : {}));
     printWindow.webContents.on('did-finish-load', () => {
-        printWindow.webContents.print({
-            silent: true,
-            deviceName: printer,
-        }, (success, errorType) => {
+        printWindow.webContents.print(mergedSettings, (success, errorType) => {
             if (success) {
                 console.log('Print job completed successfully.');
                 res.sendStatus(200);
@@ -88,12 +90,12 @@ router.post('/print', (req, res) => __awaiter(void 0, void 0, void 0, function*
     yield printWindow.loadURL(`data:text/html;charset=UTF-8,${html}`);
 }));
 router.post('/print-to-pdf', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    const { html } = req.body;
+    const { html, settings } = req.body;
     let printWindow = new BrowserWindow({
         show: false,
     });
     printWindow.webContents.on('did-finish-load', () => {
-        printWindow.webContents.printToPDF({}).then(data => {
+        printWindow.webContents.printToPDF(settings !== null && settings !== void 0 ? settings : {}).then(data => {
             printWindow.close();
             res.json({
                 result: data.toString('base64'),

resources/js/electron-plugin/dist/server/state.js

@@ -2,16 +2,16 @@ import Store from "electron-store";
 import { notifyLaravel } from "./utils.js";
 const settingsStore = new Store();
 settingsStore.onDidAnyChange((newValue, oldValue) => {
-    const changedKey = Object.keys(newValue).find((key) => newValue[key] !== oldValue[key]);
-    if (changedKey) {
+    const changedKeys = Object.keys(newValue).filter((key) => newValue[key] !== oldValue[key]);
+    changedKeys.forEach((key) => {
         notifyLaravel("events", {
             event: "Native\\Laravel\\Events\\Settings\\SettingChanged",
             payload: {
-                key: changedKey,
-                value: newValue[changedKey] || null,
+                key,
+                value: newValue[key] || null,
             },
         });
-    }
+    });
 });
 function generateRandomString(length) {
     let result = "";

resources/js/electron-plugin/src/server/api/system.ts

@@ -60,17 +60,24 @@ router.get('/printers', async (req, res) => {
 });
 
 router.post('/print', async (req, res) => {
-    const {printer, html} = req.body;
+    const {printer, html, settings} = req.body;
 
     let printWindow = new BrowserWindow({
         show: false,
     });
 
+    const defaultSettings = {
+        silent: true,
+        deviceName: printer,
+    };
+
+    const mergedSettings = {
+        ...defaultSettings,
+        ...(settings && typeof settings === 'object' ? settings : {}),
+    };
+
     printWindow.webContents.on('did-finish-load', () => {
-        printWindow.webContents.print({
-            silent: true,
-            deviceName: printer,
-        }, (success, errorType) => {
+        printWindow.webContents.print(mergedSettings, (success, errorType) => {
             if (success) {
                 console.log('Print job completed successfully.');
                 res.sendStatus(200);
@@ -89,14 +96,14 @@ router.post('/print', async (req, res) => {
 });
 
 router.post('/print-to-pdf', async (req, res) => {
-    const {html} = req.body;
+    const {html, settings} = req.body;
 
     let printWindow = new BrowserWindow({
         show: false,
     });
 
     printWindow.webContents.on('did-finish-load', () => {
-        printWindow.webContents.printToPDF({}).then(data => {
+        printWindow.webContents.printToPDF(settings ?? {}).then(data => {
             printWindow.close();
                 res.json({
                     result: data.toString('base64'),

resources/js/electron-plugin/src/server/state.ts

@@ -5,19 +5,17 @@ import { notifyLaravel } from "./utils.js";
 const settingsStore = new Store();
 settingsStore.onDidAnyChange((newValue, oldValue) => {
   // Only notify of the changed key/value pair
-  const changedKey = Object.keys(newValue).find(
-    (key) => newValue[key] !== oldValue[key]
-  );
+  const changedKeys = Object.keys(newValue).filter((key) => newValue[key] !== oldValue[key]);
 
-  if (changedKey) {
+  changedKeys.forEach((key) => {
     notifyLaravel("events", {
       event: "Native\\Laravel\\Events\\Settings\\SettingChanged",
       payload: {
-        key: changedKey,
-        value: newValue[changedKey] || null,
+        key,
+          value: newValue[key] || null,
       },
     });
-  }
+  });
 });
 
 interface State {

src/Commands/BuildCommand.php

@@ -15,10 +15,15 @@
 use Native\Electron\Traits\OsAndArch;
 use Native\Electron\Traits\PatchesPackagesJson;
 use Native\Electron\Traits\PrunesVendorDirectory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Process\Process as SymfonyProcess;
 
 use function Laravel\Prompts\intro;
 
+#[AsCommand(
+    name: 'native:build',
+    description: 'Build the NativePHP application for the specified operating system and architecture.',
+)]
 class BuildCommand extends Command
 {
     use CleansEnvFile;

src/Commands/BundleCommand.php

@@ -17,11 +17,16 @@
 use Native\Electron\Traits\LocatesPhpBinary;
 use Native\Electron\Traits\PatchesPackagesJson;
 use Native\Electron\Traits\PrunesVendorDirectory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Finder\Finder;
 use ZipArchive;
 
 use function Laravel\Prompts\intro;
 
+#[AsCommand(
+    name: 'native:bundle',
+    description: 'Bundle your application for distribution.',
+)]
 class BundleCommand extends Command
 {
     use CleansEnvFile;
@@ -35,8 +40,6 @@ class BundleCommand extends Command
 
     protected $signature = 'native:bundle {--fetch} {--clear} {--without-cleanup}';
 
-    protected $description = 'Bundle your application for distribution.';
-
     private ?string $key;
 
     private string $zipPath;

src/Commands/DevelopCommand.php

@@ -8,10 +8,15 @@
 use Native\Electron\Traits\Installer;
 use Native\Electron\Traits\InstallsAppIcon;
 use Native\Electron\Traits\PatchesPackagesJson;
+use Symfony\Component\Console\Attribute\AsCommand;
 
 use function Laravel\Prompts\intro;
 use function Laravel\Prompts\note;
 
+#[AsCommand(
+    name: 'native:serve',
+    description: 'Start the NativePHP development server with the Electron app',
+)]
 class DevelopCommand extends Command
 {
     use CopiesCertificateAuthority;

src/Commands/InstallCommand.php

@@ -5,13 +5,18 @@
 use Illuminate\Console\Command;
 use Native\Electron\Traits\Installer;
 use RuntimeException;
+use Symfony\Component\Console\Attribute\AsCommand;
 
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\info;
 use function Laravel\Prompts\intro;
 use function Laravel\Prompts\note;
 use function Laravel\Prompts\outro;
 
+#[AsCommand(
+    name: 'native:install',
+    description: 'Install all of the NativePHP resources',
+)]
 class InstallCommand extends Command
 {
     use Installer;
@@ -20,8 +25,6 @@ class InstallCommand extends Command
         {--force : Overwrite existing files by default}
         {--installer=npm : The package installer to use: npm, yarn or pnpm}';
 
-    protected $description = 'Install all of the NativePHP resources';
-
     public function handle(): void
     {
         intro('Publishing NativePHP Service Provider...');

src/Commands/PublishCommand.php

@@ -6,7 +6,12 @@
 use Illuminate\Support\Facades\Artisan;
 use Native\Electron\Traits\LocatesPhpBinary;
 use Native\Electron\Traits\OsAndArch;
+use Symfony\Component\Console\Attribute\AsCommand;
 
+#[AsCommand(
+    name: 'native:publish',
+    description: 'Build and publish the NativePHP app for the specified operating system and architecture',
+)]
 class PublishCommand extends Command
 {
     use LocatesPhpBinary;

src/Commands/ResetCommand.php

@@ -4,18 +4,21 @@
 
 use Illuminate\Console\Command;
 use Native\Electron\Traits\PatchesPackagesJson;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Filesystem\Filesystem;
 
 use function Laravel\Prompts\intro;
 
+#[AsCommand(
+    name: 'native:reset',
+    description: 'Clear all build and dist files',
+)]
 class ResetCommand extends Command
 {
     use PatchesPackagesJson;
 
     protected $signature = 'native:reset {--with-app-data : Clear the app data as well}';
 
-    protected $description = 'Clear all build and dist files';
-
     public function handle(): int
     {
         intro('Clearing build and dist directories...');