@netless/appliance-plugin 1.0.1 → 1.0.2

package/dist/core/msgEvent/deleteNode/forMainThread.d.ts

@@ -1,10 +1,6 @@
 import { EmitEventType } from "../../../plugin/types";
 import { BaseMsgMethodForMainThread } from "../baseForMainThread";
-import { IWorkerMessage } from "../../types";
 export declare class DeleteNodeMethodForMainThread extends BaseMsgMethodForMainThread {
     readonly emitEventType: EmitEventType;
-    consume(data: IWorkerMessage): Promise<boolean | undefined>;
-    consumeForLocalWorker(data: IWorkerMessage): void;
-    consumeForServiceWorker(data: IWorkerMessage): void;
-    private commandDeleteText;
+    consume(): Promise<boolean | undefined>;
 }

package/dist/core/msgEvent/deleteNode/forWorker.d.ts

@@ -1,10 +1,6 @@
 import { EmitEventType } from "../../../plugin/types";
 import { BaseMsgMethodForWorker } from "../baseForWorker";
-import { IWorkerMessage } from "../../types";
 export declare class DeleteNodeMethodForWorker extends BaseMsgMethodForWorker {
     readonly emitEventType: EmitEventType;
-    consume(data: IWorkerMessage): boolean | undefined;
-    consumeForLocalWorker(data: IWorkerMessage): void;
-    consumeForServiceWorker(data: IWorkerMessage): void;
-    private commandDeleteText;
+    consume(): boolean | undefined;
 }

package/dist/core/msgEvent/scaleNode/forMain.d.ts

@@ -18,5 +18,6 @@ export declare class ScaleNodeMethod extends BaseMsgMethod {
     private targetBox;
     private targetText;
     private cacheTextInfo;
+    private setTextStyle;
     collect(data: ScaleNodeEmtData, isSync?: boolean): Promise<void>;
 }

package/dist/core/msgEvent/setFont/forMain.d.ts

@@ -14,6 +14,7 @@ export type SetFontEmtData = {
 export declare class SetFontStyleMethod extends BaseMsgMethod {
     protected lastEmtData?: unknown;
     readonly emitEventType: EmitEventType;
+    private timerId?;
     private setTextStyle;
-    collect(data: SetFontEmtData): void;
+    collect(data: SetFontEmtData): Promise<void>;
 }

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

@@ -1,8 +1,8 @@
-import { IWorkerMessage, IMainMessage, IRectType, IUpdateNodeOpt } from "../types";
-import { EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { VNodeManager } from "../worker/vNodeManager";
+import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 export interface ArrowOptions extends BaseShapeOptions {
     thickness: number;
@@ -23,10 +23,39 @@ export declare class ArrowShape extends BaseShapeTool {
         isFullWork?: boolean;
         isSubWorker?: boolean;
         isMainThread?: boolean;
-    }): IMainMessage;
-    consumeAll(props: {
-        data?: IWorkerMessage | undefined;
-    }): IMainMessage;
+    }): {
+        type: EPostMessageType;
+    } | {
+        type: EPostMessageType;
+        dataType: EDataType;
+        op: number[];
+        isSync: boolean;
+        index: number;
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+    } | {
+        type: EPostMessageType;
+        dataType: EDataType;
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType | undefined;
+    };
+    consumeAll(): {
+        type: EPostMessageType;
+        removeIds: string[];
+    } | {
+        type: EPostMessageType;
+        dataType: EDataType;
+        ops: string;
+        isSync: boolean;
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType;
+        removeIds?: undefined;
+    };
     private draw;
     private computDrawPoints;
     private computFullArrowPoints;

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

@@ -1,8 +1,8 @@
 import { Point2d } from "../utils/primitives/Point2d";
-import { EScaleType, EToolsKey } from "../enum";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { BaseNodeMapItem, IMainMessage, IRectType, IUpdateNodeOpt, IWorkerMessage } from "../types";
 import { Group } from "spritejs";
