@multiplatform.one/frappe 6.1.0 → 6.3.0

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

@@ -75,31 +75,30 @@ 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, "subscriptions", /* @__PURE__ */new Map());
+    _define_property(this, "virtualPageManager", void 0);
+    _define_property(this, "backfillManager", void 0);
+    _define_property(this, "queryKeyToSubId", /* @__PURE__ */new Map());
+    _define_property(this, "subRefCounts", /* @__PURE__ */new Map());
+    _define_property(this, "restoredByQueryKey", /* @__PURE__ */new Map());
+    _define_property(this, "restoredAt", /* @__PURE__ */new Map());
     _define_property(this, "db", void 0);
     _define_property(this, "normalizedCache", void 0);
     _define_property(this, "options", void 0);
-    _define_property(this, "subscriptions", void 0);
-    _define_property(this, "virtualPageManager", void 0);
-    _define_property(this, "backfillManager", void 0);
-    _define_property(this, "queryKeyToSubId", void 0);
-    _define_property(this, "subRefCounts", void 0);
     this.db = db;
     this.normalizedCache = normalizedCache;
     this.options = options;
-    this.subscriptions = /* @__PURE__ */new Map();
-    this.queryKeyToSubId = /* @__PURE__ */new Map();
-    this.subRefCounts = /* @__PURE__ */new Map();
     this.virtualPageManager = new import_virtualPageManager.VirtualPageManager(this.normalizedCache, this.db, {
       batchSize: this.options.batchSize
     });
     this.backfillManager = new import_backfill.BackfillManager(this.db, this.normalizedCache, {
-      pageSize: this.options.pageSize
+      pageSize: this.options.pageSize,
+      maxPages: this.options.backfillMaxPages
     });
   }
   _create_class(SubscriptionManager2, [{
     key: "subscribe",
     value: async function subscribe(query) {
-      var _query_fields;
       var queryKey = JSON.stringify(query);
       var existingId = this.queryKeyToSubId.get(queryKey);
       if (existingId && this.subscriptions.has(existingId)) {
@@ -112,19 +111,73 @@ var SubscriptionManager = /* @__PURE__ */function () {
           checkpoint
         };
       }
+      var adopted = this.adoptRestoredSubscription(queryKey, query);
+      if (adopted) return adopted;
       var subscriptionId = cryptoRandomId();
+      var {
+        rows: rows1,
+        cursor,
+        checkpoint: checkpoint1
+      } = await this.fetchInitialRows(query);
+      var subscription = {
+        id: subscriptionId,
+        query,
+        checkpoint: checkpoint1,
+        // For CDC backfill
+        cursor,
+        // For stable pagination
+        docIds: rows1.map(function (row) {
+          return row.name;
+        }),
+        tombstones: /* @__PURE__ */new Map()
+      };
+      if (rows1.length > 0) {
+        subscription.boundaries = {
+          firstItem: rows1[0],
+          lastItem: rows1[rows1.length - 1],
+          offset: query.limitStart || 0,
+          pageSize: query.limit || 20
+        };
+      }
+      subscription.metadata = {
+        itemsBeforePage: 0,
+        itemsAfterPage: 0
+      };
+      this.subscriptions.set(subscriptionId, subscription);
+      this.queryKeyToSubId.set(queryKey, subscriptionId);
+      this.subRefCounts.set(subscriptionId, 1);
+      if (query.progressive) {
+        this.virtualPageManager.registerSubscription(subscriptionId, subscription, subscription.docIds, cursor);
+      }
+      return {
+        subscriptionId,
+        rows: rows1,
+        checkpoint: checkpoint1
+      };
+    }
+  }, {
+    key: "fetchInitialRows",
+    value: (
+    /**
+    * Performs the initial subscription fetch (single doc via getDoc, lists via
+    * getDocList), seeds the normalized cache, 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.
+    */
+    async function fetchInitialRows(query) {
+      var _query_fields;
       var queryFields = ((_query_fields = query.fields) === null || _query_fields === void 0 ? void 0 : _query_fields.length) ? Array.from(/* @__PURE__ */new Set([...query.fields, "modified", "name"])) : void 0;
-      var rows1 = [];
+      var rows = [];
       var cursor;
       var singleName = (0, import_filters.extractSingleName)(query.filters);
       if (singleName) {
         try {
           var document = await this.db.getDoc(query.doctype, singleName);
-          rows1 = document ? [document] : [];
+          rows = document ? [document] : [];
         } catch (error) {
           var errorWithStatus = error;
           if ((errorWithStatus === null || errorWithStatus === void 0 ? void 0 : errorWithStatus.status) === 404) {
-            rows1 = [];
+            rows = [];
           } else {
             throw error;
           }
@@ -138,17 +191,17 @@ var SubscriptionManager = /* @__PURE__ */function () {
         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) {
-          rows1 = response.data;
+          rows = response.data;
           cursor = response.cursor;
         } else {
-          rows1 = response;
+          rows = response;
         }
       }
       var _iteratorNormalCompletion = true,
         _didIteratorError = false,
         _iteratorError = void 0;
       try {
-        for (var _iterator = rows1[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        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);
@@ -167,15 +220,15 @@ var SubscriptionManager = /* @__PURE__ */function () {
           }
         }
       }
-      var checkpoint1 = void 0;
+      var checkpoint = void 0;
       var _iteratorNormalCompletion1 = true,
         _didIteratorError1 = false,
         _iteratorError1 = void 0;
       try {
-        for (var _iterator1 = rows1[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+        for (var _iterator1 = rows[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
           var row1 = _step1.value;
           if (!row1.modified) continue;
-          if (!checkpoint1 || row1.modified > checkpoint1) checkpoint1 = row1.modified;
+          if (!checkpoint || row1.modified > checkpoint) checkpoint = row1.modified;
         }
       } catch (err) {
         _didIteratorError1 = true;
@@ -191,47 +244,203 @@ var SubscriptionManager = /* @__PURE__ */function () {
           }
         }
       }
-      var subscription = {
-        id: subscriptionId,
-        query,
-        checkpoint: checkpoint1,
-        // For CDC backfill
+      return {
+        rows,
         cursor,
-        // For stable pagination
-        docIds: rows1.map(function (row2) {
-          return row2.name;
-        }),
-        tombstones: /* @__PURE__ */new Map()
+        checkpoint
       };
-      if (rows1.length > 0) {
-        subscription.boundaries = {
-          firstItem: rows1[0],
-          lastItem: rows1[rows1.length - 1],
-          offset: query.limitStart || 0,
-          pageSize: query.limit || 20
+    })
+  }, {
+    key: "adoptRestoredSubscription",
+    value: (
+    /**
+    * Re-adopts a subscription restored from a persisted snapshot when an
+    * identical query subscribes: the cached membership renders immediately and
+    * a background refresh re-seeds from the network. Progressive queries are
+    * excluded — their VirtualPageManager state is not persisted, so they take
+    * the fresh-subscribe path.
+    */
+    function adoptRestoredSubscription(queryKey, query) {
+      if (query.progressive) return void 0;
+      var restoredId = this.restoredByQueryKey.get(queryKey);
+      if (!restoredId) return void 0;
+      var subscription = this.subscriptions.get(restoredId);
+      this.restoredByQueryKey.delete(queryKey);
+      this.restoredAt.delete(restoredId);
+      if (!subscription) return void 0;
+      this.queryKeyToSubId.set(queryKey, restoredId);
+      this.subRefCounts.set(restoredId, 1);
+      var refresh = this.refreshAdoptedSubscription(subscription);
+      var rows = this.getDocsForSubscription(restoredId);
+      return {
+        subscriptionId: restoredId,
+        rows,
+        checkpoint: subscription.checkpoint,
+        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
         };
       }
-      subscription.metadata = {
-        itemsBeforePage: 0,
-        itemsAfterPage: 0
-      };
-      this.subscriptions.set(subscriptionId, subscription);
-      this.queryKeyToSubId.set(queryKey, subscriptionId);
-      this.subRefCounts.set(subscriptionId, 1);
-      if (query.progressive) {
-        this.virtualPageManager.registerSubscription(subscriptionId, subscription, subscription.docIds, cursor);
+    })
+  }, {
+    /**
+    * Registers a subscription restored from a persisted snapshot. Restored
+    * subscriptions are dormant: they hold the persisted query, CDC checkpoint,
+    * and membership for cache-first re-adoption, but are skipped by backfill
+    * fan-out until adopted. Duplicate snapshot entries for the same query
+    * (accumulated by pre-GC versions) collapse last-wins.
+    */
+    key: "restoreSubscription",
+    value: function restoreSubscription(snapshotSub) {
+      var _snapshotSub_query;
+      if (!(snapshotSub === null || snapshotSub === void 0 ? void 0 : snapshotSub.id) || !((_snapshotSub_query = snapshotSub.query) === null || _snapshotSub_query === void 0 ? void 0 : _snapshotSub_query.doctype)) return;
+      if (this.subscriptions.has(snapshotSub.id)) return;
+      var queryKey = JSON.stringify(snapshotSub.query);
+      var activeId = this.queryKeyToSubId.get(queryKey);
+      if (activeId && this.subscriptions.has(activeId)) return;
+      var previousId = this.restoredByQueryKey.get(queryKey);
+      if (previousId) {
+        this.subscriptions.delete(previousId);
+        this.restoredAt.delete(previousId);
       }
-      return {
-        subscriptionId,
-        rows: rows1,
-        checkpoint: checkpoint1
+      var subscription = {
+        id: snapshotSub.id,
+        query: snapshotSub.query,
+        checkpoint: snapshotSub.checkpoint,
+        cursor: snapshotSub.cursor,
+        docIds: Array.isArray(snapshotSub.docIds) ? snapshotSub.docIds : [],
+        tombstones: /* @__PURE__ */new Map(),
+        metadata: {
+          itemsBeforePage: 0,
+          itemsAfterPage: 0
+        }
       };
+      this.subscriptions.set(subscription.id, subscription);
+      this.restoredByQueryKey.set(queryKey, subscription.id);
+      this.restoredAt.set(subscription.id, Date.now());
+    }
+  }, {
+    /** True when the subscription came from a snapshot and is not yet adopted. */
+    key: "isRestoredSubscription",
+    value: function isRestoredSubscription(subscriptionId) {
+      return this.restoredAt.has(subscriptionId);
+    }
+  }, {
+    /**
+    * Drops restored subscriptions that no query re-adopted within
+    * `restoredSubscriptionTTL` (default 30 minutes). Called before every
+    * persistence snapshot so expired entries also leave the snapshot.
+    */
+    key: "gcRestoredSubscriptions",
+    value: function gcRestoredSubscriptions() {
+      var now = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : Date.now();
+      var _this_options_restoredSubscriptionTTL;
+      var ttl = (_this_options_restoredSubscriptionTTL = this.options.restoredSubscriptionTTL) !== null && _this_options_restoredSubscriptionTTL !== void 0 ? _this_options_restoredSubscriptionTTL : 30 * 60 * 1e3;
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = this.restoredAt[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var [subscriptionId, restoredAtMs] = _step.value;
+          if (now - restoredAtMs <= ttl) continue;
+          this.restoredAt.delete(subscriptionId);
+          this.subscriptions.delete(subscriptionId);
+          var _iteratorNormalCompletion1 = true,
+            _didIteratorError1 = false,
+            _iteratorError1 = void 0;
+          try {
+            for (var _iterator1 = this.restoredByQueryKey[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+              var [key, id] = _step1.value;
+              if (id === subscriptionId) {
+                this.restoredByQueryKey.delete(key);
+                break;
+              }
+            }
+          } catch (err) {
+            _didIteratorError1 = true;
+            _iteratorError1 = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                _iterator1.return();
+              }
+            } finally {
+              if (_didIteratorError1) {
+                throw _iteratorError1;
+              }
+            }
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
     }
   }, {
     /**
     * Removes a subscription by id. Cached docs remain until evicted by
     * realtime/backfill or explicit resets. This keeps other subs fast if they
     * share the same doctypes.
+    *
+    * With persistence enabled (`persistKey`), the released subscription is
+    * detached into the restored pool instead of deleted: its query,
+    * checkpoint, and membership stay in the snapshot so a remount (or a
+    * cold offline reload) can re-adopt it cache-first. Detached subscriptions
+    * are excluded from backfill and GC'd after `restoredSubscriptionTTL`.
     */
     key: "unsubscribe",
     value: function unsubscribe(subscriptionId) {
@@ -241,6 +450,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
         return;
       }
       this.subRefCounts.delete(subscriptionId);
+      var queryKey;
       var _iteratorNormalCompletion = true,
         _didIteratorError = false,
         _iteratorError = void 0;
@@ -248,6 +458,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
         for (var _iterator = this.queryKeyToSubId[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
           var [key, id] = _step.value;
           if (id === subscriptionId) {
+            queryKey = key;
             this.queryKeyToSubId.delete(key);
             break;
           }
@@ -266,6 +477,12 @@ var SubscriptionManager = /* @__PURE__ */function () {
           }
         }
       }
+      var subscription = this.subscriptions.get(subscriptionId);
+      if (this.options.persistKey && subscription && queryKey && !subscription.query.progressive && !this.restoredByQueryKey.has(queryKey)) {
+        this.restoredByQueryKey.set(queryKey, subscriptionId);
+        this.restoredAt.set(subscriptionId, Date.now());
+        return;
+      }
       this.subscriptions.delete(subscriptionId);
     }
   }, {
@@ -392,6 +609,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
         try {
           for (var _iterator = this.subscriptions.values()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
             var subscription = _step.value;
+            if (this.restoredAt.has(subscription.id)) continue;
             await this.backfillSub(subscription, args.pageSize);
           }
         } catch (err) {
@@ -444,6 +662,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
         try {
           for (var _iterator2 = this.subscriptions.values()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
             var subscription2 = _step2.value;
+            if (this.restoredAt.has(subscription2.id)) continue;
             if (set.has(subscription2.query.doctype)) await this.backfillSub(subscription2, args.pageSize);
           }
         } catch (err) {
@@ -495,7 +714,9 @@ var SubscriptionManager = /* @__PURE__ */function () {
     * Backfills one subscription using CDC checkpoint and updates membership.
     *
     * Algorithm
-    * - Query backfill using checkpoint for CDC (Change Data Capture)
+    * - Query backfill using checkpoint for CDC (Change Data Capture),
+    *   draining follow-up pages while the server reports has_more (bounded)
+    *   so reconnect catch-up is complete rather than one page deep
     * - Upsert each row to cache
     * - For each row: test client-side filters; add/remove membership accordingly
     * - Track tombstones for deleted documents
@@ -504,48 +725,61 @@ var SubscriptionManager = /* @__PURE__ */function () {
     */
     async function backfillSub(subscription) {
       var pageSize = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : (_this_options_pageSize = this.options.pageSize) !== null && _this_options_pageSize !== void 0 ? _this_options_pageSize : 200;
-      var response = await this.db.backfill({
-        doctype: subscription.query.doctype,
-        fields: subscription.query.fields,
-        filters: subscription.query.filters,
-        modifiedAfter: subscription.checkpoint,
-        // CDC checkpoint
-        limit: pageSize
-      });
-      if (response.deleted && Array.isArray(response.deleted)) {
-        var _iteratorNormalCompletion = true,
-          _didIteratorError = false,
-          _iteratorError = void 0;
+      var _this_options_backfillMaxPages;
+      var maxPages = (_this_options_backfillMaxPages = this.options.backfillMaxPages) !== null && _this_options_backfillMaxPages !== void 0 ? _this_options_backfillMaxPages : 20;
+      var rows = [];
+      var deleted = [];
+      for (var page = 0; page < maxPages; page++) {
+        var _ref;
+        var _response_deleted;
+        var response = await this.db.backfill({
+          doctype: subscription.query.doctype,
+          fields: subscription.query.fields,
+          filters: subscription.query.filters,
+          modifiedAfter: subscription.checkpoint,
+          // CDC checkpoint
+          limit: pageSize
+        });
+        if (Array.isArray(response.deleted)) {
+          deleted.push(...response.deleted);
+        }
+        rows.push(...response.rows);
+        if (response.checkpoint) subscription.checkpoint = response.checkpoint;
+        var madeProgress = response.rows.length > 0 || ((_ref = (_response_deleted = response.deleted) === null || _response_deleted === void 0 ? void 0 : _response_deleted.length) !== null && _ref !== void 0 ? _ref : 0) > 0;
+        if (!response.has_more || !response.checkpoint || !madeProgress) break;
+      }
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
+      try {
+        var _this,
+          _loop = function () {
+            var deletedRef = _step.value;
+            if (!(deletedRef === null || deletedRef === void 0 ? void 0 : deletedRef.name)) return "continue";
+            var deletedDoctype = deletedRef.doctype || subscription.query.doctype;
+            if (deletedDoctype === subscription.query.doctype && subscription.tombstones) {
+              subscription.tombstones.set(deletedRef.name, Date.now());
+            }
+            _this.normalizedCache.remove({
+              doctype: deletedDoctype,
+              name: deletedRef.name
+            });
+            if (deletedDoctype === subscription.query.doctype) subscription.docIds = subscription.docIds.filter(function (currentName) {
+              return currentName !== deletedRef.name;
+            });
+          };
+        for (var _iterator = deleted[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _this = this, _loop();
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
         try {
-          var _this,
-            _loop = function () {
-              var deleted = _step.value;
-              if (!(deleted === null || deleted === void 0 ? void 0 : deleted.name)) return "continue";
-              var deletedDoctype = deleted.doctype || subscription.query.doctype;
-              if (deletedDoctype === subscription.query.doctype && subscription.tombstones) {
-                subscription.tombstones.set(deleted.name, Date.now());
-              }
-              _this.normalizedCache.remove({
-                doctype: deletedDoctype,
-                name: deleted.name
-              });
-              if (deletedDoctype === subscription.query.doctype) subscription.docIds = subscription.docIds.filter(function (currentName) {
-                return currentName !== deleted.name;
-              });
-            };
-          for (var _iterator = response.deleted[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _this = this, _loop();
-        } catch (err) {
-          _didIteratorError = true;
-          _iteratorError = err;
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
         } finally {
-          try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-              _iterator.return();
-            }
-          } finally {
-            if (_didIteratorError) {
-              throw _iteratorError;
-            }
+          if (_didIteratorError) {
+            throw _iteratorError;
           }
         }
       }
@@ -566,7 +800,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
               return currentName !== name;
             });
           };
-        for (var _iterator1 = response.rows[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) _this1 = this, _loop1();
+        for (var _iterator1 = rows[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) _this1 = this, _loop1();
       } catch (err) {
         _didIteratorError1 = true;
         _iteratorError1 = err;
@@ -581,8 +815,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
           }
         }
       }
-      if (response.checkpoint) subscription.checkpoint = response.checkpoint;
-      if (response.rows.length && !subscription.query.filters) subscription.docIds = response.rows.map(function (row) {
+      if (rows.length && !subscription.query.filters) subscription.docIds = rows.map(function (row) {
         return row.name;
       });
       if (subscription.docIds.length > 0) {
@@ -606,9 +839,10 @@ var SubscriptionManager = /* @__PURE__ */function () {
       }
       this.resortSubscriptionDocIds(subscription);
       this.cleanupTombstones(subscription.id);
+      subscription.stale = false;
       if (this.options.onBackfill) this.options.onBackfill({
         doctype: subscription.query.doctype,
-        fetched: response.rows.length,
+        fetched: rows.length,
         checkpoint: subscription.checkpoint
       });
     })
@@ -677,6 +911,7 @@ var SubscriptionManager = /* @__PURE__ */function () {
       try {
         for (var _iterator = this.subscriptions.values()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
           var subscription = _step.value;
+          if (this.restoredAt.has(subscription.id)) continue;
           if (subscription.query.doctype !== doc.doctype) continue;
           var match = (0, import_filters.matchesFilters)(doc, subscription.query.filters);
           var isExisting = subscription.docIds.includes(doc.name);
@@ -847,6 +1082,8 @@ var SubscriptionManager = /* @__PURE__ */function () {
       this.subscriptions.clear();
       this.queryKeyToSubId.clear();
       this.subRefCounts.clear();
+      this.restoredByQueryKey.clear();
+      this.restoredAt.clear();
     }
   }, {
     /**