change the default headless option keepAlive value to false to pr…

…event chrome processes from failing to exit properly when script terminates or phpcreeper process exit
blogdaren · Oct 28, 2024 · 7d0b889 · 7d0b889
1 parent f06531c
commit 7d0b889
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/Downloader.php b/src/Downloader.php
@@ -805,13 +805,14 @@ public function download($task)
                 }
             }
         }catch(\Throwable $e){
+            $error_code = $e->getCode() < 0 ? $e->getCode() : '-205';
             $extra = array(
                 'url'            => $task['url'],
-                'exception_code' => $e->getCode(),
+                'exception_code' => $error_code,
                 'exception_msg'  => $e->getMessage(),
             );
 
-            return Tool::throwback('-205', $this->langConfig['http_transfer_exception'], $extra);
+            return Tool::throwback($error_code, $this->langConfig['http_transfer_exception'], $extra);
         }
     }
 
@@ -871,13 +872,14 @@ public function useHeadlessBrowser($args = [])
             $extra = ['content' => $content];
             return Tool::throwback('0', $this->langConfig['downloader_download_task_yes'], $extra);
         }catch(\Throwable $e){
+            $error_code = $e->getCode() < 0 ? $e->getCode() : '-205';
             $extra = array(
                 'url'            => $args['url'],
-                'exception_code' => $e->getCode(),
+                'exception_code' => $error_code,
                 'exception_msg'  => $e->getMessage(),
             );
 
-            return Tool::throwback('-205', $this->langConfig['http_transfer_exception'], $extra);
+            return Tool::throwback($error_code, $this->langConfig['http_transfer_exception'], $extra);
         }
     }
 
@@ -975,6 +977,12 @@ public function rebuildTaskArguments($args = [])
             });
         }
 
+        //force to keep option `headless_browser.headless`   
+        if(empty($args['context']['headless_browser']['headless']))
+        {
+            $args['headless_browser']['headless'] = false;
+        }
+
         //unset ditry data
         $unset_array = ['id', 'rule_name', 'rule', 'depth', 'create_time', 'referer', 'context'];
         array_walk($unset_array, function($v, $k)use(&$args){

diff --git a/src/Kernel/Middleware/HeadlessBrowser/Chrome.php b/src/Kernel/Middleware/HeadlessBrowser/Chrome.php
@@ -196,7 +196,7 @@ static public function getDefaultArguments()
         return [
             'headless'  => true,
             'noSandbox' => true,
-            'keepAlive' => true,
+            'keepAlive' => false,
             'ignoreCertificateErrors' => true,
             'sendSyncDefaultTimeout'  => 10000,
         ];
@@ -262,7 +262,6 @@ public function request($method, $url, $args = [])
             ]));
         }
 
-        //issue http request
         $page = self::getPage();
 
         try{
@@ -271,7 +270,9 @@ public function request($method, $url, $args = [])
             $page->close();
         }catch(\Throwable $e){
             $page->close();
-            throw new \Exception($e->getMessage());
+            //since the headless lib don't define an exception code, 
+            //so we have to define a uniform exception code here.... 
+            throw new \Exception($e->getMessage(), -400);
         }
 
         return $html;

diff --git a/src/Kernel/PHPCreeper.php b/src/Kernel/PHPCreeper.php
@@ -40,7 +40,7 @@ class PHPCreeper extends Worker
      *
      * @var string
      */
-    public const CURRENT_VERSION = '1.9.7';
+    public const CURRENT_VERSION = '1.9.8';
 
     /**
      * engine name