Merge branch 'main' into update-api-contracts-and-some-asserts-fakes

Author: gwleuverink

.github/workflows/phpstan.yml

@@ -30,7 +30,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}

config/nativephp.php

@@ -102,6 +102,7 @@
         /**
          * The updater provider to use.
          * Supported: "github", "s3", "spaces"
+         * Note: The "s3" provider is compatible with S3-compatible services like Cloudflare R2.
          */
         'default' => env('NATIVEPHP_UPDATER_PROVIDER', 'spaces'),
 
@@ -113,6 +114,7 @@
                 'token' => env('GITHUB_TOKEN'),
                 'vPrefixedTagName' => env('GITHUB_V_PREFIXED_TAG_NAME', true),
                 'private' => env('GITHUB_PRIVATE', false),
+                'autoupdate_token' => env('GITHUB_AUTOUPDATE_TOKEN'), // Read-only token used by the updater for private repos
                 'channel' => env('GITHUB_CHANNEL', 'latest'),
                 'releaseType' => env('GITHUB_RELEASE_TYPE', 'draft'),
             ],
@@ -125,6 +127,13 @@
                 'bucket' => env('AWS_BUCKET'),
                 'endpoint' => env('AWS_ENDPOINT'),
                 'path' => env('NATIVEPHP_UPDATER_PATH', null),
+                /**
+                 * Optional public URL for serving updates (e.g., CDN or custom domain).
+                 * When set, updates will be downloaded from this URL instead of the S3 endpoint.
+                 * Useful for S3 with CloudFront or Cloudflare R2 with public access
+                 * Example: 'https://updates.yourdomain.com'
+                 */
+                'public_url' => env('AWS_PUBLIC_URL'),
             ],
 
             'spaces' => [

resources/electron/electron-plugin/dist/index.js

@@ -158,8 +158,16 @@ class NativePHP {
         }
     }
     startAutoUpdater(config) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         if (((_a = config === null || config === void 0 ? void 0 : config.updater) === null || _a === void 0 ? void 0 : _a.enabled) === true) {
+            const defaultProvider = (_b = config === null || config === void 0 ? void 0 : config.updater) === null || _b === void 0 ? void 0 : _b.default;
+            const publicUrl = (_e = (_d = (_c = config === null || config === void 0 ? void 0 : config.updater) === null || _c === void 0 ? void 0 : _c.providers) === null || _d === void 0 ? void 0 : _d[defaultProvider]) === null || _e === void 0 ? void 0 : _e.public_url;
+            if (publicUrl) {
+                autoUpdater.setFeedURL({
+                    provider: 'generic',
+                    url: publicUrl
+                });
+            }
             autoUpdater.checkForUpdatesAndNotify();
         }
     }

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

@@ -31,6 +31,11 @@ router.post("/context-menu", (req, res) => {
     const { contextMenu } = req.body;
     (_a = state.tray) === null || _a === void 0 ? void 0 : _a.setContextMenu(buildMenu(contextMenu));
 });
