druxt 0.25.0-dev.20260927110413 → 0.25.0-dev.20260928061526

package/README.md

@@ -81,10 +81,49 @@ Translated routes also need a `decoupled_router` patch; see the
 | `endpoint`    | `string`          | `'/jsonapi'` | The JSON:API endpoint path.                                              |
 | `proxy.api`   | `boolean`         | `false`      | Proxy API requests via Nuxt ([guide](https://druxtjs.org/how-to/proxy)). |
 | `proxy.files` | `boolean\|string` | `false`      | Proxy Drupal files. A string sets the site.                              |
+| `cache`       | `boolean\|object` | `{}`         | The server cache, see below. `false` turns it off.                       |
 
 See the [Nuxt module API](https://druxtjs.org/api/packages/druxt/nuxt) for the full
 options list.
 
+## Server cache
+
+In production, the server keeps the JSON:API index and menus between requests
+for as long as Drupal's `Cache-Control` header allows. Drupal sets that header
+from the page cache maximum age (Administration > Configuration > Development >
+Performance). At the default of 0, nothing is kept. A request with an
+`Authorization` header or a Drupal session cookie never reads or fills the
+cache. The cache is off under `nuxt dev`.
+
+| Option                | Type     | Default             | Description                                                         |
+| --------------------- | -------- | ------------------- | ------------------------------------------------------------------- |
+| `cache.ttl`           | `number` |                     | Seconds a response may be kept at most. `0` keeps nothing.          |
+| `cache.secret`        | `string` |                     | Turns on `POST /_druxt/cache/clear`.                                |
+| `cache.sessionCookie` | `string` | `'S?SESS[0-9a-f]+'` | A pattern for the session cookie name, for a proxy that renames it. |
+
+Clear the cache from the app with `this.$store.dispatch('druxt/clearCache')`,
+or from Drupal by sending `POST /_druxt/cache/clear` with the secret in an
+`X-Druxt-Secret` header. Each Nuxt process has its own cache, so a site with
+several processes clears each one.
+
+### Clearing from Drupal with Purge
+
+The [Purge](https://www.drupal.org/project/purge) module can send that request
+whenever content changes. Enable `purge`, `purge_purger_http`,
+`purge_queuer_coretags` and a processor such as `purge_processor_lateruntime`,
+then add the bundled HTTP purger:
+
+```sh
+drush p:purger-add httpbundled
+```
+
+Give it the method `POST`, the Nuxt host and port, the path
+`/_druxt/cache/clear`, a header `X-Druxt-Secret` with the secret, and the
+invalidation type `tag`. One save then costs one request, whatever it
+invalidates, and a request refused for a wrong secret is sent again with the
+next batch. Keep the secret out of exported configuration: set it from
+`settings.php` as a `$config` override.
+
 ## DruxtClient
 
 The client is the communication layer between your application and Drupal's

package/dist/druxt.esm.js

@@ -10,6 +10,8 @@ import Vue from 'vue';
 
 const SCOPES = Symbol.for("druxt.processCache");
 const scopes = globalThis[SCOPES] || (globalThis[SCOPES] = new Map());
+const GENERATION = Symbol.for("druxt.processCacheGeneration");
+const generation = globalThis[GENERATION] || (globalThis[GENERATION] = { value: 0 });
 const credentialed = new WeakSet();
 const watched = new WeakSet();
 const runtime = { isServer: () => typeof window === "undefined" };
@@ -94,7 +96,9 @@ const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
     consumers.set(consumer, new Map());
   const entries = consumers.get(consumer);
   const cap = (seconds) => typeof ttl === "number" ? Math.min(seconds, ttl) : seconds;
+  const taken = generation.value;
   return {
+    generation: taken,
     get(key) {
       const entry = entries.get(key);
       if (!entry)
@@ -103,7 +107,9 @@ const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
         return void 0;
       return entry.value;
     },
-    set(key, value, seconds) {
+    set(key, value, seconds, since) {
+      if (since !== void 0 && since !== generation.value)
+        return value;
       if (cap(seconds) > 0)
         entries.set(key, { value, seconds: cap(seconds), created: Date.now() });
       else
@@ -112,6 +118,13 @@ const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
     }
   };
 };
+const resetProcessCache = (scope) => {
+  if (scope)
+    scopes.delete(scope);
+  else
+    scopes.clear();
+  generation.value += 1;
+};
 
 const indexCache = new WeakMap();
 const lifetimes = new WeakMap();
@@ -152,10 +165,21 @@ class DruxtClient {
     const indexKey = JSON.stringify([baseUrl, this.options.endpoint, this.options.jsonapiResourceConfig]);
     this.indexKey = indexKey;
     if (!indexCache.has(this.axios))
-      indexCache.set(this.axios, { index: {}, requests: {} });
+      indexCache.set(this.axios, { index: {}, requests: {}, generation: 0 });
     const cache = indexCache.get(this.axios);
+    this.indexCache = cache;
     this.indexRequests = cache.requests;
     this.index = cache.index[indexKey] || (cache.index[indexKey] = {});
+    this.cacheGeneration = 0;
+  }
+  clearCache() {
+    for (const prefix of Object.keys(this.index))
+      delete this.index[prefix];
+    for (const key of Object.keys(this.indexRequests))
+      delete this.indexRequests[key];
+    this.indexCache.generation += 1;
+    resetProcessCache();
+    this.cacheGeneration += 1;
   }
   processCache(scope) {
     if (!this.options.cache)
@@ -299,17 +323,24 @@ class DruxtClient {
     }
     if (!(this.index || {})[prefix]) {
       const key = [this.indexKey, prefix || ""].join(":");
+      const before = this.processCache("index");
+      const since = before ? before.generation : void 0;
+      const started = this.indexCache.generation;
       const request = this.indexRequests[key] || (this.indexRequests[key] = this.fetchIndex(prefix));
-      let lifetime;
+      let fetched;
       try {
-        lifetime = await request;
+        fetched = await request;
       } finally {
         if (this.indexRequests[key] === request)
           delete this.indexRequests[key];
       }
+      if (started !== this.indexCache.generation) {
+        return resource ? fetched.index[resource] || false : fetched.index;
+      }
+      this.index[prefix] = fetched.index;
       const shared = this.processCache("index");
-      if (shared && this.index[prefix])
-        shared.set(key, this.index[prefix], lifetime);
+      if (shared)
+        shared.set(key, fetched.index, fetched.lifetime, since);
     }
     return resource ? this.index[prefix][resource] || false : this.index[prefix];
   }
@@ -352,8 +383,7 @@ class DruxtClient {
         };
       }
     }
-    this.index[prefix] = index;
-    return Math.min(...documents.map((document) => this.cacheLifetime(document)));
+    return { index, lifetime: Math.min(...documents.map((document) => this.cacheLifetime(document))) };
   }
   async getRelated(type, id, related, query, prefix = "") {
     if (!id || !type || !related) {
@@ -399,8 +429,30 @@ class DruxtClient {
   }
 }
 
+const safeEqual = (input, secret) => {
+  let diff = input.length ^ secret.length;
+  for (let i = 0; i < input.length; i++) {
+    diff |= input.charCodeAt(i) ^ secret.charCodeAt(i % secret.length);
+  }
+  return diff === 0;
+};
+const cacheClearHandler = (secret) => (req, res) => {
+  if (req.method !== "POST") {
+    res.statusCode = 405;
+    res.setHeader("Allow", "POST");
+    return res.end();
+  }
+  if (!safeEqual(String(req.headers["x-druxt-secret"] || ""), String(secret))) {
+    res.statusCode = 401;
+    return res.end();
+  }
+  resetProcessCache();
+  res.statusCode = 204;
+  res.end();
+};
+
 var name = "druxt";
-var version = "0.25.0-dev.20260927110413";
+var version = "0.25.0-dev.20260928061526";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -459,7 +511,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@storybook/addon-docs": "^6.5.16",
-	"druxt-test-utils": "1.0.0-dev.20260927110413"
+	"druxt-test-utils": "1.0.0-dev.20260928061526"
 };
 var peerDependencies = {
 	axios: "0.28.0",
@@ -505,6 +557,12 @@ const DruxtNuxtModule = async function(moduleOptions = {}) {
   if (options.cache !== false) {
     options.cache = this.options.dev ? false : { ...options.cache };
   }
+  const { secret, ...cache } = options.cache || {};
+  if (options.cache)
+    options.cache = cache;
+  if (options.cache && secret) {
+    this.addServerMiddleware({ path: "/_druxt/cache/clear", handler: cacheClearHandler(secret) });
+  }
   this.options.baseUrl = options.baseUrl = options.baseUrl.endsWith("/") ? options.baseUrl.slice(0, -1) : options.baseUrl;
   this.options.endpoint = options.endpoint = options.endpoint.startsWith("/") ? options.endpoint : `/${options.endpoint}`;
   const druxt = new DruxtClient(options.baseUrl, {
@@ -636,16 +694,45 @@ const dehydrateResources = ({ commit, queryObject, resources, prefix }) => {
     return { id: data.id, type: data.type };
   });
 };
+const collectionHash = (query) => {
+  if (!query)
+    return "_default";
+  const queryObject = getDrupalJsonApiParams(query).getQueryObject();
+  return md5(JSON.stringify({ ...queryObject, fields: {}, include: [] }));
+};
+const flush = (tree, key, keys, leaf) => {
+  const byKey = tree[key];
+  if (!byKey)
+    return;
+  if (!keys.length && leaf === void 0)
+    return Vue.delete(tree, key);
+  for (const k of keys.length ? keys : Object.keys(byKey)) {
+    if (!byKey[k])
+      continue;
+    if (leaf !== void 0)
+      Vue.delete(byKey[k], leaf);
+    else
+      Vue.delete(byKey, k);
+  }
+};
 const DruxtStore = ({ store }) => {
   if (typeof store === "undefined") {
     throw new TypeError("Vuex store not found.");
   }
   const namespace = "druxt";
   const inFlight = new Map();
+  const generation = { value: 0 };
+  const flushInFlight = () => {
+    inFlight.clear();
+    generation.value += 1;
+  };
   const share = (key, request) => {
     if (!inFlight.has(key)) {
-      const clear = () => inFlight.delete(key);
       const promise = request();
+      const clear = () => {
+        if (inFlight.get(key) === promise)
+          inFlight.delete(key);
+      };
       inFlight.set(key, promise);
       promise.then(clear, clear);
     }
@@ -700,31 +787,33 @@ const DruxtStore = ({ store }) => {
         resource = merge(state.resources[type][id][prefix] || {}, resource, { arrayMerge: (dst, src) => src });
         Vue.set(state.resources[type][id], prefix, resource);
       },
-      flushCollection(state, { type, hash, prefix }) {
+      flushCollection(state, { type, hash, query, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue.set(state, "collections", {});
-        else if (type && !hash && !prefix)
-          Vue.set(state.collections, type, {});
-        else if (type && hash && !prefix)
-          Vue.set(state.collections[type], hash, {});
-        else if (type && hash && prefix)
-          Vue.set(state.collections[type][hash], prefix, {});
+          return Vue.set(state, "collections", {});
+        const key = hash !== void 0 ? hash : query !== void 0 ? collectionHash(query) : void 0;
+        flush(state.collections, type, key !== void 0 ? [key] : [], prefix);
       },
-      flushResource(state, { type, id, prefix }) {
+      flushResource(state, { type, id, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue.set(state, "resources", {});
-        else if (type && !id && !prefix)
-          Vue.set(state.resources, type, {});
-        else if (type && id && !prefix)
-          Vue.set(state.resources[type], id, {});
-        else if (type && id && prefix)
-          Vue.set(state.resources[type][id], prefix, {});
+          return Vue.set(state, "resources", {});
+        flush(state.resources, type, id !== void 0 ? [id] : [], prefix);
       }
     },
     actions: {
+      clearCache({ commit }) {
+        if (this.$druxt && typeof this.$druxt.clearCache === "function")
+          this.$druxt.clearCache();
+        commit("flushCollection", {});
+        commit("flushResource", {});
+        for (const mutation of ["druxt/views/flushResults", "druxtMenu/flushEntities", "druxtRouter/flushRoutes"]) {
+          if (this._mutations[mutation])
+            commit(mutation, {}, { root: true });
+        }
+      },
       async getCollection({ commit, state }, { type, query, prefix, bypassCache = false }) {
-        const queryObject = getDrupalJsonApiParams(query).getQueryObject();
-        const hash = query ? md5(JSON.stringify({ ...queryObject, fields: {}, include: [] })) : "_default";
+        const hash = collectionHash(query);
         if (!bypassCache && ((state.collections[type] || {})[hash] || {})[prefix]) {
           const cached = state.collections[type][hash][prefix];
           const hydrate = (o) => (((state.resources[o.type] || {})[o.id] || {})[prefix] || {}).data;
@@ -738,10 +827,12 @@ const DruxtStore = ({ store }) => {
             };
           }
         }
-        const key = JSON.stringify(["collection", prefix, type, hash, queryObject]);
+        const key = JSON.stringify(["collection", prefix, type, hash, getDrupalJsonApiParams(query).getQueryObject()]);
         return share(key, async () => {
+          const since = generation.value;
           const collection = await this.$druxt.getCollection(type, query, prefix);
-          commit("addCollection", { collection: { ...collection }, type, hash, prefix });
+          if (since === generation.value)
+            commit("addCollection", { collection: { ...collection }, type, hash, prefix });
           return collection;
         });
       },
@@ -755,7 +846,7 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = Array.from(new Set([...fields2, ...includes])).filter((s) => s).join(",");
         }
         let included = [];
-        if (queryObject.include && storedResource) {
+        if (queryObject.include && storedResource && !bypassCache) {
           const resources = await Promise.all(queryObject.include.split(",").filter((s) => Object.keys(storedResource.data.relationships || {}).includes(s)).map((key) => {
             let { data } = storedResource.data.relationships[key];
             data = Array.isArray(data) ? data : [data];
@@ -779,7 +870,7 @@ const DruxtStore = ({ store }) => {
         }
         const isFull = typeof (queryObject.fields || {})[type] !== "string";
         let fields = isFull ? true : (queryObject.fields || {})[type];
-        if (storedResource && !isFull && fields) {
+        if (storedResource && !isFull && fields && !bypassCache) {
           const queryFields = fields.split(",");
           const resourceFields = [
             ...Object.keys(((storedResource || {}).data || {}).attributes || {}),
@@ -790,18 +881,22 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = (missingFields || []).join(",") || void 0;
         }
         let resource;
+        const since = generation.value;
         if (bypassCache || !storedResource || fields) {
           try {
             const key = JSON.stringify(["resource", prefix, type, id, queryObject]);
             resource = await share(key, async () => {
+              const started = generation.value;
               const response = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-              commit("addResource", { prefix, resource: { ...response } });
+              if (started === generation.value)
+                commit("addResource", { prefix, resource: { ...response } });
               return response;
             });
           } catch (e) {
           }
         }
-        const result = { ...((state.resources[type] || {})[id] || {})[prefix] };
+        const stored = ((state.resources[type] || {})[id] || {})[prefix];
+        const result = { ...since === generation.value && stored ? stored : resource || stored };
         if (queryObject.include && ((resource || {}).included || (storedResource || {}).included)) {
           included = [
             ...(resource || {}).included || [],

package/dist/druxt.ssr.js

@@ -23,6 +23,8 @@ const Vue__default = /*#__PURE__*/_interopDefaultLegacy(Vue);
 
 const SCOPES = Symbol.for("druxt.processCache");
 const scopes = globalThis[SCOPES] || (globalThis[SCOPES] = new Map());
+const GENERATION = Symbol.for("druxt.processCacheGeneration");
+const generation = globalThis[GENERATION] || (globalThis[GENERATION] = { value: 0 });
 const credentialed = new WeakSet();
 const watched = new WeakSet();
 const runtime = { isServer: () => typeof window === "undefined" };
@@ -107,7 +109,9 @@ const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
     consumers.set(consumer, new Map());
   const entries = consumers.get(consumer);
   const cap = (seconds) => typeof ttl === "number" ? Math.min(seconds, ttl) : seconds;
+  const taken = generation.value;
   return {
+    generation: taken,
     get(key) {
       const entry = entries.get(key);
       if (!entry)
@@ -116,7 +120,9 @@ const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
         return void 0;
       return entry.value;
     },
-    set(key, value, seconds) {
+    set(key, value, seconds, since) {
+      if (since !== void 0 && since !== generation.value)
+        return value;
       if (cap(seconds) > 0)
         entries.set(key, { value, seconds: cap(seconds), created: Date.now() });
       else
@@ -125,6 +131,13 @@ const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
     }
   };
 };
+const resetProcessCache = (scope) => {
+  if (scope)
+    scopes.delete(scope);
+  else
+    scopes.clear();
+  generation.value += 1;
+};
 
 const indexCache = new WeakMap();
 const lifetimes = new WeakMap();
@@ -165,10 +178,21 @@ class DruxtClient {
     const indexKey = JSON.stringify([baseUrl, this.options.endpoint, this.options.jsonapiResourceConfig]);
     this.indexKey = indexKey;
     if (!indexCache.has(this.axios))
-      indexCache.set(this.axios, { index: {}, requests: {} });
+      indexCache.set(this.axios, { index: {}, requests: {}, generation: 0 });
     const cache = indexCache.get(this.axios);
+    this.indexCache = cache;
     this.indexRequests = cache.requests;
     this.index = cache.index[indexKey] || (cache.index[indexKey] = {});
+    this.cacheGeneration = 0;
+  }
+  clearCache() {
+    for (const prefix of Object.keys(this.index))
+      delete this.index[prefix];
+    for (const key of Object.keys(this.indexRequests))
+      delete this.indexRequests[key];
+    this.indexCache.generation += 1;
+    resetProcessCache();
+    this.cacheGeneration += 1;
   }
   processCache(scope) {
     if (!this.options.cache)
@@ -312,17 +336,24 @@ class DruxtClient {
     }
     if (!(this.index || {})[prefix]) {
       const key = [this.indexKey, prefix || ""].join(":");
+      const before = this.processCache("index");
+      const since = before ? before.generation : void 0;
+      const started = this.indexCache.generation;
       const request = this.indexRequests[key] || (this.indexRequests[key] = this.fetchIndex(prefix));
-      let lifetime;
+      let fetched;
       try {
-        lifetime = await request;
+        fetched = await request;
       } finally {
         if (this.indexRequests[key] === request)
           delete this.indexRequests[key];
       }
+      if (started !== this.indexCache.generation) {
+        return resource ? fetched.index[resource] || false : fetched.index;
+      }
+      this.index[prefix] = fetched.index;
       const shared = this.processCache("index");
-      if (shared && this.index[prefix])
-        shared.set(key, this.index[prefix], lifetime);
+      if (shared)
+        shared.set(key, fetched.index, fetched.lifetime, since);
     }
     return resource ? this.index[prefix][resource] || false : this.index[prefix];
   }
@@ -365,8 +396,7 @@ class DruxtClient {
         };
       }
     }
-    this.index[prefix] = index;
-    return Math.min(...documents.map((document) => this.cacheLifetime(document)));
+    return { index, lifetime: Math.min(...documents.map((document) => this.cacheLifetime(document))) };
   }
   async getRelated(type, id, related, query, prefix = "") {
     if (!id || !type || !related) {
@@ -412,8 +442,30 @@ class DruxtClient {
   }
 }
 
+const safeEqual = (input, secret) => {
+  let diff = input.length ^ secret.length;
+  for (let i = 0; i < input.length; i++) {
+    diff |= input.charCodeAt(i) ^ secret.charCodeAt(i % secret.length);
+  }
+  return diff === 0;
+};
+const cacheClearHandler = (secret) => (req, res) => {
+  if (req.method !== "POST") {
+    res.statusCode = 405;
+    res.setHeader("Allow", "POST");
+    return res.end();
+  }
+  if (!safeEqual(String(req.headers["x-druxt-secret"] || ""), String(secret))) {
+    res.statusCode = 401;
+    return res.end();
+  }
+  resetProcessCache();
+  res.statusCode = 204;
+  res.end();
+};
+
 var name = "druxt";
-var version = "0.25.0-dev.20260927110413";
+var version = "0.25.0-dev.20260928061526";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -472,7 +524,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@storybook/addon-docs": "^6.5.16",
-	"druxt-test-utils": "1.0.0-dev.20260927110413"
+	"druxt-test-utils": "1.0.0-dev.20260928061526"
 };
 var peerDependencies = {
 	axios: "0.28.0",
@@ -518,6 +570,12 @@ const DruxtNuxtModule = async function(moduleOptions = {}) {
   if (options.cache !== false) {
     options.cache = this.options.dev ? false : { ...options.cache };
   }
+  const { secret, ...cache } = options.cache || {};
+  if (options.cache)
+    options.cache = cache;
+  if (options.cache && secret) {
+    this.addServerMiddleware({ path: "/_druxt/cache/clear", handler: cacheClearHandler(secret) });
+  }
   this.options.baseUrl = options.baseUrl = options.baseUrl.endsWith("/") ? options.baseUrl.slice(0, -1) : options.baseUrl;
   this.options.endpoint = options.endpoint = options.endpoint.startsWith("/") ? options.endpoint : `/${options.endpoint}`;
   const druxt = new DruxtClient(options.baseUrl, {
@@ -649,16 +707,45 @@ const dehydrateResources = ({ commit, queryObject, resources, prefix }) => {
     return { id: data.id, type: data.type };
   });
 };
+const collectionHash = (query) => {
+  if (!query)
+    return "_default";
+  const queryObject = getDrupalJsonApiParams(query).getQueryObject();
+  return md5__default["default"](JSON.stringify({ ...queryObject, fields: {}, include: [] }));
+};
+const flush = (tree, key, keys, leaf) => {
+  const byKey = tree[key];
+  if (!byKey)
+    return;
+  if (!keys.length && leaf === void 0)
+    return Vue__default["default"].delete(tree, key);
+  for (const k of keys.length ? keys : Object.keys(byKey)) {
+    if (!byKey[k])
+      continue;
+    if (leaf !== void 0)
+      Vue__default["default"].delete(byKey[k], leaf);
+    else
+      Vue__default["default"].delete(byKey, k);
+  }
+};
 const DruxtStore = ({ store }) => {
   if (typeof store === "undefined") {
     throw new TypeError("Vuex store not found.");
   }
   const namespace = "druxt";
   const inFlight = new Map();
+  const generation = { value: 0 };
+  const flushInFlight = () => {
+    inFlight.clear();
+    generation.value += 1;
+  };
   const share = (key, request) => {
     if (!inFlight.has(key)) {
-      const clear = () => inFlight.delete(key);
       const promise = request();
+      const clear = () => {
+        if (inFlight.get(key) === promise)
+          inFlight.delete(key);
+      };
       inFlight.set(key, promise);
       promise.then(clear, clear);
     }
@@ -713,31 +800,33 @@ const DruxtStore = ({ store }) => {
         resource = merge__default["default"](state.resources[type][id][prefix] || {}, resource, { arrayMerge: (dst, src) => src });
         Vue__default["default"].set(state.resources[type][id], prefix, resource);
       },
-      flushCollection(state, { type, hash, prefix }) {
+      flushCollection(state, { type, hash, query, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue__default["default"].set(state, "collections", {});
-        else if (type && !hash && !prefix)
-          Vue__default["default"].set(state.collections, type, {});
-        else if (type && hash && !prefix)
-          Vue__default["default"].set(state.collections[type], hash, {});
-        else if (type && hash && prefix)
-          Vue__default["default"].set(state.collections[type][hash], prefix, {});
+          return Vue__default["default"].set(state, "collections", {});
+        const key = hash !== void 0 ? hash : query !== void 0 ? collectionHash(query) : void 0;
+        flush(state.collections, type, key !== void 0 ? [key] : [], prefix);
       },
-      flushResource(state, { type, id, prefix }) {
+      flushResource(state, { type, id, prefix } = {}) {
+        flushInFlight();
         if (!type)
-          Vue__default["default"].set(state, "resources", {});
-        else if (type && !id && !prefix)
-          Vue__default["default"].set(state.resources, type, {});
-        else if (type && id && !prefix)
-          Vue__default["default"].set(state.resources[type], id, {});
-        else if (type && id && prefix)
-          Vue__default["default"].set(state.resources[type][id], prefix, {});
+          return Vue__default["default"].set(state, "resources", {});
+        flush(state.resources, type, id !== void 0 ? [id] : [], prefix);
       }
     },
     actions: {
+      clearCache({ commit }) {
+        if (this.$druxt && typeof this.$druxt.clearCache === "function")
+          this.$druxt.clearCache();
+        commit("flushCollection", {});
+        commit("flushResource", {});
+        for (const mutation of ["druxt/views/flushResults", "druxtMenu/flushEntities", "druxtRouter/flushRoutes"]) {
+          if (this._mutations[mutation])
+            commit(mutation, {}, { root: true });
+        }
+      },
       async getCollection({ commit, state }, { type, query, prefix, bypassCache = false }) {
-        const queryObject = getDrupalJsonApiParams(query).getQueryObject();
-        const hash = query ? md5__default["default"](JSON.stringify({ ...queryObject, fields: {}, include: [] })) : "_default";
+        const hash = collectionHash(query);
         if (!bypassCache && ((state.collections[type] || {})[hash] || {})[prefix]) {
           const cached = state.collections[type][hash][prefix];
           const hydrate = (o) => (((state.resources[o.type] || {})[o.id] || {})[prefix] || {}).data;
@@ -751,10 +840,12 @@ const DruxtStore = ({ store }) => {
             };
           }
         }
-        const key = JSON.stringify(["collection", prefix, type, hash, queryObject]);
+        const key = JSON.stringify(["collection", prefix, type, hash, getDrupalJsonApiParams(query).getQueryObject()]);
         return share(key, async () => {
+          const since = generation.value;
           const collection = await this.$druxt.getCollection(type, query, prefix);
-          commit("addCollection", { collection: { ...collection }, type, hash, prefix });
+          if (since === generation.value)
+            commit("addCollection", { collection: { ...collection }, type, hash, prefix });
           return collection;
         });
       },
@@ -768,7 +859,7 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = Array.from(new Set([...fields2, ...includes])).filter((s) => s).join(",");
         }
         let included = [];
-        if (queryObject.include && storedResource) {
+        if (queryObject.include && storedResource && !bypassCache) {
           const resources = await Promise.all(queryObject.include.split(",").filter((s) => Object.keys(storedResource.data.relationships || {}).includes(s)).map((key) => {
             let { data } = storedResource.data.relationships[key];
             data = Array.isArray(data) ? data : [data];
@@ -792,7 +883,7 @@ const DruxtStore = ({ store }) => {
         }
         const isFull = typeof (queryObject.fields || {})[type] !== "string";
         let fields = isFull ? true : (queryObject.fields || {})[type];
-        if (storedResource && !isFull && fields) {
+        if (storedResource && !isFull && fields && !bypassCache) {
           const queryFields = fields.split(",");
           const resourceFields = [
             ...Object.keys(((storedResource || {}).data || {}).attributes || {}),
@@ -803,18 +894,22 @@ const DruxtStore = ({ store }) => {
           queryObject.fields[type] = (missingFields || []).join(",") || void 0;
         }
         let resource;
+        const since = generation.value;
         if (bypassCache || !storedResource || fields) {
           try {
             const key = JSON.stringify(["resource", prefix, type, id, queryObject]);
             resource = await share(key, async () => {
+              const started = generation.value;
               const response = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-              commit("addResource", { prefix, resource: { ...response } });
+              if (started === generation.value)
+                commit("addResource", { prefix, resource: { ...response } });
               return response;
             });
           } catch (e) {
           }
         }
-        const result = { ...((state.resources[type] || {})[id] || {})[prefix] };
+        const stored = ((state.resources[type] || {})[id] || {})[prefix];
+        const result = { ...since === generation.value && stored ? stored : resource || stored };
         if (queryObject.include && ((resource || {}).included || (storedResource || {}).included)) {
           included = [
             ...(resource || {}).included || [],

package/dist/server-middleware/cacheClear.mjs

@@ -0,0 +1,39 @@
+import { resetProcessCache } from '../utils/processCache'
+
+// Compares in time that depends on the caller's input alone: the loop runs its
+// length, and the secret's content and length only feed the accumulator. Node's
+// crypto is not used, as this file is part of the browser bundle too.
+const safeEqual = (input, secret) => {
+  let diff = input.length ^ secret.length
+  for (let i = 0; i < input.length; i++) {
+    diff |= input.charCodeAt(i) ^ secret.charCodeAt(i % secret.length)
+  }
+  return diff === 0
+}
+
+/**
+ * Server middleware that empties the process cache when Drupal asks.
+ *
+ * Accepts `POST` with the secret in the `X-Druxt-Secret` header, never in the URL,
+ * so it stays out of access logs.
+ *
+ * @param {string} secret - The shared secret, from `druxt.cache.secret`.
+ *
+ * @returns {Function} A Connect handler.
+ */
+export const cacheClearHandler = (secret) => (req, res) => {
+  if (req.method !== 'POST') {
+    res.statusCode = 405
+    res.setHeader('Allow', 'POST')
+    return res.end()
+  }
+
+  if (!safeEqual(String(req.headers['x-druxt-secret'] || ''), String(secret))) {
+    res.statusCode = 401
+    return res.end()
+  }
+
+  resetProcessCache()
+  res.statusCode = 204
+  res.end()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt",
-  "version": "0.25.0-dev.20260927110413",
+  "version": "0.25.0-dev.20260928061526",
   "description": "The Fully Decoupled Drupal Framework for Nuxt.js.",
   "keywords": [
     "cms",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@storybook/addon-docs": "^6.5.16",
-    "druxt-test-utils": "1.0.0-dev.20260927110413"
+    "druxt-test-utils": "1.0.0-dev.20260928061526"
   },
   "peerDependencies": {
     "axios": "0.28.0",