create-prisma-php-app 1.7.10 → 1.8.0

package/dist/bootstrap.php

@@ -24,14 +24,28 @@ function determineContentToInclude()
     $includePath = '';
     $metadata = $metadata[$uri] ?? $metadata['default'];
 
+    $isDirectAccessToPrivateRoute = preg_match('/^_/', $uri);
+
+    if ($isDirectAccessToPrivateRoute) {
+        return ['path' => $includePath];
+    }
+
     if ($uri) {
+        $groupFolder = findGroupFolder($uri);
+        if ($groupFolder) {
+            $path = $baseDir .= $groupFolder;
+            if (file_exists($path)) {
+                $includePath = $path;
+            }
+        }
+
         if (substr($uri, -4) == '.php') {
             $path = $baseDir . '/' . $uri;
             if (file_exists($path)) {
                 $includePath = $path;
             }
         } else {
-            $path = $baseDir . '/' . $uri . '/index.php';
+            $path = $baseDir . "/$uri/index.php";
             if (file_exists($path)) {
                 $includePath = $path;
             }
@@ -43,6 +57,111 @@ function determineContentToInclude()
     return ['path' => $includePath];
 }
 
+function checkForDuplicateRoutes()
+{
+    $routes = json_decode(file_get_contents(SETTINGS_PATH . "/files_list.json"), true);
+
+    $normalizedRoutesMap = [];
+    foreach ($routes as $route) {
+        $routeWithoutGroups = preg_replace('/\(.*?\)/', '', $route);
+        $routeTrimmed = ltrim($routeWithoutGroups, '.\\/');
+        $routeNormalized = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $routeTrimmed);
+        $normalizedRoutesMap[$routeNormalized][] = $route;
+    }
+
+    $errorMessages = [];
+    foreach ($normalizedRoutesMap as $normalizedRoute => $originalRoutes) {
+        if (count($originalRoutes) > 1 && strpos($normalizedRoute, DIRECTORY_SEPARATOR) !== false) {
+            $errorMessages[] = "Duplicate route found after normalization: " . $normalizedRoute;
+            foreach ($originalRoutes as $originalRoute) {
+                $errorMessages[] = "- Grouped original route: " . $originalRoute;
+            }
+        }
+    }
+
+    if (!empty($errorMessages)) {
+        $errorMessageString = implode("<br>", $errorMessages);
+        throw new Exception($errorMessageString);
+    }
+}
+
+function writeRoutes()
+{
+    $directory = './';
+
+    if (is_dir($directory)) {
+        $filesList = [];
+
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory));
+
+        foreach ($iterator as $file) {
+            if ($file->isFile()) {
+                $filesList[] = $file->getPathname();
+            }
+        }
+
+        $jsonData = json_encode($filesList, JSON_PRETTY_PRINT);
+        $jsonFileName = SETTINGS_PATH . '/files_list.json';
+        @file_put_contents($jsonFileName, $jsonData);
+    }
+}
+
+function findGroupFolder($uri): string
+{
+    $uriSegments = explode('/', $uri);
+    $constructedPath = '';
+    $groupFolder = '';
+    $finalMatch = '';
+
+    foreach ($uriSegments as $segment) {
+        if (!empty($segment)) {
+            if (isGroupIdentifier($segment)) {
+                return $segment;
+            }
+
+            $constructedPath .= (empty($constructedPath) ? '' : '/') . $segment;
+            $matchedGroupFolder = matchGroupFolder($constructedPath);
+            if ($matchedGroupFolder) {
+                $groupFolder = $matchedGroupFolder;
+                $finalMatch = $groupFolder;
+            }
+        }
+    }
+
+    if ($finalMatch) {
+        return $finalMatch;
+    } else {
+        return '';
+    }
+}
+
+function isGroupIdentifier($segment): bool
+{
+    return preg_match('/^\(.*\)$/', $segment);
+}
+
+function matchGroupFolder($constructedPath): ?string
+{
+    $routes = json_decode(file_get_contents(SETTINGS_PATH . "/files_list.json"), true);
+    $bestMatch = null;
+
+    foreach ($routes as $route) {
+        $normalizedRoute = trim(str_replace('\\', '/', $route), '.');
+        $cleanedRoute = preg_replace('/\/\([^)]+\)/', '', $normalizedRoute);
+        if (stripos($cleanedRoute, $constructedPath) !== false) {
+            if ($bestMatch === null || strlen($cleanedRoute) < strlen($bestMatch)) {
+                $bestMatch = $normalizedRoute;
+            }
+        }
+    }
+
+    if ($bestMatch !== null) {
+        return $bestMatch;
+    }
+
+    return null;
+}
+
 $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
 $domainName = $_SERVER['HTTP_HOST'];
 $scriptPath = dirname($_SERVER['SCRIPT_NAME']);
@@ -78,6 +197,8 @@ register_shutdown_function(function () use (&$content) {
 
 try {
     $result = determineContentToInclude();
+    writeRoutes();
+    checkForDuplicateRoutes();
     $contentToInclude = $result['path'] ?? '';
 
     if (!empty($contentToInclude)) {

package/dist/settings/restartWebsocket.cjs

@@ -7,8 +7,8 @@ const serverScriptPath = path.join(
   __dirname,
   "..",
   "src",
-  "lib",
-  "websocket",
+  "Lib",
+  "Websocket",
   "server.php"
 );
 
@@ -46,7 +46,7 @@ restartServer();
 // Watch for changes and restart the server
 const chokidar = require("chokidar");
 chokidar
-  .watch(path.join(__dirname, "..", "src", "lib", "websocket", "**", "*"))
+  .watch(path.join(__dirname, "..", "src", "Lib", "Websocket", "**", "*"))
   .on("change", (event, path) => {
     console.log(`${event}: ${path}`);
     restartServer();

package/dist/settings/restart_websocket.bat

@@ -1,7 +1,7 @@
 @echo off
 set PORT=8080
 set "PHP_PATH=php"
-set "SERVER_SCRIPT_PATH= src\lib\websocket\server.php"
+set "SERVER_SCRIPT_PATH= src\Lib\Websocket\server.php"
 
 echo [INFO] Checking for processes using port %PORT%...
 netstat -aon | findstr :%PORT%

package/dist/src/Lib/Websocket/ConnectionManager.php

@@ -17,7 +17,7 @@ class ConnectionManager implements MessageComponentInterface
     public function onOpen(ConnectionInterface $conn)
     {
         $this->clients->attach($conn);
-        echo "New connection! ({$conn->resourceId})\n";
+        echo "New connection! ({$conn->resourceId})";
     }
 
     public function onMessage(ConnectionInterface $from, $msg)
@@ -28,12 +28,12 @@ class ConnectionManager implements MessageComponentInterface
     public function onClose(ConnectionInterface $conn)
     {
         $this->clients->detach($conn);
-        echo "Connection {$conn->resourceId} has disconnected\n";
+        echo "Connection {$conn->resourceId} has disconnected";
     }
 
     public function onError(ConnectionInterface $conn, \Exception $e)
     {
-        echo "An error has occurred: {$e->getMessage()}\n";
+        echo "An error has occurred: {$e->getMessage()}";
         $conn->close();
     }
 }

package/package.json

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