@textbus/collaborate 4.0.0 → 4.0.2

package/bundles/connectors/hocuspocus-connector.d.ts

@@ -1,11 +1,6 @@
-import { Observable } from '@tanbo/stream';
 import { HocuspocusProviderConfiguration } from '@hocuspocus/provider';
 import { SyncConnector } from '../sync-connector';
 export declare class HocuspocusConnector extends SyncConnector {
-    onLoad: Observable<void>;
-    onStateChange: Observable<any>;
-    private loadEvent;
-    private stateChangeEvent;
     private provide;
     constructor(config: HocuspocusProviderConfiguration);
     setLocalStateField(key: string, data: Record<string, any>): void;

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

@@ -1,12 +1,7 @@
 import { Doc as YDoc } from 'yjs';
-import { Observable } from '@tanbo/stream';
 import { SyncConnector } from '../sync-connector';
 export declare class YWebsocketConnector extends SyncConnector {
-    onLoad: Observable<void>;
-    onStateChange: Observable<any>;
     private provide;
-    private loadEvent;
-    private stateChangeEvent;
     constructor(url: string, roomName: string, yDoc: YDoc);
     setLocalStateField(key: string, data: Record<string, any>): void;
     onDestroy(): void;

package/bundles/index.esm.js

@@ -1,5 +1,5 @@
-import { Subject, map, filter, Subscription } from '@tanbo/stream';
 import { HocuspocusProvider } from '@hocuspocus/provider';
+import { Subject, map, filter, Subscription } from '@tanbo/stream';
 import { WebsocketProvider } from 'y-websocket';
 import { Injectable, Inject, Optional } from '@viewfly/core';
 import { makeError, HISTORY_STACK_SIZE, ChangeOrigin, createObjectProxy, createArrayProxy, Slot, RootComponentRef, Scheduler, Registry, Selection, History } from '@textbus/core';
@@ -9,15 +9,17 @@ import { Doc, UndoManager, Map, Array as Array$1, Text, createAbsolutePositionFr
  * 协作通信通用接口
  */
 class SyncConnector {
+    constructor() {
+        this.loadEvent = new Subject();
+        this.stateChangeEvent = new Subject();
+        this.onLoad = this.loadEvent.asObservable();
+        this.onStateChange = this.stateChangeEvent.asObservable();
+    }
 }
 
 class HocuspocusConnector extends SyncConnector {
     constructor(config) {
         super();
-        this.loadEvent = new Subject();
-        this.stateChangeEvent = new Subject();
-        this.onLoad = this.loadEvent.asObservable();
-        this.onStateChange = this.stateChangeEvent.asObservable();
         this.provide = new HocuspocusProvider(Object.assign(Object.assign({}, config), { onSynced: (data) => {
                 var _a;
                 (_a = config.onSynced) === null || _a === void 0 ? void 0 : _a.call(config, data);
@@ -25,9 +27,13 @@ class HocuspocusConnector extends SyncConnector {
             }, onAwarenessUpdate: (data) => {
                 var _a;
                 (_a = config.onAwarenessUpdate) === null || _a === void 0 ? void 0 : _a.call(config, data);
-                data.states.forEach(state => {
-                    this.stateChangeEvent.next(state);
+                const states = data.states.map(state => {
+                    return {
+                        clientId: state.clientId,
+                        state: Object.assign({}, state)
+                    };
                 });
+                this.stateChangeEvent.next(states);
             } }));
     }
     setLocalStateField(key, data) {
@@ -42,8 +48,6 @@ class HocuspocusConnector extends SyncConnector {
 class YWebsocketConnector extends SyncConnector {
     constructor(url, roomName, yDoc) {
         super();
-        this.loadEvent = new Subject();
-        this.stateChangeEvent = new Subject();
         this.onLoad = this.loadEvent.asObservable();
         this.onStateChange = this.stateChangeEvent.asObservable();
         this.provide = new WebsocketProvider(url, roomName, yDoc);
@@ -53,9 +57,14 @@ class YWebsocketConnector extends SyncConnector {
             }
         });
         this.provide.awareness.on('update', () => {
-            this.provide.awareness.getStates().forEach(state => {
-                this.stateChangeEvent.next(state);
+            const syncStates = [];
+            this.provide.awareness.getStates().forEach((state, id) => {
+                syncStates.push({
+                    clientId: id,
+                    state: state,
+                });
             });
+            this.stateChangeEvent.next(syncStates);
         });
     }
     setLocalStateField(key, data) {
@@ -619,7 +628,7 @@ let Collaborate = class Collaborate {
                         sharedSlot.removeAttribute(action.name);
                     }
                 }
-            });
+            }, true);
         });
         this.slotMap.set(localSlot, sharedSlot);
         localSlot.__changeMarker__.destroyCallbacks.push(() => {
@@ -684,7 +693,7 @@ let Collaborate = class Collaborate {
                             break;
                     }
                 }
-            });
+            }, !localArray.__changeMarker__.irrevocableUpdate);
         });
         const syncRemote = (ev, tr) => {
             this.runRemoteUpdate(tr, () => {
@@ -745,14 +754,14 @@ let Collaborate = class Collaborate {
                             break;
                     }
                 }
-            });
+            }, !localObject.__changeMarker__.irrevocableUpdate);
         });
         localObject.__changeMarker__.destroyCallbacks.push(function () {
             sharedObject.unobserve(syncRemote);
             sub.unsubscribe();
         });
     }
