@file-viewer/renderer-ofd 3.0.3 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-ofd",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "private": false,
   "type": "module",
   "description": "Standalone OFD renderer plugin for File Viewer powered by DLTech21/ofd.js.",
@@ -54,7 +54,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "3.0.3",
+    "@file-viewer/core": "3.1.0",
     "jszip": "3.10.2"
   },
   "devDependencies": {
@@ -73,6 +73,7 @@
     "verify:image-placement": "node scripts/verify-image-placement.mjs",
     "verify:pageblock-render": "node scripts/verify-pageblock-render.mjs",
     "verify:render-fidelity": "node scripts/verify-render-fidelity.mjs",
-    "verify:github-177": "pnpm --filter @file-viewer/core build && pnpm exec tsc -b tsconfig.json --force && node scripts/verify-github-177.mjs"
+    "verify:github-177": "pnpm --filter @file-viewer/core build && pnpm exec tsc -b tsconfig.json --force && node scripts/verify-github-177.mjs",
+    "verify:github-266": "node scripts/verify-github-266.mjs"
   }
 }

package/vendor/dltech/ofd/ofd_parser.js

@@ -78,7 +78,10 @@ const parseXmlElement = function (element, options, order) {
         }
     }
 
-    const text = textParts.join('').trim();
+    // TextCode whitespace consumes explicitly positioned glyph slots. Trimming
+    // it moves right-aligned dates and also shifts their DeltaX indices.
+    const rawText = textParts.join('');
+    const text = xmlElementName(element) === 'ofd:TextCode' ? rawText : rawText.trim();
     if (text) {
         if (Object.keys(result).length === 0) {
             return text;
@@ -651,6 +654,7 @@ const getSignatureData = async function (zip, signature, signatureID) {
         'signedInfo': {
             'signatureID': signatureID,
             'VerifyRet': sealObj.verifyRet,
+            'VerificationStatus': sealObj.verificationStatus || 'not-verified',
             'Provider': signedInfoNode['ofd:Provider'],
             'SignatureMethod': signedInfoNode['ofd:SignatureMethod'],
             'SignatureDateTime': signedInfoNode['ofd:SignatureDateTime'],

package/vendor/dltech/ofd/ofd_render.js

@@ -470,8 +470,9 @@ export const renderTextObject = function (drawParamResObj, fontResObj, textObjec
     for (const textCodePoint of textCodePointList) {
         if (textCodePoint && !isNaN(textCodePoint.x)) {
             let text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-            text.setAttribute('x', textCodePoint.x);
-            text.setAttribute('y', textCodePoint.y);
+            text.setAttribute('x', textCodePoint.xPositions?.join(' ') || textCodePoint.x);
+            text.setAttribute('y', textCodePoint.yPositions?.join(' ') || textCodePoint.y);
+            text.setAttributeNS('http://www.w3.org/XML/1998/namespace', 'xml:space', 'preserve');
             text.textContent = textCodePoint.text;
             if (ctm) {
                 const ctms = parseCtm(ctm);
@@ -484,7 +485,7 @@ export const renderTextObject = function (drawParamResObj, fontResObj, textObjec
             const textFillColor = defaultFillColor || defaultStrokeColor || 'rgb(0, 0, 0)';
             text.setAttribute('fill', textFillColor);
             text.setAttribute('fill-opacity', defaultFillOpacity);
-            text.setAttribute('style', `font-weight: ${weight};font-size:${size}px;font-family: ${getFontFamily(fontResObj[font])};color:${textFillColor};`)
+            text.setAttribute('style', `white-space:pre;font-weight: ${weight};font-size:${size}px;font-family: ${getFontFamily(fontResObj[font])};color:${textFillColor};`)
             svg.appendChild(text);
         }
 

package/vendor/dltech/ofd/ofd_util.js

@@ -142,98 +142,54 @@ export const converterDpi = function (width) {
     return millimetersToPixel(width, Scale * 25.4);
 }
 
-export const deltaFormatter = function (delta) {
-    if (delta.indexOf("g") === -1) {
-        let floatList = [];
-        for (let f of delta.split(' ')) {
-            floatList.push(parseFloat(f));
-        }
-        return floatList;
-    } else {
-        const array = delta.split(' ');
-        let gFlag = false;
-        let gProcessing = false;
-        let gItemCount = 0;
-        let floatList = [];
-        for (const s of array) {
-            if ('g' === s) {
-                gFlag = true;
-            } else {
-                if (!s || s.trim().length == 0) {
-                    continue;
-                }
-                if (gFlag) {
-                    gItemCount = parseInt(s);
-                    gProcessing = true;
-                    gFlag = false;
-                } else if (gProcessing) {
-                    for (let j = 0; j < gItemCount; j++) {
-                        floatList.push(parseFloat(s));
-                    }
-                    gProcessing = false;
-                } else {
-                    floatList.push(parseFloat(s));
-                }
-            }
+export const deltaFormatter = function (delta, maxValues = 100000) {
+    const tokens = String(delta ?? '').trim().split(/\s+/);
+    const values = [];
+    const limit = Math.max(0, Math.min(100000, maxValues));
+    for (let i = 0; i < tokens.length && values.length < limit; i++) {
+        let count = 1;
+        if (tokens[i] === 'g') {
+            count = Number(tokens[++i]);
+            i++;
+            if (!Number.isSafeInteger(count) || count < 0) break;
         }
-        return floatList;
+        const value = Number(tokens[i]);
+        if (!tokens[i] || !Number.isFinite(value)) break;
+        count = Math.min(count, limit - values.length);
+        for (let j = 0; j < count; j++) values.push(value);
     }
+    return values;
 }
 
 export const calTextPoint = function (textCodes) {
-    let x = 0;
-    let y = 0;
-    let textCodePointList = [];
-    if (!textCodes) {
-        return textCodePointList;
-    }
-    for (let textCode of textCodes) {
-        if (!textCode) {
-            continue
-        }
-        x = parseFloat(textCode['@_X']);
-        y = parseFloat(textCode['@_Y']);
-
-        if (isNaN(x)) {
-            x = 0;
-        }
-        if (isNaN(y)) {
-            y = 0;
-        }
-
-        let deltaXList = [];
-        let deltaYList = [];
-        if (textCode['@_DeltaX'] && textCode['@_DeltaX'].length > 0) {
-            deltaXList = deltaFormatter(textCode['@_DeltaX']);
-        }
-        if (textCode['@_DeltaY'] && textCode['@_DeltaY'].length > 0) {
-            deltaYList = deltaFormatter(textCode['@_DeltaY']);
-        }
-        let textStr = textCode['#text'];
-        if (textStr) {
-            textStr += '';
-            textStr = decodeOfdText(textStr);
-            for (let i = 0; i < textStr.length; i++) {
-                if (i > 0 && deltaXList.length > 0) {
-                    x += deltaXList[(i - 1)];
-                }
-                if (i > 0 && deltaYList.length > 0) {
-                    y += deltaYList[(i - 1)];
-                }
-                let text = textStr.substring(i, i + 1);
-                let filterPointY = textCodePointList.filter((textCodePoint) => {
-                    return textCodePoint.y == converterDpi(y)
-                });
-                if (filterPointY && filterPointY.length) { // Y坐标相同，无需再创建text标签
-                    filterPointY[0].text += text;
-                } else {
-                    let textCodePoint = { 'x': converterDpi(x), 'y': converterDpi(y), 'text': text };
-                    textCodePointList.push(textCodePoint);
-                }
+    const runs = [];
+    for (const code of textCodes || []) {
+        if (code == null) continue;
+        const value = typeof code === 'string' ? code : code['#text'];
+        if (value == null || value === '') continue;
+        const text = decodeOfdText(String(value));
+        const count = Array.from(text).length;
+        const finite = value => Number.isFinite(Number.parseFloat(value)) ? Number.parseFloat(value) : 0;
+        const x = finite(code['@_X']);
+        const y = finite(code['@_Y']);
+        const positions = (start, delta) => {
+            const list = [converterDpi(start)];
+            for (const offset of deltaFormatter(delta, count - 1)) {
+                start += offset;
+                list.push(converterDpi(start));
             }
-        }
+            return list;
+        };
+        // One SVG text run per TextCode preserves shaping and avoids one DOM
+        // node per glyph. Position lists honor explicit advances (including
+        // spaces); omitted advances retain the browser's natural text advance.
+        runs.push({
+            x: converterDpi(x), y: converterDpi(y), text,
+            xPositions: positions(x, code['@_DeltaX']),
+            yPositions: positions(y, code['@_DeltaY']),
+        });
     }
-    return textCodePointList;
+    return runs;
 }
 
 export const replaceFirstSlash = function (str) {

package/vendor/dltech/ofd/ses_signature_parser.js

@@ -33,6 +33,38 @@ const HexApi = unwrapDefault(Hex);
 const Base64Api = unwrapDefault(Base64);
 const ASN1Api = unwrapDefault(ASN1);
 
+// SignedData is not an SES seal. In particular, tax invoices use the GM/T
+// ContentInfo OID and draw their visible stamp as an ordinary page resource.
+const signedDataOids = new Set(['1.2.840.113549.1.7.2', '1.2.156.10197.6.1.4.2.2']);
+const universal = (node, number) => node?.tag?.tagClass === 0 && node.tag.tagNumber === number;
+const parseSignedData = function (node) {
+    if (!universal(node?.sub?.[0], 6)) return null;
+    const oidNode = node.sub[0];
+    const start = oidNode.stream.pos + oidNode.header;
+    const oid = oidNode.stream.parseOID(start, start + oidNode.length).split('\n', 1)[0];
+    if (!signedDataOids.has(oid)) throw new Error('Unsupported signature ContentInfo type');
+    const wrapper = node.sub[1];
+    const signed = wrapper?.sub?.[0];
+    if (!universal(node, 16) || node.sub.length !== 2 ||
+        wrapper?.tag?.tagClass !== 2 || wrapper.tag.tagNumber !== 0 ||
+        !wrapper.tag.tagConstructed || wrapper.sub.length !== 1 ||
+        !universal(signed, 16) || signed.sub.length < 4 ||
+        !universal(signed.sub[0], 2) || !universal(signed.sub[1], 17) ||
+        !universal(signed.sub[2], 16) || !universal(signed.sub[2]?.sub?.[0], 6) ||
+        !universal(signed.sub.at(-1), 17)) {
+        throw new Error('Malformed SignedData structure');
+    }
+    return {
+        type: 'signed-data',
+        verificationStatus: 'not-verified',
+        verifyRet: null,
+        SES_Signature: {
+            format: 'signed-data', contentType: oid, displayOnly: true,
+            verificationStatus: 'not-verified',
+        },
+    };
+};
+
 export const parseSesSignature = async function (zip, name, getEntry) {
     const entry = typeof getEntry === 'function' ? getEntry(zip, name) : zip.files[name];
     if (!entry) {
@@ -60,7 +92,10 @@ const decodeText = function (val) {
 const decode = function (der, offset) {
     offset = offset || 0;
     try {
-        const SES_Signature = decodeSES_Signature(der, offset);
+        const root = ASN1Api.decode(der, offset);
+        const signedData = parseSignedData(root);
+        if (signedData) return signedData;
+        const SES_Signature = decodeSES_Signature(root);
         const picture = SES_Signature?.toSign?.eseal?.esealInfo?.picture;
         if (!picture?.data?.byte?.length) {
             return {};
@@ -73,12 +108,15 @@ const decode = function (der, offset) {
             SES_Signature: {
                 realVersion: SES_Signature.realVersion,
                 displayOnly: true,
+                verificationStatus: 'not-verified',
                 pictureType: type,
                 pictureWidth: picture.width,
                 pictureHeight: picture.height,
                 sealName: SES_Signature.toSign?.eseal?.esealInfo?.property?.name,
             },
-            verifyRet: true,
+            // Displaying an image is not cryptographic signature verification.
+            verifyRet: null,
+            verificationStatus: 'not-verified',
         };
     } catch (e) {
         console.warn('[ofd] decode SES signature failed', e);
@@ -122,9 +160,7 @@ const parseTimeNode = function (node, utc) {
     return decodeUTCTime(raw);
 };
 
-const decodeSES_Signature = function (der, offset) {
-    offset = offset || 0;
-    const asn1 = ASN1Api.decode(der, offset);
+const decodeSES_Signature = function (asn1) {
     let SES_Signature;
     try {
         // V1