@textbus/collaborate 4.1.0-alpha.1 → 4.2.0

package/bundles/base/_api.d.ts

@@ -0,0 +1,6 @@
+export * from './collab-history';
+export * from './collaborate';
+export * from './message-bus';
+export * from './multiple-doc-collab-history';
+export * from './sub-model-loader';
+export * from './sync-connector';

package/bundles/base/message-bus.d.ts

@@ -0,0 +1,28 @@
+import { Observable, Subject } from '@tanbo/stream';
+import { Textbus } from '@textbus/core';
+export interface Message<T> {
+    clientId: number;
+    message: T;
+}
+/**
+ * 协作消息总线，用于同步各终端消息
+ */
+export declare abstract class MessageBus<T> {
+    onSync: Observable<void>;
+    protected syncEvent: Subject<void>;
+    constructor();
+    /**
+     * 立即同步消息
+     */
+    sync(): void;
+    /**
+     * 当需要同步协作消息是，Textbus 会自动调用，并把返回数据同步到其它终端
+     */
+    abstract get(textbus: Textbus): T;
+    /**
+     * 当远程消息更新时，Textbus 会自动调用
+     * @param message
+     * @param textbus
+     */
+    abstract consume(message: Message<T>[], textbus: Textbus): void;
+}

package/bundles/{sync-connector.d.ts → base/sync-connector.d.ts}

@@ -1,8 +1,4 @@
 import { Observable, Subject } from '@tanbo/stream';
-export interface SyncState {
-    clientId: number;
-    state: Record<string, any>;
-}
 /**
  * 协作通信通用接口
  */
@@ -14,9 +10,9 @@ export declare abstract class SyncConnector {
     /**
      * 当文档 awareness 状态变更时触发的观察者
      */
-    onStateChange: Observable<SyncState[]>;
+    onStateChange: Observable<any[]>;
     protected loadEvent: Subject<void>;
-    protected stateChangeEvent: Subject<SyncState[]>;
+    protected stateChangeEvent: Subject<any[]>;
     protected constructor();
     /**
      * 设置 awareness 状态

package/bundles/collaborate-module.d.ts

@@ -1,14 +1,13 @@
 import { Module, Textbus } from '@textbus/core';
 import { Provider } from '@viewfly/core';
 import { Doc as YDoc } from 'yjs';
-import { UserInfo } from './user-activity';
-import { SyncConnector } from './sync-connector';
+import { SyncConnector } from './base/_api';
 export interface CollaborateConfig {
-    userinfo: UserInfo;
     createConnector(yDoc: YDoc): SyncConnector;
 }
 export declare class CollaborateModule implements Module {
     config: CollaborateConfig;
+    private subscription;
     providers: Provider[];
     constructor(config: CollaborateConfig);
     setup(textbus: Textbus): Promise<(() => void) | void> | (() => void) | void;

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

@@ -1,6 +1,6 @@
 import { HocuspocusProvider } from '@hocuspocus/provider';
 import { HocuspocusProviderConfiguration } from '@hocuspocus/provider';
-import { SyncConnector } from '../sync-connector';
+import { SyncConnector } from '../base/sync-connector';
 export declare class HocuspocusConnector extends SyncConnector {
     provide: HocuspocusProvider;
     constructor(config: HocuspocusProviderConfiguration);

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

@@ -1,6 +1,6 @@
 import { Doc as YDoc } from 'yjs';
 import { WebsocketProvider } from 'y-websocket';
-import { SyncConnector } from '../sync-connector';
+import { SyncConnector } from '../base/sync-connector';
 export declare class YWebsocketConnector extends SyncConnector {
     provide: WebsocketProvider;
     constructor(url: string, roomName: string, yDoc: YDoc);

package/bundles/index.esm.js

@@ -1,79 +1,9 @@
-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, ChangeOrigin, Slot, createObjectProxy, createArrayProxy, AsyncSlot, AsyncComponent, Component, Scheduler, Registry, Selection, HISTORY_STACK_SIZE, RootComponentRef, History } from '@textbus/core';
+import { Subject, map, filter, Subscription } from '@tanbo/stream';
 import { Doc, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex, Map, Array as Array$1, Text, UndoManager } from 'yjs';
-
-/**
- * 协作通信通用接口
- */
-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.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);
-                this.loadEvent.next();
-            }, onAwarenessUpdate: (data) => {
-                var _a;
-                (_a = config.onAwarenessUpdate) === null || _a === void 0 ? void 0 : _a.call(config, data);
-                const states = data.states.map(state => {
-                    return {
-                        clientId: state.clientId,
-                        state: Object.assign({}, state)
-                    };
-                });
-                this.stateChangeEvent.next(states);
-            } }));
-    }
-    setLocalStateField(key, data) {
-        this.provide.setAwarenessField(key, data);
-    }
-    onDestroy() {
-        this.provide.disconnect();
-        this.provide.destroy();
-    }
-}
-
-class YWebsocketConnector extends SyncConnector {
-    constructor(url, roomName, yDoc) {
-        super();
-        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();
-            }
-        });
-        this.provide.awareness.on('update', () => {
-            const syncStates = [];
-            this.provide.awareness.getStates().forEach((state, id) => {
-                syncStates.push({
-                    clientId: id,
-                    state: state,
-                });
-            });
-            this.stateChangeEvent.next(syncStates);
-        });
-    }
-    setLocalStateField(key, data) {
-        this.provide.awareness.setLocalStateField(key, data);
-    }
-    onDestroy() {
-        this.provide.disconnect();
-    }
-}
+import { HocuspocusProvider } from '@hocuspocus/provider';
+import { WebsocketProvider } from 'y-websocket';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -1033,81 +963,19 @@ CollabHistory = __decorate([
         Selection, Number, CustomUndoManagerConfig])
 ], CollabHistory);
 