-    runLocalUpdate(fn, record = true) {
+    runLocalUpdate(fn, record) {
         if (this.updateFromRemote) {
             return;
         }
@@ -813,15 +822,18 @@ let UserActivity = class UserActivity {
         this.subscription.add(this.selection.onChange.subscribe(() => {
             const selection = this.selection.getPaths();
             this.syncConnector.setLocalStateField('selection', Object.assign(Object.assign({}, userinfo), { selection }));
-        }), this.syncConnector.onStateChange.subscribe((state) => {
+        }), this.syncConnector.onStateChange.subscribe((states) => {
             const users = [];
             const remoteSelections = [];
-            if (state.user) {
-                users.push(state.user);
-            }
-            if (state.selection) {
-                remoteSelections.push(state.selection);
-            }
+            states.forEach(item => {
+                const state = item.state;
+                if (state.user) {
+                    users.push(state.user);
+                }
+                if (state.selection) {
+                    remoteSelections.push(state.selection);
+                }
+            });
             const selections = remoteSelections.filter(i => i.id !== userinfo.id);
             this.userChangeEvent.next(users);
             this.stateChangeEvent.next(selections);

package/bundles/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var stream = require('@tanbo/stream');
 var provider = require('@hocuspocus/provider');
+var stream = require('@tanbo/stream');
 var yWebsocket = require('y-websocket');
 var core$1 = require('@viewfly/core');
 var core = require('@textbus/core');
@@ -11,15 +11,17 @@ var yjs = require('yjs');
  * 协作通信通用接口
  */
 class SyncConnector {
+    constructor() {
+        this.loadEvent = new stream.Subject();
+        this.stateChangeEvent = new stream.Subject();
+        this.onLoad = this.loadEvent.asObservable();
+        this.onStateChange = this.stateChangeEvent.asObservable();
+    }
 }
 
 class HocuspocusConnector extends SyncConnector {
     constructor(config) {
         super();
-        this.loadEvent = new stream.Subject();
-        this.stateChangeEvent = new stream.Subject();
-        this.onLoad = this.loadEvent.asObservable();
-        this.onStateChange = this.stateChangeEvent.asObservable();
         this.provide = new provider.HocuspocusProvider(Object.assign(Object.assign({}, config), { onSynced: (data) => {
                 var _a;
                 (_a = config.onSynced) === null || _a === void 0 ? void 0 : _a.call(config, data);
@@ -27,9 +29,13 @@ class HocuspocusConnector extends SyncConnector {
             }, onAwarenessUpdate: (data) => {
                 var _a;
                 (_a = config.onAwarenessUpdate) === null || _a === void 0 ? void 0 : _a.call(config, data);
-                data.states.forEach(state => {
-                    this.stateChangeEvent.next(state);
+                const states = data.states.map(state => {
+                    return {
+                        clientId: state.clientId,
+                        state: Object.assign({}, state)
+                    };
                 });
+                this.stateChangeEvent.next(states);
             } }));
     }
     setLocalStateField(key, data) {
@@ -44,8 +50,6 @@ class HocuspocusConnector extends SyncConnector {
 class YWebsocketConnector extends SyncConnector {
     constructor(url, roomName, yDoc) {
         super();
-        this.loadEvent = new stream.Subject();
-        this.stateChangeEvent = new stream.Subject();
         this.onLoad = this.loadEvent.asObservable();
         this.onStateChange = this.stateChangeEvent.asObservable();
         this.provide = new yWebsocket.WebsocketProvider(url, roomName, yDoc);
@@ -55,9 +59,14 @@ class YWebsocketConnector extends SyncConnector {
             }
         });
         this.provide.awareness.on('update', () => {
-            this.provide.awareness.getStates().forEach(state => {
-                this.stateChangeEvent.next(state);
+            const syncStates = [];
+            this.provide.awareness.getStates().forEach((state, id) => {
+                syncStates.push({
+                    clientId: id,
+                    state: state,
+                });
             });
+            this.stateChangeEvent.next(syncStates);
         });
     }
     setLocalStateField(key, data) {
@@ -621,7 +630,7 @@ exports.Collaborate = class Collaborate {
                         sharedSlot.removeAttribute(action.name);
                     }
                 }
-            });
+            }, true);
         });
         this.slotMap.set(localSlot, sharedSlot);
         localSlot.__changeMarker__.destroyCallbacks.push(() => {
@@ -686,7 +695,7 @@ exports.Collaborate = class Collaborate {
                             break;
                     }
                 }
-            });
+            }, !localArray.__changeMarker__.irrevocableUpdate);
         });
         const syncRemote = (ev, tr) => {
             this.runRemoteUpdate(tr, () => {
@@ -747,14 +756,14 @@ exports.Collaborate = class Collaborate {
                             break;
                     }
                 }
-            });
+            }, !localObject.__changeMarker__.irrevocableUpdate);
         });
         localObject.__changeMarker__.destroyCallbacks.push(function () {
             sharedObject.unobserve(syncRemote);
             sub.unsubscribe();
         });
     }
