update

Author: ChiragAgg5k

README.md

@@ -217,14 +217,16 @@ Groups are designed to be actions that run during the lifecycle of requests to e
 
 ### Resources
 
-Resources allow you to prepare dependencies for requests such as database connection or the user who sent the request. A new instance of a resource is created for every request.
+Resources allow you to prepare dependencies for requests such as database connections or shared services. Register application dependencies on the DI container with `set()`. Runtime values such as `request`, `response`, `route`, `error`, and `context` are scoped by `Http` for each request.
 
-Define a resource on the DI container:
+Define a dependency on the DI container:
 
 ```php
-$container->setResource('timing', function() {
+use Utopia\DI\Dependency;
+
+$container->set('bootTime', new Dependency([], function () {
     return \microtime(true);
-});
+}));
 ```
 
 Inject resource into endpoint action:
@@ -233,21 +235,21 @@ Inject resource into endpoint action:
 $http = new Http(new Server(), 'America/New_York', $container);
 
 Http::get('/')
-    ->inject('timing')
+    ->inject('bootTime')
     ->inject('response')
-    ->action(function(float $timing, Response $response) {
-        $response->send('Request Unix timestamp: ' . \strval($timing));
+    ->action(function(float $bootTime, Response $response) {
+        $response->send('Process started at: ' . \strval($bootTime));
     });
 ```
 
 Inject resource into a hook:
 
 ```php
 Http::shutdown()
-    ->inject('timing')
-    ->action(function(float $timing) {
-        $difference = \microtime(true) - $timing;
-        \var_dump("Request took: " . $difference . " seconds");
+    ->inject('bootTime')
+    ->action(function(float $bootTime) {
+        $uptime = \microtime(true) - $bootTime;
+        \var_dump("Process uptime: " . $uptime . " seconds");
     });
 ```
 

composer.lock

@@ -2,7 +2,8 @@
 
 namespace Utopia\Http;
 
-use Utopia\DI\Container as DIContainer;
+use Utopia\DI\Container;
+use Utopia\DI\Dependency;
 use Utopia\Validator;
 
 class Http
@@ -38,12 +39,12 @@ class Http
      */
     protected Files $files;
 
-    protected DIContainer $resourceContainer;
+    protected Container $resourceContainer;
 
     /**
-     * @var array<string, array<string, bool>>
+     * @var array<string, Container>
      */
-    protected array $resourceNames = [];
+    protected array $scopedContainers = [];
 
     /**
      * Current running mode
@@ -129,14 +130,14 @@ class Http
      *
      * @param Adapter $server
      * @param  string  $timezone
-     * @param  DIContainer|null  $resourceContainer
+     * @param  Container|null  $resourceContainer
      */
-    public function __construct(Adapter $server, string $timezone, ?DIContainer $resourceContainer = null)
+    public function __construct(Adapter $server, string $timezone, ?Container $resourceContainer = null)
     {
         \date_default_timezone_set($timezone);
         $this->files = new Files();
         $this->server = $server;
-        $this->resourceContainer = $resourceContainer ?? new DIContainer();
+        $this->resourceContainer = $resourceContainer ?? new Container();
     }
 
     /**
@@ -879,7 +880,7 @@ public static function reset(): void
         self::$wildcardRoute = null;
     }
 
-    public function getResourceContainer(): DIContainer
+    public function getResourceContainer(): Container
     {
         return $this->resourceContainer;
     }
@@ -891,7 +892,11 @@ protected function resolveResource(string $name, string $context = 'utopia', boo
         }
 
         try {
-            return $this->resourceContainer->getResource($name, $context, $fresh);
+            if ($fresh && $context !== 'utopia') {
+                unset($this->scopedContainers[$context]);
+            }
+
+            return $this->getContextContainer($context)->get($name);
         } catch (\Throwable $e) {
             $message = \str_replace('dependency', 'resource', $e->getMessage());
 
@@ -920,8 +925,7 @@ protected function registerResource(string $name, callable $callback, array $inj
             throw new Exception("'utopia' is a reserved keyword.", 500);
         }
 
-        $this->resourceContainer->setResource($name, $callback, $injections, $context);
-        $this->resourceNames[$context][$name] = true;
+        $this->getContextContainer($context)->set($name, new Dependency($injections, $callback));
     }
 
     protected function registerRequestResources(Request $request, Response $response, string $context, array $resources = []): void
@@ -933,19 +937,28 @@ protected function registerRequestResources(Request $request, Response $response
 
     protected function refreshResources(string $context): void
     {
-        $resources = \array_unique(\array_merge(
-            \array_keys($this->resourceNames['utopia'] ?? []),
-            \array_keys($this->resourceNames[$context] ?? [])
-        ));
-
-        foreach ($resources as $resource) {
-            $this->resourceContainer->refresh($resource, $context);
+        if ($context === 'utopia') {
+            return;
         }
+
+        unset($this->scopedContainers[$context]);
     }
 
     protected function purgeResources(string $context): void
     {
-        $this->resourceContainer->purge($context);
-        unset($this->resourceNames[$context]);
+        unset($this->scopedContainers[$context]);
+    }
+
+    protected function getContextContainer(string $context = 'utopia'): Container
+    {
+        if ($context === 'utopia') {
+            return $this->resourceContainer;
+        }
+
+        if (!isset($this->scopedContainers[$context])) {
+            $this->scopedContainers[$context] = $this->resourceContainer->scope();
+        }
+
+        return $this->scopedContainers[$context];
     }
 }