@netless/appliance-plugin 1.1.43-beta.0 → 1.1.43-beta.2

package/READMA.zh-CN.md

@@ -912,7 +912,7 @@ const plugin = await ApplianceSinglePlugin.getInstance(room, {
 });
 ```
 
-不需要配置 `fullLayerDoingMask`。该旧字段仅保留兼容读取，无论传入 `true` 还是 `false`，当前实现都统一使用 FullLayer Doing Mask。`disableEraseImage` 不影响 Bitmap Eraser 对 Image 的直接擦除。
+`fullLayerDoingMask` 已移除；旧调用方即使传入也会被忽略，所有 Bitmap Eraser 事务统一使用 FullLayer Doing Mask。`fullLayerDoingMaskMaxInputPoints` 默认 500，可由客户配置。`disableEraseImage` 不影响 Bitmap Eraser 对 Image 的直接擦除。
 
 ### 前端调试
 

package/README.md

@@ -959,7 +959,11 @@ const plugin = await ApplianceSinglePlugin.getInstance(room, {
 });
 ```
 
-Do not configure `fullLayerDoingMask`. The legacy field is accepted only for compatibility; both `true` and `false` now use the single FullLayer Doing Mask path. `disableEraseImage` does not prevent the Bitmap Eraser from directly erasing Image appliances.
+Do not configure `fullLayerDoingMask`; it has been removed and is ignored if supplied by a
+legacy caller. All Bitmap Eraser transactions use the single FullLayer Doing Mask path.
+`fullLayerDoingMaskMaxInputPoints` defaults to 500 and
+can be configured per customer. `disableEraseImage` does not prevent the Bitmap Eraser from
+directly erasing Image appliances.
 
 ### Front-end Debugging
 During the integration process, if you want to understand and track the internal status of the plugin, you can view internal data through the following console commands.

package/dist/appliance-plugin.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DFo0Gmfx.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.AppliancePluginCursorNames=e.AppliancePluginCursorNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.Camera_Ack_Slow_Timeout=e.Camera_Ack_Slow_Timeout;exports.Camera_Transport_Fallback_Timeout=e.Camera_Transport_Fallback_Timeout;exports.Camera_Update_Business_Timeout=e.Camera_Update_Business_Timeout;exports.Cursor_Hover_Id=e.Cursor_Hover_Id;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EForceStopReason=e.EForceStopReason;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;exports.ESVGType=e.ESVGType;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.EventWorkState=e.EventWorkState;exports.EvevtWorkState=e.EventWorkState;exports.FontFaceFallbackBlacklistLevel=e.FontFaceFallbackBlacklistLevel;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.Main_View_Id=e.Main_View_Id;exports.Plugin=e.Plugin;exports.Renderer_Business_Default_Timeout=e.Renderer_Business_Default_Timeout;exports.ShapeType=e.ShapeType;exports.Task_Time_Interval=e.Task_Time_Interval;exports.WorkerCanvasContextBlacklistLevel=e.WorkerCanvasContextBlacklistLevel;exports.WorkerMaskTextureFormatBlacklistLevel=e.WorkerMaskTextureFormatBlacklistLevel;exports.WorkerMaskTextureUploadBlacklistLevel=e.WorkerMaskTextureUploadBlacklistLevel;exports.WorkerRenderModeBlacklistLevel=e.WorkerRenderModeBlacklistLevel;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-Bgw8Yl5s.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.AppliancePluginCursorNames=e.AppliancePluginCursorNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.Camera_Ack_Slow_Timeout=e.Camera_Ack_Slow_Timeout;exports.Camera_Transport_Fallback_Timeout=e.Camera_Transport_Fallback_Timeout;exports.Camera_Update_Business_Timeout=e.Camera_Update_Business_Timeout;exports.Cursor_Hover_Id=e.Cursor_Hover_Id;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EForceStopReason=e.EForceStopReason;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;exports.ESVGType=e.ESVGType;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.EventWorkState=e.EventWorkState;exports.EvevtWorkState=e.EventWorkState;exports.FontFaceFallbackBlacklistLevel=e.FontFaceFallbackBlacklistLevel;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.Main_View_Id=e.Main_View_Id;exports.Plugin=e.Plugin;exports.Renderer_Business_Default_Timeout=e.Renderer_Business_Default_Timeout;exports.ShapeType=e.ShapeType;exports.Task_Time_Interval=e.Task_Time_Interval;exports.WorkerCanvasContextBlacklistLevel=e.WorkerCanvasContextBlacklistLevel;exports.WorkerMaskTextureFormatBlacklistLevel=e.WorkerMaskTextureFormatBlacklistLevel;exports.WorkerMaskTextureUploadBlacklistLevel=e.WorkerMaskTextureUploadBlacklistLevel;exports.WorkerRenderModeBlacklistLevel=e.WorkerRenderModeBlacklistLevel;

