@file-viewer/doc 2.1.22 → 2.1.24

package/dist/msdoc/objects.js

@@ -1,5 +1,23 @@
 import { BinaryReader } from '../core/binary.js';
+import { inflateZlib } from '../core/inflate.js';
 import { dataUrlFromBytes, slugify, uniqueId } from '../core/utils.js';
+import { detectMimeFromBlipType, parseInlineOfficeArtShape } from './officeart.js';
+import { convertMetafileToSvg } from './vector.js';
+const DEFAULT_MAX_PICTURE_BYTES = 8 * 1024 * 1024;
+const PICF_HEADER_SIZE = 68;
+const MM_SHAPE = 0x0064;
+const MM_SHAPEFILE = 0x0066;
+const OFFICEART_CONTAINER = 0xf;
+const OFFICEART_TYPE_INLINE_SP_CONTAINER = 0xf004;
+const OFFICEART_FBSE = 0xf007;
+const OFFICEART_BLIP_EMF = 0xf01a;
+const OFFICEART_BLIP_WMF = 0xf01b;
+const OFFICEART_BLIP_PICT = 0xf01c;
+const OFFICEART_BLIP_JPEG = 0xf01d;
+const OFFICEART_BLIP_PNG = 0xf01e;
+const OFFICEART_BLIP_DIB = 0xf01f;
+const OFFICEART_BLIP_TIFF = 0xf029;
+const OFFICEART_BLIP_JPEG_ALT = 0xf02a;
 function startsWith(bytes, signature, offset = 0) {
     if (offset + signature.length > bytes.length)
         return false;
@@ -9,6 +27,86 @@ function startsWith(bytes, signature, offset = 0) {
     }
     return true;
 }
