Merge branch 'main' into prettier-and-eslint-fixes

Author: simonhamp

config/nativephp-internal.php

@@ -89,6 +89,7 @@
         'storage/hot',
 
         // Only needed for local testing
+        'vendor/nativephp/desktop/.git',
         'vendor/nativephp/desktop/resources',
         'vendor/nativephp/desktop/vendor',
         'vendor/nativephp/php-bin',

resources/electron/electron-builder.mjs

@@ -13,7 +13,6 @@ 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;
@@ -83,15 +82,14 @@ export default {
     afterSign: 'build/notarize.js',
     win: {
         executableName: fileName,
-        ...(azurePublisherName && azureEndpoint && azureCertificateProfileName && azureCodeSigningAccountName
+        ...(azureEndpoint && azureCertificateProfileName && azureCodeSigningAccountName
             ? {
-                  azureSignOptions: {
-                      publisherName: azurePublisherName,
-                      endpoint: azureEndpoint,
-                      certificateProfileName: azureCertificateProfileName,
-                      codeSigningAccountName: azureCodeSigningAccountName,
-                  },
-              }
+                azureSignOptions: {
+                    endpoint: azureEndpoint,
+                    certificateProfileName: azureCertificateProfileName,
+                    codeSigningAccountName: azureCodeSigningAccountName
+                },
+            }
             : {}),
     },
     nsis: {

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

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { mkdirSync, statSync, writeFileSync, existsSync } from 'fs';
+import { mkdirSync, statSync, writeFileSync, existsSync, readFileSync } from 'fs';
 import fs_extra from 'fs-extra';
 const { copySync, mkdirpSync } = fs_extra;
 import Store from 'electron-store';
@@ -40,6 +40,53 @@ function shouldMigrateDatabase(store) {
 function shouldOptimize(store) {
     return process.env.NODE_ENV !== 'development';
 }
+function hasNightwatchInstalled(appPath) {
+    const candidateRoots = [
+        appPath,
+        join(appPath, "build", "__nativephp_app_bundle")
+    ];
+    for (const root of candidateRoots) {
+        if (existsSync(join(root, "vendor", "laravel", "nightwatch"))) {
+            return true;
+        }
+        const composerLock = join(root, "composer.lock");
+        if (!existsSync(composerLock)) {
+            continue;
+        }
+        try {
+            if (readFileSync(composerLock, "utf8").includes("\"name\": \"laravel/nightwatch\"")) {
+                return true;
+            }
+        }
+        catch (_a) {
+        }
+    }
+    return false;
+}
+function getNightwatchToken(appPath) {
+    if (process.env.NIGHTWATCH_TOKEN) {
+        return process.env.NIGHTWATCH_TOKEN;
+    }
+    const candidateRoots = [
+        appPath,
+        join(appPath, "build", "__nativephp_app_bundle")
+    ];
+    for (const root of candidateRoots) {
+        const envPath = join(root, ".env");
+        if (!existsSync(envPath)) {
+            continue;
+        }
+        try {
+            const content = readFileSync(envPath, "utf8");
+            const match = content.match(/^NIGHTWATCH_TOKEN=(.+)$/m);
+            if (match && match[1]) {
+                return match[1].replace(/^['"]|['"]$/g, "");
+            }
+        }
+        catch (_a) {
+        }
+    }
+}
 function getPhpPort() {
     return __awaiter(this, void 0, void 0, function* () {
         const suggestedPort = yield getPort({
@@ -229,13 +276,28 @@ function serveApp(secret, apiPort, phpIniSettings) {
         ensureAppFoldersAreAvailable();
         console.log('Making sure app folders are available');
         const env = getDefaultEnvironmentVariables(secret, apiPort);
+        const nightwatchToken = getNightwatchToken(appPath);
+        let phpNightWatchPort;
+        if (nightwatchToken && hasNightwatchInstalled(appPath)) {
+            phpNightWatchPort = yield getPhpPort();
+            env.NIGHTWATCH_TOKEN = nightwatchToken;
+            env.NIGHTWATCH_INGEST_URI = `127.0.0.1:${phpNightWatchPort}`;
+        }
+        else if (nightwatchToken) {
+            console.log("Skipping Nightwatch: package not installed.");
+        }
         const phpOptions = {
             cwd: appPath,
             env
         };
         const store = new Store({
             name: 'nativephp',
         });
+        if (env.NIGHTWATCH_INGEST_URI && phpNightWatchPort) {
+            console.log('Starting Nightwatch server...');
+            callPhp(['artisan', 'nightwatch:agent', `--listen-on=${env.NIGHTWATCH_INGEST_URI}`], phpOptions, phpIniSettings);
+            console.log('Nightwatch server started on port:', phpNightWatchPort);
+        }
         if (shouldOptimize(store)) {
             console.log('Caching view and routes...');
             let result = callPhpSync(['artisan', 'optimize'], phpOptions, phpIniSettings);

resources/electron/electron-plugin/src/server/php.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, statSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import fs_extra from 'fs-extra';
 
 const { copySync, mkdirpSync } = fs_extra;
@@ -46,6 +46,65 @@ function shouldOptimize() {
     // return runningSecureBuild();
 }
 
+function hasNightwatchInstalled(appPath: string) {
+    const candidateRoots = [
+        appPath,
+        join(appPath, "build", "__nativephp_app_bundle")
+    ];
+
+    for (const root of candidateRoots) {
+        if (existsSync(join(root, "vendor", "laravel", "nightwatch"))) {
+            return true;
+        }
+
+        const composerLock = join(root, "composer.lock");
+
+        if (!existsSync(composerLock)) {
+            continue;
+        }
+
+        try {
+            if (readFileSync(composerLock, "utf8").includes("\"name\": \"laravel/nightwatch\"")) {
+                return true;
+            }
+        } catch {
+            // ignore and keep looking
+        }
+    }
+
+    return false;
+}
+
+function getNightwatchToken(appPath: string) {
+    if (process.env.NIGHTWATCH_TOKEN) {
+        return process.env.NIGHTWATCH_TOKEN;
+    }
+
+    const candidateRoots = [
+        appPath,
+        join(appPath, "build", "__nativephp_app_bundle")
+    ];
+
+    for (const root of candidateRoots) {
+        const envPath = join(root, ".env");
+
+        if (!existsSync(envPath)) {
+            continue;
+        }
+
+        try {
+            const content = readFileSync(envPath, "utf8");
+            const match = content.match(/^NIGHTWATCH_TOKEN=(.+)$/m);
+
+            if (match && match[1]) {
+                return match[1].replace(/^['"]|['"]$/g, "");
+            }
+        } catch {
+            // ignore and keep looking
+        }
+    }
+}
+
 async function getPhpPort() {
     // Try get-port first (fast path)
     const suggestedPort = await getPort({
@@ -270,7 +329,7 @@ interface EnvironmentVariables {
     APP_ROUTES_CACHE?: string;
     APP_EVENTS_CACHE?: string;
     VIEW_COMPILED_PATH?: string;
-
+    NIGHTWATCH_TOKEN?: string;
     NIGHTWATCH_INGEST_URI?: string;
 }
 
@@ -336,15 +395,19 @@ async function serveApp(secret, apiPort, phpIniSettings): Promise<ProcessResult>
 
     const env = getDefaultEnvironmentVariables(secret, apiPort);
 
+    const nightwatchToken = getNightwatchToken(appPath);
     let phpNightWatchPort: number | undefined;
-    if (process.env.NIGHTWATCH_TOKEN) {
+    if (nightwatchToken && hasNightwatchInstalled(appPath)) {
         phpNightWatchPort = await getPhpPort();
+        env.NIGHTWATCH_TOKEN = nightwatchToken;
         env.NIGHTWATCH_INGEST_URI = `127.0.0.1:${phpNightWatchPort}`;
+    } else if (nightwatchToken) {
+        console.log("Skipping Nightwatch: package not installed.");
     }
 
     const phpOptions = {
         cwd: appPath,
-        env,
+        env
     };
 
     const store = new Store({

routes/api.php

@@ -5,11 +5,12 @@
 use Native\Desktop\Http\Controllers\CreateSecurityCookieController;
 use Native\Desktop\Http\Controllers\DispatchEventFromAppController;
 use Native\Desktop\Http\Controllers\NativeAppBootedController;
+use Native\Desktop\Http\Middleware\OptionalNightwatchNever;
 use Native\Desktop\Http\Middleware\PreventRegularBrowserAccess;
 
-Route::group(['middleware' => PreventRegularBrowserAccess::class], function () {
+Route::group(['middleware' => [OptionalNightwatchNever::class, PreventRegularBrowserAccess::class]], function () {
     Route::post('_native/api/booted', NativeAppBootedController::class);
     Route::post('_native/api/events', DispatchEventFromAppController::class);
 })->withoutMiddleware(VerifyCsrfToken::class);
 
-Route::get('_native/api/cookie', CreateSecurityCookieController::class);
+Route::get('_native/api/cookie', CreateSecurityCookieController::class)->middleware(OptionalNightwatchNever::class);

src/Http/Middleware/OptionalNightwatchNever.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Native\Desktop\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class OptionalNightwatchNever
+{
+    public function handle(Request $request, Closure $next): mixed
+    {
+        if (class_exists(\Laravel\Nightwatch\Http\Middleware\Sample::class)) {
+            $middleware = app(\Laravel\Nightwatch\Http\Middleware\Sample::class);
+
+            return $middleware->handle($request, $next, 0.0);
+        }
+
+        return $next($request);
+    }
+}

src/QueueWorker.php

@@ -36,6 +36,7 @@ public function up(string|QueueConfig $config): void
                 "--memory={$config->memoryLimit}",
                 "--timeout={$config->timeout}",
                 "--sleep={$config->sleep}",
+                '--quiet',
             ],
             'queue_'.$config->alias,
             persistent: true,