druxt 0.25.0-dev.20260921034536 → 0.25.0-dev.20260927110413

package/dist/druxt.esm.js

@@ -8,7 +8,113 @@ import merge from 'deepmerge';
 import md5 from 'md5';
 import Vue from 'vue';
 
+const SCOPES = Symbol.for("druxt.processCache");
+const scopes = globalThis[SCOPES] || (globalThis[SCOPES] = new Map());
+const credentialed = new WeakSet();
+const watched = new WeakSet();
+const runtime = { isServer: () => typeof window === "undefined" };
+const DRUPAL_SESSION_COOKIE = "S?SESS[0-9a-f]+";
+const consumerId = (axios) => {
+  const headers = ((axios || {}).defaults || {}).headers || {};
+  for (const set of [headers, headers.common, headers.get]) {
+    const match = Object.entries(set || {}).find(([name]) => name.toLowerCase() === "x-consumer-id");
+    if (match && match[1])
+      return String(match[1]);
+  }
+  return "";
+};
+const headersHaveCredentials = (headers, sessionCookie) => {
+  const session = new RegExp(`(?:^|;\\s*)(?:${sessionCookie})=`, "i");
+  return Object.entries(headers || {}).some(([name, value]) => {
+    if (!value || typeof value === "object")
+      return false;
+    const header = name.toLowerCase();
+    return header === "authorization" || header === "cookie" && session.test(String(value));
+  });
+};
+const configHasCredentials = (config, sessionCookie = DRUPAL_SESSION_COOKIE) => {
+  if (!config)
+    return false;
+  if (config.auth)
+    return true;
+  const headers = config.headers || {};
+  return headersHaveCredentials(headers, sessionCookie) || headersHaveCredentials(headers.common, sessionCookie) || headersHaveCredentials(headers.get, sessionCookie);
+};
+const hasCredentials = (axios, sessionCookie = DRUPAL_SESSION_COOKIE) => {
+  if (!axios)
+    return false;
+  if (credentialed.has(axios))
+    return true;
+  return configHasCredentials(axios.defaults, sessionCookie);
+};
+const watchCredentials = (axios, sessionCookie = DRUPAL_SESSION_COOKIE) => {
+  const interceptors = ((axios || {}).interceptors || {}).response;
+  if (!interceptors || typeof interceptors.use !== "function" || watched.has(axios))
+    return;
+  watched.add(axios);
+  const mark = (config) => {
+    if (configHasCredentials(config, sessionCookie))
+      credentialed.add(axios);
+  };
+  interceptors.use((response) => {
+    mark((response || {}).config);
+    return response;
+  }, (error) => {
+    mark((error || {}).config);
+    return Promise.reject(error);
+  });
+};
+const parseCacheLifetime = (headers) => {
+  const header = (name) => Object.entries(headers || {}).filter(([key]) => key.toLowerCase() === name).map(([, value]) => String(value)).join(", ");
+  const directives = header("cache-control").toLowerCase().split(",").map((d) => d.trim());
+  if (directives.some((d) => ["private", "no-store", "no-cache"].includes(d)))
+    return 0;
+  const vary = header("vary").toLowerCase().split(",").map((v) => v.trim()).filter(Boolean);
+  if (vary.some((v) => !["cookie", "x-consumer-id", "accept-encoding"].includes(v)))
+    return 0;
+  const seconds = (name) => {
+    const directive = directives.find((d) => d.startsWith(`${name}=`));
+    const value = directive ? directive.slice(name.length + 1) : "";
+    return /^\d+$/.test(value) ? Number(value) : NaN;
+  };
+  const lifetime = directives.some((d) => d.startsWith("s-maxage=")) ? seconds("s-maxage") : seconds("max-age");
+  if (Number.isNaN(lifetime))
+    return 0;
+  const age = parseInt(header("age"), 10) || 0;
+  return Math.max(0, lifetime - age);
+};
+const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
+  if (!runtime.isServer() || hasCredentials(axios, sessionCookie))
+    return null;
+  if (!scopes.has(scope))
+    scopes.set(scope, new Map());
+  const consumers = scopes.get(scope);
+  const consumer = consumerId(axios);
+  if (!consumers.has(consumer))
+    consumers.set(consumer, new Map());
+  const entries = consumers.get(consumer);
+  const cap = (seconds) => typeof ttl === "number" ? Math.min(seconds, ttl) : seconds;
+  return {
+    get(key) {
+      const entry = entries.get(key);
+      if (!entry)
+        return void 0;
+      if (Date.now() - entry.created >= cap(entry.seconds) * 1e3)
+        return void 0;
+      return entry.value;
+    },
+    set(key, value, seconds) {
+      if (cap(seconds) > 0)
+        entries.set(key, { value, seconds: cap(seconds), created: Date.now() });
+      else
+        entries.delete(key);
+      return value;
+    }
+  };
+};
+
 const indexCache = new WeakMap();
