Merge pull request NativePHP#507 from NativePHP/feat/bundle-builds

Feat: bundle builds

Author: simonhamp

config/nativephp-internal.php

@@ -30,6 +30,15 @@
      */
     'api_url' => env('NATIVEPHP_API_URL', 'http://localhost:4000/api/'),
 
+    /**
+     * Configuration for the Zephpyr API.
+     */
+    'zephpyr' => [
+        'host' => env('ZEPHPYR_HOST', 'https://zephpyr.com'),
+        'token' => env('ZEPHPYR_TOKEN'),
+        'key' => env('ZEPHPYR_KEY'),
+    ],
+
     /**
      * The credentials to use Apples Notarization service.
      */

config/nativephp.php

@@ -48,6 +48,7 @@
         'GITHUB_*',
         'DO_SPACES_*',
         '*_SECRET',
+        'ZEPHPYR_*',
         'NATIVEPHP_UPDATER_PATH',
         'NATIVEPHP_APPLE_ID',
         'NATIVEPHP_APPLE_ID_PASS',
@@ -60,6 +61,8 @@
      * You may use glob / wildcard patterns here.
      */
     'cleanup_exclude_files' => [
+        'build',
+        'temp',
         'content',
         'node_modules',
         '*/tests',
@@ -136,4 +139,9 @@
     'postbuild' => [
         // 'rm -rf public/build',
     ],
+
+    /**
+     * Custom PHP binary path.
+     */
+    'binary_path' => env('NATIVEPHP_PHP_BINARY_PATH', null),
 ];

src/App.php

@@ -3,6 +3,7 @@
 namespace Native\Laravel;
 
 use Native\Laravel\Client\Client;
+use Phar;
 
 class App
 {
@@ -63,6 +64,12 @@ public function clearRecentDocuments(): void
         $this->client->delete('app/recent-documents');
     }
 
+    public function isRunningBundled(): bool
+    {
+        return Phar::running() !== '';
+
+    }
+
     public function openAtLogin(?bool $open = null): bool
     {
         if ($open === null) {

src/ChildProcess.php

@@ -80,7 +80,7 @@ public function start(
      * @param  string|string[]  $cmd
      * @return $this
      */
-    public function php(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false): self
+    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];
 
@@ -90,6 +90,7 @@ public function php(string|array $cmd, string $alias, ?array $env = null, ?bool
             'cwd' => base_path(),
             'env' => $env,
             'persistent' => $persistent,
+            'iniSettings' => $iniSettings,
         ])->json();
 
         return $this->fromRuntimeProcess($process);
@@ -99,13 +100,13 @@ public function php(string|array $cmd, string $alias, ?array $env = null, ?bool
      * @param  string|string[]  $cmd
      * @return $this
      */
-    public function artisan(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false): self
+    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 = ['artisan', ...$cmd];
 
-        return $this->php($cmd, $alias, env: $env, persistent: $persistent);
+        return $this->php($cmd, $alias, env: $env, persistent: $persistent, iniSettings: $iniSettings);
     }
 
     public function stop(?string $alias = null): void

src/Contracts/ChildProcess.php

@@ -16,9 +16,9 @@ public function start(
         bool $persistent = false
     ): self;
 
-    public function php(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false): self;
+    public function php(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false, ?array $iniSettings = null): self;
 
-    public function artisan(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false): self;
+    public function artisan(string|array $cmd, string $alias, ?array $env = null, ?bool $persistent = false, ?array $iniSettings = null): self;
 
     public function stop(?string $alias = null): void;
 

src/Events/ChildProcess/StartupError.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Native\Laravel\Events\ChildProcess;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class StartupError implements ShouldBroadcastNow
+{
+    use Dispatchable, SerializesModels;
+
+    public function __construct(public string $alias, public string $error) {}
+
+    public function broadcastOn()
+    {
+        return [
+            new Channel('nativephp'),
+        ];
+    }
+}

src/Facades/App.php

@@ -14,6 +14,7 @@
  * @method static void addRecentDocument(string $path)
  * @method static array recentDocuments()
  * @method static void clearRecentDocuments()
+ * @method static bool isRunningBundled()
  * @method static bool openAtLogin(?bool $open = null)
  */
 class App extends Facade

src/Fakes/ChildProcessFake.php

@@ -77,13 +77,15 @@ public function php(
         array|string $cmd,
         string $alias,
         ?array $env = null,
-        ?bool $persistent = false
+        ?bool $persistent = false,
+        ?array $iniSettings = null
     ): self {
         $this->phps[] = [
             'cmd' => $cmd,
             'alias' => $alias,
             'env' => $env,
             'persistent' => $persistent,
+            'iniSettings' => $iniSettings,
         ];
 
         return $this;
@@ -93,13 +95,15 @@ public function artisan(
         array|string $cmd,
         string $alias,
         ?array $env = null,
-        ?bool $persistent = false
+        ?bool $persistent = false,
+        ?array $iniSettings = null
     ): self {
         $this->artisans[] = [
             'cmd' => $cmd,
             'alias' => $alias,
             'env' => $env,
             'persistent' => $persistent,
+            'iniSettings' => $iniSettings,
         ];
 
         return $this;

src/NativeServiceProvider.php

@@ -150,6 +150,7 @@ public function rewriteDatabase()
     {
         $databasePath = config('nativephp-internal.database_path');
 
+        // Automatically create the database in development mode
         if (config('app.debug')) {
             $databasePath = database_path('nativephp.sqlite');
 

src/QueueWorker.php

@@ -24,24 +24,24 @@ public function up(string|QueueConfig $config): void
             throw new \InvalidArgumentException("Invalid queue configuration alias [$config]");
         }
 
-        $this->childProcess->php(
+        $this->childProcess->artisan(
             [
-                '-d',
-                "memory_limit={$config->memoryLimit}M",
-                'artisan',
                 'queue:work',
                 "--name={$config->alias}",
                 '--queue='.implode(',', $config->queuesToConsume),
                 "--memory={$config->memoryLimit}",
                 "--timeout={$config->timeout}",
             ],
-            $config->alias,
+            'queue_'.$config->alias,
             persistent: true,
+            iniSettings: [
+                'memory_limit' => "{$config->memoryLimit}M",
+            ]
         );
     }
 
     public function down(string $alias): void
     {
-        $this->childProcess->stop($alias);
+        $this->childProcess->stop('queue_'.$alias);
     }
 }