-    runLocalUpdate(fn, record = true) {
+    runLocalUpdate(fn, record) {
         if (this.updateFromRemote) {
             return;
         }
@@ -815,15 +824,18 @@ exports.UserActivity = class UserActivity {
         this.subscription.add(this.selection.onChange.subscribe(() => {
             const selection = this.selection.getPaths();
             this.syncConnector.setLocalStateField('selection', Object.assign(Object.assign({}, userinfo), { selection }));
-        }), this.syncConnector.onStateChange.subscribe((state) => {
+        }), this.syncConnector.onStateChange.subscribe((states) => {
             const users = [];
             const remoteSelections = [];
-            if (state.user) {
-                users.push(state.user);
-            }
-            if (state.selection) {
-                remoteSelections.push(state.selection);
-            }
+            states.forEach(item => {
+                const state = item.state;
+                if (state.user) {
+                    users.push(state.user);
+                }
+                if (state.selection) {
+                    remoteSelections.push(state.selection);
+                }
+            });
             const selections = remoteSelections.filter(i => i.id !== userinfo.id);
             this.userChangeEvent.next(users);
             this.stateChangeEvent.next(selections);

package/bundles/sync-connector.d.ts

@@ -1,10 +1,31 @@
-import { Observable } from '@tanbo/stream';
+import { Observable, Subject } from '@tanbo/stream';
+export interface SyncState {
+    clientId: number;
+    state: Record<string, any>;
+}
 /**
  * 协作通信通用接口
  */
 export declare abstract class SyncConnector {
-    abstract onLoad: Observable<void>;
-    abstract onStateChange: Observable<any>;
+    /**
+     * 当文档加载完成时触发的观察者
+     */
+    onLoad: Observable<void>;
+    /**
+     * 当文档 awareness 状态变更时触发的观察者
+     */
+    onStateChange: Observable<SyncState[]>;
+    protected loadEvent: Subject<void>;
+    protected stateChangeEvent: Subject<SyncState[]>;
+    protected constructor();
+    /**
+     * 设置 awareness 状态
+     * @param key 状态的 key
+     * @param data 状态值
+     */
     abstract setLocalStateField(key: string, data: Record<string, any>): void;
+    /**
+     * 当文档销毁时调用
+     */
     abstract onDestroy(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "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.5",
-    "@textbus/core": "^4.0.0",
+    "@textbus/core": "^4.0.1",
     "@viewfly/core": "^1.0.0-alpha.22",
     "y-websocket": "^1.4.3",
     "yjs": "^13.6.14"
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "cf4fd289b73bc777124a32fe42bb58eba05a34f1"
+  "gitHead": "7ff0b269f64ca78bf19a243d61ea39cac898f671"
 }