@prezly/theme-kit-nextjs 10.9.2 → 10.10.0

package/README.md

@@ -413,8 +413,30 @@ new retained key namespaces for every token or invalidation version. This create
 a one-time cold cache on upgrade. Roll out gradually and warm representative
 newsrooms before an expected traffic spike. Existing unscoped entries remain
 subject to their configured expiration; do not flush a Redis instance that also
-contains routing data. TTL, negative-cache classification and query
-canonicalization are separate policies and are unchanged here.
+contains routing data. TTL and query canonicalization are separate policies and
+are unchanged here.
+
+### Not-found results
+
+`contentDelivery.story()` and `contentDelivery.gallery()` resolve `null` when the
+API answers 403, 404 or 410. A `null` result is a cache hit like any other value:
+only an absent entry falls back to the API, so `false` and `0` are also valid
+cached values. Not-found entries are kept for `negativeTtl` seconds (default 60,
+`ContentDelivery.DEFAULT_NEGATIVE_TTL`). The deadline is written into the cached
+envelope and checked on every read, so a cache layer that ignores the `ttl`
+hint, or a `null` entry written by an older Theme Kit, is a miss rather than a
+stale hit. Memory and Redis also expire these entries on their own, and Redis
+does not renew that lifetime on read. A cache version change still invalidates
+them at once, so publishing a story makes it visible immediately; a story that
+becomes available without a version change appears within the TTL. Errors such
+as 401, 429, 5xx and transport failures throw and are never stored. `undefined`
+results are not stored either.
+
+Set `cache.negativeTtl` in `PrezlyAdapter.connect` to change the retention. It
+must be a positive integer number of seconds. Not-found caching needs the
+source/authorization scope described above; a client created with a custom
+`fetch` and no `requestScope` keeps treating `null` as a miss and does not
+store it.
 
 ### Verification and release
 

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