-import { VNodeManager } from "../worker/vNodeManager";
+import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes, ShapeOptions } from "./utils";
 import { TextOptions } from "../../component/textEditor/types";
 export interface BaseShapeOptions {
@@ -22,11 +22,19 @@ export interface BaseShapeOptions {
     translate?: [number, number];
 }
 export interface BaseShapeToolProps {
+    workId: string;
     vNodes?: VNodeManager;
     toolsOpt: ShapeOptions;
     fullLayer: Group;
     drawLayer?: Group;
 }
+export type BaseConsumeResultType = {
+    type: EPostMessageType;
+    toolsType?: EToolsKey;
+    opt?: ShapeOptions;
+    workId?: string;
+    dataType?: EDataType;
+} & Partial<IMainMessage>;
 export declare abstract class BaseShapeTool {
     static SafeBorderPadding: number;
     protected abstract tmpPoints: Array<Point2d | number>;
@@ -37,9 +45,14 @@ export declare abstract class BaseShapeTool {
     vNodes?: VNodeManager;
     protected drawLayer?: Group;
     protected fullLayer: Group;
-    protected workId: number | string | undefined;
+    protected workId: string;
     protected abstract workOptions: ShapeOptions;
     constructor(props: BaseShapeToolProps);
+    get baseConsumeResult(): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: ShapeOptions;
+    };
     /** 消费本地数据，返回绘制结果 */
     abstract consume(props: {
         data: IWorkerMessage;
@@ -47,29 +60,30 @@ export declare abstract class BaseShapeTool {
         isSubWorker?: boolean;
         drawCount?: number;
         isMainThread?: boolean;
-    }): IMainMessage;
+    }): BaseConsumeResultType;
     /** 消费本地完整数据，返回绘制结果 */
     abstract consumeAll(props: {
         data?: IWorkerMessage;
-    }): IMainMessage;
+    }): BaseConsumeResultType;
     /** 消费服务端数据，返回绘制结果 */
     abstract consumeService(props: {
         op: number[];
         isFullWork: boolean;
         replaceId?: string;
     }): IRectType | undefined;
+    protected filterSamePoints(points: Point2d[], tolerance?: number): Point2d[];
     /** 清除临时数据 */
     abstract clearTmpPoints(): void;
     /** 设置工作id */
-    setWorkId(id: string | undefined): void;
-    getWorkId(): string | number | undefined;
+    setWorkId(id: string): void;
+    getWorkId(): string;
     /** 获取工作选项配置 */
     getWorkOptions(): ShapeOptions;
     /** 设置工作选项配置 */
     setWorkOptions(workOptions: BaseShapeOptions): void;
     /** 更新服务端同步配置,返回绘制结果 */
     updataOptService(opt?: IUpdateNodeOpt): IRectType | undefined;
-    replace(layer: Group, replaceId: string, newNode: ShapeNodes): void;
+    replace(layer: Group, replaceId: string, newNode?: ShapeNodes): void;
     static updateNodeOpt(param: {
         node: ShapeNodes;
         opt: IUpdateNodeOpt;

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

@@ -1,8 +1,8 @@
-import { IWorkerMessage, IMainMessage, IRectType, IUpdateNodeOpt } from "../types";
-import { EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { VNodeManager } from "../worker/vNodeManager";
+import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 export interface EllipseOptions extends BaseShapeOptions {
     thickness: number;
@@ -23,10 +23,39 @@ export declare class EllipseShape extends BaseShapeTool {
         isFullWork?: boolean;
         isSubWorker?: boolean;
         isMainThread?: boolean;
-    }): IMainMessage;
-    consumeAll(props: {
-        data?: IWorkerMessage | undefined;
-    }): IMainMessage;
+    }): {
+        type: EPostMessageType;
+    } | {
+        op: number[];
+        isSync: boolean;
+        index: number;
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        dataType: EDataType;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+    };
+    consumeAll(): {
+        type: EPostMessageType;
+        removeIds: string[];
+    } | {
+        ops: string;
+        isSync: boolean;
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType;
+        type: EPostMessageType;
+        dataType: EDataType;
+        removeIds?: undefined;
+    };
     private draw;
     private computDrawPoints;
     private updateTempPoints;

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

@@ -1,6 +1,6 @@
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { EScaleType, EToolsKey } from "../enum";
-import { IWorkerMessage, IMainMessage, IRectType } from "../types";
+import { EPostMessageType, EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType, IworkId } from "../types";
 import type { ServiceThreadSubWork } from "./utils";
 export interface EraserOptions extends BaseShapeOptions {
     thickness: number;
@@ -32,10 +32,46 @@ export declare class EraserShape extends BaseShapeTool {
     private remove;
     consume(props: {
         data: IWorkerMessage;
-    }): IMainMessage;
+    }): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        rect?: undefined;
+        removeIds?: undefined;
+        newWorkDatas?: undefined;
+    } | {
+        type: EPostMessageType;
+        rect: IRectType;
+        removeIds: string[];
+        newWorkDatas: Map<string, {
+            op: number[];
+            opt: BaseShapeOptions;
+            workId: IworkId;
+            toolsType: EToolsKey;
+        }>;
+    };
     consumeAll(props: {
         data: IWorkerMessage;
-    }): IMainMessage;
+    }): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        rect?: undefined;
+        removeIds?: undefined;
+        newWorkDatas?: undefined;
+    } | {
+        type: EPostMessageType;
+        rect: IRectType;
+        removeIds: string[];
+        newWorkDatas: Map<string, {
+            op: number[];
+            opt: BaseShapeOptions;
+            workId: IworkId;
+            toolsType: EToolsKey;
+        }>;
+    };
     clearTmpPoints(): void;
     private getUnLockNodeMap;
 }

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

