@netless/forge-imagery-doc 0.1.3 → 1.0.0

package/src/ImageryDocPermissions.ts

@@ -1,6 +1,4 @@
-import { type RoomUser, type UserManager } from '@netless/forge-room';
-import EventEmitter from 'eventemitter3';
-import * as Y from 'yjs';
+import { AbstractApplicationPermissions, ApplicationPermissionEvents } from '@netless/forge-room';
 
 export enum ImageryDocPermissionFlag {
     /**
@@ -27,7 +25,7 @@ export enum ImageryDocPermissionFlag {
         ImageryDocPermissionFlag.sideBar
 }
 
-export interface ImageryDocPermissionEvents {
+export interface ImageryDocPermissionEvents extends ApplicationPermissionEvents {
     /**
      * 当用户权限变更时触发
      * @param { string } userId 对应 userId
@@ -37,64 +35,7 @@ export interface ImageryDocPermissionEvents {
     change: (userId: string, flags: ImageryDocPermissionFlag[], value: number) => void;
 }
 
-export class ImageryDocPermissions extends EventEmitter<ImageryDocPermissionEvents> {
-
-  private requestUserMap: (userId: string) => Y.Map<any>;
-  private userManager: UserManager;
-  private observers: Map<string, any> = new Map();
-
-  public constructor(
-    userManager: UserManager,
-    requestUserMap: (userId: string) => Y.Map<any>,
-  ) {
-    super();
-    this.userManager = userManager;
-    this.requestUserMap = requestUserMap;
-    this.createModel(this.userManager.selfId);
-    this.userManager.userIdList().forEach((userId) => {
-      this.addObserve(userId);
-    });
-
-    this.userManager.on('join', this.handleUserJoin);
-    this.userManager.on('leave', this.handleUserLeave);
-  }
-
-  private handleUserLeave = (user: RoomUser) => {
-    const cb = this.observers.get(user.id);
-    if (cb) {
-      this.requestUserMap(user.id).unobserve(cb);
-    }
-  };
-
-  private handleUserJoin = (user: RoomUser) => {
-    this.addObserve(user.id);
-  };
-
-  private addObserve(userId: string) {
-    const observer = (evt: Y.YMapEvent<any>) => {
-      this.handleUserPermissionChange(userId, evt);
-    };
-    this.observers.set(userId, observer);
-    this.requestUserMap(userId).observe(observer);
-  }
-
-  private createModel(userId: string) {
-    const userMap = this.requestUserMap(userId);
-    if (!userMap.has('permission')) {
-      userMap.set('permission', 0);
-    }
-  }
-
-  private handleUserPermissionChange(userId: string, evt: Y.YMapEvent<any>) {
-    for (const [key, value] of evt.changes.keys.entries()) {
-      if (key === 'permission') {
-        if (value.action === 'add' || value.action === 'update') {
-          const newValue = this.requestUserMap(userId).get('permission');
-          this.emit('change', userId, this.resolveFlags(newValue), newValue);
-        }
-      }
-    }
-  }
+export class ImageryDocPermissions extends AbstractApplicationPermissions<ImageryDocPermissionFlag, ImageryDocPermissionEvents> {
 
   /**
      * 解析权限列表组合
@@ -108,62 +49,5 @@ export class ImageryDocPermissions extends EventEmitter<ImageryDocPermissionEven
       ImageryDocPermissionFlag.camera,
     ].filter(v => (v & value) !== 0);
   }
-
-  /**
-     * 获取权限列表组合对应的数值
-     * @param { string } userId 不传表示获取自己
-     */
-  public getPermissionValue(userId?: string): number {
-    return this.requestUserMap(userId ?? this.userManager.selfId).get('permission') ?? 0;
-  }
-
-  /**
-     * 获取权限列表
-     * @param {string=} userId 可选, 不传表示获取自己
-     */
-  public getPermissionFlags(userId?: string): ImageryDocPermissionFlag[] {
-    const value = this.requestUserMap(userId ?? this.userManager.selfId).get('permission') ?? 0;
-    return this.resolveFlags(value);
-  }
-
-  /**
-     * 返回对应 userId 是否有相应权限
-     * @param {string=} userId 可选, 不传表示返回自己是否有相应权限
-     * @param {WhiteboardPermissionFlag} flag
-     */
-  public hasPermission(flag: ImageryDocPermissionFlag, userId?: string): boolean {
-    return ((this.requestUserMap(userId ?? this.userManager.selfId).get('permission') ?? 0) & flag) !== 0;
-  }
-
-  /**
-     * 添加权限
-     * @param {WhiteboardPermissionFlag} flag 权限标记
-     * @param {string=} userId 可选, 为 userId 添加权限, 不传表示为自己添加权限
-     */
-  public addPermission(flag: ImageryDocPermissionFlag, userId?: string) {
-    const userMap = this.requestUserMap(userId ?? this.userManager.selfId);
-    const oldValue = userMap.get('permission') ?? 0;
-    this.requestUserMap(userId ?? this.userManager.selfId).set('permission', oldValue | flag);
-  }
-
-  /**
-     * 移除权限
-     * @param {WhiteboardPermissionFlag} flag 权限标记
-     * @param {string=} userId 可选, 为 userId 移除权限, 不传表示为自己移除权限
-     */
-  public removePermission(flag: ImageryDocPermissionFlag, userId?: string) {
-    const userMap = this.requestUserMap(userId ?? this.userManager.selfId);
-    const oldValue = userMap.get('permission') ?? 0;
-    this.requestUserMap(userId ?? this.userManager.selfId).set('permission', oldValue & (~flag));
-  }
-
-  public dispose() {
-    this.userManager.off('join', this.handleUserJoin);
-    this.userManager.off('leave', this.handleUserLeave);
-    for (const [userId, observer] of this.observers) {
-      this.requestUserMap(userId).unobserve(observer);
-    }
-    this.observers.clear();
-    this.removeAllListeners();
-  }
+  
 }

package/src/SingleContainer.ts

@@ -4,6 +4,7 @@ import * as Y from 'yjs';
 import { WhiteboardApplication } from '@netless/forge-whiteboard';
 import type { ImageryDoc } from './ImageryDoc';
 import { Container, ContainerKeys } from './Container';
+import { removeObserver } from '@netless/forge-room';
 
 export const delay = (value: number) => new Promise(resolve => setTimeout(resolve, value));
 
@@ -95,14 +96,14 @@ export class SingleContainer implements Container {
       this.scale = nextScale;
       this.handleTranslate(0, 0);
     });
-    //@ts-ignore
-    window.__doc = this;
   }
 
   public init() {
     this.handleGoto(this.pageIndex)
       .catch(_error => {
-        // todo error
+        console.error(_error);
+      }).finally(() => {
+        this.handleResize();
       });
     this.updateSyncedTransform();
   }
@@ -251,7 +252,7 @@ export class SingleContainer implements Container {
   };
 
   public dispose() {
-    this.map.unobserve(this.handleMapChange);
+    removeObserver(this.map, this.handleMapChange);
     this.resizeObserver.disconnect();
     this.scroll.dispose();
   }