package/dist/appliance-plugin.mjs

@@ -1,4 +1,4 @@
-import { Y as s, Z as t, _ as r, $ as l, a0 as i, a1 as p, a2 as o, a3 as n, a4 as T, C as E, s as c, b as k, a5 as y, H as _, K as u, a6 as m, a as v, a7 as g, d as S, a8 as d, a9 as C, c as M, aa as A, E as B, ab as F, e as W, e as x, ac as I, ad as L, y as P, ae as R, af as b, ag as f, T as h, ah as w, ai as D, aj as H, ak as K } from "./index-NG5kKK1W.mjs";
+import { Y as s, Z as t, _ as r, $ as l, a0 as i, a1 as p, a2 as o, a3 as n, a4 as T, C as E, s as c, b as k, a5 as y, H as _, K as u, a6 as m, a as v, a7 as g, d as S, a8 as d, a9 as C, c as M, aa as A, E as B, ab as F, e as W, e as x, ac as I, ad as L, y as P, ae as R, af as b, ag as f, T as h, ah as w, ai as D, aj as H, ak as K } from "./index-DkMJ7xR-.mjs";
 export {
   s as ActiveContainerType,
   t as ApplianceMultiPlugin,

package/dist/{bridge-DcVN05tP.mjs → bridge-DzcPAEgn.mjs}

@@ -54,7 +54,7 @@ class g {
   }
 }
 async function d(i) {
-  return c(i), import("./index-B_vZ9d3x.mjs").then((t) => t.Z);
+  return c(i), import("./index-BARnlEAY.mjs").then((t) => t.Z);
 }
 export {
   g as P,

package/dist/{bridge-D68E09T9.js → bridge-iTPNL78o.js}

@@ -1 +1 @@
-"use strict";var l=Object.defineProperty;var o=(i,e,t)=>e in i?l(i,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):i[e]=t;var n=(i,e,t)=>o(i,typeof e!="symbol"?e+"":e,t);let r;function c(i){r=i}function u(){if(!r)throw new Error("[@netless/appliance-plugin/bridge] white-web-sdk runtime has not been bound yet.");return r}class h{constructor(){n(this,"control");n(this,"_listeners",{})}_inject(e){this.control=e}_onEvent(e,t){this._listeners[e]&&this._listeners[e](...t)}callbacks(e,t){this._listeners[e]=t}removeCallback(e){delete this._listeners[e]}}class g{constructor(e){n(this,"control");n(this,"worker");n(this,"publicMsgEmitter");n(this,"plugins",new Map);const{control:t,publicMsgEmitter:s}=e;this.control=t,this.publicMsgEmitter=s,this.worker=t.worker}use(e){this.plugins.set(e.kind,e),e._inject(this.control),e.onCreate()}destroy(){this.plugins.forEach(e=>{this.plugins.delete(e.kind),e.onDestroy()})}dispatchPluginEvent(e,...t){this.plugins.forEach(s=>{s._onEvent(e,t)})}}async function a(i){return c(i),Promise.resolve().then(()=>require("./index-C2AHqjj8.js")).then(e=>e.index)}exports.Plugin=h;exports.PluginManager=g;exports.getWhiteWebSdkBridgeRuntime=u;exports.loadAppliancePluginBridge=a;
+"use strict";var l=Object.defineProperty;var o=(i,e,t)=>e in i?l(i,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):i[e]=t;var n=(i,e,t)=>o(i,typeof e!="symbol"?e+"":e,t);let r;function c(i){r=i}function u(){if(!r)throw new Error("[@netless/appliance-plugin/bridge] white-web-sdk runtime has not been bound yet.");return r}class h{constructor(){n(this,"control");n(this,"_listeners",{})}_inject(e){this.control=e}_onEvent(e,t){this._listeners[e]&&this._listeners[e](...t)}callbacks(e,t){this._listeners[e]=t}removeCallback(e){delete this._listeners[e]}}class g{constructor(e){n(this,"control");n(this,"worker");n(this,"publicMsgEmitter");n(this,"plugins",new Map);const{control:t,publicMsgEmitter:s}=e;this.control=t,this.publicMsgEmitter=s,this.worker=t.worker}use(e){this.plugins.set(e.kind,e),e._inject(this.control),e.onCreate()}destroy(){this.plugins.forEach(e=>{this.plugins.delete(e.kind),e.onDestroy()})}dispatchPluginEvent(e,...t){this.plugins.forEach(s=>{s._onEvent(e,t)})}}async function a(i){return c(i),Promise.resolve().then(()=>require("./index-B6nsfvHS.js")).then(e=>e.index)}exports.Plugin=h;exports.PluginManager=g;exports.getWhiteWebSdkBridgeRuntime=u;exports.loadAppliancePluginBridge=a;

package/dist/bridge.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./bridge-D68E09T9.js");exports.Plugin=e.Plugin;exports.loadAppliancePluginBridge=e.loadAppliancePluginBridge;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./bridge-iTPNL78o.js");exports.Plugin=e.Plugin;exports.loadAppliancePluginBridge=e.loadAppliancePluginBridge;

