@dreamerbird/camera-studio 0.2.0 → 0.3.0

package/dist/assetLibrary/importModelFile.js

@@ -1,19 +1,6 @@
-/**
- * 宿主外部模型入库:File → 既有导入管线(planImport/executeImport)。
- * 放置管线只认库条目(按 id 解析 blob),外部模型必须真实入库,
- * 姿势/骨架匹配/持久化全部照常。library/deps 可注入(测试用)。
- */
-import { planImport, executeImport, realImportDeps } from './importPipeline';
+import { importModelFiles } from './importModelFiles';
 import { getLibrary } from './library';
-export async function importModelFile(file, library = getLibrary(), deps = realImportDeps()) {
-    const before = new Set((await library.listEntries('model')).map((e) => e.id));
-    const plan = await planImport([file], library, deps);
-    // 宿主场景无"相似条目"交互,一律保留为新条目
-    await executeImport(plan, plan.similar.map(() => 'keep'), library);
-    const models = await library.listEntries('model');
-    const created = models.find((m) => !before.has(m.id));
-    if (!created || created.kind !== 'model') {
-        throw new Error('[hostFlows] 模型导入失败:未找到新建条目');
-    }
+export async function importModelFile(file, library = getLibrary(), deps) {
+    const [created] = await importModelFiles([file], library, deps);
     return created;
 }

package/dist/assetLibrary/importModelFiles.d.ts

@@ -0,0 +1,15 @@
+import { type ImportDeps } from './importPipeline';
+import { type Library } from './library';
+import type { ModelEntry } from './types';
+export type ImportFileFailure = {
+    file: string;
+    message: string;
+};
+export declare class ImportModelFilesError extends Error {
+    readonly entries: ModelEntry[];
+    readonly failedItems: ImportFileFailure[];
+    readonly cause: unknown;
+    constructor(entries: ModelEntry[], failedItems: ImportFileFailure[], cause: unknown);
+}
+export declare function importModelFiles(files: File[], library?: Library, deps?: ImportDeps): Promise<ModelEntry[]>;
+//# sourceMappingURL=importModelFiles.d.ts.map

package/dist/assetLibrary/importModelFiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"importModelFiles.d.ts","sourceRoot":"","sources":["../../src/assetLibrary/importModelFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAa,KAAK,OAAO,EAAC,MAAM,WAAW,CAAA;AAClD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAEvC,MAAM,MAAM,iBAAiB,GAAG;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAA;AAE/D,qBAAa,qBAAsB,SAAQ,KAAK;IAE5C,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE;IAC9B,QAAQ,CAAC,WAAW,EAAE,iBAAiB,EAAE;IACzC,QAAQ,CAAC,KAAK,EAAE,OAAO;gBAFd,OAAO,EAAE,UAAU,EAAE,EACrB,WAAW,EAAE,iBAAiB,EAAE,EAChC,KAAK,EAAE,OAAO;CAS1B;AASD,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,IAAI,EAAE,EACb,OAAO,GAAE,OAAsB,EAC/B,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,UAAU,EAAE,CAAC,CAkDvB"}

package/dist/assetLibrary/importModelFiles.js

@@ -0,0 +1,58 @@
+import { executeImport, ImportItemWriteError, planImport, realImportDeps, } from './importPipeline';
+import { getLibrary } from './library';
+export class ImportModelFilesError extends Error {
+    constructor(entries, failedItems, cause) {
+        super(`模型导入部分失败: ${failedItems
+            .map((item) => `${item.file}: ${item.message}`)
+            .join('; ')}`);
+        this.entries = entries;
+        this.failedItems = failedItems;
+        this.cause = cause;
+        this.name = 'ImportModelFilesError';
+    }
+}
+function failureOf(item) {
+    return {
+        file: item.sourceFile ?? item.name,
+        message: item.type === 'skip' ? item.reason : '写入失败',
+    };
+}
+export async function importModelFiles(files, library = getLibrary(), deps) {
+    const before = new Set((await library.listEntries('model')).map((e) => e.id));
+    const modelFiles = files.filter((file) => /\.(glb|gltf|fbx)$/i.test(file.name));
+    const plan = await planImport(modelFiles, library, deps ?? realImportDeps(files));
+    const failedItems = plan.items
+        .filter((item) => item.type === 'skip' && !item.duplicate)
+        .map(failureOf);
+    let executeError;
+    try {
+        await executeImport(plan, plan.similar.map(() => 'keep'), library);
+    }
+    catch (error) {
+        executeError = error;
+        if (error instanceof ImportItemWriteError) {
+            const cause = error.cause;
+            failedItems.push({
+                ...failureOf(error.item),
+                message: cause instanceof Error ? cause.message : String(cause),
+            });
+        }
+        else {
+            failedItems.push({
+                file: 'unknown',
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    const entries = (await library.listEntries('model')).filter((entry) => entry.kind === 'model' && !before.has(entry.id));
+    if (executeError || failedItems.length > 0) {
+        const cause = executeError instanceof ImportItemWriteError
+            ? executeError.cause
+            : executeError;
+        throw new ImportModelFilesError(entries, failedItems, cause);
+    }
+    if (entries.length === 0) {
+        throw new Error('[hostFlows] 模型导入失败:未找到新建条目');
+    }
+    return entries;
+}

package/dist/assetLibrary/importModelFiles.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=importModelFiles.test.d.ts.map

package/dist/assetLibrary/importModelFiles.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"importModelFiles.test.d.ts","sourceRoot":"","sources":["../../src/assetLibrary/importModelFiles.test.ts"],"names":[],"mappings":""}

package/dist/assetLibrary/importModelFiles.test.js

@@ -0,0 +1,217 @@
+import { BoxGeometry, Group, Mesh, MeshBasicMaterial } from 'three';
+import { importModelFiles } from './importModelFiles';
+import { Library } from './library';
+const tinyPng = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=', 'base64');
+function triangleGltf() {
+    const document = {
+        asset: { version: '2.0' },
+        scene: 0,
+        scenes: [{ nodes: [0] }],
+        nodes: [{ mesh: 0 }],
+        meshes: [
+            {
+                primitives: [{ attributes: { POSITION: 0 }, material: 0, mode: 4 }],
+            },
+        ],
+        materials: [
+            {
+                pbrMetallicRoughness: {
+                    baseColorTexture: { index: 0 },
+                    metallicFactor: 0,
+                    roughnessFactor: 1,
+                },
+            },
+        ],
+        textures: [{ source: 0 }],
+        images: [{ uri: 'textures/tiny.png' }],
+        buffers: [{ uri: 'geometry/triangle.bin', byteLength: 36 }],
+        bufferViews: [{ buffer: 0, byteOffset: 0, byteLength: 36 }],
+        accessors: [
+            {
+                bufferView: 0,
+                componentType: 5126,
+                count: 3,
+                type: 'VEC3',
+                min: [0, 0, 0],
+                max: [1, 1, 0],
+            },
+        ],
+    };
+    return new File([JSON.stringify(document)], 'triangle.gltf', {
+        type: 'model/gltf+json',
+    });
+}
+function triangleBin() {
+    const bytes = new ArrayBuffer(36);
+    const positions = new Float32Array(bytes);
+    positions.set([0, 0, 0, 1, 0, 0, 0, 1, 0]);
+    return new File([bytes], 'triangle.bin', {
+        type: 'application/octet-stream',
+    });
+}
+function tinyPngFile() {
+    return new File([tinyPng], 'tiny.png', { type: 'image/png' });
+}
+function memoryBackend() {
+    const entries = new Map();
+    const blobs = new Map();
+    const backend = {
+        id: 'mock',
+        listEntries: async (kind) => [...entries.values()].filter((entry) => !kind || entry.kind === kind),
+        getEntry: async (id) => entries.get(id),
+        putEntry: async (entry) => void entries.set(entry.id, entry),
+        deleteEntry: async (id) => void entries.delete(id),
+        putBlob: async (blob) => {
+            const id = `blob-${blobs.size}`;
+            blobs.set(id, blob);
+            return id;
+        },
+        getBlobUrl: async () => 'blob:stored',
+        deleteBlob: async (id) => void blobs.delete(id),
+        listBlobIds: async () => [...blobs.keys()],
+        getRigAliases: async () => [],
+        putRigAlias: async () => { },
+    };
+    return { backend, entries, blobs };
+}
+function modelDeps(names) {
+    return {
+        load: async (file) => {
+            if (!names.includes(file.name))
+                throw new Error('无法解析');
+            const root = new Group();
+            root.name = file.name;
+            root.add(new Mesh(new BoxGeometry(), new MeshBasicMaterial()));
+            return { root, animations: [] };
+        },
+        exportModel: async (root) => new TextEncoder().encode(root.name).buffer,
+        exportAnimation: async () => new TextEncoder().encode('anim').buffer,
+    };
+}
+function gltfJsonChunk(glb) {
+    const view = new DataView(glb);
+    const jsonLength = view.getUint32(12, true);
+    expect(view.getUint32(16, true)).toBe(0x4e4f534a);
+    return JSON.parse(new TextDecoder().decode(new Uint8Array(glb, 20, jsonLength)));
+}
+describe('importModelFiles', () => {
+    const originalFetch = globalThis.fetch;
+    const originalSelf = globalThis.self;
+    const originalCreateImageBitmap = globalThis.createImageBitmap;
+    const originalImageData = globalThis.ImageData;
+    const originalCreateObjectURL = URL.createObjectURL;
+    const originalRevokeObjectURL = URL.revokeObjectURL;
+    const originalCreateElement = document.createElement;
+    let objectUrls;
+    beforeEach(() => {
+        globalThis.self = globalThis;
+        let nextId = 0;
+        objectUrls = new Map();
+        URL.createObjectURL = jest.fn((blob) => {
+            const url = `blob:test-${++nextId}`;
+            objectUrls.set(url, blob);
+            return url;
+        });
+        URL.revokeObjectURL = jest.fn((url) => {
+            objectUrls.delete(url);
+        });
+        globalThis.fetch = jest.fn(async (input) => {
+            const url = typeof input === 'string' || input instanceof URL
+                ? String(input)
+                : input.url;
+            const blob = objectUrls.get(url);
+            if (!blob)
+                throw new Error(`未登记的测试 URL: ${url}`);
+            return {
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                url,
+                headers: { get: () => null },
+                arrayBuffer: () => blob.arrayBuffer(),
+                blob: async () => blob,
+            };
+        });
+        globalThis.createImageBitmap = jest.fn(async () => ({
+            data: new Uint8ClampedArray([255, 255, 255, 255]),
+            width: 1,
+            height: 1,
+            close: jest.fn(),
+        }));
+        globalThis.ImageData = class {
+            constructor(data, width, height) {
+                this.data = data;
+                this.width = width;
+                this.height = height;
+            }
+        };
+        document.createElement = jest.fn(() => ({
+            width: 0,
+            height: 0,
+            getContext: () => ({
+                translate: jest.fn(),
+                scale: jest.fn(),
+                drawImage: jest.fn(),
+                putImageData: jest.fn(),
+            }),
+            toBlob: (callback) => callback(new Blob([tinyPng], { type: 'image/png' })),
+        }));
+    });
+    afterEach(() => {
+        globalThis.fetch = originalFetch;
+        globalThis.self = originalSelf;
+        globalThis.createImageBitmap = originalCreateImageBitmap;
+        globalThis.ImageData = originalImageData;
+        URL.createObjectURL = originalCreateObjectURL;
+        URL.revokeObjectURL = originalRevokeObjectURL;
+        if (originalCreateElement)
+            document.createElement = originalCreateElement;
+        else
+            Reflect.deleteProperty(document, 'createElement');
+    });
+    it('把相对 buffer/image 一起装入一个自包含 GLB,并回收全部临时 URL', async () => {
+        const { backend, entries, blobs } = memoryBackend();
+        const library = new Library({ sources: [backend] });
+        const imported = await importModelFiles([triangleGltf(), triangleBin(), tinyPngFile()], library);
+        expect(imported).toHaveLength(1);
+        expect(imported[0]).toMatchObject({
+            kind: 'model',
+            name: 'triangle',
+            vertexCount: 3,
+        });
+        expect(entries.size).toBe(1);
+        const glb = await blobs.get(imported[0].blobId).arrayBuffer();
+        expect(new DataView(glb).getUint32(0, true)).toBe(0x46546c67);
+        const json = gltfJsonChunk(glb);
+        expect(json.buffers[0].uri).toBeUndefined();
+        expect(json.images[0].uri).toBeUndefined();
+        expect(json.images[0].bufferView).toEqual(expect.any(Number));
+        expect(URL.createObjectURL).toHaveBeenCalledTimes(2);
+        expect(URL.revokeObjectURL).toHaveBeenCalledTimes(2);
+        expect(objectUrls.size).toBe(0);
+    });
+    it('引用的 bin 缺失时不创建任何新条目,并回收已创建的 URL', async () => {
+        const { backend, entries } = memoryBackend();
+        const library = new Library({ sources: [backend] });
+        await expect(importModelFiles([triangleGltf(), tinyPngFile()], library)).rejects.toThrow();
+        expect(entries.size).toBe(0);
+        expect(objectUrls.size).toBe(0);
+        expect(URL.revokeObjectURL).toHaveBeenCalledWith(expect.stringMatching(/^blob:test-/));
+    });
+    it('多个模型根全部成功时按原数组契约返回全部新条目', async () => {
+        const { backend } = memoryBackend();
+        const library = new Library({ sources: [backend] });
+        const imported = await importModelFiles([new File(['a'], 'a.gltf'), new File(['b'], 'b.gltf')], library, modelDeps(['a.gltf', 'b.gltf']));
+        expect(imported.map((entry) => entry.name)).toEqual(['a', 'b']);
+        expect(await library.listEntries('model')).toHaveLength(2);
+    });
+    it('混合成功时保留成功条目并报告失败文件及原因', async () => {
+        const { backend } = memoryBackend();
+        const library = new Library({ sources: [backend] });
+        await expect(importModelFiles([new File(['a'], 'a.gltf'), new File(['x'], 'broken.gltf')], library, modelDeps(['a.gltf']))).rejects.toMatchObject({
+            entries: [expect.objectContaining({ kind: 'model', name: 'a' })],
+            failedItems: [{ file: 'broken.gltf', message: expect.any(String) }],
+        });
+        expect((await library.listEntries('model')).map((entry) => entry.name)).toEqual(['a']);
+    });
+});

package/dist/assetLibrary/importPipeline.d.ts

@@ -12,10 +12,11 @@ export type ImportDeps = {
     exportModel: (root: Object3D) => Promise<ArrayBuffer>;
     exportAnimation: (root: Object3D, clip: AnimationClip) => Promise<ArrayBuffer>;
 };
-export declare const realImportDeps: () => ImportDeps;
+export declare const realImportDeps: (files?: File[]) => ImportDeps;
 export type ImportItem = {
     type: 'model';
     name: string;
+    sourceFile?: string;
     rig: string;
     contentHash: string;
     boneCount: number;
@@ -24,6 +25,7 @@ export type ImportItem = {
 } | {
     type: 'animation';
     name: string;
+    sourceFile?: string;
     rig: string;
     contentHash: string;
     duration: number;
@@ -31,12 +33,15 @@ export type ImportItem = {
 } | {
     type: 'pose';
     name: string;
+    sourceFile?: string;
     rig: string;
     bones: PoseEntry['bones'];
 } | {
     type: 'skip';
     name: string;
+    sourceFile?: string;
     reason: string;
+    duplicate?: boolean;
 };
 /** 哈希不同但同族同结构的模型,入库前要用户选 reuse/keep */
 export type SimilarMatch = {
@@ -56,6 +61,15 @@ export declare function baseName(fileName: string): string;
  * 第二层:哈希不同但同族 + 顶点/骨骼数相同 → 记入 similar 交给用户。
  */
 export declare function planImport(files: File[], library: Pick<Library, 'listEntries'>, deps: ImportDeps, tr?: TFunction): Promise<ImportPlan>;
+export declare class ImportItemWriteError extends Error {
+    readonly item: Exclude<ImportItem, {
+        type: 'skip';
+    }>;
+    readonly cause: unknown;
+    constructor(item: Exclude<ImportItem, {
+        type: 'skip';
+    }>, cause: unknown);
+}
 /** 落库:choices 与 plan.similar 一一对应,'reuse' 丢弃对应 model 项 */
 export declare function executeImport(plan: ImportPlan, choices: Array<'reuse' | 'keep'>, library: Library): Promise<void>;
 //# sourceMappingURL=importPipeline.d.ts.map

package/dist/assetLibrary/importPipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importPipeline.d.ts","sourceRoot":"","sources":["../../src/assetLibrary/importPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAA;AACzD,OAAO,EAAY,KAAK,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAKlE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AAEtC,OAAO,KAAK,EAA6B,SAAS,EAAC,MAAM,SAAS,CAAA;AAElE,MAAM,MAAM,WAAW,GAAG;IAAC,IAAI,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,aAAa,EAAE,CAAA;CAAC,CAAA;AAEpE,+DAA+D;AAC/D,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;IAC1C,WAAW,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;IACrD,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;CAC/E,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,MAAM,UAIjC,CAAA;AAmCF,MAAM,MAAM,UAAU,GAClB;IACE,IAAI,EAAE,OAAO,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,WAAW,CAAA;CACjB,GACD;IACE,IAAI,EAAE,WAAW,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,WAAW,CAAA;CACjB,GACD;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;CAAC,GACpE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAA;AAEhD,uCAAuC;AACvC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEjD;AAuBD;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,IAAI,EAAE,EACb,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,EACrC,IAAI,EAAE,UAAU,EAChB,EAAE,GAAE,SAAqB,GACxB,OAAO,CAAC,UAAU,CAAC,CAsJrB;AAED,0DAA0D;AAC1D,wBAAsB,aAAa,CACjC,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,EAChC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAgDf"}
+{"version":3,"file":"importPipeline.d.ts","sourceRoot":"","sources":["../../src/assetLibrary/importPipeline.ts"],"names":[],"mappings":"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"}

package/dist/assetLibrary/importPipeline.js

@@ -1,17 +1,28 @@
 import { translate } from '@dreamerbird/studio/i18n';
 import { classifyModel, validatePoseJson } from './classify';
 import { createGLTFLoader } from './gltfLoader';
+import { createResourceUrlModifier } from './gltfResourceSet';
 import { exportAnimationGLB, exportModelGLB } from './exportGLB';
 import { hashBytes } from './hash';
 import { collectBoneNames, meshStats, rigIdOf } from './rig';
-export const realImportDeps = () => ({
-    load: defaultLoad,
+export const realImportDeps = (files) => ({
+    load: (file) => defaultLoad(file, files),
     exportModel: exportModelGLB,
     exportAnimation: exportAnimationGLB,
 });
-async function defaultLoad(file) {
+async function defaultLoad(file, resourceFiles) {
     const { FBXLoader } = await import('three-stdlib');
     const { LoadingManager } = await import('three');
+    if (resourceFiles && /\.gltf$/i.test(file.name)) {
+        const resources = createResourceUrlModifier(resourceFiles);
+        try {
+            const gltf = await createGLTFLoader(resources.manager).parseAsync(await file.text(), '');
+            return { root: gltf.scene, animations: gltf.animations };
+        }
+        finally {
+            resources.dispose();
+        }
+    }
     const url = URL.createObjectURL(file);
     try {
         if (/\.glb$|\.gltf$/i.test(file.name)) {
@@ -81,6 +92,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: file.name,
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.badPoseJson'),
                 });
             }
@@ -88,6 +100,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'pose',
                     name: baseName(file.name),
+                    sourceFile: file.name,
                     rig: parsed.rig,
                     bones: parsed.bones,
                 });
@@ -102,6 +115,7 @@ export async function planImport(files, library, deps, tr = translate) {
             items.push({
                 type: 'skip',
                 name: file.name,
+                sourceFile: file.name,
                 reason: tr('pg.import.reason.parseFailed'),
             });
             continue;
@@ -111,6 +125,7 @@ export async function planImport(files, library, deps, tr = translate) {
             items.push({
                 type: 'skip',
                 name: file.name,
+                sourceFile: file.name,
                 reason: tr('pg.import.reason.noContent'),
             });
             continue;
@@ -128,6 +143,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: baseName(file.name),
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.modelExportFailed'),
                 });
             }
@@ -140,6 +156,7 @@ export async function planImport(files, library, deps, tr = translate) {
                     const index = items.push({
                         type: 'model',
                         name: baseName(file.name),
+                        sourceFile: file.name,
                         rig,
                         contentHash,
                         boneCount,
@@ -163,7 +180,9 @@ export async function planImport(files, library, deps, tr = translate) {
                     items.push({
                         type: 'skip',
                         name: baseName(file.name),
+                        sourceFile: file.name,
                         reason: tr('pg.import.reason.modelExists', { name: dup.name }),
+                        duplicate: true,
                     });
                 }
                 // dup 命中:模型跳过,下面的动作照常提取
@@ -180,6 +199,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: `${baseName(file.name)}/${clip.name}`,
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.animationExportFailed'),
                 });
                 continue;
@@ -189,13 +209,16 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: `${baseName(file.name)}/${clip.name}`,
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.animationExists'),
+                    duplicate: true,
                 });
                 continue;
             }
             items.push({
                 type: 'animation',
                 name: clip.name || baseName(file.name),
+                sourceFile: file.name,
                 rig,
                 contentHash,
                 duration: clip.duration,
@@ -205,6 +228,14 @@ export async function planImport(files, library, deps, tr = translate) {
     }
     return { items, similar, summary: summarize(items, tr) };
 }
+export class ImportItemWriteError extends Error {
+    constructor(item, cause) {
+        super(`导入项 ${item.name} 写入失败: ${cause instanceof Error ? cause.message : String(cause)}`);
+        this.item = item;
+        this.cause = cause;
+        this.name = 'ImportItemWriteError';
+    }
+}
 /** 落库:choices 与 plan.similar 一一对应,'reuse' 丢弃对应 model 项 */
 export async function executeImport(plan, choices, library) {
     const drop = new Set(plan.similar.filter((_, i) => choices[i] === 'reuse').map((s) => s.index));
@@ -212,42 +243,47 @@ export async function executeImport(plan, choices, library) {
         const item = plan.items[i];
         if (item.type === 'skip')
             continue;
-        if (item.type === 'model') {
-            if (drop.has(i))
-                continue;
-            await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
-                id: newId(),
-                kind: 'model',
-                name: item.name,
-                rig: item.rig,
-                blobId,
-                contentHash: item.contentHash,
-                boneCount: item.boneCount,
-                vertexCount: item.vertexCount,
-                createdAt: Date.now(),
-            }));
-        }
-        else if (item.type === 'animation') {
-            await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
-                id: newId(),
-                kind: 'animation',
-                name: item.name,
-                rig: item.rig,
-                blobId,
-                contentHash: item.contentHash,
-                duration: item.duration,
-                createdAt: Date.now(),
-            }));
+        try {
+            if (item.type === 'model') {
+                if (drop.has(i))
+                    continue;
+                await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
+                    id: newId(),
+                    kind: 'model',
+                    name: item.name,
+                    rig: item.rig,
+                    blobId,
+                    contentHash: item.contentHash,
+                    boneCount: item.boneCount,
+                    vertexCount: item.vertexCount,
+                    createdAt: Date.now(),
+                }));
+            }
+            else if (item.type === 'animation') {
+                await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
+                    id: newId(),
+                    kind: 'animation',
+                    name: item.name,
+                    rig: item.rig,
+                    blobId,
+                    contentHash: item.contentHash,
+                    duration: item.duration,
+                    createdAt: Date.now(),
+                }));
+            }
+            else {
+                await library.putEntry({
+                    id: newId(),
+                    kind: 'pose',
+                    name: item.name,
+                    rig: item.rig,
+                    bones: item.bones,
+                    createdAt: Date.now(),
+                });
+            }
         }