-let UserActivity = class UserActivity {
-    constructor(syncConnector, selection) {
-        this.syncConnector = syncConnector;
-        this.selection = selection;
-        this.stateChangeEvent = new Subject();
-        this.userChangeEvent = new Subject();
-        this.subscription = new Subscription();
-        this.onStateChange = this.stateChangeEvent.asObservable();
-        this.onUserChange = this.userChangeEvent.asObservable();
-    }
-    init(userinfo) {
-        this.syncConnector.setLocalStateField('user', userinfo);
-        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((states) => {
-            const users = [];
-            const remoteSelections = [];
-            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);
-        }));
-    }
-    destroy() {
-        this.subscription.unsubscribe();
-    }
-};
-UserActivity = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [SyncConnector,
-        Selection])
-], UserActivity);
-
-class CollaborateModule {
-    constructor(config) {
-        this.config = config;
-        this.providers = [
-            Collaborate,
-            UserActivity,
-            CollabHistory,
-            {
-                provide: History,
-                useExisting: CollabHistory
-            }, {
-                provide: SyncConnector,
-                useFactory: (collab) => {
-                    return this.config.createConnector(collab.yDoc);
-                },
-                deps: [Collaborate]
-            }, {
-                provide: SubModelLoader,
-                useClass: NonSubModelLoader
-            }
-        ];
-    }
-    setup(textbus) {
-        const connector = textbus.get(SyncConnector);
-        const userActivity = textbus.get(UserActivity);
-        userActivity.init(this.config.userinfo);
-        return connector.onLoad.toPromise();
+/**
+ * 协作消息总线，用于同步各终端消息
+ */
+class MessageBus {
+    constructor() {
+        this.syncEvent = new Subject();
+        this.onSync = this.syncEvent.asObservable();
     }
-    onDestroy(textbus) {
-        textbus.get(Collaborate).destroy();
-        textbus.get(History).destroy();
-        textbus.get(UserActivity).destroy();
-        textbus.get(SyncConnector).onDestroy();
+    /**
+     * 立即同步消息
+     */
+    sync() {
+        this.syncEvent.next();
     }
 }
 
@@ -1289,12 +1157,128 @@ MultipleDocCollabHistory = __decorate([
         RootComponentRef, Number, CustomUndoManagerConfig])
 ], MultipleDocCollabHistory);
 
+/**
+ * 协作通信通用接口
+ */
+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.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);
+                this.loadEvent.next();
+            }, onAwarenessUpdate: (data) => {
+                var _a;
+                (_a = config.onAwarenessUpdate) === null || _a === void 0 ? void 0 : _a.call(config, data);
+                const states = data.states.map(state => {
+                    return {
+                        clientId: state.clientId,
+                        message: state.message
+                    };
+                });
+                this.stateChangeEvent.next(states);
+            } }));
+    }
+    setLocalStateField(key, data) {
+        this.provide.setAwarenessField(key, data);
+    }
+    onDestroy() {
+        this.provide.disconnect();
+        this.provide.destroy();
+    }
+}
+
+class YWebsocketConnector extends SyncConnector {
+    constructor(url, roomName, yDoc) {
+        super();
+        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();
+            }
+        });
+        this.provide.awareness.on('update', () => {
+            const syncStates = [];
+            this.provide.awareness.getStates().forEach((state, id) => {
+                syncStates.push({
+                    clientId: id,
+                    message: state.message,
+                });
+            });
+            this.stateChangeEvent.next(syncStates);
+        });
+    }
+    setLocalStateField(key, data) {
+        this.provide.awareness.setLocalStateField(key, data);
+    }
+    onDestroy() {
+        this.provide.disconnect();
+    }
+}
+
+class CollaborateModule {
+    constructor(config) {
+        this.config = config;
+        this.subscription = new Subscription();
+        this.providers = [
+            Collaborate,
+            CollabHistory,
+            {
+                provide: History,
+                useExisting: CollabHistory
+            }, {
+                provide: SyncConnector,
+                useFactory: (collab) => {
+                    return this.config.createConnector(collab.yDoc);
+                },
+                deps: [Collaborate]
+            }, {
+                provide: SubModelLoader,
+                useClass: NonSubModelLoader
+            }
+        ];
+    }
+    setup(textbus) {
+        const messageBus = textbus.get(MessageBus, null);
+        const connector = textbus.get(SyncConnector);
+        if (messageBus) {
+            const selection = textbus.get(Selection);
+            connector.setLocalStateField('message', messageBus.get(textbus));
+            this.subscription.add(messageBus.onSync.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), selection.onChange.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), connector.onStateChange.subscribe((states) => {
+                messageBus.consume(states, textbus);
+            }));
+        }
+        return connector.onLoad.toPromise();
+    }
+    onDestroy(textbus) {
+        this.subscription.unsubscribe();
+        textbus.get(Collaborate).destroy();
+        textbus.get(History).destroy();
+        textbus.get(SyncConnector).onDestroy();
+    }
+}
+
 class MultipleDocumentCollaborateModule {
     constructor(config) {
         this.config = config;
+        this.subscription = new Subscription();
         this.providers = [
             Collaborate,
-            UserActivity,
             MultipleDocCollabHistory,
             {
                 provide: History,
@@ -1314,17 +1298,27 @@ class MultipleDocumentCollaborateModule {
         ];
     }
     setup(textbus) {
+        const messageBus = textbus.get(MessageBus, null);
         const connector = textbus.get(SyncConnector);
-        const userActivity = textbus.get(UserActivity);
-        userActivity.init(this.config.userinfo);
+        if (messageBus) {
+            const selection = textbus.get(Selection);
+            connector.setLocalStateField('message', messageBus.get(textbus));
+            this.subscription.add(messageBus.onSync.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), selection.onChange.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), connector.onStateChange.subscribe((states) => {
+                messageBus.consume(states, textbus);
+            }));
+        }
         return connector.onLoad.toPromise();
     }
     onDestroy(textbus) {
+        this.subscription.unsubscribe();
         textbus.get(Collaborate).destroy();
         textbus.get(History).destroy();
-        textbus.get(UserActivity).destroy();
         textbus.get(SyncConnector).onDestroy();
     }
 }
 