package/dist/bridge.mjs

@@ -1,4 +1,4 @@
-import { a as i, l as e } from "./bridge-DcVN05tP.mjs";
+import { a as i, l as e } from "./bridge-DzcPAEgn.mjs";
 export {
   i as Plugin,
   e as loadAppliancePluginBridge

package/dist/core/enum.d.ts

@@ -144,7 +144,9 @@ export declare enum EPostMessageType {
     /** 初始化 service snapshot 已完成 renderer 提交 */
     ServiceSyncCommit = 39,
     /** 取消尚未完成的字体加载请求，仅用于内部 Worker 协议 */
-    CancelFontFace = 40
+    CancelFontFace = 40,
+    /** 中断尚未完成的 Bitmap Eraser 事务，仅用于内部 Worker 协议 */
+    CancelBitmapEraser = 41
 }
 export type ECanvasContextType = "webgl2" | "webgl" | "2d";
 export declare enum ECanvasShowType {

package/dist/core/mainEngine.d.ts

@@ -179,7 +179,6 @@ export declare class MasterControlForWorker extends MasterController {
         viewId: string;
         toolsType?: EToolsKey;
         opt?: BaseShapeOptions & {
-            fullLayerDoingMask?: boolean;
             fullLayerDoingMaskMaxInputPoints?: number;
         };
         undoTickerId?: number;
@@ -430,7 +429,6 @@ export declare class MasterControlForWorker extends MasterController {
         viewId: string;
         toolsType?: EToolsKey;
         opt?: BaseShapeOptions & {
-            fullLayerDoingMask?: boolean;
             fullLayerDoingMaskMaxInputPoints?: number;
         };
         undoTickerId?: number;
@@ -590,6 +588,14 @@ export declare class MasterControlForWorker extends MasterController {
     checkDrawingWork(vId: string): Promise<number[]>;
     cancelLocalWorks(viewId: string, syncStorage?: boolean, onlyWorkIds?: ReadonlySet<string>): void;
     timeoutLocalWorks(viewId: string, scenePath: string, reason: string, onlyWorkIds?: ReadonlySet<string>, error?: unknown): void;
+    /**
+     * Bitmap Done mutates the worker VNode/display tree before its Collector
+     * apply marker arrives. On a commit deadline, replay the captured
+     * before-images to both renderer and storage, then let the normal cancel
+     * path close the dynamic Undo scope. Compensation messages deliberately do
+     * not carry eraseTxnId, so the late Done tombstone cannot discard recovery.
+     */
+    private rollbackBitmapEraserTxn;
     private logLocalWorkBarrierError;
     removeDrawingWork(vId: string): void;
     removeNodes(viewId: string, removeIds: string[]): void;

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

@@ -1,4 +1,4 @@
-import { IActiveToolsDataType, IWorkerMessage, IMainMessage, IUpdateSelectorPropsType, IBatchMainMessage } from "../types";
+import { IActiveToolsDataType, IWorkerMessage, IMainMessage, IUpdateSelectorPropsType, IBatchMainMessage, BaseNodeMapItem } from "../types";
 import type { BaseShapeTool, BaseShapeOptions, SelectorShape, ImageShape, ShapeToolsClass } from "../tools";
 import { MainThreadEngineImpl, ISubThreadInitOption } from "./base";
 import { VNodeManager } from "../vNodeManager";
@@ -16,6 +16,8 @@ export interface SubLocalThread {
     destroy(): void;
     clearAll(): void;
     clearWorkShapeNodeCache(workId: string): void;
+    abortBitmapEraser(workId: string): void;
+    publishBitmapEraserBeforeImages(workId: string, beforeImages: Map<string, BaseNodeMapItem>): void;
     setToolsOpt(opt: IActiveToolsDataType): void;
     getToolsOpt(): IActiveToolsDataType | undefined;
     createWorkShapeNode(opt: IActiveToolsDataType & {
@@ -109,6 +111,9 @@ export declare class SubLocalMainThreadImpl implements SubLocalThread {
     reRenderSelector(willSyncService?: boolean): Promise<void> | undefined;
     blurSelector(data?: IWorkerMessage): Promise<void>;
     clearWorkShapeNodeCache(workId: string): void;
+    /** Stop queued Bitmap Eraser work and restore Doing-time hidden nodes. */
+    abortBitmapEraser(workId: string): void;
+    publishBitmapEraserBeforeImages(workId: string, beforeImages: Map<string, BaseNodeMapItem>): void;
     private drawBitMapEraserFull;
     private drawPencilEraserFull;
     private drawEraser;

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

@@ -13,8 +13,6 @@ export interface SerializerEraserItem {
 export type SerializerEraserLines = Array<SerializerEraserItem>;
 export interface BitMapEraserOptions extends BaseShapeOptions {
     thickness: number;
-    /** @deprecated Bitmap Eraser now always uses the FullLayer Doing mask. */
-    fullLayerDoingMask?: boolean;
     maxImageWidth?: number;
     maxImageHeight?: number;
     removeOnDone?: boolean;
@@ -44,6 +42,8 @@ export declare class BitMapEraserShape extends BaseShapeTool {
     private readonly hiddenRenderNodes;
     private fullLayerPreviewGroup?;
     private disposeVNodeObserver?;
+    /** Transaction-scoped before-images survive until the Done ACK is applied. */
+    private readonly beforeImages;
     constructor(props: BaseShapeToolProps);
     /** Consume exactly one accepted input batch and publish one FullLayer preview. */
     combineConsume(_props: {
@@ -72,6 +72,7 @@ export declare class BitMapEraserShape extends BaseShapeTool {
         type: EPostMessageType;
     } | {
         rect: IRectType | undefined;
+        eraseTxnBeforeImages: Map<string, BaseNodeMapItem>;
         eraseTxnCommitStatus: "applied";
         workId: string;
         toolsType: EToolsKey;
@@ -84,6 +85,7 @@ export declare class BitMapEraserShape extends BaseShapeTool {
         ops: string;
         willUpdateNodes: Map<string, BaseNodeMapItem>;
         willDeleteNodes: Set<string>;
+        eraseTxnBeforeImages: Map<string, BaseNodeMapItem>;
         eraseTxnCommitStatus: "applied";
         workId: string;
         toolsType: EToolsKey;
@@ -92,6 +94,7 @@ export declare class BitMapEraserShape extends BaseShapeTool {
         rect: IRectType | undefined;
         willUpdateNodes: Map<string, BaseNodeMapItem>;
         willDeleteNodes: Set<string>;
+        eraseTxnBeforeImages: Map<string, BaseNodeMapItem>;
         eraseTxnRecoveryRequired: boolean;
         eraseTxnCommitStatus: "failed";
         workId: string;
@@ -120,6 +123,7 @@ export declare class BitMapEraserShape extends BaseShapeTool {
     private hideRenderNodesForId;
     private restoreNoLongerClearablePendingDeletes;
     private snapshotDoneCandidates;
+    private captureBeforeImage;
     private collectDoneVectorChanges;
     private normalizeClippedLine;
     private commitDoingFaces;

package/dist/core/types.d.ts

@@ -252,6 +252,8 @@ export interface IMainMessage extends INormalPushMsg {
     eraseTxnPhase?: "applied" | "failed";
     /** Internal Done result used to choose the terminal transaction marker. */
     eraseTxnCommitStatus?: "applied" | "failed";
+    /** Bitmap Eraser transaction before-images used for timeout compensation. */
+    eraseTxnBeforeImages?: Map<string, BaseNodeMapItem>;
     /** Internal renderer request business used to settle Snapshot waiters. */
     reportBusiness?: "snapshot" | "bounding-box";
     /** Structured renderer failure stage for request-scoped diagnostics. */

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

@@ -1,4 +1,4 @@
-import { IWorkerMessage, IMainMessage, IRectType, EToolsKey, IBatchMainMessage, EventWorkState, IUpdateSelectorPropsType } from "..";
+import { IWorkerMessage, IMainMessage, IRectType, EToolsKey, IBatchMainMessage, EventWorkState, IUpdateSelectorPropsType, BaseNodeMapItem } from "..";
 import { BaseShapeOptions, SelectorShape } from "../tools";
 import { ISubWorkerInitOption, LocalWork } from "./base";
 import { ServiceWorkForFullWorker } from "./fullWorkerService";
@@ -15,6 +15,9 @@ export declare class LocalWorkForFullWorker extends LocalWork {
     private disposeVNodeRevisionObserver?;
     private bitmapEraserRenderQueue;
     private bitmapEraserRevalidationQueued;
+    /** Stop queued Bitmap Eraser work and restore Doing-time hidden nodes. */
+    abortBitmapEraser(workId: string): void;
+    publishBitmapEraserBeforeImages(workId: string, beforeImages: Map<string, BaseNodeMapItem>): void;
     protected drawWorkActiveId?: string;
     protected effectSelectNodeData: Set<IWorkerMessage>;
     constructor(opt: ISubWorkerInitOption);