-        else {
-            await library.putEntry({
-                id: newId(),
-                kind: 'pose',
-                name: item.name,
-                rig: item.rig,
-                bones: item.bones,
-                createdAt: Date.now(),
-            });
+        catch (error) {
+            throw new ImportItemWriteError(item, error);
         }
     }
 }

package/dist/assetLibrary/importPipeline.test.js

@@ -185,4 +185,29 @@ describe('executeImport', () => {
         await executeImport(plan, ['keep'], lib);
         expect((await backend.listEntries('model')).length).toBe(1);
     });
+    it('第二个模型写库失败时保留实际失败项与原始错误', async () => {
+        const backend = memoryBackend();
+        let writes = 0;
+        backend.putBlob = async () => {
+            writes++;
+            if (writes === 2)
+                throw new Error('disk full');
+            return `blob-${writes}`;
+        };
+        const lib = new Library({ sources: [backend] });
+        const deps = depsFor({
+            'a.fbx': { root: skinnedModel('Hips'), animations: [] },
+            'b.fbx': { root: skinnedModel('Spine'), animations: [] },
+        });
+        deps.exportModel = async (root) => {
+            const names = [];
+            root.traverse((object) => names.push(object.name));
+            return new TextEncoder().encode(names.join('|')).buffer;
+        };
+        const plan = await planImportZh([file('a.fbx'), file('b.fbx')], backend, deps);
+        await expect(executeImport(plan, [], lib)).rejects.toMatchObject({
+            item: { name: 'b', sourceFile: 'b.fbx' },
+            cause: new Error('disk full'),
+        });
+    });
 });

