@univerjs-pro/collaboration-client 0.2.2 → 0.2.4-alpha.0

package/lib/locale/en-US.json

@@ -24,7 +24,8 @@
   "collaboration": {
     "single-unit": {
       "warning": "You opened the same file in another tab. In case of data missing, you cannot edit on this tab."
-    }
+    },
+    "closeRoom": "Editing privileges were revoked because the collaborative room was closed."
   },
   "auth": {
     "needGotoLoginAlert": "Your login has expired, click OK to re-login, click Cancel to save your local edits."

package/lib/locale/ru-RU.json

@@ -24,7 +24,8 @@
   "collaboration": {
     "single-unit": {
       "warning": "You opened the same file in another tab. In case of data missing, you cannot edit on this tab."
-    }
+    },
+    "closeRoom": "Editing privileges were revoked because the collaborative room was closed."
   },
   "auth": {
     "needGotoLoginAlert": "Your login has expired, click OK to re-login, click Cancel to save your local edits."

package/lib/locale/vi-VN.json

@@ -0,0 +1,33 @@
+{
+  "collabStatus": {
+    "fetchMiss": "Syncing server data...",
+    "conflict": "Edit conflicts",
+    "notCollab": "Local file",
+    "synced": "Synced",
+    "syncing": "Syncing...",
+    "offline": "Offline, edits would be save on local"
+  },
+  "session": {
+    "connection-failed": "Connection failed, please check your network.",
+    "will-retry": "Connection failed, we retry in a while.",
+    "room-full": "Collaboration room is full. You edits would be saved locally.",
+    "collaboration-timeout": "The server is not responding to your collaboration request. Your edits would be saved locally."
+  },
+  "conflict": {
+    "title": "Collaboration Conflict",
+    "content": "There is a conflict between your local copy and the copy on the server. Please save your local edits, because they will be lost when you reload the page."
+  },
+  "permission": {
+    "title": "Authentication Error",
+    "content": "Your actions are conflicting with the server's permissions. Please save your local edits elsewhere as they will be discarded after refreshing the page."
+  },
+  "collaboration": {
+    "single-unit": {
+      "warning": "You opened the same file in another tab. In case of data missing, you cannot edit on this tab."
+    },
+    "closeRoom": "Editing privileges were revoked because the collaborative room was closed."
+  },
+  "auth": {
+    "needGotoLoginAlert": "Your login has expired, click OK to re-login, click Cancel to save your local edits."
+  }
+}

package/lib/locale/zh-CN.json

@@ -24,7 +24,8 @@
   "collaboration": {
     "single-unit": {
       "warning": "你在另一个标签页打开了同一个文件。为了避免数据丢失，这个标签页的编辑行为将会被限制。"
-    }
+    },
+    "closeRoom": "由于协同房间被关闭,编辑权限被收回。"
   },
   "auth": {
     "needGotoLoginAlert": "你的登录已过期，点击确认重新登陆，点击取消去保存你的本地编辑。"

package/lib/locale/zh-TW.json

@@ -0,0 +1,33 @@
+{
+  "collabStatus": {
+    "fetchMiss": "Syncing server data...",
+    "conflict": "Edit conflicts",
+    "notCollab": "Local file",
+    "synced": "Synced",
+    "syncing": "Syncing...",
+    "offline": "Offline, edits would be save on local"
+  },
+  "session": {
+    "connection-failed": "Connection failed, please check your network.",
+    "will-retry": "Connection failed, we retry in a while.",
+    "room-full": "Collaboration room is full. You edits would be saved locally.",
+    "collaboration-timeout": "The server is not responding to your collaboration request. Your edits would be saved locally."
+  },
+  "conflict": {
+    "title": "Collaboration Conflict",
+    "content": "There is a conflict between your local copy and the copy on the server. Please save your local edits, because they will be lost when you reload the page."
+  },
+  "permission": {
+    "title": "Authentication Error",
+    "content": "Your actions are conflicting with the server's permissions. Please save your local edits elsewhere as they will be discarded after refreshing the page."
+  },
+  "collaboration": {
+    "single-unit": {
+      "warning": "You opened the same file in another tab. In case of data missing, you cannot edit on this tab."
+    },
+    "closeRoom": "Editing privileges were revoked because the collaborative room was closed."
+  },
+  "auth": {
+    "needGotoLoginAlert": "Your login has expired, click OK to re-login, click Cancel to save your local edits."
+  }
+}

package/lib/types/controllers/collab-cursor/__tests__/doc-collab-cursor.controller.spec.d.ts

@@ -1,5 +1,4 @@
-import { DocumentDataModel, IUniverInstanceService, RxDisposable } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { DocumentDataModel, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { Nullable } from 'vitest';
 import { DocumentViewModel, IRenderManagerService, DocumentSkeleton, IRender, IRenderContext, IRenderModule } from '@univerjs/engine-render';
 

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

@@ -1,5 +1,4 @@
-import { IUniverInstanceService, RxDisposable } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { Observable } from 'rxjs';
 import { IDocCollabCursor, ISheetCollabCursor } from '../../models/cursor';
 import { CollaborationSessionService } from '../../services/collaboration-session/collaboration-session.service';

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

@@ -1,6 +1,5 @@
-import { ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { ICommandService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { ICollaborationUser, ITransformService } from '@univerjs-pro/collaboration';
-import { Injector } from '@wendellhu/redi';
 import { IDocCollabCursor } from '../../models/cursor';
 import { CollaborationSession } from '../../services/collaboration-session/collaboration-session.service';
 import { ColorAssignService } from '../../services/color-assign/color-assign.service';

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

@@ -1,7 +1,6 @@
-import { ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { ICommandService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { RefRangeService } from '@univerjs/sheets';
 import { ICollaborationUser } from '@univerjs-pro/collaboration';
-import { Injector } from '@wendellhu/redi';
 import { ISheetCollabCursor } from '../../models/cursor';
 import { CollaborationSession } from '../../services/collaboration-session/collaboration-session.service';
 import { ColorAssignService } from '../../services/color-assign/color-assign.service';

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

@@ -1,6 +1,5 @@
-import { Disposable, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, Injector, IUniverInstanceService } from '@univerjs/core';
 import { IUIPartsService } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 import { BehaviorSubject } from 'rxjs';
 import { CollaborationController } from '../collaboration/collaboration.controller';
 import { CollaborationStatus } from '../collaboration/collaboration-state';

package/lib/types/controllers/collaboration/__tests__/mock-text-selection-render-manager.service.d.ts

@@ -7,4 +7,4 @@ export declare class TextSelectionRenderManager {
     removeAllTextRanges(): void;
     addTextRanges(): void;
 }
-export declare const ITextSelectionRenderManager: import('@wendellhu/redi').IdentifierDecorator<TextSelectionRenderManager>;
+export declare const ITextSelectionRenderManager: import('@univerjs/core').IdentifierDecorator<TextSelectionRenderManager>;

package/lib/types/controllers/collaboration/__tests__/mocks.d.ts

@@ -1,8 +1,7 @@
-import { ILocalStorageService, Nullable, ILogService } from '@univerjs/core';
+import { IDisposable, ILocalStorageService, Nullable, ILogService } from '@univerjs/core';
 import { IMessageOptions, IMessageProps } from '@univerjs/design';
 import { IBeforeCloseService, IMessageService, INotificationService } from '@univerjs/ui';
 import { ICombResponseEvent } from '@univerjs-pro/collaboration';
-import { IDisposable } from '@wendellhu/redi';
 import { Subject } from 'rxjs';
 import { ICollaborationSocket, ICollaborationSocketService } from '../../../services/socket/collaboration-socket.service';
 
@@ -49,6 +48,7 @@ export declare class MockLocalStorageService implements ILocalStorageService {
 export declare class MockMessageService implements IMessageService {
     show(_options: IMessageOptions & Omit<IMessageProps, 'key'>): IDisposable;
     setContainer(_container: HTMLElement): void;
+    getContainer(): HTMLElement;
 }
 export declare class MockNotificationService implements INotificationService {
     show(): IDisposable;

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

@@ -1,8 +1,7 @@
-import { IMutationInfo, Nullable, ICommandService, IConfigService, ILogService, IPermissionService, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { IMutationInfo, Nullable, ICommandService, IConfigService, ILogService, Injector, IPermissionService, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { INotificationService } from '@univerjs/ui';
 import { IAcknowledgedChangeset, IChangeset, ITransformService, RevisionService } from '@univerjs-pro/collaboration';
 import { UniverType } from '@univerjs/protocol';
-import { Injector } from '@wendellhu/redi';
 import { LocalCacheService } from '../../services/local-cache/local-cache.service';
 import { MemberService } from '../../services/member/member.service';
 import { ICollaborativeUndoRedoService } from '../../services/undoredo/collaborative-undoredo.service';

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

@@ -1,8 +1,7 @@
-import { IMutationInfo, Nullable, ICommandService, ILogService, IPermissionService, IUniverInstanceService, LocaleService, RxDisposable } from '@univerjs/core';
+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 { IDisposable, Injector } from '@wendellhu/redi';
 import { Observable, BehaviorSubject } from 'rxjs';
 import { DocStateChangeManagerService } from '@univerjs/docs';
 import { CollaborationSession, CollaborationSessionService } from '../../services/collaboration-session/collaboration-session.service';

package/lib/types/locale/vi-VN.d.ts

@@ -0,0 +1,4 @@
+import { default as zhCN } from './zh-CN';
+
+declare const locale: typeof zhCN;
+export default locale;

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

@@ -25,6 +25,7 @@ declare const locales: {
         'single-unit': {
             warning: string;
         };
+        closeRoom: string;
     };
     auth: {
         needGotoLoginAlert: string;

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

@@ -0,0 +1,4 @@
+import { default as zhCN } from './zh-CN';
+
+declare const locale: typeof zhCN;
+export default locale;

package/lib/types/plugin.d.ts

@@ -1,5 +1,4 @@
-import { DependencyOverride, ILogService, Plugin, UniverInstanceType } from '@univerjs/core';
-import { Ctor, Injector } from '@wendellhu/redi';
+import { Ctor, DependencyOverride, ILogService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 import { ICollaborationSocketService } from './services/socket/collaboration-socket.service';
 
 export interface ICollaborationClientPluginConfig {

package/lib/types/services/auth-server/authz-io-http.service.d.ts

@@ -1,4 +1,4 @@
-import { IAuthzIoService, IConfigService } from '@univerjs/core';
+import { IAuthzIoService, Disposable, IConfigService } from '@univerjs/core';
 import { HTTPService } from '@univerjs/network';
 import { IActionInfo, IAllowedRequest, IBatchAllowedResponse, ICollaborator, ICreateCollaboratorRequest, ICreateRequest, IDeleteCollaboratorRequest, IListCollaboratorRequest, IListPermPointRequest, IListPermPointResponse, IListRolesRequest, IPutCollaboratorsRequest, IUnitRoleKV, IUpdateCollaboratorRequest, IUpdatePermPointRequest, UnitAction } from '@univerjs/protocol';
 
@@ -7,10 +7,11 @@ import { IActionInfo, IAllowedRequest, IBatchAllowedResponse, ICollaborator, ICr
  * The URL should not ends with a slash.
  */
 export declare const AUTHZ_URL_KEY = "AUTHZ_URL_KEY";
-export declare class AuthzIoHttpService implements IAuthzIoService {
+export declare class AuthzIoHttpService extends Disposable implements IAuthzIoService {
     private _HTTPService;
     private _configService;
     constructor(_HTTPService: HTTPService, _configService: IConfigService);
+    private _initMergeInterceptor;
     private _getAPIPrefixPath;
     create(config: ICreateRequest): Promise<string>;
     list(config: IListPermPointRequest): Promise<IListPermPointResponse['objects']>;

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

@@ -1,7 +1,6 @@
-import { Nullable, Disposable, IConfigService, ILogService, LocaleService, RxDisposable } from '@univerjs/core';
+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 { IDisposable, Injector } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 import { MemberService } from '../member/member.service';
 import { ICollaborationSocket, ICollaborationSocketService } from '../socket/collaboration-socket.service';
@@ -37,6 +36,7 @@ export declare class CollaborationSession extends RxDisposable implements IDispo
     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;
@@ -83,6 +83,7 @@ export declare class CollaborationSessionService extends Disposable {
      * @returns a collaboration session.
      */
     requireSession(unitID: string): Promise<CollaborationSession>;
+    closeSession(unitID: string): void;
     private _createSocket;
     /**
      * Try to establish connection to the collaboration server.

package/lib/types/services/ime-cache-transform/doc-transform-ime-cache.service.d.ts

@@ -1,5 +1,5 @@
 import { ITransformService, IChangeset } from '@univerjs-pro/collaboration';
-import { Injector } from '@wendellhu/redi';
+import { Injector } from '@univerjs/core';
 
 export declare class DocTransformIMECacheService {
     private readonly _injector;

package/lib/types/services/permission/permission.service.d.ts

@@ -0,0 +1,13 @@
+import { Injector, IPermissionService, IUniverInstanceService, LocaleService, RxDisposable } from '@univerjs/core';
+import { CollaborationSessionService } from '../collaboration-session/collaboration-session.service';
+
+export declare class PermissionService extends RxDisposable {
+    private _injector;
+    private _univerInstanceService;
+    private _permissionService;
+    private _collaborationSessionService;
+    private _localeService;
+    constructor(_injector: Injector, _univerInstanceService: IUniverInstanceService, _permissionService: IPermissionService, _collaborationSessionService: CollaborationSessionService, _localeService: LocaleService);
+    private _initCloseConn;
+    private _initUnitPermissionChange;
+}

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

@@ -1,6 +1,10 @@
 import { IChangeset, ITransformService } from '@univerjs-pro/collaboration';
-import { Injector } from '@wendellhu/redi';
+import { Injector } from '@univerjs/core';
 
+export declare function extractTargetFromFirstChangeset(changeset: IChangeset): {
+    unitId: string;
+    subUnitId: string;
+};
 export declare class SheetTransformSelectionsService {
     private readonly _injector;
     private readonly _transformService;

package/lib/types/services/single-active-unit/single-active-unit.service.d.ts

@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
  * especially when the there is not access to the internet. There is a great chance of loosing
  * offline data! So we should make there is only one active unit at a time.
  */
-export declare const ISingleActiveUnitService: import('@wendellhu/redi').IdentifierDecorator<ISingleActiveUnitService>;
+export declare const ISingleActiveUnitService: import('@univerjs/core').IdentifierDecorator<ISingleActiveUnitService>;
 export interface ISingleActiveUnitService {
     editingUnit: (unitID: string) => void;
     getUnitStatus$: (unitID: string) => Observable<UnitStatus>;

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

@@ -16,7 +16,7 @@ export interface ICollaborationSocket extends Pick<ISocket, 'open$' | 'error$' |
 export interface ICollaborationSocketService {
     createSocket: (url: string) => Nullable<ICollaborationSocket>;
 }
-export declare const ICollaborationSocketService: import('@wendellhu/redi').IdentifierDecorator<ICollaborationSocketService>;
+export declare const ICollaborationSocketService: import('@univerjs/core').IdentifierDecorator<ICollaborationSocketService>;
 export declare class CollaborationSocketService implements ICollaborationSocketService {
     protected readonly _http: HTTPService;
     protected readonly _ws: WebSocketService;

package/lib/types/services/text-selection/doc-transform-selections.service.d.ts

@@ -1,5 +1,5 @@
 import { IChangeset, ITransformService } from '@univerjs-pro/collaboration';
-import { Injector } from '@wendellhu/redi';
+import { Injector } from '@univerjs/core';
 
 export declare class DocTransformSelectionsService {
     private readonly _injector;

package/lib/types/services/url/url.service.d.ts

@@ -10,4 +10,4 @@ export interface IURLService {
     removeParam: (key: string, useReplace?: boolean) => void;
     urlChange$: Observable<void>;
 }
-export declare const IURLService: import('@wendellhu/redi').IdentifierDecorator<IURLService>;
+export declare const IURLService: import('@univerjs/core').IdentifierDecorator<IURLService>;