musora-content-services 2.119.1 → 2.119.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.119.2](https://github.com/railroadmedia/musora-content-services/compare/v2.119.1...v2.119.2) (2026-01-14)
+
+
+### Bug Fixes
+
+* better logs in Sentry for debugging ([#712](https://github.com/railroadmedia/musora-content-services/issues/712)) ([e1019b5](https://github.com/railroadmedia/musora-content-services/commit/e1019b50b0cf606b86e71028db0a2f9ac354cfca))
+
 ### [2.119.1](https://github.com/railroadmedia/musora-content-services/compare/v2.119.0...v2.119.1) (2026-01-14)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -229,7 +229,7 @@ export const lessonTypesMapping = {
   performances: performancesLessonTypes,
   'student archives': studentArchivesLessonTypes,
   documentaries: ['documentary-lesson'],
-  courses: ['course'],
+  courses: ['course', 'course-collection'],
   'guided courses': ['guided-course'],
   'course collections': ['course-collection'],
   'skill packs': ['skill-pack'],

package/src/services/content.js

@@ -116,7 +116,7 @@ export async function getTabResults(brand, pageName, tabName, {
       addProgressPercentage: true,
       addProgressStatus: true
     })
-  } else if (sort === 'recommended') {
+  } else if (sort === 'recommended' && tabName.toLowerCase() !== Tabs.ExploreAll.name.toLowerCase()) {
     const contentTypes = lessonTypesMapping[tabName.toLowerCase()] || []
     const allRecommendations = await recommendations(brand, { contentTypes, section: tabRecSysSection })
 
@@ -162,12 +162,20 @@ export async function getTabResults(brand, pageName, tabName, {
     })
   } else {
     let temp = await fetchTabData(brand, pageName, { page, limit, sort, includedFields: mergedIncludedFields, progress: progressValue });
+    const [ranking, contextResults] = await Promise.all([
+      sort === 'recommended' ? rankItems(brand, temp.entity.map(e => e.id)) : [],
+      addContextToContent(() => temp.entity, {
+        addNextLesson: true,
+        addNavigateTo: true,
+        addProgressPercentage: true,
+        addProgressStatus: true
+      })
+    ]);
 
-    results = await addContextToContent(() => temp.entity, {
-      addNextLesson: true,
-      addNavigateTo: true,
-      addProgressPercentage: true,
-      addProgressStatus: true
+    results = ranking.length === 0 ? contextResults : contextResults.sort((a, b) => {
+      const indexA = ranking.indexOf(a.id);
+      const indexB = ranking.indexOf(b.id);
+      return (indexA === -1 ? Infinity : indexA) - (indexB === -1 ? Infinity : indexB);
     })
   }
 

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

@@ -2,7 +2,7 @@ import watermelonLogger from '@nozbe/watermelondb/utils/common/logger'
 import { SyncError, SyncUnexpectedError } from '../errors'
 
 import * as InjectedSentry from '@sentry/browser'
-export type SentryBrowserOptions = NonNullable<Parameters<typeof InjectedSentry.init>[0]>;
+export type SentryBrowserOptions = NonNullable<Parameters<typeof InjectedSentry.init>[0]>
 
 export type SentryLike = {
   captureException: typeof InjectedSentry.captureException
@@ -21,7 +21,7 @@ export enum SeverityLevel {
   LOG = 2,
   WARNING = 3,
   ERROR = 4,
-  FATAL = 5
+  FATAL = 5,
 }
 
 export class SyncTelemetry {
@@ -41,7 +41,7 @@ export class SyncTelemetry {
   }
 
   private userId: string
-  private Sentry: SentryLike;
+  private Sentry: SentryLike
   private level: SeverityLevel
   private pretty: boolean
 
@@ -50,15 +50,25 @@ export class SyncTelemetry {
   // allows us to know if Sentry shouldn't double-capture a dev-prettified console.error log
   private _ignoreConsole = false
 
-  constructor(userId: string, { Sentry, level, pretty }: { Sentry: SentryLike, level?: keyof typeof SeverityLevel, pretty?: boolean }) {
+  constructor(
+    userId: string,
+    {
+      Sentry,
+      level,
+      pretty,
+    }: { Sentry: SentryLike; level?: keyof typeof SeverityLevel; pretty?: boolean }
+  ) {
     this.userId = userId
     this.Sentry = Sentry
-    this.level = typeof level !== 'undefined' && level in SeverityLevel ? SeverityLevel[level] : SeverityLevel.LOG
+    this.level =
+      typeof level !== 'undefined' && level in SeverityLevel
+        ? SeverityLevel[level]
+        : SeverityLevel.LOG
     this.pretty = typeof pretty !== 'undefined' ? pretty : true
 
-    watermelonLogger.log = (...messages: any[]) => this.log('[Watermelon]', ...messages);
-    watermelonLogger.warn = (...messages: any[]) => this.warn('[Watermelon]', ...messages);
-    watermelonLogger.error = (...messages: any[]) => this.error('[Watermelon]', ...messages);
+    watermelonLogger.log = (message: unknown) => this.log(message instanceof Error ? message : ['[Watermelon]', message].join(' '))
+    watermelonLogger.warn = (message: unknown) => this.warn(message instanceof Error ? message : ['[Watermelon]', message].join(' '))
+    watermelonLogger.error = (message: unknown) => this.error(message instanceof Error ? message : ['[Watermelon]', message].join(' '))
   }
 
   trace<T>(opts: StartSpanOptions, callback: (_span: Span) => T) {
@@ -68,8 +78,8 @@ export class SyncTelemetry {
       op: `${SYNC_TELEMETRY_TRACE_PREFIX}${opts.op}`,
       attributes: {
         ...opts.attributes,
-        userId: this.userId
-      }
+        userId: this.userId,
+      },
     }
     return this.Sentry.startSpan<T>(options, (span) => {
       let desc = span['_spanId'].slice(0, 4)
@@ -84,14 +94,20 @@ export class SyncTelemetry {
   }
 
   capture(err: Error, context = {}) {
-    const wrapped = err instanceof SyncError ? err : new SyncUnexpectedError((err as Error).message, context);
+    const wrapped =
+      err instanceof SyncError ? err : new SyncUnexpectedError((err as Error).message, context)
 
     wrapped.markReported()
-    this.Sentry.captureException(err, err instanceof SyncUnexpectedError ? {
-      mechanism: {
-        handled: false
-      }
-    } : undefined)
+    this.Sentry.captureException(
+      err,
+      err instanceof SyncUnexpectedError
+        ? {
+            mechanism: {
+              handled: false,
+            },
+          }
+        : undefined
+    )
 
     this._ignoreConsole = true
     this.error(err.message)
@@ -123,73 +139,66 @@ export class SyncTelemetry {
     return false
   }
 
-  shouldIgnoreMessages(messages: any[]) {
-    return messages.some(message => {
-      return this.shouldIgnoreMessage(message)
-    })
+  debug(message: unknown, extra?: any) {
+    this._log(SeverityLevel.DEBUG, 'info', message, extra)
   }
 
-  debug(...messages: any[]) {
-    this.level <= SeverityLevel.DEBUG && !this.shouldIgnoreMessages(messages) && console.debug(...this.formattedConsoleMessages(...messages));
-    this.recordBreadcrumb('debug', ...messages)
+  info(message: unknown, extra?: any) {
+    this._log(SeverityLevel.INFO, 'info', message, extra)
   }
 
-  info(...messages: any[]) {
-    this.level <= SeverityLevel.INFO && !this.shouldIgnoreMessages(messages) && console.info(...this.formattedConsoleMessages(...messages));
-    this.recordBreadcrumb('info', ...messages)
+  log(message: unknown, extra?: any) {
+    this._log(SeverityLevel.LOG, 'log', message, extra)
   }
 
-  log(...messages: any[]) {
-    this.level <= SeverityLevel.LOG && !this.shouldIgnoreMessages(messages) && console.log(...this.formattedConsoleMessages(...messages));
-    this.recordBreadcrumb('log', ...messages)
+  warn(message: unknown, extra?: any) {
+    this._log(SeverityLevel.WARNING, 'warn', message, extra)
   }
 
-  warn(...messages: any[]) {
-    this.level <= SeverityLevel.WARNING && !this.shouldIgnoreMessages(messages) && console.warn(...this.formattedConsoleMessages(...messages));
-    this.recordBreadcrumb('warning', ...messages)
+  error(message: unknown[], extra?: any) {
+    this._log(SeverityLevel.ERROR, 'error', message, extra)
   }
 
-  error(...messages: any[]) {
-    this.level <= SeverityLevel.ERROR && !this.shouldIgnoreMessages(messages) && console.error(...this.formattedConsoleMessages(...messages));
-    this.recordBreadcrumb('error', ...messages)
+  fatal(message: unknown[], extra?: any) {
+    this._log(SeverityLevel.FATAL, 'error', message, extra)
   }
 
-  fatal(...messages: any[]) {
-    this.level <= SeverityLevel.FATAL && !this.shouldIgnoreMessages(messages) && console.error(...this.formattedConsoleMessages(...messages));
-    this.recordBreadcrumb('fatal', ...messages)
-  }
+  _log(level: SeverityLevel, consoleMethod: 'info' | 'log' | 'warn' | 'error', message: unknown, extra?: any) {
+    if (this.level > level || this.shouldIgnoreMessage(message)) return
 
-  private recordBreadcrumb(level: InjectedSentry.Breadcrumb['level'], ...messages: any[]) {
-    this.Sentry.addBreadcrumb({
-      message: messages.join(', '),
-      level,
-      category: 'sync',
-    })
+    this._ignoreConsole = true
+    console[consoleMethod](...this.formattedConsoleMessage(message, extra))
+    this._ignoreConsole = false
+    this.Sentry.captureMessage(message instanceof Error ? message.message : String(message), level)
   }
 
-  private formattedConsoleMessages(...messages: any[]) {
+  private formattedConsoleMessage(message: unknown, extra: any) {
     if (!this.pretty) {
-      return messages
+      return [message, ...(extra ? [extra] : [])]
     }
 
-    const date = new Date();
-    return [...this.consolePrefix(date), ...messages, ...this.consoleSuffix(date)];
+    const date = new Date()
+    return [...this.consolePrefix(date), message, ...(extra ? [extra] : []), ...this.consoleSuffix(date)]
   }
 
   private consolePrefix(date: Date) {
-    const now = Math.round(date.getTime() / 1000).toString();
-    return [`📡 SYNC: (%c${now.slice(0, 5)}%c${now.slice(5, 10)})`, 'color: #ccc', 'font-weight: bold;'];
+    const now = Math.round(date.getTime() / 1000).toString()
+    return [
+      `📡 SYNC: (%c${now.slice(0, 5)}%c${now.slice(5, 10)})`,
+      'color: #ccc',
+      'font-weight: bold;',
+    ]
   }
 
   private consoleSuffix(date: Date) {
-    return [` [${date.toLocaleTimeString()}, ${date.getTime()}]`];
+    return [` [${date.toLocaleTimeString()}, ${date.getTime()}]`]
   }
 
   private shouldIgnoreMessage(message: any) {
     if (message instanceof Error) message = message.message
     if (typeof message !== 'string') return false
 
-    return this.ignorePatterns.some(pattern => {
+    return this.ignorePatterns.some((pattern) => {
       if (typeof pattern === 'string') {
         return message.indexOf(pattern) !== -1
       } else if (pattern instanceof RegExp) {