feat: php.ts run with bundle

SRWieZ · SRWieZ · commit a2f98889a18d · 2025-03-04T20:12:58.000+01:00
diff --git a/resources/js/electron-plugin/dist/index.js b/resources/js/electron-plugin/dist/index.js
@@ -67,16 +67,6 @@ class NativePHP {
             }
             event.preventDefault();
         });
-        if (process.platform === 'win32') {
-            app.on('second-instance', (event, commandLine, workingDirectory) => {
-                if (this.mainWindow) {
-                    if (this.mainWindow.isMinimized())
-                        this.mainWindow.restore();
-                    this.mainWindow.focus();
-                }
-                this.handleDeepLink(commandLine.pop());
-            });
-        }
     }
     bootstrapApp(app) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -135,12 +125,28 @@ class NativePHP {
             else {
                 app.setAsDefaultProtocolClient(deepLinkProtocol);
             }
-            if (process.platform === 'win32') {
+            if (process.platform !== "darwin") {
                 const gotTheLock = app.requestSingleInstanceLock();
                 if (!gotTheLock) {
                     app.quit();
                     return;
                 }
+                else {
+                    app.on("second-instance", (event, commandLine, workingDirectory) => {
+                        if (this.mainWindow) {
+                            if (this.mainWindow.isMinimized())
+                                this.mainWindow.restore();
+                            this.mainWindow.focus();
+                        }
+                        notifyLaravel("events", {
+                            event: "\\Native\\Laravel\\Events\\App\\OpenedFromURL",
+                            payload: {
+                                url: commandLine[commandLine.length - 1],
+                                workingDirectory: workingDirectory,
+                            },
+                        });
+                    });
+                }
             }
         }
     }
