@multiplatform.one/frappe 7.7.6 → 7.10.0

package/dist/cjs/sync/subscriptionManager.cjs

@@ -30,6 +30,7 @@ var import_filters = require("./filters.cjs");
 var import_types = require("./types.cjs");
 var import_virtualPageManager = require("./virtualPageManager.cjs");
 class SubscriptionManager {
+  refreshes = /* @__PURE__ */new Map();
   subscriptions = /* @__PURE__ */new Map();
   virtualPageManager;
   backfillManager;
@@ -82,6 +83,7 @@ class SubscriptionManager {
       cursor,
       checkpoint
     } = await this.fetchInitialRows(query);
+    this.seedRows(query, rows);
     const subscription = {
       id: subscriptionId,
       query,
@@ -96,8 +98,8 @@ class SubscriptionManager {
       subscription.boundaries = {
         firstItem: rows[0],
         lastItem: rows[rows.length - 1],
-        offset: query.limitStart || 0,
-        pageSize: query.limit || 20
+        offset: query.limitStart ?? 0,
+        pageSize: query.limit ?? import_types.defaultPageLength
       };
     }
     subscription.metadata = {
@@ -116,9 +118,89 @@ class SubscriptionManager {
       checkpoint
     };
   }
+  async refreshSubscriptions(options = {}) {
+    const subscriptions = [...this.subscriptions.values()].filter(subscription => (this.subRefCounts.get(subscription.id) ?? 0) > 0 && (!options.doctypes || options.doctypes.includes(subscription.query.doctype)));
+    return Promise.all(subscriptions.map(subscription => this.refreshSubscription(subscription)));
+  }
+  refreshSubscription(subscription) {
+    const subscriptionId = subscription.id;
+    if (subscription.query.progressive) {
+      return Promise.resolve({
+        subscriptionId,
+        ok: false,
+        error: new Error("Snapshot refresh does not support progressive subscriptions")
+      });
+    }
+    const existing = this.refreshes.get(subscriptionId);
+    if (existing) {
+      existing.requested = true;
+      return existing.promise;
+    }
+    const state = {
+      requested: false,
+      promise: Promise.resolve({
+        subscriptionId,
+        ok: false
+      })
+    };
+    const active = () => this.refreshes.get(subscriptionId) === state && this.subscriptions.get(subscriptionId) === subscription && (this.subRefCounts.get(subscriptionId) ?? 0) > 0;
+    state.promise = Promise.resolve().then(async () => {
+      try {
+        while (true) {
+          state.requested = false;
+          try {
+            const {
+              rows,
+              cursor,
+              checkpoint
+            } = await this.fetchInitialRows(subscription.query);
+            if (!active()) {
+              return {
+                subscriptionId,
+                ok: false,
+                error: new Error("Subscription is no longer active")
+              };
+            }
+            if (state.requested) continue;
+            this.seedRows(subscription.query, rows);
+            subscription.docIds = rows.map(row => row.name);
+            subscription.cursor = cursor;
+            subscription.checkpoint = checkpoint;
+            subscription.boundaries = rows.length ? {
+              firstItem: rows[0],
+              lastItem: rows[rows.length - 1],
+              offset: subscription.query.limitStart ?? 0,
+              pageSize: subscription.query.limit ?? import_types.defaultPageLength
+            } : void 0;
+            subscription.metadata = {
+              itemsBeforePage: 0,
+              itemsAfterPage: 0
+            };
+            subscription.stale = false;
+            return {
+              subscriptionId,
+              ok: true
+            };
+          } catch (error) {
+            if (active() && state.requested) continue;
+            if (active()) subscription.stale = true;
+            return {
+              subscriptionId,
+              ok: false,
+              error
+            };
+          }
+        }
+      } finally {
+        if (this.refreshes.get(subscriptionId) === state) this.refreshes.delete(subscriptionId);
+      }
+    });
+    this.refreshes.set(subscriptionId, state);
+    return state.promise;
+  }
   /**
    * Performs the initial subscription fetch (single doc via getDoc, lists via
-   * getDocList), seeds the normalized cache, and computes the CDC checkpoint
+   * getDocList) and computes the CDC checkpoint
    * as the max `modified` across returned rows. Shared by fresh subscribes
    * and adopted-subscription refreshes so both have identical semantics.
    */
@@ -145,10 +227,8 @@ class SubscriptionManager {
         filters: query.filters,
         orderBy: query.orderBy
       };
-      if (query.limit != null) {
-        listOptions.limit = query.limit;
-        if (query.limitStart != null) listOptions.limitStart = query.limitStart;
-      }
+      listOptions.limit = query.limit ?? import_types.defaultPageLength;
+      if (query.limitStart != null) listOptions.limitStart = query.limitStart;
       if (this.options.useCursorPagination) listOptions.cursor = void 0;
       const response = await this.db.getDocList(query.doctype, listOptions);
       if (typeof response === "object" && response !== null && "data" in response) {
@@ -158,10 +238,6 @@ class SubscriptionManager {
         rows = response;
       }
     }
-    for (const row of rows) {
-      if (!row.doctype) row.doctype = query.doctype;
-      this.normalizedCache.upsert(row);
-    }
     let checkpoint = void 0;
     for (const row of rows) {
       if (!row.modified) continue;
@@ -173,6 +249,12 @@ class SubscriptionManager {
       checkpoint
     };
   }
+  seedRows(query, rows) {
+    for (const row of rows) {
+      if (!row.doctype) row.doctype = query.doctype;
+      this.normalizedCache.upsert(row);
+    }
+  }
   /**
    * Re-adopts a subscription restored from a persisted snapshot when an
    * identical query subscribes: the cached membership renders immediately and
@@ -190,7 +272,7 @@ class SubscriptionManager {
     if (!subscription) return void 0;
     this.queryKeyToSubId.set(queryKey, restoredId);
     this.subRefCounts.set(restoredId, 1);
-    const refresh = this.refreshAdoptedSubscription(subscription);
+    const refresh = this.refreshSubscription(subscription);
     const rows = this.getDocsForSubscription(restoredId);
     return {
       subscriptionId: restoredId,
@@ -199,48 +281,6 @@ class SubscriptionManager {
       refresh
     };
   }
-  /**
-   * Network refresh for an adopted subscription with fresh-subscribe
-   * semantics: an authoritative page fetch replaces membership and recomputes
-   * the checkpoint (identical to what a brand-new subscribe would produce).
-   * On failure (offline) the cached membership and the restored CDC
-   * checkpoint are kept and the subscription is marked stale — the next
-   * backfill trigger drains changes from that checkpoint. Never rejects.
-   */
-  async refreshAdoptedSubscription(subscription) {
-    try {
-      const {
-        rows,
-        cursor,
-        checkpoint
-      } = await this.fetchInitialRows(subscription.query);
-      subscription.checkpoint = checkpoint;
-      subscription.cursor = cursor;
-      subscription.docIds = rows.map(row => row.name);
-      if (rows.length > 0) {
-        subscription.boundaries = {
-          firstItem: rows[0],
-          lastItem: rows[rows.length - 1],
-          offset: subscription.query.limitStart || 0,
-          pageSize: subscription.query.limit || 20
-        };
-      }
-      subscription.metadata = {
-        itemsBeforePage: 0,
-        itemsAfterPage: 0
-      };
-      subscription.stale = false;
-      return {
-        ok: true
-      };
-    } catch (error) {
-      subscription.stale = true;
-      return {
-        ok: false,
-        error
-      };
-    }
-  }
   /**
    * Registers a subscription restored from a persisted snapshot. Restored
    * subscriptions are dormant: they hold the persisted query, CDC checkpoint,
@@ -315,6 +355,7 @@ class SubscriptionManager {
       this.subRefCounts.set(subscriptionId, refCount);
       return;
     }
+    this.refreshes.delete(subscriptionId);
     this.subRefCounts.delete(subscriptionId);
     let queryKey;
     for (const [key, id] of this.queryKeyToSubId) {
@@ -640,6 +681,7 @@ class SubscriptionManager {
     return name1 < name2 ? -1 : name1 > name2 ? 1 : 0;
   }
   clear() {
+    this.refreshes.clear();
     this.subscriptions.clear();
     this.queryKeyToSubId.clear();
     this.subRefCounts.clear();

package/dist/cjs/sync/subscriptionManager.native.js

@@ -75,6 +75,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
   function SubscriptionManager2(db, normalizedCache) {
     var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
     _class_call_check(this, SubscriptionManager2);
+    _define_property(this, "refreshes", /* @__PURE__ */new Map());
     _define_property(this, "subscriptions", /* @__PURE__ */new Map());
     _define_property(this, "virtualPageManager", void 0);
     _define_property(this, "backfillManager", void 0);
@@ -119,6 +120,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
         cursor,
         checkpoint: checkpoint1
       } = await this.fetchInitialRows(query);
