Merge branch 'master' into share-files

app/Client/Client.php

@@ -45,13 +45,13 @@ class Client
         $sharedUrl = $this->prepareSharedUrl($sharedUrl);
 
         foreach ($subdomains as $subdomain) {
-            $this->connectToServer($sharedUrl, $subdomain, config('expose.auth_token'));
+            $this->connectToServer($sharedUrl, $subdomain, $this->configuration->auth());
         }
     }
 
     public function sharePort(int $port)
     {
-        $this->connectToServerAndShareTcp($port, config('expose.auth_token'));
+        $this->connectToServerAndShareTcp($port, $this->configuration->auth());
     }
 
     protected function prepareSharedUrl(string $sharedUrl): string

app/Client/Http/HttpClient.php

@@ -74,7 +74,6 @@ class HttpClient
     protected function createConnector(): Connector
     {
         return new Connector($this->loop, [
-            'dns' => '127.0.0.1',
             'tls' => [
                 'verify_peer' => false,
                 'verify_peer_name' => false,

app/Commands/ShareCommand.php

@@ -10,7 +10,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
 class ShareCommand extends Command
 {
-    protected $signature = 'share {host} {--subdomain=} {--auth=}';
+    protected $signature = 'share {host} {--subdomain=} {--auth=} {--server-host=} {--server-port=}';
 
     protected $description = 'Share a local url with a remote expose server';
 
@@ -27,11 +27,15 @@ class ShareCommand extends Command
     {
         $this->configureConnectionLogger();
 
+        $serverHost = $this->option('server-host') ?? config('expose.host', 'localhost');
+        $serverPort = $this->option('server-port') ?? config('expose.port', 8080);
+        $auth = $this->option('auth') ?? config('expose.auth_token', '');
+
         (new Factory())
             ->setLoop(app(LoopInterface::class))
-            ->setHost(config('expose.host', 'localhost'))
-            ->setPort(config('expose.port', 8080))
-            ->setAuth($this->option('auth'))
+            ->setHost($serverHost)
+            ->setPort($serverPort)
+            ->setAuth($auth)
             ->createClient()
             ->share($this->argument('host'), explode(',', $this->option('subdomain')))
             ->createHttpServer()

app/Commands/ShareCurrentWorkingDirectoryCommand.php

@@ -4,7 +4,7 @@ namespace App\Commands;
 
 class ShareCurrentWorkingDirectoryCommand extends ShareCommand
 {
-    protected $signature = 'share-cwd {host?} {--subdomain=} {--auth=}';
+    protected $signature = 'share-cwd {host?} {--subdomain=} {--auth=} {--server-host=} {--server-port=}';
 
     public function handle()
     {
@@ -59,14 +59,19 @@ class ShareCurrentWorkingDirectoryCommand extends ShareCommand
         return str_replace('.', '-', basename($projectPath));
     }
 
-    protected function prepareSharedHost($host): string
+    protected function detectProtocol($host): string
     {
         $certificateFile = ($_SERVER['HOME'] ?? $_SERVER['USERPROFILE']).DIRECTORY_SEPARATOR.'.config'.DIRECTORY_SEPARATOR.'valet'.DIRECTORY_SEPARATOR.'Certificates'.DIRECTORY_SEPARATOR.$host.'.crt';
 
         if (file_exists($certificateFile)) {
-            return 'https://'.$host;
+            return 'https://';
         }
 
-        return $host;
+        return config('expose.default_https', false) ? 'https://' : 'http://';
+    }
+
+    protected function prepareSharedHost($host): string
+    {
+        return $this->detectProtocol($host).$host;
     }
 }

app/Commands/SharePortCommand.php

@@ -27,11 +27,13 @@ class SharePortCommand extends Command
     {
         $this->configureConnectionLogger();
 
+        $auth = $this->option('auth') ?? config('expose.auth_token', '');
+
         (new Factory())
             ->setLoop(app(LoopInterface::class))
             ->setHost(config('expose.host', 'localhost'))
             ->setPort(config('expose.port', 8080))
-            ->setAuth($this->option('auth'))
+            ->setAuth($auth)
             ->createClient()
             ->sharePort($this->argument('port'))
             ->createHttpServer()

app/Providers/AppServiceProvider.php

@@ -37,6 +37,14 @@ class AppServiceProvider extends ServiceProvider
     {
         $builtInConfig = config('expose');
 
+        $keyServerVariable = 'EXPOSE_CONFIG_FILE';
+        if (array_key_exists($keyServerVariable, $_SERVER) && is_string($_SERVER[$keyServerVariable]) && file_exists($_SERVER[$keyServerVariable])) {
+            $localConfig = require $_SERVER[$keyServerVariable];
+            config()->set('expose', array_merge($builtInConfig, $localConfig));
+
+            return;
+        }
+
         $localConfigFile = getcwd().DIRECTORY_SEPARATOR.'.expose.php';
 
         if (file_exists($localConfigFile)) {