@pluv/client 0.11.1 → 0.12.1

package/dist/index.js

@@ -87,14 +87,21 @@ var import_crdt_yjs = require("@pluv/crdt-yjs");
 var CrdtManager = class {
   constructor(options = {}) {
     this.initialized = false;
-    const { encodedState, initialStorage } = options;
+    const {
+      captureTimeout,
+      encodedState,
+      initialStorage,
+      trackedOrigins = []
+    } = options;
     const _doc = encodedState ? (0, import_crdt_yjs.doc)().applyUpdate(encodedState) : null;
     if (_doc && !!Object.keys(_doc.toJSON()).length) {
       this.doc = _doc;
+      this.trackOrigins({ captureTimeout, trackedOrigins });
       return;
     }
     _doc == null ? void 0 : _doc.destroy();
     this.doc = (0, import_crdt_yjs.doc)(initialStorage == null ? void 0 : initialStorage());
+    this.trackOrigins({ captureTimeout, trackedOrigins });
   }
   /**
    * !HACK
@@ -116,8 +123,15 @@ var CrdtManager = class {
     return this.doc.get(key);
   }
   initialize(params) {
-    const { onInitialized, origin, update } = params;
+    const {
+      captureTimeout,
+      onInitialized,
+      origin,
+      trackedOrigins,
+      update
+    } = params;
     const updates = typeof update === "string" ? [update] : update;
+    this.trackOrigins({ captureTimeout, trackedOrigins });
     if (!updates.length)
       return this;
     if (this.initialized) {
@@ -132,8 +146,13 @@ var CrdtManager = class {
       _doc.destroy();
     }
     onInitialized == null ? void 0 : onInitialized();
+    this.trackOrigins({ captureTimeout, trackedOrigins });
     return this;
   }
+  trackOrigins(options) {
+    const { captureTimeout, trackedOrigins } = options;
+    this.doc.trackOrigins({ captureTimeout, trackedOrigins });
+  }
   _applyDocUpdates(yjsDoc, updates, origin) {
     yjsDoc.transact(() => {
       updates.reduce((acc, _update) => acc.applyUpdate(_update), yjsDoc);
@@ -146,6 +165,7 @@ var CrdtManager = class {
 var import_wonka = require("wonka");
 var CrdtNotifier = class {
   constructor() {
+    this.rootSubject = (0, import_wonka.makeSubject)();
     this.subjects = /* @__PURE__ */ new Map();
   }
   subject(key) {
@@ -157,6 +177,9 @@ var CrdtNotifier = class {
     this.subjects.set(key, newSubject);
     return newSubject;
   }
+  subcribeRoot(callback) {
+    return (0, import_wonka.subscribe)(callback)(this.rootSubject.source).unsubscribe;
+  }
   subscribe(key, callback) {
     const subject = this.subject(key);
     return (0, import_wonka.subscribe)(callback)(subject.source).unsubscribe;
@@ -379,7 +402,8 @@ var ADD_TO_STORAGE_STATE_DEBOUNCE_MS = 1e3;
 var HEARTBEAT_INTERVAL_MS = 1e4;
 var PONG_TIMEOUT_MS = 2e3;
 var RECONNECT_TIMEOUT_MS = 3e4;
-var Y_ORIGIN_INITIALIZED = "$INITIALIZED";
+var ORIGIN_INITIALIZED = "$INITIALIZED";
+var ORIGIN_STORAGE_UPDATED = "$STORAGE_UPDATED";
 var DEFAULT_PLUV_CLIENT_ADDON = (input) => ({
   storage: new StorageStore(input.room.id)
 });
@@ -388,14 +412,17 @@ var PluvRoom = class extends AbstractRoom {
     const {
       addons = [],
       authEndpoint,
+      captureTimeout,
       debug = false,
       initialPresence,
       initialStorage,
       onAuthorizationFail,
       presence,
+      trackedOrigins,
       wsEndpoint
     } = options;
     super(room);
+    this._captureTimeout = null;
     this._crdtNotifier = new CrdtNotifier();
     this._eventNotifier = new EventNotifier();
     this._intervals = {
@@ -422,8 +449,15 @@ var PluvRoom = class extends AbstractRoom {
       pong: null,
       reconnect: null
     };
+    this._trackedOrigins = null;
     this._windowListeners = null;
     this._wsListeners = null;
+    this.canRedo = () => {
+      return !!this._crdtManager.doc.canRedo();
+    };
+    this.canUndo = () => {
+      return !!this._crdtManager.doc.canUndo();
+    };
     this.event = (event, callback) => {
       return this._eventNotifier.subscribe(event, callback);
     };
@@ -440,18 +474,38 @@ var PluvRoom = class extends AbstractRoom {
       return this._usersManager.getOthers();
     };
     this.getStorage = (key) => {
-      var _a, _b;
-      return (_b = (_a = this._crdtManager) == null ? void 0 : _a.get(key)) != null ? _b : null;
+      const sharedType = this._crdtManager.get(key);
+      if (typeof sharedType === "undefined") {
+        throw new Error(`Could not find storege: ${key.toString()}`);
+      }
+      return sharedType;
     };
     this.other = (connectionId, callback) => {
       return this._otherNotifier.subscribe(connectionId, callback);
     };
+    this.redo = () => {
+      this._crdtManager.doc.redo();
+    };
     this.storage = (key, fn) => {
       return this._crdtNotifier.subscribe(key, fn);
     };
+    this.storageRoot = (fn) => {
+      return this._crdtNotifier.subcribeRoot(fn);
+    };
     this.subscribe = (name, callback) => {
       return this._stateNotifier.subscribe(name, callback);
     };
+    this.transact = (fn, origin) => {
+      const _origin = origin != null ? origin : this._state.connection.id;
+      if (typeof _origin !== "string")
+        return;
+      this._crdtManager.doc.transact(() => {
+        fn(this._crdtManager.doc.storage);
+      }, _origin);
+    };
+    this.undo = () => {
+      this._crdtManager.doc.undo();
+    };
     this.updateMyPresence = (presence) => {
       var _a;
       this._usersManager.updateMyPresence(presence);
@@ -501,7 +555,13 @@ var PluvRoom = class extends AbstractRoom {
       initialPresence,
       presence
     });
-    this._crdtManager = new CrdtManager({ initialStorage });
+    this._crdtManager = new CrdtManager({
+      captureTimeout,
+      initialStorage,
+      trackedOrigins
+    });
+    this._captureTimeout = captureTimeout != null ? captureTimeout : null;
+    this._trackedOrigins = trackedOrigins != null ? trackedOrigins : null;
   }
   get webSocket() {
     return this._state.webSocket;
@@ -532,7 +592,6 @@ var PluvRoom = class extends AbstractRoom {
       });
       yield this._storageStore.initialize();
       yield this._applyStorageStore();
-      console.log(this._getWsEndpoint(this.id));
       const url = new URL(this._getWsEndpoint(this.id));
       let authToken = null;
       let webSocket;
@@ -556,7 +615,6 @@ var PluvRoom = class extends AbstractRoom {
   }
   disconnect() {
     return __async(this, null, function* () {
-      var _a;
       if (!this._endpoints.wsEndpoint) {
         throw new Error("Must provide an wsEndpoint.");
       }
@@ -571,7 +629,7 @@ var PluvRoom = class extends AbstractRoom {
       this._clearInterval(this._intervals.heartbeat);
       this._closeWs();
       yield this._storageStore.destroy();
-      (_a = this._crdtManager) == null ? void 0 : _a.destroy();
+      this._crdtManager.destroy();
       this._stateNotifier.subjects["my-presence"].next(null);
     });
   }
@@ -588,12 +646,16 @@ var PluvRoom = class extends AbstractRoom {
   }
   _applyStorageStore() {
     return __async(this, null, function* () {
+      var _a;
       const updates = yield this._storageStore.getUpdates();
+      const trackedOrigins = this._getTrackedOrigins();
       this._crdtManager.initialize({
+        captureTimeout: (_a = this._captureTimeout) != null ? _a : void 0,
         onInitialized: () => {
           this._observeCrdt();
         },
-        origin: Y_ORIGIN_INITIALIZED,
+        origin: ORIGIN_INITIALIZED,
+        trackedOrigins: trackedOrigins != null ? trackedOrigins : void 0,
         update: updates
       });
       this._emitSharedTypes();
@@ -712,10 +774,15 @@ var PluvRoom = class extends AbstractRoom {
   }
   _emitSharedTypes() {
     const sharedTypes = this._crdtManager.doc.getSharedTypes();
-    Object.entries(sharedTypes).forEach(([prop, sharedType]) => {
-      const serialized = sharedType.toJSON();
-      this._crdtNotifier.subject(prop).next(serialized);
-    });
+    const storageRoot = Object.entries(sharedTypes).reduce(
+      (acc, [prop, sharedType]) => {
+        const serialized = sharedType.toJSON();
+        this._crdtNotifier.subject(prop).next(serialized);
+        return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
+      },
+      {}
+    );
+    this._crdtNotifier.rootSubject.next(storageRoot);
   }
   _getAuthFetchOptions(room) {
     if (typeof this._endpoints.authEndpoint === "undefined")
@@ -754,6 +821,11 @@ var PluvRoom = class extends AbstractRoom {
       }
     });
   }
+  _getTrackedOrigins() {
+    var _a;
+    const connectionId = this._state.connection.id;
+    return !connectionId ? this._trackedOrigins : [connectionId, ...(_a = this._trackedOrigins) != null ? _a : []];
+  }
   _getWsEndpoint(room) {
     switch (typeof this._endpoints.wsEndpoint) {
       case "undefined":
@@ -822,7 +894,7 @@ var PluvRoom = class extends AbstractRoom {
     this._stateNotifier.subjects["others"].next(others);
   }
   _handleRegisteredMessage(message) {
-    var _a, _b, _c;
+    var _a, _b;
     const { connectionId, user } = message;
     if (!connectionId)
       return;
@@ -842,7 +914,7 @@ var PluvRoom = class extends AbstractRoom {
     const myself = (_a = this._usersManager.myself) != null ? _a : null;
     this._stateNotifier.subjects["my-presence"].next(presence);
     this._stateNotifier.subjects["myself"].next(myself);
-    const update = this._state.connection.count > 1 ? (_c = (_b = this._crdtManager) == null ? void 0 : _b.doc.encodeStateAsUpdate()) != null ? _c : null : null;
+    const update = this._state.connection.count > 1 ? (_b = this._crdtManager.doc.encodeStateAsUpdate()) != null ? _b : null : null;
     this._sendMessage({
       type: "$INITIALIZE_SESSION",
       data: { presence, update }
@@ -850,17 +922,21 @@ var PluvRoom = class extends AbstractRoom {
   }
   _handleStorageReceivedMessage(message) {
     return __async(this, null, function* () {
+      var _a;
       const { connectionId } = message;
       if (!connectionId)
         return;
       if (!this._state.webSocket)
         throw new Error("Could not find WebSocket");
       const data = message.data;
+      const trackedOrigins = this._getTrackedOrigins();
       this._crdtManager.initialize({
+        captureTimeout: (_a = this._captureTimeout) != null ? _a : void 0,
         onInitialized: () => __async(this, null, function* () {
           this._observeCrdt();
         }),
-        origin: Y_ORIGIN_INITIALIZED,
+        origin: ORIGIN_INITIALIZED,
+        trackedOrigins: trackedOrigins != null ? trackedOrigins : void 0,
         update: data.state
       });
       const encodedState = this._crdtManager.doc.encodeStateAsUpdate();
@@ -869,7 +945,7 @@ var PluvRoom = class extends AbstractRoom {
       const update = this._crdtManager.doc.encodeStateAsUpdate();
       this._sendMessage({
         type: "$UPDATE_STORAGE",
-        data: { origin: Y_ORIGIN_INITIALIZED, update }
+        data: { origin: ORIGIN_INITIALIZED, update }
       });
     });
   }
@@ -882,14 +958,19 @@ var PluvRoom = class extends AbstractRoom {
     const data = message.data;
     if (!this._crdtManager)
       return;
-    this._crdtManager.doc.applyUpdate(data.state, "$STORAGE_UPDATED");
+    this._crdtManager.doc.applyUpdate(data.state, ORIGIN_STORAGE_UPDATED);
     const sharedTypes = this._crdtManager.doc.getSharedTypes();
-    Object.entries(sharedTypes).forEach(([prop, sharedType]) => {
-      if (!this._crdtManager)
-        return;
-      const serialized = sharedType.toJSON();
-      this._crdtNotifier.subject(prop).next(serialized);
-    });
+    const storageRoot = Object.entries(sharedTypes).reduce(
+      (acc, [prop, sharedType]) => {
+        if (!this._crdtManager)
+          return acc;
+        const serialized = sharedType.toJSON();
+        this._crdtNotifier.subject(prop).next(serialized);
+        return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
+      },
+      {}
+    );
+    this._crdtNotifier.rootSubject.next(storageRoot);
   }
   _handleUserJoinedMessage(message) {
     const { connectionId } = message;
@@ -938,7 +1019,7 @@ var PluvRoom = class extends AbstractRoom {
         const origin = _origin != null ? _origin : null;
         this._addToStorageStore(update);
         this._emitSharedTypes();
-        if (origin === Y_ORIGIN_INITIALIZED || origin === this)
+        if (origin === ORIGIN_INITIALIZED || origin === this)
           return;
         if (!this._state.webSocket)
           return;
@@ -946,7 +1027,7 @@ var PluvRoom = class extends AbstractRoom {
           return;
         if (this._state.webSocket.readyState !== WebSocket.OPEN)
           return;
-        if (origin === "$STORAGE_UPDATED")
+        if (origin === ORIGIN_STORAGE_UPDATED)
           return;
         this._sendMessage({
           type: "$UPDATE_STORAGE",
@@ -1216,7 +1297,6 @@ var MockedRoom = class extends AbstractRoom {
   constructor(room, options) {
     const { events, initialPresence, initialStorage, presence } = options;
     super(room);
-    this._crdtManager = null;
     this._crdtNotifier = new CrdtNotifier();
     this._eventNotifier = new EventNotifier();
     this._otherNotifier = new OtherNotifier();
@@ -1236,6 +1316,12 @@ var MockedRoom = class extends AbstractRoom {
     this._subscriptions = {
       observeCrdt: null
     };
+    this.canRedo = () => {
+      return !!this._crdtManager.doc.canRedo();
+    };
+    this.canUndo = () => {
+      return !!this._crdtManager.doc.canUndo();
+    };
     this.event = (event, callback) => {
       return this._eventNotifier.subscribe(event, callback);
     };
@@ -1252,18 +1338,41 @@ var MockedRoom = class extends AbstractRoom {
       return this._usersManager.getOthers();
     };
     this.getStorage = (key) => {
-      var _a, _b;
-      return (_b = (_a = this._crdtManager) == null ? void 0 : _a.get(key)) != null ? _b : null;
+      const sharedType = this._crdtManager.get(key);
+      if (typeof sharedType === "undefined") {
+        throw new Error(`Could not find storege: ${key.toString()}`);
+      }
+      return sharedType;
     };
     this.other = (connectionId, callback) => {
       return this._otherNotifier.subscribe(connectionId, callback);
     };
+    this.redo = () => {
+      this._crdtManager.doc.redo();
+    };
     this.storage = (key, fn) => {
       return this._crdtNotifier.subscribe(key, fn);
     };
+    this.storageRoot = (fn) => {
+      return this._crdtNotifier.subcribeRoot(fn);
+    };
     this.subscribe = (name, callback) => {
       return this._stateNotifier.subscribe(name, callback);
     };
+    this.transact = (fn, origin) => {
+      const _origin = origin != null ? origin : this._state.connection.id;
+      const crdtManager = this._crdtManager;
+      if (typeof _origin !== "string")
+        return;
+      if (!crdtManager)
+        return;
+      crdtManager.doc.transact(() => {
+        fn(crdtManager.doc.storage);
+      }, _origin);
+    };
+    this.undo = () => {
+      this._crdtManager.doc.undo();
+    };
     this.updateMyPresence = (presence) => {
       var _a;
       this._usersManager.updateMyPresence(presence);
@@ -1315,12 +1424,17 @@ var MockedRoom = class extends AbstractRoom {
         if (origin === "$STORAGE_UPDATED")
           return;
         const sharedTypes = this._crdtManager.doc.getSharedTypes();
-        Object.entries(sharedTypes).forEach(([prop, sharedType]) => {
-          if (!this._crdtManager)
-            return;
-          const serialized = sharedType.toJSON();
-          this._crdtNotifier.subject(prop).next(serialized);
-        });
+        const storageRoot = Object.entries(sharedTypes).reduce(
+          (acc, [prop, sharedType]) => {
+            if (!this._crdtManager)
+              return acc;
+            const serialized = sharedType.toJSON();
+            this._crdtNotifier.subject(prop).next(serialized);
+            return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
+          },
+          {}
+        );
+        this._crdtNotifier.rootSubject.next(storageRoot);
       }
     );
     this._subscriptions.observeCrdt = unsubscribe;