TASK: Content cache adjustments

Neos.Neos/Classes/Cache/ContentCacheFlusherInterface.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Neos.Neos package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Cache;
+
+use Neos\ContentRepository\Core\ContentRepository;
+use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
+use Neos\Media\Domain\Model\AssetInterface;
+
+/**
+ * The interface for services flushing content caches triggered by node changes.
+ *
+ * It is called when the projection changes: In this case, it is triggered by
+ * {@see GraphProjectorCatchUpHookForCacheFlushing} which calls this method..
+ *   This is the relevant case if publishing a workspace
+ *   - where we f.e. need to flush the cache for Live.
+ * @internal this extension point is experimental 
+ */
+interface ContentCacheFlusherInterface
+{
+    /**
+     * Main entry point to *directly* flush the caches of a given NodeAggregate
+     */
+    public function flushNodeAggregate(
+        ContentRepository $contentRepository,
+        ContentStreamId $contentStreamId,
+        NodeAggregateId $nodeAggregateId
+    ): void;
+
+    /**
+     * Fetches possible usages of the asset and registers nodes that use the asset as changed.
+     */
+    public function registerAssetChange(AssetInterface $asset): void;
+}

Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php

@@ -25,6 +25,7 @@
 use Neos\Fusion\Core\Cache\ContentCache;
 use Neos\Media\Domain\Model\AssetInterface;
 use Neos\Media\Domain\Model\AssetVariantInterface;
+use Neos\Neos\Cache\ContentCacheFlusherInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -37,7 +38,7 @@
  *
  * @Flow\Scope("singleton")
  */
-class ContentCacheFlusher
+class ContentCacheFlusher implements ContentCacheFlusherInterface
 {
     /**
      * @Flow\Inject

Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushing.php

@@ -22,6 +22,7 @@
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\EventStore\Model\EventEnvelope;
+use Neos\Neos\Cache\ContentCacheFlusherInterface;
 
 /**
  * Also contains a pragmatic performance booster for some "batch" operations, where the cache flushing
@@ -116,7 +117,7 @@ public static function disabled(\Closure $fn): void
 
     public function __construct(
         private readonly ContentRepository $contentRepository,
-        private readonly ContentCacheFlusher $contentCacheFlusher
+        private readonly ContentCacheFlusherInterface $contentCacheFlusher
     ) {
     }
 
@@ -145,6 +146,11 @@ public function onBeforeEvent(EventInterface $eventInstance, EventEnvelope $even
                 $eventInstance->getNodeAggregateId()
             );
             if ($nodeAggregate) {
+                $this->scheduleCacheFlushJobForNodeAggregate(
+                    $this->contentRepository,
+                    $nodeAggregate->contentStreamId,
+                    $nodeAggregate->nodeAggregateId
+                );
                 $parentNodeAggregates = $this->contentRepository->getContentGraph()->findParentNodeAggregates(
                     $nodeAggregate->contentStreamId,
                     $nodeAggregate->nodeAggregateId

Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushingFactory.php

@@ -14,11 +14,12 @@
 
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface;
+use Neos\Neos\Cache\ContentCacheFlusherInterface;
 
 class GraphProjectorCatchUpHookForCacheFlushingFactory implements CatchUpHookFactoryInterface
 {
     public function __construct(
-        private readonly ContentCacheFlusher $contentCacheFlusher
+        private readonly ContentCacheFlusherInterface $contentCacheFlusher
     ) {
     }
 

Neos.Neos/Classes/Package.php

@@ -14,7 +14,6 @@
 
 namespace Neos\Neos;
 
-use Neos\EventStore\Model\EventEnvelope;
 use Neos\Flow\Cache\CacheManager;
 use Neos\Flow\Core\Bootstrap;
 use Neos\Flow\Monitor\FileMonitor;
@@ -26,7 +25,6 @@
 use Neos\Neos\Controller\Backend\ContentController;
 use Neos\Neos\Domain\Model\Site;
 use Neos\Neos\Domain\Service\SiteService;
-use Neos\Neos\FrontendRouting\Projection\DocumentUriPathProjection;
 use Neos\Neos\Routing\Cache\RouteCacheFlusher;
 use Neos\Neos\Fusion\Cache\ContentCacheFlusher;
 use Neos\Fusion\Core\Cache\ContentCache;

Neos.Neos/Configuration/Objects.yaml

@@ -79,3 +79,6 @@ Neos\Neos\AssetUsage\GlobalAssetUsageService:
   arguments:
     3:
       setting: Neos.Neos.assetUsage.contentRepositories
+
+Neos\Neos\Cache\ContentCacheFlusherInterface:
+  className: Neos\Neos\Fusion\Cache\ContentCacheFlusher