V2 feedback

resources/electron/.gitignore

@@ -3,3 +3,4 @@ node_modules
 out
 *.log
 !build
+dist

resources/electron/electron-builder.mjs

@@ -56,11 +56,12 @@ export default {
     copyright: appCopyright,
     directories: {
         buildResources: 'build',
-        output: isBuilding ? join(process.env.APP_PATH, 'dist') : undefined,
+        output: isBuilding ? join(process.env.APP_PATH, 'nativephp', 'electron', 'dist') : undefined,
     },
     files: [
         '!**/.vscode/*',
         '!src/*',
+        '!dist/*',
         '!electron.vite.config.{js,ts,mjs,cjs}',
         '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}',
         '!{.env,.env.*,.npmrc,pnpm-lock.yaml}',

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

@@ -25,11 +25,12 @@ class NativePHP {
         this.mainWindow = null;
         this.schedulerInterval = undefined;
     }
-    bootstrap(app, icon, phpBinary, cert) {
+    bootstrap(app, icon, phpBinary, cert, appPath) {
         initialize();
         state.icon = icon;
         state.php = phpBinary;
         state.caCert = cert;
+        state.appPath = appPath;
         this.bootstrapApp(app);
         this.addEventListeners(app);
     }

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

@@ -16,7 +16,7 @@ import killSync from "kill-sync";
 import { fileURLToPath } from "url";
 import { join } from "path";
 const router = express.Router();
-function startProcess(settings) {
+function startProcess(settings, useNodeRuntime = false) {
     const { alias, cmd, cwd, env, persistent, spawnTimeout = 30000 } = settings;
     if (getProcess(alias) !== undefined) {
         return state.processes[alias];
@@ -26,7 +26,7 @@ function startProcess(settings) {
             cwd,
             stdio: 'pipe',
             serviceName: alias,
-            env: Object.assign(Object.assign({}, process.env), env)
+            env: Object.assign(Object.assign(Object.assign({}, process.env), env), { USE_NODE_RUNTIME: useNodeRuntime ? '1' : '0' })
         });
         const startTimeout = setTimeout(() => {
             if (!state.processes[alias] || !state.processes[alias].pid) {
@@ -157,6 +157,10 @@ router.post('/start', (req, res) => {
     const proc = startProcess(req.body);
     res.json(proc);
 });
+router.post('/start-node', (req, res) => {
+    const proc = startProcess(req.body, true);
+    res.json(proc);
+});
 router.post('/start-php', (req, res) => {
     const proc = startPhpProcess(req.body);
     res.json(proc);

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

@@ -1,5 +1,12 @@
-import { spawn } from "child_process";
-const proc = spawn(process.argv[2], process.argv.slice(3));
+import { spawn, fork } from "child_process";
+const useNodeRuntime = process.env.USE_NODE_RUNTIME === '1';
+const [command, ...args] = process.argv.slice(2);
+const proc = useNodeRuntime
+    ? fork(command, args, {
+        stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
+        execPath: process.execPath
+    })
+    : spawn(command, args);
 process.parentPort.on('message', (message) => {
     proc.stdin.write(message.data);
 });

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

@@ -23,15 +23,14 @@ const databasePath = join(app.getPath('userData'), 'database');
 const databaseFile = join(databasePath, 'database.sqlite');
 const bootstrapCache = join(app.getPath('userData'), 'bootstrap', 'cache');
 const argumentEnv = getArgumentEnv();
-const appPath = getAppPath();
 mkdirpSync(bootstrapCache);
 mkdirpSync(join(storagePath, 'logs'));
 mkdirpSync(join(storagePath, 'framework', 'cache'));
 mkdirpSync(join(storagePath, 'framework', 'sessions'));
 mkdirpSync(join(storagePath, 'framework', 'views'));
 mkdirpSync(join(storagePath, 'framework', 'testing'));
 function runningSecureBuild() {
-    return existsSync(join(appPath, 'build', '__nativephp_app_bundle'))
+    return existsSync(join(getAppPath(), 'build', '__nativephp_app_bundle'))
         && process.env.NODE_ENV !== 'development';
 }
 function shouldMigrateDatabase(store) {
@@ -73,6 +72,7 @@ function canBindToPort(port) {
 function retrievePhpIniSettings() {
     return __awaiter(this, void 0, void 0, function* () {
         const env = getDefaultEnvironmentVariables();
+        const appPath = getAppPath();
         const phpOptions = {
             cwd: appPath,
             env
@@ -87,6 +87,7 @@ function retrievePhpIniSettings() {
 function retrieveNativePHPConfig() {
     return __awaiter(this, void 0, void 0, function* () {
         const env = getDefaultEnvironmentVariables();
+        const appPath = getAppPath();
         const phpOptions = {
             cwd: appPath,
             env
@@ -100,7 +101,7 @@ function retrieveNativePHPConfig() {
 }
 function callPhp(args, options, phpIniSettings = {}) {
     if (args[0] === 'artisan' && runningSecureBuild()) {
-        args.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
+        args.unshift(join(getAppPath(), 'build', '__nativephp_app_bundle'));
     }
     let iniSettings = Object.assign(getDefaultPhpIniSettings(), phpIniSettings);
     Object.keys(iniSettings).forEach(key => {
@@ -116,7 +117,7 @@ function callPhp(args, options, phpIniSettings = {}) {
 }
 function callPhpSync(args, options, phpIniSettings = {}) {
     if (args[0] === 'artisan' && runningSecureBuild()) {
-        args.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
+        args.unshift(join(getAppPath(), 'build', '__nativephp_app_bundle'));
     }
     let iniSettings = Object.assign(getDefaultPhpIniSettings(), phpIniSettings);
     Object.keys(iniSettings).forEach(key => {
@@ -140,7 +141,7 @@ function getArgumentEnv() {
     return env;
 }
 function getAppPath() {
-    let appPath = join(import.meta.dirname, '../../resources/app/').replace('app.asar', 'app.asar.unpacked');
+    let appPath = state.appPath;
     if (process.env.NODE_ENV === 'development' || argumentEnv.TESTING == 1) {
         appPath = process.env.APP_PATH || argumentEnv.APP_PATH;
     }
@@ -150,6 +151,7 @@ function ensureAppFoldersAreAvailable() {
     console.log('Copying storage folder...');
     console.log('Storage path:', storagePath);
     if (!existsSync(storagePath) || process.env.NODE_ENV === 'development') {
+        const appPath = getAppPath();
         console.log("App path:", appPath);
         copySync(join(appPath, 'storage'), storagePath);
     }
@@ -163,6 +165,7 @@ function ensureAppFoldersAreAvailable() {
 }
 function startScheduler(secret, apiPort, phpIniSettings = {}) {
     const env = getDefaultEnvironmentVariables(secret, apiPort);
+    const appPath = getAppPath();
     const phpOptions = {
         cwd: appPath,
         env

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

@@ -30,6 +30,7 @@ export default {
     phpPort: null,
     phpIni: null,
     caCert: null,
+    appPath: null,
     icon: null,
     store: settingsStore,
     randomSecret: generateRandomString(32),

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

@@ -31,14 +31,16 @@ class NativePHP {
     app: CrossProcessExports.App,
     icon: string,
     phpBinary: string,
-    cert: string
+    cert: string,
+    appPath: string
   ) {
 
     initialize();
 
     state.icon = icon;
     state.php = phpBinary;
     state.caCert = cert;
+    state.appPath = appPath;
 
     this.bootstrapApp(app);
     this.addEventListeners(app);

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

@@ -19,7 +19,6 @@ const databasePath = join(app.getPath('userData'), 'database')
 const databaseFile = join(databasePath, 'database.sqlite')
 const bootstrapCache = join(app.getPath('userData'), 'bootstrap', 'cache')
 const argumentEnv = getArgumentEnv();
-const appPath = getAppPath();
 
 mkdirpSync(bootstrapCache);
 mkdirpSync(join(storagePath, 'logs'));
@@ -29,7 +28,7 @@ mkdirpSync(join(storagePath, 'framework', 'views'));
 mkdirpSync(join(storagePath, 'framework', 'testing'));
 
 function runningSecureBuild() {
-    return existsSync(join(appPath, 'build', '__nativephp_app_bundle'))
+    return existsSync(join(getAppPath(), 'build', '__nativephp_app_bundle'))
         && process.env.NODE_ENV !== 'development';
 }
 
@@ -90,6 +89,7 @@ function canBindToPort(port: number): Promise<boolean> {
 
 async function retrievePhpIniSettings() {
     const env = getDefaultEnvironmentVariables() as any;
+    const appPath = getAppPath();
 
     const phpOptions = {
         cwd: appPath,
@@ -107,6 +107,7 @@ async function retrievePhpIniSettings() {
 
 async function retrieveNativePHPConfig() {
     const env = getDefaultEnvironmentVariables() as any;
+    const appPath = getAppPath()
 
     const phpOptions = {
         cwd: appPath,
@@ -125,7 +126,7 @@ async function retrieveNativePHPConfig() {
 function callPhp(args, options, phpIniSettings = {}) {
 
     if (args[0] === 'artisan' && runningSecureBuild()) {
-        args.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
+        args.unshift(join(getAppPath(), 'build', '__nativephp_app_bundle'));
     }
 
     let iniSettings = Object.assign(getDefaultPhpIniSettings(), phpIniSettings);
@@ -154,7 +155,7 @@ function callPhp(args, options, phpIniSettings = {}) {
 function callPhpSync(args, options, phpIniSettings = {}) {
 
     if (args[0] === 'artisan' && runningSecureBuild()) {
-        args.unshift(join(appPath, 'build', '__nativephp_app_bundle'));
+        args.unshift(join(getAppPath(), 'build', '__nativephp_app_bundle'));
     }
 
     let iniSettings = Object.assign(getDefaultPhpIniSettings(), phpIniSettings);
@@ -196,7 +197,7 @@ function getArgumentEnv() {
 }
 
 function getAppPath() {
-    let appPath = join(import.meta.dirname, '../../../build/app/')
+    let appPath = state.appPath
 
     if (process.env.NODE_ENV === 'development' || argumentEnv.TESTING == 1) {
         appPath = process.env.APP_PATH || argumentEnv.APP_PATH;
@@ -209,10 +210,12 @@ function ensureAppFoldersAreAvailable() {
     // if (!runningSecureBuild()) {
     console.log('Copying storage folder...');
     console.log('Storage path:', storagePath);
-        if (!existsSync(storagePath) || process.env.NODE_ENV === 'development') {
-            console.log("App path:", appPath);
-            copySync(join(appPath, 'storage'), storagePath)
-        }
+
+    if (!existsSync(storagePath) || process.env.NODE_ENV === 'development') {
+        const appPath = getAppPath();
+        console.log("App path:", appPath);
+        copySync(join(appPath, 'storage'), storagePath)
+    }
     // }
 
     mkdirSync(databasePath, {recursive: true})
@@ -227,6 +230,7 @@ function ensureAppFoldersAreAvailable() {
 
 function startScheduler(secret, apiPort, phpIniSettings = {}) {
     const env = getDefaultEnvironmentVariables(secret, apiPort);
+    const appPath = getAppPath();
 
     const phpOptions = {
         cwd: appPath,

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

@@ -26,6 +26,7 @@ interface State {
   phpPort: number | null;
   phpIni: any;
   caCert: string | null;
+  appPath: string | null;
   icon: string | null;
   processes: Record<string, {pid: any, proc: UtilityProcess, settings: Record<string, any>}>;
   windows: Record<string, BrowserWindow>;
@@ -56,6 +57,7 @@ export default {
   phpPort: null,
   phpIni: null,
   caCert: null,
+  appPath: null,
   icon: null,
   store: settingsStore,
   randomSecret: generateRandomString(32),

resources/electron/src/main/index.js

@@ -3,12 +3,12 @@ import NativePHP from '#plugin'
 import path from 'path'
 
 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')
 
 const executable = process.platform === 'win32' ? 'php.exe' : 'php';
 const phpBinary = path.join(buildPath,'php', executable);
+const appPath = path.join(buildPath, 'app')
 
 /**
  * Turn on the lights for the NativePHP app.
@@ -17,5 +17,6 @@ NativePHP.bootstrap(
     app,
     defaultIcon,
     phpBinary,
-    certificate
+    certificate,
+    appPath
 );

src/Builder/Concerns/PrunesVendorDirectory.php

@@ -26,7 +26,8 @@ public function pruneVendorDirectory()
         // Remove custom php binary package directory
         $binaryPackageDirectory = $this->binaryPackageDirectory();
         if (! empty($binaryPackageDirectory) && $filesystem->exists($this->buildPath($binaryPackageDirectory))) {
-            $filesystem->remove($this->buildPath('app', $binaryPackageDirectory));
+            $binariesInBuildPath = $this->buildPath("app/{$binaryPackageDirectory}");
+            $filesystem->remove($binariesInBuildPath);
         }
     }
 }

src/ChildProcess.php

@@ -65,7 +65,7 @@ public function start(
         ?array $env = null,
         bool $persistent = false
     ): self {
-        $cmd = is_array($cmd) ? array_values($cmd) : [$cmd];
+        $cmd = $this->parseCommand($cmd);
 
         $process = $this->client->post('child-process/start', [
             'alias' => $alias,
@@ -84,7 +84,7 @@ public function start(
      */
     public function php(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false, ?array $iniSettings = null): self
     {
-        $cmd = is_array($cmd) ? array_values($cmd) : [$cmd];
+        $cmd = $this->parseCommand($cmd);
 
         $process = $this->client->post('child-process/start-php', [
             'alias' => $alias,
@@ -100,7 +100,7 @@ public function php(string|array $cmd, string $alias, ?array $env = null, ?bool
 
     public function node(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false): self
     {
-        $cmd = is_array($cmd) ? array_values($cmd) : [$cmd];
+        $cmd = $this->parseCommand($cmd);
 
         $process = $this->client->post('child-process/start-node', [
             'alias' => $alias,
@@ -119,7 +119,7 @@ public function node(string|array $cmd, string $alias, ?array $env = null, ?bool
      */
     public function artisan(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false, ?array $iniSettings = null): self
     {
-        $cmd = is_array($cmd) ? array_values($cmd) : [$cmd];
+        $cmd = $this->parseCommand($cmd);
 
         $cmd = ['artisan', ...$cmd];
 
@@ -173,4 +173,16 @@ protected function fromRuntimeProcess($process)
 
         return $this;
     }
+
+    /* Convert a cmd string to array representation (explode on space, except within quotes) */
+    protected function parseCommand(string|array $cmd): array
+    {
+        if (is_array($cmd)) {
+            return array_values($cmd);
+        }
+
+        preg_match_all('/"[^"]*"|\'[^\']*\'|[^\s]+/', $cmd, $matches);
+
+        return array_filter($matches[0]);
+    }
 }

src/Contracts/ChildProcess.php

@@ -20,6 +20,8 @@ public function php(string|array $cmd, string $alias, ?array $env = null, ?bool
 
     public function artisan(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false, ?array $iniSettings = null): self;
 
+    public function node(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false): self;
+
     public function stop(?string $alias = null): void;
 
     public function restart(?string $alias = null): ?self;

src/Contracts/Shell.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Native\Desktop\Contracts;
+
+interface Shell
+{
+    public function showInFolder(string $path): void;
+
+    public function openFile(string $path): string;
+
+    public function trashFile(string $path): void;
+
+    public function openExternal(string $url): void;
+}