@textbus/collaborate 4.3.6 → 4.3.8

package/bundles/connectors/y-websocket-connector.d.ts

@@ -3,6 +3,8 @@ import { WebsocketProvider } from 'y-websocket';
 import { SyncConnector } from '../base/sync-connector';
 export declare class YWebsocketConnector extends SyncConnector {
     provide: WebsocketProvider;
+    private onSync;
+    private onUpdate;
     constructor(url: string, roomName: string, yDoc: YDoc);
     setLocalStateField(key: string, data: Record<string, any>): void;
     onDestroy(): void;

package/bundles/index.esm.js

@@ -1115,11 +1115,16 @@ let CollabHistory = class CollabHistory {
         this.changeEvent.next();
     }
     destroy() {
-        var _a;
         this.index = 0;
         this.historyItems = [];
         this.subscriptions.forEach(i => i.unsubscribe());
-        (_a = this.manager) === null || _a === void 0 ? void 0 : _a.destroy();
+        if (this.manager) {
+            this.manager.destroy();
+            this.manager.captureTransaction = () => true;
+            this.manager.deleteFilter = () => true;
+            this.manager.trackedOrigins = new Set([null]);
+        }
+        this.manager = null;
     }
 };
 CollabHistory = __decorate([
@@ -1534,30 +1539,44 @@ class YWebsocketConnector extends SyncConnector {
             writable: true,
             value: void 0
         });
-        this.onLoad = this.loadEvent.asObservable();
-        this.onStateChange = this.stateChangeEvent.asObservable();
-        this.provide = new WebsocketProvider(url, roomName, yDoc);
-        this.provide.on('sync', (is) => {
-            if (is) {
-                this.loadEvent.next();
+        Object.defineProperty(this, "onSync", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (is) => {
+                if (is) {
+                    this.loadEvent.next();
+                }
             }
         });
-        this.provide.awareness.on('update', () => {
-            const syncStates = [];
-            this.provide.awareness.getStates().forEach((state, id) => {
-                syncStates.push({
-                    clientId: id,
-                    message: state.message,
+        Object.defineProperty(this, "onUpdate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                const syncStates = [];
+                this.provide.awareness.getStates().forEach((state, id) => {
+                    syncStates.push({
+                        clientId: id,
+                        message: state.message,
+                    });
                 });
-            });
-            this.stateChangeEvent.next(syncStates);
+                this.stateChangeEvent.next(syncStates);
+            }
         });
+        this.onLoad = this.loadEvent.asObservable();
+        this.onStateChange = this.stateChangeEvent.asObservable();
+        this.provide = new WebsocketProvider(url, roomName, yDoc);
+        this.provide.once('sync', this.onSync);
+        this.provide.awareness.on('update', this.onUpdate);
     }
     setLocalStateField(key, data) {
         this.provide.awareness.setLocalStateField(key, data);
     }
     onDestroy() {
+        this.provide.awareness.off('update', this.onUpdate);
         this.provide.disconnect();
+        this.provide.destroy();
     }
 }
 

package/bundles/index.js

@@ -1117,11 +1117,16 @@ exports.CollabHistory = class CollabHistory {
         this.changeEvent.next();
     }
     destroy() {
-        var _a;
         this.index = 0;
         this.historyItems = [];
         this.subscriptions.forEach(i => i.unsubscribe());
-        (_a = this.manager) === null || _a === void 0 ? void 0 : _a.destroy();
+        if (this.manager) {
+            this.manager.destroy();
+            this.manager.captureTransaction = () => true;
+            this.manager.deleteFilter = () => true;
+            this.manager.trackedOrigins = new Set([null]);
+        }
+        this.manager = null;
     }
 };
 exports.CollabHistory = __decorate([
@@ -1536,30 +1541,44 @@ class YWebsocketConnector extends SyncConnector {
             writable: true,
             value: void 0
         });
-        this.onLoad = this.loadEvent.asObservable();
-        this.onStateChange = this.stateChangeEvent.asObservable();
-        this.provide = new yWebsocket.WebsocketProvider(url, roomName, yDoc);
-        this.provide.on('sync', (is) => {
-            if (is) {
-                this.loadEvent.next();
+        Object.defineProperty(this, "onSync", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (is) => {
+                if (is) {
+                    this.loadEvent.next();
+                }
             }
         });
-        this.provide.awareness.on('update', () => {
-            const syncStates = [];
-            this.provide.awareness.getStates().forEach((state, id) => {
-                syncStates.push({
-                    clientId: id,
-                    message: state.message,
+        Object.defineProperty(this, "onUpdate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                const syncStates = [];
+                this.provide.awareness.getStates().forEach((state, id) => {
+                    syncStates.push({
+                        clientId: id,
+                        message: state.message,
+                    });
                 });
-            });
-            this.stateChangeEvent.next(syncStates);
+                this.stateChangeEvent.next(syncStates);
+            }
         });
+        this.onLoad = this.loadEvent.asObservable();
+        this.onStateChange = this.stateChangeEvent.asObservable();
+        this.provide = new yWebsocket.WebsocketProvider(url, roomName, yDoc);
+        this.provide.once('sync', this.onSync);
+        this.provide.awareness.on('update', this.onUpdate);
     }
     setLocalStateField(key, data) {
         this.provide.awareness.setLocalStateField(key, data);
     }
     onDestroy() {
+        this.provide.awareness.off('update', this.onUpdate);
         this.provide.disconnect();
+        this.provide.destroy();
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "description": "Textbus is a rich text editor and framework that is highly customizable and extensible to achieve rich wysiwyg effects.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@hocuspocus/provider": "^2.13.6",
     "@tanbo/stream": "^1.2.6",
-    "@textbus/core": "^4.3.6",
+    "@textbus/core": "^4.3.8",
     "@viewfly/core": "^1.1.10",
     "y-websocket": "^1.4.3",
     "yjs": "^13.6.14"
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "f09dce2a210eed0fde349b67fa8ecd7f904aefdf"
+  "gitHead": "a2eb21a78bc8f1fc18cb0a75c4d1093de539eebf"
 }