diff --git a/resources/js/electron-plugin/dist/server/api/notification.js b/resources/js/electron-plugin/dist/server/api/notification.js
@@ -3,8 +3,9 @@ import { Notification } from 'electron';
 import { notifyLaravel } from "../utils.js";
 const router = express.Router();
 router.post('/', (req, res) => {
-    const { title, body, subtitle, silent, icon, hasReply, timeoutType, replyPlaceholder, sound, urgency, actions, closeButtonText, toastXml, event: customEvent } = req.body;
+    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\\Laravel\\Events\\Notifications\\NotificationClicked';
+    const notificationReference = reference !== null && reference !== void 0 ? reference : (Date.now() + '.' + Math.random().toString(36).slice(2, 9));
     const notification = new Notification({
         title,
         body,
@@ -22,11 +23,45 @@ router.post('/', (req, res) => {
     });
     notification.on("click", (event) => {
         notifyLaravel('events', {
-            event: eventName,
-            payload: JSON.stringify(event)
+            event: eventName || '\\Native\\Laravel\\Events\\Notifications\\NotificationClicked',
+            payload: {
+                reference: notificationReference,
+                event: JSON.stringify(event),
+            },
+        });
+    });
+    notification.on("action", (event, index) => {
+        notifyLaravel('events', {
+            event: '\\Native\\Laravel\\Events\\Notifications\\NotificationActionClicked',
+            payload: {
+                reference: notificationReference,
+                index,
+                event: JSON.stringify(event),
+            },
+        });
+    });
+    notification.on("reply", (event, reply) => {
+        notifyLaravel('events', {
+            event: '\\Native\\Laravel\\Events\\Notifications\\NotificationReply',
+            payload: {
+                reference: notificationReference,
+                reply,
+                event: JSON.stringify(event),
+            },
+        });
+    });
+    notification.on("close", (event) => {
+        notifyLaravel('events', {
+            event: '\\Native\\Laravel\\Events\\Notifications\\NotificationClosed',
+            payload: {
+                reference: notificationReference,
+                event: JSON.stringify(event),
+            },
         });
     });
     notification.show();
-    res.sendStatus(200);
+    res.status(200).json({
+        reference: notificationReference,
+    });
 });
 export default router;
diff --git a/resources/js/electron-plugin/dist/server/php.js b/resources/js/electron-plugin/dist/server/php.js
@@ -22,6 +22,13 @@ const databasePath = join(app.getPath('userData'), 'database');
 const databaseFile = join(databasePath, 'database.sqlite');
 const argumentEnv = getArgumentEnv();
 const appPath = getAppPath();
+function runningSecureBuild() {
+    return existsSync(join(appPath, 'build', '__nativephp_app_bundle'));
+}
+function shouldMigrateDatabase(store) {
+    return store.get('migrated_version') !== app.getVersion()
+        && process.env.NODE_ENV !== 'development';
+}
 function getPhpPort() {
     return __awaiter(this, void 0, void 0, function* () {
         return yield getPort({
@@ -41,7 +48,11 @@ function retrievePhpIniSettings() {
             cwd: appPath,
             env
         };
-        return yield promisify(execFile)(state.php, ['artisan', 'native:php-ini'], phpOptions);
+        let command = ['artisan', 'native:php-ini'];
+        if (runningSecureBuild()) {
+            command.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
+        }
+        return yield promisify(execFile)(state.php, command, phpOptions);
     });
 }
 function retrieveNativePHPConfig() {
@@ -55,14 +66,24 @@ function retrieveNativePHPConfig() {
             cwd: appPath,
             env
         };
-        return yield promisify(execFile)(state.php, ['artisan', 'native:config'], phpOptions);
+        let command = ['artisan', 'native:config'];
+        if (runningSecureBuild()) {
+            command.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
+        }
+        return yield promisify(execFile)(state.php, command, phpOptions);
     });
 }
 function callPhp(args, options, phpIniSettings = {}) {
+    if (args[0] === 'artisan' && runningSecureBuild()) {
+        args.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
+    }
     let iniSettings = Object.assign(getDefaultPhpIniSettings(), phpIniSettings);
     Object.keys(iniSettings).forEach(key => {
         args.unshift('-d', `${key}=${iniSettings[key]}`);
     });
+    if (parseInt(process.env.SHELL_VERBOSITY) > 0) {
+        console.log('Calling PHP', state.php, args);
+    }
     return spawn(state.php, args, {
         cwd: options.cwd,
         env: Object.assign(Object.assign({}, process.env), options.env),
@@ -116,6 +137,7 @@ function getDefaultEnvironmentVariables(secret, apiPort) {
     return {
         APP_ENV: process.env.NODE_ENV === 'development' ? 'local' : 'production',
         APP_DEBUG: process.env.NODE_ENV === 'development' ? 'true' : 'false',
+        LARAVEL_STORAGE_PATH: storagePath,
         NATIVEPHP_STORAGE_PATH: storagePath,
         NATIVEPHP_DATABASE_PATH: databaseFile,
         NATIVEPHP_API_URL: `http://localhost:${apiPort}/api/`,
@@ -152,8 +174,10 @@ function serveApp(secret, apiPort, phpIniSettings) {
             env
         };
         const store = new Store();
-        callPhp(['artisan', 'storage:link', '--force'], phpOptions, phpIniSettings);
-        if (store.get('migrated_version') !== app.getVersion() && process.env.NODE_ENV !== 'development') {
+        if (!runningSecureBuild()) {
+            callPhp(['artisan', 'storage:link', '--force'], phpOptions, phpIniSettings);
+        }
+        if (shouldMigrateDatabase(store)) {
             console.log('Migrating database...');
             callPhp(['artisan', 'migrate', '--force'], phpOptions, phpIniSettings);
             store.set('migrated_version', app.getVersion());
@@ -162,40 +186,36 @@ function serveApp(secret, apiPort, phpIniSettings) {
             console.log('Skipping Database migration while in development.');
             console.log('You may migrate manually by running: php artisan native:migrate');
         }
+        console.log('Starting PHP server...');
         const phpPort = yield getPhpPort();
-        const serverPath = join(appPath, 'vendor', 'laravel', 'framework', 'src', 'Illuminate', 'Foundation', 'resources', 'server.php');
+        let serverPath = join(appPath, 'build', '__nativephp_app_bundle');
+        if (!runningSecureBuild()) {
+            console.log('* * * Running from source * * *');
+            serverPath = join(appPath, 'vendor', 'laravel', 'framework', 'src', 'Illuminate', 'Foundation', 'resources', 'server.php');
+        }
         const phpServer = callPhp(['-S', `127.0.0.1:${phpPort}`, serverPath], {
             cwd: join(appPath, 'public'),
             env
         }, phpIniSettings);
         const portRegex = /Development Server \(.*:([0-9]+)\) started/gm;
         phpServer.stdout.on('data', (data) => {
-            const match = portRegex.exec(data.toString());
-            if (match) {
-                console.log("PHP Server started on port: ", match[1]);
-                const port = parseInt(match[1]);
-                resolve({
-                    port,
-                    process: phpServer
-                });
-            }
         });
         phpServer.stderr.on('data', (data) => {
             const error = data.toString();
-            const match = portRegex.exec(error);
+            const match = portRegex.exec(data.toString());
             if (match) {
                 const port = parseInt(match[1]);
                 console.log("PHP Server started on port: ", port);
                 resolve({
                     port,
-                    process: phpServer
+                    process: phpServer,
                 });
             }
             else {
-                if (error.startsWith('[NATIVE_EXCEPTION]: ', 27)) {
+                if (error.includes('[NATIVE_EXCEPTION]:')) {
                     console.log();
                     console.error('Error in PHP:');
-                    console.error('  ' + error.slice(47));
+                    console.error('  ' + error.split('[NATIVE_EXCEPTION]:')[1].trim());
                     console.log('Please check your log file:');
                     console.log('  ' + join(appPath, 'storage', 'logs', 'laravel.log'));
                     console.log();
@@ -205,6 +225,9 @@ function serveApp(secret, apiPort, phpIniSettings) {
         phpServer.on('error', (error) => {
             reject(error);
         });
+        phpServer.on('close', (code) => {
+            console.log(`PHP server exited with code ${code}`);
+        });
     }));
 }
 export { startScheduler, serveApp, getAppPath, retrieveNativePHPConfig, retrievePhpIniSettings, getDefaultEnvironmentVariables, getDefaultPhpIniSettings };
diff --git a/resources/js/electron-plugin/src/server/php.ts b/resources/js/electron-plugin/src/server/php.ts
