Merge branch 'main' into update-deps

Author: gwleuverink

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' => [

package-lock.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "fix-path": "^5.0.0"
+  }
+}

package.json

@@ -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/index.js

@@ -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/index.ts

@@ -2,6 +2,10 @@ import {app} from 'electron'
 import NativePHP from '#plugin'
 import path from 'path'
 
+// Inherit User's PATH in Process & ChildProcess
+import fixPath from 'fix-path';
+fixPath();
+
 const buildPath = path.resolve(import.meta.dirname, import.meta.env.MAIN_VITE_NATIVEPHP_BUILD_PATH);
 const defaultIcon = path.join(buildPath, 'icon.png')
 const certificate = path.join(buildPath, 'cacert.pem')

resources/electron/src/main/index.js

@@ -20,4 +20,6 @@ public function current(): Window;
     public function all(): array;
 
     public function get(string $id): Window;
+
+    public function reload($id = null): void;
 }

src/Contracts/WindowManager.php

@@ -17,15 +17,20 @@ public function environmentVariables(): array
 
     public function builderOptions(): array
     {
-        return [
+        $options = [
             'provider' => 'github',
             'repo' => $this->config['repo'],
             'owner' => $this->config['owner'],
             'vPrefixedTagName' => $this->config['vPrefixedTagName'],
             'private' => $this->config['private'],
             'channel' => $this->config['channel'],
             'releaseType' => $this->config['releaseType'],
-            'token' => $this->config['token'],
         ];
+
+        if ($this->config['private'] === true && ! empty($this->config['autoupdate_token'])) {
+            $options['token'] = $this->config['autoupdate_token'];
+        }
+
+        return $options;
     }
 }