exiftool-vendored 36.0.0 → 37.0.0

package/dist/InvalidUtf8Xml.spec.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const ExifTool_1 = require("./ExifTool");
+const _chai_spec_1 = require("./_chai.spec");
+const InvalidMarker = "{{INVALID_UTF8}}";
+const InvalidByte = 0xdc;
+function withInvalidUtf8(template) {
+    const parts = template.split(InvalidMarker);
+    const chunks = [];
+    parts.forEach((part, index) => {
+        chunks.push(Buffer.from(part));
+        if (index < parts.length - 1)
+            chunks.push(Buffer.from([InvalidByte]));
+    });
+    return Buffer.concat(chunks);
+}
+function expectedBytes(before, after) {
+    return Uint8Array.from([
+        ...Buffer.from(before),
+        InvalidByte,
+        ...Buffer.from(after),
+    ]);
+}
+async function writeMalformedXml(template) {
+    const filename = (0, _chai_spec_1.tmpname)("malformed-utf8-") + ".xml";
+    await (0, promises_1.writeFile)(filename, withInvalidUtf8(template));
+    return filename;
+}
+async function writeMalformedXmpJpeg() {
+    const source = await (0, promises_1.readFile)((0, node_path_1.join)(_chai_spec_1.testDir, "with_faces.jpg"));
+    const needle = Buffer.from("<mwg-rs:Name>Alice Smith</mwg-rs:Name>");
+    const offset = source.indexOf(needle);
+    (0, _chai_spec_1.expect)(offset).to.be.greaterThan(-1);
+    const result = Buffer.from(source);
+    const damagedByte = offset + Buffer.byteLength("<mwg-rs:Name>A");
+    (0, _chai_spec_1.expect)(result[damagedByte]).to.equal("l".charCodeAt(0));
+    result[damagedByte] = InvalidByte;
+    const filename = (0, _chai_spec_1.tmpname)("malformed-utf8-struct-") + ".jpg";
+    await (0, promises_1.writeFile)(filename, result);
+    return filename;
+}
+async function writeXmpWithEmbeddedXmlPacket() {
+    const packet = withInvalidUtf8(`<x:xmpmeta xmlns:x="adobe:ns:meta/">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/">
+      <dc:description>packet A${InvalidMarker}ice</dc:description>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>`);
+    const outer = `<x:xmpmeta xmlns:x="adobe:ns:meta/">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description
+      xmlns:ast="http://ns.nikon.com/asteroid/1.0/"
+      ast:XMLPackets="${packet.toString("base64")}"/>
+  </rdf:RDF>
+</x:xmpmeta>`;
+    const filename = (0, _chai_spec_1.tmpname)("malformed-utf8-packet-") + ".xmp";
+    await (0, promises_1.writeFile)(filename, outer);
+    return { filename, packet };
+}
+describe("malformed UTF-8 in XML and nested structures", () => {
+    let exiftool;
+    before(() => (exiftool = new ExifTool_1.ExifTool()));
+    after(() => (0, _chai_spec_1.end)(exiftool));
+    const genericXml = `<?xml version="1.0" encoding="UTF-8"?>
+<root attribute="attribute A${InvalidMarker}ice">
+  <nested>
+    <name>text &amp; A${InvalidMarker}ice</name>
+    <document><![CDATA[<doc>opaque A${InvalidMarker}ice</doc>]]></document>
+  </nested>
+</root>`;
+    const expectedGenericValue = {
+        Attribute: "attribute A�ice",
+        Nested: {
+            Document: "<doc>opaque A�ice</doc>",
+            Name: "text & A�ice",
+        },
+    };
+    const expectedGenericBytes = {
+        Attribute: expectedBytes("attribute A", "ice"),
+        Nested: {
+            Document: expectedBytes("<doc>opaque A", "ice</doc>"),
+            Name: expectedBytes("text & A", "ice"),
+        },
+    };
+    it("captures nested generic XML values through read()", async () => {
+        const filename = await writeMalformedXml(genericXml);
+        const tags = await exiftool.read(filename, { struct: 1 });
+        (0, _chai_spec_1.expect)(tags.Root).to.deep.equal(expectedGenericValue);
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.Root).to.deep.equal(expectedGenericBytes);
+    });
+    it("captures nested generic XML values through readRaw()", async () => {
+        const filename = await writeMalformedXml(genericXml);
+        const tags = await exiftool.readRaw(filename, { readArgs: ["-struct"] });
+        (0, _chai_spec_1.expect)(tags.Root).to.deep.equal(expectedGenericValue);
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.Root).to.deep.equal(expectedGenericBytes);
+    });
+    for (const struct of [0, 1, 2]) {
+        it(`mirrors embedded XMP paths with struct=${struct}`, async () => {
+            const filename = await writeMalformedXmpJpeg();
+            const tags = await exiftool.read(filename, { struct });
+            const rawName = expectedBytes("A", "ice Smith");
+            if (struct !== 1) {
+                (0, _chai_spec_1.expect)(tags.RegionName).to.deep.equal([
+                    "A�ice Smith",
+                    "Bob Jones",
+                ]);
+                (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.RegionName).to.deep.equal({
+                    0: rawName,
+                });
+            }
+            if (struct !== 0) {
+                (0, _chai_spec_1.expect)(tags.RegionInfo.RegionList[0].Name).to.equal("A�ice Smith");
+                (0, _chai_spec_1.expect)((tags.invalidUtf8Bytes?.RegionInfo).RegionList[0].Name).to.deep.equal(rawName);
+            }
+        });
+    }
+    it("parses embedded binary XML while preserving its binary value", async () => {
+        const { filename, packet } = await writeXmpWithEmbeddedXmlPacket();
+        const tags = await exiftool.readRaw(filename, {
+            readArgs: ["-G1", "-struct", "-XMLPackets", "-Description"],
+        });
+        (0, _chai_spec_1.expect)(tags["XMP-ast:XMLPackets"]).to.match(/^\(Binary data \d+ bytes, use -b option to extract\)$/);
+        (0, _chai_spec_1.expect)(tags["XMP-dc:Description"]).to.equal("packet A�ice");
+        const descriptionBytes = expectedBytes("packet A", "ice");
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.deep.equal({
+            "MWG:Description": descriptionBytes,
+            "XMP-dc:Description": descriptionBytes,
+        });
+        const extracted = await exiftool.readRaw(filename, {
+            readArgs: ["-G1", "-b", "-XMLPackets"],
+        });
+        (0, _chai_spec_1.expect)(extracted["XMP-ast:XMLPackets"]).to.equal(packet.toString("base64"));
+        (0, _chai_spec_1.expect)(extracted.invalidUtf8Bytes).to.equal(undefined);
+    });
+    it("cannot capture malformed XML element or attribute-name bytes", async () => {
+        const filename = await writeMalformedXml(`<?xml version="1.0"?>
+<root at${InvalidMarker}tribute="attribute value">
+  <na${InvalidMarker}me>element value</na${InvalidMarker}me>
+  <ok>fine</ok>
+</root>`);
+        const tags = await exiftool.readRaw(filename, { readArgs: ["-struct"] });
+        // Value filters never receive names, and ExifTool's JSON writer renders
+        // these malformed generic-XML name bytes as "?". A separate non-JSON
+        // extraction path would be needed to preserve the original names.
+        (0, _chai_spec_1.expect)(tags.Root).to.deep.equal({
+            "At?tribute": "attribute value",
+            "Na?me": "element value",
+            Ok: "fine",
+        });
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.equal(undefined);
+    });
+});
+//# sourceMappingURL=InvalidUtf8Xml.spec.js.map

