create-prisma-php-app 3.5.4 → 3.6.1

package/dist/src/Lib/Middleware/CorsMiddleware.php

@@ -0,0 +1,145 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lib\Middleware;
+
+final class CorsMiddleware
+{
+    /** Entry point */
+    public static function handle(?array $overrides = null): void
+    {
+        // Not a CORS request
+        $origin = $_SERVER['HTTP_ORIGIN'] ?? '';
+        if ($origin === '') {
+            return;
+        }
+
+        // Resolve config (env → overrides)
+        $cfg = self::buildConfig($overrides);
+
+        // Not allowed? Do nothing (browser will block)
+        if (!self::isAllowedOrigin($origin, $cfg['allowedOrigins'])) {
+            return;
+        }
+
+        // Compute which value to send for Access-Control-Allow-Origin
+        // If credentials are disabled and '*' is in list, we can send '*'
+        $sendWildcard = (!$cfg['allowCredentials'] && self::listHasWildcard($cfg['allowedOrigins']));
+        $allowOriginValue = $sendWildcard ? '*' : self::normalize($origin);
+
+        // Vary for caches
+        header('Vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers');
+
+        header('Access-Control-Allow-Origin: ' . $allowOriginValue);
+        if ($cfg['allowCredentials']) {
+            header('Access-Control-Allow-Credentials: true');
+        }
+
+        if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+            // Preflight response
+            $requestedHeaders = $_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'] ?? '';
+            $allowedHeaders = $cfg['allowedHeaders'] !== ''
+                ? $cfg['allowedHeaders']
+                : ($requestedHeaders ?: 'Content-Type, Authorization, X-Requested-With');
+
+            header('Access-Control-Allow-Methods: ' . $cfg['allowedMethods']);
+            header('Access-Control-Allow-Headers: ' . $allowedHeaders);
+            if ($cfg['maxAge'] > 0) {
+                header('Access-Control-Max-Age: ' . (string) $cfg['maxAge']);
+            }
+
+            // Optional: Private Network Access preflights (Chrome)
+            if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_PRIVATE_NETWORK'])) {
+                header('Access-Control-Allow-Private-Network: true');
+            }
+
+            http_response_code(204);
+            header('Content-Length: 0');
+            exit;
+        }
+
+        // Simple/actual request
+        if ($cfg['exposeHeaders'] !== '') {
+            header('Access-Control-Expose-Headers: ' . $cfg['exposeHeaders']);
+        }
+    }
+
+    /** Read env + normalize + apply overrides */
+    private static function buildConfig(?array $overrides): array
+    {
+        $allowed = self::parseList($_ENV['CORS_ALLOWED_ORIGINS'] ?? '');
+        $cfg = [
+            'allowedOrigins'   => $allowed,
+            'allowCredentials' => filter_var($_ENV['CORS_ALLOW_CREDENTIALS'] ?? 'false', FILTER_VALIDATE_BOOLEAN),
+            'allowedMethods'   => $_ENV['CORS_ALLOWED_METHODS'] ?? 'GET, POST, PUT, PATCH, DELETE, OPTIONS',
+            'allowedHeaders'   => trim($_ENV['CORS_ALLOWED_HEADERS'] ?? ''),
+            'exposeHeaders'    => trim($_ENV['CORS_EXPOSE_HEADERS'] ?? ''),
+            'maxAge'           => (int)($_ENV['CORS_MAX_AGE'] ?? 86400),
+        ];
+
+        if (is_array($overrides)) {
+            foreach ($overrides as $k => $v) {
+                if (array_key_exists($k, $cfg)) {
+                    $cfg[$k] = $v;
+                }
+            }
+        }
+
+        // Normalize patterns
+        $cfg['allowedOrigins'] = array_map([self::class, 'normalize'], $cfg['allowedOrigins']);
+        return $cfg;
+    }
+
+    /** CSV or JSON array → array<string> */
+    private static function parseList(string $raw): array
+    {
+        $raw = trim($raw);
+        if ($raw === '') return [];
+
+        if ($raw[0] === '[') {
+            $arr = json_decode($raw, true);
+            if (is_array($arr)) {
+                return array_values(array_filter(array_map('strval', $arr), 'strlen'));
+            }
+        }
+        return array_values(array_filter(array_map('trim', explode(',', $raw)), 'strlen'));
+    }
+
+    private static function normalize(string $origin): string
+    {
+        return rtrim($origin, '/');
+    }
+
+    private static function isAllowedOrigin(string $origin, array $list): bool
+    {
+        $o = self::normalize($origin);
+
+        foreach ($list as $pattern) {
+            $p = self::normalize($pattern);
+
+            // literal "*"
+            if ($p === '*') return true;
+
+            // allow literal "null" for file:// or sandboxed if explicitly listed
+            if ($o === 'null' && strtolower($p) === 'null') return true;
+
+            // wildcard like https://*.example.com
+            if (strpos($p, '*') !== false) {
+                $regex = '/^' . str_replace('\*', '[^.]+', preg_quote($p, '/')) . '$/i';
+                if (preg_match($regex, $o)) return true;
+            } else {
+                if (strcasecmp($p, $o) === 0) return true;
+            }
+        }
+        return false;
+    }
+
+    private static function listHasWildcard(array $list): bool
+    {
+        foreach ($list as $p) {
+            if (trim($p) === '*') return true;
+        }
+        return false;
+    }
+}

