@dabble/patches 0.7.8 → 0.7.9

package/dist/net/PatchesSync.d.ts

@@ -5,9 +5,9 @@ import { JSONRPCClient } from './protocol/JSONRPCClient.js';
 import { PatchesWebSocket } from './websocket/PatchesWebSocket.js';
 import { WebSocketOptions } from './websocket/WebSocketTransport.js';
 import { SizeCalculator } from '../algorithms/ot/shared/changeBatching.js';
+import { ClientAlgorithm } from '../client/ClientAlgorithm.js';
 import { Patches } from '../client/Patches.js';
 import { AlgorithmName } from '../client/PatchesStore.js';
-import { ClientAlgorithm } from '../client/ClientAlgorithm.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';
@@ -142,6 +142,16 @@ declare class PatchesSync {
      * Cleans up local state and notifies the application with any pending changes that were lost.
      */
     protected _handleRemoteDocDeleted(docId: string): Promise<void>;
+    /**
+     * Applies the subscribeFilter option to a list of doc IDs, returning the subset
+     * that should be sent to ws.subscribe/unsubscribe. Returns the full list if no filter is set.
+     */
+    protected _filterSubscribeIds(docIds: string[]): string[];
+    /**
+     * Returns the set of doc IDs currently subscribed on the server, derived by
+     * applying the subscribe filter to the full tracked set.
+     */
+    protected _getActiveSubscriptions(): Set<string>;
     /**
      * Helper to detect DOC_DELETED (410) errors from the server.
      */

package/dist/net/PatchesSync.js

@@ -155,7 +155,7 @@ class PatchesSync {
       this.trackedDocs = new Set(activeDocIds);
       if (activeDocIds.length > 0) {
         try {
-          const subscribeIds = this.options?.subscribeFilter?.(activeDocIds) || activeDocIds;
+          const subscribeIds = this._filterSubscribeIds(activeDocIds);
           if (subscribeIds.length) {
             await this.ws.subscribe(subscribeIds);
           }
@@ -318,6 +318,7 @@ class PatchesSync {
   async _handleDocsTracked(docIds) {
     const newIds = docIds.filter((id) => !this.trackedDocs.has(id));
     if (!newIds.length) return;
+    const alreadySubscribed = this._getActiveSubscriptions();
     newIds.forEach((id) => this.trackedDocs.add(id));
     for (const docId of newIds) {
       for (const algorithm of Object.values(this.patches.algorithms)) {
@@ -330,13 +331,9 @@ class PatchesSync {
         }
       }
     }
-    let subscribeIds = newIds;
-    if (this.options?.subscribeFilter) {
-      const alreadyTracked = this.options.subscribeFilter([...this.trackedDocs]);
-      subscribeIds = subscribeIds.filter((id) => !alreadyTracked.includes(id));
-    }
     if (this.state.connected) {
       try {
+        const subscribeIds = this._filterSubscribeIds(newIds).filter((id) => !alreadySubscribed.has(id));
         if (subscribeIds.length) {
           await this.ws.subscribe(subscribeIds);
         }
@@ -350,8 +347,10 @@ class PatchesSync {
   async _handleDocsUntracked(docIds) {
     const existingIds = docIds.filter((id) => this.trackedDocs.has(id));
     if (!existingIds.length) return;
+    const subscribedBefore = this._getActiveSubscriptions();
     existingIds.forEach((id) => this.trackedDocs.delete(id));
-    const unsubscribeIds = this.options?.subscribeFilter?.(existingIds) || existingIds;
+    const subscribedAfter = this._getActiveSubscriptions();
+    const unsubscribeIds = [...subscribedBefore].filter((id) => !subscribedAfter.has(id));
     if (this.state.connected && unsubscribeIds.length) {
       try {
         await this.ws.unsubscribe(unsubscribeIds);
@@ -380,6 +379,20 @@ class PatchesSync {
     await algorithm.confirmDeleteDoc(docId);
     await this.onRemoteDocDeleted.emit(docId, pendingChanges);
   }
+  /**
+   * Applies the subscribeFilter option to a list of doc IDs, returning the subset
+   * that should be sent to ws.subscribe/unsubscribe. Returns the full list if no filter is set.
+   */
+  _filterSubscribeIds(docIds) {
+    return this.options?.subscribeFilter?.(docIds) || docIds;
+  }
+  /**
+   * Returns the set of doc IDs currently subscribed on the server, derived by
+   * applying the subscribe filter to the full tracked set.
+   */
+  _getActiveSubscriptions() {
+    return new Set(this._filterSubscribeIds([...this.trackedDocs]));
+  }
   /**
    * Helper to detect DOC_DELETED (410) errors from the server.
    */

package/dist/net/index.d.ts

@@ -15,11 +15,11 @@ export { WebSocketOptions, WebSocketTransport } from './websocket/WebSocketTrans
 export { CommitChangesOptions } from '../types.js';
 import '../event-signal.js';
 import '../algorithms/ot/shared/changeBatching.js';
-import '../client/Patches.js';
-import '../json-patch/types.js';
 import '../client/ClientAlgorithm.js';
+import '../json-patch/types.js';
 import '../BaseDoc-_Rsau70J.js';
 import '../client/PatchesStore.js';
+import '../client/Patches.js';
 import '../server/types.js';
 import '../utils/deferred.js';
 import '../json-patch/JSONPatch.js';

package/dist/net/protocol/JSONRPCServer.js

@@ -54,7 +54,10 @@ class JSONRPCServer {
       this.registerMethod(method, async (...args) => {
         const docId = args[0];
         if (typeof docId !== "string" || !docId) {
-          throw new StatusError(400, `INVALID_REQUEST: docId is required (got ${docId === "" ? "empty string" : String(docId)})`);
+          throw new StatusError(
+            400,
+            `INVALID_REQUEST: docId is required (got ${docId === "" ? "empty string" : String(docId)})`
+          );
         }
         const ctx = getAuthContext();
         await this.assertAccess(access, ctx, method, args);
@@ -137,7 +140,10 @@ class JSONRPCServer {
     if (!this.auth) return;
     const docId = args?.[0];
     if (typeof docId !== "string" || !docId) {
-      throw new StatusError(400, `INVALID_REQUEST: docId is required (got ${docId === "" ? "empty string" : String(docId)})`);
+      throw new StatusError(
+        400,
+        `INVALID_REQUEST: docId is required (got ${docId === "" ? "empty string" : String(docId)})`
+      );
     }
     const ok = await this.auth.canAccess(ctx, docId, access, method);
     if (!ok) {

package/dist/solid/primitives.js

@@ -66,7 +66,24 @@ function createDocReactiveState(options) {
     change,
     doc
   };
-  return { doc, setDoc, data, setData, loading, setLoading, error, setError, rev, setRev, hasPending, setHasPending, setupDoc, resetSignals, change, baseReturn };
+  return {
+    doc,
+    setDoc,
+    data,
+    setData,
+    loading,
+    setLoading,
+    error,
+    setError,
+    rev,
+    setRev,
+    hasPending,
+    setHasPending,
+    setupDoc,
+    resetSignals,
+    change,
+    baseReturn
+  };
 }
 function usePatchesDoc(docIdOrOptions, options) {
   if (typeof docIdOrOptions === "string" || typeof docIdOrOptions === "function") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dabble/patches",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "Immutable JSON Patch implementation based on RFC 6902 supporting operational transformation and last-writer-wins",
   "author": "Jacob Wright <jacwright@gmail.com>",
   "bugs": {