@lokvis/runtime 0.2.0-beta.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/dist/asset-store.d.ts +5 -2
- package/dist/asset-store.d.ts.map +1 -1
- package/dist/asset-store.js +93 -3
- package/dist/asset-store.js.map +1 -1
- package/dist/batch-processor.d.ts +200 -0
- package/dist/batch-processor.d.ts.map +1 -0
- package/dist/batch-processor.js +505 -0
- package/dist/batch-processor.js.map +1 -0
- package/dist/degradation.d.ts +109 -0
- package/dist/degradation.d.ts.map +1 -0
- package/dist/degradation.js +184 -0
- package/dist/degradation.js.map +1 -0
- package/dist/history-store.d.ts +76 -0
- package/dist/history-store.d.ts.map +1 -0
- package/dist/history-store.js +109 -0
- package/dist/history-store.js.map +1 -0
- package/dist/idb-asset-store.js +1 -1
- package/dist/idb-asset-store.js.map +1 -1
- package/dist/index.d.ts +5 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/memory-guard.d.ts +109 -0
- package/dist/memory-guard.d.ts.map +1 -0
- package/dist/memory-guard.js +161 -0
- package/dist/memory-guard.js.map +1 -0
- package/dist/opfs-asset-store.d.ts +35 -4
- package/dist/opfs-asset-store.d.ts.map +1 -1
- package/dist/opfs-asset-store.js +94 -10
- package/dist/opfs-asset-store.js.map +1 -1
- package/dist/runtime.d.ts +130 -6
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +404 -16
- package/dist/runtime.js.map +1 -1
- package/dist/types.d.ts +106 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/worker-host.d.ts +13 -0
- package/dist/worker-host.d.ts.map +1 -1
- package/dist/worker-host.js +47 -15
- package/dist/worker-host.js.map +1 -1
- package/dist/worker-protocol.d.ts +10 -1
- package/dist/worker-protocol.d.ts.map +1 -1
- package/dist/worker-protocol.js.map +1 -1
- package/dist/workflow-builder.d.ts +124 -0
- package/dist/workflow-builder.d.ts.map +1 -0
- package/dist/workflow-builder.js +240 -0
- package/dist/workflow-builder.js.map +1 -0
- package/package.json +3 -2
- package/src/asset-store.ts +103 -3
- package/src/batch-processor.ts +699 -0
- package/src/degradation.ts +241 -0
- package/src/history-store.ts +159 -0
- package/src/idb-asset-store.ts +1 -1
- package/src/index.ts +5 -0
- package/src/memory-guard.ts +202 -0
- package/src/opfs-asset-store.ts +118 -10
- package/src/runtime.ts +445 -12
- package/src/types.ts +107 -0
- package/src/worker-host.ts +56 -16
- package/src/worker-protocol.ts +11 -1
- package/src/workflow-builder.ts +303 -0
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 内存阈值监测与 OPFS 溢出(W3.3)
|
|
3
|
+
*
|
|
4
|
+
* 目标(对应 whitepaper T1「浏览器内存/性能 ★★★★★」):
|
|
5
|
+
* 浏览器单 tab 内存有限(桌面典型 2-4GB,移动端更少),大图批量处理
|
|
6
|
+
* 极易触发 OOM 崩溃(整个 tab 被杀,丢失所有中间结果)。MemoryGuard 通过
|
|
7
|
+
* 显式追踪中间结果占用 + 周期性压力评估,在逼近预算时把中间 Blob 溢出
|
|
8
|
+
* 到 OPFS,把"OPFS 当虚拟内存用"——内存里只留当前活跃的一两个 Blob。
|
|
9
|
+
*
|
|
10
|
+
* 设计取舍:
|
|
11
|
+
* - tracked:显式登记的中间分配(decode 结果、canvas 输出等大对象)。
|
|
12
|
+
* 相比 `performance.memory`(Chrome-only、deprecated、MB 粒度、跨浏览器
|
|
13
|
+
* 不可用),tracked 是可控、可测、确定性的信号,适合做预算判定主依据。
|
|
14
|
+
* - budget:512MB(经验值——留出 JS runtime / DOM / 其他 tab 的余量,
|
|
15
|
+
* 实际由 RuntimeConfig.memoryBudget 传入,默认 512MB)。
|
|
16
|
+
* - pressure:low(<60%) / elevated(60-80%) / high(80-95%) / critical(≥95%)。
|
|
17
|
+
* - shouldSpill:pressure >= high 时建议把当前中间结果落 OPFS。
|
|
18
|
+
* - spill/restore/evict:经由 AssetStore(OPFS-backed when available;
|
|
19
|
+
* runtime 已用 wrapAssetStoreWithQuota 包裹,溢出受 storageQuota 约束,
|
|
20
|
+
* 避免无限溢出把磁盘填满)。
|
|
21
|
+
*
|
|
22
|
+
* 集成方式(由 W3.4 degradation 编排):
|
|
23
|
+
* const guard = new MemoryGuard({ budget, assetStore });
|
|
24
|
+
* const alloc = guard.track(blob.size); // 登记
|
|
25
|
+
* if (guard.shouldSpill()) { const a = await guard.spill(blob); blob = null; } // 溢出
|
|
26
|
+
* ...
|
|
27
|
+
* alloc.release(); // 回退
|
|
28
|
+
*/
|
|
29
|
+
/** 默认内存预算:512MB(见上) */
|
|
30
|
+
export const DEFAULT_MEMORY_BUDGET = 512 * 1024 * 1024;
|
|
31
|
+
/**
|
|
32
|
+
* 估算解码后位图占用的内存(RGBA,4 字节/像素)。
|
|
33
|
+
*
|
|
34
|
+
* 一个 4000×3000 的 JPEG,blob 可能只有 2MB,但 decode 成 ImageBitmap 后
|
|
35
|
+
* 占 4000*3000*4 ≈ 46MB。追踪中间结果时应以此为准而非 blob.size,
|
|
36
|
+
* 否则严重低估内存压力。
|
|
37
|
+
*/
|
|
38
|
+
export function estimateDecodedBytes(width, height) {
|
|
39
|
+
return Math.max(0, Math.round(width * height * 4));
|
|
40
|
+
}
|
|
41
|
+
/** 估算 Blob 在内存中占用的字节数(对未解码的 Blob,以其 size 为准) */
|
|
42
|
+
export function estimateBlobBytes(blob) {
|
|
43
|
+
return blob.size;
|
|
44
|
+
}
|
|
45
|
+
/** 内存守卫:追踪中间结果占用 + 触发 OPFS 溢出 */
|
|
46
|
+
export class MemoryGuard {
|
|
47
|
+
tracked = 0;
|
|
48
|
+
budget;
|
|
49
|
+
elevatedRatio;
|
|
50
|
+
highRatio;
|
|
51
|
+
criticalRatio;
|
|
52
|
+
assetStore;
|
|
53
|
+
constructor(opts = {}) {
|
|
54
|
+
this.budget = opts.budget ?? DEFAULT_MEMORY_BUDGET;
|
|
55
|
+
this.elevatedRatio = opts.elevatedRatio ?? 0.6;
|
|
56
|
+
this.highRatio = opts.highRatio ?? 0.8;
|
|
57
|
+
this.criticalRatio = opts.criticalRatio ?? 0.95;
|
|
58
|
+
this.assetStore = opts.assetStore;
|
|
59
|
+
// 阈值单调性校验,避免配置错误导致 pressure 永远卡在某一档
|
|
60
|
+
if (!(this.elevatedRatio <= this.highRatio && this.highRatio <= this.criticalRatio)) {
|
|
61
|
+
throw new Error(`MemoryGuard thresholds must be non-decreasing: ` +
|
|
62
|
+
`elevated(${this.elevatedRatio}) <= high(${this.highRatio}) <= critical(${this.criticalRatio})`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/** 当前已登记的字节数 */
|
|
66
|
+
get currentUsage() {
|
|
67
|
+
return this.tracked;
|
|
68
|
+
}
|
|
69
|
+
/** 总预算(字节) */
|
|
70
|
+
get budgetBytes() {
|
|
71
|
+
return this.budget;
|
|
72
|
+
}
|
|
73
|
+
/** 当前是否已配置可溢出的 AssetStore */
|
|
74
|
+
get canSpill() {
|
|
75
|
+
return this.assetStore !== undefined;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* 登记一笔内存占用。返回 release 句柄,丢弃引用时调用以回退计数。
|
|
79
|
+
* 用于追踪 decode 结果 / canvas 输出等大对象的生命周期。
|
|
80
|
+
*/
|
|
81
|
+
track(bytes) {
|
|
82
|
+
if (bytes < 0) {
|
|
83
|
+
throw new Error(`MemoryGuard.track: bytes must be non-negative, got ${bytes}`);
|
|
84
|
+
}
|
|
85
|
+
this.tracked += bytes;
|
|
86
|
+
let released = false;
|
|
87
|
+
return {
|
|
88
|
+
bytes,
|
|
89
|
+
release: () => {
|
|
90
|
+
if (released)
|
|
91
|
+
return; // 幂等:重复 release 仅首次生效
|
|
92
|
+
released = true;
|
|
93
|
+
this.tracked = Math.max(0, this.tracked - bytes);
|
|
94
|
+
},
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
/** 当前压力等级(基于 tracked / budget) */
|
|
98
|
+
getPressure() {
|
|
99
|
+
const ratio = this.tracked / this.budget;
|
|
100
|
+
if (ratio >= this.criticalRatio)
|
|
101
|
+
return 'critical';
|
|
102
|
+
if (ratio >= this.highRatio)
|
|
103
|
+
return 'high';
|
|
104
|
+
if (ratio >= this.elevatedRatio)
|
|
105
|
+
return 'elevated';
|
|
106
|
+
return 'low';
|
|
107
|
+
}
|
|
108
|
+
/** 已用比例(0-1+) */
|
|
109
|
+
getUsageRatio() {
|
|
110
|
+
return this.tracked / this.budget;
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* 是否应溢出(pressure >= high)。无 assetStore 时永远 false(无法溢出,
|
|
114
|
+
* 交由降级阶梯 L3/L4 处理)。
|
|
115
|
+
*/
|
|
116
|
+
shouldSpill() {
|
|
117
|
+
if (!this.assetStore)
|
|
118
|
+
return false;
|
|
119
|
+
const p = this.getPressure();
|
|
120
|
+
return p === 'high' || p === 'critical';
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* 把一个中间 Blob 溢出到 OPFS(assetStore.create),返回 Asset 句柄。
|
|
124
|
+
* 调用方应在 spill 后丢弃内存中的 Blob 引用,以真正释放内存。
|
|
125
|
+
*
|
|
126
|
+
* @param blob 要溢出的中间结果
|
|
127
|
+
* @param mimeType Blob 的 MIME(用于元数据);默认取 blob.type
|
|
128
|
+
* @param assetType 资产类型(默认 'image');video/pdf 管线可传对应类型
|
|
129
|
+
*/
|
|
130
|
+
async spill(blob, mimeType, assetType = 'image') {
|
|
131
|
+
if (!this.assetStore) {
|
|
132
|
+
throw new Error('MemoryGuard.spill requires an assetStore (OPFS-backed). ' +
|
|
133
|
+
'Construct MemoryGuard with { assetStore } to enable spilling.');
|
|
134
|
+
}
|
|
135
|
+
const mime = mimeType || blob.type || 'application/octet-stream';
|
|
136
|
+
const metadata = {
|
|
137
|
+
mimeType: mime,
|
|
138
|
+
size: blob.size,
|
|
139
|
+
format: mime.split('/')[1] ?? 'bin',
|
|
140
|
+
};
|
|
141
|
+
return this.assetStore.create(blob, metadata, assetType);
|
|
142
|
+
}
|
|
143
|
+
/** 从 OPFS 读回之前 spill 的中间结果 */
|
|
144
|
+
async restore(asset) {
|
|
145
|
+
if (!this.assetStore) {
|
|
146
|
+
throw new Error('MemoryGuard.restore requires an assetStore');
|
|
147
|
+
}
|
|
148
|
+
return this.assetStore.getBlob(asset.blob);
|
|
149
|
+
}
|
|
150
|
+
/** 丢弃已 spill 的中间结果(处理完成后回收 OPFS 空间) */
|
|
151
|
+
async evict(asset) {
|
|
152
|
+
if (!this.assetStore)
|
|
153
|
+
return;
|
|
154
|
+
await this.assetStore.remove(asset.id);
|
|
155
|
+
}
|
|
156
|
+
/** 重置所有登记(用于工作流结束 / 取消后的清理,tracked 归零) */
|
|
157
|
+
reset() {
|
|
158
|
+
this.tracked = 0;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
//# sourceMappingURL=memory-guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memory-guard.js","sourceRoot":"","sources":["../src/memory-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* OPFS Asset Store
|
|
3
3
|
*
|
|
4
|
-
* 大文件(blob)存 OPFS(Origin Private File System),元数据存内存 Map
|
|
5
|
-
* OPFS 是浏览器私有文件系统,blob 持久化(
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* 大文件(blob)存 OPFS(Origin Private File System),元数据存内存 Map +
|
|
5
|
+
* IndexedDB(Dexie)持久化。OPFS 是浏览器私有文件系统,blob 持久化(刷新后
|
|
6
|
+
* 文件仍在);W6.6 起元数据也通过 Dexie 持久化,刷新后 list()/get() 能恢复。
|
|
7
|
+
*
|
|
8
|
+
* 持久化策略(W6.6):
|
|
9
|
+
* - 启动时:db.metadata.toArray() 预加载内存 Map(后续 get/list 零 IO)
|
|
10
|
+
* - import/create:写 OPFS 文件 + db.metadata.put + 内存 Map.set
|
|
11
|
+
* - remove:删 OPFS 文件 + db.metadata.delete + 内存 Map.delete
|
|
12
|
+
* - IndexedDB 不可用时降级为仅内存模式(刷新后丢失,与 W2 行为一致)
|
|
8
13
|
*
|
|
9
14
|
* 注:任务规格提及 FileSystemSyncAccessHandle(Worker 内同步句柄),
|
|
10
15
|
* 但 AssetStore 接口本身为 async,主线程仅可使用 FileSystemFileHandle 异步 API,
|
|
@@ -12,6 +17,8 @@
|
|
|
12
17
|
*
|
|
13
18
|
* 降级链(W2.8 工厂):OPFS → IndexedDB → Memory
|
|
14
19
|
*/
|
|
20
|
+
import Dexie, { type Table } from 'dexie';
|
|
21
|
+
import type { Asset, AssetId } from '@lokvis/schema';
|
|
15
22
|
import type { AssetStore } from './asset-store.js';
|
|
16
23
|
/** OPFS 不可用或初始化失败时抛出 */
|
|
17
24
|
export declare class OpfsUnavailableError extends Error {
|
|
@@ -19,6 +26,23 @@ export declare class OpfsUnavailableError extends Error {
|
|
|
19
26
|
}
|
|
20
27
|
/** OPFS 文件存储路径前缀(出现在 BlobHandle.path 中) */
|
|
21
28
|
export declare const OPFS_PATH_PREFIX = "opfs";
|
|
29
|
+
/**
|
|
30
|
+
* OPFS 元数据持久化数据库(W6.6)。
|
|
31
|
+
*
|
|
32
|
+
* 仅存 { id, asset }(不含 blob,blob 在 OPFS 文件里),用于刷新后恢复内存 Map。
|
|
33
|
+
* 数据库名独立于 IdbAssetStore 的 'lokvis-assets',避免与全持久化 store 冲突。
|
|
34
|
+
*/
|
|
35
|
+
export declare class OpfsMetadataDatabase extends Dexie {
|
|
36
|
+
metadata: Table<OpfsMetadataRecord, AssetId>;
|
|
37
|
+
constructor(name?: string);
|
|
38
|
+
}
|
|
39
|
+
/** OPFS 元数据记录 */
|
|
40
|
+
export interface OpfsMetadataRecord {
|
|
41
|
+
/** 主键 = Asset.id */
|
|
42
|
+
id: AssetId;
|
|
43
|
+
/** 资产元数据(blob 在 OPFS 文件,不在此存) */
|
|
44
|
+
asset: Asset;
|
|
45
|
+
}
|
|
22
46
|
/** OPFS AssetStore 配置 */
|
|
23
47
|
export interface OpfsAssetStoreOptions {
|
|
24
48
|
/** OPFS 根目录下的命名空间目录名(默认 'lokvis') */
|
|
@@ -30,6 +54,13 @@ export interface OpfsAssetStoreOptions {
|
|
|
30
54
|
* 默认使用 navigator.storage.getDirectory()。
|
|
31
55
|
*/
|
|
32
56
|
rootHandle?: FileSystemDirectoryHandle;
|
|
57
|
+
/**
|
|
58
|
+
* 测试注入:自定义元数据库实例(W6.6 持久化)。
|
|
59
|
+
* 默认在 IndexedDB 可用时自动创建 OpfsMetadataDatabase。
|
|
60
|
+
*/
|
|
61
|
+
metadataDb?: OpfsMetadataDatabase;
|
|
62
|
+
/** 元数据库名(默认 'lokvis-opfs-metadata';仅 metadataDb 未注入时生效) */
|
|
63
|
+
metadataDbName?: string;
|
|
33
64
|
}
|
|
34
65
|
/** 检测当前环境是否支持 OPFS */
|
|
35
66
|
export declare function isOpfsSupported(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opfs-asset-store.d.ts","sourceRoot":"","sources":["../src/opfs-asset-store.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"opfs-asset-store.d.ts","sourceRoot":"","sources":["../src/opfs-asset-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,EAAE,KAAK,KAAK,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AASnD,wBAAwB;AACxB,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,OAAO,EAAE,MAAM;CAI5B;AAED,2CAA2C;AAC3C,eAAO,MAAM,gBAAgB,SAAS,CAAC;AAKvC;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,EAAG,KAAK,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;gBAElC,IAAI,SAAyB;CAM1C;AAED,iBAAiB;AACjB,MAAM,WAAW,kBAAkB;IACjC,oBAAoB;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,iCAAiC;IACjC,KAAK,EAAE,KAAK,CAAC;CACd;AAED,yBAAyB;AACzB,MAAM,WAAW,qBAAqB;IACpC,qCAAqC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC;;;OAGG;IACH,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,sBAAsB;AACtB,wBAAgB,eAAe,IAAI,OAAO,CAMzC;AAwFD,2BAA2B;AAC3B,wBAAsB,oBAAoB,CACxC,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,UAAU,CAAC,CAsFrB"}
|
package/dist/opfs-asset-store.js
CHANGED
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* OPFS Asset Store
|
|
3
3
|
*
|
|
4
|
-
* 大文件(blob)存 OPFS(Origin Private File System),元数据存内存 Map
|
|
5
|
-
* OPFS 是浏览器私有文件系统,blob 持久化(
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* 大文件(blob)存 OPFS(Origin Private File System),元数据存内存 Map +
|
|
5
|
+
* IndexedDB(Dexie)持久化。OPFS 是浏览器私有文件系统,blob 持久化(刷新后
|
|
6
|
+
* 文件仍在);W6.6 起元数据也通过 Dexie 持久化,刷新后 list()/get() 能恢复。
|
|
7
|
+
*
|
|
8
|
+
* 持久化策略(W6.6):
|
|
9
|
+
* - 启动时:db.metadata.toArray() 预加载内存 Map(后续 get/list 零 IO)
|
|
10
|
+
* - import/create:写 OPFS 文件 + db.metadata.put + 内存 Map.set
|
|
11
|
+
* - remove:删 OPFS 文件 + db.metadata.delete + 内存 Map.delete
|
|
12
|
+
* - IndexedDB 不可用时降级为仅内存模式(刷新后丢失,与 W2 行为一致)
|
|
8
13
|
*
|
|
9
14
|
* 注:任务规格提及 FileSystemSyncAccessHandle(Worker 内同步句柄),
|
|
10
15
|
* 但 AssetStore 接口本身为 async,主线程仅可使用 FileSystemFileHandle 异步 API,
|
|
@@ -12,7 +17,9 @@
|
|
|
12
17
|
*
|
|
13
18
|
* 降级链(W2.8 工厂):OPFS → IndexedDB → Memory
|
|
14
19
|
*/
|
|
20
|
+
import Dexie, {} from 'dexie';
|
|
15
21
|
import { buildAsset, generateId, parseBlobPath, prepareImport, } from './asset-store.js';
|
|
22
|
+
import { isIdbSupported } from './idb-asset-store.js';
|
|
16
23
|
/** OPFS 不可用或初始化失败时抛出 */
|
|
17
24
|
export class OpfsUnavailableError extends Error {
|
|
18
25
|
constructor(message) {
|
|
@@ -24,6 +31,21 @@ export class OpfsUnavailableError extends Error {
|
|
|
24
31
|
export const OPFS_PATH_PREFIX = 'opfs';
|
|
25
32
|
/** OPFS 文件名后缀 */
|
|
26
33
|
const OPFS_FILE_SUFFIX = '.bin';
|
|
34
|
+
/**
|
|
35
|
+
* OPFS 元数据持久化数据库(W6.6)。
|
|
36
|
+
*
|
|
37
|
+
* 仅存 { id, asset }(不含 blob,blob 在 OPFS 文件里),用于刷新后恢复内存 Map。
|
|
38
|
+
* 数据库名独立于 IdbAssetStore 的 'lokvis-assets',避免与全持久化 store 冲突。
|
|
39
|
+
*/
|
|
40
|
+
export class OpfsMetadataDatabase extends Dexie {
|
|
41
|
+
metadata;
|
|
42
|
+
constructor(name = 'lokvis-opfs-metadata') {
|
|
43
|
+
super(name);
|
|
44
|
+
this.version(1).stores({
|
|
45
|
+
metadata: 'id',
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
}
|
|
27
49
|
/** 检测当前环境是否支持 OPFS */
|
|
28
50
|
export function isOpfsSupported() {
|
|
29
51
|
return (typeof navigator !== 'undefined' &&
|
|
@@ -59,22 +81,77 @@ async function writeOpfsFile(dir, fileName, blob) {
|
|
|
59
81
|
}
|
|
60
82
|
return fileHandle;
|
|
61
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* 初始化元数据库(W6.6)。
|
|
86
|
+
*
|
|
87
|
+
* 优先用 options.metadataDb(测试注入);否则在 IndexedDB 可用时创建新实例。
|
|
88
|
+
* IndexedDB 不可用时返回 undefined,调用方降级为仅内存模式。
|
|
89
|
+
*/
|
|
90
|
+
function resolveMetadataDb(options) {
|
|
91
|
+
if (options.metadataDb)
|
|
92
|
+
return options.metadataDb;
|
|
93
|
+
if (!isIdbSupported())
|
|
94
|
+
return undefined;
|
|
95
|
+
try {
|
|
96
|
+
return new OpfsMetadataDatabase(options.metadataDbName);
|
|
97
|
+
}
|
|
98
|
+
catch (err) {
|
|
99
|
+
console.warn('[lokvis] OPFS metadata db init failed, falling back to memory-only:', err);
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
/** 安全写入元数据库(失败仅 warn,不阻断主流程) */
|
|
104
|
+
async function persistMetadata(db, id, asset) {
|
|
105
|
+
if (!db)
|
|
106
|
+
return;
|
|
107
|
+
try {
|
|
108
|
+
await db.metadata.put({ id, asset });
|
|
109
|
+
}
|
|
110
|
+
catch (err) {
|
|
111
|
+
console.warn(`[lokvis] OPFS metadata persist failed for ${id}:`, err);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
/** 安全删除元数据(失败仅 warn) */
|
|
115
|
+
async function deleteMetadata(db, id) {
|
|
116
|
+
if (!db)
|
|
117
|
+
return;
|
|
118
|
+
try {
|
|
119
|
+
await db.metadata.delete(id);
|
|
120
|
+
}
|
|
121
|
+
catch (err) {
|
|
122
|
+
console.warn(`[lokvis] OPFS metadata delete failed for ${id}:`, err);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
62
125
|
/** 创建 OPFS 版 AssetStore */
|
|
63
126
|
export async function createOpfsAssetStore(options = {}) {
|
|
64
127
|
const assetsDir = await resolveAssetsDir(options);
|
|
65
|
-
/** 元数据缓存(
|
|
128
|
+
/** 元数据缓存(内存中;W6.6 起启动时从 Dexie 预加载) */
|
|
66
129
|
const assets = new Map();
|
|
67
|
-
/** id → 文件句柄(用于 getBlob/remove) */
|
|
130
|
+
/** id → 文件句柄(用于 getBlob/remove;刷新后丢失,按需重建) */
|
|
68
131
|
const fileHandles = new Map();
|
|
132
|
+
/** 元数据库(W6.6 持久化;undefined 时仅内存模式) */
|
|
133
|
+
const db = resolveMetadataDb(options);
|
|
134
|
+
// 启动时预加载已持久化的元数据(刷新后恢复 list/get)
|
|
135
|
+
if (db) {
|
|
136
|
+
try {
|
|
137
|
+
const records = await db.metadata.toArray();
|
|
138
|
+
for (const r of records)
|
|
139
|
+
assets.set(r.id, r.asset);
|
|
140
|
+
}
|
|
141
|
+
catch (err) {
|
|
142
|
+
console.warn('[lokvis] OPFS metadata preload failed:', err);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
69
145
|
/** 从 id 派生 OPFS 文件名 */
|
|
70
146
|
const fileName = (id) => `${id}${OPFS_FILE_SUFFIX}`;
|
|
71
147
|
return {
|
|
72
148
|
async import(source) {
|
|
73
|
-
const { id, blob, metadata, type } = prepareImport(source);
|
|
149
|
+
const { id, blob, metadata, type } = await prepareImport(source);
|
|
74
150
|
const handle = await writeOpfsFile(assetsDir, fileName(id), blob);
|
|
75
151
|
fileHandles.set(id, handle);
|
|
76
152
|
const asset = buildAsset(id, blob, metadata, type, OPFS_PATH_PREFIX);
|
|
77
153
|
assets.set(id, asset);
|
|
154
|
+
await persistMetadata(db, id, asset);
|
|
78
155
|
return asset;
|
|
79
156
|
},
|
|
80
157
|
async get(id) {
|
|
@@ -84,7 +161,7 @@ export async function createOpfsAssetStore(options = {}) {
|
|
|
84
161
|
const id = parseBlobPath(handle.path, OPFS_PATH_PREFIX);
|
|
85
162
|
let fileHandle = fileHandles.get(id);
|
|
86
163
|
if (!fileHandle) {
|
|
87
|
-
//
|
|
164
|
+
// 可能是进程重启后内存句柄丢失,从 OPFS 重新获取
|
|
88
165
|
try {
|
|
89
166
|
fileHandle = await assetsDir.getFileHandle(fileName(id));
|
|
90
167
|
fileHandles.set(id, fileHandle);
|
|
@@ -102,9 +179,15 @@ export async function createOpfsAssetStore(options = {}) {
|
|
|
102
179
|
try {
|
|
103
180
|
await assetsDir.removeEntry(fileName(id));
|
|
104
181
|
}
|
|
105
|
-
catch {
|
|
106
|
-
//
|
|
182
|
+
catch (err) {
|
|
183
|
+
// NotFoundError 是幂等删除的预期场景(文件已不存在),静默忽略;
|
|
184
|
+
// 其他错误(权限/IO 等)记录 warn,便于排查孤儿 OPFS 文件长期累积
|
|
185
|
+
// 无论文件删除是否成功,都继续清理 IDB metadata(见下方)
|
|
186
|
+
if (!(err instanceof DOMException && err.name === 'NotFoundError')) {
|
|
187
|
+
console.warn(`[lokvis] OPFS removeEntry unexpected failure for asset ${id}:`, err);
|
|
188
|
+
}
|
|
107
189
|
}
|
|
190
|
+
await deleteMetadata(db, id);
|
|
108
191
|
},
|
|
109
192
|
async list() {
|
|
110
193
|
return Array.from(assets.values());
|
|
@@ -115,6 +198,7 @@ export async function createOpfsAssetStore(options = {}) {
|
|
|
115
198
|
fileHandles.set(id, handle);
|
|
116
199
|
const asset = buildAsset(id, blob, metadata, type, OPFS_PATH_PREFIX);
|
|
117
200
|
assets.set(id, asset);
|
|
201
|
+
await persistMetadata(db, id, asset);
|
|
118
202
|
return asset;
|
|
119
203
|
},
|
|
120
204
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opfs-asset-store.js","sourceRoot":"","sources":["../src/opfs-asset-store.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"opfs-asset-store.js","sourceRoot":"","sources":["../src/opfs-asset-store.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime.d.ts
CHANGED
|
@@ -3,12 +3,14 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Runtime 是整个系统的"浏览器操作系统",唯一职责:Input → Run → Output。
|
|
5
5
|
*/
|
|
6
|
-
import type { Asset, AssetId, AssetSource, Capability, HistoryEntry, McpManifest } from '@lokvis/schema';
|
|
6
|
+
import type { Asset, AssetId, AssetSource, Capability, ExifData, HistoryEntry, McpManifest, MetadataReader } from '@lokvis/schema';
|
|
7
7
|
import type { Workflow, WorkflowResult } from '@lokvis/schema';
|
|
8
|
-
import type { LokvisRuntime, RuntimeConfig, RuntimeStatus, ToMcpManifestOptions } from './types.js';
|
|
8
|
+
import type { LokvisRuntime, PluginInstallEntry, RuntimeConfig, RuntimeStatus, ToMcpManifestOptions } from './types.js';
|
|
9
9
|
import type { EventBus } from '@lokvis/schema';
|
|
10
10
|
import { type AssetStore } from './asset-store.js';
|
|
11
11
|
import { CapabilityRegistry } from './capability-registry.js';
|
|
12
|
+
import { BatchProcessor } from './batch-processor.js';
|
|
13
|
+
import { MemoryGuard } from './memory-guard.js';
|
|
12
14
|
export declare const RUNTIME_VERSION = "0.1.0";
|
|
13
15
|
/** 存储配额超限时抛出(W2.9) */
|
|
14
16
|
export declare class QuotaExceededError extends Error {
|
|
@@ -23,21 +25,71 @@ export declare class LokvisRuntimeImpl implements LokvisRuntime {
|
|
|
23
25
|
readonly eventBus: EventBus;
|
|
24
26
|
private config;
|
|
25
27
|
private _status;
|
|
28
|
+
/**
|
|
29
|
+
* AssetStore 实例。类型为 QuotaAwareAssetStore —— 由 wrapAssetStoreWithQuota
|
|
30
|
+
* 返回(在构造函数中无条件包裹,即使是注入的 assetStore 也会被包装以提供配额校验)。
|
|
31
|
+
* 保留 _getQuotaUsage 内部 API 供 getStorageUsage O(1) 读取 usage。
|
|
32
|
+
* 注:外部注入的 assetStore 在 wrapAssetStoreWithQuota 中同样被包装,
|
|
33
|
+
* 因此所有路径下 this.assetStore 都是 QuotaAwareAssetStore。
|
|
34
|
+
*/
|
|
26
35
|
private assetStore;
|
|
27
36
|
private capabilityRegistry;
|
|
28
37
|
private executor;
|
|
38
|
+
private memoryGuard;
|
|
39
|
+
private batchProcessor;
|
|
29
40
|
/**
|
|
30
41
|
* 每个工作流独立的 HistoryStack。
|
|
31
|
-
*
|
|
32
|
-
*
|
|
42
|
+
* W7.2 起,栈快照(entries + cursor)连同 initialInputs / currentOutputs
|
|
43
|
+
* 通过 historyStore 持久化到 IndexedDB,刷新后可恢复。
|
|
33
44
|
*/
|
|
34
45
|
private historyStacks;
|
|
35
46
|
/** 记录每个工作流的初始输入 AssetId(undo 回到初始时使用) */
|
|
36
47
|
private initialInputsMap;
|
|
37
48
|
/** 记录每个工作流当前的输出 AssetId(undo/redo 后切换"当前") */
|
|
38
49
|
private currentOutputsMap;
|
|
50
|
+
/**
|
|
51
|
+
* 历史持久化存储(W7.2)。undefined 时退化为仅内存历史(刷新后丢失)。
|
|
52
|
+
* 由 createRuntime 在 enableIndexedDB 时自动创建,或通过 config 注入。
|
|
53
|
+
*/
|
|
54
|
+
private historyStore;
|
|
55
|
+
/**
|
|
56
|
+
* 加载持久化历史快照期间的守卫标志。
|
|
57
|
+
* restore() 会触发 onChanged → persistHistory,此时跳过写回,
|
|
58
|
+
* 避免把刚读出的数据又重复写入(冗余 IO + 潜在覆盖竞态)。
|
|
59
|
+
*/
|
|
60
|
+
private isLoadingHistory;
|
|
61
|
+
/**
|
|
62
|
+
* 加载期间被 onChanged 标记为"dirty"的工作流 ID 集合(W7.2 review 修复)。
|
|
63
|
+
*
|
|
64
|
+
* 原实现:isLoadingHistory 期间所有 persistHistory 调用直接 return,
|
|
65
|
+
* 若加载期间有其他来源(run / undo / 外部事件)触发 onChanged,
|
|
66
|
+
* 这些变更会被永久丢弃(加载结束后不会重发 persist)。
|
|
67
|
+
*
|
|
68
|
+
* 现策略:加载期间被跳过的 persistHistory 把 workflowId 加入此 Set,
|
|
69
|
+
* loadPersistedHistory 结束后逐个补 persist,确保不丢变更。
|
|
70
|
+
* (restore() 自身触发的 onChanged 也加入,但其内容与刚读出的相同,
|
|
71
|
+
* 补 persist 仅多一次等价写回,幂等无害。)
|
|
72
|
+
*/
|
|
73
|
+
private dirtyDuringLoad;
|
|
74
|
+
/**
|
|
75
|
+
* 元数据读取器注册表(W7.3/7.4 长期方案:MetadataReader 依赖反转)。
|
|
76
|
+
*
|
|
77
|
+
* Plugin(plugin-image)通过 PluginContext.registerMetadataReader 注册
|
|
78
|
+
* 查询函数(如 'image.read-exif'),Runtime 持有引用并按名调用。
|
|
79
|
+
* 解决了 readExif(Blob→ExifData)不符合 Engine 层 Blob↔Blob 纯函数约束、
|
|
80
|
+
* 也不符合 CapabilityImplementation Asset[]→Asset[] 契约的问题。
|
|
81
|
+
* UI 经 runtime.readAssetExif 间接调用,不直接依赖 plugin/engine。
|
|
82
|
+
*/
|
|
83
|
+
private metadataReaders;
|
|
84
|
+
/**
|
|
85
|
+
* 注册元数据读取器(由 PluginContext.registerMetadataReader 转发)。
|
|
86
|
+
* 下划线前缀表示内部 API,不暴露在 LokvisRuntime 公开接口。
|
|
87
|
+
*/
|
|
88
|
+
_registerMetadataReader(name: string, reader: MetadataReader): void;
|
|
39
89
|
constructor(config?: RuntimeConfig);
|
|
40
90
|
get status(): RuntimeStatus;
|
|
91
|
+
get isPro(): boolean;
|
|
92
|
+
get batch(): BatchProcessor;
|
|
41
93
|
run(workflow: Workflow, inputs: AssetId[] | Asset[], options?: import('./types.js').RunOptions): Promise<WorkflowResult>;
|
|
42
94
|
cancel(workflowId: string): Promise<void>;
|
|
43
95
|
pause(workflowId: string): Promise<void>;
|
|
@@ -59,13 +111,34 @@ export declare class LokvisRuntimeImpl implements LokvisRuntime {
|
|
|
59
111
|
*/
|
|
60
112
|
disposeWorkflow(workflowId: string): Promise<void>;
|
|
61
113
|
history(workflowId: string): Promise<HistoryEntry[]>;
|
|
114
|
+
getHistoryState(workflowId: string): Promise<{
|
|
115
|
+
entries: HistoryEntry[];
|
|
116
|
+
cursor: number;
|
|
117
|
+
}>;
|
|
62
118
|
undo(workflowId: string): Promise<void>;
|
|
63
119
|
redo(workflowId: string): Promise<void>;
|
|
120
|
+
jumpTo(workflowId: string, index: number): Promise<void>;
|
|
64
121
|
importAsset(source: AssetSource): Promise<AssetId>;
|
|
65
122
|
getAsset(id: AssetId): Promise<Asset>;
|
|
66
123
|
exportAsset(id: AssetId, format?: string): Promise<Blob>;
|
|
124
|
+
/**
|
|
125
|
+
* 读取 image 资产的 EXIF 元数据(W7.3/7.4 长期方案:MetadataReader 依赖反转)。
|
|
126
|
+
*
|
|
127
|
+
* Runtime 持有 plugin-image 通过 ctx.registerMetadataReader('image.read-exif', fn)
|
|
128
|
+
* 注册的 reader 引用,按名调用。reader 内部调 readExifFromBlob(exifr)。
|
|
129
|
+
* Plugin 未安装时优雅降级返回 null(不抛错)。
|
|
130
|
+
*
|
|
131
|
+
* 架构决策:readExif 是 Blob→ExifData 查询,不符合 Engine 层 Blob↔Blob 纯函数
|
|
132
|
+
* 约束,也不符合 Capability Asset[]→Asset[] 契约,故走 MetadataReader 机制,
|
|
133
|
+
* 不进 engine-image、不走 Capability execute。
|
|
134
|
+
*/
|
|
135
|
+
readAssetExif(id: AssetId): Promise<ExifData | null>;
|
|
67
136
|
removeAsset(id: AssetId): Promise<void>;
|
|
68
137
|
listAssets(): Promise<Asset[]>;
|
|
138
|
+
getStorageUsage(): Promise<{
|
|
139
|
+
usage: number;
|
|
140
|
+
quota: number;
|
|
141
|
+
}>;
|
|
69
142
|
capabilities(): Promise<Capability[]>;
|
|
70
143
|
hasCapability(name: string): Promise<boolean>;
|
|
71
144
|
/**
|
|
@@ -78,10 +151,30 @@ export declare class LokvisRuntimeImpl implements LokvisRuntime {
|
|
|
78
151
|
* - resource 固定为 capabilities 与 workflows 两个清单
|
|
79
152
|
*/
|
|
80
153
|
toMcpManifest(options?: ToMcpManifestOptions): McpManifest;
|
|
81
|
-
/**
|
|
154
|
+
/**
|
|
155
|
+
* 在本 Runtime 上安装一个插件(实现 LokvisRuntime.installPlugin 接口)。
|
|
156
|
+
*
|
|
157
|
+
* 步骤:
|
|
158
|
+
* 1. 注册能力声明(plugin.config.capabilities → CapabilityRegistry)
|
|
159
|
+
* 2. 构造受限 PluginContext(只暴露受限 Runtime API + 注册器 + 日志)
|
|
160
|
+
* 3. 调用 plugin.install(ctx),让插件注册 CapabilityImplementation
|
|
161
|
+
* 4. 发射 `plugin:loaded` 事件
|
|
162
|
+
*
|
|
163
|
+
* 不吞错:plugin.install 抛出的错误原样上抛,由 SDK 包成 PluginLoadError。
|
|
164
|
+
*
|
|
165
|
+
* 此前 SDK 通过 `instanceof LokvisRuntimeImpl` + `_getAssetStore()` /
|
|
166
|
+
* `_getCapabilityRegistry()` 反向访问内部依赖,现改为公共接口调用,
|
|
167
|
+
* SDK 不再依赖具体实现类。
|
|
168
|
+
*/
|
|
169
|
+
installPlugin(plugin: PluginInstallEntry): Promise<void>;
|
|
170
|
+
/** 获取 AssetStore(仅测试用,SDK 通过 installPlugin 间接访问) */
|
|
82
171
|
_getAssetStore(): AssetStore;
|
|
83
|
-
/** 获取 CapabilityRegistry
|
|
172
|
+
/** 获取 CapabilityRegistry(仅测试用,SDK 通过 installPlugin 间接访问) */
|
|
84
173
|
_getCapabilityRegistry(): CapabilityRegistry;
|
|
174
|
+
/**
|
|
175
|
+
* 获取 MemoryGuard(内部用,供集成测试驱动内存压力验证 BatchProcessor 收缩)。
|
|
176
|
+
*/
|
|
177
|
+
_getMemoryGuard(): MemoryGuard;
|
|
85
178
|
/** 获取工作流当前输出 AssetId(undo/redo 后的"当前"状态,内部用) */
|
|
86
179
|
_getCurrentOutputs(workflowId: string): AssetId[];
|
|
87
180
|
/** 获取工作流当前输出 AssetId(公开 API,供 UI / MCP 查询) */
|
|
@@ -101,6 +194,37 @@ export declare class LokvisRuntimeImpl implements LokvisRuntime {
|
|
|
101
194
|
private collectInputAssetIds;
|
|
102
195
|
/** 监听 node:finished 事件,自动 append 到对应工作流的 HistoryStack */
|
|
103
196
|
private recordHistoryFromNodeEvent;
|
|
197
|
+
/**
|
|
198
|
+
* 把指定工作流的当前历史状态快照写入 historyStore。
|
|
199
|
+
*
|
|
200
|
+
* 时序修复:currentOutputs 从 stack snapshot 派生(cursor === -1 用
|
|
201
|
+
* initialInputs,否则用 entries[cursor].outputs),而非读 currentOutputsMap。
|
|
202
|
+
* 原因:onChanged 在 undo/redo/jumpTo/run 内部同步触发时,map 尚未更新,
|
|
203
|
+
* 会读到旧值(例如 run 后 append 触发 onChanged,但 currentOutputsMap 在
|
|
204
|
+
* append 返回后才 set)。
|
|
205
|
+
*
|
|
206
|
+
* 竞态安全:多个 fire-and-forget save 的 IDB readwrite 事务由 IndexedDB
|
|
207
|
+
* 引擎按发起顺序串行化(同 object store 不重叠),无需应用层加链。
|
|
208
|
+
*
|
|
209
|
+
* - entries 为空时改为 delete,避免残留空记录(reset/clear 后自然清理)
|
|
210
|
+
* - 加载期间(isLoadingHistory=true)跳过写回,但把 workflowId 加入
|
|
211
|
+
* dirtyDuringLoad,loadPersistedHistory 结束后补 persist(避免丢变更)
|
|
212
|
+
*/
|
|
213
|
+
private persistHistory;
|
|
214
|
+
/**
|
|
215
|
+
* 从 historyStore 预加载所有持久化的历史快照,恢复到内存。
|
|
216
|
+
*
|
|
217
|
+
* 由 createRuntime 工厂在构造完 impl 后调用一次。加载期间置 isLoadingHistory
|
|
218
|
+
* 守卫,使 restore() 触发的 onChanged → persistHistory 跳过冗余写回;
|
|
219
|
+
* 但被跳过的 workflowId 记入 dirtyDuringLoad,加载结束后补 persist,
|
|
220
|
+
* 避免加载期间其他来源(run / undo / 外部事件)的变更被永久丢弃。
|
|
221
|
+
*
|
|
222
|
+
* 注意:restore 会 emit history:changed 事件,但此时 UI 尚未订阅
|
|
223
|
+
* (runtime-slice.init 在 createRuntime resolve 后才订阅),故无副作用。
|
|
224
|
+
*
|
|
225
|
+
* 非 LokvisRuntime 接口的一部分,仅为 impl 的初始化钩子(工厂调用)。
|
|
226
|
+
*/
|
|
227
|
+
loadPersistedHistory(): Promise<void>;
|
|
104
228
|
}
|
|
105
229
|
/**
|
|
106
230
|
* 创建 Runtime 实例(W2.8 + W2.9)。
|
package/dist/runtime.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,KAAK,EACL,OAAO,EACP,WAAW,EACX,UAAU,EAGV,YAAY,EAEZ,WAAW,
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}
|