Fixed fetch-share-url command and replaced dependancy...

- Replaced the outdated `nategood/httpful` with `guzzlehttp/guzzle` package for REST API requests.
- Added a `--debug` option to the `share` command to prevent opening of a new CMD window,
and allow error messages to be displayed from Ngrok. This is because Ngrok may fail silentyly by opening a new CMD window and quickly closes it if it encounters an error, so no errors are outputted.
- Fixed `fetch-share-url` command:
	- Option `domain` to `site` to properly reference the project, and not get confused with the ngrok domain.
	- Output messages.
	- Use Guzzle to perform a API get request to get the current ngrok tunnel public URL,
	and copy it to the clipboard.
	- Changed findHttpTunnelUrl function to use the array bracket notation on the array,
	as it's not an object anymore.

Author: yCodeTech

cli/Valet/Ngrok.php

@@ -3,7 +3,7 @@
 namespace Valet;
 
 use DomainException;
-use Httpful\Request;
+use GuzzleHttp\Client;
 use Illuminate\Support\Collection;
 
 class Ngrok
@@ -49,7 +49,7 @@ public function run(string $command)
 	 * @param  array  $options
 	 * @return void
 	 */
-	public function start(string $site, int $port, array $options = [])
+	public function start(string $site, int $port, $debug = false, array $options = [])
 	{
 		if ($port === 443 && !$this->hasAuthToken()) {
 			output('Forwarding to local port 443 or a local https:// URL is only available after you sign up.
@@ -67,7 +67,9 @@ public function start(string $site, int $port, array $options = [])
 		$newCMDtitle = "\"Sharing $site\"";
 		$ngrokCommand = "\"$ngrok\" http $site:$port " . $this->getNgrokConfig() . " $options";
 
-		$this->cli->passthru("start $newCMDtitle $ngrokCommand");
+		$newCMD = ($debug) ? "" : "start $newCMDtitle";
+
+		$this->cli->passthru("$newCMD $ngrokCommand");
 	}
 
 	/**
@@ -83,26 +85,30 @@ public function getNgrokConfig()
 
 	/**
 	 * Get the current tunnel URL from the Ngrok API.
+	 * @param string $site The site
 	 *
-	 * @return string
+	 * @return string $url The current tunnel URL
 	 */
-	public function currentTunnelUrl(string $domain = null)
+	public function currentTunnelUrl(string $site)
 	{
-		// wait a second for ngrok to start before attempting to find available tunnels
-		// sleep(1);
+		// Set a new GuzzleHttp client.
+		$client = new Client();
 
-		foreach ($this->tunnelsEndpoints as $endpoint) {
-			$response = retry(20, function () use ($endpoint, $domain) {
-				$body = Request::get($endpoint)->send()->body;
+		// Create a GuzzleHttp get request to the ngrok tunnels API.
+		$response = $client->get('http://127.0.0.1:4040/api/tunnels');
 
-				if (isset($body->tunnels) && count($body->tunnels) > 0) {
-					return $this->findHttpTunnelUrl($body->tunnels, $domain);
-				}
-			}, 250);
+		// Get the contents of the API response.
+		$response = $response->getBody()->getContents();
+		// Decode the json response into a properly formed PHP array.
+		$tunnels = json_decode($response, true);
 
-			if (!empty($response)) {
-				return $response;
-			}
+		// Find and get the public URL of the site.
+		$url = $this->findHttpTunnelUrl($tunnels["tunnels"], $site);
+
+		if (!empty($url)) {
+			// Use | clip to copy the URL to the clipboard.
+			$this->cli->passthru("echo $url | clip");
+			return $url;
 		}
 
 		throw new DomainException('Tunnel not established.');
@@ -121,8 +127,8 @@ public function findHttpTunnelUrl(array $tunnels, string $domain = null)
 		// find the one responding on HTTP. Each tunnel has an HTTP and a HTTPS address
 		// but for local dev purposes we just desire the plain HTTP URL endpoint.
 		foreach ($tunnels as $tunnel) {
-			if ($tunnel->proto === 'http' && strpos($tunnel->config->addr, $domain)) {
-				return $tunnel->public_url;
+			if (($tunnel["proto"] === 'http' || $tunnel["proto"] === 'https') && strpos($tunnel["config"]["addr"], $domain)) {
+				return $tunnel["public_url"];
 			}
 		}
 	}

cli/valet.php

@@ -478,12 +478,12 @@
 	 */
 	// TODO: custom domain and ngrok params
 	$app->command(
-		'share [site] [--domain=] [--host-header=] [--region=]',
-		function ($site = null, $domain = null, $hostheader = null, $region = null) {
+		'share [site] [--domain=] [--host-header=] [--region=] [--debug]',
+		function ($site = null, $domain = null, $hostheader = null, $region = null, $debug) {
 
 			$url = ($site ?: strtolower(Site::host(getcwd()))) . '.' . Configuration::read()['tld'];
 
-			Ngrok::start($url, Site::port($url), array_filter([
+			Ngrok::start($url, Site::port($url), $debug, array_filter([
 				'domain' => $domain,
 				'host-header' => $hostheader,
 				'region' => $region,
@@ -496,8 +496,13 @@ function ($site = null, $domain = null, $hostheader = null, $region = null) {
 	/**
 	 * Echo the currently tunneled URL.
 	 */
-	$app->command('fetch-share-url [domain]', function ($domain = null) {
-		output(Ngrok::currentTunnelUrl($domain ?: Site::host(getcwd()) . '.' . Configuration::read()['tld']));
+	$app->command('fetch-share-url [site]', function ($site = null) {
+		$site = $site ?: Site::host(getcwd()) . '.' . Configuration::read()['tld'];
+
+		$url = Ngrok::currentTunnelUrl($site);
+		info("The public URL for $site is: <fg=blue>$url</>");
+		info("It has been copied to your clipboard.");
+
 	})->descriptions('Get the URL to the current Ngrok tunnel');
 
 	/**

composer.json

@@ -45,7 +45,7 @@
 		"illuminate/container": "^8.0|^9.0",
 		"mnapoli/silly": "^1.7",
 		"symfony/process": "^4.0|^5.0|^6.0",
-		"nategood/httpful": "^0.3",
+		"guzzlehttp/guzzle": "^7.7",
 		"phpseclib/phpseclib": "^3.0",
 		"illuminate/collections": "^8.0|^9.0"
 	},