Small improvements (#35)

* Output baseUrl of etherpad instance

* Add parameter to change timeout setting

* Set default scheme to 'http'

* Output database error in metrics

* Update version

* Do not cancel github action tests

* Fix tests

* Add test for 2.1.0

Author: Gared

.github/workflows/e2e-test.yml

@@ -48,6 +48,7 @@ jobs:
           { tag: "2.0.2", expected: "2.0.2" },
           { tag: "2.0.0", expected: "2.0.0" },
         ]
+      fail-fast: false
 
     steps:
       - name: Checkout repository
@@ -93,6 +94,7 @@ jobs:
           { tag: "1.9.7", expected: "1.9.7" },
           { tag: "1.8.18", expected: "1.8.18" },
         ]
+      fail-fast: false
 
     steps:
       - name: Checkout repository
@@ -251,13 +253,15 @@ jobs:
       matrix:
         versions: [
           {tag: "develop", expected: "2.1.0"},
+          {tag: "2.1.0", expected: "2.1.0"},
           {tag: "2.0.3", expected: "2.0.3"},
           {tag: "1.9.7", expected: "1.9.7"},
           {tag: "1.9.0", expected: "1.9.0"},
           {tag: "1.8.18", expected: "1.8.18"},
           {tag: "1.8.0", expected: "1.8.0"},
           {tag: "1.7.5", expected: "1.7.5"}
         ]
+      fail-fast: false
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

src/Console/ScanCommandOutputHelper.php

@@ -24,9 +24,9 @@ public function __construct(
     ) {
     }
 
-    public function onScanApiStart(): void
+    public function onScanApiStart(string $baseUrl): void
     {
-        $this->symfonyStyle->title('Starting scan of api...');
+        $this->symfonyStyle->title('Starting scan of api: ' . $baseUrl);
     }
 
     public function onScanApiResponse(ResponseInterface $response): void
@@ -84,6 +84,12 @@ public function onStatsResult(array $data): void
             $startTime = new DateTimeImmutable('@' . ($data['httpStartTime'] / 1000));
             $this->symfonyStyle->info('Server running since: ' . $startTime->format(DateTimeInterface::RFC3339));
         }
+        if (isset($data['ueberdb_writesFailed']) && $data['ueberdb_writesFailed'] > 0) {
+            $this->symfonyStyle->error('Database writes failed: ' . $data['ueberdb_writesFailed']);
+        }
+        if (isset($data['ueberdb_readsFailed']) && $data['ueberdb_readsFailed'] > 0) {
+            $this->symfonyStyle->error('Database reads failed: ' . $data['ueberdb_readsFailed']);
+        }
         $this->output->writeln('Stats: ' . print_r($data, true), OutputInterface::VERBOSITY_DEBUG);
     }
 

src/Service/ScannerService.php

@@ -38,7 +38,8 @@ class ScannerService
     private string $padId;
 
     public function __construct(
-        string $url
+        string $url,
+        float $timeout = 2.0,
     ) {
         $stack = new HandlerStack(Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
@@ -47,10 +48,10 @@ public function __construct(
         $this->baseUrl = $url;
 
         $this->client = new Client([
-            'timeout' => 2.0,
+            'timeout' => $timeout,
             'connect_timeout' => 2.0,
             RequestOptions::HEADERS => [
-                'User-Agent' => 'EtherpadScanner/3.1.1',
+                'User-Agent' => 'EtherpadScanner/3.2.0',
             ],
             'handler' => $stack,
             'verify' => false,
@@ -86,6 +87,10 @@ private function scanBaseUrl(ScannerServiceCallbackInterface $callback): void
             ->withFragment('')
             ->withQuery('');
 
+        if ($uri->getScheme() === '') {
+            $uri = $uri->withScheme('http');
+        }
+
         while (true) {
             $uriWithPad = $uri->withPath($uri->getPath() . '/p/' . $this->padId);
             $result = $this->scanForPath($uriWithPad);
@@ -140,7 +145,7 @@ private function scanForPath(UriInterface $uri): bool
 
     private function scanApi(ScannerServiceCallbackInterface $callback): void
     {
-        $callback->onScanApiStart();
+        $callback->onScanApiStart($this->baseUrl);
         try {
             $response = $this->client->get($this->baseUrl . 'api');
             $callback->onScanApiResponse($response);

src/Service/ScannerServiceCallbackInterface.php

@@ -12,7 +12,7 @@
 
 interface ScannerServiceCallbackInterface
 {
-    public function onScanApiStart(): void;
+    public function onScanApiStart(string $baseUrl): void;
 
     public function onScanApiResponse(ResponseInterface $response): void;
 

tests/e2e/fixture/latest.txt

@@ -1,5 +1,5 @@
 
-Starting scan of api...
+Starting scan of api: http://localhost:9001/
 =======================
 
  [INFO] No revision in server header

tests/e2e/fixture/master_with_plugins.txt

@@ -1,5 +1,5 @@
 
-Starting scan of api...
+Starting scan of api: http://localhost:9001/
 =======================
 
  [INFO] No revision in server header