package/dist/assetLibrary/library.d.ts

@@ -84,6 +84,7 @@ export declare class Library {
     listBlobIds(): Promise<string[]>;
     /** 所有条目引用的 blob id 集合(模型 blobId + thumbnailId) */
     private referencedBlobIds;
+    private referencedBlobIdsForRollback;
     /** 删条目并清理它的 blob;blob 被其他条目共享时保留 */
     deleteEntryDeep(id: string): Promise<void>;
     /** 清理无条目引用的孤儿 blob,返回删除数量 */

package/dist/assetLibrary/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../src/assetLibrary/library.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../src/assetLibrary/library.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAC,MAAM,UAAU,CAAA;AACvD,OAAO,KAAK,EAAC,aAAa,EAAE,qBAAqB,EAAC,MAAM,UAAU,CAAA;AAGlE,OAAO,KAAK,EAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAA;AAE9D,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,aAAa,EAAE,CAAA;IACxB,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IAChC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK,IAAI,CAAA;CACtC,CAAA;AAKD,mCAAmC;AACnC,eAAO,MAAM,cAAc,WAAW,CAAA;AAYtC;;;;;;;GAOG;AACH,qBAAa,OAAO;IAClB,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,CAAA;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IACzC,OAAO,CAAC,OAAO,CAAC,CAA6B;IAC7C,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,eAAe,CAA8B;IACrD,+CAA+C;IAC/C,OAAO,CAAC,cAAc,CAAmC;gBAE7C,IAAI,EAAE,WAAW;IAoB7B,4CAA4C;IAC5C,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;OAIG;IACH,WAAW,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAIpC;;;;OAIG;IACH,kBAAkB,IAAI,SAAS,YAAY,EAAE;IAI7C,kDAAkD;IAClD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAIrD,OAAO,CAAC,eAAe;IAWvB,SAAS,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAOrC,OAAO,CAAC,IAAI;IAKZ,gCAAgC;IAChC,OAAO,CAAC,OAAO;IASf;;;;;;;;;;OAUG;IACG,WAAW,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA8D5D;;;;;;OAMG;IACG,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAmB7D;;;OAGG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD,OAAO,CAAC,eAAe;IAOjB,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5C,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtC,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB1D,kDAAkD;IAC5C,gBAAgB,CACpB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,GAC1C,OAAO,CAAC,IAAI,CAAC;IAmBhB,6CAA6C;IACvC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1C,2CAA2C;IACrC,WAAW,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAItC,kDAAkD;YACpC,iBAAiB;YAajB,4BAA4B;IAc1C,oCAAoC;IAC9B,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBhD,6BAA6B;IACvB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAkBzC;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAU1C,iBAAiB;IACX,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAM5D;AAQD;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvE;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAuBpC;AAED,mCAAmC;AACnC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAG3D;AAED,6BAA6B;AAC7B,wBAAgB,iBAAiB,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,YAAY,EAAE,CAmBlE;AAED,iCAAiC;AACjC,wBAAgB,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAoBtD"}