@netless/appliance-plugin 1.1.0-beta.1 → 1.1.1-beta.0

package/dist/appliance-plugin.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DmfRoAiB.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.ECanvasContextType=e.ECanvasContextType;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EPostMessageType=e.EPostMessageType;exports.EScaleType=e.EScaleType;exports.EStrokeType=e.EStrokeType;exports.EToolsKey=e.EToolsKey;exports.ElayerType=e.ElayerType;exports.EmitEventType=e.EmitEventType;exports.EventMessageType=e.EventMessageType;exports.EvevtWorkState=e.EvevtWorkState;exports.EvevtWorkType=e.EvevtWorkType;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-Bc02VTGL.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.ECanvasContextType=e.ECanvasContextType;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EPostMessageType=e.EPostMessageType;exports.EScaleType=e.EScaleType;exports.EStrokeType=e.EStrokeType;exports.EToolsKey=e.EToolsKey;exports.ElayerType=e.ElayerType;exports.EmitEventType=e.EmitEventType;exports.EventMessageType=e.EventMessageType;exports.EvevtWorkState=e.EvevtWorkState;exports.EvevtWorkType=e.EvevtWorkType;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;

package/dist/appliance-plugin.mjs

@@ -1,4 +1,4 @@
-import { H as s, A as p, B as t, z as r, y as l, J as n, K as y, h as E, r as i, k as T, O as o, F as v, E as g, N as S, p as c, L as k, a as A, P as u, I as M, G as W, w as m, x } from "./index-CIJP6_Qj.mjs";
+import { H as s, A as p, B as t, z as r, y as l, J as n, K as y, h as E, r as i, k as T, O as o, F as v, E as g, N as S, p as c, L as k, a as A, P as u, I as M, G as W, w as m, x } from "./index-DXSmA8_B.mjs";
 export {
   s as ActiveContainerType,
   p as ApplianceMultiPlugin,

package/dist/collector/base.d.ts

@@ -1,15 +1,18 @@
 import type { AppliancePluginLike } from "../plugin/types";
 import { IworkId } from "../core";
 import { BaseApplianceManager } from "../plugin/baseApplianceManager";
+import { ISerializableAuthData } from "./types";
 export declare abstract class BaseCollector<T> {
     plugin: AppliancePluginLike;
     uid: string;
     abstract serviceStorage: T;
     abstract storage: T;
     protected abstract namespace: string;
+    protected abstract authSpace: string;
     readonly control: BaseApplianceManager;
     constructor(control: BaseApplianceManager, plugin: AppliancePluginLike);
     getNamespaceData(): T;
+    getAuthSpaceData(): ISerializableAuthData;
     getUidFromKey(key: string): string;
     isLocalId(key: string): boolean;
     getLocalId(key: string): string;

package/dist/collector/collector.d.ts

@@ -1,4 +1,5 @@
-import { BaseCollectorReducerAction, Diff, ISerializableStorageData, ISerializableStorageViewData } from "./types";
+import { EPostMessageType } from "../core/enum";
+import { AuthWriteData, BaseCollectorReducerAction, Diff, DiffAuthRender, ISerializableAuthData, ISerializableAuthRenderItemType, ISerializableStorageData, ISerializableStorageViewData, ViewId } from "./types";
 import { BaseCollector } from "./base";
 import type { AppliancePluginLike } from "../plugin/types";
 import { BaseApplianceManager } from "../plugin/baseApplianceManager";
@@ -6,12 +7,16 @@ import { BaseApplianceManager } from "../plugin/baseApplianceManager";
  * 服务端事件/状态同步收集器
  */
 export declare class Collector extends BaseCollector<ISerializableStorageViewData> {
+    protected authSpace: string;
     protected namespace: string;
     static namespace: string;
+    static authSpace: string;
     static syncInterval: number;
     serviceStorage: ISerializableStorageViewData;
     storage: ISerializableStorageViewData;
+    authStorage: ISerializableAuthData;
     private stateDisposer;
+    private authDisposer;
     private asyncClockState;
     constructor(control: BaseApplianceManager, plugin: AppliancePluginLike, syncInterval?: number);
     getViewIdBySecenPath(scenePath: string): string | undefined;
@@ -51,4 +56,14 @@ export declare class Collector extends BaseCollector<ISerializableStorageViewDat
     private syncStorageKey;
     keyTransformWorkId(key: string): string;
     destroy(): void;
+    setAuth(auth: Partial<ISerializableAuthData>, isSync: boolean): void;
+    dispatchAuth(action: {
+        type: EPostMessageType.AuthWriter | EPostMessageType.AuthReader;
+        viewId?: ViewId;
+        writeData?: AuthWriteData;
+        renderData?: ISerializableAuthRenderItemType;
+    }, isSync?: boolean): void;
+    addAuthStateListener(callBack: (diffAuthRender: DiffAuthRender) => void): void;
+    removeAuthStateListener(): void;
+    private diffAuthFun;
 }

package/dist/collector/enum.d.ts

@@ -1,7 +1,4 @@
 /** 同步事件类型 */
-export declare enum EEventDataKey {
-    GetPoint = "getPoint"
-}
 /** 同步类型 */
 export declare enum SyncedType {
     State = 0,

package/dist/collector/eventCollector.d.ts

@@ -6,6 +6,7 @@ import { BaseApplianceManager } from "../plugin/baseApplianceManager";
  * 服务端事件/状态同步收集器
  */
 export declare class EventCollector extends BaseCollector<ISerializableEventData> {
+    protected authSpace: string;
     static syncInterval: number;
     static namespace: string;
     serviceStorage: ISerializableEventData;

package/dist/collector/magixEventCollector.d.ts

@@ -6,6 +6,7 @@ import { BaseApplianceManager } from "../plugin/baseApplianceManager";
  * 服务端事件/状态同步收集器
  */
 export declare class magixEventCollector extends BaseCollector<ISerializableEventData> {
+    protected authSpace: string;
     static syncInterval: number;
     static namespace: string;
     serviceStorage: ISerializableEventData;

package/dist/collector/types.d.ts

@@ -1,8 +1,7 @@
 import { EPostMessageType, EToolsKey, EventMessageType } from "../core/enum";
 import { ShapeOptions } from "../core/tools";
 import { IUpdateNodeOpt, IworkId } from "../core/types";
-import { EmitEventType } from "../plugin/types";
-import { EEventDataKey } from "./enum";
+import { EmitEventType, _ArrayTrue } from "../plugin/types";
 export declare type DiffOneView<ISerializableStorageViewData> = {
     oldValue?: ISerializableStorageViewData;
     newValue?: ISerializableStorageViewData;
@@ -32,12 +31,6 @@ export declare type Diff = {
     diffScenePath?: DiffScenePath<ISerializableStorageScenePathData>;
     diffView?: DiffView<ISerializableStorageViewData>;
 };
-export type SyncEventData = {
-    [key in EEventDataKey]: {
-        workId?: number;
-        key: string;
-    };
-};
 export type IStorageValueItem = Partial<INormalPushMsg>;
 export interface INormalPushMsg {
     workId?: IworkId;
@@ -69,6 +62,10 @@ export type BaseCollectorReducerAction = INormalPushMsg & Pick<INormalPushMsg, '
 export interface ISerializableStorageData {
     [key: string]: BaseCollectorReducerAction | undefined;
 }
+export type ViewId = string;
+export type WorkId = string;
+export type ScenePath = string;
+export type Uid = string | 'localSelf';
 export interface BaseEventCollectorReducerAction {
     type?: EventMessageType;
     uid?: string;
@@ -76,14 +73,43 @@ export interface BaseEventCollectorReducerAction {
     op?: Array<number | undefined>;
     isHide?: boolean;
     isSync?: boolean;
-    viewId?: string;
+    viewId?: ViewId;
 }
 export interface ISerializableEventData {
-    [key: string]: Array<BaseEventCollectorReducerAction | undefined> | undefined;
+    [key: WorkId]: Array<BaseEventCollectorReducerAction | undefined> | undefined;
 }
 export interface ISerializableStorageViewData {
-    [key: string]: ISerializableStorageScenePathData;
+    [key: ViewId]: ISerializableStorageScenePathData;
 }
 export interface ISerializableStorageScenePathData {
-    [key: string]: ISerializableStorageData;
+    [key: ScenePath]: ISerializableStorageData;
 }
+export type ISerializableAuthRenderItemType = {
+    /** 可读用户组,  如果是true, 则为所有用户笔记可渲染 */
+    render?: _ArrayTrue<Uid>;
+    /** 可隐藏用户组 如果是true, 则为所有用户笔记可隐藏 */
+    hide?: _ArrayTrue<Uid>;
+    /** 可移除笔记用户组 如果是true, 则为所有用户笔记可移除 */
+    clear?: _ArrayTrue<Uid>;
+};
+export type ISerializableAuthRenderDataType = {
+    [key: ViewId]: ISerializableAuthRenderItemType;
+};
+export type ISerializableAuthData = {
+    /** 可写用户组, 如果是true, 则为所有用户可写 */
+    writable?: _ArrayTrue<Uid>;
+    /** 只读用户组, 如果是true, 则为所有用户可读 */
+    readOnly?: _ArrayTrue<Uid>;
+    /** viewid区分,用户显示笔记权限 */
+    renderAuth?: ISerializableAuthRenderDataType;
+};
+export type AuthWriteData = Pick<ISerializableAuthData, 'writable' | 'readOnly'>;
+export type AuthWriteDatakey = keyof AuthWriteData;
+export type ISerializableAuthRenderItemTypeKey = keyof ISerializableAuthRenderItemType;
+export declare type DiffAuthRender = {
+    [K in keyof ISerializableAuthRenderDataType]?: DiffOneRender;
+};
+export declare type DiffOneRender = {
+    oldValue?: ISerializableAuthRenderItemType;
+    newValue?: ISerializableAuthRenderItemType;
+};

package/dist/core/enum.d.ts

@@ -105,7 +105,13 @@ export declare enum EPostMessageType {
     /** 优先激活worker */
     PriorityMainThreadWorker = 22,
     /** 获取图片位图 */
-    GetImageBitMap = 23
+    GetImageBitMap = 23,
+    /** 授权可写权限 */
+    AuthWriter = 24,
+    /** 授权可显示笔记权限 */
+    AuthReader = 25,
+    /** 授权可以删除笔记权限 */
+    AuthClear = 26
 }
 export declare enum ECanvasContextType {
     Webgl2 = "webgl2",

package/dist/core/mainEngine.d.ts

@@ -1,9 +1,9 @@
 import EventEmitter2 from "eventemitter2";
-import { BaseCollectorReducerAction, DiffOneData } from "../collector";
+import { BaseCollectorReducerAction, DiffOneData, Uid } from "../collector";
 import { BaseApplianceManager } from "../plugin/baseApplianceManager";
 import { IActiveToolsDataType, IActiveWorkDataType, ICameraOpt, IMainMessage, IRectType, IUpdateNodeOpt, IWorkerMessage, IqueryTask, IworkId, ViewWorkerOptions } from "./types";
 import { BaseSubWorkModuleProps } from "../plugin/types";
-import type { ImageInformation, PriorityType } from "../plugin/types";
+import type { ImageInformation, PriorityType, _SetTrue } from "../plugin/types";
 import { MethodBuilderMain } from "./msgEvent";
 import { EvevtWorkState } from "./enum";
 import { BaseShapeOptions } from "./tools";
@@ -66,7 +66,7 @@ export declare abstract class MasterController {
     /** 更新已有node配置 */
     abstract updateNode(workId: IworkId, updateNodeOpt: IUpdateNodeOpt, viewId: string, scenePath: string): void;
     /** 清空指定的view场景路径下的所有数据 */
-    abstract clearViewScenePath(viewId: string, justLocal?: boolean): Promise<void>;
+    abstract clearViewScenePath(viewId: string, justLocal?: boolean, isFiter?: boolean): Promise<void>;
     /** 更新指定view场景路径下的相机参数 */
     abstract updateCamera(viewId: string, cameraOpt: ICameraOpt): void;
     /**  创建一个新的viewWorker */
@@ -198,7 +198,7 @@ export declare class MasterControlForWorker extends MasterController {
     updateCamera(viewId: string, cameraOpt: ICameraOpt): void;
     private updateCameraDone;
     private consumeQueue;
-    clearViewScenePath(viewId: string, justLocal?: boolean | undefined): Promise<void>;
+    clearViewScenePath(viewId: string, justLocal?: boolean | undefined, isFiter?: boolean): Promise<void>;
     private internalMsgEmitterListener;
     private setZIndex;
     checkDrawingWork(vId: string): void;
@@ -217,4 +217,5 @@ export declare class MasterControlForWorker extends MasterController {
     blurSelector(viewId: string, scenePath: string, workId?: string): void;
     consoleWorkerInfo(): void;
     setPriority(priority: PriorityType): void;
+    sendClearUids(viewId: string, clearUids?: _SetTrue<Uid>): void;
 }

package/dist/core/renderCotrol.d.ts

@@ -0,0 +1,66 @@
+import type { RoomMemberManager } from "../members";
+import { ApplianceManagerLike, BaseSubWorkModuleProps, FilterPublishAutType, FilterRenderType, _ArrayTrue } from "../plugin/types";
+import type { MasterControlForWorker } from "./mainEngine";
+import { Uid } from "../collector/types";
+export interface RenderCotrol {
+    readonly roomMemberManager: RoomMemberManager;
+    readonly control: ApplianceManagerLike;
+    /** 监听本地可写权限变化 */
+    onSetWriteable(bool: boolean): void;
+    /** 发布可写权限到服务端 */
+    publishWriteAble(write: _ArrayTrue<Uid>, readOnly: _ArrayTrue<Uid>): void;
+    /** 发布当个用户可写权限到服务端 */
+    publishOneWriteAble(uid: Uid, type: FilterPublishAutType, isSync: boolean): void;
+    /** 本地发布可显示绘制权限到服务端 */
+    publishRender(param: {
+        viewId: Uid;
+        option: {
+            render?: _ArrayTrue<Uid>;
+            hide?: _ArrayTrue<Uid>;
+            clear?: _ArrayTrue<Uid>;
+        };
+        isSync: boolean;
+    }): void;
+    /** 发布当个用户显示绘制权限到服务端 */
+    publishOneRender(viewId: Uid, uid: Uid, type: FilterRenderType, isSync: boolean): void;
+    /** 发布当个用户删除笔记权限到服务端 */
+    publishOneClear(viewId: Uid, uid: Uid, isAdd: boolean, isSync: boolean): void;
+    /** 服务端同步可显示绘制权限 */
+    syncRenderUids(viewId: Uid, _render?: _ArrayTrue<Uid>, _hide?: _ArrayTrue<Uid>, _clear?: _ArrayTrue<Uid>): void;
+    /** 服务端同步可写权限 */
+    syncWriteable(writable?: _ArrayTrue<Uid>, readOnly?: _ArrayTrue<Uid>): void;
+    destoryByViewId(viewId: string): void;
+}
+export declare class RenderCotrolImple implements RenderCotrol {
+    readonly control: ApplianceManagerLike;
+    readonly roomMemberManager: RoomMemberManager;
+    readonly worker: MasterControlForWorker;
+    private writeableUids;
+    private readonlyUids;
+    private renderUids;
+    private isCurWrite;
+    constructor(props: BaseSubWorkModuleProps);
+    onSetWriteable(bool: boolean): void;
+    getCurWriteable(): boolean;
+    isWriteable(uid: Uid): boolean;
+    isRenderAble(uid: Uid, viewId: string, filterLocalSelf?: boolean): boolean;
+    isClearAble(uid: Uid, viewId: string, filterLocalSelf?: boolean): boolean;
+    publishWriteAble(writable?: _ArrayTrue<Uid>, readOnly?: _ArrayTrue<Uid>): void;
+    publishOneWriteAble(uid: Uid, type: FilterPublishAutType, isSync?: boolean): void;
+    publishRender(param: {
+        viewId: Uid;
+        option?: {
+            render?: _ArrayTrue<Uid>;
+            hide?: _ArrayTrue<Uid>;
+            clear?: _ArrayTrue<Uid>;
+        };
+        isSync: boolean;
+    }): void;
+    publishOneRender(viewId: Uid, uid: Uid, type: FilterRenderType, isSync?: boolean): void;
+    publishOneClear(viewId: Uid, uid: Uid, isAdd: boolean, isSync?: boolean): void;
+    syncRenderUids(viewId: Uid, _render?: _ArrayTrue<Uid>, _hide?: _ArrayTrue<Uid>, _clear?: _ArrayTrue<Uid>): void;
+    syncWriteable(writable?: _ArrayTrue<Uid>, readOnly?: _ArrayTrue<Uid>): void;
+    destoryByViewId(viewId: string, isLocal?: boolean): void;
+    private renderEffect;
+    private writeEffect;
+}

package/dist/core/tools/eraser.d.ts

@@ -54,5 +54,5 @@ export declare class EraserShape extends BaseShapeTool {
         removeIds: string[];
     };
     clearTmpPoints(): void;
-    private getUnLockNodeMap;
+    private getCanEraserNodeMap;
 }

package/dist/core/tools/pencilEraser.d.ts

@@ -70,5 +70,5 @@ export declare class PencilEraserShape extends BaseShapeTool {
         }>;
     };
     clearTmpPoints(): void;
-    private getUnLockNodeMap;
+    private getCanEraserNodeMap;
 }

package/dist/core/types.d.ts

@@ -6,6 +6,9 @@ import { BaseShapeOptions, BaseShapeTool, ShapeOptions } from './tools';
 import type { SelectorShape } from './tools';
 import type { Direction } from "re-resizable/lib/resizer";
 import { ShapeOptType } from '../displayer/types';
+export type PickOne<T> = {
+    [P in keyof T]: Record<P, T[P]> & Partial<Record<Exclude<keyof T, P>, undefined>>;
+}[keyof T];
 export type IworkId = string | number;
 export type IqueryTask = Partial<IWorkerMessage> | undefined;
 export type ViewWorkerOptions = {
@@ -283,7 +286,6 @@ export type BaseNodeMapItem = {
     scaleType: EScaleType;
     /** 是否被框选中,框选中的元素不能被其它人操作 */
     isSelected: boolean;
-    isHid?: boolean;
     eraserlines?: Map<string, Pick<BaseNodeMapItem, 'op' | 'opt'>>;
 };
 export type Size = {

package/dist/core/utils/spriteNode.d.ts

@@ -1,4 +1,2 @@
 import { Group, Node, Path } from "spritejs";
-import { BaseNodeMapItem } from "../types";
 export declare const isSealedGroup: (group: Group | Path | Node) => boolean;
-export declare const isRenderNode: (param: Pick<BaseNodeMapItem, "isHid">) => boolean;

package/dist/core/vNodeManager.d.ts

@@ -1,6 +1,8 @@
 import { Group, Scene } from "spritejs";
 import { BaseNodeMapItem, IRectType } from "./types";
 import { EToolsKey } from ".";
+import { _SetTrue } from "../plugin";
+import type { Uid } from "../collector/types";
 export declare class VNodeManager {
     viewId: string;
     scene: Scene;
@@ -8,10 +10,16 @@ export declare class VNodeManager {
     curNodeMap: Map<string, BaseNodeMapItem>;
     targetNodeMap: Map<string, BaseNodeMapItem>[];
     private highLevelIds?;
+    private canClearUids?;
+    private localUid?;
     constructor(viewId: string, scene: Scene);
     init(fullLayer: Group): void;
     get(name: string): BaseNodeMapItem | undefined;
-    getUnLockNodes(): Map<string, BaseNodeMapItem>;
+    setLocalUid(uid: string): void;
+    getLocalUid(): string | undefined;
+    setCanClearUids(clearUids?: _SetTrue<Uid>): void;
+    getCanClearUids(): _SetTrue<string> | undefined;
+    getCanEraserNodes(nodeMap: Map<string, BaseNodeMapItem>): Map<string, BaseNodeMapItem>;
     getNodesByType(type: EToolsKey): Map<string, BaseNodeMapItem>;
     hasRenderNodes(): boolean;
     has(name: string): boolean;
@@ -20,7 +28,6 @@ export declare class VNodeManager {
     unSelected(name: string): void;
     delete(name: string): void;
     clear(): void;
-    hasRectIntersectRange(rect: IRectType, filterLock?: boolean): boolean;
     getRectIntersectRange(rect: IRectType, filterLock?: boolean, filterEditor?: boolean): {
         rectRange: IRectType | undefined;
         nodeRange: Map<string, BaseNodeMapItem>;
@@ -30,7 +37,6 @@ export declare class VNodeManager {
     updateHighLevelNodesRect(highLevelIds: Set<string>): void;
     updateLowLevelNodesRect(): void;
     clearHighLevelIds(): void;
-    combineIntersectRect(rect: IRectType): IRectType;
     setTargetAssignKeys(keys: Array<string>): number;
     setTarget(): number;
     getLastTarget(): Map<string, BaseNodeMapItem>;
@@ -38,4 +44,6 @@ export declare class VNodeManager {
     getTarget(i: number): Map<string, BaseNodeMapItem>;
     deleteTarget(i: number): void;
     clearTarget(): void;
+    isLocalWorkId(workId: string): boolean;
+    isCanClearWorkId(workId: string): boolean;
 }