musora-content-services 2.157.4 → 2.158.1

package/.github/workflows/docs.js.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
 
       - name: Install dependencies for v2
         working-directory: main-content

package/CHANGELOG.md

@@ -2,19 +2,45 @@
 
 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.157.4](https://github.com/railroadmedia/musora-content-services/compare/v2.157.3...v2.157.4) (2026-05-05)
+### [2.158.1](https://github.com/railroadmedia/musora-content-services/compare/v2.158.0...v2.158.1) (2026-05-07)
 
 
 ### Bug Fixes
 
-* update sanity url to v4 ([91daeb7](https://github.com/railroadmedia/musora-content-services/commit/91daeb7e50801832a4d824f6f20695d29879fd36))
+* increment sanity url version ([#953](https://github.com/railroadmedia/musora-content-services/issues/953)) ([61c36c9](https://github.com/railroadmedia/musora-content-services/commit/61c36c962473294e6dfe67d3d688105649e3d79f))
+* pass collection to getProgressDataByIds ([#957](https://github.com/railroadmedia/musora-content-services/issues/957)) ([2ad1620](https://github.com/railroadmedia/musora-content-services/commit/2ad162085f45b35f617c0ba4d2cc32e7be4a3708))
+* Revert "add resolver condition to ensure seen records always get marked sync" ([#956](https://github.com/railroadmedia/musora-content-services/issues/956)) ([56741d3](https://github.com/railroadmedia/musora-content-services/commit/56741d3f49c97e4034e7841deb4aef1f938168c5))
+* update sanity url to v4 ([c567d22](https://github.com/railroadmedia/musora-content-services/commit/c567d227a4f3bdb9f2f1c95364d423e67b1b214f))
 
-### [2.157.3](https://github.com/railroadmedia/musora-content-services/compare/v2.157.2...v2.157.3) (2026-05-05)
+## [2.158.0](https://github.com/railroadmedia/musora-content-services/compare/v2.153.0...v2.158.0) (2026-05-05)
+
+
+### Features
+
+* **BEHLTP-23:** add multi-user account update endpoint ([#914](https://github.com/railroadmedia/musora-content-services/issues/914)) ([98f6c4b](https://github.com/railroadmedia/musora-content-services/commit/98f6c4bb830c7a8a25ba556ca07fc97023667011))
+* **BEHSTP-167:** offline progress tracking support ([#889](https://github.com/railroadmedia/musora-content-services/issues/889)) ([0528597](https://github.com/railroadmedia/musora-content-services/commit/05285977237ccbfa577a5770a1762c31d855e59e))
+* handle late-start active paths, and set up better resetAllLearningPaths ([#928](https://github.com/railroadmedia/musora-content-services/issues/928)) ([5d80430](https://github.com/railroadmedia/musora-content-services/commit/5d80430fbedfb21668882d402c5f6b07c82cfbf9))
+* **MU2-1384:** enable related lessons for non-members ([#943](https://github.com/railroadmedia/musora-content-services/issues/943)) ([f091bd7](https://github.com/railroadmedia/musora-content-services/commit/f091bd7e7edfcfe8808684d97faff22f62ef6fe0))
+* **MU2-1452:** free tier content sort to front ([#915](https://github.com/railroadmedia/musora-content-services/issues/915)) ([0655e68](https://github.com/railroadmedia/musora-content-services/commit/0655e685f32fe77728d7b8c2505283adbc1a7c97))
+* **MU2-1463:** initialize onboarding flow ([#929](https://github.com/railroadmedia/musora-content-services/issues/929)) ([4daae5f](https://github.com/railroadmedia/musora-content-services/commit/4daae5ff28599b53fa9ee5b9bea8bdb08b706978))
+* muppet - add invite validity/error data ([#923](https://github.com/railroadmedia/musora-content-services/issues/923)) ([3938fa5](https://github.com/railroadmedia/musora-content-services/commit/3938fa56ec9295023b6ba624c5f238d1645a911b))
 
 
 ### Bug Fixes
 
-* increment sanity url version ([de73b89](https://github.com/railroadmedia/musora-content-services/commit/de73b89bbc53175ba5901c2588fdb2f47ff35069))
+* add missing vimeo_live_event_id field to downloads field list ([#948](https://github.com/railroadmedia/musora-content-services/issues/948)) ([2b54208](https://github.com/railroadmedia/musora-content-services/commit/2b5420838f200ee061dc7af27029df8a3c38f87c))
+* add typeof before LokiJSAdapter in parameter list ([6a135b5](https://github.com/railroadmedia/musora-content-services/commit/6a135b57c516c277a50d707417544ab2f9eeb194))
+* **BEHSTP-160:** hide future content in related lessons ([#952](https://github.com/railroadmedia/musora-content-services/issues/952)) ([b8d5e06](https://github.com/railroadmedia/musora-content-services/commit/b8d5e0662fae47285978ed1c2d641cc514f25ecd))
+* **BR-460:** report option label updates ([#940](https://github.com/railroadmedia/musora-content-services/issues/940)) ([8ad8f72](https://github.com/railroadmedia/musora-content-services/commit/8ad8f72dd9a1284b4098aa00f08962a53a170275))
+* **BR-627:** add pagination support to fetch followed threads method ([779e308](https://github.com/railroadmedia/musora-content-services/commit/779e30881e76b17e17124852c4d2ee02d62ccf87))
+* **BR-632:** dont trickle progress to children when enrolling in GC ([#916](https://github.com/railroadmedia/musora-content-services/issues/916)) ([67a96d6](https://github.com/railroadmedia/musora-content-services/commit/67a96d69bd8b61f12d0efd45475a7b0b08c58813))
+* **BR-659:** fix resources for null parents ([#951](https://github.com/railroadmedia/musora-content-services/issues/951)) ([b78157b](https://github.com/railroadmedia/musora-content-services/commit/b78157b9dbb9f4d8861bca9546eab79a1c04c01e))
+* export ([#936](https://github.com/railroadmedia/musora-content-services/issues/936)) ([16b78be](https://github.com/railroadmedia/musora-content-services/commit/16b78be3dca3cee8981f1347a37f1b1b00ffe691))
+* remove prevSession args ([#937](https://github.com/railroadmedia/musora-content-services/issues/937)) ([2fe1dc2](https://github.com/railroadmedia/musora-content-services/commit/2fe1dc280a21e060b15567afe60a4cf959cecc90))
+* remove timestamp filtering of practice records in offline mode ([#938](https://github.com/railroadmedia/musora-content-services/issues/938)) ([1a8ac03](https://github.com/railroadmedia/musora-content-services/commit/1a8ac03bfa1b9b3670c45049adb9b833263ef871))
+* revert activity timestamp changes ([#942](https://github.com/railroadmedia/musora-content-services/issues/942)) ([bd9f97d](https://github.com/railroadmedia/musora-content-services/commit/bd9f97d6547409b7f2856bf716c90d6723306c36))
+* **TMA-239:** MCS - Sanity - Add a v=2 query parameter to all sanity requests to force a cache refresh ([#933](https://github.com/railroadmedia/musora-content-services/issues/933)) ([eac5a2c](https://github.com/railroadmedia/musora-content-services/commit/eac5a2c6848aee80c462ba0ccbeba52a92652fa9))
+* **TMA-275:** MCS - Sanity - Add a v2 url segment to to all sanity requests to force a cache refresh ([#946](https://github.com/railroadmedia/musora-content-services/issues/946)) ([b5df1dc](https://github.com/railroadmedia/musora-content-services/commit/b5df1dc943cc9d477dcac5879daaf0725fa60f76))
 
 ### [2.157.2](https://github.com/railroadmedia/musora-content-services/compare/v2.157.0...v2.157.2) (2026-04-30)
 

package/jest.live.config.js

@@ -0,0 +1,10 @@
+/** @type {import('jest').Config} */
+import baseConfig from './jest.config.js'
+
+export default {
+  ...baseConfig,
+  modulePathIgnorePatterns: [],
+  setupFilesAfterEnv: ['dotenv/config'],
+  testTimeout: 1000000,
+  collectCoverage: false,
+}

package/package.json

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

package/src/contentTypeConfig.js

@@ -116,7 +116,7 @@ export const descriptionField = 'description[0].children[0].text'
 // this pulls both any defined resources for the document as well as any resources in the parent document
 export const resourcesField = `[
           ... resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )},
-          ... coalesce(parent_content_reference[]->resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )}, []),
+          ... coalesce(parent_content_reference[count(@->resource) > 0]->resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )}, []),
           ]`
 
 export const contentAwardField = "*[references(^._id) && _type == 'content-award'][0]"

package/src/index.d.ts

@@ -153,6 +153,10 @@ import {
 	toLocalDay
 } from './services/dateUtils.js';
 
+import {
+	getEndScreen
+} from './services/endScreen/endScreen.ts';
+
 import {
 	createForumCategory,
 	deleteForumCategory,
@@ -667,6 +671,7 @@ declare module 'musora-content-services' {
 		getContentAwardsByIds,
 		getContentRows,
 		getDailySession,
+		getEndScreen,
 		getEnrichedLearningPath,
 		getEnrichedLearningPaths,
 		getHierarchies,

package/src/index.js

@@ -157,6 +157,10 @@ import {
 	toLocalDay
 } from './services/dateUtils.js';
 
+import {
+	getEndScreen
+} from './services/endScreen/endScreen.ts';
+
 import {
 	createForumCategory,
 	deleteForumCategory,
@@ -666,6 +670,7 @@ export {
 	getContentAwardsByIds,
 	getContentRows,
 	getDailySession,
+	getEndScreen,
 	getEnrichedLearningPath,
 	getEnrichedLearningPaths,
 	getHierarchies,

package/src/services/contentAggregator.js

@@ -65,6 +65,7 @@ export async function addContextToContent(dataPromise, ...dataArgs) {
 
   // todo: merge addProgressData with addResumeTimeSeconds to one watermelon call
   const {
+    collection = null, // MA/FE still use this function for LP lessons, so we need this here.
     dataField = null,
     dataField_includeParent = false,
     addProgressPercentage = false,
@@ -98,7 +99,7 @@ export async function addContextToContent(dataPromise, ...dataArgs) {
     awards,
   ] = await Promise.all([
     addProgressPercentage || addProgressStatus || addProgressTimestamp
-      ? getProgressDataByIds(ids) : Promise.resolve(null),
+      ? getProgressDataByIds(ids, collection) : Promise.resolve(null),
     addIsLiked ? isContentLikedByIds(ids) : Promise.resolve(null),
     addResumeTimeSeconds ? getResumeTimeSecondsByIds(ids) : Promise.resolve(null),
     addNavigateTo ? getNavigateTo(items) : Promise.resolve(null),

package/src/services/endScreen/README.md

@@ -0,0 +1,62 @@
+# End Screen Service
+
+Determines what content to show after a user finishes a lesson.
+
+## Functions
+
+| Function | Type | Use case |
+|---|---|---|
+| `getEndScreen(params)` | async | All content types — lessons, courses, playlists |
+
+---
+
+## Decision Logic
+
+### `getEndScreen`
+
+```
+single-song / play-along / jam →  countdown-up-next  +  RecSys recommendation
+playlist (not last item)       →  countdown-up-next  +  next item
+playlist (last item)           →  null
+no course                      →  countdown-up-next  +  RecSys recommendation
+course (not last lesson)       →  countdown-up-next  +  next lesson
+course (last, has next course) →  course-complete    +  first lesson of next course
+course (last, no next course)  →  course-complete    +  RecSys recommendation
+```
+
+RecSys fallback: if the recommender returns nothing → related lesson (standalone) or related course (course-complete)
+
+
+## API Reference
+
+### `getEndScreen(params): Promise<EndScreenResult>`
+
+```typescript
+// Parameters
+{
+  lesson:      { id: number, type?: string }          // required
+  brand:       string                                  // required
+  course?:     { id: number, children?: ContentItem[] }
+  collection?: { id: number, type: string, children?: { id: number, children?: ContentItem[] }[] }
+  playlist?:   { id: number, items?: ContentItem[] }
+  user_playlist_item_index?: number  // current item's index in playlist; skips findIndex lookup when provided
+}
+
+// Return value
+{
+  variant:           'countdown-up-next' | 'course-complete'
+  upNext:            object | null   // null if RecSys and related content both return nothing
+  countdownAutoplay: boolean
+  ctaLabels:         { primary: string, secondary: string }
+}
+```
+
+---
+
+## Implementation
+
+### When to call
+
+Call `getEndScreen` **at page load**, not when the video ends. RecSys calls happen in the background while the user watches — by the time the video ends, the result is ready.
+
+

package/src/services/endScreen/endScreen.ts

@@ -0,0 +1,153 @@
+import {fetchSimilarItems} from '../recommendations.js'
+import {fetchByRailContentIds, fetchCourseCollectionData, fetchRelatedLessons} from '../sanity.js'
+import { addContextToContent } from '../contentAggregator.js'
+import { playAlongLessonTypes, jamTrackLessonTypes, lessonTypesMapping } from '../../contentTypeConfig.js'
+import {getUserData} from "../user/management.js";
+import type {
+  ContentItem,
+  Collection,
+  Course,
+  Playlist,
+  CtaLabels,
+  EndScreenResult,
+  GetEndScreenParams,
+} from './types.ts'
+
+// ─── Constants ────────────────────────────────────────────────────────────────
+
+const SINGLE_SONG_LESSON_TYPES: string[] = [
+  ...playAlongLessonTypes,
+  ...jamTrackLessonTypes,
+  ...lessonTypesMapping['single lessons'],
+]
+const COURSE_COMPLETE_CTA: CtaLabels = { primary: 'Play Now', secondary: 'Back to Home'}
+const COUNTDOWN_CTA: CtaLabels = { primary: 'Play Now' }
+const COUNTDOWN_CTA_REPLAY: CtaLabels = { primary: 'Play Now', secondary: 'Replay' }
+
+export async function getEndScreen({
+  lesson,
+  course = null,
+  collection = null,
+  playlist = null,
+  user_playlist_item_index = null,
+  next_item = null,
+  brand
+}: GetEndScreenParams): Promise<EndScreenResult> {
+  const userData = await getUserData()
+  const isAdmin = userData?.is_admin ?? false
+
+  if (playlist) {
+    const nextItem = next_item ??
+      getNextItemInPlaylistOrNull(lesson.id, playlist, user_playlist_item_index, isAdmin)
+
+    return nextItem ? buildCountdown(nextItem, false) : null
+  }
+
+  if (SINGLE_SONG_LESSON_TYPES.includes(lesson.type ?? '')) {
+    return buildCountdown(await fetchEndScreenRecommendation(brand, lesson.id, null, isAdmin), true)
+  }
+
+  if (!course) {
+    return buildCountdown(await fetchEndScreenRecommendation(brand, lesson.id, null, isAdmin), false)
+  }
+
+  const nextLesson = getNextLessonOrNull(lesson.id, course, isAdmin)
+  if (nextLesson) {
+    return buildCountdown(nextLesson, false)
+  }
+
+  // TODO: remove internal fetch if FE provides collection.children directly
+  // collection.vue fetches lessonsInCourse (course children) but not the parent collection's courses
+  const resolvedCollection: Collection | null =
+    collection?.type === 'course' && collection?.parent_id
+      ? await fetchCourseCollectionData(collection.parent_id)
+      : collection
+
+  const nextCourseFirstLesson = getFirstLessonOfNextCourseOrNull(course.id, resolvedCollection, isAdmin)
+  if (nextCourseFirstLesson) {
+    return buildCourseComplete(nextCourseFirstLesson)
+  }
+
+  return buildCourseComplete(await fetchEndScreenRecommendation(brand, lesson.id, course.id, isAdmin))
+}
+
+// ─── Builders ─────────────────────────────────────────────────────────────────
+
+function buildCountdown(upNext: any, withReply: boolean): EndScreenResult {
+  return { variant: 'countdown-up-next', upNext, countdownAutoplay: true, ctaLabels: withReply ? COUNTDOWN_CTA_REPLAY : COUNTDOWN_CTA }
+}
+
+function buildCourseComplete(upNext: any): EndScreenResult {
+  return { variant: 'course-complete', upNext, countdownAutoplay: false, ctaLabels: COURSE_COMPLETE_CTA }
+}
+
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+
+function getNextItemInPlaylistOrNull(contentId: number, playlist: Playlist, user_playlist_item_index: number|null, isAdmin: boolean): ContentItem | null {
+  const items = playlist.items ?? []
+  const index = user_playlist_item_index !== null ? user_playlist_item_index : items.findIndex((item) => Number(item.id) === Number(contentId))
+  if (index < 0 || index === items.length - 1) return null
+  return items.slice(index + 1).find(item => isReleasedContent(item, isAdmin)) ?? null
+}
+
+function getNextLessonOrNull(lessonId: number, course: Course, isAdmin: boolean): ContentItem | null {
+  const children = course.children ?? []
+  const index = children.findIndex((child) => Number(child.id) === Number(lessonId))
+  if (index < 0 || index === children.length - 1) return null
+  return children.slice(index + 1).find(child => isReleasedContent(child, isAdmin)) ?? null
+}
+
+function isReleasedContent(content: ContentItem, isAdmin: boolean): boolean {
+  if (isAdmin) return true
+  if (!content?.status) return false
+  return (content.status === 'published') && !content.need_access
+}
+
+function getFirstLessonOfNextCourseOrNull(
+  courseId: number,
+  collection: Collection | null,
+  isAdmin: boolean
+): ContentItem | null {
+  if (!collection) return null
+  const courses = collection.children ?? []
+  const index = courses.findIndex((course) => Number(course.id) === Number(courseId))
+  if (index < 0 || index === courses.length - 1) return null
+  const nextCourse = courses.slice(index + 1).find(course => isReleasedContent(course, isAdmin))
+  if (!nextCourse?.children) return null
+  return nextCourse.children.find(lesson => isReleasedContent(lesson, isAdmin)) ?? null
+}
+
+async function fetchEndScreenRecommendation(
+  brand: string,
+  contentId: number,
+  parentId: number | null = null,
+  isAdmin: boolean
+): Promise<any | null> {
+  try {
+    let recData: number[] = await fetchSimilarItems(contentId, brand, 20)
+    const contents: ContentItem[] = recData.length > 0 ? await fetchByRailContentIds(recData) : []
+    let recommended =
+      contents?.find((c) => isReleasedContent(c, isAdmin) && c.id !== parentId && (!c.parent_id || c.parent_id !== parentId)) ??
+      contents?.find((c) => isReleasedContent(c, isAdmin) && c.id !== parentId) ??
+      null
+
+    if (!recommended) {
+      const relatedLesson = await fetchRelatedLessons(parentId ?? contentId).then((r) =>
+        r.related_lessons?.[0] ?? null
+      )
+      recommended = isReleasedContent(relatedLesson, isAdmin) ? relatedLesson : null
+    }
+
+    if (!recommended) {
+      return null
+    }
+
+    return await addContextToContent(() => recommended, {
+      addProgressPercentage: true,
+      addProgressStatus: true,
+      addNavigateTo: true,
+    })
+  } catch {
+    return null
+  }
+}

package/src/services/endScreen/types.ts

@@ -0,0 +1,63 @@
+/**
+ * @module EndScreen Types
+ */
+
+export type EndScreenVariant =
+  | 'countdown-up-next'
+  | 'course-complete'
+
+export interface CtaLabels {
+  primary: string
+  secondary?: string
+}
+
+export interface EndScreenResult {
+  variant: EndScreenVariant
+  upNext: object | null
+  countdownAutoplay: boolean
+  ctaLabels: CtaLabels
+}
+
+export interface ContentItem {
+  id: number
+  type?: string
+  status?: string
+  parent_id?: number
+  need_access?: boolean
+}
+
+export interface Course {
+  id: number
+  type?: string
+  status?: string
+  children?: ContentItem[]
+}
+
+export interface CourseInCollection {
+  id: number
+  status?: string
+  children?: ContentItem[]
+}
+
+export interface Collection {
+  id: number
+  type: string
+  status?: string
+  parent_id?: number
+  children?: CourseInCollection[]
+}
+
+export interface Playlist {
+  id: number
+  items?: ContentItem[]
+}
+
+export interface GetEndScreenParams {
+  lesson: ContentItem
+  course?: Course | null
+  collection?: Collection | null
+  playlist?: Playlist | null
+  user_playlist_item_index?: number | null
+  next_item?: any | null
+  brand: string
+}

package/src/services/forums/threads.ts

@@ -184,18 +184,29 @@ export async function unlockThread(threadId: number, brand: string): Promise<voi
   return httpClient.delete<void>(`${baseUrl}/v1/threads/${threadId}/lock?brand=${brand}`)
 }
 
+export interface FetchFollowedThreadsParams {
+  page?: number,
+  limit?: number,
+}
+
 /**
  * Fetches followed forum Threads for the given brand and current user.
  *
  * @param {string} brand - The brand context (e.g., "drumeo", "singeo").
+ * @param {FetchFollowedThreadsParams} params - Optional pagination parameters.
  * @returns {Promise<PaginatedResponse<ForumThread>>} - A promise that resolves to the list of forum threads.
  * @throws {HttpError} - If the request fails.
  */
 export async function fetchFollowedThreads(
-  brand: string
+  brand: string,
+  params: FetchFollowedThreadsParams = {}
 ): Promise<PaginatedResponse<ForumThread>> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.get<PaginatedResponse<ForumThread>>(`${baseUrl}/v1/threads?brand=${brand}`)
+  const queryObj: Record<string, string> = { brand, ...Object.fromEntries(
+      Object.entries(params).filter(([_, v]) => v !== undefined && v !== null).map(([k, v]) => [k, String(v)])
+    )}
+  const query = new URLSearchParams(queryObj).toString()
+  return httpClient.get<PaginatedResponse<ForumThread>>(`${baseUrl}/v1/threads?${query}`)
 }
 
 export interface FetchLatestThreadParams {

package/src/services/recommendations.js

@@ -37,6 +37,9 @@ export async function fetchSimilarItems(content_id, brand, count = 10) {
       brand: brand,
       content_ids: content_id,
       num_similar: count + 1,
+      page_size: count + 1,
+      page: 1,
+      exclude_interacted: true
     }
     const url = `/similar_items/`
     try {

package/src/services/sanity.js

@@ -1146,20 +1146,22 @@ export async function fetchSiblingContent(railContentId, brand = null) {
  */
 export async function fetchRelatedLessons(railContentId) {
   const defaultFilterFields = `_type==^._type && brand == ^.brand && railcontent_id != ${railContentId}`
-
+  const params = {
+    showMembershipRestrictedContent: true,
+    availableContentStatuses: ['published'],
+  }
   const filterSameArtist = await new FilterBuilder(
     `${defaultFilterFields} && references(^.artist->_id)`,
-    { showMembershipRestrictedContent: true }
+    params
   ).buildFilter()
   const filterSameGenre = await new FilterBuilder(
     `${defaultFilterFields} && references(^.genre[]->_id)`,
-    { showMembershipRestrictedContent: true }
+    params
   ).buildFilter()
   const filterSameDifficulty = await new FilterBuilder(
     `${defaultFilterFields} && difficulty == ^.difficulty`,
-    { showMembershipRestrictedContent: true }
+    params
   ).buildFilter()
-
   const queryFields = getFieldsForContentType()
 
   const query = `*[railcontent_id == ${railContentId}]{
@@ -1169,7 +1171,6 @@ export async function fetchRelatedLessons(railContentId) {
       ...(*[${filterSameGenre}]{${queryFields}}|order(published_on desc, title asc)[0...10]),
       ...(*[${filterSameDifficulty}]{${queryFields}}|order(published_on desc, title asc)[0...10]),
       ])[0...10]}`
-
   return await fetchSanity(query, false, { processNeedAccess: true })
 }
 

package/src/services/sync/adapters/lokijs.ts

@@ -25,6 +25,7 @@ export default class LokiPersistenceErrorAwareAdapter extends (LokiJSAdapter as
   }
 
   _overrideSaveDatabase(onPersistenceError?: (err: Error) => void) {
+    if (!this._driver) return
     const driver = this._driver
     const persistenceAdapter = driver.loki.persistenceAdapter
     const oldSaveDatabase = persistenceAdapter.saveDatabase;

package/src/services/sync/resolver.ts

@@ -7,7 +7,6 @@ export type SyncResolution = {
   tuplesForUpdate: [BaseModel, SyncEntry][]
   tuplesForRestore: [BaseModel, SyncEntry][]
   idsForDestroy: RecordId[]
-  recordsForSynced: BaseModel[]
 }
 
 export type SyncResolverComparator<T extends BaseModel = BaseModel> = (serverEntry: SyncEntryNonDeleted<T>, localModel: T) => 'SERVER' | 'LOCAL'
@@ -25,8 +24,7 @@ export default class SyncResolver {
       entriesForCreate: [],
       tuplesForUpdate: [],
       tuplesForRestore: [],
-      idsForDestroy: [],
-      recordsForSynced: []
+      idsForDestroy: []
     }
   }
 
@@ -60,9 +58,6 @@ export default class SyncResolver {
     } else if (this.comparator(server as SyncEntryNonDeleted<BaseModel>, local) !== 'LOCAL') {
       // local is older, so update it with server's
       this.resolution.tuplesForUpdate.push([local, server])
-    } else {
-      // server is older - can happen with clock skew - just mark as synced
-      this.resolution.recordsForSynced.push(local)
     }
   }
 
@@ -74,9 +69,6 @@ export default class SyncResolver {
     } else if (this.comparator(server as SyncEntryNonDeleted<BaseModel>, local) !== 'LOCAL') {
       // local is older, so update it with server's
       this.resolution.tuplesForUpdate.push([local, server])
-    } else {
-      // server is older - can happen with clock skew - just mark as synced
-      this.resolution.recordsForSynced.push(local)
     }
   }
 

package/src/services/sync/store/index.ts

@@ -184,12 +184,8 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
   async pushRecordIdsImpatiently(ids: RecordId[], span?: Span) {
     const records = await this.queryMaybeDeletedRecords(Q.where('id', Q.oneOf(ids)))
 
-    return await this.pushCoalescer.push(
-      records,
-      queueThrottle({ state: this.pushThrottleState }, () => {
-        return this.executePush(records, span)
-      })
-    )
+    // don't use coalescer or throttle - otherwise it could pick up on currently in-flight retrying (i.e., not impatient) requests
+    return this.executePush(records, span)
   }
 
   async readAll() {
@@ -962,15 +958,9 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
         r._raw._changed = ''
       })
     })
-    const syncedBuilds = result.recordsForSynced.map((record) => {
-      return record.prepareUpdate((r) => {
-        r._raw._status = 'synced'
-        r._raw._changed = ''
-      })
-    })
 
     return [
-      [...destroyedBuilds, ...createdBuilds, ...updatedBuilds, ...restoreDestroyBuilds, ...syncedBuilds],
+      [...destroyedBuilds, ...createdBuilds, ...updatedBuilds, ...restoreDestroyBuilds],
       [...restoreCreateBuilds],
     ]
   }

package/src/services/urlBuilder.ts

@@ -97,10 +97,6 @@ const CONTENT_TYPES_WITHOUT_OVERVIEW = ['course', 'guided-course']
  * @example
  * generateContentUrl({ id: 456, type: 'course-part', parentId: 789, brand: 'pianote' })
  * // Returns: "/pianote/lessons/course/789/456"
- *
- * @example
- * generateContentUrl({ id: 123, type: 'pack-bundle', navigateTo: { id: 456 }, brand: 'guitareo' })
- * // Returns: "/guitareo/lessons/pack/123/456"
  */
 export async function generateContentUrl({
   id,
@@ -128,18 +124,6 @@ export async function generateContentUrl({
     return `/${brand}/lessons/course-collection/overview/${id}`
   }
 
-  if (type === 'pack') {
-    return `/${brand}/lessons/pack/overview/${id}`
-  }
-
-  if (type === 'pack-bundle') {
-    if (navigateTo?.id) {
-      return `/${brand}/lessons/pack/${id}/${navigateTo.id}`
-    }
-    // Fallback to overview if navigateTo is missing
-    return `/${brand}/lessons/pack/overview/${id}`
-  }
-
   // Recursive helper to fetch navigateTo with optional deep fetching
   const fetchNavigateToRecursive = async (contentId: number | string, shouldGoDeeper: boolean): Promise<any> => {
     const content = await fetchByRailContentIds([contentId])
@@ -209,7 +193,6 @@ export async function generateContentUrl({
     'course-lesson': 'course',
     'guided-course-lesson': 'course',
     'guided-course': 'course',
-    'pack-bundle-lesson': 'pack',
     'documentary-lesson': 'documentary',
     'skill-pack-lesson': 'skill-pack',
 

package/src/services/user/profile.js

@@ -28,7 +28,7 @@ export async function otherStats(userId = globalConfig.sessionConfig.userId) {
       type: 'week',
       length: longestStreaks.longestWeeklyStreak,
     },
-    total_practice_time: longestStreaks.totalPracticeSeconds,
+    total_practice_time: longestStreaks.totalPracticeSeconds + (stats.v1_practice_time ?? 0),
   }
 }