musora-content-services 2.148.0 → 2.150.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.150.0](https://github.com/railroadmedia/musora-content-services/compare/v2.149.0...v2.150.0) (2026-04-08)
+
+
+### Features
+
+* throw specific error after abort; protect getLastFetchToken ([#905](https://github.com/railroadmedia/musora-content-services/issues/905)) ([7c084e4](https://github.com/railroadmedia/musora-content-services/commit/7c084e4b351e26f8464f568d658e855f84e31951))
+
+## [2.149.0](https://github.com/railroadmedia/musora-content-services/compare/v2.148.0...v2.149.0) (2026-04-07)
+
+
+### Features
+
+* remove countdown logic for GC in progress card ([#897](https://github.com/railroadmedia/musora-content-services/issues/897)) ([254bc2a](https://github.com/railroadmedia/musora-content-services/commit/254bc2a0a695f68e449a49a71197be01654ba9aa))
+
 ## [2.148.0](https://github.com/railroadmedia/musora-content-services/compare/v2.145.6...v2.148.0) (2026-04-03)
 
 

package/package.json

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

package/src/services/progress-row/rows/content-card.js

@@ -12,7 +12,6 @@ import {
   showsLessonTypes,
   songs,
 } from '../../../contentTypeConfig.js'
-import { getTimeRemainingUntilLocal } from '../../dateUtils.js'
 import { PARENT_ID_TOP_LEVEL } from '../../sync/models/ContentProgress'
 
 /**
@@ -58,7 +57,7 @@ function generateContentPromises(contents) {
   const promises = []
   if (!contents) return promises
   const existingShows = new Set()
-  let allRecentTypeSet = new Set(Object.values(recentTypes.homeRow))
+  const allRecentTypeSet = new Set(Object.values(recentTypes.homeRow))
   allRecentTypeSet.delete('learning-path-v2') // we do this to remove from homepage, until we allow a-la-carte learning paths
   contents.forEach((content) => {
     const type = content.type
@@ -80,33 +79,12 @@ function generateContentPromises(contents) {
 export async function processContentItem(content) {
   const contentType = getFormattedType(content.type, content.brand)
   const isLive = content.isLive ?? false
-  let ctaText = getDefaultCTATextForContent(content, contentType)
+  const ctaText = getDefaultCTATextForContent(content, contentType)
 
   const { completedChildren, allChildren } = await getCompletedChildren(content, contentType)
   content.completed_children = completedChildren
   content.all_children = allChildren
 
-  if (content.type === 'guided-course') {
-    const nextLessonPublishedOn = content.children.find(
-      (child) => child.id === content.navigateTo.id
-    )?.published_on
-    let isLocked = new Date(nextLessonPublishedOn) > new Date()
-    if (isLocked) {
-      content.is_locked = true
-      const timeRemaining = getTimeRemainingUntilLocal(nextLessonPublishedOn, {
-        withTotalSeconds: true,
-      })
-      content.time_remaining_seconds = timeRemaining.totalSeconds
-      ctaText = 'Next lesson in ' + timeRemaining.formatted
-    } else if (
-      !content.progressStatus ||
-      content.progressStatus === 'not-started' ||
-      content.progressPercentage === 0
-    ) {
-      ctaText = 'Start Course'
-    }
-  }
-
   return {
     id: content.id,
     progressType: 'content',
@@ -125,16 +103,10 @@ export async function processContentItem(content) {
       badge_template: content.badge_template ?? null,
       badge_template_rear: content.badge_template_rear ?? null,
       isLocked: content.is_locked ?? false,
-      subtitle:
-        collectionLessonTypes.includes(content.type) || content.lesson_count > 1
-          ? `${content.completed_children ?? 0} of ${content.all_children ?? content.lesson_count ?? content.child_count} Lessons Complete`
-          : (contentType === 'lesson' || contentType === 'show') && isLive === false
-            ? `${content.progressPercentage}% Complete`
-            : `${content.difficulty_string} • ${content.artist_name}`,
+      subtitle: getSubtitle(content, contentType, isLive),
     },
     cta: {
       text: ctaText,
-      timeRemainingToUnlockSeconds: content.time_remaining_seconds ?? null,
       action: {
         type: content.type,
         brand: content.brand,
@@ -147,21 +119,37 @@ export async function processContentItem(content) {
   }
 }
 
+function getSubtitle(content, contentType, isLive) {
+  if (collectionLessonTypes.includes(content.type) || content.lesson_count > 1) {
+    return `${content.completed_children ?? 0} of ${content.all_children ?? content.lesson_count ?? content.child_count} Lessons Complete`
+  }
+  if ((contentType === 'lesson' || contentType === 'show') && !isLive) {
+    return `${content.progressPercentage}% Complete`
+  }
+  return `${content.difficulty_string} • ${content.artist_name}`
+}
+
 function getDefaultCTATextForContent(content, contentType) {
-  let ctaText = 'Continue'
+  const notStarted =
+    !content.progressStatus ||
+    content.progressStatus === 'not-started' ||
+    content.progressPercentage === 0
+  if (content.type === 'guided-course' && notStarted) return 'Start Course'
+
   if (content.progressStatus === 'completed') {
     if (
       contentType === songs[content.brand] ||
       contentType === 'play along' ||
       contentType === 'jam track'
     )
-      ctaText = 'Replay Song'
-    if (contentType === 'lesson' || contentType === 'show') ctaText = 'Revisit Lesson'
+      return 'Replay Song'
+    if (contentType === 'lesson' || contentType === 'show') return 'Revisit Lesson'
     if (contentType === 'song tutorial' || collectionLessonTypes.includes(content.type))
-      ctaText = 'Revisit Lessons'
-    if (contentType === 'course-collection') ctaText = 'View Lessons'
+      return 'Revisit Lessons'
+    if (contentType === 'course-collection') return 'View Lessons'
   }
-  return ctaText
+
+  return 'Continue'
 }
 
 async function getCompletedChildren(content, contentType) {

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

@@ -72,3 +72,11 @@ export class SyncValidationError extends SyncError {
     Object.setPrototypeOf(this, new.target.prototype)
   }
 }
+
+export class SyncAbortError extends SyncError {
+  constructor(message: string = 'Sync operation was aborted', details?: ErrorDetails) {
+    super(message, details)
+    this.name = 'SyncAbortError'
+    Object.setPrototypeOf(this, new.target.prototype)
+  }
+}

package/src/services/sync/manager.ts

@@ -286,4 +286,8 @@ export default class SyncManager {
   getContext() {
     return this.context
   }
+
+  abort(reason?: string) {
+    this.runScope.abort(reason)
+  }
 }

package/src/services/sync/run-scope.ts

@@ -1,3 +1,5 @@
+import { SyncAbortError } from './errors'
+
 export default class SyncRunScope {
   private abortController: AbortController
 
@@ -9,14 +11,14 @@ export default class SyncRunScope {
     return this.abortController.signal
   }
 
-  abort(): void {
-    this.abortController.abort()
+  abort(reason?: string): void {
+    this.abortController.abort(reason)
   }
 
   abortable<T>(fn: () => Promise<T>): Promise<T> {
     return new Promise((resolve, reject) => {
       if (this.signal.aborted) {
-        reject(this.signal.reason)
+        reject(new SyncAbortError('Operation aborted', { reason: this.signal.reason }))
         return
       }
 

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

@@ -172,7 +172,9 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
   }
 
   async getLastFetchToken() {
-    return (await this.db.localStorage.get<SyncToken | null>(this.lastFetchTokenKey)) ?? null
+    return await this.runScope.abortable(async () => {
+      return (await this.db.localStorage.get<SyncToken | null>(this.lastFetchTokenKey)) ?? null
+    })
   }
 
   async pullRecords(span?: Span) {

package/.claude/settings.local.json

@@ -1,22 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(tree:*)",
-      "Bash(find:*)",
-      "Bash(docker exec:*)",
-      "Bash(node:*)",
-      "Bash(npm run build-index:*)",
-      "Bash(npm run link_mcs:*)",
-      "Bash(./link_mcs.sh:*)",
-      "Bash(curl:*)",
-      "Bash(php artisan:*)",
-      "Bash(git checkout:*)",
-      "Bash(source .env)",
-      "Bash(echo:*)",
-      "Bash(grep:*)",
-      "Bash(gh api repos/railroadmedia/musora-platform-backend/commits/1f9878a5e681bf1e2233c0d59a618d477b118c49 --jq '.commit.message' 2>/dev/null || echo \"no access\")",
-      "WebFetch(domain:github.com)",
-      "Read(//app/**)"
-    ]
-  }
-}