+      this.seedRows(query, rows1);
       var subscription = {
         id: subscriptionId,
         query,
@@ -132,11 +134,12 @@ var SubscriptionManager = /* @__PURE__ */function () {
         tombstones: /* @__PURE__ */new Map()
       };
       if (rows1.length > 0) {
+        var _query_limitStart, _query_limit;
         subscription.boundaries = {
           firstItem: rows1[0],
           lastItem: rows1[rows1.length - 1],
-          offset: query.limitStart || 0,
-          pageSize: query.limit || 20
+          offset: (_query_limitStart = query.limitStart) !== null && _query_limitStart !== void 0 ? _query_limitStart : 0,
+          pageSize: (_query_limit = query.limit) !== null && _query_limit !== void 0 ? _query_limit : import_types.defaultPageLength
         };
       }
       subscription.metadata = {
@@ -155,12 +158,110 @@ var SubscriptionManager = /* @__PURE__ */function () {
         checkpoint: checkpoint1
       };
     }
+  }, {
+    key: "refreshSubscriptions",
+    value: async function refreshSubscriptions() {
+      var _this = this;
+      var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+      var subscriptions = [...this.subscriptions.values()].filter(function (subscription) {
+        var _this_subRefCounts_get;
+        return ((_this_subRefCounts_get = _this.subRefCounts.get(subscription.id)) !== null && _this_subRefCounts_get !== void 0 ? _this_subRefCounts_get : 0) > 0 && (!options.doctypes || options.doctypes.includes(subscription.query.doctype));
+      });
+      return Promise.all(subscriptions.map(function (subscription) {
+        return _this.refreshSubscription(subscription);
+      }));
+    }
+  }, {
+    key: "refreshSubscription",
+    value: function refreshSubscription(subscription) {
+      var _this = this;
+      var subscriptionId = subscription.id;
+      if (subscription.query.progressive) {
+        return Promise.resolve({
+          subscriptionId,
+          ok: false,
+          error: new Error("Snapshot refresh does not support progressive subscriptions")
+        });
+      }
+      var existing = this.refreshes.get(subscriptionId);
+      if (existing) {
+        existing.requested = true;
+        return existing.promise;
+      }
+      var state = {
+        requested: false,
+        promise: Promise.resolve({
+          subscriptionId,
+          ok: false
+        })
+      };
+      var active = function active2() {
+        var _this_subRefCounts_get;
+        return _this.refreshes.get(subscriptionId) === state && _this.subscriptions.get(subscriptionId) === subscription && ((_this_subRefCounts_get = _this.subRefCounts.get(subscriptionId)) !== null && _this_subRefCounts_get !== void 0 ? _this_subRefCounts_get : 0) > 0;
+      };
+      state.promise = Promise.resolve().then(async function () {
+        try {
+          while (true) {
+            state.requested = false;
+            try {
+              var _subscription_query_limitStart, _subscription_query_limit;
+              var {
+                rows,
+                cursor,
+                checkpoint
+              } = await _this.fetchInitialRows(subscription.query);
+              if (!active()) {
+                return {
+                  subscriptionId,
+                  ok: false,
+                  error: new Error("Subscription is no longer active")
+                };
+              }
+              if (state.requested) continue;
+              _this.seedRows(subscription.query, rows);
+              subscription.docIds = rows.map(function (row) {
+                return row.name;
+              });
+              subscription.cursor = cursor;
+              subscription.checkpoint = checkpoint;
+              subscription.boundaries = rows.length ? {
+                firstItem: rows[0],
+                lastItem: rows[rows.length - 1],
+                offset: (_subscription_query_limitStart = subscription.query.limitStart) !== null && _subscription_query_limitStart !== void 0 ? _subscription_query_limitStart : 0,
+                pageSize: (_subscription_query_limit = subscription.query.limit) !== null && _subscription_query_limit !== void 0 ? _subscription_query_limit : import_types.defaultPageLength
+              } : void 0;
+              subscription.metadata = {
+                itemsBeforePage: 0,
+                itemsAfterPage: 0
+              };
+              subscription.stale = false;
+              return {
+                subscriptionId,
+                ok: true
+              };
+            } catch (error) {
+              if (active() && state.requested) continue;
+              if (active()) subscription.stale = true;
+              return {
+                subscriptionId,
+                ok: false,
+                error
+              };
+            }
+          }
+        } finally {
+          if (_this.refreshes.get(subscriptionId) === state) _this.refreshes.delete(subscriptionId);
+        }
+      });
+      this.refreshes.set(subscriptionId, state);
+      return state.promise;
+    }
   }, {
     key: "fetchInitialRows",
     value: (
     /**
     * Performs the initial subscription fetch (single doc via getDoc, lists via
-    * getDocList), seeds the normalized cache, and computes the CDC checkpoint
+    * getDocList) and computes the CDC checkpoint
     * as the max `modified` across returned rows. Shared by fresh subscribes
     * and adopted-subscription refreshes so both have identical semantics.
     */
@@ -183,15 +284,14 @@ var SubscriptionManager = /* @__PURE__ */function () {
           }
         }
       } else {
+        var _query_limit;
         var listOptions = {
           fields: queryFields,
           filters: query.filters,
           orderBy: query.orderBy
         };
-        if (query.limit != null) {
-          listOptions.limit = query.limit;
-          if (query.limitStart != null) listOptions.limitStart = query.limitStart;
-        }
+        listOptions.limit = (_query_limit = query.limit) !== null && _query_limit !== void 0 ? _query_limit : import_types.defaultPageLength;
+        if (query.limitStart != null) listOptions.limitStart = query.limitStart;
         if (this.options.useCursorPagination) listOptions.cursor = void 0;
         var response = await this.db.getDocList(query.doctype, listOptions);
         if ((typeof response === "undefined" ? "undefined" : _type_of(response)) === "object" && response !== null && "data" in response) {
@@ -201,14 +301,15 @@ var SubscriptionManager = /* @__PURE__ */function () {
           rows = response;
         }
       }
+      var checkpoint = void 0;
       var _iteratorNormalCompletion = true,
         _didIteratorError = false,
         _iteratorError = void 0;
       try {
         for (var _iterator = rows[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
           var row = _step.value;
-          if (!row.doctype) row.doctype = query.doctype;
-          this.normalizedCache.upsert(row);
+          if (!row.modified) continue;
+          if (!checkpoint || row.modified > checkpoint) checkpoint = row.modified;
         }
       } catch (err) {
         _didIteratorError = true;
@@ -224,36 +325,39 @@ var SubscriptionManager = /* @__PURE__ */function () {
           }
         }
       }
-      var checkpoint = void 0;
-      var _iteratorNormalCompletion1 = true,
-        _didIteratorError1 = false,
-        _iteratorError1 = void 0;
+      return {
+        rows,
+        cursor,
+        checkpoint
+      };
+    })
+  }, {
+    key: "seedRows",
+    value: function seedRows(query, rows) {
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
       try {
-        for (var _iterator1 = rows[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-          var row1 = _step1.value;
-          if (!row1.modified) continue;
-          if (!checkpoint || row1.modified > checkpoint) checkpoint = row1.modified;
+        for (var _iterator = rows[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var row = _step.value;
+          if (!row.doctype) row.doctype = query.doctype;
+          this.normalizedCache.upsert(row);
         }
       } catch (err) {
-        _didIteratorError1 = true;
-        _iteratorError1 = err;
+        _didIteratorError = true;
+        _iteratorError = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-            _iterator1.return();
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
           }
         } finally {
-          if (_didIteratorError1) {
-            throw _iteratorError1;
+          if (_didIteratorError) {
+            throw _iteratorError;
           }
         }
       }
-      return {
-        rows,
-        cursor,
-        checkpoint
-      };
-    })
+    }
   }, {
     key: "adoptRestoredSubscription",
     value: (
@@ -274,7 +378,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
       if (!subscription) return void 0;
       this.queryKeyToSubId.set(queryKey, restoredId);
       this.subRefCounts.set(restoredId, 1);
-      var refresh = this.refreshAdoptedSubscription(subscription);
+      var refresh = this.refreshSubscription(subscription);
       var rows = this.getDocsForSubscription(restoredId);
       return {
         subscriptionId: restoredId,
@@ -283,53 +387,6 @@ var SubscriptionManager = /* @__PURE__ */function () {
         refresh
       };
     })
-  }, {
-    key: "refreshAdoptedSubscription",
-    value: (
-    /**
-    * Network refresh for an adopted subscription with fresh-subscribe
-    * semantics: an authoritative page fetch replaces membership and recomputes
-    * the checkpoint (identical to what a brand-new subscribe would produce).
-    * On failure (offline) the cached membership and the restored CDC
-    * checkpoint are kept and the subscription is marked stale — the next
-    * backfill trigger drains changes from that checkpoint. Never rejects.
-    */
-    async function refreshAdoptedSubscription(subscription) {
-      try {
-        var {
-          rows,
-          cursor,
-          checkpoint
-        } = await this.fetchInitialRows(subscription.query);
-        subscription.checkpoint = checkpoint;
-        subscription.cursor = cursor;
-        subscription.docIds = rows.map(function (row) {
-          return row.name;
-        });
-        if (rows.length > 0) {
-          subscription.boundaries = {
-            firstItem: rows[0],
-            lastItem: rows[rows.length - 1],
-            offset: subscription.query.limitStart || 0,
-            pageSize: subscription.query.limit || 20
-          };
-        }
-        subscription.metadata = {
-          itemsBeforePage: 0,
-          itemsAfterPage: 0
-        };
-        subscription.stale = false;
-        return {
-          ok: true
-        };
-      } catch (error) {
-        subscription.stale = true;
-        return {
-          ok: false,
-          error
-        };
-      }
-    })
   }, {
     /**
     * Registers a subscription restored from a persisted snapshot. Restored
@@ -453,6 +510,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
         this.subRefCounts.set(subscriptionId, refCount);
         return;
       }
+      this.refreshes.delete(subscriptionId);
       this.subRefCounts.delete(subscriptionId);
       var queryKey;
       var _iteratorNormalCompletion = true,
@@ -1083,6 +1141,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
   }, {
     key: "clear",
     value: function clear() {
+      this.refreshes.clear();
       this.subscriptions.clear();
       this.queryKeyToSubId.clear();
       this.subRefCounts.clear();