A bit of refactoring

Author: skauk

cli/Valet/Cloudflared.php

@@ -17,15 +17,20 @@ public function currentTunnelUrl(?string $domain = null)
         $urls = [];
         $processes = array_filter(explode("\n", $this->cli->run('pgrep -fl cloudflared')));
 
+        // Every cloudflare process will start a metrics web server
+        // where Quick Tunnel URL is mentioned under /metrics endpoint
         foreach ($processes as $process) {
-            preg_match('/(?<pid>\d+)\s.+(?<=--http-host-header\s)(?<domain>[^\s]+).*/', $process, $matches);
-            if (count($matches) > 2) {
+            preg_match('/(?<pid>\d+)\s.+--http-host-header\s(?<domain>[^\s]+).*/', $process, $matches);
+            if (array_key_exists('domain', $matches) && array_key_exists('pid', $matches)) {
                 $local_domain = $matches['domain'];
-                $lsof = $this->cli->run('lsof -iTCP -P -a -p '.$matches['pid']);
+                $lsof = $this->cli->run("lsof -iTCP -P -a -p {$matches['pid']}");
                 preg_match('/TCP\s(?<server>[^\s]+:\d+)\s\(LISTEN\)/', $lsof, $matches);
                 if (array_key_exists('server', $matches)) {
-                    $body = (new Client())->get("http://{$matches['server']}/metrics")->getBody();
-                    preg_match('/userHostname="(?<url>.+)"/', $body->getContents(), $matches);
+                    try {
+                        $body = (new Client())->get("http://{$matches['server']}/metrics")->getBody();
+                        preg_match('/userHostname="(?<url>.+)"/', $body->getContents(), $matches);
+                    } catch (\Exception $e) {}
+
                     $urls[$local_domain] = array_key_exists('url', $matches) ? $matches['url'] : false;
                 }
             }

cli/app.php

@@ -403,26 +403,25 @@ function (ConsoleCommandEvent $event) {
     /**
      * Echo or set the name of the currently-selected share tool (either "ngrok" or "expose").
      */
-    $share_tools_list = preg_replace('/,\s([^,]+)$/', ' or $1',
-        join(', ', array_map(fn($t) => "`$t`", $share_tools)));
-
     $app->command('share-tool [tool]', function (InputInterface $input, OutputInterface $output, $tool = null)
-    use ($share_tools, $share_tools_list) {
+    use ($share_tools) {
         if ($tool === null) {
             return output(Configuration::read()['share-tool'] ?? '(not set)');
         }
 
-        if (! in_array($tool, $share_tools) || ! class_exists(ucfirst($tool))) {
-            warning($tool.' is not a valid share tool. Please use '.$share_tools_list .'.');
+        $share_tools_list = preg_replace('/,\s([^,]+)$/', ' or $1',
+            join(', ', array_map(fn($t) => "`$t`", $share_tools)));
+
+        if (! in_array($tool, $share_tools) || ! class_exists($tool)) {
+            warning("$tool is not a valid share tool. Please use $share_tools_list.");
 
             return Command::FAILURE;
         }
 
         Configuration::updateKey('share-tool', $tool);
-        info('Share tool set to '.$tool.'.');
-        $share_tool = ucfirst($tool);
+        info("Share tool set to $tool.");
 
-        if (! $share_tool::installed()) {
+        if (! $tool::installed()) {
             $helper = $this->getHelperSet()->get('question');
             $question = new ConfirmationQuestion(
                 'Would you like to install '.ucfirst($tool).' now? [y/N] ',
@@ -434,9 +433,11 @@ function (ConsoleCommandEvent $event) {
                 return;
             }
 
-            $share_tool::ensureInstalled();
+            $tool::ensureInstalled();
         }
-    })->descriptions('Get the name of the current share tool ('.$share_tools_list.').');
+
+        return Command::SUCCESS;
+    })->descriptions('Get the name of the current share tool.');
 
     /**
      * Set the ngrok auth token.

valet

@@ -124,8 +124,9 @@ then
         else
             SCHEME="http"
         fi
-        echo "Scheme: $SCHEME"
-        sudo -u "$USER" cloudflared tunnel --no-tls-verify --url "$SCHEME://localhost" --http-host-header "$HOST.$TLD" $PARAMS
+
+        sudo -u "$USER" cloudflared tunnel --no-tls-verify --url "$SCHEME://localhost" \
+            --http-host-header "$HOST.$TLD" $PARAMS
 
         exit