@@ -19,15 +19,18 @@ function configure(config) {
   if (storage) {
     return {
       storage: config.namespace ? storage.namespace(config.namespace) : storage,
-      latestVersion: _themeKitCore.Resolvable.resolve(config.latestVersion)
+      latestVersion: _themeKitCore.Resolvable.resolve(config.latestVersion),
+      negativeTtl: config.negativeTtl
     };
   }
   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,8 +10,12 @@ export interface Configuration {
     namespace?: string;
     /** Extra immutable identity for custom fetch implementations. Enables request sharing. */
     requestScope?: string;
+    /** Retention in seconds for not-found results. See `ContentDelivery.DEFAULT_NEGATIVE_TTL`. */
+    negativeTtl?: number;
+    telemetry?: ContentDelivery.Telemetry;
 }
 export declare function configure(config: Configuration): {
     storage: ContentDelivery.Cache;
     latestVersion: number;
+    negativeTtl: number | undefined;
 } | undefined;

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

@@ -13,15 +13,18 @@ export function configure(config) {
   if (storage) {
     return {
       storage: config.namespace ? storage.namespace(config.namespace) : storage,
-      latestVersion: Resolvable.resolve(config.latestVersion)
+      latestVersion: Resolvable.resolve(config.latestVersion),
+      negativeTtl: config.negativeTtl
     };
   }
   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,52 @@ 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);
+          // Sliding expiry applies to regular content only. An entry with its
+          // own short retention must not be renewed to the default lifetime.
+          if (ttl && entry.ttl === 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) {
+      set(key, value, version, options) {
         return _asyncToGenerator(function* () {
-          if (!connection.isReady) return;
-          var entry = {
+          if (!connection.isReady) {
+            _themeKitCore.ContentDelivery.emit(telemetry, {
+              type: 'redis_unavailable',
+              command: 'set'
+            });
+            return;
+          }
+          // SET EX takes whole seconds; round a fractional hint up, never down.
+          var entry = (options === null || options === void 0 ? void 0 : options.ttl) === undefined ? {
             value,
             version
+          } : {
+            value,
+            version,
+            ttl: Math.max(1, Math.ceil(options.ttl))
           };
-          yield command(() => connection.set("".concat(namespacePrefix).concat(key), JSON.stringify(entry), {
-            EX: ttl
-          }));
+          yield command(() => {
+            var _entry$ttl;
+            return connection.set("".concat(namespacePrefix).concat(key), JSON.stringify(entry), {
+              EX: (_entry$ttl = entry.ttl) !== null && _entry$ttl !== void 0 ? _entry$ttl : 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,52 @@ 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);
+          // Sliding expiry applies to regular content only. An entry with its
+          // own short retention must not be renewed to the default lifetime.
+          if (ttl && entry.ttl === 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) {
+      set(key, value, version, options) {
         return _asyncToGenerator(function* () {
-          if (!connection.isReady) return;
-          var entry = {
+          if (!connection.isReady) {
+            ContentDelivery.emit(telemetry, {
+              type: 'redis_unavailable',
+              command: 'set'
+            });
+            return;
+          }
+          // SET EX takes whole seconds; round a fractional hint up, never down.
+          var entry = (options === null || options === void 0 ? void 0 : options.ttl) === undefined ? {
             value,
             version
+          } : {
+            value,
+            version,
+            ttl: Math.max(1, Math.ceil(options.ttl))
           };
-          yield command(() => connection.set("".concat(namespacePrefix).concat(key), JSON.stringify(entry), {
-            EX: ttl
-          }));
+          yield command(() => {
+            var _entry$ttl;
+            return connection.set("".concat(namespacePrefix).concat(key), JSON.stringify(entry), {
+              EX: (_entry$ttl = entry.ttl) !== null && _entry$ttl !== void 0 ? _entry$ttl : 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', () => ({
@@ -78,12 +83,73 @@ it('preserves namespace, version and sliding expiry and observes expiry rejectio
     EX: 300
   });
 }));
+it('stores a short-lived entry with its own expiry and never renews it', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection3 = connection(),
+    client = _connection3.client,
+    cache = _connection3.cache;
+  yield cache.set('missing', null, 4, {
+    ttl: 60
+  });
+  expect(client.set).toHaveBeenLastCalledWith('test:missing', JSON.stringify({
+    value: null,
+    version: 4,
+    ttl: 60
+  }), {
+    EX: 60
+  });
+  client.get.mockResolvedValueOnce(JSON.stringify({
+    value: null,
+    version: 4,
+    ttl: 60
+  }));
+  var onSource = jest.fn();
+  expect(yield cache.get('missing', 4, onSource)).toBeNull();
+  expect(onSource).toHaveBeenCalledWith('redis');
+  expect(client.expire).not.toHaveBeenCalled();
+  client.get.mockResolvedValueOnce(JSON.stringify({
+    value: null,
+    version: 4,
+    ttl: 60
+  }));
+  expect(yield cache.get('missing', 5)).toBeUndefined();
+}));
+it('rounds a fractional ttl hint up to whole seconds for SET EX', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection4 = connection(),
+    client = _connection4.client,
+    cache = _connection4.cache;
+  yield cache.set('short', null, 1, {
+    ttl: 0.5
+  });
+  expect(client.set).toHaveBeenLastCalledWith('test:short', JSON.stringify({
+    value: null,
+    version: 1,
+    ttl: 1
+  }), {
+    EX: 1
+  });
+}));
+it.each([false, 0, ''])('returns a stored %p as a hit', /*#__PURE__*/function () {
+  var _ref8 = _asyncToGenerator(function* (value) {
+    var _connection5 = connection(),
+      client = _connection5.client,
+      cache = _connection5.cache;
+    client.get.mockResolvedValueOnce(JSON.stringify({
+      value,
+      version: 2
+    }));
+    expect(yield cache.get('key', 2)).toBe(value);
+    expect(client.expire).toHaveBeenCalledTimes(1);
+  });
+  return function (_x) {
+    return _ref8.apply(this, arguments);
+  };
+}());
 it.each(['get', 'set'])('times out stalled %s commands without unsafe cancellation and recovers', /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator(function* (method) {
+  var _ref9 = _asyncToGenerator(function* (method) {
     jest.useFakeTimers();
-    var _connection3 = connection(),
-      client = _connection3.client,
-      cache = _connection3.cache;
+    var _connection6 = connection(),
+      client = _connection6.client,
+      cache = _connection6.cache;
     var rejectOperation;
     client[method].mockImplementationOnce(() => new Promise((_, reject) => {
       rejectOperation = reject;
@@ -97,7 +163,38 @@ it.each(['get', 'set'])('times out stalled %s commands without unsafe cancellati
     yield jest.advanceTimersByTimeAsync(0);
     expect(jest.getTimerCount()).toBe(0);
   });
-  return function (_x) {
-    return _ref6.apply(this, arguments);
+  return function (_x2) {
+    return _ref9.apply(this, arguments);
   };
-}());
+}());
+it('does not fragment Redis connections by observer and distinguishes unavailable from commands', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection7 = connection(false),
+    client = _connection7.client,
+    options = _connection7.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';
@@ -76,12 +81,73 @@ it('preserves namespace, version and sliding expiry and observes expiry rejectio
     EX: 300
   });
 }));
+it('stores a short-lived entry with its own expiry and never renews it', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection3 = connection(),
+    client = _connection3.client,
+    cache = _connection3.cache;
+  yield cache.set('missing', null, 4, {
+    ttl: 60
+  });
+  expect(client.set).toHaveBeenLastCalledWith('test:missing', JSON.stringify({
+    value: null,
+    version: 4,
+    ttl: 60
+  }), {
+    EX: 60
+  });
+  client.get.mockResolvedValueOnce(JSON.stringify({
+    value: null,
+    version: 4,
+    ttl: 60
+  }));
+  var onSource = jest.fn();
+  expect(yield cache.get('missing', 4, onSource)).toBeNull();
+  expect(onSource).toHaveBeenCalledWith('redis');
+  expect(client.expire).not.toHaveBeenCalled();
+  client.get.mockResolvedValueOnce(JSON.stringify({
+    value: null,
+    version: 4,
+    ttl: 60
+  }));
+  expect(yield cache.get('missing', 5)).toBeUndefined();
+}));
+it('rounds a fractional ttl hint up to whole seconds for SET EX', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection4 = connection(),
+    client = _connection4.client,
+    cache = _connection4.cache;
+  yield cache.set('short', null, 1, {
+    ttl: 0.5
+  });
+  expect(client.set).toHaveBeenLastCalledWith('test:short', JSON.stringify({
+    value: null,
+    version: 1,
+    ttl: 1
+  }), {
+    EX: 1
+  });
+}));
+it.each([false, 0, ''])('returns a stored %p as a hit', /*#__PURE__*/function () {
+  var _ref8 = _asyncToGenerator(function* (value) {
+    var _connection5 = connection(),
+      client = _connection5.client,
+      cache = _connection5.cache;
+    client.get.mockResolvedValueOnce(JSON.stringify({
+      value,
+      version: 2
+    }));
+    expect(yield cache.get('key', 2)).toBe(value);
+    expect(client.expire).toHaveBeenCalledTimes(1);
+  });
+  return function (_x) {
+    return _ref8.apply(this, arguments);
+  };
+}());
 it.each(['get', 'set'])('times out stalled %s commands without unsafe cancellation and recovers', /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator(function* (method) {
+  var _ref9 = _asyncToGenerator(function* (method) {
     jest.useFakeTimers();
-    var _connection3 = connection(),
-      client = _connection3.client,
-      cache = _connection3.cache;
+    var _connection6 = connection(),
+      client = _connection6.client,
+      cache = _connection6.cache;
     var rejectOperation;
     client[method].mockImplementationOnce(() => new Promise((_, reject) => {
       rejectOperation = reject;
@@ -95,7 +161,38 @@ it.each(['get', 'set'])('times out stalled %s commands without unsafe cancellati
     yield jest.advanceTimersByTimeAsync(0);
     expect(jest.getTimerCount()).toBe(0);
   });
-  return function (_x) {
-    return _ref6.apply(this, arguments);
+  return function (_x2) {
+    return _ref9.apply(this, arguments);
   };
-}());
+}());
+it('does not fragment Redis connections by observer and distinguishes unavailable from commands', /*#__PURE__*/_asyncToGenerator(function* () {
+  var _connection7 = connection(false),
+    client = _connection7.client,
+    options = _connection7.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()
+  }));
+}));