musora-content-services 1.2.5 → 1.3.2

package/src/services/dataContext.js

@@ -1,110 +1,116 @@
-import {globalConfig} from "./config.js";
+import { globalConfig } from './config.js'
 
 /**
  * Exported functions that are excluded from index generation.
  *
  * @type {string[]}
  */
-const excludeFromGeneratedIndex = [];
+const excludeFromGeneratedIndex = []
 
 //These constants need to match MWP UserDataVersionKeyEnum enum
-export const ContentLikesVersionKey = 0;
-export const ContentProgressVersionKey = 1;
+export const ContentLikesVersionKey = 0
+export const ContentProgressVersionKey = 1
 
-let cache = null;
+let cache = null
 
 export class DataContext {
-    context = null;
-    dataPromise = null;
-
-    constructor(dataVersionKey, fetchDataFunction) {
-        this.dataVersionKey = dataVersionKey;
-        this.fetchDataFunction = fetchDataFunction;
-        this.localStorageKey = `dataContext_${this.dataVersionKey.toString()}`;
-        this.localStorageLastUpdatedKey = `dataContext_${this.dataVersionKey.toString()}_lastUpdated`;
+  context = null
+  dataPromise = null
+
+  constructor(dataVersionKey, fetchDataFunction) {
+    this.dataVersionKey = dataVersionKey
+    this.fetchDataFunction = fetchDataFunction
+    this.localStorageKey = `dataContext_${this.dataVersionKey.toString()}`
+    this.localStorageLastUpdatedKey = `dataContext_${this.dataVersionKey.toString()}_lastUpdated`
+  }
+
+  async getData() {
+    if (!this.dataPromise) {
+      this.dataPromise = this.getDataPromise()
     }
-
-    async getData() {
-        if (!this.dataPromise) {
-            this.dataPromise = this.getDataPromise();
-        }
-        return this.dataPromise;
+    return this.dataPromise
+  }
+
+  async getDataPromise() {
+    await this.ensureLocalContextLoaded()
+    const shouldVerify = await this.shouldVerifyServerVerions()
+
+    if (!this.context || shouldVerify) {
+      let version = this.version()
+      let data = await this.fetchData(version)
+      if (data?.version !== 'No Change') {
+        this.context = data
+        cache.setItem(this.localStorageKey, JSON.stringify(data))
+      }
+      cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime()?.toString())
     }
-
-    async getDataPromise() {
-        await this.ensureLocalContextLoaded();
-        const shouldVerify = await this.shouldVerifyServerVerions();
-
-        if ((!this.context) || shouldVerify) {
-            let version = this.version();
-            let data = await this.fetchData(version);
-            if (data?.version !== "No Change") {
-                this.context = data;
-                cache.setItem(this.localStorageKey, JSON.stringify(data));
-            }
-            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime()?.toString());
-        }
-        this.dataPromise = null;
-        return this.context.data;
+    this.dataPromise = null
+    return this.context.data
+  }
+
+  async fetchData(version) {
+    return await this.fetchDataFunction(version)
+  }
+
+  async ensureLocalContextLoaded() {
+    if (this.context) return
+    this.verifyConfig()
+    let localData = globalConfig.isMA
+      ? await cache.getItem(this.localStorageKey)
+      : cache.getItem(this.localStorageKey)
+    if (localData) {
+      this.context = JSON.parse(localData)
     }
-
-    async fetchData(version) {
-        return await this.fetchDataFunction(version);
+  }
+
+  verifyConfig() {
+    if (!cache) {
+      cache = globalConfig.localStorage
+      if (!cache)
+        throw new Error(
+          'dataContext: LocalStorage cache not configured in musora content services initializeService.'
+        )
     }
-
-    async ensureLocalContextLoaded() {
-        if (this.context) return;
-        this.verifyConfig();
-        let localData = globalConfig.isMA ? await cache.getItem(this.localStorageKey) : cache.getItem(this.localStorageKey);
-        if (localData) {
-            this.context = JSON.parse(localData);
-        }
+  }
+
+  async shouldVerifyServerVerions() {
+    let lastUpdated = globalConfig.isMA
+      ? await cache.getItem(this.localStorageLastUpdatedKey)
+      : cache.getItem(this.localStorageLastUpdatedKey)
+    if (!lastUpdated) return false
+    const verifyServerTime = 10000 //10 s
+    return new Date().getTime() - lastUpdated > verifyServerTime
+  }
+
+  clearCache() {
+    this.clearContext()
+    cache.removeItem(this.localStorageKey)
+    cache.removeItem(this.localStorageLastUpdatedKey)
+  }
+
+  clearContext() {
+    this.context = null
+  }
+
+  async update(localUpdateFunction, serverUpdateFunction) {
+    await this.ensureLocalContextLoaded()
+    if (this.context) {
+      await localUpdateFunction(this.context)
+      if (this.context) this.context.version++
+      let data = JSON.stringify(this.context)
+      cache.setItem(this.localStorageKey, data)
+      cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime().toString())
     }
-
-    verifyConfig() {
-        if (!cache) {
-            cache = globalConfig.localStorage;
-            if (!cache) throw new Error('dataContext: LocalStorage cache not configured in musora content services initializeService.');
-        }
-    }
-
-    async shouldVerifyServerVerions() {
-        let lastUpdated = globalConfig.isMA ? await cache.getItem(this.localStorageLastUpdatedKey) : cache.getItem(this.localStorageLastUpdatedKey);
-        if (!lastUpdated) return false;
-        const verifyServerTime = 10000; //10 s
-        return (new Date().getTime() - lastUpdated) > verifyServerTime;
-    }
-
-    clearCache() {
-        this.clearContext();
-        cache.removeItem(this.localStorageKey);
-        cache.removeItem(this.localStorageLastUpdatedKey);
-    }
-
-    clearContext() {
-        this.context = null;
-    }
-
-    async update(localUpdateFunction, serverUpdateFunction) {
-        await this.ensureLocalContextLoaded();
-        if (this.context) {
-            await localUpdateFunction(this.context);
-            if (this.context) this.context.version++;
-            let data = JSON.stringify(this.context);
-            cache.setItem(this.localStorageKey, data);
-            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime().toString());
-        }
-        const updatePromise = serverUpdateFunction();
-        updatePromise.then((response) => {
-            if (response?.version !== this.version()) {
-                this.clearCache();
-            }
-        });
-        return updatePromise;
-    }
-
-    version() {
-        return this.context?.version ?? -1;
-    }
-
+    const updatePromise = serverUpdateFunction()
+    updatePromise.then((response) => {
+      if (response?.version !== this.version()) {
+        this.clearCache()
+      }
+    })
+    return updatePromise
+  }
+
+  version() {
+    return this.context?.version ?? -1
+  }
 }

package/src/services/lastUpdated.js

@@ -1,18 +1,18 @@
-import {globalConfig} from "./config.js";
+import { globalConfig } from './config.js'
 
 /**
  * Exported functions that are excluded from index generation.
  *
  * @type {string[]}
  */
-const excludeFromGeneratedIndex = ['wasLastUpdateOlderThanXSeconds', 'setLastUpdatedTime'];
+const excludeFromGeneratedIndex = ['wasLastUpdateOlderThanXSeconds', 'setLastUpdatedTime']
 export function wasLastUpdateOlderThanXSeconds(seconds, key) {
-    let lastUpdated = globalConfig.localStorage.getItem(key);
-    if (!lastUpdated) return false;
-    const verifyServerTime = seconds * 1000;
-    return (new Date().getTime() - lastUpdated) > verifyServerTime;
+  let lastUpdated = globalConfig.localStorage.getItem(key)
+  if (!lastUpdated) return false
+  const verifyServerTime = seconds * 1000
+  return new Date().getTime() - lastUpdated > verifyServerTime
 }
 
 export function setLastUpdatedTime(key) {
-    globalConfig.localStorage.setItem(key, new Date().getTime()?.toString());
+  globalConfig.localStorage.setItem(key, new Date().getTime()?.toString())
 }