musora-content-services 2.117.0 → 2.117.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.117.2](https://github.com/railroadmedia/musora-content-services/compare/v2.117.1...v2.117.2) (2026-01-13)
+
+### [2.117.1](https://github.com/railroadmedia/musora-content-services/compare/v2.117.0...v2.117.1) (2026-01-13)
+
 ## [2.117.0](https://github.com/railroadmedia/musora-content-services/compare/v2.116.0...v2.117.0) (2026-01-13)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -86,6 +86,7 @@ export const DEFAULT_CHILD_FIELDS = [
   "'permission_id': permission_v2",
   'child_count',
   '"parent_id": parent_content_data[0].id',
+  '"grandparent_id": parent_content_data[1].id',
 ]
 
 export const playAlongMp3sField = `{

package/src/index.d.ts

@@ -109,6 +109,7 @@ import {
 	contentStatusCompletedMany,
 	contentStatusReset,
 	contentStatusStarted,
+	flushWatchSession,
 	getAllCompleted,
 	getAllCompletedByIds,
 	getAllStarted,
@@ -568,6 +569,7 @@ declare module 'musora-content-services' {
 		fetchUserPracticeNotes,
 		fetchUserPractices,
 		findIncompleteLesson,
+		flushWatchSession,
 		followThread,
 		generateAuthSessionUrl,
 		generateCommentUrl,

package/src/index.js

@@ -113,6 +113,7 @@ import {
 	contentStatusCompletedMany,
 	contentStatusReset,
 	contentStatusStarted,
+	flushWatchSession,
 	getAllCompleted,
 	getAllCompletedByIds,
 	getAllStarted,
@@ -567,6 +568,7 @@ export {
 	fetchUserPracticeNotes,
 	fetchUserPractices,
 	findIncompleteLesson,
+	flushWatchSession,
 	followThread,
 	generateAuthSessionUrl,
 	generateCommentUrl,

package/src/services/contentProgress.js

@@ -10,6 +10,7 @@ import { fetchBrandsByContentIds } from './sanity.js'
 const STATE_STARTED = STATE.STARTED
 const STATE_COMPLETED = STATE.COMPLETED
 const MAX_DEPTH = 3
+const PUSH_INTERVAL = 30_000
 
 export async function getProgressState(contentId, collection = null) {
   return getById(normalizeContentId(contentId), normalizeCollection(collection), 'state', '')
@@ -414,16 +415,42 @@ export async function recordWatchSession(
   contentId = normalizeContentId(contentId)
   collection = normalizeCollection(collection)
 
+  if (!prevSession) {
+    prevSession = {
+      practiceSession: new Map(),
+      pushInterval: null
+    }
+  }
+
+  // Track practice and progress locally (no immediate push)
   const [session] = await Promise.all([
-    trackPractice(contentId, secondsPlayed, prevSession, { instrumentId, categoryId }),
+    trackPractice(contentId, secondsPlayed, prevSession.practiceSession, { instrumentId, categoryId }),
     trackProgress(contentId, collection, currentSeconds, mediaLengthSeconds),
   ])
 
-  return session
+  if (!prevSession.pushInterval) {
+    prevSession.pushInterval = setInterval(() => {
+      flushWatchSession()
+    }, PUSH_INTERVAL)
+  }
+
+  prevSession.practiceSession = session
+
+  return prevSession
+}
+
+export async function flushWatchSession(sessionToFlush = null, shouldClearInterval = true) {
+  if (shouldClearInterval && sessionToFlush?.pushInterval) {
+    clearInterval(sessionToFlush.pushInterval)
+    sessionToFlush.pushInterval = null
+  }
+
+  db.contentProgress.requestPushUnsynced()
+  db.practices.requestPushUnsynced()
 }
 
-async function trackPractice(contentId, secondsPlayed, prevSession, details = {}) {
-  const session = prevSession || new Map()
+async function trackPractice(contentId, secondsPlayed, practiceSession, details = {}) {
+  const session = practiceSession || new Map()
 
   const secondsSinceLastUpdate = Math.ceil(secondsPlayed - (session.get(contentId) ?? 0))
   session.set(contentId, secondsPlayed)
@@ -437,7 +464,7 @@ async function trackProgress(contentId, collection, currentSeconds, mediaLengthS
     99,
     Math.round(((currentSeconds ?? 0) / Math.max(1, mediaLengthSeconds)) * 100)
   ))
-  return saveContentProgress(contentId, collection, progress, currentSeconds)
+  return saveContentProgress(contentId, collection, progress, currentSeconds, { skipPush: true })
 }
 
 export async function contentStatusCompleted(contentId, collection = null) {

package/src/services/sync/repositories/base.ts

@@ -238,7 +238,7 @@ export default class SyncRepository<TModel extends BaseModel> {
     return result
   }
 
-  protected async _requestPushUnsynced() {
-    await this.store.pushUnsyncedWithRetry()
+  requestPushUnsynced() {
+    this.store.pushUnsyncedWithRetry()
   }
 }

package/src/services/sync/repositories/content-progress.ts

@@ -220,10 +220,6 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return this.deleteOne(ProgressRepository.generateId(contentId, collection), { skipPush })
   }
 
-  async requestPushUnsynced() {
-    await this._requestPushUnsynced()
-  }
-
   private static generateId(
     contentId: number,
     collection: CollectionParameter | null

package/src/services/sync/repositories/practices.ts

@@ -18,7 +18,7 @@ export default class PracticesRepository extends SyncRepository<Practice> {
     return Math.round(totalSeconds / 60)
   }
 
-  async trackAutoPractice(contentId: number, date: string, incrementalDurationSeconds: number) {
+  async trackAutoPractice(contentId: number, date: string, incrementalDurationSeconds: number, skipPush = true) {
     return await this.upsertOne(PracticesRepository.generateAutoId(contentId, date), r => {
       r._raw.id = PracticesRepository.generateAutoId(contentId, date);
       r.auto = true;
@@ -26,7 +26,7 @@ export default class PracticesRepository extends SyncRepository<Practice> {
       r.date = date;
 
       r.duration_seconds = Math.min((r.duration_seconds || 0) + incrementalDurationSeconds, 59999);
-    })
+    }, { skipPush })
   }
 
   async recordManualPractice(date: string, durationSeconds: number, details: Partial<Pick<Practice, 'title' | 'instrument_id' | 'category_id' | 'thumbnail_url'>> = {}) {
@@ -64,4 +64,12 @@ export default class PracticesRepository extends SyncRepository<Practice> {
   private static generateManualId(manualId: string) {
     return `manual:${manualId}`;
   }
+
+  async getAutoPracticesOnDate(date: string) {
+    return await this.queryAll(
+      Q.where('date', date),
+      Q.where('auto', true),
+      Q.sortBy('created_at', 'asc')
+    )
+  }
 }

package/src/services/userActivity.js

@@ -298,7 +298,7 @@ export async function recordUserPractice(practiceDetails) {
 
 export async function trackUserPractice(contentId, incSeconds) {
   const day = new Date().toLocaleDateString('sv-SE'); // YYYY-MM-DD wall clock date in user's timezone
-  return await db.practices.trackAutoPractice(contentId, day, incSeconds);
+  return await db.practices.trackAutoPractice(contentId, day, incSeconds, { skipPush: true }); // NOTE - SKIPS PUSH
 }
 
 /**