@lokvis/runtime 0.1.0 → 0.2.0
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/capability-registry.d.ts +4 -0
- package/dist/capability-registry.d.ts.map +1 -1
- package/dist/capability-registry.js +19 -2
- package/dist/capability-registry.js.map +1 -1
- 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/event-bus.d.ts.map +1 -1
- package/dist/event-bus.js +7 -2
- package/dist/event-bus.js.map +1 -1
- package/dist/executor.d.ts.map +1 -1
- package/dist/executor.js +37 -1
- package/dist/executor.js.map +1 -1
- 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/history.d.ts +1 -1
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +1 -1
- package/dist/history.js.map +1 -1
- 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 +139 -4
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +443 -25
- package/dist/runtime.js.map +1 -1
- package/dist/types.d.ts +101 -2
- 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/capability-registry.ts +19 -2
- package/src/degradation.ts +241 -0
- package/src/event-bus.ts +6 -2
- package/src/executor.ts +46 -1
- package/src/history-store.ts +159 -0
- package/src/history.ts +2 -2
- 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 +482 -21
- package/src/types.ts +98 -1
- package/src/worker-host.ts +56 -16
- package/src/worker-protocol.ts +11 -1
- package/src/workflow-builder.ts +303 -0
|
@@ -0,0 +1,202 @@
|
|
|
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
|
+
|
|
30
|
+
import type { Asset, AssetMetadata, AssetType } from '@lokvis/schema';
|
|
31
|
+
import type { AssetStore } from './asset-store.js';
|
|
32
|
+
|
|
33
|
+
/** 默认内存预算:512MB(见上) */
|
|
34
|
+
export const DEFAULT_MEMORY_BUDGET = 512 * 1024 * 1024;
|
|
35
|
+
|
|
36
|
+
/** 内存压力等级(降级阶梯 W3.4 据此选择策略) */
|
|
37
|
+
export type MemoryPressure = 'low' | 'elevated' | 'high' | 'critical';
|
|
38
|
+
|
|
39
|
+
export interface MemoryGuardOptions {
|
|
40
|
+
/** 总内存预算(字节),超出 high 阈值则建议溢出 */
|
|
41
|
+
budget?: number;
|
|
42
|
+
/** elevated 阈值占 budget 比例(默认 0.6) */
|
|
43
|
+
elevatedRatio?: number;
|
|
44
|
+
/** high 阈值(默认 0.8):达到则 shouldSpill=true */
|
|
45
|
+
highRatio?: number;
|
|
46
|
+
/** critical 阈值(默认 0.95):达到则降级阶梯走 L4 拒绝 */
|
|
47
|
+
criticalRatio?: number;
|
|
48
|
+
/** 溢出目标(通常为 OPFS-backed AssetStore);不提供则 shouldSpill 永远 false */
|
|
49
|
+
assetStore?: AssetStore;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** track() 返回的分配句柄:丢弃引用时调用 release() 回退计数(幂等) */
|
|
53
|
+
export interface MemoryAllocation {
|
|
54
|
+
/** 该笔登记的字节数 */
|
|
55
|
+
readonly bytes: number;
|
|
56
|
+
/** 回退登记;重复调用幂等(仅首次生效) */
|
|
57
|
+
release(): void;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* 估算解码后位图占用的内存(RGBA,4 字节/像素)。
|
|
62
|
+
*
|
|
63
|
+
* 一个 4000×3000 的 JPEG,blob 可能只有 2MB,但 decode 成 ImageBitmap 后
|
|
64
|
+
* 占 4000*3000*4 ≈ 46MB。追踪中间结果时应以此为准而非 blob.size,
|
|
65
|
+
* 否则严重低估内存压力。
|
|
66
|
+
*/
|
|
67
|
+
export function estimateDecodedBytes(width: number, height: number): number {
|
|
68
|
+
return Math.max(0, Math.round(width * height * 4));
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/** 估算 Blob 在内存中占用的字节数(对未解码的 Blob,以其 size 为准) */
|
|
72
|
+
export function estimateBlobBytes(blob: Blob): number {
|
|
73
|
+
return blob.size;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/** 内存守卫:追踪中间结果占用 + 触发 OPFS 溢出 */
|
|
77
|
+
export class MemoryGuard {
|
|
78
|
+
private tracked = 0;
|
|
79
|
+
private readonly budget: number;
|
|
80
|
+
private readonly elevatedRatio: number;
|
|
81
|
+
private readonly highRatio: number;
|
|
82
|
+
private readonly criticalRatio: number;
|
|
83
|
+
private readonly assetStore?: AssetStore;
|
|
84
|
+
|
|
85
|
+
constructor(opts: MemoryGuardOptions = {}) {
|
|
86
|
+
this.budget = opts.budget ?? DEFAULT_MEMORY_BUDGET;
|
|
87
|
+
this.elevatedRatio = opts.elevatedRatio ?? 0.6;
|
|
88
|
+
this.highRatio = opts.highRatio ?? 0.8;
|
|
89
|
+
this.criticalRatio = opts.criticalRatio ?? 0.95;
|
|
90
|
+
this.assetStore = opts.assetStore;
|
|
91
|
+
|
|
92
|
+
// 阈值单调性校验,避免配置错误导致 pressure 永远卡在某一档
|
|
93
|
+
if (!(this.elevatedRatio <= this.highRatio && this.highRatio <= this.criticalRatio)) {
|
|
94
|
+
throw new Error(
|
|
95
|
+
`MemoryGuard thresholds must be non-decreasing: ` +
|
|
96
|
+
`elevated(${this.elevatedRatio}) <= high(${this.highRatio}) <= critical(${this.criticalRatio})`
|
|
97
|
+
);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** 当前已登记的字节数 */
|
|
102
|
+
get currentUsage(): number {
|
|
103
|
+
return this.tracked;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/** 总预算(字节) */
|
|
107
|
+
get budgetBytes(): number {
|
|
108
|
+
return this.budget;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** 当前是否已配置可溢出的 AssetStore */
|
|
112
|
+
get canSpill(): boolean {
|
|
113
|
+
return this.assetStore !== undefined;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/**
|
|
117
|
+
* 登记一笔内存占用。返回 release 句柄,丢弃引用时调用以回退计数。
|
|
118
|
+
* 用于追踪 decode 结果 / canvas 输出等大对象的生命周期。
|
|
119
|
+
*/
|
|
120
|
+
track(bytes: number): MemoryAllocation {
|
|
121
|
+
if (bytes < 0) {
|
|
122
|
+
throw new Error(`MemoryGuard.track: bytes must be non-negative, got ${bytes}`);
|
|
123
|
+
}
|
|
124
|
+
this.tracked += bytes;
|
|
125
|
+
let released = false;
|
|
126
|
+
return {
|
|
127
|
+
bytes,
|
|
128
|
+
release: () => {
|
|
129
|
+
if (released) return; // 幂等:重复 release 仅首次生效
|
|
130
|
+
released = true;
|
|
131
|
+
this.tracked = Math.max(0, this.tracked - bytes);
|
|
132
|
+
},
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/** 当前压力等级(基于 tracked / budget) */
|
|
137
|
+
getPressure(): MemoryPressure {
|
|
138
|
+
const ratio = this.tracked / this.budget;
|
|
139
|
+
if (ratio >= this.criticalRatio) return 'critical';
|
|
140
|
+
if (ratio >= this.highRatio) return 'high';
|
|
141
|
+
if (ratio >= this.elevatedRatio) return 'elevated';
|
|
142
|
+
return 'low';
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/** 已用比例(0-1+) */
|
|
146
|
+
getUsageRatio(): number {
|
|
147
|
+
return this.tracked / this.budget;
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
/**
|
|
151
|
+
* 是否应溢出(pressure >= high)。无 assetStore 时永远 false(无法溢出,
|
|
152
|
+
* 交由降级阶梯 L3/L4 处理)。
|
|
153
|
+
*/
|
|
154
|
+
shouldSpill(): boolean {
|
|
155
|
+
if (!this.assetStore) return false;
|
|
156
|
+
const p = this.getPressure();
|
|
157
|
+
return p === 'high' || p === 'critical';
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/**
|
|
161
|
+
* 把一个中间 Blob 溢出到 OPFS(assetStore.create),返回 Asset 句柄。
|
|
162
|
+
* 调用方应在 spill 后丢弃内存中的 Blob 引用,以真正释放内存。
|
|
163
|
+
*
|
|
164
|
+
* @param blob 要溢出的中间结果
|
|
165
|
+
* @param mimeType Blob 的 MIME(用于元数据);默认取 blob.type
|
|
166
|
+
* @param assetType 资产类型(默认 'image');video/pdf 管线可传对应类型
|
|
167
|
+
*/
|
|
168
|
+
async spill(blob: Blob, mimeType?: string, assetType: AssetType = 'image'): Promise<Asset> {
|
|
169
|
+
if (!this.assetStore) {
|
|
170
|
+
throw new Error(
|
|
171
|
+
'MemoryGuard.spill requires an assetStore (OPFS-backed). ' +
|
|
172
|
+
'Construct MemoryGuard with { assetStore } to enable spilling.'
|
|
173
|
+
);
|
|
174
|
+
}
|
|
175
|
+
const mime = mimeType || blob.type || 'application/octet-stream';
|
|
176
|
+
const metadata: AssetMetadata = {
|
|
177
|
+
mimeType: mime,
|
|
178
|
+
size: blob.size,
|
|
179
|
+
format: mime.split('/')[1] ?? 'bin',
|
|
180
|
+
};
|
|
181
|
+
return this.assetStore.create(blob, metadata, assetType);
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
/** 从 OPFS 读回之前 spill 的中间结果 */
|
|
185
|
+
async restore(asset: Asset): Promise<Blob> {
|
|
186
|
+
if (!this.assetStore) {
|
|
187
|
+
throw new Error('MemoryGuard.restore requires an assetStore');
|
|
188
|
+
}
|
|
189
|
+
return this.assetStore.getBlob(asset.blob);
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/** 丢弃已 spill 的中间结果(处理完成后回收 OPFS 空间) */
|
|
193
|
+
async evict(asset: Asset): Promise<void> {
|
|
194
|
+
if (!this.assetStore) return;
|
|
195
|
+
await this.assetStore.remove(asset.id);
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
/** 重置所有登记(用于工作流结束 / 取消后的清理,tracked 归零) */
|
|
199
|
+
reset(): void {
|
|
200
|
+
this.tracked = 0;
|
|
201
|
+
}
|
|
202
|
+
}
|
package/src/opfs-asset-store.ts
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,
|
|
@@ -13,6 +18,7 @@
|
|
|
13
18
|
* 降级链(W2.8 工厂):OPFS → IndexedDB → Memory
|
|
14
19
|
*/
|
|
15
20
|
|
|
21
|
+
import Dexie, { type Table } from 'dexie';
|
|
16
22
|
import type { Asset, AssetId } from '@lokvis/schema';
|
|
17
23
|
import type { AssetStore } from './asset-store.js';
|
|
18
24
|
import {
|
|
@@ -21,6 +27,7 @@ import {
|
|
|
21
27
|
parseBlobPath,
|
|
22
28
|
prepareImport,
|
|
23
29
|
} from './asset-store.js';
|
|
30
|
+
import { isIdbSupported } from './idb-asset-store.js';
|
|
24
31
|
|
|
25
32
|
/** OPFS 不可用或初始化失败时抛出 */
|
|
26
33
|
export class OpfsUnavailableError extends Error {
|
|
@@ -36,6 +43,31 @@ export const OPFS_PATH_PREFIX = 'opfs';
|
|
|
36
43
|
/** OPFS 文件名后缀 */
|
|
37
44
|
const OPFS_FILE_SUFFIX = '.bin';
|
|
38
45
|
|
|
46
|
+
/**
|
|
47
|
+
* OPFS 元数据持久化数据库(W6.6)。
|
|
48
|
+
*
|
|
49
|
+
* 仅存 { id, asset }(不含 blob,blob 在 OPFS 文件里),用于刷新后恢复内存 Map。
|
|
50
|
+
* 数据库名独立于 IdbAssetStore 的 'lokvis-assets',避免与全持久化 store 冲突。
|
|
51
|
+
*/
|
|
52
|
+
export class OpfsMetadataDatabase extends Dexie {
|
|
53
|
+
metadata!: Table<OpfsMetadataRecord, AssetId>;
|
|
54
|
+
|
|
55
|
+
constructor(name = 'lokvis-opfs-metadata') {
|
|
56
|
+
super(name);
|
|
57
|
+
this.version(1).stores({
|
|
58
|
+
metadata: 'id',
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** OPFS 元数据记录 */
|
|
64
|
+
export interface OpfsMetadataRecord {
|
|
65
|
+
/** 主键 = Asset.id */
|
|
66
|
+
id: AssetId;
|
|
67
|
+
/** 资产元数据(blob 在 OPFS 文件,不在此存) */
|
|
68
|
+
asset: Asset;
|
|
69
|
+
}
|
|
70
|
+
|
|
39
71
|
/** OPFS AssetStore 配置 */
|
|
40
72
|
export interface OpfsAssetStoreOptions {
|
|
41
73
|
/** OPFS 根目录下的命名空间目录名(默认 'lokvis') */
|
|
@@ -47,6 +79,13 @@ export interface OpfsAssetStoreOptions {
|
|
|
47
79
|
* 默认使用 navigator.storage.getDirectory()。
|
|
48
80
|
*/
|
|
49
81
|
rootHandle?: FileSystemDirectoryHandle;
|
|
82
|
+
/**
|
|
83
|
+
* 测试注入:自定义元数据库实例(W6.6 持久化)。
|
|
84
|
+
* 默认在 IndexedDB 可用时自动创建 OpfsMetadataDatabase。
|
|
85
|
+
*/
|
|
86
|
+
metadataDb?: OpfsMetadataDatabase;
|
|
87
|
+
/** 元数据库名(默认 'lokvis-opfs-metadata';仅 metadataDb 未注入时生效) */
|
|
88
|
+
metadataDbName?: string;
|
|
50
89
|
}
|
|
51
90
|
|
|
52
91
|
/** 检测当前环境是否支持 OPFS */
|
|
@@ -98,26 +137,85 @@ async function writeOpfsFile(
|
|
|
98
137
|
return fileHandle;
|
|
99
138
|
}
|
|
100
139
|
|
|
140
|
+
/**
|
|
141
|
+
* 初始化元数据库(W6.6)。
|
|
142
|
+
*
|
|
143
|
+
* 优先用 options.metadataDb(测试注入);否则在 IndexedDB 可用时创建新实例。
|
|
144
|
+
* IndexedDB 不可用时返回 undefined,调用方降级为仅内存模式。
|
|
145
|
+
*/
|
|
146
|
+
function resolveMetadataDb(
|
|
147
|
+
options: OpfsAssetStoreOptions
|
|
148
|
+
): OpfsMetadataDatabase | undefined {
|
|
149
|
+
if (options.metadataDb) return options.metadataDb;
|
|
150
|
+
if (!isIdbSupported()) return undefined;
|
|
151
|
+
try {
|
|
152
|
+
return new OpfsMetadataDatabase(options.metadataDbName);
|
|
153
|
+
} catch (err) {
|
|
154
|
+
console.warn('[lokvis] OPFS metadata db init failed, falling back to memory-only:', err);
|
|
155
|
+
return undefined;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
/** 安全写入元数据库(失败仅 warn,不阻断主流程) */
|
|
160
|
+
async function persistMetadata(
|
|
161
|
+
db: OpfsMetadataDatabase | undefined,
|
|
162
|
+
id: AssetId,
|
|
163
|
+
asset: Asset
|
|
164
|
+
): Promise<void> {
|
|
165
|
+
if (!db) return;
|
|
166
|
+
try {
|
|
167
|
+
await db.metadata.put({ id, asset });
|
|
168
|
+
} catch (err) {
|
|
169
|
+
console.warn(`[lokvis] OPFS metadata persist failed for ${id}:`, err);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
/** 安全删除元数据(失败仅 warn) */
|
|
174
|
+
async function deleteMetadata(
|
|
175
|
+
db: OpfsMetadataDatabase | undefined,
|
|
176
|
+
id: AssetId
|
|
177
|
+
): Promise<void> {
|
|
178
|
+
if (!db) return;
|
|
179
|
+
try {
|
|
180
|
+
await db.metadata.delete(id);
|
|
181
|
+
} catch (err) {
|
|
182
|
+
console.warn(`[lokvis] OPFS metadata delete failed for ${id}:`, err);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
|
|
101
186
|
/** 创建 OPFS 版 AssetStore */
|
|
102
187
|
export async function createOpfsAssetStore(
|
|
103
188
|
options: OpfsAssetStoreOptions = {}
|
|
104
189
|
): Promise<AssetStore> {
|
|
105
190
|
const assetsDir = await resolveAssetsDir(options);
|
|
106
|
-
/** 元数据缓存(
|
|
191
|
+
/** 元数据缓存(内存中;W6.6 起启动时从 Dexie 预加载) */
|
|
107
192
|
const assets = new Map<AssetId, Asset>();
|
|
108
|
-
/** id → 文件句柄(用于 getBlob/remove) */
|
|
193
|
+
/** id → 文件句柄(用于 getBlob/remove;刷新后丢失,按需重建) */
|
|
109
194
|
const fileHandles = new Map<AssetId, FileSystemFileHandle>();
|
|
195
|
+
/** 元数据库(W6.6 持久化;undefined 时仅内存模式) */
|
|
196
|
+
const db = resolveMetadataDb(options);
|
|
197
|
+
|
|
198
|
+
// 启动时预加载已持久化的元数据(刷新后恢复 list/get)
|
|
199
|
+
if (db) {
|
|
200
|
+
try {
|
|
201
|
+
const records = await db.metadata.toArray();
|
|
202
|
+
for (const r of records) assets.set(r.id, r.asset);
|
|
203
|
+
} catch (err) {
|
|
204
|
+
console.warn('[lokvis] OPFS metadata preload failed:', err);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
110
207
|
|
|
111
208
|
/** 从 id 派生 OPFS 文件名 */
|
|
112
209
|
const fileName = (id: AssetId) => `${id}${OPFS_FILE_SUFFIX}`;
|
|
113
210
|
|
|
114
211
|
return {
|
|
115
212
|
async import(source) {
|
|
116
|
-
const { id, blob, metadata, type } = prepareImport(source);
|
|
213
|
+
const { id, blob, metadata, type } = await prepareImport(source);
|
|
117
214
|
const handle = await writeOpfsFile(assetsDir, fileName(id), blob);
|
|
118
215
|
fileHandles.set(id, handle);
|
|
119
216
|
const asset = buildAsset(id, blob, metadata, type, OPFS_PATH_PREFIX);
|
|
120
217
|
assets.set(id, asset);
|
|
218
|
+
await persistMetadata(db, id, asset);
|
|
121
219
|
return asset;
|
|
122
220
|
},
|
|
123
221
|
|
|
@@ -129,7 +227,7 @@ export async function createOpfsAssetStore(
|
|
|
129
227
|
const id = parseBlobPath(handle.path, OPFS_PATH_PREFIX);
|
|
130
228
|
let fileHandle = fileHandles.get(id);
|
|
131
229
|
if (!fileHandle) {
|
|
132
|
-
//
|
|
230
|
+
// 可能是进程重启后内存句柄丢失,从 OPFS 重新获取
|
|
133
231
|
try {
|
|
134
232
|
fileHandle = await assetsDir.getFileHandle(fileName(id));
|
|
135
233
|
fileHandles.set(id, fileHandle);
|
|
@@ -146,9 +244,18 @@ export async function createOpfsAssetStore(
|
|
|
146
244
|
fileHandles.delete(id);
|
|
147
245
|
try {
|
|
148
246
|
await assetsDir.removeEntry(fileName(id));
|
|
149
|
-
} catch {
|
|
150
|
-
//
|
|
247
|
+
} catch (err) {
|
|
248
|
+
// NotFoundError 是幂等删除的预期场景(文件已不存在),静默忽略;
|
|
249
|
+
// 其他错误(权限/IO 等)记录 warn,便于排查孤儿 OPFS 文件长期累积
|
|
250
|
+
// 无论文件删除是否成功,都继续清理 IDB metadata(见下方)
|
|
251
|
+
if (!(err instanceof DOMException && err.name === 'NotFoundError')) {
|
|
252
|
+
console.warn(
|
|
253
|
+
`[lokvis] OPFS removeEntry unexpected failure for asset ${id}:`,
|
|
254
|
+
err
|
|
255
|
+
);
|
|
256
|
+
}
|
|
151
257
|
}
|
|
258
|
+
await deleteMetadata(db, id);
|
|
152
259
|
},
|
|
153
260
|
|
|
154
261
|
async list() {
|
|
@@ -161,6 +268,7 @@ export async function createOpfsAssetStore(
|
|
|
161
268
|
fileHandles.set(id, handle);
|
|
162
269
|
const asset = buildAsset(id, blob, metadata, type, OPFS_PATH_PREFIX);
|
|
163
270
|
assets.set(id, asset);
|
|
271
|
+
await persistMetadata(db, id, asset);
|
|
164
272
|
return asset;
|
|
165
273
|
},
|
|
166
274
|
};
|