musora-content-services 2.125.0 → 2.126.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.126.0](https://github.com/railroadmedia/musora-content-services/compare/v2.125.0...v2.126.0) (2026-01-29)
+
+
+### Features
+
+* adds sync store push blocking ([#754](https://github.com/railroadmedia/musora-content-services/issues/754)) ([e9a7c23](https://github.com/railroadmedia/musora-content-services/commit/e9a7c23c91f5e707c08c4e0765af52213ba6263b))
+* melon push failure notifs ([#753](https://github.com/railroadmedia/musora-content-services/issues/753)) ([cce60ad](https://github.com/railroadmedia/musora-content-services/commit/cce60ad3e618106473fd0c7da141aebaced835d5))
+
 ## [2.125.0](https://github.com/railroadmedia/musora-content-services/compare/v2.122.7...v2.125.0) (2026-01-29)
 
 

package/package.json

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

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

@@ -4,3 +4,4 @@ import type SyncStore from "../store"
 export type SyncEffect = (context: SyncContext, stores: SyncStore[]) => () => void
 
 export { default as createLogoutWarningEffect } from './logout-warning'
+export { default as createPushFailureNotificationEffect } from './push-failure-notification'

package/src/services/sync/effects/push-failure-notification.ts

@@ -0,0 +1,34 @@
+import { type SyncEffect } from '.'
+
+const NOTIFICATION_COOLDOWN = 60_000 * 10 // 10 mins
+const MUTE_PERIOD = 60_000 * 60 * 3 // 3 hours
+
+const createPushFailureNotificationEffect = (notifyCallback: (opts: { mute: () => void }) => void) => {
+  let lastNotifiedAt = 0
+  let mutedUntil = 0
+
+  const mute = () => {
+    mutedUntil = Date.now() + MUTE_PERIOD
+  }
+
+  const pushFailureToast: SyncEffect = function (_context, stores) {
+    const maybeNotify = () => {
+      const now = Date.now()
+      if (now - lastNotifiedAt < NOTIFICATION_COOLDOWN) return
+      if (mutedUntil && now < mutedUntil) return
+
+      lastNotifiedAt = now
+      notifyCallback({ mute })
+    }
+
+    const teardowns = stores.map((store) => store.on('failedPush', maybeNotify))
+
+    return () => {
+      teardowns.forEach((teardown) => teardown())
+    }
+  }
+
+  return pushFailureToast
+}
+
+export default createPushFailureNotificationEffect

package/src/services/sync/fetch.ts

@@ -4,7 +4,27 @@ import { EpochMs } from "."
 import { globalConfig } from '../config.js'
 import { RecordId } from "@nozbe/watermelondb"
 import BaseModel from "./models/Base"
-import { BaseSessionProvider } from "./context/providers"
+import SyncContext from "./context"
+import { SyncTelemetry } from "./telemetry"
+
+export type BlockingState = {
+  enabled: boolean
+}
+export type SyncPull = (
+  tableName: string,
+  intendedUserId: number,
+  context: SyncContext,
+  signal: AbortSignal,
+  previousFetchToken: SyncToken | null
+) => Promise<SyncPullResponse>
+export type SyncPush = (
+  tableName: string,
+  intendedUserId: number,
+  context: SyncContext,
+  payload: PushPayload,
+  signal: AbortSignal,
+  blockingState: BlockingState
+) => Promise<SyncPushResponse>
 
 interface RawPullResponse {
   meta: {
@@ -23,7 +43,7 @@ interface RawPushResponse {
 }
 
 export type SyncResponse = SyncPushResponse | SyncPullResponse
-export type SyncPushResponse = SyncPushSuccessResponse | SyncPushFetchFailureResponse | SyncPushFailureResponse
+export type SyncPushResponse = SyncPushSuccessResponse | SyncPushFetchFailureResponse | SyncPushAbortResponse | SyncPushBlockedResponse | SyncPushFailureResponse
 
 type SyncPushSuccessResponse = SyncResponseBase & {
   ok: true
@@ -34,6 +54,15 @@ type SyncPushFetchFailureResponse = SyncResponseBase & {
   failureType: 'fetch'
   isRetryable: boolean
 }
+type SyncPushAbortResponse = SyncResponseBase & {
+  ok: false,
+  failureType: 'abort'
+}
+type SyncPushBlockedResponse = SyncResponseBase & {
+  ok: false,
+  failureType: 'blocked'
+  isRetryable: boolean
+}
 type SyncPushFailureResponse = SyncResponseBase & {
   ok: false,
   failureType: 'error'
@@ -63,7 +92,7 @@ interface SyncStorePushResultBase {
   type: 'success' | 'failure'
 }
 
-export type SyncPullResponse = SyncPullSuccessResponse | SyncPullFailureResponse | SyncPullFetchFailureResponse
+export type SyncPullResponse = SyncPullSuccessResponse | SyncPullFailureResponse | SyncPullAbortResponse | SyncPullFetchFailureResponse
 
 type SyncPullSuccessResponse = SyncResponseBase & {
   ok: true
@@ -82,6 +111,10 @@ type SyncPullFailureResponse = SyncResponseBase & {
   failureType: 'error'
   originalError: Error
 }
+type SyncPullAbortResponse = SyncResponseBase & {
+  ok: false,
+  failureType: 'abort'
+}
 export interface SyncResponseBase {
   ok: boolean
 }
@@ -118,8 +151,8 @@ interface ServerPushPayload {
   }[]
 }
 
-export function makeFetchRequest(input: RequestInfo, init?: RequestInit): (userId: number, session: BaseSessionProvider) => Request {
-  return (userId, session) => new Request(globalConfig.baseUrl + input, {
+export function makeFetchRequest(input: RequestInfo, init?: RequestInit): (userId: number, context: SyncContext) => Request {
+  return (userId, context) => new Request(globalConfig.baseUrl + input, {
     ...init,
     headers: {
       ...init?.headers,
@@ -127,18 +160,18 @@ export function makeFetchRequest(input: RequestInfo, init?: RequestInit): (userI
         'Authorization': `Bearer ${globalConfig.sessionConfig.token}`
       } : {},
       'Content-Type': 'application/json',
-      'X-Sync-Client-Id': session.getClientId(),
-      ...(session.getSessionId() ? {
-        'X-Sync-Client-Session-Id': session.getSessionId()!
+      'X-Sync-Client-Id': context.session.getClientId(),
+      ...(context.session.getSessionId() ? {
+        'X-Sync-Client-Session-Id': context.session.getSessionId()!
       } : {}),
       'X-Sync-Intended-User-Id': userId.toString()
     }
   })
 }
 
-export function handlePull(callback: (userId: number, session: BaseSessionProvider) => Request) {
-  return async function(userId: number, session: BaseSessionProvider, lastFetchToken: SyncToken | null, signal?: AbortSignal): Promise<SyncPullResponse> {
-    const generatedRequest = callback(userId, session)
+export function handlePull(callback: (userId: number, context: SyncContext) => Request): SyncPull {
+  return async function(_tableName, userId, context, signal, lastFetchToken) {
+    const generatedRequest = callback(userId, context)
     const url = serializePullUrlQuery(generatedRequest.url, lastFetchToken)
     const request = new Request(url, {
       credentials: 'include',
@@ -150,6 +183,19 @@ export function handlePull(callback: (userId: number, session: BaseSessionProvid
     try {
       response = await fetch(request)
     } catch (e) {
+      if (e.name === 'AbortError') {
+        return {
+          ok: false,
+          failureType: 'abort'
+        }
+      } else if (e instanceof TypeError) {
+        return {
+          ok: false,
+          failureType: 'fetch',
+          isRetryable: context.connectivity.getValue() !== false
+        }
+      }
+
       return {
         ok: false,
         failureType: 'error',
@@ -190,9 +236,9 @@ export function handlePull(callback: (userId: number, session: BaseSessionProvid
   }
 }
 
-export function handlePush(callback: (userId: number, session: BaseSessionProvider) => Request) {
-  return async function(userId: number, session: BaseSessionProvider, payload: PushPayload, signal?: AbortSignal): Promise<SyncPushResponse> {
-    const generatedRequest = callback(userId, session)
+export function handlePush(callback: (userId: number, context: SyncContext) => Request): SyncPush {
+  return async function(tableName, userId, context, payload, signal, blockingState) {
+    const generatedRequest = callback(userId, context)
     const serverPayload = serializePushPayload(payload)
     const request = new Request(generatedRequest, {
       credentials: 'include',
@@ -200,10 +246,33 @@ export function handlePush(callback: (userId: number, session: BaseSessionProvid
       signal
     })
 
+    if (blockingState.enabled) {
+      SyncTelemetry.getInstance().debug(`[sync:${tableName}] Push blocked`)
+      await new Promise(resolve => setTimeout(resolve, Math.random() * 1000 + 30))
+      return {
+        ok: false,
+        failureType: 'blocked',
+        isRetryable: true
+      }
+    }
+
     let response: Response | null = null
     try {
       response = await fetch(request)
     } catch (e) {
+      if (e.name === 'AbortError') {
+        return {
+          ok: false,
+          failureType: 'abort'
+        }
+      } else if (e instanceof TypeError) {
+        return {
+          ok: false,
+          failureType: 'fetch',
+          isRetryable: context.connectivity.getValue() !== false
+        }
+      }
+
       return {
         ok: false,
         failureType: 'error',

package/src/services/sync/manager.ts

@@ -275,6 +275,10 @@ export default class SyncManager {
     return store as unknown as SyncStore<TModel>
   }
 
+  getAllStores() {
+    return this.storesRegistry
+  }
+
   getTelemetry() {
     return this.telemetry
   }

package/src/services/sync/retry.ts

@@ -11,7 +11,7 @@ export default class SyncRetry {
   private backoffUntil = 0
   private failureCount = 0
 
-  private unsubscribeConnectivity: () => void
+  private unsubscribeConnectivity: (() => void) | null = null
 
   constructor(private readonly context: SyncContext, private readonly telemetry: SyncTelemetry) {}
 
@@ -26,13 +26,18 @@ export default class SyncRetry {
 
   stop() {
     this.unsubscribeConnectivity?.()
+    this.unsubscribeConnectivity = null
   }
 
   /**
    * Runs the given syncFn with automatic retries.
    * Returns the first successful result or the last failed result after retries.
    */
-  async request<T extends SyncResponse>(spanOpts: StartSpanOptions, syncFn: (span: Span) => Promise<T>) {
+  async request<T extends SyncResponse>(
+    spanOpts: StartSpanOptions,
+    syncFn: (span: Span) => Promise<T>,
+    options: { onFail?: () => void } = {}
+  ) {
     let attempt = 0
 
     while (true) {
@@ -64,9 +69,12 @@ export default class SyncRetry {
         this.resetBackoff()
         return result
       } else {
-        if (result.failureType === 'fetch' && result.isRetryable) {
+        if ('isRetryable' in result && result.isRetryable) {
           this.scheduleBackoff()
-          if (attempt >= this.MAX_ATTEMPTS) return result
+          if (attempt >= this.MAX_ATTEMPTS) {
+            options.onFail?.()
+            return result
+          }
         } else {
           return result
         }