Build with obfuscated bundle

composer.json

@@ -39,9 +39,9 @@
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
+        "larastan/larastan": "^2.9",
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^7.9",
-        "nunomaduro/larastan": "^2.0.1",
         "orchestra/testbench": "^8.18",
         "pestphp/pest": "^2.7",
         "pestphp/pest-plugin-arch": "^2.0",

phpstan.neon

@@ -4,7 +4,5 @@ parameters:
         - src
         - config
         - database
-    tmpDir: build/phpstan
-    checkOctaneCompatibility: true
-    checkModelProperties: true
+
 

resources/js/electron-builder.js

@@ -1,10 +1,10 @@
 import os from 'os';
-import { join } from 'path';
-import { mkdtempSync } from 'fs';
+import path, { join } from 'path';
+import {existsSync, mkdtempSync} from 'fs';
 
 // Workaround for CommonJS module
 import fs_extra from 'fs-extra';
-const { copySync, removeSync, writeJsonSync } = fs_extra;
+const { copySync, removeSync, writeJsonSync, mkdirpSync } = fs_extra;
 
 const isBuilding = process.env.NATIVEPHP_BUILDING;
 const appId = process.env.NATIVEPHP_APP_ID;
@@ -33,12 +33,8 @@ if (isDarwin) {
     targetOs = 'mac';
 }
 
-
 let updaterConfig = {};
 