@@ -1,9 +1,9 @@
 import { Scene } from "spritejs";
-import { IMainMessage, IRectType, IUpdateNodeOpt, BaseNodeMapItem } from "../types";
-import { EScaleType, EToolsKey } from "../enum";
+import { IRectType, IUpdateNodeOpt, BaseNodeMapItem } from "../types";
+import { EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { VNodeManager } from "../worker/vNodeManager";
+import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 export interface ImageOptions extends BaseShapeOptions {
     /** 图片的唯一识别符 */
@@ -33,8 +33,12 @@ export declare class ImageShape extends BaseShapeTool {
     protected workOptions: ImageOptions;
     oldRect?: IRectType;
     constructor(props: BaseShapeToolProps);
-    consume(): IMainMessage;
-    consumeAll(): IMainMessage;
+    consume(): {
+        type: EPostMessageType;
+    };
+    consumeAll(): {
+        type: EPostMessageType;
+    };
     private draw;
     consumeService(): IRectType | undefined;
     consumeServiceAsync(props: {

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

@@ -1,6 +1,6 @@
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { EScaleType, EToolsKey } from "../enum";
-import { IWorkerMessage, IMainMessage, IRectType } from "../types";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType } from "../types";
 import { EStrokeType } from "../../plugin/types";
 import { Point2d } from "../utils/primitives/Point2d";
 export interface LaserPenOptions extends BaseShapeOptions {
@@ -25,8 +25,38 @@ export declare class LaserPenShape extends BaseShapeTool {
         data: IWorkerMessage;
         isFullWork: boolean;
         isSubWorker?: boolean;
-    }): IMainMessage;
-    consumeAll(): IMainMessage;
+    }): {
+        type: EPostMessageType;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: {
+            x: number;
+            y: number;
+            w: number;
+            h: number;
+        };
+        type: EPostMessageType;
+        dataType: EDataType;
+        op: number[] | undefined;
+        index: number | undefined;
+    };
+    consumeAll(): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: {
+            x: number;
+            y: number;
+            w: number;
+            h: number;
+        } | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+        ops: string;
+        index: number;
+    };
     clearTmpPoints(): void;
     consumeService(props: {
         op: number[];

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

@@ -1,10 +1,10 @@
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { EScaleType, EToolsKey } from "../enum";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
 import { IWorkerMessage, IMainMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EStrokeType } from "../../plugin/types";
 import { ShapeNodes } from "./utils";
-import { VNodeManager } from "../worker/vNodeManager";
+import { VNodeManager } from "../vNodeManager";
 export interface PencilOptions extends BaseShapeOptions {
     thickness: number;
     strokeColor: string;
@@ -33,10 +33,43 @@ export declare class PencilShape extends BaseShapeTool {
         drawCount?: number;
         isMainThread?: boolean;
         replaceId?: string;
-    }): IMainMessage;
+    }): {
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+    } | {
+        type: EPostMessageType;
+        dataType: EDataType;
+        rect: IRectType | undefined;
+        op: number[] | undefined;
+        index: number | undefined;
+        updateNodeOpt: {
+            useAnimation: boolean;
+        };
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+    };
     consumeAll(props: {
         data?: IWorkerMessage;
-    }): IMainMessage;
+    }): {
+        type: EPostMessageType;
+        removeIds: string[];
+        rect: IRectType | undefined;
+    } | {
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+        ops: string;
+        updateNodeOpt: {
+            pos: [number, number];
+            useAnimation: boolean;
+        };
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        removeIds?: undefined;
+    };
     clearTmpPoints(): void;
     consumeService(params: {
         op: number[];

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

@@ -1,8 +1,8 @@
-import { IWorkerMessage, IMainMessage, IRectType, IUpdateNodeOpt } from "../types";
-import { EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { VNodeManager } from "../worker/vNodeManager";
+import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 export interface PolygonOptions extends BaseShapeOptions {
     thickness: number;
@@ -25,10 +25,39 @@ export declare class PolygonShape extends BaseShapeTool {
         isClearAll?: boolean;
         isSubWorker?: boolean;
         isMainThread?: boolean;
-    }): IMainMessage;
-    consumeAll(props: {
-        data?: IWorkerMessage | undefined;
-    }): IMainMessage;
+    }): {
+        type: EPostMessageType;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        dataType: EDataType;
+        op: number[];
+        isSync: boolean;
+        index: number;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+    };
+    consumeAll(): {
+        type: EPostMessageType;
+        removeIds: string[];
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType;
+        type: EPostMessageType;
+        dataType: EDataType;
+        ops: string;
+        isSync: boolean;
+        removeIds?: undefined;
+    };
     private draw;
     private computDrawPoints;
     private updateTempPoints;

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

@@ -1,8 +1,8 @@
-import { IWorkerMessage, IMainMessage, IRectType, IUpdateNodeOpt } from "../types";
-import { EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { VNodeManager } from "../worker/vNodeManager";
+import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 export interface RectangleOptions extends BaseShapeOptions {
     thickness: number;
@@ -26,10 +26,39 @@ export declare class RectangleShape extends BaseShapeTool {
         isClearAll?: boolean;
         isSubWorker?: boolean;
         isMainThread?: boolean;
-    }): IMainMessage;
-    consumeAll(props: {
-        data?: IWorkerMessage | undefined;
-    }): IMainMessage;
+    }): {
+        type: EPostMessageType;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        dataType: EDataType;
+        op: number[];
+        isSync: boolean;
+        index: number;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
+    };
+    consumeAll(): {
+        type: EPostMessageType;
+        removeIds: string[];
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect: IRectType;
+        type: EPostMessageType;
+        dataType: EDataType;
+        ops: string;
+        isSync: boolean;
+        removeIds?: undefined;
+    };
     private draw;
     private updateTempPoints;
     consumeService(props: {

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

@@ -3,7 +3,7 @@ import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { IWorkerMessage, IMainMessage, IRectType, IUpdateNodeOpt, IServiceWorkItem } from "../types";
 import { Point2d } from "../utils/primitives/Point2d";
-import type { VNodeManager } from "../worker/vNodeManager";
+import type { VNodeManager } from "../vNodeManager";
 import { TextOptions } from "../../component/textEditor/types";
 import { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
 import { ShapeOptType } from "../../displayer/types";
@@ -30,7 +30,7 @@ export declare class SelectorShape extends BaseShapeTool {
     shapeOpt?: ShapeOptType;
     textOpt?: TextOptions;
     isLocked?: boolean;
-    constructor(props: Required<BaseShapeToolProps>);
+    constructor(props: BaseShapeToolProps);
     private computSelector;
     private updateTempPoints;
     private drawSelector;
@@ -39,8 +39,56 @@ export declare class SelectorShape extends BaseShapeTool {
     getChildrenPoints(): [number, number][] | undefined;
     consume(props: {
         data: IWorkerMessage;
-    }): IMainMessage;
-    consumeAll(): IMainMessage;
+    }): {
+        type: EPostMessageType;
+    } | {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        dataType: EDataType;
+        rect: IRectType | undefined;
+        selectIds: never[] | string[];
+        selectRect: IRectType | undefined;
+        selectorColor: string | undefined;
+        strokeColor: string | undefined;
+        fillColor: string | undefined;
+        textOpt: TextOptions | undefined;
+        canTextEdit: boolean;
+        canRotate: boolean;
+        canLock: boolean;
+        scaleType: EScaleType;
+        willSyncService: boolean;
+        points: [number, number][] | undefined;
+        isLocked: boolean | undefined;
+        toolsTypes: EToolsKey[] | undefined;
+        shapeOpt: ShapeOptType | undefined;
+    };
+    consumeAll(): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        dataType: EDataType;
+        rect: IRectType | undefined;
+        selectIds: string[] | undefined;
+        selectorColor: string | undefined;
+        selectRect: IRectType | undefined;
+        strokeColor: string | undefined;
+        fillColor: string | undefined;
+        textOpt: TextOptions | undefined;
+        canTextEdit: boolean;
+        canRotate: boolean;
+        canLock: boolean;
+        scaleType: EScaleType;
+        willSyncService: boolean;
+        points: [number, number][] | undefined;
+        isLocked: boolean | undefined;
+        toolsTypes: EToolsKey[] | undefined;
+        shapeOpt: ShapeOptType | undefined;
+    } | {
+        type: EPostMessageType;
+    };
     consumeService(): undefined;
     clearTmpPoints(): void;
     clearSelectData(): void;