+const lifetimes = new WeakMap();
 class DruxtClient {
   constructor(baseUrl, options = {}) {
     this.log = consola.create({ defaults: {
@@ -41,6 +147,8 @@ class DruxtClient {
       jsonapiResourceConfig: "jsonapi_resource_config--jsonapi_resource_config",
       ...options
     };
+    if (this.options.cache)
+      watchCredentials(this.axios, this.options.cache.sessionCookie);
     const indexKey = JSON.stringify([baseUrl, this.options.endpoint, this.options.jsonapiResourceConfig]);
     this.indexKey = indexKey;
     if (!indexCache.has(this.axios))
@@ -49,6 +157,18 @@ class DruxtClient {
     this.indexRequests = cache.requests;
     this.index = cache.index[indexKey] || (cache.index[indexKey] = {});
   }
+  processCache(scope) {
+    if (!this.options.cache)
+      return null;
+    const { ttl, sessionCookie } = this.options.cache;
+    return processCache(scope, { axios: this.axios, ttl, sessionCookie });
+  }
+  cacheLifetime(document) {
+    const record = document && typeof document === "object" && lifetimes.get(document);
+    if (!record)
+      return 0;
+    return Math.max(0, record.seconds - Math.floor((Date.now() - record.at) / 1e3));
+  }
   addHeaders(headers) {
     if (typeof headers === "undefined") {
       return false;
@@ -142,6 +262,8 @@ class DruxtClient {
   async get(url, options) {
     try {
       const res = await this.axios.get(url, options);
+      if (res && res.data && typeof res.data === "object")
+        lifetimes.set(res.data, { seconds: parseCacheLifetime(res.headers), at: Date.now() });
       return res;
     } catch (err) {
       this.error(err, { url });
@@ -168,15 +290,26 @@ class DruxtClient {
     return collections;
   }
   async getIndex(resource, prefix) {
+    if (!(this.index || {})[prefix]) {
+      const shared = this.processCache("index");
+      const sharedKey = [this.indexKey, prefix || ""].join(":");
+      const stored = shared && shared.get(sharedKey);
+      if (stored)
+        this.index[prefix] = stored;
+    }
     if (!(this.index || {})[prefix]) {
       const key = [this.indexKey, prefix || ""].join(":");
       const request = this.indexRequests[key] || (this.indexRequests[key] = this.fetchIndex(prefix));
+      let lifetime;
       try {
-        await request;
+        lifetime = await request;
       } finally {
         if (this.indexRequests[key] === request)
           delete this.indexRequests[key];
       }
+      const shared = this.processCache("index");
+      if (shared && this.index[prefix])
+        shared.set(key, this.index[prefix], lifetime);
     }
     return resource ? this.index[prefix][resource] || false : this.index[prefix];
   }
@@ -193,10 +326,13 @@ class DruxtClient {
       value.href = value.href.replace(baseUrl, "");
       return [key, value];
     }));
+    const documents = [data];
     if (index[this.options.jsonapiResourceConfig]) {
       let resources = [];
       try {
-        resources = (await this.get(index[this.options.jsonapiResourceConfig].href)).data.data;
+        const config = (await this.get(index[this.options.jsonapiResourceConfig].href)).data;
+        resources = config.data;
+        documents.push(config);
       } catch (err) {
         this.log.warn(err.message);
       }
@@ -217,6 +353,7 @@ class DruxtClient {
       }
     }
     this.index[prefix] = index;
+    return Math.min(...documents.map((document) => this.cacheLifetime(document)));
   }
   async getRelated(type, id, related, query, prefix = "") {
     if (!id || !type || !related) {
@@ -263,7 +400,7 @@ class DruxtClient {
 }
 
 var name = "druxt";
-var version = "0.25.0-dev.20260921034536";
+var version = "0.25.0-dev.20260927110413";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -322,7 +459,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@storybook/addon-docs": "^6.5.16",
-	"druxt-test-utils": "1.0.0-dev.20260921034536"
+	"druxt-test-utils": "1.0.0-dev.20260927110413"
 };
 var peerDependencies = {
 	axios: "0.28.0",
@@ -365,6 +502,9 @@ const DruxtNuxtModule = async function(moduleOptions = {}) {
     ...moduleOptions,
     ...(this.options || {}).druxt
   };
+  if (options.cache !== false) {
+    options.cache = this.options.dev ? false : { ...options.cache };
+  }
   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, {
@@ -501,6 +641,16 @@ const DruxtStore = ({ store }) => {
     throw new TypeError("Vuex store not found.");
   }
   const namespace = "druxt";
+  const inFlight = new Map();
+  const share = (key, request) => {
+    if (!inFlight.has(key)) {
+      const clear = () => inFlight.delete(key);
+      const promise = request();
+      inFlight.set(key, promise);
+      promise.then(clear, clear);
+    }
+    return inFlight.get(key);
+  };
   const module = {
     namespaced: true,
     state: () => ({
@@ -588,9 +738,12 @@ const DruxtStore = ({ store }) => {
             };
           }
         }
-        const collection = await this.$druxt.getCollection(type, query, prefix);
-        commit("addCollection", { collection: { ...collection }, type, hash, prefix });
-        return collection;
+        const key = JSON.stringify(["collection", prefix, type, hash, queryObject]);
+        return share(key, async () => {
+          const collection = await this.$druxt.getCollection(type, query, prefix);
+          commit("addCollection", { collection: { ...collection }, type, hash, prefix });
+          return collection;
+        });
       },
       async getResource({ commit, dispatch, state }, { type, id, query, prefix, bypassCache = false }) {
         const storedResource = ((state.resources[type] || {})[id] || {})[prefix] ? { ...state.resources[type][id][prefix] } : null;
@@ -639,8 +792,12 @@ const DruxtStore = ({ store }) => {
         let resource;
         if (bypassCache || !storedResource || fields) {
           try {
-            resource = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-            commit("addResource", { prefix, resource: { ...resource } });
+            const key = JSON.stringify(["resource", prefix, type, id, queryObject]);
+            resource = await share(key, async () => {
+              const response = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
+              commit("addResource", { prefix, resource: { ...response } });
+              return response;
+            });
           } catch (e) {
           }
         }

package/dist/druxt.ssr.js

@@ -21,7 +21,113 @@ const merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 const md5__default = /*#__PURE__*/_interopDefaultLegacy(md5);
 const Vue__default = /*#__PURE__*/_interopDefaultLegacy(Vue);
 
+const SCOPES = Symbol.for("druxt.processCache");
+const scopes = globalThis[SCOPES] || (globalThis[SCOPES] = new Map());
+const credentialed = new WeakSet();
+const watched = new WeakSet();
+const runtime = { isServer: () => typeof window === "undefined" };
+const DRUPAL_SESSION_COOKIE = "S?SESS[0-9a-f]+";
+const consumerId = (axios) => {
+  const headers = ((axios || {}).defaults || {}).headers || {};
+  for (const set of [headers, headers.common, headers.get]) {
+    const match = Object.entries(set || {}).find(([name]) => name.toLowerCase() === "x-consumer-id");
+    if (match && match[1])
+      return String(match[1]);
+  }
+  return "";
+};
+const headersHaveCredentials = (headers, sessionCookie) => {
+  const session = new RegExp(`(?:^|;\\s*)(?:${sessionCookie})=`, "i");
+  return Object.entries(headers || {}).some(([name, value]) => {
+    if (!value || typeof value === "object")
+      return false;
+    const header = name.toLowerCase();
+    return header === "authorization" || header === "cookie" && session.test(String(value));
+  });
+};
+const configHasCredentials = (config, sessionCookie = DRUPAL_SESSION_COOKIE) => {
+  if (!config)
+    return false;
+  if (config.auth)
+    return true;
+  const headers = config.headers || {};
+  return headersHaveCredentials(headers, sessionCookie) || headersHaveCredentials(headers.common, sessionCookie) || headersHaveCredentials(headers.get, sessionCookie);
+};
+const hasCredentials = (axios, sessionCookie = DRUPAL_SESSION_COOKIE) => {
+  if (!axios)
+    return false;
+  if (credentialed.has(axios))
+    return true;
+  return configHasCredentials(axios.defaults, sessionCookie);
+};
+const watchCredentials = (axios, sessionCookie = DRUPAL_SESSION_COOKIE) => {
+  const interceptors = ((axios || {}).interceptors || {}).response;
+  if (!interceptors || typeof interceptors.use !== "function" || watched.has(axios))
+    return;
+  watched.add(axios);
+  const mark = (config) => {
+    if (configHasCredentials(config, sessionCookie))
+      credentialed.add(axios);
+  };
+  interceptors.use((response) => {
+    mark((response || {}).config);
+    return response;
+  }, (error) => {
+    mark((error || {}).config);
+    return Promise.reject(error);
+  });
+};
+const parseCacheLifetime = (headers) => {
+  const header = (name) => Object.entries(headers || {}).filter(([key]) => key.toLowerCase() === name).map(([, value]) => String(value)).join(", ");
+  const directives = header("cache-control").toLowerCase().split(",").map((d) => d.trim());
+  if (directives.some((d) => ["private", "no-store", "no-cache"].includes(d)))
+    return 0;
+  const vary = header("vary").toLowerCase().split(",").map((v) => v.trim()).filter(Boolean);
+  if (vary.some((v) => !["cookie", "x-consumer-id", "accept-encoding"].includes(v)))
+    return 0;
+  const seconds = (name) => {
+    const directive = directives.find((d) => d.startsWith(`${name}=`));
+    const value = directive ? directive.slice(name.length + 1) : "";
+    return /^\d+$/.test(value) ? Number(value) : NaN;
+  };
+  const lifetime = directives.some((d) => d.startsWith("s-maxage=")) ? seconds("s-maxage") : seconds("max-age");
+  if (Number.isNaN(lifetime))
+    return 0;
+  const age = parseInt(header("age"), 10) || 0;
+  return Math.max(0, lifetime - age);
+};
+const processCache = (scope, { axios, ttl, sessionCookie } = {}) => {
+  if (!runtime.isServer() || hasCredentials(axios, sessionCookie))
+    return null;
+  if (!scopes.has(scope))
+    scopes.set(scope, new Map());
+  const consumers = scopes.get(scope);
+  const consumer = consumerId(axios);
+  if (!consumers.has(consumer))
+    consumers.set(consumer, new Map());
+  const entries = consumers.get(consumer);
+  const cap = (seconds) => typeof ttl === "number" ? Math.min(seconds, ttl) : seconds;
+  return {
+    get(key) {
+      const entry = entries.get(key);
+      if (!entry)
+        return void 0;
+      if (Date.now() - entry.created >= cap(entry.seconds) * 1e3)
+        return void 0;
+      return entry.value;
+    },
+    set(key, value, seconds) {
+      if (cap(seconds) > 0)
+        entries.set(key, { value, seconds: cap(seconds), created: Date.now() });
+      else
+        entries.delete(key);
+      return value;
+    }
+  };
+};
+
 const indexCache = new WeakMap();
+const lifetimes = new WeakMap();
 class DruxtClient {
   constructor(baseUrl, options = {}) {
     this.log = consola__default["default"].create({ defaults: {
@@ -54,6 +160,8 @@ class DruxtClient {
       jsonapiResourceConfig: "jsonapi_resource_config--jsonapi_resource_config",
       ...options
     };
+    if (this.options.cache)
+      watchCredentials(this.axios, this.options.cache.sessionCookie);
     const indexKey = JSON.stringify([baseUrl, this.options.endpoint, this.options.jsonapiResourceConfig]);
     this.indexKey = indexKey;
     if (!indexCache.has(this.axios))
@@ -62,6 +170,18 @@ class DruxtClient {
     this.indexRequests = cache.requests;
     this.index = cache.index[indexKey] || (cache.index[indexKey] = {});
   }
+  processCache(scope) {
+    if (!this.options.cache)
+      return null;
+    const { ttl, sessionCookie } = this.options.cache;
+    return processCache(scope, { axios: this.axios, ttl, sessionCookie });
+  }
+  cacheLifetime(document) {
+    const record = document && typeof document === "object" && lifetimes.get(document);
+    if (!record)
+      return 0;
+    return Math.max(0, record.seconds - Math.floor((Date.now() - record.at) / 1e3));
+  }
   addHeaders(headers) {
     if (typeof headers === "undefined") {
       return false;
@@ -155,6 +275,8 @@ class DruxtClient {
   async get(url, options) {
     try {
       const res = await this.axios.get(url, options);
+      if (res && res.data && typeof res.data === "object")
+        lifetimes.set(res.data, { seconds: parseCacheLifetime(res.headers), at: Date.now() });
       return res;
     } catch (err) {
       this.error(err, { url });
@@ -181,15 +303,26 @@ class DruxtClient {
     return collections;
   }
   async getIndex(resource, prefix) {
+    if (!(this.index || {})[prefix]) {
+      const shared = this.processCache("index");
+      const sharedKey = [this.indexKey, prefix || ""].join(":");
+      const stored = shared && shared.get(sharedKey);
+      if (stored)
+        this.index[prefix] = stored;
+    }
     if (!(this.index || {})[prefix]) {
       const key = [this.indexKey, prefix || ""].join(":");
       const request = this.indexRequests[key] || (this.indexRequests[key] = this.fetchIndex(prefix));
+      let lifetime;
       try {
-        await request;
+        lifetime = await request;
       } finally {
         if (this.indexRequests[key] === request)
           delete this.indexRequests[key];
       }
+      const shared = this.processCache("index");
+      if (shared && this.index[prefix])
+        shared.set(key, this.index[prefix], lifetime);
     }
     return resource ? this.index[prefix][resource] || false : this.index[prefix];
   }
@@ -206,10 +339,13 @@ class DruxtClient {
       value.href = value.href.replace(baseUrl, "");
       return [key, value];
     }));
+    const documents = [data];
     if (index[this.options.jsonapiResourceConfig]) {
       let resources = [];
       try {
-        resources = (await this.get(index[this.options.jsonapiResourceConfig].href)).data.data;
+        const config = (await this.get(index[this.options.jsonapiResourceConfig].href)).data;
+        resources = config.data;
+        documents.push(config);
       } catch (err) {
         this.log.warn(err.message);
       }
@@ -230,6 +366,7 @@ class DruxtClient {
       }
     }
     this.index[prefix] = index;
+    return Math.min(...documents.map((document) => this.cacheLifetime(document)));
   }
   async getRelated(type, id, related, query, prefix = "") {
     if (!id || !type || !related) {
@@ -276,7 +413,7 @@ class DruxtClient {
 }
 
 var name = "druxt";
-var version = "0.25.0-dev.20260921034536";
+var version = "0.25.0-dev.20260927110413";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -335,7 +472,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@storybook/addon-docs": "^6.5.16",
-	"druxt-test-utils": "1.0.0-dev.20260921034536"
+	"druxt-test-utils": "1.0.0-dev.20260927110413"
 };
 var peerDependencies = {
 	axios: "0.28.0",
@@ -378,6 +515,9 @@ const DruxtNuxtModule = async function(moduleOptions = {}) {
     ...moduleOptions,
     ...(this.options || {}).druxt
   };
+  if (options.cache !== false) {
+    options.cache = this.options.dev ? false : { ...options.cache };
+  }
   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, {
@@ -514,6 +654,16 @@ const DruxtStore = ({ store }) => {
     throw new TypeError("Vuex store not found.");
   }
   const namespace = "druxt";
+  const inFlight = new Map();
+  const share = (key, request) => {
+    if (!inFlight.has(key)) {
+      const clear = () => inFlight.delete(key);
+      const promise = request();
+      inFlight.set(key, promise);
+      promise.then(clear, clear);
+    }
+    return inFlight.get(key);
+  };
   const module = {
     namespaced: true,
     state: () => ({
@@ -601,9 +751,12 @@ const DruxtStore = ({ store }) => {
             };
           }
         }
-        const collection = await this.$druxt.getCollection(type, query, prefix);
-        commit("addCollection", { collection: { ...collection }, type, hash, prefix });
-        return collection;
+        const key = JSON.stringify(["collection", prefix, type, hash, queryObject]);
+        return share(key, async () => {
+          const collection = await this.$druxt.getCollection(type, query, prefix);
+          commit("addCollection", { collection: { ...collection }, type, hash, prefix });
+          return collection;
+        });
       },
       async getResource({ commit, dispatch, state }, { type, id, query, prefix, bypassCache = false }) {
         const storedResource = ((state.resources[type] || {})[id] || {})[prefix] ? { ...state.resources[type][id][prefix] } : null;
@@ -652,8 +805,12 @@ const DruxtStore = ({ store }) => {
         let resource;
         if (bypassCache || !storedResource || fields) {
           try {
-            resource = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
-            commit("addResource", { prefix, resource: { ...resource } });
+            const key = JSON.stringify(["resource", prefix, type, id, queryObject]);
+            resource = await share(key, async () => {
+              const response = await this.$druxt.getResource(type, id, getDrupalJsonApiParams(queryObject), prefix);
+              commit("addResource", { prefix, resource: { ...response } });
+              return response;
+            });
           } catch (e) {
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt",
-  "version": "0.25.0-dev.20260921034536",
+  "version": "0.25.0-dev.20260927110413",
   "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.20260921034536"
+    "druxt-test-utils": "1.0.0-dev.20260927110413"
   },
   "peerDependencies": {
     "axios": "0.28.0",