@prezly/theme-kit-nextjs 10.9.1 → 10.9.3

package/build/adapters/prezly/cache/configure.cjs

@@ -25,9 +25,11 @@ function configure(config) {
   return undefined;
 }
 function configureStorage(config) {
-  var caches = [config.memory ? _themeKitCore.ContentDelivery.createSharedMemoryCache() : undefined, config.redis ? (0, _redis.createRedisCache)(_objectSpread({
+  var caches = [config.memory ? _themeKitCore.ContentDelivery.createSharedMemoryCache() : undefined, config.redis ? (0, _redis.createRedisCache)(_objectSpread(_objectSpread({
     ttl: DEFAULT_REDIS_CACHE_TTL
-  }, config.redis)) : undefined].filter(_isNotUndefined.isNotUndefined);
+  }, config.redis), {}, {
+    telemetry: config.telemetry
+  })) : undefined].filter(_isNotUndefined.isNotUndefined);
   if (caches.length === 0) {
     return undefined;
   }

package/build/adapters/prezly/cache/configure.d.ts

@@ -10,6 +10,7 @@ export interface Configuration {
     namespace?: string;
     /** Extra immutable identity for custom fetch implementations. Enables request sharing. */
     requestScope?: string;
+    telemetry?: ContentDelivery.Telemetry;
 }
 export declare function configure(config: Configuration): {
     storage: ContentDelivery.Cache;

package/build/adapters/prezly/cache/configure.mjs

@@ -19,9 +19,11 @@ export function configure(config) {
   return undefined;
 }
 function configureStorage(config) {
-  var caches = [config.memory ? ContentDelivery.createSharedMemoryCache() : undefined, config.redis ? createRedisCache(_objectSpread({
+  var caches = [config.memory ? ContentDelivery.createSharedMemoryCache() : undefined, config.redis ? createRedisCache(_objectSpread(_objectSpread({
     ttl: DEFAULT_REDIS_CACHE_TTL
-  }, config.redis)) : undefined].filter(isNotUndefined);
+  }, config.redis), {}, {
+    telemetry: config.telemetry
+  })) : undefined].filter(isNotUndefined);
   if (caches.length === 0) {
     return undefined;
   }

package/build/adapters/prezly/cache/redis.cjs

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRedisCache = createRedisCache;
+var _themeKitCore = require("@prezly/theme-kit-core");
 var _jsonStableStringify = _interopRequireDefault(require("json-stable-stringify"));
 var _redis = require("redis");
-var _excluded = ["ttl", "prefix"];
+var _excluded = ["ttl", "prefix", "telemetry"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -19,21 +20,32 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var COMMAND_TIMEOUT = 1000;
 var CONNECTIONS = new Map();
-function command(_x) {
+function command(_x, _x2) {
   return _command.apply(this, arguments);
 }
 function _command() {
-  _command = _asyncToGenerator(function* (invoke) {
+  _command = _asyncToGenerator(function* (invoke, telemetry) {
+    var operation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'get';
     var timer;
+    var start = telemetry ? _themeKitCore.ContentDelivery.telemetryNow() : 0;
+    var outcome = 'error';
     try {
       // node-redis 4 can corrupt its command queue when aborting a command
       // already sent to the socket. Leave that operation tracked by the client;
       // commandsQueueMaxLength bounds all outstanding replies, including these.
-      return yield Promise.race([Promise.resolve().then(invoke), new Promise((_, reject) => {
+      var value = yield Promise.race([Promise.resolve().then(invoke), new Promise((_, reject) => {
         timer = setTimeout(() => reject(new Error('Content cache command timed out.')), COMMAND_TIMEOUT);
       })]);
+      outcome = 'success';
+      return value;
     } finally {
       clearTimeout(timer);
+      _themeKitCore.ContentDelivery.emit(telemetry, {
+        type: 'redis_command',
+        command: operation,
+        outcome,
+        seconds: telemetry ? _themeKitCore.ContentDelivery.elapsedSeconds(start) : 0
+      });
     }
   });
   return _command.apply(this, arguments);
@@ -42,6 +54,7 @@ function createRedisCache(_ref) {
   var ttl = _ref.ttl,
     _ref$prefix = _ref.prefix,
     prefix = _ref$prefix === void 0 ? '' : _ref$prefix,
+    telemetry = _ref.telemetry,
     options = _objectWithoutProperties(_ref, _excluded);
   var connectionKey = (0, _jsonStableStringify.default)(options);
   var client = CONNECTIONS.get(connectionKey);
@@ -63,29 +76,42 @@ function createRedisCache(_ref) {
   function createCache() {
     var namespacePrefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     return {
-      get(key, latestVersion) {
+      get(key, latestVersion, onSource) {
         return _asyncToGenerator(function* () {
-          if (!connection.isReady) return undefined;
-          var cached = yield command(() => connection.get("".concat(namespacePrefix).concat(key)));
+          if (!connection.isReady) {
+            _themeKitCore.ContentDelivery.emit(telemetry, {
+              type: 'redis_unavailable',
+              command: 'get'
+            });
+            return undefined;
+          }
+          var cached = yield command(() => connection.get("".concat(namespacePrefix).concat(key)), telemetry, 'get');
           if (!cached) return undefined;
           var entry = JSON.parse(cached);
           if (entry.version < latestVersion) return undefined;
           if (ttl) {
-            void command(() => connection.expire("".concat(namespacePrefix).concat(key), ttl)).catch(() => undefined);
+            void command(() => connection.expire("".concat(namespacePrefix).concat(key), ttl), telemetry, 'expire').catch(() => undefined);
           }
+          if (onSource) _themeKitCore.ContentDelivery.notify(onSource, 'redis');
           return entry.value;
         })();
       },
       set(key, value, version) {
         return _asyncToGenerator(function* () {
-          if (!connection.isReady) return;
+          if (!connection.isReady) {
+            _themeKitCore.ContentDelivery.emit(telemetry, {
+              type: 'redis_unavailable',
+              command: 'set'
+            });
+            return;
+          }
           var entry = {
             value,
             version
           };
           yield command(() => connection.set("".concat(namespacePrefix).concat(key), JSON.stringify(entry), {
             EX: ttl
-          }));
+          }), telemetry, 'set');
         })();
       },
       namespace(namespace) {

package/build/adapters/prezly/cache/redis.d.ts

@@ -1,9 +1,10 @@
-import type { ContentDelivery } from '@prezly/theme-kit-core';
+import { ContentDelivery } from '@prezly/theme-kit-core';
 import { type RedisClientOptions } from 'redis';
 type Seconds = number;
 type Options = RedisClientOptions & {
     ttl?: Seconds;
     prefix?: string;
+    telemetry?: ContentDelivery.Telemetry;
 };
-export declare function createRedisCache({ ttl, prefix, ...options }: Options): ContentDelivery.Cache;
+export declare function createRedisCache({ ttl, prefix, telemetry, ...options }: Options): ContentDelivery.Cache;
 export {};

package/build/adapters/prezly/cache/redis.mjs

@@ -1,4 +1,4 @@
-var _excluded = ["ttl", "prefix"];
+var _excluded = ["ttl", "prefix", "telemetry"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -8,25 +8,37 @@ function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+import { ContentDelivery } from '@prezly/theme-kit-core';
 import stableStringify from 'json-stable-stringify';
 import { createClient } from 'redis';
 var COMMAND_TIMEOUT = 1000;
 var CONNECTIONS = new Map();
-function command(_x) {
+function command(_x, _x2) {
   return _command.apply(this, arguments);
 }
 function _command() {
-  _command = _asyncToGenerator(function* (invoke) {
+  _command = _asyncToGenerator(function* (invoke, telemetry) {
+    var operation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'get';
     var timer;
+    var start = telemetry ? ContentDelivery.telemetryNow() : 0;
+    var outcome = 'error';
     try {
       // node-redis 4 can corrupt its command queue when aborting a command
       // already sent to the socket. Leave that operation tracked by the client;
       // commandsQueueMaxLength bounds all outstanding replies, including these.
-      return yield Promise.race([Promise.resolve().then(invoke), new Promise((_, reject) => {
+      var value = yield Promise.race([Promise.resolve().then(invoke), new Promise((_, reject) => {
         timer = setTimeout(() => reject(new Error('Content cache command timed out.')), COMMAND_TIMEOUT);
       })]);
+      outcome = 'success';
+      return value;
     } finally {
       clearTimeout(timer);
+      ContentDelivery.emit(telemetry, {
+        type: 'redis_command',
+        command: operation,
+        outcome,
+        seconds: telemetry ? ContentDelivery.elapsedSeconds(start) : 0
+      });
     }
   });
   return _command.apply(this, arguments);
@@ -35,6 +47,7 @@ export function createRedisCache(_ref) {
   var ttl = _ref.ttl,
     _ref$prefix = _ref.prefix,
     prefix = _ref$prefix === void 0 ? '' : _ref$prefix,
+    telemetry = _ref.telemetry,
     options = _objectWithoutProperties(_ref, _excluded);
   var connectionKey = stableStringify(options);
   var client = CONNECTIONS.get(connectionKey);
@@ -56,29 +69,42 @@ export function createRedisCache(_ref) {
   function createCache() {
     var namespacePrefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     return {
-      get(key, latestVersion) {
+      get(key, latestVersion, onSource) {
         return _asyncToGenerator(function* () {
-          if (!connection.isReady) return undefined;
-          var cached = yield command(() => connection.get("".concat(namespacePrefix).concat(key)));
+          if (!connection.isReady) {
+            ContentDelivery.emit(telemetry, {
+              type: 'redis_unavailable',
+              command: 'get'
+            });
+            return undefined;
+          }
+          var cached = yield command(() => connection.get("".concat(namespacePrefix).concat(key)), telemetry, 'get');
           if (!cached) return undefined;
           var entry = JSON.parse(cached);
           if (entry.version < latestVersion) return undefined;
           if (ttl) {
-            void command(() => connection.expire("".concat(namespacePrefix).concat(key), ttl)).catch(() => undefined);
+            void command(() => connection.expire("".concat(namespacePrefix).concat(key), ttl), telemetry, 'expire').catch(() => undefined);
           }
+          if (onSource) ContentDelivery.notify(onSource, 'redis');
           return entry.value;
         })();
       },
       set(key, value, version) {
         return _asyncToGenerator(function* () {
-          if (!connection.isReady) return;
+          if (!connection.isReady) {
+            ContentDelivery.emit(telemetry, {
+              type: 'redis_unavailable',
+              command: 'set'
+            });
+            return;
+          }
           var entry = {
             value,
             version
           };
           yield command(() => connection.set("".concat(namespacePrefix).concat(key), JSON.stringify(entry), {
             EX: ttl
-          }));
+          }), telemetry, 'set');
         })();
       },
       namespace(namespace) {

package/build/adapters/prezly/cache/redis.test.cjs

@@ -2,6 +2,11 @@
 
 var _redis = require("redis");
 var _redis2 = require("./redis.cjs");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 jest.mock('redis', () => ({
@@ -100,4 +105,35 @@ it.each(['get', 'set'])('times out stalled %s commands without unsafe cancellati
   return function (_x) {
     return _ref6.apply(this, arguments);
   };
-}());
+}());
+it('does not fragment Redis connections by observer and distinguishes unavailable from commands', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection4 = connection(false),
+    client = _connection4.client,
+    options = _connection4.options;
+  var events = [];
+  var observe = event => {
+    events.push(event);
+  };
+  var cache = (0, _redis2.createRedisCache)(_objectSpread(_objectSpread({}, options), {}, {
+    telemetry: {
+      observe,
+      source: 'prezly'
+    }
+  }));
+  yield cache.get('private-key', 1);
+  yield cache.set('private-key', 'private-value', 1);
+  expect(events.filter(e => e.type === 'redis_unavailable')).toHaveLength(2);
+  expect(events.some(e => e.type === 'redis_command')).toBe(false);
+  expect(client.connect).toHaveBeenCalledTimes(1);
+  client.isReady = true;
+  var source = jest.fn();
+  expect(yield cache.namespace('private-room').get('private-key', 1, source)).toBe('cached');
+  expect(source).toHaveBeenCalledWith('redis');
+  yield cache.set('private-key', 'value', 2);
+  yield new Promise(resolve => setImmediate(resolve));
+  expect(events.filter(e => e.type === 'redis_command').map(e => e.command).sort()).toEqual(['expire', 'get', 'set']);
+  expect(JSON.stringify(events)).not.toContain('private-');
+  expect(_redis.createClient).toHaveBeenLastCalledWith(expect.not.objectContaining({
+    telemetry: expect.anything()
+  }));
+}));

package/build/adapters/prezly/cache/redis.test.mjs

@@ -1,3 +1,8 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 import { createClient } from 'redis';
@@ -98,4 +103,35 @@ it.each(['get', 'set'])('times out stalled %s commands without unsafe cancellati
   return function (_x) {
     return _ref6.apply(this, arguments);
   };
-}());
+}());
+it('does not fragment Redis connections by observer and distinguishes unavailable from commands', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection4 = connection(false),
+    client = _connection4.client,
+    options = _connection4.options;
+  var events = [];
+  var observe = event => {
+    events.push(event);
+  };
+  var cache = createRedisCache(_objectSpread(_objectSpread({}, options), {}, {
+    telemetry: {
+      observe,
+      source: 'prezly'
+    }
+  }));
+  yield cache.get('private-key', 1);
+  yield cache.set('private-key', 'private-value', 1);
+  expect(events.filter(e => e.type === 'redis_unavailable')).toHaveLength(2);
+  expect(events.some(e => e.type === 'redis_command')).toBe(false);
+  expect(client.connect).toHaveBeenCalledTimes(1);
+  client.isReady = true;
+  var source = jest.fn();
+  expect(yield cache.namespace('private-room').get('private-key', 1, source)).toBe('cached');
+  expect(source).toHaveBeenCalledWith('redis');
+  yield cache.set('private-key', 'value', 2);
+  yield new Promise(resolve => setImmediate(resolve));
+  expect(events.filter(e => e.type === 'redis_command').map(e => e.command).sort()).toEqual(['expire', 'get', 'set']);
+  expect(JSON.stringify(events)).not.toContain('private-');
+  expect(createClient).toHaveBeenLastCalledWith(expect.not.objectContaining({
+    telemetry: expect.anything()
+  }));
+}));

package/build/adapters/prezly/requests.cjs

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FetchScheduler = void 0;
 exports.createBoundedFetch = createBoundedFetch;
+var _themeKitCore = require("@prezly/theme-kit-core");
+var _telemetry = require("./telemetry.cjs");
 var _registry$key;
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -48,33 +50,62 @@ class FetchScheduler {
       }
     }
   }
-  run(invoke, signal) {
-    if (signal !== null && signal !== void 0 && signal.aborted) return Promise.reject(abortReason(signal));
+  run(invoke, signal, telemetry) {
+    var route = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'other';
+    if (signal !== null && signal !== void 0 && signal.aborted) {
+      _themeKitCore.ContentDelivery.emit(telemetry, {
+        type: 'fetch_queue',
+        route,
+        outcome: 'aborted',
+        seconds: 0
+      });
+      return Promise.reject(abortReason(signal));
+    }
     return new Promise((_resolve, reject) => {
       var task = {
         invoke,
         resolve: value => _resolve(value),
         reject,
         signal,
-        clearQueueWait: () => {}
+        clearQueueWait: () => {},
+        telemetry,
+        route
       };
       if (this.active < this.limits.concurrency) {
         this.start(task);
         return;
       }
       if (this.queue.length >= this.limits.queueLimit) {
+        _themeKitCore.ContentDelivery.emit(telemetry, {
+          type: 'fetch_queue',
+          route,
+          outcome: 'full',
+          seconds: 0
+        });
         reject(new Error('Content request queue is full.'));
         return;
       }
-      var cancel = error => {
+      task.queuedAt = telemetry ? _themeKitCore.ContentDelivery.telemetryNow() : undefined;
+      _themeKitCore.ContentDelivery.emit(telemetry, {
+        type: 'fetch_queue',
+        route,
+        outcome: 'queued'
+      });
+      var cancel = (error, outcome) => {
         var index = this.queue.indexOf(task);
         if (index < 0) return;
         this.queue.splice(index, 1);
         task.clearQueueWait();
+        _themeKitCore.ContentDelivery.emit(telemetry, {
+          type: 'fetch_queue',
+          route,
+          outcome,
+          seconds: task.queuedAt === undefined ? 0 : _themeKitCore.ContentDelivery.elapsedSeconds(task.queuedAt)
+        });
         reject(error);
       };
-      var onAbort = () => cancel(abortReason(signal));
-      var timer = setTimeout(() => cancel(new Error('Content request queue wait timed out.')), this.limits.queueTimeout);
+      var onAbort = () => cancel(abortReason(signal), 'aborted');
+      var timer = setTimeout(() => cancel(new Error('Content request queue wait timed out.'), 'wait_timeout'), this.limits.queueTimeout);
       task.clearQueueWait = () => {
         clearTimeout(timer);
         signal === null || signal === void 0 || signal.removeEventListener('abort', onAbort);
@@ -88,6 +119,12 @@ class FetchScheduler {
   start(task) {
     var _task$signal2;
     task.clearQueueWait();
+    _themeKitCore.ContentDelivery.emit(task.telemetry, {
+      type: 'fetch_queue',
+      route: task.route,
+      outcome: 'accepted',
+      seconds: task.queuedAt === undefined ? 0 : _themeKitCore.ContentDelivery.elapsedSeconds(task.queuedAt)
+    });
     this.active += 1;
     var controller = new AbortController();
     var rejectAbort = () => task.reject(abortReason(controller.signal));
@@ -101,7 +138,15 @@ class FetchScheduler {
     (_task$signal2 = task.signal) === null || _task$signal2 === void 0 || _task$signal2.addEventListener('abort', forwardAbort, {
       once: true
     });
-    var timer = setTimeout(() => controller.abort(new Error('Content request timed out.')), this.limits.requestTimeout);
+    var timer = setTimeout(() => {
+      if (!controller.signal.aborted) {
+        _themeKitCore.ContentDelivery.emit(task.telemetry, {
+          type: 'fetch_timeout',
+          route: task.route
+        });
+        controller.abort(new Error('Content request timed out.'));
+      }
+    }, this.limits.requestTimeout);
     void Promise.resolve().then(() => {
       if (controller.signal.aborted) throw abortReason(controller.signal);
       return task.invoke(controller.signal);
@@ -127,6 +172,7 @@ var registry = globalThis;
 var sharedContentFetches = (_registry$key = registry[key]) !== null && _registry$key !== void 0 ? _registry$key : registry[key] = new FetchScheduler();
 function createBoundedFetch(fetchImpl) {
   var scheduler = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : sharedContentFetches;
+  var telemetry = arguments.length > 2 ? arguments[2] : undefined;
   return (input, init) => {
     var _init$signal;
     var signal = (_init$signal = init === null || init === void 0 ? void 0 : init.signal) !== null && _init$signal !== void 0 ? _init$signal : input instanceof Request ? input.signal : undefined;
@@ -147,6 +193,6 @@ function createBoundedFetch(fetchImpl) {
       return function (_x) {
         return _ref4.apply(this, arguments);
       };
-    }(), signal);
+    }(), signal, telemetry, telemetry ? (0, _telemetry.upstreamRoute)(input) : 'other');
   };
 }

package/build/adapters/prezly/requests.d.ts

@@ -10,8 +10,9 @@ export declare class FetchScheduler {
     private readonly queue;
     private readonly limits;
     constructor(limits?: Partial<Limits>);
-    run<T>(invoke: (signal: AbortSignal) => Promise<T>, signal?: AbortSignal | null): Promise<T>;
+    run<T>(invoke: (signal: AbortSignal) => Promise<T>, signal?: AbortSignal | null, telemetry?: ContentDelivery.Telemetry, route?: ContentDelivery.UpstreamRoute): Promise<T>;
     private start;
 }
-export declare function createBoundedFetch(fetchImpl: typeof fetch, scheduler?: FetchScheduler): typeof fetch;
+export declare function createBoundedFetch(fetchImpl: typeof fetch, scheduler?: FetchScheduler, telemetry?: ContentDelivery.Telemetry): typeof fetch;
+import { ContentDelivery } from '@prezly/theme-kit-core';
 export {};

package/build/adapters/prezly/requests.mjs

@@ -41,33 +41,62 @@ export class FetchScheduler {
       }
     }
   }
-  run(invoke, signal) {
-    if (signal !== null && signal !== void 0 && signal.aborted) return Promise.reject(abortReason(signal));
+  run(invoke, signal, telemetry) {
+    var route = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'other';
+    if (signal !== null && signal !== void 0 && signal.aborted) {
+      ContentDelivery.emit(telemetry, {
+        type: 'fetch_queue',
+        route,
+        outcome: 'aborted',
+        seconds: 0
+      });
+      return Promise.reject(abortReason(signal));
+    }
     return new Promise((_resolve, reject) => {
       var task = {
         invoke,
         resolve: value => _resolve(value),
         reject,
         signal,
-        clearQueueWait: () => {}
+        clearQueueWait: () => {},
+        telemetry,
+        route
       };
       if (this.active < this.limits.concurrency) {
         this.start(task);
         return;
       }
       if (this.queue.length >= this.limits.queueLimit) {
+        ContentDelivery.emit(telemetry, {
+          type: 'fetch_queue',
+          route,
+          outcome: 'full',
+          seconds: 0
+        });
         reject(new Error('Content request queue is full.'));
         return;
       }
-      var cancel = error => {
+      task.queuedAt = telemetry ? ContentDelivery.telemetryNow() : undefined;
+      ContentDelivery.emit(telemetry, {
+        type: 'fetch_queue',
+        route,
+        outcome: 'queued'
+      });
+      var cancel = (error, outcome) => {
         var index = this.queue.indexOf(task);
         if (index < 0) return;
         this.queue.splice(index, 1);
         task.clearQueueWait();
+        ContentDelivery.emit(telemetry, {
+          type: 'fetch_queue',
+          route,
+          outcome,
+          seconds: task.queuedAt === undefined ? 0 : ContentDelivery.elapsedSeconds(task.queuedAt)
+        });
         reject(error);
       };
-      var onAbort = () => cancel(abortReason(signal));
-      var timer = setTimeout(() => cancel(new Error('Content request queue wait timed out.')), this.limits.queueTimeout);
+      var onAbort = () => cancel(abortReason(signal), 'aborted');
+      var timer = setTimeout(() => cancel(new Error('Content request queue wait timed out.'), 'wait_timeout'), this.limits.queueTimeout);
       task.clearQueueWait = () => {
         clearTimeout(timer);
         signal === null || signal === void 0 || signal.removeEventListener('abort', onAbort);
@@ -81,6 +110,12 @@ export class FetchScheduler {
   start(task) {
     var _task$signal2;
     task.clearQueueWait();
+    ContentDelivery.emit(task.telemetry, {
+      type: 'fetch_queue',
+      route: task.route,
+      outcome: 'accepted',
+      seconds: task.queuedAt === undefined ? 0 : ContentDelivery.elapsedSeconds(task.queuedAt)
+    });
     this.active += 1;
     var controller = new AbortController();
     var rejectAbort = () => task.reject(abortReason(controller.signal));
@@ -94,7 +129,15 @@ export class FetchScheduler {
     (_task$signal2 = task.signal) === null || _task$signal2 === void 0 || _task$signal2.addEventListener('abort', forwardAbort, {
       once: true
     });
-    var timer = setTimeout(() => controller.abort(new Error('Content request timed out.')), this.limits.requestTimeout);
+    var timer = setTimeout(() => {
+      if (!controller.signal.aborted) {
+        ContentDelivery.emit(task.telemetry, {
+          type: 'fetch_timeout',
+          route: task.route
+        });
+        controller.abort(new Error('Content request timed out.'));
+      }
+    }, this.limits.requestTimeout);
     void Promise.resolve().then(() => {
       if (controller.signal.aborted) throw abortReason(controller.signal);
       return task.invoke(controller.signal);
@@ -119,6 +162,7 @@ var registry = globalThis;
 var sharedContentFetches = (_registry$key = registry[key]) !== null && _registry$key !== void 0 ? _registry$key : registry[key] = new FetchScheduler();
 export function createBoundedFetch(fetchImpl) {
   var scheduler = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : sharedContentFetches;
+  var telemetry = arguments.length > 2 ? arguments[2] : undefined;
   return (input, init) => {
     var _init$signal;
     var signal = (_init$signal = init === null || init === void 0 ? void 0 : init.signal) !== null && _init$signal !== void 0 ? _init$signal : input instanceof Request ? input.signal : undefined;
@@ -139,6 +183,8 @@ export function createBoundedFetch(fetchImpl) {
       return function (_x) {
         return _ref4.apply(this, arguments);
       };
-    }(), signal);
+    }(), signal, telemetry, telemetry ? upstreamRoute(input) : 'other');
   };
-}
+}
+import { ContentDelivery } from '@prezly/theme-kit-core';
+import { upstreamRoute } from "./telemetry.mjs";

package/build/adapters/prezly/server.cjs

@@ -11,6 +11,7 @@ var _sdk = require("@prezly/sdk");
 var _themeKitCore = require("@prezly/theme-kit-core");
 var _index = require("./cache/index.cjs");
 var _requests = require("./requests.cjs");
+var _telemetry = require("./telemetry.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -22,7 +23,8 @@ var PrezlyAdapter;
   function connect(config) {
     var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       cacheConfig = _ref.cache,
-      fetch = _ref.fetch;
+      fetch = _ref.fetch,
+      observer = _ref.telemetry;
     function usePrezlyClient() {
       var _cacheConfig$namespac, _cacheConfig$memory;
       var _Resolvable$resolve = _themeKitCore.Resolvable.resolve(config),
@@ -32,15 +34,21 @@ var PrezlyAdapter;
         newsroom = _Resolvable$resolve.newsroom,
         theme = _Resolvable$resolve.theme,
         formats = _Resolvable$resolve.formats;
+      var telemetry = observer ? {
+        observe: observer,
+        source: !baseUrl || baseUrl.replace(/\/$/, '') === 'https://api.prezly.com' ? 'prezly' : 'custom'
+      } : undefined;
       var client = (0, _sdk.createPrezlyClient)({
-        fetch,
+        fetch: telemetry ? (0, _telemetry.createObservedFetch)(fetch !== null && fetch !== void 0 ? fetch : globalThis.fetch, telemetry, 'raw') : fetch,
         accessToken,
         baseUrl,
         headers
       });
-      var cache = cacheConfig ? (0, _index.configure)(_objectSpread({
+      var cache = cacheConfig ? (0, _index.configure)(_objectSpread(_objectSpread({
         namespace: 'content:'
-      }, cacheConfig)) : undefined;
+      }, cacheConfig), {}, {
+        telemetry
+      })) : undefined;
       // Custom fetches may depend on hidden request context. Preserve their
       // existing cache behavior unless the caller declares that identity.
       var scope = cache && (!fetch || (cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.requestScope) !== undefined) ? (0, _utils.bytesToHex)((0, _sha.sha256)((0, _jsonStableStringify.default)({
@@ -58,10 +66,11 @@ var PrezlyAdapter;
         accessToken,
         baseUrl,
         headers,
-        fetch: (0, _requests.createBoundedFetch)(fetch !== null && fetch !== void 0 ? fetch : globalThis.fetch)
+        fetch: (0, _requests.createBoundedFetch)((0, _telemetry.createObservedFetch)(fetch !== null && fetch !== void 0 ? fetch : globalThis.fetch, telemetry, 'content'), undefined, telemetry)
       }) : client;
       var contentDelivery = _themeKitCore.ContentDelivery.createClient(contentClient, newsroom, theme, {
         formats,
+        telemetry,
         cache: cache ? _objectSpread(_objectSpread({}, cache), {}, {
           scope
         }) : undefined

package/build/adapters/prezly/server.d.ts

@@ -14,9 +14,10 @@ export declare namespace PrezlyAdapter {
     interface Options {
         cache?: CacheConfiguration;
         fetch?: typeof fetch;
+        telemetry?: ContentDelivery.TelemetryObserver;
     }
     type CacheConfiguration = CacheConfig;
-    function connect(config: Resolvable<Configuration>, { cache: cacheConfig, fetch }?: Options): {
+    function connect(config: Resolvable<Configuration>, { cache: cacheConfig, fetch, telemetry: observer }?: Options): {
         usePrezlyClient: () => {
             client: import("@prezly/sdk").PrezlyClient;
             contentDelivery: {

package/build/adapters/prezly/server.mjs

@@ -10,12 +10,14 @@ import { createPrezlyClient } from '@prezly/sdk';
 import { ContentDelivery, Resolvable } from '@prezly/theme-kit-core';
 import { configure as configureCache } from "./cache/index.mjs";
 import { createBoundedFetch } from "./requests.mjs";
+import { createObservedFetch } from "./telemetry.mjs";
 export var PrezlyAdapter;
 (function (_PrezlyAdapter) {
   function connect(config) {
     var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       cacheConfig = _ref.cache,
-      fetch = _ref.fetch;
+      fetch = _ref.fetch,
+      observer = _ref.telemetry;
     function usePrezlyClient() {
       var _cacheConfig$namespac, _cacheConfig$memory;
       var _Resolvable$resolve = Resolvable.resolve(config),
@@ -25,15 +27,21 @@ export var PrezlyAdapter;
         newsroom = _Resolvable$resolve.newsroom,
         theme = _Resolvable$resolve.theme,
         formats = _Resolvable$resolve.formats;
+      var telemetry = observer ? {
+        observe: observer,
+        source: !baseUrl || baseUrl.replace(/\/$/, '') === 'https://api.prezly.com' ? 'prezly' : 'custom'
+      } : undefined;
       var client = createPrezlyClient({
-        fetch,
+        fetch: telemetry ? createObservedFetch(fetch !== null && fetch !== void 0 ? fetch : globalThis.fetch, telemetry, 'raw') : fetch,
         accessToken,
         baseUrl,
         headers
       });
-      var cache = cacheConfig ? configureCache(_objectSpread({
+      var cache = cacheConfig ? configureCache(_objectSpread(_objectSpread({
         namespace: 'content:'
-      }, cacheConfig)) : undefined;
+      }, cacheConfig), {}, {
+        telemetry
+      })) : undefined;
       // Custom fetches may depend on hidden request context. Preserve their
       // existing cache behavior unless the caller declares that identity.
       var scope = cache && (!fetch || (cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.requestScope) !== undefined) ? bytesToHex(sha256(stableStringify({
@@ -51,10 +59,11 @@ export var PrezlyAdapter;
         accessToken,
         baseUrl,
         headers,
-        fetch: createBoundedFetch(fetch !== null && fetch !== void 0 ? fetch : globalThis.fetch)
+        fetch: createBoundedFetch(createObservedFetch(fetch !== null && fetch !== void 0 ? fetch : globalThis.fetch, telemetry, 'content'), undefined, telemetry)
       }) : client;
       var contentDelivery = ContentDelivery.createClient(contentClient, newsroom, theme, {
         formats,
+        telemetry,
         cache: cache ? _objectSpread(_objectSpread({}, cache), {}, {
           scope
         }) : undefined

package/build/adapters/prezly/telemetry.cjs

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createObservedFetch = createObservedFetch;
+exports.upstreamRoute = upstreamRoute;
+var _themeKitCore = require("@prezly/theme-kit-core");
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function upstreamRoute(input) {
+  try {
+    var path = new URL(typeof input === 'string' ? input : input instanceof URL ? input.href : input.url).pathname;
+    if (/^\/v2\/stories\/by-slug\/[^/]+$/.test(path)) return 'story_by_slug';
+    if (/^\/v2\/stories(?:\/search)?$/.test(path)) return 'stories';
+    if (/^\/v2\/stories\/[^/]+$/.test(path)) return 'story';
+    if (/^\/v2\/newsrooms\/[^/]+\/themes\/[^/]+$/.test(path)) return 'theme';
+    if (/^\/v2\/newsrooms\/[^/]+\/languages(?:\/[^/]+)?$/.test(path)) return 'languages';
+    if (/^\/v2\/newsrooms\/[^/]+\/categories(?:\/[^/]+)?$/.test(path)) return 'categories';
+    if (/^\/v2\/newsrooms\/[^/]+\/contacts(?:\/search)?$/.test(path)) return 'contacts';
+    if (/^\/v2\/newsrooms\/[^/]+\/galleries(?:\/search)?$/.test(path)) return 'galleries';
+    if (/^\/v2\/newsrooms\/[^/]+\/galleries\/[^/]+$/.test(path)) return 'gallery';
+    if (/^\/v2\/newsrooms\/[^/]+$/.test(path)) return 'newsroom';
+  } catch (_unused) {
+    // Invalid/custom inputs keep their original fetch behavior.
+  }
+  return 'other';
+}
+
+/** Observe response headers only; preserve the Response and streaming body. */
+function createObservedFetch(fetchImpl, telemetry, client) {
+  if (!telemetry) return fetchImpl;
+  return /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (input, init) {
+      var route = upstreamRoute(input);
+      var start = _themeKitCore.ContentDelivery.telemetryNow();
+      var status = 'error';
+      try {
+        var response = yield fetchImpl(input, init);
+        status = response.status >= 200 && response.status < 600 ? "".concat(Math.floor(response.status / 100), "xx") : 'other';
+        return response;
+      } finally {
+        _themeKitCore.ContentDelivery.emit(telemetry, {
+          type: 'upstream',
+          route,
+          client,
+          status,
+          seconds: _themeKitCore.ContentDelivery.elapsedSeconds(start)
+        });
+      }
+    });
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}

package/build/adapters/prezly/telemetry.d.ts

@@ -0,0 +1,4 @@
+import { ContentDelivery } from '@prezly/theme-kit-core';
+export declare function upstreamRoute(input: Parameters<typeof fetch>[0]): ContentDelivery.UpstreamRoute;
+/** Observe response headers only; preserve the Response and streaming body. */
+export declare function createObservedFetch(fetchImpl: typeof fetch, telemetry: ContentDelivery.Telemetry | undefined, client: 'raw' | 'content'): typeof fetch;

package/build/adapters/prezly/telemetry.mjs

@@ -0,0 +1,49 @@
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+import { ContentDelivery } from '@prezly/theme-kit-core';
+export function upstreamRoute(input) {
+  try {
+    var path = new URL(typeof input === 'string' ? input : input instanceof URL ? input.href : input.url).pathname;
+    if (/^\/v2\/stories\/by-slug\/[^/]+$/.test(path)) return 'story_by_slug';
+    if (/^\/v2\/stories(?:\/search)?$/.test(path)) return 'stories';
+    if (/^\/v2\/stories\/[^/]+$/.test(path)) return 'story';
+    if (/^\/v2\/newsrooms\/[^/]+\/themes\/[^/]+$/.test(path)) return 'theme';
+    if (/^\/v2\/newsrooms\/[^/]+\/languages(?:\/[^/]+)?$/.test(path)) return 'languages';
+    if (/^\/v2\/newsrooms\/[^/]+\/categories(?:\/[^/]+)?$/.test(path)) return 'categories';
+    if (/^\/v2\/newsrooms\/[^/]+\/contacts(?:\/search)?$/.test(path)) return 'contacts';
+    if (/^\/v2\/newsrooms\/[^/]+\/galleries(?:\/search)?$/.test(path)) return 'galleries';
+    if (/^\/v2\/newsrooms\/[^/]+\/galleries\/[^/]+$/.test(path)) return 'gallery';
+    if (/^\/v2\/newsrooms\/[^/]+$/.test(path)) return 'newsroom';
+  } catch (_unused) {
+    // Invalid/custom inputs keep their original fetch behavior.
+  }
+  return 'other';
+}
+
+/** Observe response headers only; preserve the Response and streaming body. */
+export function createObservedFetch(fetchImpl, telemetry, client) {
+  if (!telemetry) return fetchImpl;
+  return /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (input, init) {
+      var route = upstreamRoute(input);
+      var start = ContentDelivery.telemetryNow();
+      var status = 'error';
+      try {
+        var response = yield fetchImpl(input, init);
+        status = response.status >= 200 && response.status < 600 ? "".concat(Math.floor(response.status / 100), "xx") : 'other';
+        return response;
+      } finally {
+        ContentDelivery.emit(telemetry, {
+          type: 'upstream',
+          route,
+          client,
+          status,
+          seconds: ContentDelivery.elapsedSeconds(start)
+        });
+      }
+    });
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}

package/build/adapters/prezly/telemetry.test.cjs

@@ -0,0 +1,167 @@
+"use strict";
+
+var _telemetry = require("./telemetry.cjs");
+var _requests = require("./requests.cjs");
+var _server = require("./server.cjs");
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+var nativeFetch = globalThis.fetch;
+var tick = () => new Promise(resolve => setImmediate(resolve));
+afterEach(() => {
+  globalThis.fetch = nativeFetch;
+  jest.useRealTimers();
+});
+it.each([['/v2/newsrooms/private-id', 'newsroom'], ['/v2/newsrooms/private-id/languages/en_GB', 'languages'], ['/v2/newsrooms/private-id/categories', 'categories'], ['/v2/stories/by-slug/private-slug?token=secret', 'story_by_slug'], ['/v2/stories/search', 'stories'], ['/v2/stories/private-uuid', 'story'], ['/custom/private-path', 'other']])('classifies %s without retaining URL values', (path, expected) => {
+  expect((0, _telemetry.upstreamRoute)("https://private-origin.test".concat(path))).toBe(expected);
+});
+it('observes raw response headers without consuming the body or adding a signal', /*#__PURE__*/_asyncToGenerator(function* () {
+  var events = [];
+  var response = new Response('private-body');
+  var read = jest.spyOn(response, 'arrayBuffer');
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return response;
+  }));
+  var options = {
+    headers: {
+      Authorization: 'private-token'
+    }
+  };
+  var observed = (0, _telemetry.createObservedFetch)(fetchMock, {
+    observe: e => {
+      events.push(e);
+    },
+    source: 'custom'
+  }, 'raw');
+  expect(yield observed('https://private-origin.test/v2/stories/private-uuid', options)).toBe(response);
+  expect(read).not.toHaveBeenCalled();
+  expect(fetchMock).toHaveBeenCalledWith('https://private-origin.test/v2/stories/private-uuid', options);
+  expect(events).toEqual([expect.objectContaining({
+    type: 'upstream',
+    client: 'raw',
+    route: 'story',
+    source: 'custom',
+    status: '2xx'
+  })]);
+  expect(JSON.stringify(events)).not.toMatch(/private-/);
+}));
+it('keeps telemetry outside the source/cache identity when adapters share work', /*#__PURE__*/_asyncToGenerator(function* () {
+  var events = [];
+  var config = {
+    newsroom: 'private-room',
+    accessToken: 'private-token'
+  };
+  var cache = {
+    memory: true,
+    latestVersion: 1,
+    namespace: 'metrics-adapter-sharing'
+  };
+  globalThis.fetch = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return Response.json({
+      newsroom: {
+        name: 'room'
+      }
+    });
+  }));
+  var observed = _server.PrezlyAdapter.connect(config, {
+    cache,
+    telemetry: e => {
+      events.push(e);
+    }
+  }).usePrezlyClient();
+  var plain = _server.PrezlyAdapter.connect(config, {
+    cache
+  }).usePrezlyClient();
+  yield Promise.all([observed.contentDelivery.newsroom(), plain.contentDelivery.newsroom()]);
+  expect(globalThis.fetch).toHaveBeenCalledTimes(1);
+  yield tick();
+  yield observed.contentDelivery.newsroom();
+  expect(globalThis.fetch).toHaveBeenCalledTimes(1);
+  expect(events.filter(e => e.type === 'upstream')).toHaveLength(1);
+  expect(events.some(e => e.type === 'cache_hit')).toBe(true);
+}));
+it('reports queued, full, accepted and completed wait without changing admission limits', /*#__PURE__*/_asyncToGenerator(function* () {
+  var events = [];
+  var telemetry = {
+    observe: e => {
+      events.push(e);
+    }
+  };
+  var scheduler = new _requests.FetchScheduler({
+    concurrency: 1,
+    queueLimit: 1
+  });
+  var release;
+  var active = scheduler.run(() => new Promise(r => {
+    release = r;
+  }), undefined, telemetry, 'story');
+  var queued = scheduler.run(/*#__PURE__*/_asyncToGenerator(function* () {
+    return 42;
+  }), undefined, telemetry, 'story');
+  yield expect(scheduler.run(/*#__PURE__*/_asyncToGenerator(function* () {
+    return 0;
+  }), undefined, telemetry, 'story')).rejects.toThrow('queue is full');
+  yield tick();
+  release();
+  yield active;
+  expect(yield queued).toBe(42);
+  yield tick();
+  expect(events.filter(e => e.type === 'fetch_queue').map(e => e.outcome)).toEqual(['accepted', 'queued', 'full', 'accepted']);
+}));
+it('reports queue timeout and body deadline independently of successful HTTP headers', /*#__PURE__*/_asyncToGenerator(function* () {
+  jest.useFakeTimers();
+  var events = [];
+  var telemetry = {
+    observe: e => {
+      events.push(e);
+    }
+  };
+  var scheduler = new _requests.FetchScheduler({
+    concurrency: 1,
+    queueLimit: 1,
+    queueTimeout: 10,
+    requestTimeout: 30
+  });
+  var finish;
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return new Response(new ReadableStream({
+      start(controller) {
+        finish = () => controller.close();
+      }
+    }));
+  }));
+  var fetch = (0, _requests.createBoundedFetch)((0, _telemetry.createObservedFetch)(fetchMock, telemetry, 'content'), scheduler, telemetry);
+  var first = fetch('https://example.test/v2/stories/search');
+  var failed = expect(first).rejects.toThrow('timed out');
+  var next = fetch('https://example.test/v2/stories/search');
+  var queued = expect(next).rejects.toThrow('queue wait timed out');
+  yield jest.advanceTimersByTimeAsync(31);
+  yield failed;
+  yield queued;
+  expect(events.filter(e => e.type === 'upstream')).toEqual([expect.objectContaining({
+    status: '2xx'
+  })]);
+  expect(events.filter(e => e.type === 'fetch_timeout')).toHaveLength(1);
+  expect(events).toContainEqual(expect.objectContaining({
+    type: 'fetch_queue',
+    outcome: 'wait_timeout'
+  }));
+  finish();
+  yield jest.advanceTimersByTimeAsync(0);
+  expect(jest.getTimerCount()).toBe(0);
+}));
+it('a throwing or rejecting observer cannot change successful fetch outcomes', /*#__PURE__*/_asyncToGenerator(function* () {
+  var response = new Response('ok');
+  for (var observe of [() => {
+    throw Error('metrics');
+  }, /*#__PURE__*/_asyncToGenerator(function* () {
+    throw Error('metrics');
+  })]) {
+    var fetch = (0, _telemetry.createObservedFetch)(/*#__PURE__*/_asyncToGenerator(function* () {
+      return response;
+    }), {
+      observe
+    }, 'raw');
+    expect(yield fetch('https://example.test')).toBe(response);
+  }
+  yield tick();
+}));

package/build/adapters/prezly/telemetry.test.mjs

@@ -0,0 +1,165 @@
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+import { createObservedFetch, upstreamRoute } from "./telemetry.mjs";
+import { createBoundedFetch, FetchScheduler } from "./requests.mjs";
+import { PrezlyAdapter } from "./server.mjs";
+var nativeFetch = globalThis.fetch;
+var tick = () => new Promise(resolve => setImmediate(resolve));
+afterEach(() => {
+  globalThis.fetch = nativeFetch;
+  jest.useRealTimers();
+});
+it.each([['/v2/newsrooms/private-id', 'newsroom'], ['/v2/newsrooms/private-id/languages/en_GB', 'languages'], ['/v2/newsrooms/private-id/categories', 'categories'], ['/v2/stories/by-slug/private-slug?token=secret', 'story_by_slug'], ['/v2/stories/search', 'stories'], ['/v2/stories/private-uuid', 'story'], ['/custom/private-path', 'other']])('classifies %s without retaining URL values', (path, expected) => {
+  expect(upstreamRoute("https://private-origin.test".concat(path))).toBe(expected);
+});
+it('observes raw response headers without consuming the body or adding a signal', /*#__PURE__*/_asyncToGenerator(function* () {
+  var events = [];
+  var response = new Response('private-body');
+  var read = jest.spyOn(response, 'arrayBuffer');
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return response;
+  }));
+  var options = {
+    headers: {
+      Authorization: 'private-token'
+    }
+  };
+  var observed = createObservedFetch(fetchMock, {
+    observe: e => {
+      events.push(e);
+    },
+    source: 'custom'
+  }, 'raw');
+  expect(yield observed('https://private-origin.test/v2/stories/private-uuid', options)).toBe(response);
+  expect(read).not.toHaveBeenCalled();
+  expect(fetchMock).toHaveBeenCalledWith('https://private-origin.test/v2/stories/private-uuid', options);
+  expect(events).toEqual([expect.objectContaining({
+    type: 'upstream',
+    client: 'raw',
+    route: 'story',
+    source: 'custom',
+    status: '2xx'
+  })]);
+  expect(JSON.stringify(events)).not.toMatch(/private-/);
+}));
+it('keeps telemetry outside the source/cache identity when adapters share work', /*#__PURE__*/_asyncToGenerator(function* () {
+  var events = [];
+  var config = {
+    newsroom: 'private-room',
+    accessToken: 'private-token'
+  };
+  var cache = {
+    memory: true,
+    latestVersion: 1,
+    namespace: 'metrics-adapter-sharing'
+  };
+  globalThis.fetch = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return Response.json({
+      newsroom: {
+        name: 'room'
+      }
+    });
+  }));
+  var observed = PrezlyAdapter.connect(config, {
+    cache,
+    telemetry: e => {
+      events.push(e);
+    }
+  }).usePrezlyClient();
+  var plain = PrezlyAdapter.connect(config, {
+    cache
+  }).usePrezlyClient();
+  yield Promise.all([observed.contentDelivery.newsroom(), plain.contentDelivery.newsroom()]);
+  expect(globalThis.fetch).toHaveBeenCalledTimes(1);
+  yield tick();
+  yield observed.contentDelivery.newsroom();
+  expect(globalThis.fetch).toHaveBeenCalledTimes(1);
+  expect(events.filter(e => e.type === 'upstream')).toHaveLength(1);
+  expect(events.some(e => e.type === 'cache_hit')).toBe(true);
+}));
+it('reports queued, full, accepted and completed wait without changing admission limits', /*#__PURE__*/_asyncToGenerator(function* () {
+  var events = [];
+  var telemetry = {
+    observe: e => {
+      events.push(e);
+    }
+  };
+  var scheduler = new FetchScheduler({
+    concurrency: 1,
+    queueLimit: 1
+  });
+  var release;
+  var active = scheduler.run(() => new Promise(r => {
+    release = r;
+  }), undefined, telemetry, 'story');
+  var queued = scheduler.run(/*#__PURE__*/_asyncToGenerator(function* () {
+    return 42;
+  }), undefined, telemetry, 'story');
+  yield expect(scheduler.run(/*#__PURE__*/_asyncToGenerator(function* () {
+    return 0;
+  }), undefined, telemetry, 'story')).rejects.toThrow('queue is full');
+  yield tick();
+  release();
+  yield active;
+  expect(yield queued).toBe(42);
+  yield tick();
+  expect(events.filter(e => e.type === 'fetch_queue').map(e => e.outcome)).toEqual(['accepted', 'queued', 'full', 'accepted']);
+}));
+it('reports queue timeout and body deadline independently of successful HTTP headers', /*#__PURE__*/_asyncToGenerator(function* () {
+  jest.useFakeTimers();
+  var events = [];
+  var telemetry = {
+    observe: e => {
+      events.push(e);
+    }
+  };
+  var scheduler = new FetchScheduler({
+    concurrency: 1,
+    queueLimit: 1,
+    queueTimeout: 10,
+    requestTimeout: 30
+  });
+  var finish;
+  var fetchMock = jest.fn(/*#__PURE__*/_asyncToGenerator(function* () {
+    return new Response(new ReadableStream({
+      start(controller) {
+        finish = () => controller.close();
+      }
+    }));
+  }));
+  var fetch = createBoundedFetch(createObservedFetch(fetchMock, telemetry, 'content'), scheduler, telemetry);
+  var first = fetch('https://example.test/v2/stories/search');
+  var failed = expect(first).rejects.toThrow('timed out');
+  var next = fetch('https://example.test/v2/stories/search');
+  var queued = expect(next).rejects.toThrow('queue wait timed out');
+  yield jest.advanceTimersByTimeAsync(31);
+  yield failed;
+  yield queued;
+  expect(events.filter(e => e.type === 'upstream')).toEqual([expect.objectContaining({
+    status: '2xx'
+  })]);
+  expect(events.filter(e => e.type === 'fetch_timeout')).toHaveLength(1);
+  expect(events).toContainEqual(expect.objectContaining({
+    type: 'fetch_queue',
+    outcome: 'wait_timeout'
+  }));
+  finish();
+  yield jest.advanceTimersByTimeAsync(0);
+  expect(jest.getTimerCount()).toBe(0);
+}));
+it('a throwing or rejecting observer cannot change successful fetch outcomes', /*#__PURE__*/_asyncToGenerator(function* () {
+  var response = new Response('ok');
+  for (var observe of [() => {
+    throw Error('metrics');
+  }, /*#__PURE__*/_asyncToGenerator(function* () {
+    throw Error('metrics');
+  })]) {
+    var fetch = createObservedFetch(/*#__PURE__*/_asyncToGenerator(function* () {
+      return response;
+    }), {
+      observe
+    }, 'raw');
+    expect(yield fetch('https://example.test')).toBe(response);
+  }
+  yield tick();
+}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prezly/theme-kit-nextjs",
-  "version": "10.9.1",
+  "version": "10.9.3",
   "description": "Data layer and utility library for developing Prezly themes with NextJS",
   "type": "module",
   "main": "build/index.mjs",
@@ -42,11 +42,11 @@
     }
   },
   "engines": {
-    "node": ">= 16.x",
+    "node": ">= 18.18.0",
     "npm": ">= 8.x"
   },
   "devEngines": {
-    "node": ">= 16.x",
+    "node": ">= 18.18.0",
     "npm": ">= 8.x"
   },
   "repository": {
@@ -78,14 +78,14 @@
   },
   "dependencies": {
     "@noble/hashes": "1.8.0",
+    "@prezly/theme-kit-core": "^10.9.3",
+    "@prezly/theme-kit-intl": "^10.9.1",
+    "@prezly/theme-kit-react": "^10.9.1",
     "@technically/is-not-undefined": "^1.0.0",
     "@technically/omit-undefined": "^1.0.4",
     "json-stable-stringify": "^1.2.1",
     "redis": "^4.7.0",
-    "url-pattern": "^1.0.3",
-    "@prezly/theme-kit-core": "^10.9.1",
-    "@prezly/theme-kit-react": "^10.9.1",
-    "@prezly/theme-kit-intl": "^10.9.1"
+    "url-pattern": "^1.0.3"
   },
   "devDependencies": {
     "@sentry/nextjs": "7.120.4"
@@ -94,7 +94,7 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "51b1ce99cf8ce2c886001077bcaf95cb143f86ce",
+  "gitHead": "31134742a0ff3f3e669283f94843c3222eac8ebd",
   "scripts": {
     "prebuild": "rimraf --glob build/* *.tsbuildinfo",
     "build": "pnpm build:types && pnpm build:esm && pnpm build:cjs",
@@ -111,7 +111,7 @@
     "test:unit": "jest",
     "test:redis": "node tests/test-redis-resilience.cjs",
     "test:build": "pnpm test:build:cjs && pnpm test:build:esm && pnpm test:build:types",
-    "test:build:types": "tsc --esModuleInterop --noEmit build/index.d.ts",
+    "test:build:types": "tsc --esModuleInterop --noEmit --target es2020 --moduleResolution node tests/test-build-types.ts",
     "test:build:esm": "node tests/test-build.mjs",
     "test:build:cjs": "node tests/test-build.cjs"
   }