+router.post("/show-context-menu", (req, res) => {
+    var _a;
+    res.sendStatus(200);
+    (_a = state.tray) === null || _a === void 0 ? void 0 : _a.popUpContextMenu();
+});
 router.post("/show", (req, res) => {
     res.sendStatus(200);
     state.activeMenuBar.showWindow();

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

@@ -1,26 +1,49 @@
 import express from 'express';
 import { Notification } from 'electron';
-import { notifyLaravel } from "../utils.js";
+import { notifyLaravel, broadcastToWindows } from "../utils.js";
+import playSoundLib from 'play-sound';
+import fs from 'fs';
+const isLocalFile = (sound) => {
+    if (typeof sound !== 'string')
+        return false;
+    if (/^https?:\/\//i.test(sound))
+        return false;
+    return sound.includes('/') || sound.includes('\\');
+};
 const router = express.Router();
 router.post('/', (req, res) => {
     const { title, body, subtitle, silent, icon, hasReply, timeoutType, replyPlaceholder, sound, urgency, actions, closeButtonText, toastXml, event: customEvent, reference, } = req.body;
     const eventName = customEvent !== null && customEvent !== void 0 ? customEvent : '\\Native\\Desktop\\Events\\Notifications\\NotificationClicked';
     const notificationReference = reference !== null && reference !== void 0 ? reference : (Date.now() + '.' + Math.random().toString(36).slice(2, 9));
+    const usingLocalFile = isLocalFile(sound);
     const notification = new Notification({
         title,
         body,
         subtitle,
-        silent,
+        silent: usingLocalFile ? true : silent,
         icon,
         hasReply,
         timeoutType,
         replyPlaceholder,
-        sound,
+        sound: usingLocalFile ? undefined : sound,
         urgency,
         actions,
         closeButtonText,
         toastXml
     });
+    if (usingLocalFile && !silent) {
+        fs.access(sound, fs.constants.F_OK, (err) => {
+            if (err) {
+                broadcastToWindows('log', {
+                    level: 'error',
+                    message: `Sound file not found: ${sound}`,
+                    context: { sound }
+                });
+                return;
+            }
+            playSoundLib().play(sound, () => { });
+        });
+    }
     notification.on("click", (event) => {
         notifyLaravel('events', {
             event: eventName || '\\Native\\Desktop\\Events\\Notifications\\NotificationClicked',

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

@@ -107,7 +107,7 @@ router.post('/print-to-pdf', (req, res) => __awaiter(void 0, void 0, void 0, fun
             });
         });
     });
-    yield printWindow.loadURL(`data:text/html;charset=UTF-8,${html}`);
+    yield printWindow.loadURL(`data:text/html;base64;charset=UTF-8,${html}`);
 }));
 router.get('/theme', (req, res) => {
     res.json({

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

@@ -41,6 +41,12 @@ router.post('/closable', (req, res) => {
     (_a = state.windows[id]) === null || _a === void 0 ? void 0 : _a.setClosable(closable);
     res.sendStatus(200);
 });
+router.post('/window-button-visibility', (req, res) => {
+    var _a;
+    const { id, windowButtonVisibility } = req.body;
+    (_a = state.windows[id]) === null || _a === void 0 ? void 0 : _a.setWindowButtonVisibility(windowButtonVisibility);
+    res.sendStatus(200);
+});
 router.post('/show-dev-tools', (req, res) => {
     var _a;
     const { id } = req.body;
@@ -145,7 +151,7 @@ function getWindowData(id) {
     };
 }
 router.post('/open', (req, res) => {
-    let { id, x, y, frame, width, height, minWidth, minHeight, maxWidth, maxHeight, focusable, skipTaskbar, hiddenInMissionControl, hasShadow, url, resizable, movable, minimizable, maximizable, closable, title, alwaysOnTop, titleBarStyle, trafficLightPosition, vibrancy, backgroundColor, transparency, showDevTools, fullscreen, fullscreenable, kiosk, autoHideMenuBar, webPreferences, zoomFactor, preventLeaveDomain, preventLeavePage, suppressNewWindows, } = req.body;
+    let { id, x, y, frame, width, height, minWidth, minHeight, maxWidth, maxHeight, focusable, skipTaskbar, hiddenInMissionControl, hasShadow, url, resizable, movable, minimizable, maximizable, closable, title, alwaysOnTop, titleBarStyle, trafficLightPosition, windowButtonVisibility, vibrancy, backgroundColor, transparency, showDevTools, fullscreen, fullscreenable, kiosk, autoHideMenuBar, webPreferences, zoomFactor, preventLeaveDomain, preventLeavePage, suppressNewWindows, } = req.body;
     if (state.windows[id]) {
         state.windows[id].show();
         state.windows[id].focus();
@@ -193,6 +199,9 @@ router.post('/open', (req, res) => {
             return { action: "deny" };
         });
     }
+    if (process.platform === 'darwin') {
+        window.setWindowButtonVisibility(windowButtonVisibility);
+    }
     window.on('blur', () => {
         notifyLaravel('events', {
             event: 'Native\\Desktop\\Events\\Windows\\WindowBlurred',

resources/electron/electron-plugin/src/index.ts

@@ -34,7 +34,6 @@ class NativePHP {
     cert: string,
     appPath: string
   ) {
-
     initialize();
 
     state.icon = icon;
@@ -216,6 +215,17 @@ class NativePHP {
 
   private startAutoUpdater(config) {
     if (config?.updater?.enabled === true) {
+      // If a public URL is configured for the current provider, use it for updates
+      const defaultProvider = config?.updater?.default;
+      const publicUrl = config?.updater?.providers?.[defaultProvider]?.public_url;
+
+      if (publicUrl) {
+        autoUpdater.setFeedURL({
+          provider: 'generic',
+          url: publicUrl
+        });
+      }
+
       autoUpdater.checkForUpdatesAndNotify();
     }
   }

resources/electron/electron-plugin/src/server/api/menuBar.ts

@@ -42,6 +42,12 @@ router.post("/context-menu", (req, res) => {
     state.tray?.setContextMenu(buildMenu(contextMenu));
 });
 
+router.post("/show-context-menu", (req, res) => {
+    res.sendStatus(200);
+
+    state.tray?.popUpContextMenu();
+});
+
 router.post("/show", (req, res) => {
     res.sendStatus(200);
 

resources/electron/electron-plugin/src/server/api/notification.ts

@@ -1,6 +1,16 @@
 import express from 'express';
 import { Notification } from 'electron';
-import {notifyLaravel} from "../utils.js";
+import {notifyLaravel, broadcastToWindows} from "../utils.js";
+declare const require: any;
+import playSoundLib from 'play-sound';
+import fs from 'fs';
+
+const isLocalFile = (sound: unknown) => {
+    if (typeof sound !== 'string') return false;
+    if (/^https?:\/\//i.test(sound)) return false;
+    // Treat any string containing path separators as a local file
+    return sound.includes('/') || sound.includes('\\');
+};
 const router = express.Router();
 
 router.post('/', (req, res) => {
@@ -26,22 +36,39 @@ router.post('/', (req, res) => {
 
     const notificationReference = reference ?? (Date.now() + '.' + Math.random().toString(36).slice(2, 9));
 
+    const usingLocalFile = isLocalFile(sound);
+
     const notification = new Notification({
         title,
         body,
         subtitle,
-        silent,
+        silent: usingLocalFile ? true : silent,
         icon,
         hasReply,
         timeoutType,
         replyPlaceholder,
-        sound,
+        sound: usingLocalFile ? undefined : sound,
         urgency,
         actions,
         closeButtonText,
         toastXml
     });
 
+    if (usingLocalFile && !silent) {
+        fs.access(sound, fs.constants.F_OK, (err) => {
+            if (err) {
+                broadcastToWindows('log', {
+                    level: 'error',
+                    message: `Sound file not found: ${sound}`,
+                    context: { sound }
+                });
+                return;
+            }
+
+            playSoundLib().play(sound, () => {});
+        });
+    }
+
     notification.on("click", (event) => {
         notifyLaravel('events', {
             event: eventName || '\\Native\\Desktop\\Events\\Notifications\\NotificationClicked',