Update: Decoupling octane and built

src/Command.php → src/Built/Command.php

@@ -10,8 +10,9 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple;
+namespace Laravel\Ripple\Built;
 
+use Laravel\Ripple\Inspector\Client;
 use Ripple\Utils\Output;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -52,7 +53,7 @@ public function initialize(InputInterface $input, OutputInterface $output): void
     /**
      * 运行服务
      *
-     * @param \Laravel\Ripple\Client $client
+     * @param \Laravel\Ripple\Inspector\Client $client
      *
      * @return void
      */

src/Coroutine/ContainerMap.php → src/Built/Coroutine/ContainerMap.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Coroutine;
+namespace Laravel\Ripple\Built\Coroutine;
 
 use Fiber;
 use Illuminate\Container\Container;

src/Coroutine/ContextManager.php → src/Built/Coroutine/ContextManager.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Coroutine;
+namespace Laravel\Ripple\Built\Coroutine;
 
 use Fiber;
 use Illuminate\Container\Container;

src/Events/RequestHandled.php → src/Built/Events/RequestHandled.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Events;
+namespace Laravel\Ripple\Built\Events;
 
 use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;

src/Events/RequestReceived.php → src/Built/Events/RequestReceived.php

@@ -10,15 +10,15 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Events;
+namespace Laravel\Ripple\Built\Events;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;
-use Laravel\Ripple\Coroutine\ContextManager;
-use Laravel\Ripple\Listeners\FlushAuthenticationState;
-use Laravel\Ripple\Listeners\FlushQueuedCookies;
-use Laravel\Ripple\Listeners\FlushSessionState;
+use Laravel\Ripple\Built\Coroutine\ContextManager;
+use Laravel\Ripple\Built\Listeners\FlushAuthenticationState;
+use Laravel\Ripple\Built\Listeners\FlushQueuedCookies;
+use Laravel\Ripple\Built\Listeners\FlushSessionState;
 use Ripple\Utils\Output;
 
 class RequestReceived

src/Events/RequestTerminated.php → src/Built/Events/RequestTerminated.php

@@ -10,11 +10,11 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Events;
+namespace Laravel\Ripple\Built\Events;
 
 use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;
-use Laravel\Ripple\Coroutine\ContextManager;
+use Laravel\Ripple\Built\Coroutine\ContextManager;
 use Symfony\Component\HttpFoundation\Response;
 
 /**

src/Events/WorkerErrorOccurred.php → src/Built/Events/WorkerErrorOccurred.php

@@ -10,10 +10,10 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Events;
+namespace Laravel\Ripple\Built\Events;
 
 use Illuminate\Foundation\Application;
-use Laravel\Ripple\Coroutine\ContextManager;
+use Laravel\Ripple\Built\Coroutine\ContextManager;
 use Throwable;
 
 class WorkerErrorOccurred

src/Factory.php → src/Built/Factory.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple;
+namespace Laravel\Ripple\Built;
 
 use Illuminate\Foundation\Application;
 use Ripple\File\File;

src/Listeners/FlushAuthenticationState.php → src/Built/Listeners/FlushAuthenticationState.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Listeners;
+namespace Laravel\Ripple\Built\Listeners;
 
 use function with;
 

src/Listeners/FlushQueuedCookies.php → src/Built/Listeners/FlushQueuedCookies.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Listeners;
+namespace Laravel\Ripple\Built\Listeners;
 
 class FlushQueuedCookies
 {

src/Listeners/FlushSessionState.php → src/Built/Listeners/FlushSessionState.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Listeners;
+namespace Laravel\Ripple\Built\Listeners;
 
 class FlushSessionState
 {

src/Response/IteratorResponse.php → src/Built/Response/IteratorResponse.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Response;
+namespace Laravel\Ripple\Built\Response;
 
 use Closure;
 use Iterator;

src/Traits/DispatchesEvents.php → src/Built/Traits/DispatchesEvents.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple\Traits;
+namespace Laravel\Ripple\Built\Traits;
 
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Foundation\Application;

src/Config/ripple.php

@@ -14,7 +14,7 @@
 use Illuminate\Support\Env;
 
 return [
-    'HTTP_LISTEN'  => Env::get('RIP_HTTP_LISTEN', 'http://127.0.0.1:8008'),
+    'HTTP_LISTEN'  => Env::get('RIP_HTTP_LISTEN', 'http://127.0.0.1:8000'),
     'HTTP_WORKERS' => Env::get('RIP_HTTP_WORKERS', 1),
     'WATCH' => Env::get('RIP_WATCH', 1)
 ];

src/HttpWorker.php

@@ -16,12 +16,13 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Foundation\Application;
-use Laravel\Ripple\Events\RequestHandled;
-use Laravel\Ripple\Events\RequestReceived;
-use Laravel\Ripple\Events\RequestTerminated;
-use Laravel\Ripple\Events\WorkerErrorOccurred;
-use Laravel\Ripple\Response\IteratorResponse;
-use Laravel\Ripple\Traits\DispatchesEvents;
+use Laravel\Ripple\Built\Events\RequestHandled;
+use Laravel\Ripple\Built\Events\RequestReceived;
+use Laravel\Ripple\Built\Events\RequestTerminated;
+use Laravel\Ripple\Built\Events\WorkerErrorOccurred;
+use Laravel\Ripple\Built\Factory;
+use Laravel\Ripple\Built\Response\IteratorResponse;
+use Laravel\Ripple\Built\Traits\DispatchesEvents;
 use Ripple\Http\Server;
 use Ripple\Http\Server\Request;
 use Ripple\Stream\Exception\ConnectionException;

src/Client.php → src/Inspector/Client.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple;
+namespace Laravel\Ripple\Inspector;
 
 use Illuminate\Support\Facades\Config;
 use Laravel\Ripple\Virtual\Virtual;
@@ -38,7 +38,7 @@
 
 class Client
 {
-    /*** @var \Laravel\Ripple\Inspector */
+    /*** @var \Laravel\Ripple\Inspector\Inspector */
     public readonly Inspector $inspector;
 
     /*** @var \Ripple\Channel\Channel */
