Changeset 3791202 for cliedesk/trunk/src/Rest/RestServer.php

Timestamp:

11/08/2026 04:28:35 PM (5 hours ago)

Author:

degird

Message:

Release 1.2.4

File:

• cliedesk/trunk/src/Rest/RestServer.php (modified) (4 diffs)

cliedesk/trunk/src/Rest/RestServer.php

@@ -19 +19 @@
 use Cliedesk\Infrastructure\ChangeLog;
 use Cliedesk\Infrastructure\Ephemeral;
+use Cliedesk\Infrastructure\Http\NoCache;
 use Cliedesk\Infrastructure\Jobs\Kick;
 use Cliedesk\Infrastructure\RequestId;
@@ -78 +79 @@
                 add_filter( 'rest_pre_dispatch', array( $this, 'complete_routes' ), 0, 3 );
                 add_filter( 'rest_pre_dispatch', array( $this, 'guard' ), 10, 3 );
+                add_filter( 'rest_pre_dispatch', array( $this, 'never_cache' ), 0, 3 );
                 add_filter( 'rest_post_dispatch', array( $this, 'headers' ), 10, 3 );
                 add_filter( 'rest_index', array( $this, 'trim_index' ) );
@@ -273 +275 @@
 
         /**
-         * Add X-Request-Id and no-store headers to cliedesk/v1 responses.
+         * `rest_pre_dispatch`: a page cache never stores a Cliedesk answer, streams and early exits included. Only for a
+         * real REST request: a route called from inside a normal page does not make that page uncacheable.
+         *
+         * @param mixed            $result  Result so far.
+         * @param \WP_REST_Server  $server  Server.
+         * @param \WP_REST_Request $request Request.
+         * @return mixed
+         */
+        public function never_cache( $result, $server, $request ) {
+                if ( defined( 'REST_REQUEST' ) && REST_REQUEST && NoCache::is_own_route( (string) $request->get_route() ) ) {
+                        NoCache::refuse();
+                }
+                return $result;
+        }
+
+        /**
+         * Add the no-cache headers to Cliedesk's responses, and X-Request-Id and no-store to cliedesk/v1 responses.
          *
          * @param \WP_HTTP_Response $response Response.
@@ -281 +299 @@
          */
         public function headers( $response, $server, $request ) {
-                if ( str_starts_with( (string) $request->get_route(), '/' . RouteRegistry::NAMESPACE ) ) {
+                $route = (string) $request->get_route();
+                if ( ! NoCache::is_own_route( $route ) ) {
+                        return $response;
+                }
+                foreach ( NoCache::headers() as $name => $value ) {
+                        $response->header( $name, $value );
+                }
+                if ( 0 === stripos( $route, '/' . RouteRegistry::NAMESPACE ) ) {
                         $response->header( 'X-Request-Id', RequestId::get() );
                         $response->header( 'Cache-Control', 'no-store, private' );