package/dist/src/Lib/Websocket/websocket-server.php

@@ -2,26 +2,117 @@
 
 declare(strict_types=1);
 
-require __DIR__ . '/../../../vendor/autoload.php';
-require_once __DIR__ . '/../../../settings/paths.php';
+namespace Lib\Websocket;
 
-use Dotenv\Dotenv;
-
-Dotenv::createImmutable(DOCUMENT_PATH)->load();
+$root = dirname(__DIR__, 3);
+require $root . '/vendor/autoload.php';
+require_once $root . '/settings/paths.php';
 
+use Dotenv\Dotenv;
 use Ratchet\Server\IoServer;
 use Ratchet\Http\HttpServer;
 use Ratchet\WebSocket\WsServer;
 use Lib\Websocket\ConnectionManager;
+use Throwable;
+
+// ── Load .env (optional) and timezone ─────────────────────────────────────────
+if (file_exists(DOCUMENT_PATH . '/.env')) {
+    Dotenv::createImmutable(DOCUMENT_PATH)->safeLoad();
+}
+date_default_timezone_set($_ENV['APP_TIMEZONE'] ?? 'UTC');
+
+// ── Tiny argv parser: allows --host=0.0.0.0 --port=8080 ──────────────────────
+$cli = [];
+foreach ($argv ?? [] as $arg) {
+    if (preg_match('/^--([^=]+)=(.*)$/', $arg, $m)) {
+        $cli[$m[1]] = $m[2];
+    }
+}
+
+// ── Resolve settings (env → cli defaults) ────────────────────────────────────
+$appName = $_ENV['WS_NAME']       ?? 'prisma-php-ws';
+$appVer  = $_ENV['WS_VERSION']    ?? '0.0.1';
+$host    = $cli['host']           ?? ($_ENV['WS_HOST'] ?? '127.0.0.1');
+$port    = (int)($cli['port']     ?? ($_ENV['WS_PORT'] ?? 8080));
+$verbose = filter_var($cli['verbose'] ?? ($_ENV['WS_VERBOSE'] ?? 'true'), FILTER_VALIDATE_BOOLEAN);
+
+// ── Console helpers ──────────────────────────────────────────────────────────
+$color = static fn(string $t, string $c) => "\033[{$c}m{$t}\033[0m";
+$info  = static fn(string $t) => $color($t, '1;36');
+$ok    = static fn(string $t) => $color($t, '32');
+$warn  = static fn(string $t) => $color($t, '33');
+$err   = static fn(string $t) => $color($t, '31');
 