-export { CollabHistory, Collaborate, CollaborateModule, CustomUndoManagerConfig, HocuspocusConnector, MultipleDocCollabHistory, MultipleDocumentCollaborateModule, NonSubModelLoader, SubModelLoader, SyncConnector, UserActivity, YWebsocketConnector };
+export { CollabHistory, Collaborate, CollaborateModule, CustomUndoManagerConfig, HocuspocusConnector, MessageBus, MultipleDocCollabHistory, MultipleDocumentCollaborateModule, NonSubModelLoader, SubModelLoader, SyncConnector, YWebsocketConnector };

package/bundles/index.js

@@ -1,81 +1,11 @@
 'use strict';
 
-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');
+var stream = require('@tanbo/stream');
 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.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);
-                this.loadEvent.next();
-            }, onAwarenessUpdate: (data) => {
-                var _a;
-                (_a = config.onAwarenessUpdate) === null || _a === void 0 ? void 0 : _a.call(config, data);
-                const states = data.states.map(state => {
-                    return {
-                        clientId: state.clientId,
-                        state: Object.assign({}, state)
-                    };
-                });
-                this.stateChangeEvent.next(states);
-            } }));
-    }
-    setLocalStateField(key, data) {
-        this.provide.setAwarenessField(key, data);
-    }
-    onDestroy() {
-        this.provide.disconnect();
-        this.provide.destroy();
-    }
-}
-
-class YWebsocketConnector extends SyncConnector {
-    constructor(url, roomName, yDoc) {
-        super();
-        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();
-            }
-        });
-        this.provide.awareness.on('update', () => {
-            const syncStates = [];
-            this.provide.awareness.getStates().forEach((state, id) => {
-                syncStates.push({
-                    clientId: id,
-                    state: state,
-                });
-            });
-            this.stateChangeEvent.next(syncStates);
-        });
-    }
-    setLocalStateField(key, data) {
-        this.provide.awareness.setLocalStateField(key, data);
-    }
-    onDestroy() {
-        this.provide.disconnect();
-    }
-}
+var provider = require('@hocuspocus/provider');
+var yWebsocket = require('y-websocket');
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -1035,81 +965,19 @@ exports.CollabHistory = __decorate([
         core.Selection, Number, CustomUndoManagerConfig])
 ], exports.CollabHistory);
 
