phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-07 09:10:03 +01:00
Code Activity

Fix auto-detection amongst multiple ngrok processes

Browse Source 
Ngrok Pro plans allow multiple processes, which means you could be serving several sites simultaneously. This PR allows Valet to correctly identify amongst the active ngrok process URLs.

Fixes #145
This commit is contained in:
Chris Brown
2019-12-03 18:34:08 -05:00
parent 3d877ef803
commit 710fa27651
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/Valet/Ngrok.php
View File

@@ -14,16 +14,16 @@ class Ngrok
* *
* @return string * @return string
*/ */
function currentTunnelUrl() function currentTunnelUrl($domain = null)
{ {
return retry(20, function () { return retry(20, function () use ($domain) {
$body = Request::get($this->tunnelsEndpoint)->send()->body; $body = Request::get($this->tunnelsEndpoint)->send()->body;
// If there are active tunnels on the Ngrok instance we will spin through them and // If there are active tunnels on the Ngrok instance we will spin through them and
// find the one responding on HTTP. Each tunnel has an HTTP and a HTTPS address // find the one responding on HTTP. Each tunnel has an HTTP and a HTTPS address
// but for local testing purposes we just desire the plain HTTP URL endpoint. // but for local testing purposes we just desire the plain HTTP URL endpoint.
if (isset($body->tunnels) && count($body->tunnels) > 0) { if (isset($body->tunnels) && count($body->tunnels) > 0) {
return $this->findHttpTunnelUrl($body->tunnels); return $this->findHttpTunnelUrl($body->tunnels, $domain);
} else { } else {
throw new DomainException("Tunnel not established."); throw new DomainException("Tunnel not established.");
} }
@@ -36,10 +36,10 @@ function currentTunnelUrl()
* @param array $tunnels * @param array $tunnels
* @return string|null * @return string|null
*/ */
function findHttpTunnelUrl($tunnels) function findHttpTunnelUrl($tunnels, $domain)
{ {
foreach ($tunnels as $tunnel) { foreach ($tunnels as $tunnel) {
if ($tunnel->proto === 'http') { if ($tunnel->proto === 'http' && strpos($tunnel->config->addr, $domain) ) {
return $tunnel->public_url; return $tunnel->public_url;
} }
} }

4
cli/valet.php
View File

@@ -226,8 +226,8 @@
/** /**
* Echo the currently tunneled URL. * Echo the currently tunneled URL.
*/ */
$app->command('fetch-share-url', function () { $app->command('fetch-share-url [domain]', function ($domain = null) {
output(Ngrok::currentTunnelUrl()); output(Ngrok::currentTunnelUrl($domain ?: Site::host(getcwd()).'.'.Configuration::read()['tld']));
})->descriptions('Get the URL to the current Ngrok tunnel'); })->descriptions('Get the URL to the current Ngrok tunnel');
/** /**