wip

Author: simonhamp

config/nativephp-internal.php

@@ -32,6 +32,7 @@
 
     'zephpyr' => [
         'host' => env('ZEPHPYR_HOST', 'zephpyr.com'),
-        'key' => env('ZEPHPYR_SECRET'),
+        'token' => env('ZEPHPYR_TOKEN'),
+        'key' => env('ZEPHPYR_KEY'),
     ],
 ];

config/nativephp.php

@@ -6,7 +6,7 @@
      * It is used to determine if the app needs to be updated.
      * Increment this value every time you release a new version of your app.
      */
-    'version' => env('NATIVEPHP_APP_VERSION', '1.0.0'),
+    'version' => env('NATIVEPHP_APP_VERSION', 1),
 
     /**
      * The ID of your application. This should be a unique identifier
@@ -47,6 +47,7 @@
         'AWS_*',
         'GITHUB_*',
         'DO_SPACES_*',
+        'ZEPHPYR_*',
         '*_SECRET',
         'NATIVEPHP_UPDATER_PATH',
         'NATIVEPHP_APPLE_ID',

src/Commands/BundleCommand.php

@@ -3,32 +3,34 @@
 namespace Native\Laravel\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
 use Native\Electron\Traits\CleansEnvFile;
-use Native\Laravel\NativeServiceProvider;
 use Symfony\Component\Finder\Finder;
 use ZipArchive;
 
 class BundleCommand extends Command
 {
     use CleansEnvFile;
 
-    protected $name = 'native:bundle';
+    protected $signature = 'native:bundle {--fetch}';
 
     protected $description = 'Bundle your application for distribution.';
 
     private ?string $key;
+
     private string $zipPath;
+
     private string $zipName;
 
     public function handle()
     {
         $this->key = config('nativephp-internal.zephpyr.key');
 
-        if (!$this->key) {
+        if (! $this->key) {
             $this->line('');
-            $this->warn('No ZEPHPYR_SECRET found. Cannot bundle!');
+            $this->warn('No ZEPHPYR_KEY found. Cannot bundle!');
             $this->line('');
-            $this->line('Add this app\'s ZEPHPYR_SECRET to its .env file:');
+            $this->line('Add this app\'s ZEPHPYR_KEY to its .env file:');
             $this->line(base_path('.env'));
             $this->line('');
             $this->info('Not set up with Zephpyr yet? Secure your NativePHP app builds and more!');
@@ -38,24 +40,43 @@ public function handle()
             return static::FAILURE;
         }
 
+        if ($this->option('fetch')) {
+            if (! $this->fetchLatestBundle()) {
+                $this->warn("Latest bundle not yet available. Try again soon.");
+                return static::FAILURE;
+            }
+
+            $this->info("Latest bundle downloaded.");
+            return static::SUCCESS;
+        }
+
         // Package the app up into a zip
         if (! $this->zipApplication()) {
             $this->error("Failed to create zip archive at {$this->zipPath}.");
+
             return static::FAILURE;
         }
 
         // Send the zip file
-        if (! $this->sendToZephpyr()) {
+        dd($result = $this->sendToZephpyr());
+
+        if ($result->failed()) {
             $this->error("Failed to upload zip [{$this->zipPath}] to Zephpyr.");
+
             return static::FAILURE;
         }
 
+        @unlink($this->zipPath);
+
+        $this->info('Successfully uploaded to Zephpyr.');
+        $this->line('Use native:bundle --fetch to retrieve the latest bundle.');
+
         return static::SUCCESS;
     }
 
     private function zipApplication(): bool
     {
-        $this->zipName = 'app_' . str()->random(8) . '.zip';
+        $this->zipName = 'app_'.str()->random(8).'.zip';
         $this->zipPath = storage_path($this->zipName);
 
         $zip = new ZipArchive;
@@ -77,54 +98,68 @@ private function zipApplication(): bool
 
     private function addFilesToZip(ZipArchive $zip): void
     {
-        $app = (new Finder())->files()
+        // TODO: Check the composer.json to make sure there are no symlinked or private packages as these will be a
+        // pain later
+
+        $app = (new Finder)->files()
             ->followLinks()
             ->ignoreVCSIgnored(true)
             ->in(base_path())
             ->exclude([
+                'vendor',
+                'dist',
+                'build',
                 'tests',
                 ...config('nativephp.cleanup_exclude_files', []),
             ]);
 
         $this->finderToZip($app, $zip);
 
-        $vendor = (new Finder())->files()
+        $vendor = (new Finder)->files()
             ->exclude([
-                'vendor/nativephp/php-bin',
+                'nativephp/php-bin',
+                'nativephp/electron/resources/js',
+                'nativephp/*/vendor',
             ])
             ->in(base_path('vendor'));
 
-        $this->finderToZip($vendor, $zip);
+        $this->finderToZip($vendor, $zip, 'vendor');
 
-        $nodeModules = (new Finder())->files()
+        $nodeModules = (new Finder)->files()
             ->in(base_path('node_modules'));
 
-        $this->finderToZip($nodeModules, $zip);
-
-        $env = (new Finder())->files()
-            ->ignoreDotFiles(false)
-            ->name('.env')
-            ->in(base_path());
-
-        $this->finderToZip($env, $zip);
+        $this->finderToZip($nodeModules, $zip, 'node_modules');
     }
 
-    private function finderToZip(Finder $finder, ZipArchive $zip): void
+    private function finderToZip(Finder $finder, ZipArchive $zip, ?string $path = null): void
     {
         foreach ($finder as $file) {
-            dump([$file->getRealPath(), $file->getRelativePath()]);
-            $zip->addFile($file->getRealPath(), $file->getRelativePathname());
+            if ($file->getRealPath() === false) {
+                continue;
+            }
+
+            $zip->addFile($file->getRealPath(), str($path)->finish(DIRECTORY_SEPARATOR) . $file->getRelativePathname());
         }
     }
 
-    private function sendToZephpyr(): bool
+    private function sendToZephpyr()
     {
-        return false;
-        $response = Http::attach('archive', fopen($this->zipPath, 'r'), $this->zipName)
-            ->post(config('nativephp-internal.zephpyr.host'), [
-                'key' => $this->key,
-            ]);
+        return Http::withToken(config('nativephp-internal.zephpyr.token'))
+            ->attach('archive', fopen($this->zipPath, 'r'), $this->zipName)
+            ->post(str(config('nativephp-internal.zephpyr.host'))->finish('/') . 'api/build/' . $this->key);
+    }
+
+    private function fetchLatestBundle(): bool
+    {
+        $response = Http::withToken(config('nativephp-internal.zephpyr.token'))
+            ->get(str(config('nativephp-internal.zephpyr.host'))->finish('/') . 'api/download/' . $this->key);
 
-        return $response->successful();
+        if ($response->failed()) {
+            return false;
+        }
+
+        file_put_contents(base_path('build/__nativephp_app_bundle'), $response->body());
+
+        return true;
     }
 }