configurable surge URL

[alttp.git] / app / Jobs / GenerateAosSeed.php

diff --git a/app/Jobs/GenerateAosSeed.php b/app/Jobs/GenerateAosSeed.php
index 7169c3610f90f4714796329d809fb25bf65e05e1..a95c372bd1f79ad2736f46a5b53ed4ef4c8e45d4 100644 (file)
--- a/app/Jobs/GenerateAosSeed.php
+++ b/app/Jobs/GenerateAosSeed.php
@@ -34,37 +34,52 @@ class GenerateAosSeed implements ShouldQueue
         */
        public function handle()
        {
+               $stage = 'initial';
                try {
                        $temp_dir = sys_get_temp_dir();
 
                        $seed = $this->seed;
                        $params = array_merge(['seed' => $seed->seed], $seed->settings);
-                       $url = 'https://aosrando.surge.sh/?'.http_build_query($params, '', '&');
+                       $url = config('aos.surge_url').'/?'.http_build_query($params, '', '&');
 
                        $fac = new BrowserFactory('chromium');
                        $browser = $fac->createBrowser();
 
+                       $stage = 'loading page';
                        $page = $browser->createPage();
                        $page->setDownloadPath($temp_dir);
                        $page->navigate($url)->waitForNavigation();
 
+                       $stage = 'selecting rom';
                        $fileInput = $page->dom()->querySelector('input[type=file]');
                        $fileInput->sendFile(config('aos.base_rom'));
                        $page->waitUntilContainsElement('select');
 
+                       $stage = 'clicking randomize';
                        $page->mouse()->find('button', 2)->click();
                        $page->waitUntilContainsElement('a[download]');
 
+                       $stage = 'clicking download';
                        $page->dom()->querySelector('a[download]')->setAttributeValue('download', $seed->hash.'.gba');
                        $page->mouse()->find('a[download]')->click();
 
-                       sleep(2);
-
+                       $stage = 'waiting for rom';
+                       $romFile = $temp_dir.'/'.$seed->hash.'.gba';
+                       for ($i = 0; $i < 20; ++$i) {
+                               clearstatcache();
+                               if (is_file($romFile) && filesize($romFile) >= 8388608) {
+                                       break;
+                               }
+                               usleep(100_000);
+                       }
+
+                       $stage = 'calculating patch';
                        $encoder = new Encoder(file_get_contents(config('aos.base_rom')));
-                       $patch = $encoder->createPatch(file_get_contents($temp_dir.'/'.$seed->hash.'.gba'));
+                       $patch = $encoder->createPatch(file_get_contents($romFile));
                        Storage::disk('aos-seeds')->put($seed->hash.'.bps', $patch);
-                       unlink($temp_dir.'/'.$seed->hash.'.gba');
+                       unlink($romFile);
 
+                       $stage = 'done';
                        $seed->status = 'generated';
                        $seed->save();
 
@@ -72,6 +87,7 @@ class GenerateAosSeed implements ShouldQueue
                } catch (\Throwable $e) {
                        $seed->status = 'error';
                        $seed->error_detail = [
+                               'stage' => $stage,
                                'type' => get_class($e),
                                'message' => $e->getMessage(),
                        ];