musora-content-services 2.179.0 → 2.180.0

package/.agent/decisions/2026-09-04-sanity-client-cloudflare-cache.md

@@ -0,0 +1,37 @@
+---
+date: 2026-09-04
+branch: refactor/sanity-client-cloudflare-cache
+pr: https://github.com/railroadmedia/musora-content-services/pull/1046
+status: open
+tags: [[chore]]
+---
+
+# Route SanityClient through Cloudflare caching proxy
+
+## Context
+
+PR #900 added a Cloudflare caching layer for Sanity queries by pointing the legacy `fetchSanity()` function (`src/services/sanity.js`) at `sanity.musora.com` instead of hitting `*.sanity.io` directly. That change only touched the legacy path. The newer `SanityClient` class (`src/infrastructure/sanity/SanityClient.ts`) builds its request URL independently in `FetchQueryExecutor.buildUrl()`, which still hit `*.sanity.io` directly and bypassed the CF cache entirely.
+
+## Decision
+
+Mirrored the same host rewrite from PR #900 into `FetchQueryExecutor.buildUrl()` (`src/infrastructure/sanity/executors/FetchQueryExecutor.ts`):
+
+```ts
+return `https://sanity.musora.com/${config.projectId}/${api}/v${config.version}/${config.dataset}?perspective=${perspective}`
+```
+
+No other files needed to change — `DefaultConfigProvider`, `SanityConfig`, and `SanityClient` itself are all host-agnostic and pass through unaffected.
+
+## Alternatives Considered
+
+No alternatives considered — this is a direct parity fix to bring `SanityClient` in line with the URL rewrite already proven in `fetchSanity()`.
+
+## Process Notes
+
+Updated `test/unit/infrastructure/sanity/FetchQueryExecutor.test.ts` — 4 assertions were hardcoded against the old `*.sanity.io` URL format and needed updating to the new `sanity.musora.com` host/path shape.
+
+The diff also shows unrelated prettier-driven reformatting in `src/services/sanity.js` (line wrapping, trailing commas) picked up from a main sync — not part of this change's intent.
+
+## Consequences
+
+Both Sanity query paths (`fetchSanity()` and `SanityClient`) now route through the Cloudflare caching proxy, so queries made via `SanityClient` benefit from the same CDN caching as the legacy path.

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.180.0](https://github.com/railroadmedia/musora-content-services/compare/v2.179.0...v2.180.0) (2026-09-04)
+
+
+### Features
+
+* **TP-1335:** consolidate duplicated user data fetches ([#1039](https://github.com/railroadmedia/musora-content-services/issues/1039)) ([bb2af2c](https://github.com/railroadmedia/musora-content-services/commit/bb2af2cddce8da519a414b24d7b86cc96639faaf))
+* **TP-1354:** daily session / active path get optimisations ([#1041](https://github.com/railroadmedia/musora-content-services/issues/1041)) ([bca652c](https://github.com/railroadmedia/musora-content-services/commit/bca652ccf181b1ba943fe6e9b14b375bf4bebfc9))
+
 ## [2.179.0](https://github.com/railroadmedia/musora-content-services/compare/v2.178.1...v2.179.0) (2026-09-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.179.0",
+  "version": "2.180.0",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/infrastructure/http/HttpClient.ts

@@ -18,6 +18,7 @@ export class HttpClient {
   private headerProvider: HeaderProvider
   private requestExecutor: RequestExecutor
   private credentials: RequestCredentials
+  private inFlightGetRequests: Map<string, Promise<any>> = new Map()
 
   constructor(
     baseUrl: string = '',
@@ -42,7 +43,20 @@ export class HttpClient {
   }
 
   public async get<T>(url: string, options: _RequestOptions = {}): Promise<T> {
-    return this.request<T>(url, 'GET', options)
+    const key = `GET:${this.resolveUrl(url)}:${options.dataVersion || ''}`
+
+    const inFlightRequest = this.inFlightGetRequests.get(key)
+    if (inFlightRequest) {
+      return inFlightRequest
+    }
+
+    const request = this.request<T>(url, 'GET', options).finally(() => {
+      this.inFlightGetRequests.delete(key)
+    })
+    
+    this.inFlightGetRequests.set(key, request)
+
+    return request
   }
 
   public async post<T>(url: string, data: any, options: _RequestOptions = {}): Promise<T> {

package/src/infrastructure/sanity/executors/FetchQueryExecutor.ts

@@ -46,7 +46,7 @@ export class FetchQueryExecutor implements QueryExecutor {
   private buildUrl(config: SanityConfig): string {
     const perspective = config.perspective ?? 'published'
     const api = config.useCachedAPI ? 'apicdn' : 'api'
-    return `https://${config.projectId}.${api}.sanity.io/v${config.version}/data/query/${config.dataset}?perspective=${perspective}`
+    return `https://sanity.musora.com/${config.projectId}/${api}/v${config.version}/${config.dataset}?perspective=${perspective}`
   }
 
   private buildRequest(

package/src/services/config.js

@@ -9,6 +9,7 @@ export let globalConfig = {
   sanityConfig: {},
   railcontentConfig: {},
   sessionConfig: {},
+  sessionUser: null,
   localStorage: null,
   isMA: false,
   localTimezoneString: null, // In format: America/Vancouver
@@ -109,3 +110,7 @@ export function initializeService(config) {
 export function initializeEnvVar(config) {
   globalConfig.appEnv = config.appEnv
 }
+
+export function setSessionUserData(userData) {
+  globalConfig.sessionUser = userData || null
+}

package/src/services/content-org/learning-paths.ts

@@ -30,12 +30,38 @@ const excludeFromGeneratedIndex = [
   'onLearningPathCompletedActions',
   'mapContentsThatWereLastProgressedFromMethod',
   'mapLearningPathParentsTo',
+  'resetLearningPathCachesForTests',
 ]
 
 const BASE_PATH: string = `/api/content-org`
 const LEARNING_PATHS_PATH = `${BASE_PATH}/v1/user/learning-paths`
-let dailySessionPromise: Promise<DailySessionResponse | ''> | null = null
-let activePathPromise: Promise<ActiveLearningPathResponse | ''> | null = null
+const dailySessionPromises = new Map<string, Promise<DailySessionResponse | ''>>()
+const activePathPromises = new Map<string, Promise<ActiveLearningPathResponse | ''>>()
+
+function clearLearningPathCaches(): void {
+  dailySessionPromises.clear()
+  activePathPromises.clear()
+}
+
+export function resetLearningPathCachesForTests(): void {
+  clearLearningPathCaches()
+}
+
+function rememberValue<T>(cache: Map<string, Promise<T>>, key: string, value: T | null): void {
+  if (value === null) {
+    cache.delete(key)
+  } else {
+    cache.set(key, Promise.resolve(value))
+  }
+}
+
+function activePathKey(brand: string): string {
+  return `active-path:${brand}`
+}
+
+function dailySessionKey(brand: string, dateWithTimezone: string): string {
+  return `daily-session:${brand}:${dateWithTimezone}`
+}
 
 interface ActiveLearningPathResponse {
   user_id: number
@@ -67,38 +93,25 @@ interface CollectionObject {
  * If the daily session doesn't exist, it will be created.
  * @param brand
  * @param userDate - local datetime. must have date and time - format 2025-10-31T13:45:00
- * @param forceRefresh - force cache refresh
  */
-export async function getDailySession(
-  brand: string,
-  userDate: Date,
-  forceRefresh: boolean = false,
-) {
-  if (dailySessionPromise && !forceRefresh) {
-    return dailySessionPromise
-  }
-
-  dailySessionPromise = (async () => {
-    const dateWithTimezone = formatLocalDateTime(userDate)
-    const url = `${LEARNING_PATHS_PATH}/daily-session/get?brand=${brand}&userDate=${encodeURIComponent(dateWithTimezone)}`
+export async function getDailySession(brand: string, userDate: Date) {
+  const dateWithTimezone = formatLocalDateTime(userDate)
+  const key = dailySessionKey(brand, dateWithTimezone)
 
-    const response = await GET(url, {
-      cache: forceRefresh ? 'reload' : 'default',
-    }) as DailySessionResponse | ''
+  try {
+    return await dataPromiseGET(dailySessionPromises, key, async () => {
+      const url = `${LEARNING_PATHS_PATH}/daily-session/get?brand=${brand}&userDate=${encodeURIComponent(dateWithTimezone)}`
 
-    if (!response) {
-      return await updateDailySession(brand, userDate, false)
-    }
-    return response as DailySessionResponse
-  })()
+      const response = await GET(url) as DailySessionResponse | ''
 
-  try {
-    return await dailySessionPromise
+      if (!response) {
+        return await updateDailySession(brand, userDate, false)
+      }
+      return response as DailySessionResponse
+    })
   } catch (error) {
     console.error('Error fetching daily session:', (error as any).message)
     return null
-  } finally {
-    dailySessionPromise = null
   }
 }
 
@@ -114,6 +127,7 @@ export async function updateDailySession(
   keepFirstLearningPath: boolean = false,
 ) {
   const dateWithTimezone = formatLocalDateTime(userDate)
+  const key = dailySessionKey(brand, dateWithTimezone)
   const url: string = `${LEARNING_PATHS_PATH}/daily-session/create`
   const body = {
     brand: brand,
@@ -122,14 +136,10 @@ export async function updateDailySession(
   }
   try {
     const response = (await POST(url, body)) as DailySessionResponse | ''
+    rememberValue(dailySessionPromises, key, response !== '' ? response : null)
 
-    if (response || response === '') { // refresh cached value
-      const urlGet: string = `${LEARNING_PATHS_PATH}/daily-session/get?brand=${brand}&userDate=${encodeURIComponent(dateWithTimezone)}`
-      dataPromiseGET(urlGet, true).then(() => {
-        dailySessionPromise = null
-      })
-
-    }
+    const urlGet: string = `${LEARNING_PATHS_PATH}/daily-session/get?brand=${brand}&userDate=${encodeURIComponent(dateWithTimezone)}`
+    GET(urlGet, { cache: 'reload' }).catch(() => {})
 
     return (response !== '' ? response : null)
   } catch (error: any) {
@@ -144,15 +154,13 @@ function formatLocalDateTime(date: Date): string {
 /**
  * Gets user's active learning path.
  * @param brand
- * @param forceRefresh - force cache refresh
  */
-export async function getActivePath(brand: string, forceRefresh: boolean = false) {
+export async function getActivePath(brand: string) {
   const url: string = `${LEARNING_PATHS_PATH}/active-path/get?brand=${brand}`
 
-  const response = await dataPromiseGET(url, forceRefresh) as ActiveLearningPathResponse
-  activePathPromise = null
-
-  return response
+  return (await dataPromiseGET(activePathPromises, activePathKey(brand), () =>
+    GET(url) as Promise<ActiveLearningPathResponse>,
+  )) as ActiveLearningPathResponse
 }
 
 /**
@@ -166,36 +174,36 @@ export async function startLearningPath(brand: string, learningPathId: number) {
 
   const response = (await POST(url, body)) as ActiveLearningPathResponse
 
-  // manual BE call to avoid recursive POST<->GET calls
   if (response) {
+    rememberValue(activePathPromises, activePathKey(brand), response)
+    dailySessionPromises.delete(dailySessionKey(brand, formatLocalDateTime(new Date())))
+
     const urlGet: string = `${LEARNING_PATHS_PATH}/active-path/get?brand=${brand}`
-    dataPromiseGET(urlGet, true).then(() => {
-      activePathPromise = null
-    })
+    GET(urlGet, { cache: 'reload' }).catch(() => {})
   }
 
   return response
 }
 
-async function dataPromiseGET(
-  url: string,
-  forceRefresh: boolean,
-): Promise<DailySessionResponse | ActiveLearningPathResponse | ''> {
-  if (url.includes('daily-session')) {
-    if (!dailySessionPromise || forceRefresh) {
-      dailySessionPromise = GET(url, {
-        cache: forceRefresh ? 'reload' : 'default',
-      }) as Promise<DailySessionResponse>
-    }
-    return dailySessionPromise
-  } else if (url.includes('active-path')) {
-    if (!activePathPromise || forceRefresh) {
-      activePathPromise = GET(url, {
-        cache: forceRefresh ? 'reload' : 'default',
-      }) as Promise<ActiveLearningPathResponse>
-    }
-    return activePathPromise
+function dataPromiseGET<T>(
+  cache: Map<string, Promise<T>>,
+  key: string,
+  fetcher: () => Promise<T>,
+): Promise<T> {
+  if (cache.has(key)) {
+    return cache.get(key)!
   }
+
+  const promise = fetcher()
+  cache.set(key, promise)
+  promise
+    .then((value) => {
+      if (!value && cache.get(key) === promise) cache.delete(key)
+    })
+    .catch(() => {
+      if (cache.get(key) === promise) cache.delete(key)
+    })
+  return promise
 }
 
 /**
@@ -204,6 +212,8 @@ async function dataPromiseGET(
 export async function resetAllLearningPaths() {
   const url: string = `${LEARNING_PATHS_PATH}/reset`
 
+  clearLearningPathCaches()
+
   return await Promise.all([
     devFetchAllLearningPathsAndIntroVideoIdsForDelete().then(async (all) => {
       await Promise.all([
@@ -509,7 +519,16 @@ async function methodIntroVideoCompleteActions(brand: string, learningPathId: nu
   const dateWithTimezone = formatLocalDateTime(userDate)
   const url: string = `${LEARNING_PATHS_PATH}/method-intro-video-complete-actions`
   const body = { brand: brand, learningPathId: learningPathId, userDate: dateWithTimezone }
-  return (await POST(url, body)) as DailySessionResponse
+  const response = (await POST(url, body)) as DailySessionResponse
+
+  rememberValue(activePathPromises, activePathKey(brand), {
+    user_id: response.user_id,
+    brand: response.brand,
+    active_learning_path_id: response.active_learning_path_id,
+  })
+  rememberValue(dailySessionPromises, dailySessionKey(brand, dateWithTimezone), response)
+
+  return response
 }
 
 interface completeLearningPathIntroVideo {
@@ -557,6 +576,7 @@ export async function completeLearningPathIntroVideo(
   } else {
     response.lesson_import_response = await contentStatusCompletedMany(lessonsToImport, collection)
 
+    activePathPromises.delete(activePathKey(brand))
     const activePath = await getActivePath(brand)
     if (activePath.active_learning_path_id === learningPathId && !lateMethodSetup) { // don't update dailies if they were just set by completeMethodIntroVideoCompleteActions.
       response.update_dailies_response = await updateDailySession(brand, new Date(), true)

package/src/services/sanity.js

@@ -46,7 +46,10 @@ import { globalConfig } from './config.js'
 
 import { arrayToStringRepresentation, FilterBuilder } from '../filterBuilder.js'
 import { getPermissionsAdapter } from './permissions/index.ts'
-import { lifetimeUpgradeDecorator, NEED_LIFETIME_UPGRADE_FIELD } from '../lib/sanity/decorators/need-lifetime-upgrade.ts'
+import {
+  lifetimeUpgradeDecorator,
+  NEED_LIFETIME_UPGRADE_FIELD,
+} from '../lib/sanity/decorators/need-lifetime-upgrade.ts'
 import {
   getAllCompleted,
   getAllCompletedByIds,
@@ -906,7 +909,8 @@ export async function fetchAllFilterOptions(
       ? filtersToGroq(filters, excludeFilter)
       : includedFieldsFilter
     const statusFilter = ' && status == "published"'
-    const includeStatusFilter = !hasAllContentAccess && !['instructor', 'artist', 'genre'].includes(contentType)
+    const includeStatusFilter =
+      !hasAllContentAccess && !['instructor', 'artist', 'genre'].includes(contentType)
 
     return coachId
       ? `brand == '${brand}' && status == "published" && references(*[_type=='instructor' && railcontent_id == ${coachId}]._id) ${filterWithoutOption || ''} ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`
@@ -1197,8 +1201,12 @@ export async function fetchLiveEvent(brand, forcedContentId = null) {
 
   const now = new Date()
 
-  const startOfYesterday = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() - 1)).toISOString()
-  const endOfTomorrow = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + 2)).toISOString()
+  const startOfYesterday = new Date(
+    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() - 1)
+  ).toISOString()
+  const endOfTomorrow = new Date(
+    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + 2)
+  ).toISOString()
 
   const liveEventFields = getLiveFields().concat(
     `'event_coach_calendar_id': coalesce(calendar_id, '${defaultCalendarID}')`
@@ -1226,10 +1234,12 @@ export async function fetchLiveEvent(brand, forcedContentId = null) {
   const windowStart = new Date(clientNow.getTime() - LIVE_EXTRA_MINUTES * 60000).toISOString()
   const windowEnd = new Date(clientNow.getTime() + LIVE_EXTRA_MINUTES * 60000).toISOString()
 
-  return events?.find(event =>
-    event.live_event_end_time >= windowStart &&
-    event.live_event_start_time <= windowEnd
-  ) ?? null
+  return (
+    events?.find(
+      (event) =>
+        event.live_event_end_time >= windowStart && event.live_event_start_time <= windowEnd
+    ) ?? null
+  )
 }
 
 /**
@@ -1571,6 +1581,7 @@ export async function fetchCommentModContentData(ids) {
 }
 
 /**
+ * @deprecated Use SanityClient.ts or groq query runner instead. This function is a legacy wrapper for fetching data from the Sanity API using GROQ queries. It handles query construction, execution, and post-processing of results.
  *
  * @param {string} query - The GROQ query to execute against the Sanity API.
  * @param {boolean} isList - Whether to return an array or a single result.
@@ -1586,7 +1597,6 @@ export async function fetchCommentModContentData(ids) {
  *   .then(data => console.log(data))
  *   .catch(error => console.error(error));
  */
-
 export async function fetchSanity(
   query,
   isList,
@@ -1640,7 +1650,9 @@ export async function fetchSanity(
         return null
       }
       results = processNeedAccess ? await needsAccessDecorator(results, userPermissions) : results
-      results = processNeedAccess ? needsLifetimeUpgradeDecorator(results, userPermissions) : results
+      results = processNeedAccess
+        ? needsLifetimeUpgradeDecorator(results, userPermissions)
+        : results
       results = processPageType ? pageTypeDecorator(results) : results
       return customPostProcess ? customPostProcess(results) : results
     } else {
@@ -2124,7 +2136,7 @@ export async function fetchTabData(
     availableContentStatuses: hasAllContentAccess
       ? CONTENT_STATUSES.ADMIN_ALL
       : CONTENT_STATUSES.PUBLISHED_ONLY,
-    pullFutureContent: hasAllContentAccess
+    pullFutureContent: hasAllContentAccess,
   }).buildFilter()
   query = buildEntityAndTotalQuery(filterWithRestrictions, entityFieldsString, {
     sortOrder: sortOrder,
@@ -2242,11 +2254,13 @@ export async function fetchScheduledAndNewReleases(
 
   const reordered = reorderScheduledAndNewReleases(r, limit)
   const computedNow = new Date()
-  return reordered.map(item => ({
+  return reordered.map((item) => ({
     ...item,
-    isLive: item.live_event_start_time && item.live_event_end_time
-      ? new Date(item.live_event_start_time) <= computedNow && new Date(item.live_event_end_time) >= computedNow
-      : false,
+    isLive:
+      item.live_event_start_time && item.live_event_end_time
+        ? new Date(item.live_event_start_time) <= computedNow &&
+          new Date(item.live_event_end_time) >= computedNow
+        : false,
   }))
 }
 

package/src/services/state.ts

@@ -1,4 +1,5 @@
 import { streakCalculator } from './user/streakCalculator'
+import { setSessionUserData } from './config.js'
 
 /**
  * Clears all client-side cached state in musora-content-services.
@@ -7,4 +8,5 @@ import { streakCalculator } from './user/streakCalculator'
  */
 export function clearState(): void {
   streakCalculator.invalidate()
+  setSessionUserData(null)
 }

package/src/services/user/management.js

@@ -76,8 +76,14 @@ export async function deletePicture(pictureUrl) {
  * @param {number} [userId=globalConfig.sessionConfig.userId]
  * @returns {Promise<User|null>}
  */
-export async function getUserData(userId = globalConfig.sessionConfig.userId) {
-  const apiUrl = `${baseUrl}/v1/users/${userId}`
+export async function getUserData(userId) {
+  if (!userId && globalConfig.sessionUser) {
+    return globalConfig.sessionUser
+  }
+
+  let userIdToFetch = userId || globalConfig.sessionConfig.userId
+
+  const apiUrl = `${baseUrl}/v1/users/${userIdToFetch}`
   return await GET(apiUrl)
 }
 

package/src/version-info.js

@@ -1 +1 @@
-export const MCS_VERSION = '2.179.0'
+export const MCS_VERSION = '2.180.0'