Merge remote-tracking branch 'origin/main' into chore/update-dependencies

Author: gwleuverink

.github/funding.yml

@@ -1,2 +1 @@
-github: simonhamp
 open_collective: nativephp

.github/workflows/build-plugin.yml

@@ -18,7 +18,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Use Node.js
         uses: actions/setup-node@v4

.github/workflows/fix-php-code-style-issues.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.head_ref }}
 

.github/workflows/phpstan.yml

@@ -11,7 +11,7 @@ jobs:
     name: phpstan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/run-plugin-tests.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:

.github/workflows/run-tests.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Use Node.js
         uses: actions/setup-node@v4

.github/workflows/update-changelog.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: main
 

resources/js/build/notarize.js

@@ -1,7 +1,11 @@
 import { notarize } from '@electron/notarize';
 
 export default async (context) => {
-    if (process.platform !== 'darwin') return
+    // Only notarize when process is running on a Mac
+    if (process.platform !== 'darwin') return;
+
+    // And the current build target is macOS
+    if (context.packager.platform.name !== 'mac') return;
 
     console.log('aftersign hook triggered, start to notarize app.')
 

resources/js/electron-builder.js

@@ -1,5 +1,5 @@
-import { join } from 'path';
 import { exec } from 'child_process';
+import { join } from 'path';
 
 const appUrl = process.env.APP_URL;
 const appId = process.env.NATIVEPHP_APP_ID;
@@ -10,6 +10,13 @@ const fileName = process.env.NATIVEPHP_APP_FILENAME;
 const appVersion = process.env.NATIVEPHP_APP_VERSION;
 const appCopyright = process.env.NATIVEPHP_APP_COPYRIGHT;
 const deepLinkProtocol = process.env.NATIVEPHP_DEEPLINK_SCHEME;
+const updaterEnabled = process.env.NATIVEPHP_UPDATER_ENABLED === 'true';
+
+// Azure signing configuration
+const azurePublisherName = process.env.NATIVEPHP_AZURE_PUBLISHER_NAME;
+const azureEndpoint = process.env.NATIVEPHP_AZURE_ENDPOINT;
+const azureCertificateProfileName = process.env.NATIVEPHP_AZURE_CERTIFICATE_PROFILE_NAME;
+const azureCodeSigningAccountName = process.env.NATIVEPHP_AZURE_CODE_SIGNING_ACCOUNT_NAME;
 
 // Since we do not copy the php executable here, we only need these for building
 const isWindows = process.argv.includes('--win');
@@ -78,6 +85,14 @@ export default {
     afterSign: 'build/notarize.js',
     win: {
         executableName: fileName,
+        ...(azurePublisherName && azureEndpoint && azureCertificateProfileName && azureCodeSigningAccountName ? {
+            azureSignOptions: {
+                publisherName: azurePublisherName,
+                endpoint: azureEndpoint,
+                certificateProfileName: azureCertificateProfileName,
+                codeSigningAccountName: azureCodeSigningAccountName
+            }
+        } : {}),
     },
     nsis: {
         artifactName: appName + '-${version}-setup.${ext}',
@@ -115,11 +130,13 @@ export default {
         artifactName: appName + '-${version}.${ext}',
     },
     npmRebuild: false,
-    publish: updaterConfig,
     extraMetadata: {
         name: fileName,
         homepage: appUrl,
         version: appVersion,
         author: appAuthor,
-    }
+    },
+    ...updaterEnabled 
+        ? { publish: updaterConfig } 
+        : {}
 };

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

@@ -11,7 +11,7 @@ import { app, session, powerMonitor } from "electron";
 import { initialize } from "@electron/remote/main/index.js";
 import state from "./server/state.js";
 import { electronApp, optimizer } from "@electron-toolkit/utils";
-import { retrieveNativePHPConfig, retrievePhpIniSettings, runScheduler, startAPI, startPhpApp, } from "./server/index.js";
+import { retrieveNativePHPConfig, retrievePhpIniSettings, runScheduler, killScheduler, startAPI, startPhpApp, } from "./server/index.js";
 import { notifyLaravel } from "./server/utils.js";
 import { resolve } from "path";
 import { stopAllProcesses } from "./server/api/childProcess.js";
@@ -22,8 +22,8 @@ const { autoUpdater } = electronUpdater;
 class NativePHP {
     constructor() {
         this.processes = [];
-        this.schedulerInterval = undefined;
         this.mainWindow = null;
+        this.schedulerInterval = undefined;
     }
     bootstrap(app, icon, phpBinary, cert) {
         initialize();
@@ -149,7 +149,6 @@ class NativePHP {
                             event: "\\Native\\Laravel\\Events\\App\\OpenedFromURL",
                             payload: {
                                 url: commandLine[commandLine.length - 1],
-                                workingDirectory: workingDirectory,
                             },
                         });
                     });
@@ -193,6 +192,7 @@ class NativePHP {
             clearInterval(this.schedulerInterval);
             this.schedulerInterval = null;
         }
+        killScheduler();
     }
     startScheduler() {
         const now = new Date();
@@ -207,9 +207,14 @@ class NativePHP {
         }, delay);
     }
     killChildProcesses() {
+        this.stopScheduler();
         this.processes
             .filter((p) => p !== undefined)
             .forEach((process) => {
+            if (!process || !process.pid)
+                return;
+            if (process.killed && process.exitCode !== null)
+                return;
             try {
                 killSync(process.pid, 'SIGTERM', true);
                 ps.kill(process.pid);