+function isPrintableAnsi(bytes) {
+    for (let i = 0; i < bytes.length; i += 1) {
+        const value = bytes[i] ?? 0;
+        if (value === 0 || value === 9 || value === 10 || value === 13)
+            continue;
+        if (value < 0x20 || value === 0x7f)
+            return false;
+    }
+    return true;
+}
+function isProbablyPicturePath(value) {
+    const normalized = value.trim();
+    if (!normalized)
+        return false;
+    if (/^(?:file|https?|data|blob):/i.test(normalized))
+        return true;
+    if (/^(?:\\\\|[a-zA-Z]:[\\/]|\/)/.test(normalized))
+        return true;
+    return /\.(?:png|apng|jpe?g|gif|bmp|dib|tiff?|emf|wmf|pict|svg)(?:$|[?#])/i.test(normalized);
+}
+function isLocalExternalPath(value) {
+    return /^file:/i.test(value) || /^(?:\\\\|[a-zA-Z]:[\\/]|\/)/.test(value);
+}
+function detectMimeFromPath(path) {
+    const normalized = path.toLowerCase();
+    if (normalized.includes('.png'))
+        return 'image/png';
+    if (normalized.includes('.jpg') || normalized.includes('.jpeg'))
+        return 'image/jpeg';
+    if (normalized.includes('.gif'))
+        return 'image/gif';
+    if (normalized.includes('.bmp'))
+        return 'image/bmp';
+    if (normalized.includes('.dib'))
+        return 'image/bmp';
+    if (normalized.includes('.tif'))
+        return 'image/tiff';
+    if (normalized.includes('.emf'))
+        return 'image/emf';
+    if (normalized.includes('.wmf'))
+        return 'image/wmf';
+    if (normalized.includes('.pict') || normalized.includes('.pct') || normalized.includes('.pic'))
+        return 'image/pict';
+    if (normalized.includes('.svg'))
+        return 'image/svg+xml';
+    return null;
+}
+function isBrowserDisplayableMime(mime) {
+    return /^(?:image\/png|image\/jpeg|image\/gif|image\/bmp|image\/webp|image\/svg\+xml|image\/tiff)$/i.test(mime);
+}
+function detectAttachmentMime(name) {
+    const normalized = name.toLowerCase();
+    if (normalized.endsWith('.doc'))
+        return 'application/msword';
+    if (normalized.endsWith('.docx'))
+        return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+    if (normalized.endsWith('.xls'))
+        return 'application/vnd.ms-excel';
+    if (normalized.endsWith('.xlsx'))
+        return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+    if (normalized.endsWith('.ppt'))
+        return 'application/vnd.ms-powerpoint';
+    if (normalized.endsWith('.pptx'))
+        return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+    if (normalized.endsWith('.pdf'))
+        return 'application/pdf';
+    if (normalized.endsWith('.png'))
+        return 'image/png';
+    if (normalized.endsWith('.jpg') || normalized.endsWith('.jpeg'))
+        return 'image/jpeg';
+    if (normalized.endsWith('.gif'))
+        return 'image/gif';
+    if (normalized.endsWith('.bmp'))
+        return 'image/bmp';
+    if (normalized.endsWith('.zip'))
+        return 'application/zip';
+    if (normalized.endsWith('.txt'))
+        return 'text/plain';
+    return 'application/octet-stream';
+}
 export function detectImageSegment(bytes) {
     const sigs = [
         { mime: 'image/png', magic: [0x89, 0x50, 0x4e, 0x47], end: findPngEnd },
@@ -23,6 +121,8 @@ export function detectImageSegment(bytes) {
     for (let i = 0; i < bytes.length - 4; i += 1) {
         for (const sig of sigs) {
             if (startsWith(bytes, sig.magic, i)) {
+                if (sig.mime === 'image/emf' && findEmfEnd(bytes, i) === bytes.length)
+                    continue;
                 const end = sig.end ? sig.end(bytes, i) : bytes.length;
                 return { mime: sig.mime, start: i, end: end || bytes.length };
             }
@@ -60,25 +160,426 @@ function findBmpEnd(bytes, start) {
     return bytes.length;
 }
 function findEmfEnd(bytes, start) {
-    if (start + 48 <= bytes.length) {
-        const reader = new BinaryReader(bytes.subarray(start));
-        const size = reader.u32(40);
-        if (size > 0 && start + size <= bytes.length)
-            return start + size;
-    }
+    if (start + 52 > bytes.length)
+        return bytes.length;
+    const reader = new BinaryReader(bytes.subarray(start));
+    const iType = reader.u32(0);
+    const signature = reader.u32(40);
+    const nBytes = reader.u32(48);
+    if (iType !== 0x00000001 || signature !== 0x464d4520)
+        return bytes.length;
+    if (nBytes > 0 && start + nBytes <= bytes.length)
+        return start + nBytes;
     return bytes.length;
 }
+function parsePicfHeader(bytes) {
+    if (bytes.length < PICF_HEADER_SIZE)
+        return null;
+    const reader = new BinaryReader(bytes);
+    // PICMID stores the intended display goal size in twips plus mx/my scaling
+    // factors (tenths of a percent). Word uses these values for inline picture
+    // layout, including images that live in header/footer stories.
+    const dxaGoalTwips = reader.i16(28);
+    const dyaGoalTwips = reader.i16(30);
+    const scaleXPermille = reader.u16(32);
+    const scaleYPermille = reader.u16(34);
+    const displayWidthTwips = dxaGoalTwips > 0 && scaleXPermille > 0
+        ? Math.max(15, Math.min(31680, Math.round((dxaGoalTwips * scaleXPermille) / 1000)))
+        : undefined;
+    const displayHeightTwips = dyaGoalTwips > 0 && scaleYPermille > 0
+        ? Math.max(15, Math.min(31680, Math.round((dyaGoalTwips * scaleYPermille) / 1000)))
+        : undefined;
+    return {
+        lcb: reader.i32(0),
+        cbHeader: reader.u16(4),
+        mm: reader.u16(6),
+        xExt: reader.i16(8),
+        yExt: reader.i16(10),
+        dxaGoalTwips: dxaGoalTwips > 0 ? dxaGoalTwips : undefined,
+        dyaGoalTwips: dyaGoalTwips > 0 ? dyaGoalTwips : undefined,
+        scaleXPermille: scaleXPermille || undefined,
+        scaleYPermille: scaleYPermille || undefined,
+        displayWidthTwips,
+        displayHeightTwips,
+    };
+}
+/**
+ * PICFAndOfficeArtData can optionally carry a length-prefixed ANSI path right after
+ * the 68-byte PICF header. The spec ties this to MM_SHAPEFILE, but real-world files
+ * are not always perfectly spec-compliant, so we also accept clearly path-like data.
+ */
+function readOptionalPictureName(pictureChunk, picf) {
+    const offset = Math.min(picf.cbHeader || PICF_HEADER_SIZE, pictureChunk.length);
+    if (offset >= pictureChunk.length)
+        return null;
+    const length = pictureChunk[offset] ?? 0;
+    if (!length || offset + 1 + length > pictureChunk.length)
+        return null;
+    const raw = pictureChunk.subarray(offset + 1, offset + 1 + length);
+    if (!isPrintableAnsi(raw))
+        return null;
+    const value = new TextDecoder('windows-1252').decode(raw).replace(/\0+$/g, '');
+    if (!isProbablyPicturePath(value)) {
+        if (picf.mm !== MM_SHAPEFILE)
+            return null;
+    }
+    return { value, nextOffset: offset + 1 + length };
+}
+/**
+ * OfficeArt records all start with the common 8-byte OfficeArtRecordHeader.
+ * Parsing this explicitly lets us walk inline shape containers instead of guessing
+ * image payloads by magic bytes, which was the root cause of the broken image output.
+ */
+export function parseOfficeArtRecordHeader(bytes, offset) {
+    if (offset < 0 || offset + 8 > bytes.length)
+        return null;
+    const reader = new BinaryReader(bytes);
+    const versionAndInstance = reader.u16(offset);
+    const recType = reader.u16(offset + 2);
+    const recLen = reader.u32(offset + 4);
+    if (recType < 0xf000 || recType > 0xffff)
+        return null;
+    const size = 8 + recLen;
+    if (recLen > bytes.length || offset + size > bytes.length)
+        return null;
+    return {
+        recVer: versionAndInstance & 0x000f,
+        recInstance: versionAndInstance >>> 4,
+        recType,
+        recLen,
+        size,
+    };
+}
+function createBitmapFileHeader(pixelOffset, totalSize) {
+    const header = new Uint8Array(14);
+    const view = new DataView(header.buffer);
+    view.setUint8(0, 0x42);
+    view.setUint8(1, 0x4d);
+    view.setUint32(2, totalSize, true);
+    view.setUint16(6, 0, true);
+    view.setUint16(8, 0, true);
+    view.setUint32(10, pixelOffset, true);
+    return header;
+}
+function dibToBmp(dibBytes) {
+    if (dibBytes.length < 12)
+        return null;
+    const reader = new BinaryReader(dibBytes);
+    const headerSize = reader.u32(0);
+    if (headerSize < 12 || headerSize > dibBytes.length)
+        return null;
+    let bitsPerPixel = 0;
+    let compression = 0;
+    let colorsUsed = 0;
+    let paletteEntrySize = 4;
+    if (headerSize === 12) {
+        bitsPerPixel = reader.u16(10);
+        paletteEntrySize = 3;
+    }
+    else {
+        bitsPerPixel = reader.u16(14);
+        compression = reader.u32(16);
+        colorsUsed = reader.u32(32);
+    }
+    const colorCount = colorsUsed || (bitsPerPixel > 0 && bitsPerPixel <= 8 ? 1 << bitsPerPixel : 0);
+    let paletteSize = colorCount * paletteEntrySize;
+    if (compression === 3 && headerSize >= 40)
+        paletteSize += 12;
+    const pixelOffset = 14 + headerSize + paletteSize;
+    if (pixelOffset > 14 + dibBytes.length)
+        return null;
+    const bmpHeader = createBitmapFileHeader(pixelOffset, 14 + dibBytes.length);
+    const out = new Uint8Array(14 + dibBytes.length);
+    out.set(bmpHeader, 0);
+    out.set(dibBytes, 14);
+    return out;
+}
+/**
+ * OfficeArtBStoreContainerFileBlock can wrap an OfficeArtFBSE record instead of a
+ * BLIP atom directly. In that case the actual image payload sits in the FBSE
+ * embeddedBlip field after the fixed 36-byte FBSE header and optional nameData.
+ */
+function extractEmbeddedBlipFromFbse(bytes, offset, header) {
+    const payloadOffset = offset + 8;
+    const payloadEnd = payloadOffset + header.recLen;
+    if (payloadEnd > bytes.length || header.recLen < 36)
+        return null;
+    const reader = new BinaryReader(bytes);
+    const btWin32 = reader.u8(payloadOffset);
+    const btMacOS = reader.u8(payloadOffset + 1);
+    const tag = reader.u16(payloadOffset + 18);
+    const size = reader.u32(payloadOffset + 20);
+    const cRef = reader.u32(payloadOffset + 24);
+    const foDelay = reader.u32(payloadOffset + 28);
+    const cbName = reader.u8(payloadOffset + 33);
+    const nameOffset = payloadOffset + 36;
+    const embeddedBlipOffset = nameOffset + cbName;
+    if (embeddedBlipOffset + 8 > payloadEnd)
+        return null;
+    const embeddedHeader = parseOfficeArtRecordHeader(bytes, embeddedBlipOffset);
+    if (!embeddedHeader)
+        return null;
+    const candidate = extractBlipPayload(bytes, embeddedBlipOffset, embeddedHeader);
+    if (!candidate)
+        return null;
+    const fbseName = cbName > 0 && nameOffset + cbName <= payloadEnd
+        ? new TextDecoder('utf-16le').decode(bytes.subarray(nameOffset, nameOffset + Math.max(0, cbName - 2))).replace(/\0+$/g, '')
+        : '';
+    return {
+        ...candidate,
+        meta: {
+            ...(candidate.meta || {}),
+            fbseBlipType: btWin32 || btMacOS,
+            fbseMime: detectMimeFromBlipType(btWin32 || btMacOS),
+            fbseTag: tag,
+            fbseSize: size,
+            fbseRefCount: cRef,
+            fbseDelayOffset: foDelay,
+            fbseName,
+        },
+    };
+}
+function extractBlipPayload(bytes, offset, header) {
+    const payloadOffset = offset + 8;
+    const uidCount = (header.recInstance & 0x1) === 1 ? 2 : 1;
+    const uidBytes = uidCount * 16;
+    const atom = bytes.subarray(payloadOffset, payloadOffset + header.recLen);
+    if (header.recType === OFFICEART_BLIP_PNG || header.recType === OFFICEART_BLIP_JPEG || header.recType === OFFICEART_BLIP_JPEG_ALT || header.recType === OFFICEART_BLIP_DIB || header.recType === OFFICEART_BLIP_TIFF) {
+        const infoSize = uidBytes + 1;
+        if (atom.length < infoSize)
+            return null;
+        let mime = 'application/octet-stream';
+        let payload = atom.subarray(infoSize);
+        if (header.recType === OFFICEART_BLIP_PNG)
+            mime = 'image/png';
+        else if (header.recType === OFFICEART_BLIP_JPEG || header.recType === OFFICEART_BLIP_JPEG_ALT)
+            mime = 'image/jpeg';
+        else if (header.recType === OFFICEART_BLIP_TIFF)
+            mime = 'image/tiff';
+        else if (header.recType === OFFICEART_BLIP_DIB) {
+            const bmp = dibToBmp(payload);
+            if (bmp) {
+                payload = bmp;
+                mime = 'image/bmp';
+            }
+            else {
+                mime = 'image/dib';
+            }
+        }
+        return {
+            mime,
+            bytes: payload,
+            displayable: isBrowserDisplayableMime(mime),
+            kind: 'officeArt',
+            meta: { recType: header.recType, recInstance: header.recInstance },
+        };
+    }
+    if (header.recType === OFFICEART_BLIP_EMF || header.recType === OFFICEART_BLIP_WMF || header.recType === OFFICEART_BLIP_PICT) {
+        const infoSize = uidBytes + 34;
+        if (atom.length < infoSize)
+            return null;
+        const metaReader = new BinaryReader(atom);
+        const metafileUncompressedSize = metaReader.u32(uidBytes);
+        const metafileCompressedSize = metaReader.u32(uidBytes + 28);
+        const metafileCompression = atom[uidBytes + 32] ?? 0xff;
+        const metafileFilter = atom[uidBytes + 33] ?? 0xff;
+        const rawPayload = atom.subarray(infoSize);
+        let payload = rawPayload;
+        let metafileDecompressed = false;
+        let metafileCompressed = metafileCompression !== 0xfe;
+        if (metafileCompression === 0x00) {
+            const inflated = inflateZlib(rawPayload, metafileUncompressedSize || undefined);
+            if (inflated) {
+                payload = inflated;
+                metafileDecompressed = true;
+                metafileCompressed = false;
+            }
+        }
+        const mime = header.recType === OFFICEART_BLIP_EMF ? 'image/emf' : header.recType === OFFICEART_BLIP_WMF ? 'image/wmf' : 'image/pict';
+        return {
+            mime,
+            bytes: payload,
+            displayable: isBrowserDisplayableMime(mime),
+            kind: 'officeArt',
+            meta: {
+                recType: header.recType,
+                recInstance: header.recInstance,
+                metafileUncompressedSize,
+                metafileCompressedSize,
+                metafileCompression,
+                metafileFilter,
+                metafileCompressed,
+                metafileDecompressed,
+                metafileOriginalByteLength: rawPayload.length,
+                fbseSize: metafileCompressedSize,
+            },
+        };
+    }
+    return null;
+}
+function collectOfficeArtCandidates(bytes, offset, end, out) {
+    let cursor = offset;
+    while (cursor + 8 <= end) {
+        const header = parseOfficeArtRecordHeader(bytes, cursor);
+        if (!header)
+            break;
+        const next = cursor + header.size;
+        if (next > end)
+            break;
+        if (header.recVer === OFFICEART_CONTAINER) {
+            collectOfficeArtCandidates(bytes, cursor + 8, next, out);
+        }
+        else if (header.recType === OFFICEART_FBSE) {
+            const candidate = extractEmbeddedBlipFromFbse(bytes, cursor, header);
+            if (candidate)
+                out.push(candidate);
+        }
+        else {
+            const candidate = extractBlipPayload(bytes, cursor, header);
+            if (candidate)
+                out.push(candidate);
+        }
+        cursor = next;
+    }
+}
+/**
+ * The `picture` field of PICFAndOfficeArtData is an OfficeArtInlineSpContainer.
+ * We recursively walk nested OfficeArt containers until we reach actual BLIP atoms
+ * (PNG/JPEG/DIB/TIFF/EMF/WMF/PICT) and then extract the payload according to the
+ * BLIP record-specific layout from MS-ODRAW.
+ */
+function findOfficeArtCandidates(pictureChunk, startOffset) {
+    if (startOffset < 0 || startOffset + 8 > pictureChunk.length)
+        return [];
+    const candidates = [];
+    collectOfficeArtCandidates(pictureChunk, startOffset, pictureChunk.length, candidates);
+    return candidates;
+}
+function rankPictureCandidate(candidate) {
+    switch (candidate.mime) {
+        case 'image/png': return 100;
+        case 'image/jpeg': return 90;
+        case 'image/gif': return 80;
+        case 'image/bmp': return 70;
+        case 'image/tiff': return 60;
+        case 'image/svg+xml': return 50;
+        case 'image/emf': return 40;
+        case 'image/wmf': return 30;
+        case 'image/pict': return 20;
+        default: return 0;
+    }
+}
+function pickBestPictureCandidate(candidates) {
+    let best = null;
+    for (const candidate of candidates) {
+        if (!best || rankPictureCandidate(candidate) > rankPictureCandidate(best))
+            best = candidate;
+    }
+    return best;
+}
+function maybeConvertVectorCandidate(candidate) {
+    if (!/^(?:image\/emf|image\/wmf)$/i.test(candidate.mime))
+        return candidate;
+    if (!candidate.bytes.length)
+        return candidate;
+    if (candidate.meta?.metafileCompressed)
+        return candidate;
+    const converted = convertMetafileToSvg(candidate.mime, candidate.bytes);
+    if (!converted)
+        return candidate;
+    return {
+        ...candidate,
+        mime: converted.mime,
+        bytes: converted.bytes,
+        displayable: true,
+        meta: {
+            ...(candidate.meta || {}),
+            vectorConverted: true,
+            vectorSourceMime: converted.sourceMime,
+            vectorWidth: converted.width,
+            vectorHeight: converted.height,
+            vectorRecordCount: converted.recordCount,
+        },
+    };
+}
+function createImageAsset(candidate, pictureOffset, picf, linkedPath, inlineShape) {
+    const sourceUrl = candidate.sourceUrl;
+    const localExternal = sourceUrl ? isLocalExternalPath(sourceUrl) : false;
+    const meta = {
+        pictureOffset,
+        lcb: picf.lcb,
+        cbHeader: picf.cbHeader,
+        mm: picf.mm,
+        xExt: picf.xExt,
+        yExt: picf.yExt,
+        dxaGoalTwips: picf.dxaGoalTwips,
+        dyaGoalTwips: picf.dyaGoalTwips,
+        scaleXPermille: picf.scaleXPermille,
+        scaleYPermille: picf.scaleYPermille,
+        displayWidthTwips: picf.displayWidthTwips,
+        displayHeightTwips: picf.displayHeightTwips,
+        linkedPath,
+        sourceKind: candidate.kind === 'officeArt' ? 'embedded' : candidate.kind,
+        localExternal,
+        browserRenderable: candidate.displayable,
+        blipIndex: inlineShape?.blipIndex,
+        sourceShapeId: inlineShape?.shapeId,
+        ...(candidate.meta || {}),
+    };
+    return {
+        id: uniqueId('asset-img'),
+        type: 'image',
+        mime: candidate.mime,
+        bytes: candidate.bytes,
+        dataUrl: sourceUrl ? '' : dataUrlFromBytes(candidate.bytes, candidate.mime),
+        sourceUrl,
+        displayable: candidate.displayable && !localExternal,
+        meta,
+    };
+}
+/**
+ * Resolves a picture character (U+0001 + sprmCPicLocation) to an HTML-friendly asset.
+ * The happy path is: PICF -> optional linked picture name -> OfficeArtInlineSpContainer
+ * -> OfficeArtBlip*. When no structured BLIP can be found we still fall back to a
+ * signature scan so slightly malformed files remain usable.
+ */
 export function extractPictureAsset(dataStreamBytes, pictureOffset, options = {}) {
-    if (!dataStreamBytes || pictureOffset == null || pictureOffset < 0 || pictureOffset + 68 > dataStreamBytes.length)
+    if (!dataStreamBytes || pictureOffset == null || pictureOffset < 0 || pictureOffset + PICF_HEADER_SIZE > dataStreamBytes.length)
         return null;
     const reader = new BinaryReader(dataStreamBytes);
     const lcb = reader.i32(pictureOffset);
-    const cbHeader = reader.u16(pictureOffset + 4);
     const total = lcb > 0 && pictureOffset + lcb <= dataStreamBytes.length
         ? lcb
-        : Math.min(dataStreamBytes.length - pictureOffset, options.maxPictureBytes || 8 * 1024 * 1024);
+        : Math.min(dataStreamBytes.length - pictureOffset, options.maxPictureBytes || DEFAULT_MAX_PICTURE_BYTES);
     const pictureChunk = dataStreamBytes.subarray(pictureOffset, pictureOffset + total);
-    const bodyStart = Math.min(cbHeader || 68, pictureChunk.length);
+    const picf = parsePicfHeader(pictureChunk);
+    if (!picf)
+        return null;
+    let pictureDataOffset = Math.min(picf.cbHeader || PICF_HEADER_SIZE, pictureChunk.length);
+    const pictureName = readOptionalPictureName(pictureChunk, picf);
+    const linkedPath = pictureName?.value;
+    if (pictureName)
+        pictureDataOffset = pictureName.nextOffset;
+    const inlineShape = parseInlineOfficeArtShape(pictureChunk, pictureDataOffset);
+    const officeArtCandidates = findOfficeArtCandidates(pictureChunk, pictureDataOffset);
+    const officeArtCandidate = pickBestPictureCandidate(officeArtCandidates);
+    if (officeArtCandidate) {
+        return createImageAsset(maybeConvertVectorCandidate(officeArtCandidate), pictureOffset, picf, linkedPath, inlineShape);
+    }
+    if (linkedPath) {
+        const mime = detectMimeFromPath(linkedPath) || 'application/octet-stream';
+        const isLocalFileReference = isLocalExternalPath(linkedPath);
+        const linkedCandidate = {
+            mime,
+            bytes: new Uint8Array(0),
+            sourceUrl: linkedPath,
+            displayable: isBrowserDisplayableMime(mime) && !isLocalFileReference,
+            kind: 'linked',
+            meta: { linkedPath },
+        };
+        return createImageAsset(linkedCandidate, pictureOffset, picf, linkedPath, inlineShape);
+    }
+    const bodyStart = Math.min(picf.cbHeader || PICF_HEADER_SIZE, pictureChunk.length);
     const segment = detectImageSegment(pictureChunk.subarray(bodyStart));
     if (!segment) {
         return {
@@ -87,21 +588,95 @@ export function extractPictureAsset(dataStreamBytes, pictureOffset, options = {}
             mime: 'application/octet-stream',
             bytes: pictureChunk,
             dataUrl: dataUrlFromBytes(pictureChunk, 'application/octet-stream'),
-            meta: { pictureOffset, lcb, cbHeader },
+            displayable: false,
+            meta: {
+                pictureOffset,
+                lcb: picf.lcb,
+                cbHeader: picf.cbHeader,
+                mm: picf.mm,
+                xExt: picf.xExt,
+                yExt: picf.yExt,
+                dxaGoalTwips: picf.dxaGoalTwips,
+                dyaGoalTwips: picf.dyaGoalTwips,
+                scaleXPermille: picf.scaleXPermille,
+                scaleYPermille: picf.scaleYPermille,
+                displayWidthTwips: picf.displayWidthTwips,
+                displayHeightTwips: picf.displayHeightTwips,
+                sourceKind: 'fallback',
+                browserRenderable: false,
+                blipIndex: inlineShape?.blipIndex,
+                sourceShapeId: inlineShape?.shapeId,
+            },
         };
     }
     const start = bodyStart + segment.start;
     const end = Math.min(bodyStart + segment.end, pictureChunk.length);
     const imageBytes = pictureChunk.subarray(start, end);
+    const fallbackCandidate = maybeConvertVectorCandidate({
+        mime: segment.mime,
+        bytes: imageBytes,
+        displayable: isBrowserDisplayableMime(segment.mime),
+        kind: 'fallback',
+        meta: {
+            pictureOffset,
+            lcb: picf.lcb,
+            cbHeader: picf.cbHeader,
+            mm: picf.mm,
+            xExt: picf.xExt,
+            yExt: picf.yExt,
+            dxaGoalTwips: picf.dxaGoalTwips,
+            dyaGoalTwips: picf.dyaGoalTwips,
+            scaleXPermille: picf.scaleXPermille,
+            scaleYPermille: picf.scaleYPermille,
+            displayWidthTwips: picf.displayWidthTwips,
+            displayHeightTwips: picf.displayHeightTwips,
+            sourceKind: 'fallback',
+            browserRenderable: isBrowserDisplayableMime(segment.mime),
+        },
+    });
     return {
         id: uniqueId('asset-img'),
         type: 'image',
-        mime: segment.mime,
-        bytes: imageBytes,
-        dataUrl: dataUrlFromBytes(imageBytes, segment.mime),
-        meta: { pictureOffset, lcb, cbHeader },
+        mime: fallbackCandidate.mime,
+        bytes: fallbackCandidate.bytes,
+        dataUrl: dataUrlFromBytes(fallbackCandidate.bytes, fallbackCandidate.mime),
+        displayable: fallbackCandidate.displayable,
+        meta: {
+            pictureOffset,
+            lcb: picf.lcb,
+            cbHeader: picf.cbHeader,
+            mm: picf.mm,
+            xExt: picf.xExt,
+            yExt: picf.yExt,
+            dxaGoalTwips: picf.dxaGoalTwips,
+            dyaGoalTwips: picf.dyaGoalTwips,
+            scaleXPermille: picf.scaleXPermille,
+            scaleYPermille: picf.scaleYPermille,
+            displayWidthTwips: picf.displayWidthTwips,
+            displayHeightTwips: picf.displayHeightTwips,
+            sourceKind: 'fallback',
+            browserRenderable: Boolean(fallbackCandidate.displayable),
+            blipIndex: inlineShape?.blipIndex,
+            sourceShapeId: inlineShape?.shapeId,
+            ...(fallbackCandidate.meta || {}),
+        },
     };
 }
+export function extractFbseImageAsset(drawingBytes, offset, header = parseOfficeArtRecordHeader(drawingBytes, offset)) {
+    if (!header || header.recType !== OFFICEART_FBSE)
+        return null;
+    const candidate = extractEmbeddedBlipFromFbse(drawingBytes, offset, header);
+    if (!candidate)
+        return null;
+    const normalized = maybeConvertVectorCandidate(candidate);
+    return createImageAsset(normalized, -1, {
+        lcb: normalized.bytes.length,
+        cbHeader: 0,
+        mm: MM_SHAPE,
+        xExt: 0,
+        yExt: 0,
+    });
+}
 function readCString(bytes, offset) {
     let end = offset;
     while (end < bytes.length && bytes[end] !== 0)
@@ -148,14 +723,16 @@ function readObjectStorage(cfb, entry) {
         const nativeInfo = parseOle10Native(bytes);
         if (nativeInfo) {
             const name = nativeInfo.label || nativeInfo.originalPath.split(/[\\/]/).pop() || `${entry.name}.bin`;
+            const mime = detectAttachmentMime(name);
+            const attachmentMeta = { ...nativeInfo, sourceKind: 'ole10-native' };
             const attachment = {
                 id: uniqueId('asset-ole'),
                 type: 'attachment',
                 name,
-                mime: 'application/octet-stream',
+                mime,
                 bytes: nativeInfo.bytes,
-                dataUrl: dataUrlFromBytes(nativeInfo.bytes, 'application/octet-stream'),
-                meta: nativeInfo,
+                dataUrl: dataUrlFromBytes(nativeInfo.bytes, mime),
+                meta: attachmentMeta,
             };
             info.attachment = attachment;
             return info;
@@ -163,14 +740,16 @@ function readObjectStorage(cfb, entry) {
     }
     if (packageStream) {
         const bytes = cfb.getStream(packageStream) || new Uint8Array(0);
+        const name = `${slugify(entry.name)}.bin`;
+        const mime = detectAttachmentMime(name);
         const attachment = {
             id: uniqueId('asset-pkg'),
             type: 'attachment',
-            name: `${slugify(entry.name)}.bin`,
-            mime: 'application/octet-stream',
+            name,
+            mime,
             bytes,
-            dataUrl: dataUrlFromBytes(bytes, 'application/octet-stream'),
-            meta: { stream: packageStream.name },
+            dataUrl: dataUrlFromBytes(bytes, mime),
+            meta: { stream: packageStream.name, sourceKind: 'package' },
         };
         info.attachment = attachment;
     }