package/dist/InvalidUtf8Xml.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InvalidUtf8Xml.spec.js","sourceRoot":"","sources":["../src/InvalidUtf8Xml.spec.ts"],"names":[],"mappings":"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"}

package/dist/JSON.d.ts

@@ -9,5 +9,6 @@ export type Literal = string | number | boolean | bigint | null;
  * - {@link ExifDateTime} is revived using {@link ExifDateTime.fromJSON}
  * - {@link ExifDate} is revived using {@link ExifDate.fromJSON}
  * - {@link ExifTime} is revived using {@link ExifTime.fromJSON}
+ * - `invalidUtf8Bytes` sidecars are revived as nested `Uint8Array` values
  */
 export declare function parseJSON(s: string): any;

package/dist/JSON.js

@@ -5,6 +5,7 @@ const BinaryField_1 = require("./BinaryField");
 const ExifDate_1 = require("./ExifDate");
 const ExifDateTime_1 = require("./ExifDateTime");
 const ExifTime_1 = require("./ExifTime");
+const InvalidUtf8Bytes_1 = require("./InvalidUtf8Bytes");
 const Revivers = {
     BinaryField: (ea) => BinaryField_1.BinaryField.fromJSON(ea),
     ExifDateTime: (ea) => ExifDateTime_1.ExifDateTime.fromJSON(ea),
@@ -18,15 +19,19 @@ const Revivers = {
  * - {@link ExifDateTime} is revived using {@link ExifDateTime.fromJSON}
  * - {@link ExifDate} is revived using {@link ExifDate.fromJSON}
  * - {@link ExifTime} is revived using {@link ExifTime.fromJSON}
+ * - `invalidUtf8Bytes` sidecars are revived as nested `Uint8Array` values
  */
 function parseJSON(s) {
-    return JSON.parse(s, (_key, value) => {
+    return JSON.parse(s, (key, value) => {
         if (typeof value === "object" &&
             value !== null &&
             "_ctor" in value &&
             typeof value._ctor === "string") {
             return Revivers[value._ctor]?.(value) ?? value;
         }
+        if (key === "invalidUtf8Bytes") {
+            return (0, InvalidUtf8Bytes_1.reviveInvalidUtf8Bytes)(value);
+        }
         return value;
     });
 }

package/dist/JSON.js.map

@@ -1 +1 @@
-{"version":3,"file":"JSON.js","sourceRoot":"","sources":["../src/JSON.ts"],"names":[],"mappings":";;AAoCA,8BAYC;AAhDD,+CAA4C;AAC5C,yCAAsC;AACtC,iDAA8C;AAC9C,yCAAsC;AAetC,MAAM,QAAQ,GAAmD;IAC/D,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAClB,yBAAW,CAAC,QAAQ,CAAC,EAAkD,CAAC;IAC1E,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,CACnB,2BAAY,CAAC,QAAQ,CAAC,EAAmD,CAAC;IAC5E,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;IACpE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;CACrE,CAAC;AACF;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,KAAW,EAAE,EAAE;QACzC,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,OAAO,IAAI,KAAK;YAChB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAC/B,CAAC;YACD,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAmB,CAAC,IAAI,KAAK,CAAC;QAC/D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"JSON.js","sourceRoot":"","sources":["../src/JSON.ts"],"names":[],"mappings":";;AAsCA,8BAeC;AArDD,+CAA4C;AAC5C,yCAAsC;AACtC,iDAA8C;AAC9C,yCAAsC;AACtC,yDAA4D;AAe5D,MAAM,QAAQ,GAAmD;IAC/D,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAClB,yBAAW,CAAC,QAAQ,CAAC,EAAkD,CAAC;IAC1E,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,CACnB,2BAAY,CAAC,QAAQ,CAAC,EAAmD,CAAC;IAC5E,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;IACpE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;CACrE,CAAC;AACF;;;;;;;;GAQG;AACH,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,KAAW,EAAE,EAAE;QACxC,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,OAAO,IAAI,KAAK;YAChB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAC/B,CAAC;YACD,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAmB,CAAC,IAAI,KAAK,CAAC;QAC/D,CAAC;QACD,IAAI,GAAG,KAAK,kBAAkB,EAAE,CAAC;YAC/B,OAAO,IAAA,yCAAsB,EAAC,KAAK,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/RawTags.d.ts

@@ -1,8 +1,15 @@
 import { ErrorsAndWarnings } from "./ErrorsAndWarnings";
+import { InvalidUtf8Bytes } from "./InvalidUtf8Bytes";
 import { Json } from "./JSON";
 /**
- * Loosely typed raw result from ExifTool
+ * Loosely typed raw result from ExifTool.
+ *
+ * `readRaw()` skips the rich parsing that `read()` performs, so this omits the
+ * timezone fields (`tz`, `zone`, ...) from {@link ExifToolVendoredTags}: only
+ * `errors`, `warnings`, and `invalidUtf8Bytes` are ever set here.
  *
  * @see https://github.com/photostructure/exiftool-vendored.js/issues/138
  */
-export type RawTags = Record<string, Json> & ErrorsAndWarnings;
+export type RawTags = Record<string, Json | InvalidUtf8Bytes> & ErrorsAndWarnings & {
+    invalidUtf8Bytes?: InvalidUtf8Bytes;
+};

package/dist/ReadRawTask.d.ts

@@ -8,6 +8,7 @@ export declare const DefaultReadRawTaskOptions: {
 };
 export type ReadRawTaskOptions = Partial<typeof DefaultReadRawTaskOptions>;
 export declare class ReadRawTask extends ExifToolTask<RawTags> {
+    #private;
     readonly sourceFile: string;
     readonly args: string[];
     static for(filename: string, options?: ReadRawTaskOptions): ReadRawTask;

package/dist/ReadRawTask.js

@@ -40,7 +40,9 @@ const DefaultExifToolOptions_1 = require("./DefaultExifToolOptions");
 const ErrorsAndWarnings_1 = require("./ErrorsAndWarnings");
 const ExifToolTask_1 = require("./ExifToolTask");
 const FilenameCharsetArgs_1 = require("./FilenameCharsetArgs");
+const InvalidUtf8Bytes_1 = require("./InvalidUtf8Bytes");
 const Pick_1 = require("./Pick");
+const Utf8JsonFilter_1 = require("./Utf8JsonFilter");
 exports.ReadRawTaskOptionFields = [
     "readArgs",
     "ignoreMinorErrors",
@@ -52,10 +54,13 @@ exports.DefaultReadRawTaskOptions = {
 class ReadRawTask extends ExifToolTask_1.ExifToolTask {
     sourceFile;
     args;
+    #unwrapInvalidUtf8;
     static for(filename, options) {
+        const readArgs = options?.readArgs ?? [];
         const args = [
             ...FilenameCharsetArgs_1.Utf8FilenameCharsetArgs,
-            ...(options?.readArgs ?? []),
+            ...readArgs,
+            ...(0, Utf8JsonFilter_1.utf8JsonFilterArgs)(readArgs),
         ];
         const opts = { ...exports.DefaultReadRawTaskOptions, ...options };
         if (!args.includes("-json"))
@@ -71,16 +76,24 @@ class ReadRawTask extends ExifToolTask_1.ExifToolTask {
         super(args, options);
         this.sourceFile = sourceFile;
         this.args = args;
+        this.#unwrapInvalidUtf8 = (0, Utf8JsonFilter_1.hasBuiltInUtf8Filter)(args);
     }
     toString() {
         return "ReadRawTask(" + this.sourceFile + ")";
     }
     parse(data, err) {
         try {
-            const tags = JSON.parse(data)[0];
-            const { errors, warnings } = (0, ErrorsAndWarnings_1.errorsAndWarnings)(this, tags);
+            const parsed = JSON.parse(data)[0];
+            const decoded = this.#unwrapInvalidUtf8
+                ? (0, InvalidUtf8Bytes_1.unwrapInvalidUtf8Tags)(parsed)
+                : { tags: parsed };
+            const tags = decoded.tags;
+            const { errors, warnings } = (0, ErrorsAndWarnings_1.errorsAndWarnings)(this, decoded.tags);
             tags.errors = errors;
             tags.warnings = warnings;
+            if (decoded.invalidUtf8Bytes != null) {
+                tags.invalidUtf8Bytes = decoded.invalidUtf8Bytes;
+            }
             return tags;
         }
         catch (jsonError) {

package/dist/ReadRawTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadRawTask.js","sourceRoot":"","sources":["../src/ReadRawTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAuC;AACvC,iDAAmC;AACnC,qEAAkE;AAClE,2DAAwD;AAExD,iDAA8C;AAC9C,+DAAgE;AAChE,iCAA8B;AAGjB,QAAA,uBAAuB,GAAG;IACrC,UAAU;IACV,mBAAmB;IACnB,QAAQ;CACoC,CAAC;AAElC,QAAA,yBAAyB,GAAG;IACvC,GAAG,IAAA,WAAI,EAAC,+CAAsB,EAAE,GAAG,+BAAuB,CAAC;CAChB,CAAC;AAI9C,MAAa,WAAY,SAAQ,2BAAqB;IAkBzC;IACS;IAlBpB,MAAM,CAAC,GAAG,CAAC,QAAgB,EAAE,OAA4B;QACvD,MAAM,IAAI,GAAa;YACrB,GAAG,6CAAuB;YAC1B,GAAG,CAAC,OAAO,EAAE,QAAQ,IAAI,EAAE,CAAC;SAC7B,CAAC;QACF,MAAM,IAAI,GAAG,EAAE,GAAG,iCAAyB,EAAE,GAAG,OAAO,EAAE,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,OAAO,IAAI,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,YACW,UAAkB,EACT,IAAc,EAChC,OAAqC;QAErC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAJZ,eAAU,GAAV,UAAU,CAAQ;QACT,SAAI,GAAJ,IAAI,CAAU;IAIlC,CAAC;IAEQ,QAAQ;QACf,OAAO,cAAc,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IAChD,CAAC;IAES,KAAK,CAAC,IAAY,EAAE,GAAW;QACvC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,qCAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,SAAS,EAAE,CAAC;YACnB,IAAA,sBAAM,GAAE,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,MAAM,GAAG,IAAI,SAAS,CAAC;QACzB,CAAC;IACH,CAAC;CACF;AAzCD,kCAyCC"}
+{"version":3,"file":"ReadRawTask.js","sourceRoot":"","sources":["../src/ReadRawTask.ts"],"names":[],"mappings":"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"}

package/dist/ReadRawTask.spec.js

@@ -6,9 +6,200 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const ExifTool_1 = require("./ExifTool");
+const InvalidUtf8Bytes_1 = require("./InvalidUtf8Bytes");
 const _chai_spec_1 = require("./_chai.spec");
 after(() => (0, _chai_spec_1.end)(ExifTool_1.exiftool));
 describe("ReadRawTask", () => {
+    describe("malformed UTF-8", () => {
+        const malformedUtf8File = node_path_1.default.join(_chai_spec_1.testDir, "malformed-utf8.jpg");
+        const binaryListFile = node_path_1.default.join(_chai_spec_1.testDir, "malformed-utf8.lfp");
+        const binaryCollisionFile = node_path_1.default.join(_chai_spec_1.testDir, "malformed-utf8-collision.mie");
+        const customFilter = 'Image::ExifTool::XMP::FixUTF8(\\$_,"X")';
+        function withoutInvalidUtf8Bytes(value) {
+            const { invalidUtf8Bytes: _, ...rest } = value;
+            return rest;
+        }
+        function legacyUtf8Replacement(value) {
+            if (typeof value === "string")
+                return value.replaceAll("\uFFFD", "?");
+            if (Array.isArray(value))
+                return value.map(legacyUtf8Replacement);
+            if (value != null && typeof value === "object") {
+                return Object.fromEntries(Object.entries(value).map(([key, child]) => [
+                    key,
+                    legacyUtf8Replacement(child),
+                ]));
+            }
+            return value;
+        }
+        it("marks malformed scalar and list values without changing valid text", async () => {
+            const tags = await ExifTool_1.exiftool.readRaw(malformedUtf8File);
+            (0, _chai_spec_1.expect)(tags).to.containSubset({
+                City: "\uFFFDK",
+                Title: "Authored? 世界",
+                Subject: ["Valid? item", "damaged:\uFFFDtail"],
+                UserComment: "SKEYս",
+            });
+            (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.City).to.deep.equal(new Uint8Array([0xdc, 0x4b]));
+            (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.Subject).to.deep.equal({
+                1: new Uint8Array([
+                    0x64, 0x61, 0x6d, 0x61, 0x67, 0x65, 0x64, 0x3a, 0xdc, 0x74, 0x61,
+                    0x69, 0x6c,
+                ]),
+            });
+            (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.UserComment).to.deep.equal(new Uint8Array([
+                0x53, 0x4b, 0x45, 0x59, 0x00, 0x00, 0x00, 0x00, 0xd5, 0x00, 0xbd,
+            ]));
+        });
+        it("mirrors JSON NUL removal before deciding which bytes are malformed", async () => {
+            const readArgs = ["-G1", "-UserComment"];
+            const marked = await ExifTool_1.exiftool.readRaw(malformedUtf8File, { readArgs });
+            const legacy = await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                readArgs: [...readArgs, "-api", "Filter=1"],
+            });
+            // The stored bytes d5 00 bd become valid UTF-8 (U+057D) when JSON removes
+            // NUL. Repairing before that deletion would incorrectly produce two U+FFFDs.
+            (0, _chai_spec_1.expect)(marked).to.containSubset({ "ExifIFD:UserComment": "SKEYս" });
+            (0, _chai_spec_1.expect)(marked.invalidUtf8Bytes).to.deep.equal({
+                "ExifIFD:UserComment": new Uint8Array([
+                    0x53, 0x4b, 0x45, 0x59, 0x00, 0x00, 0x00, 0x00, 0xd5, 0x00, 0xbd,
+                ]),
+            });
+            (0, _chai_spec_1.expect)(withoutInvalidUtf8Bytes(marked)).to.deep.equal(legacy);
+        });
+        it("otherwise differs from legacy JSON only by ? to U+FFFD repair", async () => {
+            for (const [file, readArgs] of [
+                [malformedUtf8File, ["-City", "-Title", "-Subject", "-UserComment"]],
+                [binaryListFile, ["-G1", "-JSONMetadata", "-Foo"]],
+                [binaryCollisionFile, ["-G1", "-City", "-RelatedAudioFile"]],
+            ]) {
+                const marked = await ExifTool_1.exiftool.readRaw(file, {
+                    readArgs: [...readArgs],
+                });
+                const legacy = await ExifTool_1.exiftool.readRaw(file, {
+                    readArgs: [...readArgs, "-api", "Filter=1"],
+                });
+                (0, _chai_spec_1.expect)(legacyUtf8Replacement(withoutInvalidUtf8Bytes(marked))).to.deep.equal(legacy);
+            }
+        });
+        it("keeps the marker when per-call readArgs replace the defaults", async () => {
+            (0, _chai_spec_1.expect)(await ExifTool_1.exiftool.readRaw(malformedUtf8File, { readArgs: [] })).to.containSubset({
+                City: "\uFFFDK",
+                Subject: ["Valid? item", "damaged:\uFFFDtail"],
+            });
+        });
+        for (const { api, filter } of [
+            { api: "-api", filter: `Filter=${customFilter}` },
+            { api: "-API", filter: `filter=${customFilter}` },
+            { api: "-api", filter: `FILTER^=${customFilter}` },
+        ]) {
+            it(`leaves UTF-8 repair to ${api} ${filter.split("=")[0]}=`, async () => {
+                const tags = await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                    readArgs: [api, filter],
+                });
+                (0, _chai_spec_1.expect)(tags).to.containSubset({
+                    City: "XK",
+                    Subject: ["Valid? item", "damaged:Xtail"],
+                });
+                (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.equal(undefined);
+            });
+        }
+        for (const bareFilter of ["Filter", "Filter^"]) {
+            it(`treats a bare ${bareFilter} as a custom no-op Filter`, async () => {
+                // Ground truth:
+                // exiftool -j -City -api 'Filter[^]' test/malformed-utf8.jpg
+                const tags = await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                    readArgs: ["-City", "-api", bareFilter],
+                });
+                (0, _chai_spec_1.expect)(tags.City).to.equal("?K");
+                (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.equal(undefined);
+            });
+        }
+        it("does not decode marker-shaped output owned by a custom Filter", async () => {
+            const markerValue = {
+                [InvalidUtf8Bytes_1.InvalidUtf8Marker]: {
+                    replacement: "s:forged",
+                    rawBase64: "b64:3Es=",
+                },
+            };
+            const markerFilter = String.raw `Filter=$_={"${InvalidUtf8Bytes_1.InvalidUtf8Marker}"=>{replacement=>"s:forged",rawBase64=>"b64:3Es="}} if $_ eq "\xdcK"`;
+            const tags = await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                readArgs: ["-City", "-api", markerFilter],
+            });
+            (0, _chai_spec_1.expect)(tags.City).to.deep.equal(markerValue);
+            (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.equal(undefined);
+        });
+        it("does not let a custom Filter leak into the next stay-open command", async () => {
+            (0, _chai_spec_1.expect)(await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                readArgs: ["-api", `Filter=${customFilter}`],
+            })).to.containSubset({ City: "XK" });
+            (0, _chai_spec_1.expect)(await ExifTool_1.exiftool.readRaw(malformedUtf8File, { readArgs: [] })).to.containSubset({ City: "\uFFFDK" });
+        });
+        for (const emptyFilter of ["Filter=", "Filter^="]) {
+            it(`does not treat ${emptyFilter} as a custom Filter`, async () => {
+                (0, _chai_spec_1.expect)(await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                    readArgs: ["-api", emptyFilter],
+                })).to.containSubset({ City: "\uFFFDK" });
+            });
+        }
+        for (const clearedFilter of ["Filter=", "Filter^="]) {
+            it(`honors a final ${clearedFilter} after a custom Filter`, async () => {
+                // ExifTool API options are last-assignment-wins. Verified with:
+                // exiftool -j -api 'Filter=..."X"' -api 'Filter=' malformed-utf8.jpg
+                (0, _chai_spec_1.expect)(await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                    readArgs: ["-api", `Filter=${customFilter}`, "-api", clearedFilter],
+                })).to.containSubset({ City: "\uFFFDK" });
+            });
+        }
+        it("honors a final custom Filter after an empty Filter", async () => {
+            (0, _chai_spec_1.expect)(await ExifTool_1.exiftool.readRaw(malformedUtf8File, {
+                readArgs: ["-api", "Filter=", "-api", `Filter=${customFilter}`],
+            })).to.containSubset({ City: "XK" });
+        });
+        it("does not alter malformed binary list items", async () => {
+            // The synthetic LFP contains two 13-byte JSONMetadata binary items.
+            // Ground truth without a Filter:
+            // exiftool -j -G1 -struct test/malformed-utf8.lfp
+            const tags = await ExifTool_1.exiftool.readRaw(binaryListFile, {
+                readArgs: ["-G1", "-JSONMetadata", "-Foo"],
+            });
+            (0, _chai_spec_1.expect)(tags).to.containSubset({
+                "Lytro:JSONMetadata": [
+                    "(Binary data 13 bytes, use -b option to extract)",
+                    "(Binary data 13 bytes, use -b option to extract)",
+                ],
+                "Lytro:Foo": "\uFFFDL",
+            });
+            (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.deep.equal({
+                "Lytro:Foo": new Uint8Array([0xdd, 0x4c]),
+            });
+        });
+        it("repairs text that has the same bytes as an unrelated binary tag", async () => {
+            // Both tags contain dc 4b. Ground truth:
+            // exiftool -b -MIE-Geo:City malformed-utf8-collision.mie | od -An -tx1
+            // exiftool -b -MIE-Audio:RelatedAudioFile ... | od -An -tx1
+            const tags = await ExifTool_1.exiftool.readRaw(binaryCollisionFile, {
+                readArgs: ["-G1", "-City", "-RelatedAudioFile"],
+            });
+            (0, _chai_spec_1.expect)(tags).to.containSubset({
+                "MIE-Geo:City": "\uFFFDK",
+                "MIE-Audio:RelatedAudioFile": "(Binary data 2 bytes, use -b option to extract)",
+            });
+            (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.deep.equal({
+                "MIE-Geo:City": new Uint8Array([0xdc, 0x4b]),
+            });
+        });
+        it("preserves malformed binary output", async () => {
+            const tags = await ExifTool_1.exiftool.readRaw(binaryCollisionFile, {
+                readArgs: ["-G1", "-b", "-RelatedAudioFile"],
+            });
+            (0, _chai_spec_1.expect)(tags).to.containSubset({
+                // base64 for the original bytes dc 4b
+                "MIE-Audio:RelatedAudioFile": "base64:3Es=",
+            });
+            (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.equal(undefined);
+        });
+    });
     describe("non-alphanumeric filenames", () => {
         for (const { str, desc } of _chai_spec_1.NonAlphaStrings) {
             it("reads with " + desc, async () => {

package/dist/ReadRawTask.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadRawTask.spec.js","sourceRoot":"","sources":["../src/ReadRawTask.spec.ts"],"names":[],"mappings":";;;;;AAAA,+CAA4C;AAC5C,0DAA6B;AAC7B,yCAAsC;AACtC,6CAQsB;AAEtB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAA,gBAAG,EAAC,mBAAQ,CAAC,CAAC,CAAC;AAE3B,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,4BAAe,EAAE,CAAC;YAC5C,EAAE,CAAC,aAAa,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE;gBAClC,IAAA,mBAAM,EAAC,mBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,GAAG,GAAG,MAAM,CAAC;gBAC9B,MAAM,IAAI,GAAG,mBAAI,CAAC,IAAI,CAAC,IAAA,mBAAM,GAAE,EAAE,QAAQ,CAAC,CAAC;gBAC3C,MAAM,IAAA,mBAAM,EAAC,IAAA,mBAAM,GAAE,CAAC,CAAC;gBACvB,MAAM,IAAA,mBAAQ,EAAC,mBAAI,CAAC,IAAI,CAAC,oBAAO,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;gBACvD,MAAM,CAAC,GAAG,MAAM,mBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACvC,IAAA,mBAAM,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC;oBACzB,QAAQ,EAAE,YAAY;oBACtB,QAAQ;oBACR,gBAAgB,EAAE,yBAAyB;oBAC3C,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,eAAe;oBACtB,gBAAgB,EAAE,mCAAmC;oBACrD,cAAc,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC;oBAC7C,KAAK,EAAE,+BAAkB;iBAC1B,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,6DAA6D;IAC7D,qEAAqE;IACrE,uBAAuB;IACvB,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC5C,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACxE,OAAO,IAAA,mBAAM,EACX,mBAAQ,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAC9D,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,OAAO,IAAA,mBAAM,EACX,mBAAQ,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAC/C,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ReadRawTask.spec.js","sourceRoot":"","sources":["../src/ReadRawTask.spec.ts"],"names":[],"mappings":"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"}

package/dist/ReadTask.js

@@ -50,6 +50,7 @@ const ExifToolTask_1 = require("./ExifToolTask");
 const File_1 = require("./File");
 const FilenameCharsetArgs_1 = require("./FilenameCharsetArgs");
 const GPS_1 = require("./GPS");
+const InvalidUtf8Bytes_1 = require("./InvalidUtf8Bytes");
 const Lazy_1 = require("./Lazy");
 const Number_1 = require("./Number");
 const Object_1 = require("./Object");
@@ -58,6 +59,7 @@ const Pick_1 = require("./Pick");
 const String_1 = require("./String");
 const TagNameValidation_1 = require("./TagNameValidation");
 const Timezones_1 = require("./Timezones");
+const Utf8JsonFilter_1 = require("./Utf8JsonFilter");
 /**
  * tag names we don't need to muck with, but name conventions (like including
  * "date") suggest they might be date/time tags
@@ -104,6 +106,8 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
     degroup;
     #raw = {};
     #rawDegrouped = {};
+    #invalidUtf8Bytes;
+    #unwrapInvalidUtf8;
     #tags = {};
     /**
      * @param sourceFile the file to read
@@ -116,6 +120,7 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
         this.sourceFile = sourceFile;
         this.args = args;
         this.options = options;
+        this.#unwrapInvalidUtf8 = (0, Utf8JsonFilter_1.hasBuiltInUtf8Filter)(args);
         // See https://github.com/photostructure/exiftool-vendored.js/issues/147#issuecomment-1642580118
         this.degroup = this.args.includes("-G");
         this.#tags = { SourceFile: sourceFile };
@@ -127,10 +132,12 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
             ...options,
         });
         const sourceFile = _path.resolve(filename);
+        const readArgs = (0, Array_1.toArray)(opts.readArgs);
         const args = [
             ...FilenameCharsetArgs_1.Utf8FilenameCharsetArgs,
             "-json",
-            ...(0, Array_1.toArray)(opts.readArgs),
+            ...readArgs,
+            ...(0, Utf8JsonFilter_1.utf8JsonFilterArgs)(readArgs),
         ];
         // "-api struct=undef" doesn't work: but it's the same as struct=0:
         args.push("-api", "struct=" + ((0, Number_1.isNumber)(opts.struct) ? opts.struct : "0"));
@@ -171,7 +178,12 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
         try {
             // Fix ExifToolVersion to be a string to preserve version distinctions like 12.3 vs 12.30
             const versionFixedData = data.replace(/"ExifToolVersion"\s*:\s*(\d+(?:\.\d+)?)/, '"ExifToolVersion":"$1"');
-            this.#raw = JSON.parse(versionFixedData)[0];
+            const parsed = JSON.parse(versionFixedData)[0];
+            const decoded = this.#unwrapInvalidUtf8
+                ? (0, InvalidUtf8Bytes_1.unwrapInvalidUtf8Tags)(parsed)
+                : { tags: parsed };
+            this.#raw = decoded.tags;
+            this.#invalidUtf8Bytes = decoded.invalidUtf8Bytes;
         }
         catch (jsonError) {
             // TODO: should restart exiftool?
@@ -243,6 +255,16 @@ class ReadTask extends ExifToolTask_1.ExifToolTask {
         const { errors, warnings } = (0, ErrorsAndWarnings_1.errorsAndWarnings)(this, tags);
         tags.errors = errors;
         tags.warnings = warnings;
+        if (this.#invalidUtf8Bytes != null) {
+            for (const key of Object.keys(this.#invalidUtf8Bytes)) {
+                if (!Object.hasOwn(tags, key)) {
+                    Reflect.deleteProperty(this.#invalidUtf8Bytes, key);
+                }
+            }
+            if (Object.keys(this.#invalidUtf8Bytes).length > 0) {
+                tags.invalidUtf8Bytes = this.#invalidUtf8Bytes;
+            }
+        }
         return tags;
     }
     #extractGpsMetadata = (0, Lazy_1.lazy)(() => {