-exports.UserActivity = class UserActivity {
-    constructor(syncConnector, selection) {
-        this.syncConnector = syncConnector;
-        this.selection = selection;
-        this.stateChangeEvent = new stream.Subject();
-        this.userChangeEvent = new stream.Subject();
-        this.subscription = new stream.Subscription();
-        this.onStateChange = this.stateChangeEvent.asObservable();
-        this.onUserChange = this.userChangeEvent.asObservable();
-    }
-    init(userinfo) {
-        this.syncConnector.setLocalStateField('user', userinfo);
-        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((states) => {
-            const users = [];
-            const remoteSelections = [];
-            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);
-        }));
-    }
-    destroy() {
-        this.subscription.unsubscribe();
-    }
-};
-exports.UserActivity = __decorate([
-    core$1.Injectable(),
-    __metadata("design:paramtypes", [SyncConnector,
-        core.Selection])
-], exports.UserActivity);
-
-class CollaborateModule {
-    constructor(config) {
-        this.config = config;
-        this.providers = [
-            exports.Collaborate,
-            exports.UserActivity,
-            exports.CollabHistory,
-            {
-                provide: core.History,
-                useExisting: exports.CollabHistory
-            }, {
-                provide: SyncConnector,
-                useFactory: (collab) => {
-                    return this.config.createConnector(collab.yDoc);
-                },
-                deps: [exports.Collaborate]
-            }, {
-                provide: SubModelLoader,
-                useClass: exports.NonSubModelLoader
-            }
-        ];
-    }
-    setup(textbus) {
-        const connector = textbus.get(SyncConnector);
-        const userActivity = textbus.get(exports.UserActivity);
-        userActivity.init(this.config.userinfo);
-        return connector.onLoad.toPromise();
+/**
+ * 协作消息总线，用于同步各终端消息
+ */
+class MessageBus {
+    constructor() {
+        this.syncEvent = new stream.Subject();
+        this.onSync = this.syncEvent.asObservable();
     }
-    onDestroy(textbus) {
-        textbus.get(exports.Collaborate).destroy();
-        textbus.get(core.History).destroy();
-        textbus.get(exports.UserActivity).destroy();
-        textbus.get(SyncConnector).onDestroy();
+    /**
+     * 立即同步消息
+     */
+    sync() {
+        this.syncEvent.next();
     }
 }
 
@@ -1291,12 +1159,128 @@ exports.MultipleDocCollabHistory = __decorate([
         core.RootComponentRef, Number, CustomUndoManagerConfig])
 ], exports.MultipleDocCollabHistory);
 
+/**
+ * 协作通信通用接口
+ */
+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.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);
+                this.loadEvent.next();
+            }, onAwarenessUpdate: (data) => {
+                var _a;
+                (_a = config.onAwarenessUpdate) === null || _a === void 0 ? void 0 : _a.call(config, data);
+                const states = data.states.map(state => {
+                    return {
+                        clientId: state.clientId,
+                        message: state.message
+                    };
+                });
+                this.stateChangeEvent.next(states);
+            } }));
+    }
+    setLocalStateField(key, data) {
+        this.provide.setAwarenessField(key, data);
+    }
+    onDestroy() {
+        this.provide.disconnect();
+        this.provide.destroy();
+    }
+}
+
+class YWebsocketConnector extends SyncConnector {
+    constructor(url, roomName, yDoc) {
+        super();
+        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();
+            }
+        });
+        this.provide.awareness.on('update', () => {
+            const syncStates = [];
+            this.provide.awareness.getStates().forEach((state, id) => {
+                syncStates.push({
+                    clientId: id,
+                    message: state.message,
+                });
+            });
+            this.stateChangeEvent.next(syncStates);
+        });
+    }
+    setLocalStateField(key, data) {
+        this.provide.awareness.setLocalStateField(key, data);
+    }
+    onDestroy() {
+        this.provide.disconnect();
+    }
+}
+
+class CollaborateModule {
+    constructor(config) {
+        this.config = config;
+        this.subscription = new stream.Subscription();
+        this.providers = [
+            exports.Collaborate,
+            exports.CollabHistory,
+            {
+                provide: core.History,
+                useExisting: exports.CollabHistory
+            }, {
+                provide: SyncConnector,
+                useFactory: (collab) => {
+                    return this.config.createConnector(collab.yDoc);
+                },
+                deps: [exports.Collaborate]
+            }, {
+                provide: SubModelLoader,
+                useClass: exports.NonSubModelLoader
+            }
+        ];
+    }
+    setup(textbus) {
+        const messageBus = textbus.get(MessageBus, null);
+        const connector = textbus.get(SyncConnector);
+        if (messageBus) {
+            const selection = textbus.get(core.Selection);
+            connector.setLocalStateField('message', messageBus.get(textbus));
+            this.subscription.add(messageBus.onSync.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), selection.onChange.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), connector.onStateChange.subscribe((states) => {
+                messageBus.consume(states, textbus);
+            }));
+        }
+        return connector.onLoad.toPromise();
+    }
+    onDestroy(textbus) {
+        this.subscription.unsubscribe();
+        textbus.get(exports.Collaborate).destroy();
+        textbus.get(core.History).destroy();
+        textbus.get(SyncConnector).onDestroy();
+    }
+}
+
 class MultipleDocumentCollaborateModule {
     constructor(config) {
         this.config = config;
+        this.subscription = new stream.Subscription();
         this.providers = [
             exports.Collaborate,
-            exports.UserActivity,
             exports.MultipleDocCollabHistory,
             {
                 provide: core.History,
@@ -1316,15 +1300,25 @@ class MultipleDocumentCollaborateModule {
         ];
     }
     setup(textbus) {
+        const messageBus = textbus.get(MessageBus, null);
         const connector = textbus.get(SyncConnector);
-        const userActivity = textbus.get(exports.UserActivity);
-        userActivity.init(this.config.userinfo);
+        if (messageBus) {
+            const selection = textbus.get(core.Selection);
+            connector.setLocalStateField('message', messageBus.get(textbus));
+            this.subscription.add(messageBus.onSync.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), selection.onChange.subscribe(() => {
+                connector.setLocalStateField('message', messageBus.get(textbus));
+            }), connector.onStateChange.subscribe((states) => {
+                messageBus.consume(states, textbus);
+            }));
+        }
         return connector.onLoad.toPromise();
     }
     onDestroy(textbus) {
+        this.subscription.unsubscribe();
         textbus.get(exports.Collaborate).destroy();
         textbus.get(core.History).destroy();
-        textbus.get(exports.UserActivity).destroy();
         textbus.get(SyncConnector).onDestroy();
     }
 }
@@ -1332,6 +1326,7 @@ class MultipleDocumentCollaborateModule {
 exports.CollaborateModule = CollaborateModule;
 exports.CustomUndoManagerConfig = CustomUndoManagerConfig;
 exports.HocuspocusConnector = HocuspocusConnector;
+exports.MessageBus = MessageBus;
 exports.MultipleDocumentCollaborateModule = MultipleDocumentCollaborateModule;
 exports.SubModelLoader = SubModelLoader;
 exports.SyncConnector = SyncConnector;

package/bundles/multiple-document-collaborate-module.d.ts

@@ -1,12 +1,13 @@
 import { Module, Textbus } from '@textbus/core';
 import { Provider } from '@viewfly/core';
+import { SubModelLoader } from './base/_api';
 import { CollaborateConfig } from './collaborate-module';
-import { SubModelLoader } from './sub-model-loader';
 export interface MultipleDocCollaborateConfig extends CollaborateConfig {
     subModelLoader: SubModelLoader;
 }
 export declare class MultipleDocumentCollaborateModule implements Module {
     config: MultipleDocCollaborateConfig;
+    private subscription;
     providers: Provider[];
     constructor(config: MultipleDocCollaborateConfig);
     setup(textbus: Textbus): Promise<(() => void) | void> | (() => void) | void;

package/bundles/public-api.d.ts

@@ -1,9 +1,4 @@
+export * from './base/_api';
 export * from './connectors/_api';
-export * from './collab-history';
-export * from './collaborate';
 export * from './collaborate-module';
-export * from './multiple-doc-collab-history';
 export * from './multiple-document-collaborate-module';
-export * from './sub-model-loader';
-export * from './sync-connector';
-export * from './user-activity';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.1.0-alpha.1",
+  "version": "4.2.0",
   "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,8 +27,8 @@
   "dependencies": {
     "@hocuspocus/provider": "^2.13.6",
     "@tanbo/stream": "^1.2.5",
-    "@textbus/core": "^4.1.0-alpha.0",
-    "@viewfly/core": "^1.0.4",
+    "@textbus/core": "^4.2.0",
+    "@viewfly/core": "^1.0.5",
     "y-websocket": "^1.4.3",
     "yjs": "^13.6.14"
   },
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "04567b43046abd508826c795a27531b37a7753e3"
+  "gitHead": "cf4fd289b73bc777124a32fe42bb58eba05a34f1"
 }

package/bundles/user-activity.d.ts

@@ -1,23 +0,0 @@
-import { Observable } from '@tanbo/stream';
-import { Selection, SelectionPaths } from '@textbus/core';
-import { SyncConnector } from './sync-connector';
-export interface UserInfo {
-    username: string;
-    color: string;
-    id: string;
-}
-export interface ActivityInfo extends UserInfo {
-    selection: SelectionPaths;
-}
-export declare class UserActivity {
-    private syncConnector;
-    private selection;
-    onStateChange: Observable<ActivityInfo[]>;
-    onUserChange: Observable<UserInfo[]>;
-    private stateChangeEvent;
-    private userChangeEvent;
-    private subscription;
-    constructor(syncConnector: SyncConnector, selection: Selection);
-    init(userinfo: UserInfo): void;
-    destroy(): void;
-}