@netless/appliance-plugin 1.1.13 → 1.1.14-beta.1

package/dist/appliance-plugin.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-Wi09G9p1.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.AutoDrawPlugin=e.AutoDrawPlugin;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;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.Plugin=e.Plugin;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-BEY3BEPC.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.AutoDrawPlugin=e.AutoDrawPlugin;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;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.Plugin=e.Plugin;exports.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;

package/dist/appliance-plugin.mjs

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

package/dist/core/mainEngine.d.ts

@@ -105,7 +105,7 @@ export declare class MasterControlForWorker extends MasterController {
     private zIndexNodeMethod?;
     /** master\fullwoker\subworker 三者高频绘制时队列化参数 */
     private subWorkerDrawCount;
-    private wokerDrawCount;
+    private fullWorkerDrawCount;
     private maxDrawCount;
     private _consumeCount;
     private _postCount;
@@ -152,6 +152,7 @@ export declare class MasterControlForWorker extends MasterController {
     private get isCanRecordUndoRedo();
     private get isCanSentCursor();
     private get isPostCountType();
+    private get isCanPostDraw();
     private get isCanStartEventConsum();
     init(): Promise<void>;
     private useMainThread;
@@ -162,10 +163,8 @@ export declare class MasterControlForWorker extends MasterController {
     setLockSentEventCursor(bol: boolean): void;
     getTasksqueueState(): EvevtWorkState.Doing | EvevtWorkState.Done;
     setMaxDrawCount(num: number): void;
-    getWorkDrawCount(): number;
-    getSubWorkerDrawCount(): number;
+    getFullWorkDrawCount(): number;
     getMaxDrawCount(): number;
-    setWorkDrawCount(num: number): void;
     setSubWorkerDrawCount(num: number): void;
     setConsumeCount(num: number): void;
     setWorkerTasksqueueCount(num: number): void;

package/dist/core/mainThread/subLocalThread.d.ts

@@ -52,7 +52,7 @@ export interface SubLocalThread {
     }): Promise<IMainMessage | undefined>;
     createLocalWork(data: IWorkerMessage): void;
 }
-export declare class SubLocalThreadImpl implements SubLocalThread {
+export declare class SubLocalMainThreadImpl implements SubLocalThread {
     readonly vNodes: VNodeManager;
     readonly thread: MainThreadEngineImpl;
     workShapes: Map<string, BaseShapeTool>;
@@ -61,7 +61,7 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     private batchEraserWorks;
     private tmpOpt?;
     private syncUnitTime;
-    private drawCount;
+    private fullWorkerDrawCount;
     private drawWorkActiveId?;
     private consumeCount;
     constructor(opt: ISubThreadInitOption);
@@ -98,7 +98,6 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     reRenderSelector(willSyncService?: boolean): Promise<void> | undefined;
     blurSelector(data?: IWorkerMessage): Promise<void>;
     clearWorkShapeNodeCache(workId: string): void;
-    private drawBitMapEraser;
     private drawBitMapEraserFull;
     private drawPencilEraser;
     private drawEraser;

package/dist/core/mainThread/subServiceThread.d.ts

@@ -12,7 +12,7 @@ export interface SubServiceThread {
     removeWork(data: IWorkerMessage): void;
     runSelectWork(data: IWorkerMessage): void;
 }
-export declare class SubServiceThreadImpl implements SubServiceThread {
+export declare class SubServiceMainThreadImpl implements SubServiceThread {
     readonly vNodes: VNodeManager;
     readonly thread: MainThreadEngineImpl;
     workShapes: Map<string, IServiceWorkItem>;

package/dist/core/mainThread/workerMainThread.d.ts

@@ -77,7 +77,7 @@ export declare class SubMainThreadWorkerImpl implements SubMainThreadWorker {
     workShapes: Map<string, BaseShapeTool>;
     private tmpOpt?;
     private syncUnitTime;
-    private drawCount;
+    private subWorkerDrawCount;
     constructor(subThreadOpt: {
         thread: MainThreadWorkerImpl;
     });

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

@@ -6,6 +6,8 @@ import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes, ShapeOptions } from "./utils";
 import { TextOptions } from "../../component/textEditor/types";
 import { SerializerEraserLines } from "./pencilEraserBitMap";
+import type { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
+import type { SubLocalMainThreadImpl } from "../mainThread/subLocalThread";
 export interface BaseShapeOptions {
     isOpacity?: boolean;
     fontColor?: string;
@@ -49,6 +51,7 @@ export declare abstract class BaseShapeTool {
     protected fullLayer: Group;
     protected workId: string;
     protected abstract workOptions: ShapeOptions;
+    isDelete: boolean;
     constructor(props: BaseShapeToolProps);
     get baseConsumeResult(): {
         workId: string;
@@ -62,10 +65,12 @@ export declare abstract class BaseShapeTool {
         isSubWorker?: boolean;
         drawCount?: number;
         isMainThread?: boolean;
+        removeDrawCount?: number;
     }): BaseConsumeResultType;
     /** 消费本地完整数据，返回绘制结果 */
     abstract consumeAll(props: {
         data?: IWorkerMessage;
+        workerEngine?: LocalWorkForFullWorker | SubLocalMainThreadImpl;
     }): BaseConsumeResultType;
     /** 消费服务端数据，返回绘制结果 */
     abstract consumeService(props: {
@@ -90,12 +95,15 @@ export declare abstract class BaseShapeTool {
         eraserlines: SerializerEraserLines;
         pos: [number, number];
         layer: Group;
-        isClear?: boolean;
     }): void;
+    private createVmRenderNode;
+    private addEraserlines;
+    private isTransparentRectByCanvas;
     protected computEraserPoints(points: number[], thickness: number): Point2d[];
     private computDot;
     private computLine;
-    replace(layer: Group, replaceId: string, newNode?: ShapeNodes): void;
+    replace(layer: Group, replaceId?: string, newNode?: ShapeNodes): void;
+    removeDrawCountNodes(layer: Group, removeDrawCount: number): void;
     static updateNodeOpt(param: {
         node: ShapeNodes;
         opt: IUpdateNodeOpt;

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

@@ -5,9 +5,9 @@ import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 import type { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
-import type { SubLocalThreadImpl } from "../mainThread/subLocalThread";
+import type { SubLocalMainThreadImpl } from "../mainThread/subLocalThread";
 import type { SnapshotThreadImpl } from "../mainThread/snapshotThread";
-import type { SubServiceThreadImpl } from "../mainThread/subServiceThread";
+import type { SubServiceMainThreadImpl } from "../mainThread/subServiceThread";
 import { type WorkThreadEngineForFullWorker, WorkThreadEngineForSubWorker } from "../worker/workerManager";
 export interface ImageOptions extends BaseShapeOptions {
     /** 图片地址 */
@@ -49,7 +49,7 @@ export declare class ImageShape extends BaseShapeTool {
     consumeService(): IRectType | undefined;
     consumeServiceAsync(props: {
         isFullWork: boolean;
-        worker: LocalWorkForFullWorker | WorkThreadEngineForFullWorker | WorkThreadEngineForSubWorker | SubLocalThreadImpl | SnapshotThreadImpl | SubServiceThreadImpl;
+        worker: LocalWorkForFullWorker | WorkThreadEngineForFullWorker | WorkThreadEngineForSubWorker | SubLocalMainThreadImpl | SnapshotThreadImpl | SubServiceMainThreadImpl;
         replaceId?: string;
     }): Promise<IRectType | undefined>;
     clearTmpPoints(): void;

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

@@ -32,7 +32,7 @@ export declare class PencilShape extends BaseShapeTool {
         isSubWorker?: boolean;
         drawCount?: number;
         isMainThread?: boolean;
-        replaceId?: string;
+        removeDrawCount?: number;
     }): {
         rect: IRectType | undefined;
         type: EPostMessageType;

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

@@ -1,9 +1,10 @@
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { IWorkerMessage, IRectType, BaseNodeMapItem } from "../types";
+import type { IMainMessage } from "../types";
 import { Point2d } from "../utils/primitives/Point2d";
 import type { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
-import type { SubLocalThreadImpl } from "../mainThread/subLocalThread";
+import type { SubLocalMainThreadImpl } from "../mainThread/subLocalThread";
 export type SerializerEraserLines = Array<SerializerEraserItem>;
 export interface SerializerEraserItem {
     op: number[][];
@@ -27,24 +28,33 @@ export declare class BitMapEraserShape extends BaseShapeTool {
     private syncIndex;
     private syncTimestamp;
     constructor(props: BaseShapeToolProps);
+    /** 批量合并消费本地数据,返回绘制结果 */
+    combineConsume(): IMainMessage | undefined;
     consumeService(params: {
         op: number[];
         isFullWork?: boolean;
+        replaceId?: string;
     }): IRectType | undefined;
     private updateTempPoints;
     private getChangeNodes;
-    reRenderEffectNodes(props: {
-        willDeleteNodes?: Set<string>;
-        willUpdateNodes?: Map<string, BaseNodeMapItem>;
-        worker: LocalWorkForFullWorker | SubLocalThreadImpl;
-    }): Promise<IRectType | undefined>;
     consume(props: {
         data: IWorkerMessage;
+        isFullWork: boolean;
+        isSubWorker?: boolean;
+        isMainThread?: boolean;
+        drawCount?: number;
+        removeDrawCount?: number;
     }): {
         workId: string;
         toolsType: EToolsKey;
         opt: import("./utils").ShapeOptions;
         type: EPostMessageType;
+        rect?: undefined;
+        dataType?: undefined;
+    } | {
+        rect: IRectType | undefined;
+        type: EPostMessageType;
+        dataType: EDataType;
     } | {
         type: EPostMessageType;
         dataType: EDataType;
@@ -59,10 +69,10 @@ export declare class BitMapEraserShape extends BaseShapeTool {
         opt: import("./utils").ShapeOptions;
     };
     private draw;
-    private isTransparentRectByGL;
-    private isTransparentRectByCanvas;
-    private isTransparentRect;
-    consumeAll(): {
+    private computEraserPointLines;
+    consumeAll(props: {
+        workerEngine?: LocalWorkForFullWorker | SubLocalMainThreadImpl;
+    }): {
         workId: string;
         toolsType: EToolsKey;
         opt: import("./utils").ShapeOptions;

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

@@ -6,7 +6,7 @@ import type { VNodeManager } from "../vNodeManager";
 import { TextOptions } from "../../component/textEditor/types";
 import { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
 import { ShapeOptType } from "../../displayer/types";
-import type { SubLocalThreadImpl } from "../mainThread/subLocalThread";
+import type { SubLocalMainThreadImpl } from "../mainThread/subLocalThread";
 import { EStrokeType } from "../../plugin";
 export interface SelectorOptions extends BaseShapeOptions {
 }
@@ -111,7 +111,7 @@ export declare class SelectorShape extends BaseShapeTool {
         vNodes: VNodeManager;
         selectIds?: string[];
         willSerializeData?: boolean;
-        worker?: LocalWorkForFullWorker | SubLocalThreadImpl;
+        worker?: LocalWorkForFullWorker | SubLocalMainThreadImpl;
         offset?: [number, number];
     }): Promise<IMainMessage | undefined>;
     blurSelector(): {

package/dist/core/types.d.ts

@@ -109,7 +109,6 @@ export type IWorkerMessage = Omit<Partial<BaseCollectorReducerAction>, 'op'> & {
     currentToolsData?: IActiveToolsDataType;
     updateNodeOpt?: IUpdateNodeOpt;
     layerOpt?: ILayerOptionType;
-    drawCount?: number;
     useAnimation?: boolean;
     willRefreshSelector?: boolean;
     willSyncService?: boolean;
@@ -149,7 +148,6 @@ export interface IMainMessage extends INormalPushMsg {
     removeIds?: Array<string>;
     /** 是否是完整的一次任务 */
     isFullWork?: boolean;
-    drawCount?: number;
     selectIds?: Array<string>;
     padding?: number;
     selectRect?: IRectType;
@@ -209,11 +207,12 @@ export interface IBatchMainMessage {
     render?: Array<IMainMessageRenderData>;
     /** 同步服务端数据 */
     sp?: Array<IMainMessage>;
-    drawCount?: number;
     workerTasksqueueCount?: number;
     workIds?: Set<string>;
     viewId?: string;
     consumeCount?: number;
+    subWorkerDrawCount?: number;
+    fullWorkerDrawCount?: number;
 }
 export interface ICameraOpt {
     centerX: number;

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

@@ -98,6 +98,7 @@ export declare abstract class LocalWork {
     protected tmpOpt?: IActiveToolsDataType;
     workShapes: Map<string, BaseShapeTool>;
     protected drawCount: number;
+    protected consumeCount: number;
     protected syncUnitTime: number;
     constructor(opt: ISubWorkerInitOption);
     destroy(): void;

package/dist/core/worker/fullWorkerLocal.d.ts

@@ -1,4 +1,4 @@
-import { IWorkerMessage, IMainMessage, EToolsKey, IBatchMainMessage, IUpdateSelectorPropsType } from "..";
+import { IWorkerMessage, IMainMessage, IRectType, EToolsKey, IBatchMainMessage, IUpdateSelectorPropsType } from "..";
 import { BaseShapeOptions, SelectorShape } from "../tools";
 import { ISubWorkerInitOption, LocalWork } from "./base";
 import { ServiceWorkForFullWorker } from "./fullWorkerService";
@@ -8,7 +8,6 @@ export declare class LocalWorkForFullWorker extends LocalWork {
     private combineTimerId?;
     private combineDrawResolve?;
     private combineDrawActiveId?;
-    private consumeCount;
     protected drawWorkActiveId?: string;
     private effectSelectNodeData;
     private batchEraserWorks;
@@ -22,7 +21,10 @@ export declare class LocalWorkForFullWorker extends LocalWork {
     private commandDeleteText;
     removeSelector(data: IWorkerMessage, workEngine?: WorkThreadEngineForFullWorker): Promise<void>;
     removeWork(data: IWorkerMessage): Promise<void>;
-    private removeNode;
+    removeNode(key: string): {
+        fullRect: IRectType | undefined;
+        drawRect: IRectType | undefined;
+    };
     private _removeWork;
     checkTextActive(data: IWorkerMessage): Promise<void>;
     colloctEffectSelectWork(data: IWorkerMessage): Promise<IWorkerMessage | undefined>;
@@ -47,6 +49,7 @@ export declare class LocalWorkForFullWorker extends LocalWork {
     destroy(): void;
     private drawBitMapEraser;
     private drawBitMapEraserFull;
+    private drawBitMapCombine;
     private drawPencilCombine;
     private drawSelector;
     private drawPencilEraser;