+
+HTML;
exit;
}
// Handle info endpoint
if ($path === '/jump/info') {
header('Content-Type: application/json');
- echo json_encode([
+
+ // Get WebSocket port from environment (set by JumpCommand)
+ $wsPort = getenv('JUMP_WS_PORT') ?: null;
+
+ $info = [
'name' => 'NativePHP Server',
'app_name' => getenv('APP_NAME') ?: 'Laravel',
'version' => '1.0.0',
'type' => 'nativephp-server',
- ]);
+ ];
+
+ // Include WebSocket port for hybrid mode
+ if ($wsPort) {
+ $info['ws_port'] = (string) $wsPort;
+ }
+
+ echo json_encode($info);
exit;
}
@@ -137,11 +141,9 @@ function jumpLog($message)
$appName = getenv('APP_NAME') ?: 'Laravel';
- // Create JSON data for the QR code
- $qrData = json_encode([
- 'host' => $displayHost,
- 'port' => (string) $httpPort,
- ]);
+ // Create deep link URL for the QR code
+ // jump:// scheme opens the Jump app directly when scanned with the camera
+ $qrData = "jump://connect?host={$displayHost}&port={$httpPort}";
// Generate QR code
$result = (new Builder(
@@ -152,10 +154,8 @@ function jumpLog($message)
$qrCodeDataUri = $result->getDataUri();
- // Generate HTML - use offline version if flag is set
- global $offlineMode;
- $viewFile = $offlineMode ? 'qr-offline.blade.php' : 'qr.blade.php';
- $viewPath = __DIR__.'/views/'.$viewFile;
+ // Generate HTML
+ $viewPath = __DIR__.'/views/qr.blade.php';
if (file_exists($viewPath)) {
// Read blade file and do simple variable substitution
@@ -179,6 +179,33 @@ function jumpLog($message)
}
}
+// Proxy Vite dev server requests (HMR, assets, websocket)
+// Vite paths: /@vite/, /@fs/, /@id/, /resources/ (dev assets), hot-update files
+$hotFilePath = $basePath.'/public/hot';
+$viteRunning = file_exists($hotFilePath);
+// Read the actual Vite dev server URL from the hot file (e.g. "http://[::1]:5174")
+$vitePort = 5173;
+if ($viteRunning) {
+ $hotContent = trim(file_get_contents($hotFilePath));
+ if (preg_match('/:(\d+)\/?$/', $hotContent, $m)) {
+ $vitePort = (int) $m[1];
+ }
+}
+
+if ($viteRunning) {
+ $isViteRequest = str_starts_with($path, '/@vite')
+ || str_starts_with($path, '/@fs')
+ || str_starts_with($path, '/@id')
+ || str_starts_with($path, '/resources/')
+ || str_starts_with($path, '/node_modules/')
+ || str_contains($path, '.hot-update.');
+
+ if ($isViteRequest) {
+ proxyToVite($vitePort);
+ exit;
+ }
+}
+
// Proxy all other requests to Laravel
proxyToLaravel($laravelPort);
@@ -883,6 +910,75 @@ function generateQrHtml($appName, $qrCodeDataUri, $displayHost, $port)
HTML;
}
+/**
+ * Proxy request to Vite dev server
+ */
+function proxyToVite($vitePort)
+{
+ $method = $_SERVER['REQUEST_METHOD'];
+ $uri = $_SERVER['REQUEST_URI'];
+
+ // Try the hot file origin first (may be IPv6 [::1]), fall back to 127.0.0.1
+ global $hotFilePath;
+ $viteHost = "http://127.0.0.1:{$vitePort}";
+ if (isset($hotFilePath) && file_exists($hotFilePath)) {
+ $viteHost = rtrim(trim(file_get_contents($hotFilePath)), '/');
+ }
+ $viteUrl = "{$viteHost}{$uri}";
+
+ $headers = [];
+ foreach ($_SERVER as $key => $value) {
+ if (strpos($key, 'HTTP_') === 0) {
+ $headerName = str_replace('_', '-', substr($key, 5));
+ if (in_array(strtolower($headerName), ['connection', 'keep-alive', 'transfer-encoding', 'upgrade', 'host'])) {
+ continue;
+ }
+ $headers[] = "{$headerName}: {$value}";
+ }
+ }
+ if (isset($_SERVER['CONTENT_TYPE'])) {
+ $headers[] = 'Content-Type: '.$_SERVER['CONTENT_TYPE'];
+ }
+
+ $ch = curl_init($viteUrl);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_HEADER, true);
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+
+ $response = curl_exec($ch);
+ $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+ curl_close($ch);
+
+ if ($response === false) {
+ http_response_code(502);
+ echo 'Vite dev server not reachable on port '.$vitePort;
+
+ return;
+ }
+
+ $responseHeaders = substr($response, 0, $headerSize);
+ $responseBody = substr($response, $headerSize);
+
+ http_response_code($httpCode);
+
+ $headerLines = explode("\r\n", $responseHeaders);
+ foreach ($headerLines as $headerLine) {
+ if (empty($headerLine) || strpos($headerLine, 'HTTP/') === 0) {
+ continue;
+ }
+ if (stripos($headerLine, 'transfer-encoding:') === 0) {
+ continue;
+ }
+ header($headerLine);
+ }
+
+ echo $responseBody;
+}
+
/**
* Proxy request to Laravel development server
*/
@@ -893,6 +989,7 @@ function proxyToLaravel($laravelPort)
$laravelUrl = "http://127.0.0.1:{$laravelPort}{$uri}";
// Build headers to forward
+ global $displayHost, $httpPort;
$headers = [];
foreach ($_SERVER as $key => $value) {
if (strpos($key, 'HTTP_') === 0) {
@@ -908,6 +1005,12 @@ function proxyToLaravel($laravelPort)
$headers[] = 'Content-Type: '.$_SERVER['CONTENT_TYPE'];
}
+ // Tell Laravel the real host so it generates correct URLs (redirects, assets, etc.)
+ $headers[] = "Host: {$displayHost}:{$httpPort}";
+ $headers[] = "X-Forwarded-Host: {$displayHost}:{$httpPort}";
+ $headers[] = 'X-Forwarded-Proto: http';
+ $headers[] = 'X-Forwarded-Port: '.$httpPort;
+
// Get request body for POST/PUT/PATCH
$body = null;
if (in_array($method, ['POST', 'PUT', 'PATCH'])) {
@@ -948,7 +1051,10 @@ function proxyToLaravel($laravelPort)
// Set response code
http_response_code($httpCode);
- // Forward response headers (skip some)
+ $laravelOrigin = "http://127.0.0.1:{$laravelPort}";
+ $jumpOrigin = "http://{$displayHost}:{$httpPort}";
+
+ // Forward response headers, rewriting any redirect URLs
$headerLines = explode("\r\n", $responseHeaders);
foreach ($headerLines as $headerLine) {
if (empty($headerLine) || strpos($headerLine, 'HTTP/') === 0) {
@@ -958,9 +1064,30 @@ function proxyToLaravel($laravelPort)
if (stripos($headerLine, 'transfer-encoding:') === 0) {
continue;
}
+ // Rewrite Location headers that still point to Laravel's internal address
+ if (stripos($headerLine, 'location:') === 0) {
+ $headerLine = str_replace($laravelOrigin, $jumpOrigin, $headerLine);
+ }
header($headerLine);
}
- // Output response body
+ // Rewrite Vite dev server URLs so the phone routes them through the Jump proxy.
+ // Vite can generate URLs with localhost, 127.0.0.1, [::], or the network IP.
+ global $vitePort;
+ if ($vitePort) {
+ $viteOrigins = [
+ "http://localhost:{$vitePort}",
+ "http://127.0.0.1:{$vitePort}",
+ "http://[::1]:{$vitePort}",
+ "http://[::]:{$vitePort}",
+ "http://{$displayHost}:{$vitePort}",
+ ];
+ $responseBody = str_replace(
+ $viteOrigins,
+ "http://{$displayHost}:{$httpPort}",
+ $responseBody
+ );
+ }
+
echo $responseBody;
}
diff --git a/resources/jump/websocket-server.php b/resources/jump/websocket-server.php
new file mode 100644
index 0000000..c090bcc
--- /dev/null
+++ b/resources/jump/websocket-server.php
@@ -0,0 +1,239 @@
+ [ws_port] [bridge_port] start [-d]
+ */
+
+// Parse arguments
+$args = array_slice($argv, 1);
+$positional = [];
+foreach ($args as $arg) {
+ if ($arg === 'start' || $arg === 'stop' || $arg === 'restart' || $arg === '-d' || $arg === '-g') {
+ continue;
+ }
+ $positional[] = $arg;
+}
+
+$basePath = $positional[0] ?? getenv('JUMP_BASE_PATH');
+$wsPort = $positional[1] ?? getenv('JUMP_WS_PORT') ?: '3001';
+$bridgePort = $positional[2] ?? getenv('JUMP_BRIDGE_PORT') ?: '3002';
+
+if (! $basePath || ! file_exists($basePath.'/vendor/autoload.php')) {
+ fwrite(STDERR, "[Jump] Error: base_path not provided or vendor/autoload.php not found\n");
+ exit(1);
+}
+
+require_once $basePath.'/vendor/autoload.php';
+
+use Workerman\Connection\TcpConnection;
+use Workerman\Worker;
+
+// Make basePath available globally for file watcher
+$GLOBALS['basePath'] = $basePath;
+
+// Single WebSocket worker — the TCP server is created inside onWorkerStart
+// so both run in the SAME process and can share $deviceConnections
+$wsWorker = new Worker("websocket://0.0.0.0:{$wsPort}");
+$wsWorker->count = 1;
+$wsWorker->name = 'JumpBridge';
+
+// Shared state (same process)
+$deviceConnections = [];
+$pendingCalls = [];
+
+$wsWorker->onConnect = function (TcpConnection $connection) use (&$deviceConnections) {
+ $deviceConnections[$connection->id] = $connection;
+ jumpLog('Device connected via WebSocket (total: '.count($deviceConnections).')');
+};
+
+$wsWorker->onMessage = function (TcpConnection $connection, $data) use (&$pendingCalls) {
+ $message = json_decode($data, true);
+ if (! $message || ! isset($message['type'])) {
+ return;
+ }
+
+ switch ($message['type']) {
+ case 'bridge_response':
+ $requestId = $message['id'] ?? null;
+ if ($requestId && isset($pendingCalls[$requestId])) {
+ $tcpConnection = $pendingCalls[$requestId];
+ unset($pendingCalls[$requestId]);
+
+ $response = json_encode([
+ 'id' => $requestId,
+ 'result' => $message['result'] ?? [],
+ 'error' => $message['error'] ?? null,
+ ]);
+
+ $packed = pack('N', strlen($response)).$response;
+ $tcpConnection->send($packed);
+ }
+ break;
+
+ case 'native_event':
+ jumpLog("Native event: {$message['event']}");
+ break;
+
+ case 'pong':
+ break;
+ }
+};
+
+$wsWorker->onClose = function (TcpConnection $connection) use (&$deviceConnections, &$pendingCalls) {
+ unset($deviceConnections[$connection->id]);
+ jumpLog('Device disconnected (remaining: '.count($deviceConnections).')');
+
+ if (empty($deviceConnections)) {
+ foreach ($pendingCalls as $requestId => $tcpConnection) {
+ $error = json_encode([
+ 'id' => $requestId,
+ 'error' => 'Device disconnected',
+ ]);
+ $packed = pack('N', strlen($error)).$error;
+ $tcpConnection->send($packed);
+ }
+ $pendingCalls = [];
+ }
+};
+
+// Create the TCP server inside onWorkerStart so it runs in the SAME process
+$wsWorker->onWorkerStart = function () use (&$deviceConnections, &$pendingCalls, $bridgePort) {
+ $tcpBuffers = [];
+
+ // Internal TCP server for PHP bridge calls
+ $tcpServer = new Worker("tcp://127.0.0.1:{$bridgePort}");
+
+ $tcpServer->onConnect = function (TcpConnection $connection) use (&$tcpBuffers) {
+ $tcpBuffers[$connection->id] = '';
+ };
+
+ $tcpServer->onMessage = function (TcpConnection $connection, $data) use (&$deviceConnections, &$pendingCalls, &$tcpBuffers) {
+ $tcpBuffers[$connection->id] = ($tcpBuffers[$connection->id] ?? '').$data;
+ $buffer = &$tcpBuffers[$connection->id];
+
+ while (strlen($buffer) >= 4) {
+ $unpacked = unpack('N', substr($buffer, 0, 4));
+ $messageLength = $unpacked[1];
+
+ if (strlen($buffer) < 4 + $messageLength) {
+ break;
+ }
+
+ $messageData = substr($buffer, 4, $messageLength);
+ $buffer = substr($buffer, 4 + $messageLength);
+
+ $message = json_decode($messageData, true);
+ if (! $message || ! isset($message['type'])) {
+ continue;
+ }
+
+ if ($message['type'] === 'bridge_call') {
+ if (empty($deviceConnections)) {
+ $error = json_encode([
+ 'id' => $message['id'] ?? 'unknown',
+ 'error' => 'No device connected',
+ ]);
+ $packed = pack('N', strlen($error)).$error;
+ $connection->send($packed);
+
+ continue;
+ }
+
+ $pendingCalls[$message['id']] = $connection;
+ $encoded = json_encode($message);
+ foreach ($deviceConnections as $deviceConnection) {
+ $deviceConnection->send($encoded);
+ }
+ }
+ }
+ };
+
+ $tcpServer->onClose = function (TcpConnection $connection) use (&$pendingCalls, &$tcpBuffers) {
+ unset($tcpBuffers[$connection->id]);
+ foreach ($pendingCalls as $requestId => $pendingConnection) {
+ if ($pendingConnection === $connection) {
+ unset($pendingCalls[$requestId]);
+ }
+ }
+ };
+
+ $tcpServer->listen();
+ jumpLog("TCP bridge listening on 127.0.0.1:{$bridgePort}");
+
+ // Keepalive ping
+ \Workerman\Timer::add(15, function () use (&$deviceConnections) {
+ $ping = json_encode(['type' => 'ping']);
+ foreach ($deviceConnections as $connection) {
+ $connection->send($ping);
+ }
+ });
+
+ // File watcher for live reload
+ $lastModTimes = [];
+ $watchPaths = ['app', 'resources', 'routes', 'config'];
+ $watchExtensions = ['php', 'blade.php', 'js', 'css', 'ts', 'vue'];
+
+ \Workerman\Timer::add(1, function () use (&$deviceConnections, &$lastModTimes, $watchPaths, $watchExtensions) {
+ global $basePath;
+ if (empty($deviceConnections)) {
+ return;
+ }
+
+ $changed = false;
+ foreach ($watchPaths as $dir) {
+ $fullPath = $basePath.'/'.$dir;
+ if (! is_dir($fullPath)) {
+ continue;
+ }
+
+ $iterator = new \RecursiveIteratorIterator(
+ new \RecursiveDirectoryIterator($fullPath, \RecursiveDirectoryIterator::SKIP_DOTS)
+ );
+
+ foreach ($iterator as $file) {
+ if (! $file->isFile()) {
+ continue;
+ }
+
+ $ext = $file->getExtension();
+ $path = $file->getPathname();
+
+ // Check blade.php specifically
+ $isWatched = in_array($ext, $watchExtensions) || str_ends_with($path, '.blade.php');
+ if (! $isWatched) {
+ continue;
+ }
+
+ $mtime = $file->getMTime();
+ if (isset($lastModTimes[$path]) && $lastModTimes[$path] < $mtime) {
+ $changed = true;
+ $relativePath = str_replace($basePath.'/', '', $path);
+ jumpLog("Changed: {$relativePath}");
+ }
+ $lastModTimes[$path] = $mtime;
+ }
+ }
+
+ if ($changed) {
+ $reload = json_encode(['type' => 'reload']);
+ foreach ($deviceConnections as $connection) {
+ $connection->send($reload);
+ }
+ jumpLog('Sent reload to '.count($deviceConnections).' device(s)');
+ }
+ });
+};
+
+function jumpLog($message)
+{
+ fwrite(STDERR, "[Jump] {$message}\n");
+}
+
+Worker::runAll();
diff --git a/src/Commands/JumpCommand.php b/src/Commands/JumpCommand.php
index 6e28df2..0255830 100644
--- a/src/Commands/JumpCommand.php
+++ b/src/Commands/JumpCommand.php
@@ -10,13 +10,14 @@
class JumpCommand extends Command
{
protected $signature = 'native:jump
- {platform? : Target platform (android/a or ios/i)}
{--host=0.0.0.0 : The host address to serve the application on}
{--ip= : The IP address to display in the QR code (overrides auto-detection)}
{--http-port= : The HTTP port to serve on}
- {--laravel-port=8000 : The Laravel dev server port to proxy to}
- {--no-mdns : Disable mDNS service advertisement}
- {--S|skip-build : Skip building the app bundle if app.zip already exists}';
+ {--ws-port= : The WebSocket bridge port}
+ {--bridge-port= : The internal TCP bridge port}
+ {--no-serve : Do not start artisan serve automatically (use if running your own server)}
+ {--laravel-port= : The Laravel dev server port (auto-detected when artisan serve is managed)}
+ {--no-mdns : Disable mDNS service advertisement}';
protected $description = 'Start the NativePHP development server for testing mobile apps';
@@ -24,39 +25,22 @@ class JumpCommand extends Command
private string $displayHost;
- private string $platform;
+ private $laravelProcess = null;
+
+ private array $laravelPipes = [];
public function handle()
{
intro('NativePHP Jump Server');
- // Get platform from argument (android/a, ios/i) or prompt
- $platform = $this->argument('platform');
-
- if ($platform && in_array(strtolower($platform), ['android', 'a', 'ios', 'i'])) {
- $this->platform = match (strtolower($platform)) {
- 'android', 'a' => 'android',
- 'ios', 'i' => 'ios',
- };
- } else {
- $this->platform = select(
- label: 'Select target platform',
- options: ['android' => 'Android', 'ios' => 'iOS'],
- );
- }
-
- // Run npm build for the selected platform
- $this->runNpmBuild();
-
// Kill existing servers
$this->killExistingServers();
// Configuration
$host = $this->option('host');
$httpPort = $this->option('http-port') ?? config('nativephp.server.http_port', 3000);
- $this->laravelPort = $this->option('laravel-port') ?? 8000;
- // Auto-find available port
+ // Auto-find available port for the Jump proxy server
$httpPort = $this->findAvailablePort($httpPort);
if ($httpPort === null) {
$this->error('Cannot start server: No available HTTP port found.');
@@ -64,17 +48,28 @@ public function handle()
return self::FAILURE;
}
- // Check if we should open browser
- $openQr = config('nativephp.server.open_browser', true);
-
- // Pre-build the Laravel bundle ZIP
- $buildPath = storage_path('app/native-build');
- $zipPath = $buildPath.'/app.zip';
+ // Start or detect the Laravel dev server
+ if ($this->option('no-serve')) {
+ // User is running their own artisan serve
+ $this->laravelPort = (int) ($this->option('laravel-port') ?? 8000);
+ if (! $this->isPortInUse($this->laravelPort)) {
+ $this->warn("No server detected on port {$this->laravelPort}. Start one with: php artisan serve --port={$this->laravelPort}");
+ }
+ } else {
+ // Auto-start artisan serve on an available port
+ $desiredLaravelPort = (int) ($this->option('laravel-port') ?? 8000);
+ $this->laravelPort = $this->findAvailablePort($desiredLaravelPort, 100, [$httpPort]);
+ if ($this->laravelPort === null) {
+ $this->error('Cannot start server: No available port for artisan serve.');
- if (! is_dir($buildPath)) {
- mkdir($buildPath, 0755, true);
+ return self::FAILURE;
+ }
+ $this->startLaravelServer($this->laravelPort);
}
+ // Check if we should open browser
+ $openQr = config('nativephp.server.open_browser', true);
+
// Get the local IP for dev server config
$ipOption = $this->option('ip');
if ($ipOption) {
@@ -98,31 +93,17 @@ public function handle()
}
}
- // Check if we should skip building
- $skipBuild = $this->option('skip-build') && file_exists($zipPath);
-
- if ($skipBuild) {
- $bundleSize = $this->formatBytes(filesize($zipPath));
- $this->components->twoColumnDetail('Using existing bundle', $bundleSize);
- } else {
- // Delete existing bundle to ensure fresh build
- if (file_exists($zipPath)) {
- unlink($zipPath);
- }
- $bundleResult = $this->createZipWithProgress($zipPath, $this->displayHost);
-
- if (! $bundleResult) {
- $this->error('Failed to create Laravel bundle. Cannot start server.');
+ // Start WebSocket bridge server — find ports that don't collide with HTTP or Laravel
+ $usedPorts = [$httpPort, $this->laravelPort];
+ $wsPort = (int) ($this->option('ws-port') ?? $this->findAvailablePort(3001, 100, $usedPorts));
+ $usedPorts[] = $wsPort;
+ $bridgePort = (int) ($this->option('bridge-port') ?? $this->findAvailablePort(3002, 100, $usedPorts));
+ $this->startBridgeServer($wsPort, $bridgePort);
+ $this->components->twoColumnDetail('Bridge WebSocket', "ws://{$this->displayHost}:{$wsPort}/jump/ws");
+ $this->components->twoColumnDetail('Bridge TCP', "tcp://127.0.0.1:{$bridgePort}");
- return self::FAILURE;
- }
-
- $bundleSize = file_exists($zipPath) ? $this->formatBytes(filesize($zipPath)) : 'unknown';
- $this->components->twoColumnDetail('Bundle created', $bundleSize);
- }
-
- // Start PHP built-in server
- $this->startPhpServer($host, $httpPort, $zipPath, $openQr);
+ // Start PHP built-in server (serves QR page + proxies to Laravel)
+ $this->startPhpServer($host, $httpPort, $openQr, $bridgePort, $wsPort);
return self::SUCCESS;
}
@@ -130,7 +111,7 @@ public function handle()
/**
* Start PHP's built-in development server with the Jump router
*/
- private function startPhpServer(string $host, int $httpPort, string $zipPath, bool $openQr): void
+ private function startPhpServer(string $host, int $httpPort, bool $openQr, int $bridgePort = 3002, int $wsPort = 3001): void
{
$routerPath = __DIR__.'/../../resources/jump/router.php';
@@ -142,10 +123,12 @@ private function startPhpServer(string $host, int $httpPort, string $zipPath, bo
// Build environment variables for the router
$env = [
- 'JUMP_ZIP_PATH' => $zipPath,
'JUMP_DISPLAY_HOST' => $this->displayHost,
'JUMP_HTTP_PORT' => (string) $httpPort,
'JUMP_LARAVEL_PORT' => (string) $this->laravelPort,
+ 'JUMP_BRIDGE_PORT' => (string) $bridgePort,
+ 'JUMP_WS_PORT' => (string) $wsPort,
+ 'JUMP_VITE_PORT' => (string) config('nativephp.server.vite_port', 5173),
'JUMP_BASE_PATH' => base_path(),
'APP_NAME' => config('app.name', 'Laravel'),
];
@@ -157,11 +140,7 @@ private function startPhpServer(string $host, int $httpPort, string $zipPath, bo
$fullEnv = array_filter($fullEnv, fn ($v) => is_string($v) || is_numeric($v));
$this->displayServerInfo($host, $httpPort, $this->laravelPort);
-
- // Auto-open browser with QR code
- if ($openQr) {
- $this->openBrowser($host, $httpPort);
- }
+ $this->displayTerminalQrCode($this->displayHost, $httpPort);
// Build the PHP server command
$phpBinary = PHP_BINARY;
@@ -198,9 +177,10 @@ private function startPhpServer(string $host, int $httpPort, string $zipPath, bo
// Handle signals for graceful shutdown
if (function_exists('pcntl_signal')) {
- pcntl_signal(SIGINT, function () use ($process, &$pipes) {
+ $shutdown = function () use ($process, &$pipes) {
$this->newLine();
- $this->components->info('Shutting down server...');
+ $this->components->info('Shutting down...');
+ $this->stopLaravelServer();
if (is_resource($pipes[1])) {
fclose($pipes[1]);
}
@@ -209,17 +189,9 @@ private function startPhpServer(string $host, int $httpPort, string $zipPath, bo
}
proc_terminate($process);
exit(0);
- });
- pcntl_signal(SIGTERM, function () use ($process, &$pipes) {
- if (is_resource($pipes[1])) {
- fclose($pipes[1]);
- }
- if (is_resource($pipes[2])) {
- fclose($pipes[2]);
- }
- proc_terminate($process);
- exit(0);
- });
+ };
+ pcntl_signal(SIGINT, $shutdown);
+ pcntl_signal(SIGTERM, $shutdown);
}
// Main loop - read output from the server
@@ -250,6 +222,16 @@ private function startPhpServer(string $host, int $httpPort, string $zipPath, bo
}
}
+ // Drain Laravel server output to prevent pipe buffer from filling
+ if ($this->laravelProcess && is_resource($this->laravelProcess)) {
+ if (is_resource($this->laravelPipes[1] ?? null)) {
+ fgets($this->laravelPipes[1]);
+ }
+ if (is_resource($this->laravelPipes[2] ?? null)) {
+ fgets($this->laravelPipes[2]);
+ }
+ }
+
// Handle signals if available
if (function_exists('pcntl_signal_dispatch')) {
pcntl_signal_dispatch();
@@ -260,399 +242,207 @@ private function startPhpServer(string $host, int $httpPort, string $zipPath, bo
}
// Cleanup
+ $this->stopLaravelServer();
fclose($pipes[1]);
fclose($pipes[2]);
proc_close($process);
}
/**
- * Format PHP server output for cleaner display
+ * Start the WebSocket bridge server for hybrid mode.
+ * Runs as a background process alongside the HTTP server.
*/
- private function formatServerOutput(string $output): void
+ private function startBridgeServer(int $wsPort, int $bridgePort): void
{
- $output = trim($output);
- if (empty($output)) {
- return;
- }
-
- // PHP built-in server format: [Date Time] Client:Port [Status]: Method Path
- if (preg_match('/\[.+\]\s+(\d+\.\d+\.\d+\.\d+):(\d+)\s+\[(\d+)\]:\s+(\w+)\s+(.+)/', $output, $matches)) {
- $status = $matches[3];
- $method = $matches[4];
- $path = $matches[5];
-
- // Skip certain paths
- if (str_contains($path, '/jump/')) {
- return; // Our internal endpoints
- }
-
- // Color code by status
- if ($status >= 400) {
- $this->line("