@algolia/client-common 5.0.0-alpha.92 → 5.0.0-alpha.98

package/dist/client-common.cjs

@@ -118,14 +118,35 @@ function createBrowserLocalStorageCache(options) {
   function getNamespace() {
     return JSON.parse(getStorage().getItem(namespaceKey) || '{}');
   }
+  function setNamespace(namespace) {
+    getStorage().setItem(namespaceKey, JSON.stringify(namespace));
+  }
+  function removeOutdatedCacheItems() {
+    const timeToLive = options.timeToLive ? options.timeToLive * 1000 : null;
+    const namespace = getNamespace();
+    const filteredNamespaceWithoutOldFormattedCacheItems = Object.fromEntries(Object.entries(namespace).filter(([, cacheItem]) => {
+      return cacheItem.timestamp !== undefined;
+    }));
+    setNamespace(filteredNamespaceWithoutOldFormattedCacheItems);
+    if (!timeToLive) {
+      return;
+    }
+    const filteredNamespaceWithoutExpiredItems = Object.fromEntries(Object.entries(filteredNamespaceWithoutOldFormattedCacheItems).filter(([, cacheItem]) => {
+      const currentTimestamp = new Date().getTime();
+      const isExpired = cacheItem.timestamp + timeToLive < currentTimestamp;
+      return !isExpired;
+    }));
+    setNamespace(filteredNamespaceWithoutExpiredItems);
+  }
   return {
     get(key, defaultValue, events = {
       miss: () => Promise.resolve()
     }) {
       return Promise.resolve().then(() => {
-        const keyAsString = JSON.stringify(key);
-        const value = getNamespace()[keyAsString];
-        return Promise.all([value || defaultValue(), value !== undefined]);
+        removeOutdatedCacheItems();
+        return getNamespace()[JSON.stringify(key)];
+      }).then(value => {
+        return Promise.all([value ? value.value : defaultValue(), value !== undefined]);
       }).then(([value, exists]) => {
         return Promise.all([value, exists || events.miss(value)]);
       }).then(([value]) => value);
@@ -133,7 +154,10 @@ function createBrowserLocalStorageCache(options) {
     set(key, value) {
       return Promise.resolve().then(() => {
         const namespace = getNamespace();
-        namespace[JSON.stringify(key)] = value;
+        namespace[JSON.stringify(key)] = {
+          timestamp: new Date().getTime(),
+          value
+        };
         getStorage().setItem(namespaceKey, JSON.stringify(namespace));
         return value;
       });
@@ -263,6 +287,20 @@ function createStatefulHost(host, status = 'up') {
   };
 }
 
+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 _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : String(i);
+}
 function _defineProperty(obj, key, value) {
   key = _toPropertyKey(key);
   if (key in obj) {
@@ -277,20 +315,6 @@ function _defineProperty(obj, key, value) {
   }
   return obj;
 }
-function _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
-}
 
 class AlgoliaError extends Error {
   constructor(message, name) {
@@ -311,7 +335,7 @@ class ErrorWithStackTrace extends AlgoliaError {
 }
 class RetryError extends ErrorWithStackTrace {
   constructor(stackTrace) {
-    super('Unreachable hosts - your application id may be incorrect. If the error persists, contact support@algolia.com.', stackTrace, 'RetryError');
+    super('Unreachable hosts - your application id may be incorrect. If the error persists, please create a ticket at https://support.algolia.com/ sharing steps we can use to reproduce the issue.', stackTrace, 'RetryError');
   }
 }
 class ApiError extends ErrorWithStackTrace {

package/dist/client-common.esm.node.js

@@ -116,14 +116,35 @@ function createBrowserLocalStorageCache(options) {
   function getNamespace() {
     return JSON.parse(getStorage().getItem(namespaceKey) || '{}');
   }
+  function setNamespace(namespace) {
+    getStorage().setItem(namespaceKey, JSON.stringify(namespace));
+  }
+  function removeOutdatedCacheItems() {
+    const timeToLive = options.timeToLive ? options.timeToLive * 1000 : null;
+    const namespace = getNamespace();
+    const filteredNamespaceWithoutOldFormattedCacheItems = Object.fromEntries(Object.entries(namespace).filter(([, cacheItem]) => {
+      return cacheItem.timestamp !== undefined;
+    }));
+    setNamespace(filteredNamespaceWithoutOldFormattedCacheItems);
+    if (!timeToLive) {
+      return;
+    }
+    const filteredNamespaceWithoutExpiredItems = Object.fromEntries(Object.entries(filteredNamespaceWithoutOldFormattedCacheItems).filter(([, cacheItem]) => {
+      const currentTimestamp = new Date().getTime();
+      const isExpired = cacheItem.timestamp + timeToLive < currentTimestamp;
+      return !isExpired;
+    }));
+    setNamespace(filteredNamespaceWithoutExpiredItems);
+  }
   return {
     get(key, defaultValue, events = {
       miss: () => Promise.resolve()
     }) {
       return Promise.resolve().then(() => {
-        const keyAsString = JSON.stringify(key);
-        const value = getNamespace()[keyAsString];
-        return Promise.all([value || defaultValue(), value !== undefined]);
+        removeOutdatedCacheItems();
+        return getNamespace()[JSON.stringify(key)];
+      }).then(value => {
+        return Promise.all([value ? value.value : defaultValue(), value !== undefined]);
       }).then(([value, exists]) => {
         return Promise.all([value, exists || events.miss(value)]);
       }).then(([value]) => value);
@@ -131,7 +152,10 @@ function createBrowserLocalStorageCache(options) {
     set(key, value) {
       return Promise.resolve().then(() => {
         const namespace = getNamespace();
-        namespace[JSON.stringify(key)] = value;
+        namespace[JSON.stringify(key)] = {
+          timestamp: new Date().getTime(),
+          value
+        };
         getStorage().setItem(namespaceKey, JSON.stringify(namespace));
         return value;
       });
@@ -261,6 +285,20 @@ function createStatefulHost(host, status = 'up') {
   };
 }
 
+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 _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : String(i);
+}
 function _defineProperty(obj, key, value) {
   key = _toPropertyKey(key);
   if (key in obj) {
@@ -275,20 +313,6 @@ function _defineProperty(obj, key, value) {
   }
   return obj;
 }
-function _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
-}
 
 class AlgoliaError extends Error {
   constructor(message, name) {
@@ -309,7 +333,7 @@ class ErrorWithStackTrace extends AlgoliaError {
 }
 class RetryError extends ErrorWithStackTrace {
   constructor(stackTrace) {
-    super('Unreachable hosts - your application id may be incorrect. If the error persists, contact support@algolia.com.', stackTrace, 'RetryError');
+    super('Unreachable hosts - your application id may be incorrect. If the error persists, please create a ticket at https://support.algolia.com/ sharing steps we can use to reproduce the issue.', stackTrace, 'RetryError');
   }
 }
 class ApiError extends ErrorWithStackTrace {

package/dist/src/cache/createBrowserLocalStorageCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBrowserLocalStorageCache.d.ts","sourceRoot":"","sources":["../../../src/cache/createBrowserLocalStorageCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,KAAK,EAAe,MAAM,UAAU,CAAC;AAE/E,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,0BAA0B,GAClC,KAAK,CAqEP"}
+{"version":3,"file":"createBrowserLocalStorageCache.d.ts","sourceRoot":"","sources":["../../../src/cache/createBrowserLocalStorageCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,0BAA0B,EAC1B,KAAK,EAEN,MAAM,UAAU,CAAC;AAElB,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,0BAA0B,GAClC,KAAK,CAiHP"}

package/dist/src/types/cache.d.ts

@@ -33,11 +33,25 @@ export type BrowserLocalStorageOptions = {
      * The cache key.
      */
     key: string;
+    /**
+     * The time to live for each cached item in seconds.
+     */
+    timeToLive?: number;
     /**
      * The native local storage implementation.
      */
     localStorage?: Storage;
 };
+export type BrowserLocalStorageCacheItem = {
+    /**
+     * The cache item creation timestamp.
+     */
+    timestamp: number;
+    /**
+     * The cache item value.
+     */
+    value: any;
+};
 export type FallbackableCacheOptions = {
     /**
      * List of caches order by priority.

package/dist/src/types/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/types/cache.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAClB;;OAEG;IACH,GAAG,EAAE,CAAC,MAAM,EACV,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EACjC,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACnC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,KACzB,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB;;OAEG;IACH,GAAG,EAAE,CAAC,MAAM,EACV,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EACjC,KAAK,EAAE,MAAM,KACV,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB;;OAEG;IACH,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D;;OAEG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,MAAM,IAAI;IAChC;;OAEG;IACH,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/types/cache.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAClB;;OAEG;IACH,GAAG,EAAE,CAAC,MAAM,EACV,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EACjC,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACnC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,KACzB,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB;;OAEG;IACH,GAAG,EAAE,CAAC,MAAM,EACV,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EACjC,KAAK,EAAE,MAAM,KACV,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB;;OAEG;IACH,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D;;OAEG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,MAAM,IAAI;IAChC;;OAEG;IACH,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algolia/client-common",
-  "version": "5.0.0-alpha.92",
+  "version": "5.0.0-alpha.98",
   "description": "Common package for the Algolia JavaScript API client.",
   "repository": "algolia/algoliasearch-client-javascript",
   "license": "MIT",
@@ -20,14 +20,14 @@
     "test": "jest"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.23.3",
+    "@babel/preset-env": "7.23.8",
     "@babel/preset-typescript": "7.23.3",
-    "@types/jest": "29.5.8",
-    "@types/node": "20.9.0",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.11.1",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "ts-jest": "29.1.1",
-    "typescript": "5.2.2"
+    "typescript": "5.3.3"
   },
   "engines": {
     "node": ">= 14.0.0"

package/src/__tests__/cache/browser-local-storage-cache.test.ts

@@ -39,6 +39,24 @@ describe('browser local storage cache', () => {
     expect(missMock.mock.calls.length).toBe(1);
   });
 
+  it('reads unexpired timeToLive keys', async () => {
+    const cache = createBrowserLocalStorageCache({
+      key: version,
+      timeToLive: 5,
+    });
+    await cache.set({ key: 'foo' }, { bar: 1 });
+
+    const defaultValue = (): DefaultValue => Promise.resolve({ bar: 2 });
+
+    expect(
+      await cache.get({ key: 'foo' }, defaultValue, {
+        miss: () => Promise.resolve(missMock()),
+      })
+    ).toMatchObject({ bar: 1 });
+
+    expect(missMock.mock.calls.length).toBe(0);
+  });
+
   it('deletes keys', async () => {
     const cache = createBrowserLocalStorageCache({ key: version });
 
@@ -53,19 +71,43 @@ describe('browser local storage cache', () => {
     expect(missMock.mock.calls.length).toBe(1);
   });
 
+  it('deletes expired keys', async () => {
+    const cache = createBrowserLocalStorageCache({
+      key: version,
+      timeToLive: -1,
+    });
+    await cache.set({ key: 'foo' }, { bar: 1 });
+
+    const defaultValue = (): DefaultValue => Promise.resolve({ bar: 2 });
+
+    expect(
+      await cache.get({ key: 'foo' }, defaultValue, {
+        miss: () => Promise.resolve(missMock()),
+      })
+    ).toMatchObject({ bar: 2 });
+
+    expect(missMock.mock.calls.length).toBe(1);
+  });
+
   it('can be cleared', async () => {
     const cache = createBrowserLocalStorageCache({ key: version });
-
     await cache.set({ key: 'foo' }, { bar: 1 });
+
     await cache.clear();
 
-    const defaultValue = (): DefaultValue => Promise.resolve({ bar: 2 });
+    const defaultValue = (): Promise<void> => Promise.resolve({ bar: 2 });
 
-    expect(await cache.get({ key: 'foo' }, defaultValue, events)).toMatchObject(
-      { bar: 2 }
-    );
-    expect(missMock.mock.calls.length).toBe(1);
     expect(localStorage.length).toBe(0);
+
+    expect(
+      await cache.get({ key: 'foo' }, defaultValue, {
+        miss: () => Promise.resolve(missMock()),
+      })
+    ).toMatchObject({ bar: 2 });
+
+    expect(missMock.mock.calls.length).toBe(1);
+
+    expect(localStorage.getItem(`algolia-client-js-${version}`)).toEqual('{}');
   });
 
   it('do throws localstorage exceptions on access', async () => {
@@ -122,13 +164,23 @@ describe('browser local storage cache', () => {
     });
     const key = { foo: 'bar' };
     const value = 'foo';
-
     expect(localStorage.getItem(`algolia-client-js-${version}`)).toBeNull();
 
     await cache.set(key, value);
 
-    expect(localStorage.getItem(`algolia-client-js-${version}`)).toBe(
-      '{"{\\"foo\\":\\"bar\\"}":"foo"}'
+    const expectedValue = expect.objectContaining({
+      [JSON.stringify(key)]: {
+        timestamp: expect.any(Number),
+        value,
+      },
+    });
+
+    const localStorageValue = localStorage.getItem(
+      `algolia-client-js-${version}`
+    );
+
+    expect(JSON.parse(localStorageValue ? localStorageValue : '{}')).toEqual(
+      expectedValue
     );
   });
 });

package/src/cache/createBrowserLocalStorageCache.ts

@@ -1,4 +1,9 @@
-import type { BrowserLocalStorageOptions, Cache, CacheEvents } from '../types';
+import type {
+  BrowserLocalStorageCacheItem,
+  BrowserLocalStorageOptions,
+  Cache,
+  CacheEvents,
+} from '../types';
 
 export function createBrowserLocalStorageCache(
   options: BrowserLocalStorageOptions
@@ -19,20 +24,61 @@ export function createBrowserLocalStorageCache(
     return JSON.parse(getStorage().getItem(namespaceKey) || '{}');
   }
 
+  function setNamespace(namespace: Record<string, any>): void {
+    getStorage().setItem(namespaceKey, JSON.stringify(namespace));
+  }
+
+  function removeOutdatedCacheItems(): void {
+    const timeToLive = options.timeToLive ? options.timeToLive * 1000 : null;
+    const namespace = getNamespace<BrowserLocalStorageCacheItem>();
+
+    const filteredNamespaceWithoutOldFormattedCacheItems = Object.fromEntries(
+      Object.entries(namespace).filter(([, cacheItem]) => {
+        return cacheItem.timestamp !== undefined;
+      })
+    );
+
+    setNamespace(filteredNamespaceWithoutOldFormattedCacheItems);
+
+    if (!timeToLive) {
+      return;
+    }
+
+    const filteredNamespaceWithoutExpiredItems = Object.fromEntries(
+      Object.entries(filteredNamespaceWithoutOldFormattedCacheItems).filter(
+        ([, cacheItem]) => {
+          const currentTimestamp = new Date().getTime();
+          const isExpired = cacheItem.timestamp + timeToLive < currentTimestamp;
+
+          return !isExpired;
+        }
+      )
+    );
+
+    setNamespace(filteredNamespaceWithoutExpiredItems);
+  }
+
   return {
     get<TValue>(
       key: Record<string, any> | string,
       defaultValue: () => Promise<TValue>,
       events: CacheEvents<TValue> = {
-        miss: (): Promise<void> => Promise.resolve(),
+        miss: () => Promise.resolve(),
       }
     ): Promise<TValue> {
       return Promise.resolve()
         .then(() => {
-          const keyAsString = JSON.stringify(key);
-          const value = getNamespace<TValue>()[keyAsString];
+          removeOutdatedCacheItems();
 
-          return Promise.all([value || defaultValue(), value !== undefined]);
+          return getNamespace<Promise<BrowserLocalStorageCacheItem>>()[
+            JSON.stringify(key)
+          ];
+        })
+        .then((value) => {
+          return Promise.all([
+            value ? value.value : defaultValue(),
+            value !== undefined,
+          ]);
         })
         .then(([value, exists]) => {
           return Promise.all([value, exists || events.miss(value)]);
@@ -47,7 +93,10 @@ export function createBrowserLocalStorageCache(
       return Promise.resolve().then(() => {
         const namespace = getNamespace();
 
-        namespace[JSON.stringify(key)] = value;
+        namespace[JSON.stringify(key)] = {
+          timestamp: new Date().getTime(),
+          value,
+        };
 
         getStorage().setItem(namespaceKey, JSON.stringify(namespace));
 

package/src/transporter/errors.ts

@@ -25,7 +25,7 @@ export class ErrorWithStackTrace extends AlgoliaError {
 export class RetryError extends ErrorWithStackTrace {
   constructor(stackTrace: StackFrame[]) {
     super(
-      'Unreachable hosts - your application id may be incorrect. If the error persists, contact support@algolia.com.',
+      'Unreachable hosts - your application id may be incorrect. If the error persists, please create a ticket at https://support.algolia.com/ sharing steps we can use to reproduce the issue.',
       stackTrace,
       'RetryError'
     );

package/src/types/cache.ts

@@ -47,12 +47,29 @@ export type BrowserLocalStorageOptions = {
    */
   key: string;
 
+  /**
+   * The time to live for each cached item in seconds.
+   */
+  timeToLive?: number;
+
   /**
    * The native local storage implementation.
    */
   localStorage?: Storage;
 };
 
+export type BrowserLocalStorageCacheItem = {
+  /**
+   * The cache item creation timestamp.
+   */
+  timestamp: number;
+
+  /**
+   * The cache item value.
+   */
+  value: any;
+};
+
 export type FallbackableCacheOptions = {
   /**
    * List of caches order by priority.