@univerjs-pro/collaboration-client 0.2.10 → 0.2.12

package/lib/locale/en-US.json

@@ -1,4 +1,9 @@
 {
+  "collab-client": {
+    "tooltip": {
+      "reconnect": "Click to Reconnect"
+    }
+  },
   "collabStatus": {
     "fetchMiss": "Syncing server data...",
     "conflict": "Edit conflicts",

package/lib/locale/ru-RU.json

@@ -1,4 +1,9 @@
 {
+  "collab-client": {
+    "tooltip": {
+      "reconnect": "Click to Reconnect"
+    }
+  },
   "collabStatus": {
     "fetchMiss": "Syncing server data...",
     "conflict": "Edit conflicts",

package/lib/locale/vi-VN.json

@@ -1,4 +1,9 @@
 {
+  "collab-client": {
+    "tooltip": {
+      "reconnect": "Click to Reconnect"
+    }
+  },
   "collabStatus": {
     "fetchMiss": "Syncing server data...",
     "conflict": "Edit conflicts",

package/lib/locale/zh-CN.json

@@ -1,17 +1,22 @@
 {
+  "collab-client": {
+    "tooltip": {
+      "reconnect": "点击重新连接"
+    }
+  },
   "collabStatus": {
-    "fetchMiss": "正在同步服务端数据...",
+    "fetchMiss": "正在拉取服务端数据...",
     "conflict": "编辑冲突",
     "notCollab": "本地文件",
-    "synced": "已保存",
+    "synced": "已同步",
     "syncing": "保存中...",
-    "offline": "编辑将在本地保存"
+    "offline": "已离线，编辑将在本地缓存"
   },
   "session": {
     "connection-failed": "连接失败，请检查你的网络",
-    "will-retry": "连接失败，将在一会儿之后重试",
-    "room-full": "协同房间已满，你的编辑将在本地保存",
-    "collaboration-timeout": "服务器未响应你的协同请求，你的编辑将在本地保存"
+    "will-retry": "连接失败，将在一会儿之后重试连接",
+    "room-full": "协同房间已满，你的编辑将在本地缓存",
+    "collaboration-timeout": "服务器未响应，你的编辑将在本地缓存"
   },
   "conflict": {
     "title": "协同冲突",

package/lib/locale/zh-TW.json

@@ -1,4 +1,9 @@
 {
+  "collab-client": {
+    "tooltip": {
+      "reconnect": "Click to Reconnect"
+    }
+  },
   "collabStatus": {
     "fetchMiss": "Syncing server data...",
     "conflict": "Edit conflicts",

package/lib/types/controllers/collab-cursor/doc-collab-cursor-entity.d.ts

@@ -1,10 +1,10 @@
 import { ICommandService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { ICollaborationUser, ITransformService } from '@univerjs-pro/collaboration';
 import { IDocCollabCursor } from '../../models/cursor';
-import { CollaborationSession } from '../../services/collaboration-session/collaboration-session.service';
 import { ColorAssignService } from '../../services/color-assign/color-assign.service';
 import { MemberService } from '../../services/member/member.service';
 import { DocSyncEditingCollabCursorService } from '../../services/sync-editing-collab-cursor/doc-sync-editing-collab-cursor.service';
+import { CollaborationSession } from '../../services/collaboration-session/collaboration-session';
 /**
  * Each univer document instance would map to an `CollabCursorEntity` to handle collaborated editing events.
  */

package/lib/types/controllers/collab-cursor/sheet-collab-cursor-entity.d.ts

@@ -2,9 +2,9 @@ import { ICommandService, Injector, IUniverInstanceService, RxDisposable } from
 import { RefRangeService } from '@univerjs/sheets';
 import { ICollaborationUser } from '@univerjs-pro/collaboration';
 import { ISheetCollabCursor } from '../../models/cursor';
-import { CollaborationSession } from '../../services/collaboration-session/collaboration-session.service';
 import { ColorAssignService } from '../../services/color-assign/color-assign.service';
 import { MemberService } from '../../services/member/member.service';
+import { CollaborationSession } from '../../services/collaboration-session/collaboration-session';
 /**
  * Each univer document instance would map to an `CollabCursorEntity` to handle collaborated editing events.
  */

package/lib/types/controllers/collab-status/collab-status.controller.d.ts

@@ -13,6 +13,6 @@ export declare class DesktopCollaborationStatusDisplayController extends Disposa
     private readonly _collaborationController;
     protected readonly _status$: BehaviorSubject<CollaborationStatus>;
     constructor(_univerInstanceService: IUniverInstanceService, _uiPartsService: IUIPartsService, _injector: Injector, _collaborationController: CollaborationController);
-    protected _initStatusComponent(): void;
     private _initStatusListener;
+    protected _initStatusComponent(): void;
 }

package/lib/types/controllers/collaboration/collaboration-entity.d.ts

@@ -0,0 +1,87 @@
+import { CompressMutationService, RevisionService } from '@univerjs-pro/collaboration';
+import { IDisposable, IMutationInfo, ICommandService, ILogService, Injector, IPermissionService, LocaleService, RxDisposable } from '@univerjs/core';
+import { DocStateChangeManagerService } from '@univerjs/docs';
+import { UniverType } from '@univerjs/protocol';
+import { IMessageService } from '@univerjs/ui';
+import { Observable, BehaviorSubject } from 'rxjs';
+import { Nullable } from 'vitest';
+import { DocTransformIMECacheService } from '../../services/ime-cache-transform/doc-transform-ime-cache.service';
+import { LocalCacheService } from '../../services/local-cache/local-cache.service';
+import { SheetTransformSelectionsService } from '../../services/range-selection/sheet-transform-selections.service';
+import { ISingleActiveUnitService } from '../../services/single-active-unit/single-active-unit.service';
+import { DocSyncEditingCollabCursorService } from '../../services/sync-editing-collab-cursor/doc-sync-editing-collab-cursor.service';
+import { DocTransformSelectionsService } from '../../services/text-selection/doc-transform-selections.service';
+import { CollaborationSession } from '../../services/collaboration-session/collaboration-session';
+import { CollaborationState, ICollaborationStateHandler, CollaborationStatus } from './collaboration-state';
+/**
+ * Each univer document instance would map to an `CollaborationEntity` to handle collaborated editing events.
+ */
+export declare abstract class CollaborationEntity extends RxDisposable {
+    readonly unitID: string;
+    readonly session: CollaborationSession;
+    protected readonly _type: UniverType;
+    protected readonly _injector: Injector;
+    protected readonly _localCacheService: LocalCacheService;
+    protected readonly _compressMutationService: CompressMutationService;
+    protected readonly _localeService: LocaleService;
+    protected readonly _revisionService: RevisionService;
+    protected readonly _logService: ILogService;
+    protected readonly _commandService: ICommandService;
+    protected readonly _messageService: IMessageService;
+    private _permissionService;
+    protected readonly _singleActiveUnitService?: ISingleActiveUnitService | undefined;
+    protected _state$: BehaviorSubject<Nullable<CollaborationState>>;
+    readonly state$: Observable<Nullable<CollaborationState>>;
+    protected _state: CollaborationState;
+    get state(): CollaborationState;
+    protected _collaborationPaused: boolean;
+    readonly status$: Observable<CollaborationStatus>;
+    constructor(unitID: string, session: CollaborationSession, _type: UniverType, _injector: Injector, _localCacheService: LocalCacheService, _compressMutationService: CompressMutationService, _localeService: LocaleService, _revisionService: RevisionService, _logService: ILogService, _commandService: ICommandService, _messageService: IMessageService, _permissionService: IPermissionService, _singleActiveUnitService?: ISingleActiveUnitService | undefined);
+    init(): Promise<void>;
+    /**
+     * Pause collaboration on the document. Remote changesets would be inserted to a queue and wait for resuming.
+     * @returns a disposable which will resume collaboration when called.
+     */
+    pauseCollaboration(): IDisposable;
+    private _updateState;
+    protected _init(): Promise<CollaborationState>;
+    /**
+     * Could not transit the state twice at the same time. So we put a lock here in case of implementation fault.
+     */
+    private _transitionLocked;
+    private _unlockTransition;
+    private _lockTransition;
+    protected _onLocalMutation(command: IMutationInfo): void;
+    private _remoteChangesetQueue;
+    private _onRemoteChangeset;
+    private _exhaustRemoteChangesetQueue;
+    private _applyRemoteChangeset;
+    private _onRemoteACK;
+    private _onRemoteRejected;
+    private _onFetchMissResult;
+    private _toggleOffline;
+    private _toggleOnline;
+    private _createInitialState;
+    protected _createHandler(): ICollaborationStateHandler;
+    private _createInitialStateImpl;
+    private _replayCachedMutations;
+}
+export declare class DocCollaborationEntity extends CollaborationEntity {
+    readonly unitID: string;
+    readonly type: UniverType;
+    private readonly _docStateChangeManagerService;
+    private readonly _docTransformIMECacheService;
+    private readonly _docTransformSelectionsService;
+    private readonly _docSyncEditingCollabCursorService;
+    constructor(unitID: string, type: UniverType, session: CollaborationSession, injector: Injector, localCacheService: LocalCacheService, compressMutationService: CompressMutationService, localeService: LocaleService, revisionService: RevisionService, _docStateChangeManagerService: DocStateChangeManagerService, _docTransformIMECacheService: DocTransformIMECacheService, _docTransformSelectionsService: DocTransformSelectionsService, _docSyncEditingCollabCursorService: DocSyncEditingCollabCursorService, logService: ILogService, commandService: ICommandService, messageService: IMessageService, permissionService: IPermissionService, singleActiveUnitService?: ISingleActiveUnitService);
+    protected _createHandler(): ICollaborationStateHandler;
+    protected _init(): Promise<CollaborationState>;
+}
+export declare class SheetCollaborationEntity extends CollaborationEntity {
+    readonly unitID: string;
+    readonly type: UniverType;
+    private readonly _sheetTransformSelectionsService;
+    constructor(unitID: string, type: UniverType, session: CollaborationSession, injector: Injector, localCacheService: LocalCacheService, compressMutationService: CompressMutationService, localeService: LocaleService, revisionService: RevisionService, _sheetTransformSelectionsService: SheetTransformSelectionsService, logService: ILogService, commandService: ICommandService, messageService: IMessageService, permissionService: IPermissionService, singleActiveUnitService?: ISingleActiveUnitService);
+    protected _createHandler(): ICollaborationStateHandler;
+    protected _init(): Promise<CollaborationState>;
+}

package/lib/types/controllers/collaboration/collaboration-state.d.ts

@@ -120,6 +120,7 @@ export declare class SyncedState extends CollaborationState {
     toggleOffline(): CollaborationState;
     toggleOnline(): CollaborationState;
     resend(): void;
+    fetchMiss(): CollaborationState;
 }
 /**
  * Some local changes are waiting to be sent to the server. But no changesets are waiting for acknowledgement.
@@ -148,7 +149,7 @@ export declare class PendingState extends CollaborationState {
      *
      * @internal
      */
-    _schedule(timeout?: number): void;
+    _schedule(t?: number): void;
     private _getSendChangesetTimeout;
     resend(): void;
     private _clearScheduledTask;

package/lib/types/controllers/collaboration/collaboration.controller.d.ts

@@ -1,17 +1,7 @@
-import { IDisposable, IMutationInfo, Nullable, ICommandService, ILogService, Injector, IPermissionService, IUniverInstanceService, LocaleService, RxDisposable } from '@univerjs/core';
-import { IMessageService } from '@univerjs/ui';
-import { CompressMutationService, RevisionService } from '@univerjs-pro/collaboration';
-import { UniverType } from '@univerjs/protocol';
-import { Observable, BehaviorSubject } from 'rxjs';
-import { DocStateChangeManagerService } from '@univerjs/docs';
-import { CollaborationSession, CollaborationSessionService } from '../../services/collaboration-session/collaboration-session.service';
-import { LocalCacheService } from '../../services/local-cache/local-cache.service';
-import { ISingleActiveUnitService } from '../../services/single-active-unit/single-active-unit.service';
-import { DocTransformIMECacheService } from '../../services/ime-cache-transform/doc-transform-ime-cache.service';
-import { DocTransformSelectionsService } from '../../services/text-selection/doc-transform-selections.service';
-import { DocSyncEditingCollabCursorService } from '../../services/sync-editing-collab-cursor/doc-sync-editing-collab-cursor.service';
-import { SheetTransformSelectionsService } from '../../services/range-selection/sheet-transform-selections.service';
-import { CollaborationState, ICollaborationStateHandler, CollaborationStatus } from './collaboration-state';
+import { Nullable, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { Observable } from 'rxjs';
+import { CollaborationSessionService } from '../../services/collaboration-session/collaboration-session.service';
+import { CollaborationEntity } from './collaboration-entity';
 export declare class CollaborationController extends RxDisposable {
     private readonly _injector;
     private readonly _collabSessionService;
@@ -32,77 +22,3 @@ export declare class CollaborationController extends RxDisposable {
     private _startCollaboration;
     private _getCtorByUniverType;
 }
-/**
- * Each univer document instance would map to an `CollaborationEntity` to handle collaborated editing events.
- */
-export declare abstract class CollaborationEntity extends RxDisposable {
-    readonly unitID: string;
-    protected readonly _type: UniverType;
-    protected readonly _session: CollaborationSession;
-    protected readonly _injector: Injector;
-    protected readonly _localCacheService: LocalCacheService;
-    protected readonly _compressMutationService: CompressMutationService;
-    protected readonly _localeService: LocaleService;
-    protected readonly _revisionService: RevisionService;
-    protected readonly _logService: ILogService;
-    protected readonly _commandService: ICommandService;
-    protected readonly _messageService: IMessageService;
-    private _permissionService;
-    protected readonly _singleActiveUnitService?: ISingleActiveUnitService | undefined;
-    protected _state$: BehaviorSubject<Nullable<CollaborationState>>;
-    readonly state$: Observable<Nullable<CollaborationState>>;
-    protected _state: CollaborationState;
-    get state(): CollaborationState;
-    protected _collaborationPaused: boolean;
-    readonly status$: Observable<CollaborationStatus>;
-    constructor(unitID: string, _type: UniverType, _session: CollaborationSession, _injector: Injector, _localCacheService: LocalCacheService, _compressMutationService: CompressMutationService, _localeService: LocaleService, _revisionService: RevisionService, _logService: ILogService, _commandService: ICommandService, _messageService: IMessageService, _permissionService: IPermissionService, _singleActiveUnitService?: ISingleActiveUnitService | undefined);
-    init(): Promise<void>;
-    /**
-     * Pause collaboration on the document. Remote changesets would be inserted to a queue and wait for resuming.
-     * @returns a disposable which will resume collaboration when called.
-     */
-    pauseCollaboration(): IDisposable;
-    private _updateState;
-    protected _init(): Promise<CollaborationState>;
-    /**
-     * Could not transit the state twice at the same time. So we put a lock here in case of implementation fault.
-     */
-    private _transitionLocked;
-    private _unlockTransition;
-    private _lockTransition;
-    protected _onLocalMutation(command: IMutationInfo): void;
-    private _remoteChangesetQueue;
-    private _onRemoteChangeset;
-    private _exhaustRemoteChangesetQueue;
-    private _applyRemoteChangeset;
-    private _onRemoteACK;
-    private _onRemoteRejected;
-    private _onFetchMissResult;
-    private _toggleOffline;
-    private _toggleOnline;
-    private _createInitialState;
-    protected _createHandler(): ICollaborationStateHandler;
-    private _createInitialStateImpl;
-    private _replayCachedMutations;
-}
-export declare class DocCollaborationEntity extends CollaborationEntity {
-    readonly unitID: string;
-    readonly type: UniverType;
-    readonly session: CollaborationSession;
-    private readonly _docStateChangeManagerService;
-    private readonly _docTransformIMECacheService;
-    private readonly _docTransformSelectionsService;
-    private readonly _docSyncEditingCollabCursorService;
-    constructor(unitID: string, type: UniverType, session: CollaborationSession, injector: Injector, localCacheService: LocalCacheService, compressMutationService: CompressMutationService, localeService: LocaleService, revisionService: RevisionService, _docStateChangeManagerService: DocStateChangeManagerService, _docTransformIMECacheService: DocTransformIMECacheService, _docTransformSelectionsService: DocTransformSelectionsService, _docSyncEditingCollabCursorService: DocSyncEditingCollabCursorService, logService: ILogService, commandService: ICommandService, messageService: IMessageService, permissionService: IPermissionService, singleActiveUnitService?: ISingleActiveUnitService);
-    protected _createHandler(): ICollaborationStateHandler;
-    protected _init(): Promise<CollaborationState>;
-}
-export declare class SheetCollaborationEntity extends CollaborationEntity {
-    readonly unitID: string;
-    readonly type: UniverType;
-    readonly session: CollaborationSession;
-    private readonly _sheetTransformSelectionsService;
-    constructor(unitID: string, type: UniverType, session: CollaborationSession, injector: Injector, localCacheService: LocalCacheService, compressMutationService: CompressMutationService, localeService: LocaleService, revisionService: RevisionService, _sheetTransformSelectionsService: SheetTransformSelectionsService, logService: ILogService, commandService: ICommandService, messageService: IMessageService, permissionService: IPermissionService, singleActiveUnitService?: ISingleActiveUnitService);
-    protected _createHandler(): ICollaborationStateHandler;
-    protected _init(): Promise<CollaborationState>;
-}

package/lib/types/controllers/config.schema.d.ts

@@ -0,0 +1,5 @@
+export declare const PLUGIN_CONFIG_KEY = "collaboration-client.config";
+export declare const configSymbol: unique symbol;
+export interface IUniverCollaborationClientConfig {
+}
+export declare const defaultPluginConfig: IUniverCollaborationClientConfig;

package/lib/types/controllers/telemetry.d.ts

@@ -0,0 +1,11 @@
+import { IMutationInfo, UniverInstanceType } from '@univerjs/core';
+export declare const TELEMETRY_COLLABORATION_NEW_CHANGESET = "collaboration_new_changeset";
+export interface INewChangesetTelemetryInfo {
+    startTime: number;
+    stopTime: number;
+    duration: number;
+    size: number;
+    type: UniverInstanceType;
+    unitId: string;
+}
+export declare function summaryChangesetSize(mutations: IMutationInfo[]): number;

package/lib/types/index.d.ts

@@ -1,8 +1,10 @@
-export { SNAPSHOT_SERVER_URL_KEY, SNAPSHOT_URL_KEY, SEND_CHANGESET_TIMEOUT_KEY, COLLAB_WEB_SOCKET_URL_KEY, HEARTBEAT_INTERVAL_KEY, HEARTBEAT_TIMEOUT_KEY, LOCAL_CACHE_INTERVAL_KEY, COLLAB_SUBMIT_CHANGESET_URL_KEY, LOGIN_URL_KEY, } from './config/config';
+export { SNAPSHOT_SERVER_URL_KEY, SNAPSHOT_URL_KEY, SEND_CHANGESET_TIMEOUT_KEY, COLLAB_WEB_SOCKET_URL_KEY, HEARTBEAT_INTERVAL_KEY, HEARTBEAT_TIMEOUT_KEY, LOCAL_CACHE_INTERVAL_KEY, RETRY_CONNECTING_INTERVAL_KEY, RETRY_CONNECTING_MAX_COUNT_KEY, COLLAB_SUBMIT_CHANGESET_URL_KEY, LOGIN_URL_KEY, } from './config/config';
 export { CollaborationController } from './controllers/collaboration/collaboration.controller';
+export { CollaborationEntity, SheetCollaborationEntity, DocCollaborationEntity } from './controllers/collaboration/collaboration-entity';
 export { CollaborationStatus } from './controllers/collaboration/collaboration-state';
 export { UniverCollaborationClientPlugin, type ICollaborationClientPluginConfig } from './plugin';
-export { CollaborationSession, CollaborationSessionService, SessionStatus, } from './services/collaboration-session/collaboration-session.service';
+export { CollaborationSessionService } from './services/collaboration-session/collaboration-session.service';
+export { CollaborationSession, SessionStatus } from './services/collaboration-session/collaboration-session';
 export type { ICollaborationSocket } from './services/socket/collaboration-socket.service';
 export { CollaborationSocketService, ICollaborationSocketService, } from './services/socket/collaboration-socket.service';
 export { LocalCacheService } from './services/local-cache/local-cache.service';
@@ -15,6 +17,5 @@ export { deserializeToCombResponse, serializeCombRequest } from './services/sock
 export { CollaborationStatusDisplay } from './views/components/CollabStatus';
 export { SnapshotServerOverHTTPService } from './services/snapshot-server/snapshot-server.service';
 export { CommentService } from './services/comment/comment.service';
-export { SheetCollaborationEntity } from './controllers/collaboration/collaboration.controller';
 export { SheetCollabCursorShape, type ISheetCollabCursorShapeProps } from './views/shapes/sheet-collab-cursor.shape';
 export { ImageIoService } from './services/image-remote/image-io.service';

package/lib/types/locale/zh-CN.d.ts

@@ -1,4 +1,9 @@
 declare const locales: {
+    'collab-client': {
+        tooltip: {
+            reconnect: string;
+        };
+    };
     collabStatus: {
         fetchMiss: string;
         conflict: string;

package/lib/types/plugin.d.ts

@@ -1,4 +1,4 @@
-import { Ctor, DependencyOverride, ILogService, Injector, Plugin } from '@univerjs/core';
+import { Ctor, DependencyOverride, IConfigService, ILogService, Injector, Plugin } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { ICollaborationSocketService } from './services/socket/collaboration-socket.service';
 export interface ICollaborationClientPluginConfig {
@@ -16,8 +16,9 @@ export declare class UniverCollaborationClientPlugin extends Plugin {
     private readonly _logService;
     private readonly _renderManagerService;
     protected _injector: Injector;
+    private readonly _configService;
     static pluginName: string;
-    constructor(_config: ICollaborationClientPluginConfig | undefined, _logService: ILogService, _renderManagerService: IRenderManagerService, _injector: Injector);
+    constructor(_config: ICollaborationClientPluginConfig | undefined, _logService: ILogService, _renderManagerService: IRenderManagerService, _injector: Injector, _configService: IConfigService);
     onStarting(): void;
     onRendered(): void;
     private _registerDependencies;

package/lib/types/services/collaboration-session/collaboration-session.d.ts

@@ -0,0 +1,59 @@
+import { ICollaborationEvent } from '@univerjs-pro/collaboration';
+import { IDisposable, Nullable, IConfigService, ILogService, LocaleService, RxDisposable } from '@univerjs/core';
+import { IBeforeCloseService, IMessageService } from '@univerjs/ui';
+import { Observable } from 'rxjs';
+import { ITelemetryService } from '@univerjs/telemetry';
+import { CommentService } from '../comment/comment.service';
+import { MemberService } from '../member/member.service';
+import { ICollaborationSocket } from '../socket/collaboration-socket.service';
+export declare enum SessionStatus {
+    IDLE = 0,
+    JOINING = 1,
+    OFFLINE = 2,
+    ONLINE = 3
+}
+/**
+ * The data structure to represent a collaboration session. It also manages the collaborator's identity.
+ *
+ * An collaboration session maps to a unit.
+ */
+export declare class CollaborationSession extends RxDisposable implements IDisposable {
+    private readonly _unitID;
+    private readonly _logService;
+    private readonly _beforeCloseService;
+    private readonly _messageService;
+    private readonly _configService;
+    private readonly _localeService;
+    private readonly _memberService;
+    private readonly _commentService;
+    private readonly _telemetryService?;
+    private readonly _sessionStatus$;
+    readonly sessionStatus$: Observable<SessionStatus>;
+    get sessionStatus(): SessionStatus;
+    private readonly _event$;
+    readonly event$: Observable<ICollaborationEvent>;
+    private _socket;
+    private _socketMessageSubscription;
+    constructor(_unitID: string, socket$: Observable<Nullable<ICollaborationSocket>>, _logService: ILogService, _beforeCloseService: IBeforeCloseService, _messageService: IMessageService, _configService: IConfigService, _localeService: LocaleService, _memberService: MemberService, _commentService: CommentService, _telemetryService?: ITelemetryService | undefined);
+    getMemberID(): string | null;
+    dispose(): void;
+    close(): void;
+    private _onCombEvent;
+    private _joinRoom;
+    private _onJoinRoomEvent;
+    private _onRecvEvent;
+    private _onUserJoin;
+    private _onUserLeave;
+    /**
+     * Send event to the collaboration server.
+     */
+    send(event: ICollaborationEvent, unitID: string): Promise<void>;
+    private _collaborationTimeoutTimer;
+    private _scheduleCollaborationTimeoutTimer;
+    private _clearCollaborationTimeoutTimer;
+    private _shouldReportTelemetry;
+    private _telemetryInfo;
+    private _startTelemetryCollaborationNewChangeset;
+    private _stopTelemetryCollaborationNewChangeset;
+    private _throwTelemetryCollaborationNewChangeset;
+}

package/lib/types/services/collaboration-session/collaboration-session.service.d.ts

@@ -1,55 +1,7 @@
-import { IDisposable, Nullable, Disposable, IConfigService, ILogService, Injector, LocaleService, RxDisposable } from '@univerjs/core';
-import { IBeforeCloseService, IMessageService } from '@univerjs/ui';
-import { ICollaborationEvent } from '@univerjs-pro/collaboration';
-import { Observable } from 'rxjs';
-import { MemberService } from '../member/member.service';
+import { Nullable, Disposable, IConfigService, ILogService, Injector, LocaleService } from '@univerjs/core';
+import { IMessageService } from '@univerjs/ui';
 import { ICollaborationSocket, ICollaborationSocketService } from '../socket/collaboration-socket.service';
-import { CommentService } from '../comment/comment.service';
-export declare enum SessionStatus {
-    IDLE = 0,
-    JOINING = 1,
-    OFFLINE = 2,
-    ONLINE = 3
-}
-/**
- * The data structure to represent a collaboration session. It also manages the collaborator's identity.
- *
- * An collaboration session maps to a unit.
- */
-export declare class CollaborationSession extends RxDisposable implements IDisposable {
-    private readonly _unitID;
-    private readonly _logService;
-    private readonly _beforeCloseService;
-    private readonly _messageService;
-    private readonly _configService;
-    private readonly _localeService;
-    private readonly _memberService;
-    private readonly _commentService;
-    private readonly _sessionStatus$;
-    readonly sessionStatus$: Observable<SessionStatus>;
-    get sessionStatus(): SessionStatus;
-    private readonly _event$;
-    readonly event$: Observable<ICollaborationEvent>;
-    private _socket;
-    private _socketMessageSubscription;
-    constructor(_unitID: string, socket$: Observable<Nullable<ICollaborationSocket>>, _logService: ILogService, _beforeCloseService: IBeforeCloseService, _messageService: IMessageService, _configService: IConfigService, _localeService: LocaleService, _memberService: MemberService, _commentService: CommentService);
-    getMemberID(): string | null;
-    dispose(): void;
-    close(): void;
-    private _onCombEvent;
-    private _joinRoom;
-    private _onJoinRoomEvent;
-    private _onRecvEvent;
-    private _onUserJoin;
-    private _onUserLeave;
-    /**
-     * Send event to the collaboration server.
-     */
-    send(event: ICollaborationEvent, unitID: string): Promise<void>;
-    private _collaborationTimeoutTimer;
-    private _scheduleCollaborationTimeoutTimer;
-    private _clearCollaborationTimeoutTimer;
-}
+import { CollaborationSession, SessionStatus } from './collaboration-session';
 /**
  * This service provide collaboration sessions to univer instances. A collaboration session
  * may be used by different controllers of different features.
@@ -65,13 +17,12 @@ export declare class CollaborationSessionService extends Disposable {
      * Socket for collaboration sessions. Session are by unitID but the socket is share by collaboration sessions.
      */
     private _socket$;
+    readonly socket$: import('rxjs').Observable<Nullable<ICollaborationSocket>>;
     private get _socket();
     private _sessions;
     private _status$;
-    status$: Observable<SessionStatus>;
+    status$: import('rxjs').Observable<SessionStatus>;
     private _socketReady;
-    private _sendHeartbeatTimer;
-    private _timeoutTimer;
     private _retryConnectingTimer;
     private _retryCount;
     constructor(_injector: Injector, _localeService: LocaleService, _messageService: IMessageService, _logService: ILogService, _configService: IConfigService, _socketService: ICollaborationSocketService);
@@ -83,6 +34,7 @@ export declare class CollaborationSessionService extends Disposable {
      */
     requireSession(unitID: string): Promise<CollaborationSession>;
     closeSession(unitID: string): void;
+    reconnect(): void;
     private _createSocket;
     /**
      * Try to establish connection to the collaboration server.
@@ -91,12 +43,17 @@ export declare class CollaborationSessionService extends Disposable {
      */
     private _tryEnsureSocket;
     private _onConnectionOpen;
+    private _listenToOfflineEvent;
+    private _onOffline;
     private _onConnectionFailed;
-    private _scheduleReconnection;
-    private _rescheduleHeartbeatEvent;
+    private _listenToOnlineEvent;
+    private _tryReconnect;
+    private _onMessage;
+    private _sendHeartbeatTimer;
+    private _timeoutTimer;
+    private _rescheduleHeartbeat;
     private _sendHeartbeat;
     private _waitForHeartbeatResponse;
-    private _onMessage;
     private _clearHeartbeatTimer;
     private _clearTimeoutTimer;
 }

package/lib/types/services/range-selection/sheet-transform-selections.service.d.ts

@@ -1,5 +1,5 @@
 import { IChangeset, ITransformService } from '@univerjs-pro/collaboration';
-import { Injector } from '@univerjs/core';
+import { Injector, IUniverInstanceService } from '@univerjs/core';
 export declare function extractTargetFromFirstChangeset(changeset: IChangeset): {
     unitId: string;
     subUnitId: string;
@@ -7,6 +7,7 @@ export declare function extractTargetFromFirstChangeset(changeset: IChangeset):
 export declare class SheetTransformSelectionsService {
     private readonly _injector;
     private readonly _transformService;
-    constructor(_injector: Injector, _transformService: ITransformService);
+    private readonly _instanceService;
+    constructor(_injector: Injector, _transformService: ITransformService, _instanceService: IUniverInstanceService);
     transformSelections(changeset: IChangeset): void;
 }