@@ -95,7 +95,7 @@ public function start(bool $daemon = false): void
 
         $this->owner = true;
         $this->lock->exclusion(false);
-        $this->virtual = new Virtual(__DIR__ . '/Virtual/server.bin.php');
+        $this->virtual = new Virtual(__DIR__ . '/../Virtual/server.bin.php');
         $this->virtual->launch([
             'RIP_PROJECT_PATH' => base_path(),
             'RIP_VIRTUAL_ID'   => $this->virtual->id,
@@ -122,7 +122,7 @@ public function start(bool $daemon = false): void
                         Output::write("\033c");
 
                         $oldVirtual = $this->virtual;
-                        $virtual = new Virtual(__DIR__ . '/Virtual/server.bin.php');
+                        $virtual = new Virtual(__DIR__ . '/../Virtual/server.bin.php');
                         $virtual->launch([
                             'RIP_PROJECT_PATH' => base_path(),
                             'RIP_VIRTUAL_ID'   => $virtual->id,

src/Inspector.php → src/Inspector/Inspector.php

@@ -10,7 +10,7 @@
  * Contributions, suggestions, and feedback are always welcome!
  */
 
-namespace Laravel\Ripple;
+namespace Laravel\Ripple\Inspector;
 
 use function base_path;
 use function Co\channel;

src/Octane/Bin/ripple-server.bin.php

@@ -16,7 +16,7 @@
 use Laravel\Octane\ApplicationFactory;
 use Laravel\Octane\RequestContext;
 use Laravel\Octane\Worker;
-use Laravel\Ripple\Factory;
+use Laravel\Ripple\Built\Factory;
 use Laravel\Ripple\HttpWorker;
 use Laravel\Ripple\Octane\RippleClient;
 use Laravel\Ripple\Util;

src/Octane/Bin/ripple-ware.bin.php

@@ -14,7 +14,7 @@
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Laravel\Ripple\Factory;
+use Laravel\Ripple\Built\Factory;
 use Laravel\Ripple\Virtual\Virtual;
 use Ripple\Utils\Output;
 

src/Octane/Commands/RippleStopCommand.php

@@ -14,7 +14,7 @@
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Laravel\Octane\Commands\StopCommand;
-use Laravel\Ripple\Inspector;
+use Laravel\Ripple\Inspector\Inspector;
 use Symfony\Component\Console\Attribute\AsCommand;
 
 use function app;

src/Octane/RippleClient.php

@@ -17,7 +17,7 @@
 use Laravel\Octane\Contracts\Client;
 use Laravel\Octane\OctaneResponse;
 use Laravel\Octane\RequestContext;
-use Laravel\Ripple\Response\IteratorResponse;
+use Laravel\Ripple\Built\Response\IteratorResponse;
 use Ripple\Utils\Output;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Throwable;

src/Octane/RippleServerProcessInspector.php

@@ -13,15 +13,15 @@
 namespace Laravel\Ripple\Octane;
 
 use Laravel\Octane\Contracts\ServerProcessInspector as ServerProcessInspectorContract;
-use Laravel\Ripple\Client;
+use Laravel\Ripple\Inspector\Client;
 
 /**
  *
  */
 class RippleServerProcessInspector implements ServerProcessInspectorContract
 {
     /**
-     * @param \Laravel\Ripple\Client $client
+     * @param \Laravel\Ripple\Inspector\Client $client
      */
     public function __construct(protected readonly Client $client)
     {

src/Provider.php

@@ -14,6 +14,7 @@
 
 use Composer\InstalledVersions;
 use Illuminate\Support\ServiceProvider;
+use Laravel\Ripple\Built\Command;
 use Laravel\Ripple\Octane\RippleProvider;
 
 use function config_path;

src/Virtual/server.bin.php

@@ -14,8 +14,8 @@
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Foundation\Console\Kernel;
-use Laravel\Ripple\Coroutine\ContextManager;
-use Laravel\Ripple\Factory;
+use Laravel\Ripple\Built\Coroutine\ContextManager;
+use Laravel\Ripple\Built\Factory;
 use Laravel\Ripple\HttpWorker;
 use Laravel\Ripple\Util;
 use Ripple\Utils\Output;