musora-content-services 2.93.0 → 2.93.1

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.93.1](https://github.com/railroadmedia/musora-content-services/compare/v2.93.0...v2.93.1) (2025-12-02)
+
 ## [2.93.0](https://github.com/railroadmedia/musora-content-services/compare/v2.92.7...v2.93.0) (2025-12-02)
 
 

package/package.json

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

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

@@ -29,7 +29,7 @@ export function inBoundary<T, TContext extends Record<string, any>>(fn: (context
     if (result instanceof Promise) {
       return result.catch((err: unknown) => {
         const wrapped = err instanceof SyncError ? err : new SyncUnexpectedError((err as Error).message, context);
-        SyncTelemetry.getInstance().capture(wrapped)
+        SyncTelemetry.getInstance()?.capture(wrapped)
 
         throw wrapped;
       });
@@ -38,7 +38,7 @@ export function inBoundary<T, TContext extends Record<string, any>>(fn: (context
     return result;
   } catch (err: unknown) {
     const wrapped = err instanceof SyncError ? err : new SyncUnexpectedError((err as Error).message, context);
-    SyncTelemetry.getInstance().capture(wrapped);
+    SyncTelemetry.getInstance()?.capture(wrapped);
 
     throw wrapped;
   }

package/src/services/sync/fetch.ts

@@ -23,19 +23,19 @@ interface RawPushResponse {
 }
 
 export type SyncResponse = SyncPushResponse | SyncPullResponse
+export type SyncPushResponse = SyncPushSuccessResponse | SyncPushFetchFailureResponse | SyncPushFailureResponse
 
-export type SyncPushResponse = SyncPushSuccessResponse | SyncPushFailureResponse
-
-type SyncPushSuccessResponse = SyncPushResponseBase & {
+type SyncPushSuccessResponse = SyncResponseBase & {
   ok: true
   results: SyncStorePushResult[]
 }
-type SyncPushFailureResponse = SyncPushResponseBase & {
+type SyncPushFetchFailureResponse = SyncResponseBase & {
   ok: false,
-  originalError: Error
+  isRetryable: boolean
 }
-interface SyncPushResponseBase extends SyncResponseBase {
-
+type SyncPushFailureResponse = SyncResponseBase & {
+  ok: false,
+  originalError: Error
 }
 
 type SyncStorePushResult<TRecordKey extends string = 'id'> = SyncStorePushResultSuccess<TRecordKey> | SyncStorePushResultFailure<TRecordKey>
@@ -61,20 +61,21 @@ interface SyncStorePushResultBase {
   type: 'success' | 'failure'
 }
 
-export type SyncPullResponse = SyncPullSuccessResponse | SyncPullFailureResponse
+export type SyncPullResponse = SyncPullSuccessResponse | SyncPullFailureResponse | SyncPullFetchFailureResponse
 
-type SyncPullSuccessResponse = SyncPullResponseBase & {
+type SyncPullSuccessResponse = SyncResponseBase & {
   ok: true
   entries: SyncEntry[]
   token: SyncToken
   previousToken: SyncToken | null
 }
-type SyncPullFailureResponse = SyncPullResponseBase & {
+type SyncPullFailureResponse = SyncResponseBase & {
   ok: false,
-  originalError: Error
+  isRetryable: boolean
 }
-interface SyncPullResponseBase extends SyncResponseBase {
-
+type SyncPullFetchFailureResponse = SyncResponseBase & {
+  ok: false,
+  originalError: Error
 }
 export interface SyncResponseBase {
   ok: boolean
@@ -141,11 +142,18 @@ export function handlePull(callback: (session: BaseSessionProvider) => Request)
 
     let response: Response | null = null
     try {
-      response = await performFetch(request)
+      response = await fetch(request)
     } catch (e) {
       return {
         ok: false,
-        originalError: e
+        originalError: e as Error
+      }
+    }
+
+    if (response.ok === false) {
+      return {
+        ok: false,
+        isRetryable: (response.status >= 500 && response.status < 504) || response.status === 429 || response.status === 408
       }
     }
 
@@ -180,11 +188,18 @@ export function handlePush(callback: (session: BaseSessionProvider) => Request)
 
     let response: Response | null = null
     try {
-      response = await performFetch(request)
+      response = await fetch(request)
     } catch (e) {
       return {
         ok: false,
-        originalError: e
+        originalError: e as Error
+      }
+    }
+
+    if (response.ok === false) {
+      return {
+        ok: false,
+        isRetryable: (response.status >= 500 && response.status < 504) || response.status === 429 || response.status === 408
       }
     }
 
@@ -198,17 +213,6 @@ export function handlePush(callback: (session: BaseSessionProvider) => Request)
   }
 }
 
-async function performFetch(request: Request) {
-  const response = await fetch(request)
-  const isRetryable = (response.status >= 500 && response.status < 504) || response.status === 429 || response.status === 408
-
-  if (isRetryable) {
-    throw new Error(`Server returned ${response.status}`)
-  }
-
-  return response
-}
-
 function serializePullUrlQuery(url: string, fetchToken: SyncToken | null) {
   const queryString = url.replace(/^[^?]*\??/, '');
   const searchParams = new URLSearchParams(queryString);

package/src/services/sync/manager.ts

@@ -14,6 +14,7 @@ import { inBoundary } from './errors/boundary'
 import createStoresFromConfig from './store-configs'
 
 export default class SyncManager {
+  private static counter = 0
   private static instance: SyncManager | null = null
 
   public static assignAndSetupInstance(instance: SyncManager) {
@@ -23,8 +24,8 @@ export default class SyncManager {
     SyncManager.instance = instance
     const teardown = instance.setup()
     return async () => {
-      await teardown()
       SyncManager.instance = null
+      await teardown()
     }
   }
 
@@ -35,6 +36,7 @@ export default class SyncManager {
     return SyncManager.instance
   }
 
+  private id: string
   public telemetry: SyncTelemetry
   private database: Database
   private context: SyncContext
@@ -45,10 +47,12 @@ export default class SyncManager {
   private safetyMap: { stores: SyncStore<any>[]; mechanisms: (() => void)[] }[]
 
   constructor(context: SyncContext, initDatabase: () => Database) {
+    this.id = (SyncManager.counter++).toString()
+
     this.telemetry = SyncTelemetry.getInstance()!
     this.context = context
 
-    this.database = this.telemetry.trace({ name: 'db:init' }, () => inBoundary(initDatabase))
+    this.database = this.telemetry.trace({ name: 'db:init' }, () => inBoundary(initDatabase)) // todo - can cause undefined??
 
     this.runScope = new SyncRunScope()
     this.retry = new SyncRetry(this.context, this.telemetry)
@@ -59,6 +63,13 @@ export default class SyncManager {
     this.safetyMap = []
   }
 
+  /**
+   * Useful as a cache key (if user logs in and out multiple times, creating multiple managers)
+   */
+  getId() {
+    return this.id
+  }
+
   createStore<TModel extends BaseModel>(config: SyncStoreConfig<TModel>) {
     return new SyncStore<TModel>(config, this.context, this.database, this.retry, this.runScope, this.telemetry)
   }

package/src/services/sync/repository-proxy.ts

@@ -14,35 +14,50 @@ import {
   PracticeDayNote
 } from "./models"
 
+
 interface SyncRepositories {
- likes: ContentLikesRepository
- contentProgress: ContentProgressRepository
- practices: PracticesRepository
- practiceDayNotes: PracticeDayNotesRepository
+  likes: ContentLikesRepository;
+  contentProgress: ContentProgressRepository;
+  practices: PracticesRepository;
+  practiceDayNotes: PracticeDayNotesRepository;
 }
 
-export default new Proxy({} as SyncRepositories, {
-  get(target: SyncRepositories, prop: keyof SyncRepositories) {
-    if (!target[prop]) {
-      const manager = SyncManager.getInstance()
 
+// internal cache for repositories, keyed by managerId and property name
+const repoCache: Record<string, Partial<SyncRepositories>> = {};
+
+const proxy = new Proxy({} as SyncRepositories, {
+  get(_target, prop: keyof SyncRepositories) {
+    const manager = SyncManager.getInstance();
+    const managerId = manager.getId();
+
+    if (!repoCache[managerId]) {
+      repoCache[managerId] = {};
+    }
+    const cache = repoCache[managerId];
+
+    if (!cache[prop]) {
       switch (prop) {
         case 'likes':
-          target[prop] = new ContentLikesRepository(manager.getStore(ContentLike))
-          break
+          cache.likes = new ContentLikesRepository(manager.getStore(ContentLike));
+          break;
         case 'contentProgress':
-          target[prop] = new ContentProgressRepository(manager.getStore(ContentProgress))
-          break
+          cache.contentProgress = new ContentProgressRepository(manager.getStore(ContentProgress));
+          break;
         case 'practices':
-          target[prop] = new PracticesRepository(manager.getStore(Practice))
-          break
+          cache.practices = new PracticesRepository(manager.getStore(Practice));
+          break;
         case 'practiceDayNotes':
-          target[prop] = new PracticeDayNotesRepository(manager.getStore(PracticeDayNote))
-          break
+          cache.practiceDayNotes = new PracticeDayNotesRepository(manager.getStore(PracticeDayNote));
+          break;
         default:
-          throw new SyncError(`Repository '${prop}' not found`)
+          throw new SyncError(`Repository '${String(prop)}' not found`);
       }
     }
-    return target[prop]
+    return cache[prop];
   }
-})
+});
+
+export default proxy;
+
+

package/src/services/sync/retry.ts

@@ -56,8 +56,14 @@ export default class SyncRetry {
         this.resetBackoff()
         return result
       } else {
-        this.scheduleBackoff()
-        if (attempt >= this.MAX_ATTEMPTS) return result
+        const isRetryable = 'isRetryable' in result ? result.isRetryable : false
+
+        if (isRetryable) {
+          this.scheduleBackoff()
+          if (attempt >= this.MAX_ATTEMPTS) return result
+        } else {
+          return result
+        }
       }
     }
   }

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

@@ -424,19 +424,21 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
   }
 
   private async setLastFetchToken(token: SyncToken | null) {
-    await this.db.write(async () => {
-      if (token) {
-        const storedValue = await this.getLastFetchToken()
-
-        // avoids thrashing if we get and compare first before setting
-        if (storedValue !== token) {
-          this.telemetry.debug(`[store:${this.model.table}] Setting last fetch token: ${token}`)
-          return this.db.localStorage.set(this.lastFetchTokenKey, token)
+    await this.runScope.abortable(async () => {
+      await this.db.write(async () => {
+        if (token) {
+          const storedValue = await this.getLastFetchToken()
+
+          // avoids thrashing if we get and compare first before setting
+          if (storedValue !== token) {
+            this.telemetry.debug(`[store:${this.model.table}] Setting last fetch token: ${token}`)
+            return this.db.localStorage.set(this.lastFetchTokenKey, token)
+          }
+        } else {
+          this.telemetry.debug(`[store:${this.model.table}] Removing last fetch token`)
+          return this.db.localStorage.remove(this.lastFetchTokenKey)
         }
-      } else {
-        this.telemetry.debug(`[store:${this.model.table}] Removing last fetch token`)
-        return this.db.localStorage.remove(this.lastFetchTokenKey)
-      }
+      })
     })
   }
 

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

@@ -75,7 +75,6 @@ export class SyncTelemetry {
       }
     } : undefined)
 
-
     this._ignoreConsole = true
     this.error(err.message)
     this._ignoreConsole = false

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

@@ -4,7 +4,7 @@ import { SyncError } from '../errors'
 type ReturnsUndefined<T extends (...args: any[]) => any> = (...args: Parameters<T>) => ReturnType<T> | undefined
 
 export const syncSentryBeforeSend: ReturnsUndefined<NonNullable<SentryBrowserOptions['beforeSend']>> = (event, hint) => {
-  if (event.logger === 'console' && SyncTelemetry.getInstance().shouldIgnoreConsole()) {
+  if (event.logger === 'console' && SyncTelemetry.getInstance()?.shouldIgnoreConsole()) {
     return null
   }