-$server = IoServer::factory(
-    new HttpServer(
-        new WsServer(
-            new ConnectionManager()
-        )
-    ),
-    8080
+// ── Preflight: check if port is free (nice error if not) ─────────────────────
+$probe = @stream_socket_server("tcp://{$host}:{$port}", $errno, $errstr);
+if ($probe === false) {
+    fwrite(STDERR, $err("✖ Port {$port} on {$host} is not available: {$errstr}\n"));
+    exit(1);
+}
+fclose($probe);
+
+// ── Build app ────────────────────────────────────────────────────────────────
+$manager = new ConnectionManager(); // your app component
+$server  = IoServer::factory(
+    new HttpServer(new WsServer($manager)),
+    $port,
+    $host
 );
 
-echo "WebSocket server started on port 8080...\n";
-$server->run();
+$pid  = getmypid() ?: 0;
+$url  = "ws://{$host}:{$port}";
+$ts   = date('Y-m-d H:i:s');
+
+echo PHP_EOL;
+echo $info("⚡  {$appName} (v{$appVer})") . PHP_EOL;
+echo $warn("→ WebSocket server starting…") . PHP_EOL;
+echo "   Host:       {$host}" . PHP_EOL;
+echo "   Port:       {$port}" . PHP_EOL;
+echo "   URL:        {$url}" . PHP_EOL;
+echo "   PID:        {$pid}" . PHP_EOL;
+echo "   Started:    {$ts}" . PHP_EOL;
+
+// ── Graceful shutdown & periodic logs (if loop available) ────────────────────
+$loop = property_exists($server, 'loop') ? $server->loop : null;
+if ($loop instanceof \React\EventLoop\LoopInterface) {
+    // Periodic stats every 60s
+    $loop->addPeriodicTimer(60, function () use ($ok) {
+        $mem = function_exists('memory_get_usage') ? number_format(memory_get_usage(true) / 1048576, 2) . ' MB' : 'n/a';
+        $msg = "✓ Heartbeat — memory: {$mem}";
+        echo $ok($msg) . PHP_EOL;
+    });
+
+    // Signal handlers (needs pcntl)
+    if (function_exists('pcntl_signal') && method_exists($loop, 'addSignal')) {
+        $stop = function (int $sig) use ($warn, $loop) {
+            echo PHP_EOL . $warn("⏹  Caught signal {$sig}. Shutting down…") . PHP_EOL;
+            $loop->stop();
+        };
+        $loop->addSignal(SIGINT, $stop);
+        $loop->addSignal(SIGTERM, $stop);
+    }
+}
+
+// ── Run ──────────────────────────────────────────────────────────────────────
+try {
+    echo $ok("✓ Listening on {$url}") . PHP_EOL;
+    if ($verbose) {
+        // Basic error/exception logging
+        set_error_handler(function ($severity, $message, $file, $line) use ($err) {
+            // Respect @-silence
+            if (!(error_reporting() & $severity)) return;
+            fwrite(STDERR, $err("PHP Error [{$severity}] {$message} @ {$file}:{$line}\n"));
+        });
+        set_exception_handler(function (Throwable $e) use ($err) {
+            fwrite(STDERR, $err('Uncaught Exception: ' . $e->getMessage() . "\n" . $e->getTraceAsString() . "\n"));
+        });
+    }
+
+    $server->run(); // blocks until loop->stop()
+
+    echo PHP_EOL . $ok('✔ Server stopped.') . PHP_EOL;
+    exit(0);
+} catch (Throwable $e) {
+    fwrite(STDERR, $err('✖ Server error: ' . $e->getMessage()) . PHP_EOL);
+    exit(1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "3.5.4",
+  "version": "3.6.1",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",

package/dist/settings/restart-websocket.bat

@@ -1,28 +0,0 @@
-@echo off
-set PORT=8080
-set "PHP_PATH=php"
-set "SERVER_SCRIPT_PATH= src\Lib\Websocket\websocket-server.php"
-
-echo [INFO] Checking for processes using port %PORT%...
-netstat -aon | findstr :%PORT%
-
-for /f "tokens=5" %%a in ('netstat -aon ^| findstr :%PORT%') do (
-    echo [INFO] Found PID: %%a
-    taskkill /F /PID %%a
-    if %ERRORLEVEL% == 0 (
-        echo [SUCCESS] Killed process %%a.
-    ) else (
-        echo [ERROR] Failed to kill process %%a.
-    )
-)
-
-:: Wait to ensure the port is freed
-timeout /t 2 >nul
-
-echo [INFO] Starting WebSocket server on port %PORT%...
-%PHP_PATH% %SERVER_SCRIPT_PATH%
-if %ERRORLEVEL% == 0 (
-    echo [SUCCESS] WebSocket server started.
-) else (
-    echo [ERROR] Failed to start WebSocket server.
-)