-// We wouldn't need these since its not representing the target platform
-console.log("Arch: ", process.arch)
-console.log("Platform: ", process.platform)
 try {
     updaterConfig = process.env.NATIVEPHP_UPDATER_CONFIG;
     updaterConfig = JSON.parse(updaterConfig);
@@ -47,6 +43,8 @@ try {
 }
 
 if (isBuilding) {
+    console.log("Current platform: ", process.platform)
+    console.log("Current arch: ", process.arch)
 
     console.log();
     console.log('===================================================================');
@@ -61,60 +59,92 @@ if (isBuilding) {
 
         removeSync(appPath);
 
-        // As we can't copy into a subdirectory of ourself we need to copy to a temp directory
-        let tmpDir = mkdtempSync(join(os.tmpdir(), 'nativephp'));
-
-        copySync(process.env.APP_PATH, tmpDir, {
-            overwrite: true,
-            dereference: true,
-            filter: (src, dest) => {
-                let skip = [
-                    // Skip .git and Dev directories
-                    join(process.env.APP_PATH, '.git'),
-                    join(process.env.APP_PATH, 'docker'),
-                    join(process.env.APP_PATH, 'packages'),
-
-                    // Only needed for local testing
-                    join(process.env.APP_PATH, 'vendor', 'nativephp', 'electron', 'vendor'),
-                    join(process.env.APP_PATH, 'vendor', 'nativephp', 'laravel', 'vendor'),
-
-                    join(process.env.APP_PATH, 'vendor', 'nativephp', 'php-bin'),
-                    join(process.env.APP_PATH, 'vendor', 'nativephp', 'electron', 'bin'),
-                    join(process.env.APP_PATH, 'vendor', 'nativephp', 'electron', 'resources'),
-                    join(process.env.APP_PATH, 'node_modules'),
-                    join(process.env.APP_PATH, 'dist'),
-                ];
-
-                let shouldSkip = false;
-                skip.forEach((path) => {
-                    if (src.indexOf(path) === 0) {
-                        shouldSkip = true;
-                    }
-                });
-
-                return !shouldSkip;
-            }
-        });
-
-        copySync(tmpDir, appPath);
-
-        // Electron build removes empty folders, so we have to create dummy files
-        // dotfiles unfortunately don't work.
-        writeJsonSync(join(appPath, 'storage', 'framework', 'cache', '_native.json'), {})
-        writeJsonSync(join(appPath, 'storage', 'framework', 'sessions', '_native.json'), {})
-        writeJsonSync(join(appPath, 'storage', 'framework', 'testing', '_native.json'), {})
-        writeJsonSync(join(appPath, 'storage', 'framework', 'views', '_native.json'), {})
-        writeJsonSync(join(appPath, 'storage', 'app', 'public', '_native.json'), {})
-        writeJsonSync(join(appPath, 'storage', 'logs', '_native.json'), {})
-
-        removeSync(tmpDir);
+        let bundle = join(process.env.APP_PATH, 'build', '__nativephp_app_bundle');
+
+        if (existsSync(bundle)) {
+            copySync(bundle, join(appPath, 'bundle', '__nativephp_app_bundle'));
+        } else {
+            // As we can't copy into a subdirectory of ourself we need to copy to a temp directory
+            let tmpDir = mkdtempSync(join(os.tmpdir(), 'nativephp'));
+
+            console.warn('===================================================================');
+            console.warn('                    * * * INSECURE BUILD * * *');
+            console.warn('===================================================================');
+            console.warn('Secure app bundle not found! Building with exposed source files.');
+            console.warn('See https://nativephp.com/docs/publishing/building#security');
+            console.warn('===================================================================');
+
+            console.log('Copying app to temporary directory for build');
+            copySync(process.env.APP_PATH, tmpDir, {
+                overwrite: true,
+                dereference: true,
+                filter: (src) => {
+                    let skip = [
+                        // Skip .git and Dev directories
+                        join(process.env.APP_PATH, '.git'),
+                        join(process.env.APP_PATH, 'docker'),
+                        join(process.env.APP_PATH, 'packages'),
+
+                        // Only needed for local testing
+                        join(process.env.APP_PATH, 'vendor', 'nativephp', 'electron', 'vendor'),
+                        join(process.env.APP_PATH, 'vendor', 'nativephp', 'laravel', 'vendor'),
+
+                        join(process.env.APP_PATH, 'vendor', 'nativephp', 'php-bin'),
+                        join(process.env.APP_PATH, 'vendor', 'nativephp', 'electron', 'bin'),
+                        join(process.env.APP_PATH, 'vendor', 'nativephp', 'electron', 'resources'),
+                        join(process.env.APP_PATH, 'node_modules'),
+                        join(process.env.APP_PATH, 'dist'),
+                        join(process.env.APP_PATH, 'build'),
+
+                        join(process.env.APP_PATH, 'storage', 'framework'),
+                        join(process.env.APP_PATH, 'storage', 'logs'),
+                    ];
+
+                    let shouldSkip = false;
+                    skip.forEach((path) => {
+                        if (src.indexOf(path) === 0) {
+                            shouldSkip = true;
+                        }
+                    });
+
+                    return !shouldSkip;
+                }
+            });
+
+            copySync(tmpDir, appPath);
+
+            console.log('Preparing directories for electron build');
+            // Electron build removes empty folders, so we have to create dummy files
+            // dotfiles unfortunately don't work.
+            const emptyPaths = [
+                join(appPath, 'storage', 'framework', 'cache', '_native.json'),
+                join(appPath, 'storage', 'framework', 'sessions', '_native.json'),
+                join(appPath, 'storage', 'framework', 'testing', '_native.json'),
+                join(appPath, 'storage', 'framework', 'views', '_native.json'),
+                join(appPath, 'storage', 'app', 'public', '_native.json'),
+                join(appPath, 'storage', 'logs', '_native.json'),
+            ];
+
+            emptyPaths.forEach((emptyPath) => {
+                // Create directory if it doesn't exist
+                let dir =  path.dirname(emptyPath);
+                if (!existsSync(dir)) {
+                    mkdirpSync(dir);
+                }
+
+                writeJsonSync(emptyPath, {});
+            });
+
+            removeSync(tmpDir);
+        }
 
         console.log();
         console.log('Copied app to resources');
         console.log(join(process.env.APP_PATH, 'dist'));
         console.log();
         console.log('===================================================================');
         console.log('                       Starting build...');
+        console.log('===================================================================');
         console.log();
     } catch (e) {
         console.error();

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

@@ -23,6 +23,7 @@ class NativePHP {
     constructor() {
         this.processes = [];
         this.schedulerInterval = undefined;
+        this.mainWindow = null;
     }
     bootstrap(app, icon, phpBinary, cert) {
         initialize();
@@ -66,6 +67,15 @@ 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();
+                }
+            });
+        }
     }
     bootstrapApp(app) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -124,6 +134,13 @@ class NativePHP {
             else {
                 app.setAsDefaultProtocolClient(deepLinkProtocol);
             }
+            if (process.platform === 'win32') {
+                const gotTheLock = app.requestSingleInstanceLock();
+                if (!gotTheLock) {
+                    app.quit();
+                    return;
+                }
+            }
         }
     }
     startAutoUpdater(config) {