@enslo/sd-metadata 2.1.0 → 2.2.0

package/dist/index.js

@@ -66,20 +66,61 @@ var Result = {
 function toUint8Array(input) {
   return input instanceof ArrayBuffer ? new Uint8Array(input) : input;
 }
+function isPng(data) {
+  if (data.length < 8) return false;
+  return data[0] === 137 && data[1] === 80 && data[2] === 78 && data[3] === 71 && data[4] === 13 && data[5] === 10 && data[6] === 26 && data[7] === 10;
+}
+function isJpeg(data) {
+  if (data.length < 2) return false;
+  return data[0] === 255 && data[1] === 216;
+}
+function isWebp(data) {
+  if (data.length < 12) return false;
+  return data[0] === 82 && // R
+  data[1] === 73 && // I
+  data[2] === 70 && // F
+  data[3] === 70 && // F
+  data[8] === 87 && // W
+  data[9] === 69 && // E
+  data[10] === 66 && // B
+  data[11] === 80;
+}
+function detectFormat(data) {
+  if (isPng(data)) return "png";
+  if (isJpeg(data)) return "jpeg";
+  if (isWebp(data)) return "webp";
+  return null;
+}
+function readUint16BE(data, offset) {
+  return new DataView(data.buffer, data.byteOffset, data.byteLength).getUint16(
+    offset
+  );
+}
+function readUint16(data, offset, isLittleEndian) {
+  return new DataView(data.buffer, data.byteOffset, data.byteLength).getUint16(
+    offset,
+    isLittleEndian
+  );
+}
 function readUint24LE(data, offset) {
   return (data[offset] ?? 0) | (data[offset + 1] ?? 0) << 8 | (data[offset + 2] ?? 0) << 16;
 }
 function readUint32BE(data, offset) {
-  return (data[offset] ?? 0) << 24 | (data[offset + 1] ?? 0) << 16 | (data[offset + 2] ?? 0) << 8 | (data[offset + 3] ?? 0);
+  return new DataView(data.buffer, data.byteOffset, data.byteLength).getUint32(
+    offset
+  );
 }
 function readUint32LE(data, offset) {
-  return (data[offset] ?? 0) | (data[offset + 1] ?? 0) << 8 | (data[offset + 2] ?? 0) << 16 | (data[offset + 3] ?? 0) << 24;
+  return new DataView(data.buffer, data.byteOffset, data.byteLength).getUint32(
+    offset,
+    true
+  );
 }
-function writeUint32BE(data, offset, value) {
-  data[offset] = value >>> 24 & 255;
-  data[offset + 1] = value >>> 16 & 255;
-  data[offset + 2] = value >>> 8 & 255;
-  data[offset + 3] = value & 255;
+function readUint32(data, offset, isLittleEndian) {
+  return new DataView(data.buffer, data.byteOffset, data.byteLength).getUint32(
+    offset,
+    isLittleEndian
+  );
 }
 function readChunkType(data, offset) {
   return String.fromCharCode(
@@ -89,77 +130,94 @@ function readChunkType(data, offset) {
     data[offset + 3] ?? 0
   );
 }
-function readUint16(data, offset, isLittleEndian) {
-  if (isLittleEndian) {
-    return (data[offset] ?? 0) | (data[offset + 1] ?? 0) << 8;
-  }
-  return (data[offset] ?? 0) << 8 | (data[offset + 1] ?? 0);
+function writeUint16BE(data, offset, value) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint16(
+    offset,
+    value
+  );
 }
-function readUint32(data, offset, isLittleEndian) {
-  if (isLittleEndian) {
-    return (data[offset] ?? 0) | (data[offset + 1] ?? 0) << 8 | (data[offset + 2] ?? 0) << 16 | (data[offset + 3] ?? 0) << 24;
-  }
-  return (data[offset] ?? 0) << 24 | (data[offset + 1] ?? 0) << 16 | (data[offset + 2] ?? 0) << 8 | (data[offset + 3] ?? 0);
+function writeUint16(data, offset, value, isLittleEndian) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint16(
+    offset,
+    value,
+    isLittleEndian
+  );
 }
-function arraysEqual(a, b) {
-  if (a.length !== b.length) return false;
-  for (let i = 0; i < a.length; i++) {
-    if (a[i] !== b[i]) return false;
-  }
-  return true;
+function writeUint32BE(data, offset, value) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint32(
+    offset,
+    value
+  );
 }
-function writeUint16(data, offset, value, isLittleEndian) {
-  if (isLittleEndian) {
-    data[offset] = value & 255;
-    data[offset + 1] = value >>> 8 & 255;
-  } else {
-    data[offset] = value >>> 8 & 255;
-    data[offset + 1] = value & 255;
-  }
+function writeUint32LE(data, offset, value) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint32(
+    offset,
+    value,
+    true
+  );
 }
 function writeUint32(data, offset, value, isLittleEndian) {
-  if (isLittleEndian) {
-    data[offset] = value & 255;
-    data[offset + 1] = value >>> 8 & 255;
-    data[offset + 2] = value >>> 16 & 255;
-    data[offset + 3] = value >>> 24 & 255;
-  } else {
-    data[offset] = value >>> 24 & 255;
-    data[offset + 1] = value >>> 16 & 255;
-    data[offset + 2] = value >>> 8 & 255;
-    data[offset + 3] = value & 255;
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint32(
+    offset,
+    value,
+    isLittleEndian
+  );
+}
+
+// src/utils/xmp.ts
+var XMP_KEYWORD = "XML:com.adobe.xmp";
+var XMP_APP1_PREFIX = /* @__PURE__ */ new TextEncoder().encode(
+  "http://ns.adobe.com/xap/1.0/\0"
+);
+function matchesXmpPrefix(data, offset) {
+  if (offset + XMP_APP1_PREFIX.length > data.length) return false;
+  for (let i = 0; i < XMP_APP1_PREFIX.length; i++) {
+    if (data[offset + i] !== XMP_APP1_PREFIX[i]) return false;
   }
+  return true;
 }
-function writeUint32LE(data, offset, value) {
-  data[offset] = value & 255;
-  data[offset + 1] = value >>> 8 & 255;
-  data[offset + 2] = value >>> 16 & 255;
-  data[offset + 3] = value >>> 24 & 255;
+function isXmpKeyword(keyword) {
+  return keyword === XMP_KEYWORD;
 }
-function isPng(data) {
-  if (data.length < 8) return false;
-  return data[0] === 137 && data[1] === 80 && data[2] === 78 && data[3] === 71 && data[4] === 13 && data[5] === 10 && data[6] === 26 && data[7] === 10;
+var MAX_XMP_TEXT_LENGTH = 65535;
+function extractXmpEntries(xmpText) {
+  if (xmpText.length > MAX_XMP_TEXT_LENGTH) return null;
+  const candidates = [
+    ["CreatorTool", extractSimpleElement(xmpText, "xmp", "CreatorTool")],
+    ["UserComment", extractAltElement(xmpText, "exif", "UserComment")],
+    ["parameters", extractAltElement(xmpText, "dc", "description")]
+  ];
+  const entries = candidates.filter(
+    (entry) => entry[1] !== void 0
+  );
+  return entries.length > 0 ? Object.fromEntries(entries) : null;
 }
-function isJpeg(data) {
-  if (data.length < 2) return false;
-  return data[0] === 255 && data[1] === 216;
+function extractSimpleElement(xmp, ns, field) {
+  const pattern = new RegExp(`<${ns}:${field}>([^<]*)</${ns}:${field}>`);
+  const match = xmp.match(pattern);
+  return match?.[1] ? decodeXmlEntities(match[1]) : void 0;
 }
-function isWebp(data) {
-  if (data.length < 12) return false;
-  return data[0] === 82 && // R
-  data[1] === 73 && // I
-  data[2] === 70 && // F
-  data[3] === 70 && // F
-  data[8] === 87 && // W
-  data[9] === 69 && // E
-  data[10] === 66 && // B
-  data[11] === 80;
+function extractAltElement(xmp, ns, field) {
+  const pattern = new RegExp(
+    `<${ns}:${field}>[\\s\\S]*?<rdf:li[^>]*(?<!/)>([\\s\\S]*?)</rdf:li>[\\s\\S]*?</${ns}:${field}>`
+  );
+  const match = xmp.match(pattern);
+  return match?.[1] ? decodeXmlEntities(match[1]) : void 0;
 }
-function detectFormat(data) {
-  if (isPng(data)) return "png";
-  if (isJpeg(data)) return "jpeg";
-  if (isWebp(data)) return "webp";
-  return null;
+function decodeXmlEntities(text) {
+  return text.replace(/&#x([0-9a-fA-F]+);/g, (match, hex) => {
+    try {
+      return String.fromCodePoint(parseInt(hex, 16));
+    } catch {
+      return match;
+    }
+  }).replace(/&#(\d+);/g, (match, dec) => {
+    try {
+      return String.fromCodePoint(parseInt(dec, 10));
+    } catch {
+      return match;
+    }
+  }).replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, "&");
 }
 
 // src/utils/exif-constants.ts
@@ -276,23 +334,23 @@ function writeIfdEntry(data, offset, tag, dataOffset, isLittleEndian) {
     writeUint32(data, offset + 8, dataOffset ?? 0, isLittleEndian);
   }
 }
+var UNICODE_PREFIX = new Uint8Array([
+  85,
+  78,
+  73,
+  67,
+  79,
+  68,
+  69,
+  0
+]);
 function encodeUserComment(text) {
-  const utf16Data = [];
+  const result = new Uint8Array(8 + text.length * 2);
+  const dataView = new DataView(result.buffer);
+  result.set(UNICODE_PREFIX);
   for (let i = 0; i < text.length; i++) {
-    const code = text.charCodeAt(i);
-    utf16Data.push(code & 255);
-    utf16Data.push(code >> 8 & 255);
-  }
-  const result = new Uint8Array(8 + utf16Data.length);
-  result[0] = 85;
-  result[1] = 78;
-  result[2] = 73;
-  result[3] = 67;
-  result[4] = 79;
-  result[5] = 68;
-  result[6] = 69;
-  result[7] = 0;
-  result.set(new Uint8Array(utf16Data), 8);
+    dataView.setUint16(8 + i * 2, text.charCodeAt(i), true);
+  }
   return result;
 }
 function encodeAsciiTag(text, prefix) {
@@ -315,6 +373,7 @@ function writeJpegMetadata(data, segments) {
     return Result.error({ type: "invalidSignature" });
   }
   const comSegments = segments.filter((s) => s.source.type === "jpegCom");
+  const xmpSegments = segments.filter((s) => s.source.type === "xmpPacket");
   const exifSegments = segments.filter(
     (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake"
   );
@@ -324,11 +383,16 @@ function writeJpegMetadata(data, segments) {
   }
   const { beforeSos, scanData } = collectResult.value;
   const app1Segment = exifSegments.length > 0 ? buildApp1Segment(exifSegments) : null;
-  const comSegmentData = comSegments.map((s) => buildComSegment(s.data));
+  const firstXmp = xmpSegments[0];
+  const xmpApp1Segment = firstXmp ? buildXmpApp1Segment(firstXmp.data) : null;
+  const comSegmentData = comSegments.map((s) => buildComSegment(s.data)).filter((s) => s !== null);
   let totalSize = 2;
   if (app1Segment) {
     totalSize += app1Segment.length;
   }
+  if (xmpApp1Segment) {
+    totalSize += xmpApp1Segment.length;
+  }
   for (const seg of beforeSos) {
     totalSize += seg.length;
   }
@@ -344,6 +408,10 @@ function writeJpegMetadata(data, segments) {
     output.set(app1Segment, offset);
     offset += app1Segment.length;
   }
+  if (xmpApp1Segment) {
+    output.set(xmpApp1Segment, offset);
+    offset += xmpApp1Segment.length;
+  }
   for (const seg of beforeSos) {
     output.set(seg, offset);
     offset += seg.length;
@@ -383,7 +451,7 @@ function collectNonMetadataSegments(data) {
         message: "Unexpected end of file"
       });
     }
-    const length = (data[offset] ?? 0) << 8 | (data[offset + 1] ?? 0);
+    const length = readUint16BE(data, offset);
     const segmentStart = offset - 2;
     const segmentEnd = offset + length;
     if (segmentEnd > data.length) {
@@ -398,8 +466,9 @@ function collectNonMetadataSegments(data) {
     data[offset + 5] === 102 && // f
     data[offset + 6] === 0 && // NULL
     data[offset + 7] === 0;
+    const isXmpApp1 = marker === APP1_MARKER && !isExifApp1 && matchesXmpPrefix(data, offset + 2);
     const isCom = marker === COM_MARKER;
-    if (!isExifApp1 && !isCom) {
+    if (!isExifApp1 && !isXmpApp1 && !isCom) {
       beforeSos.push(data.slice(segmentStart, segmentEnd));
     }
     offset = segmentEnd;
@@ -418,20 +487,35 @@ function buildApp1Segment(segments) {
   const segment = new Uint8Array(2 + segmentLength);
   segment[0] = 255;
   segment[1] = APP1_MARKER;
-  segment[2] = segmentLength >> 8 & 255;
-  segment[3] = segmentLength & 255;
+  writeUint16BE(segment, 2, segmentLength);
   segment.set(EXIF_HEADER, 4);
   segment.set(tiffData, 4 + EXIF_HEADER.length);
   return segment;
 }
+function buildXmpApp1Segment(xmpText) {
+  const textBytes = new TextEncoder().encode(xmpText);
+  const segmentLength = 2 + XMP_APP1_PREFIX.length + textBytes.length;
+  if (segmentLength > 65535) {
+    return null;
+  }
+  const segment = new Uint8Array(2 + segmentLength);
+  segment[0] = 255;
+  segment[1] = APP1_MARKER;
+  writeUint16BE(segment, 2, segmentLength);
+  segment.set(XMP_APP1_PREFIX, 4);
+  segment.set(textBytes, 4 + XMP_APP1_PREFIX.length);
+  return segment;
+}
 function buildComSegment(text) {
   const textBytes = new TextEncoder().encode(text);
   const segmentLength = 2 + textBytes.length;
+  if (segmentLength > 65535) {
+    return null;
+  }
   const segment = new Uint8Array(2 + segmentLength);
   segment[0] = 255;
   segment[1] = COM_MARKER;
-  segment[2] = segmentLength >> 8 & 255;
-  segment[3] = segmentLength & 255;
+  writeUint16BE(segment, 2, segmentLength);
   segment.set(textBytes, 4);
   return segment;
 }
@@ -491,6 +575,7 @@ function collectNonTextChunks(data) {
     if (offset + 4 > data.length) break;
     const chunkType = readChunkType(data, offset);
     offset += 4;
+    if (offset + length + 4 > data.length) break;
     offset += length;
     offset += 4;
     const chunkEnd = offset;
@@ -545,9 +630,7 @@ function serializeITXtChunk(chunk) {
 function buildChunk(type, data) {
   const chunk = new Uint8Array(4 + 4 + data.length + 4);
   writeUint32BE(chunk, 0, data.length);
-  for (let i = 0; i < 4; i++) {
-    chunk[4 + i] = type.charCodeAt(i);
-  }
+  chunk.set(new TextEncoder().encode(type), 4);
   chunk.set(data, 8);
   const crcData = chunk.slice(4, 8 + data.length);
   const crc = calculateCrc32(crcData);
@@ -591,23 +674,29 @@ function calculateCrc32(data) {
 // src/writers/webp.ts
 var RIFF_SIGNATURE = new Uint8Array([82, 73, 70, 70]);
 var WEBP_MARKER = new Uint8Array([87, 69, 66, 80]);
-var EXIF_CHUNK_TYPE = new Uint8Array([69, 88, 73, 70]);
 function writeWebpMetadata(data, segments) {
   if (!isWebp(data)) {
     return Result.error({ type: "invalidSignature" });
   }
-  const collectResult = collectNonExifChunks(data);
+  const xmpSegments = segments.filter((s) => s.source.type === "xmpPacket");
+  const exifSegments = segments.filter((s) => s.source.type !== "xmpPacket");
+  const collectResult = collectNonMetadataChunks(data);
   if (!collectResult.ok) {
     return collectResult;
   }
   const { chunks } = collectResult.value;
-  const exifChunk = buildExifChunk(segments);
+  const exifChunk = buildExifChunk(exifSegments);
+  const firstXmp = xmpSegments[0];
+  const xmpChunk = firstXmp ? buildXmpChunk(firstXmp.data) : null;
+  const metadataChunks = [];
+  if (exifChunk) metadataChunks.push(exifChunk);
+  if (xmpChunk) metadataChunks.push(xmpChunk);
   let newFileSize = 4;
   for (const chunk of chunks) {
     newFileSize += chunk.length;
   }
-  if (exifChunk) {
-    newFileSize += exifChunk.length;
+  for (const meta of metadataChunks) {
+    newFileSize += meta.length;
   }
   const output = new Uint8Array(8 + newFileSize);
   let offset = 0;
@@ -617,54 +706,48 @@ function writeWebpMetadata(data, segments) {
   offset += 4;
   output.set(WEBP_MARKER, offset);
   offset += 4;
-  let exifWritten = false;
+  let metadataWritten = false;
   for (const chunk of chunks) {
     output.set(chunk, offset);
     offset += chunk.length;
-    if (!exifWritten && exifChunk && isImageChunk(chunk)) {
-      output.set(exifChunk, offset);
-      offset += exifChunk.length;
-      exifWritten = true;
+    if (!metadataWritten && metadataChunks.length > 0 && isImageChunk(chunk)) {
+      for (const meta of metadataChunks) {
+        output.set(meta, offset);
+        offset += meta.length;
+      }
+      metadataWritten = true;
     }
   }
-  if (!exifWritten && exifChunk) {
-    output.set(exifChunk, offset);
+  if (!metadataWritten) {
+    for (const meta of metadataChunks) {
+      output.set(meta, offset);
+      offset += meta.length;
+    }
   }
   return Result.ok(output);
 }
 function isImageChunk(chunk) {
   if (chunk.length < 4) return false;
-  const type = String.fromCharCode(
-    chunk[0] ?? 0,
-    chunk[1] ?? 0,
-    chunk[2] ?? 0,
-    chunk[3] ?? 0
-  );
+  const type = readChunkType(chunk, 0);
   return type === "VP8 " || type === "VP8L" || type === "VP8X";
 }
-function collectNonExifChunks(data) {
+function collectNonMetadataChunks(data) {
   const chunks = [];
   let firstChunkType = "";
   let offset = 12;
   while (offset < data.length - 8) {
-    const chunkType = data.slice(offset, offset + 4);
-    const typeStr = String.fromCharCode(
-      chunkType[0] ?? 0,
-      chunkType[1] ?? 0,
-      chunkType[2] ?? 0,
-      chunkType[3] ?? 0
-    );
+    const typeStr = readChunkType(data, offset);
+    const chunkSize = readUint32LE(data, offset + 4);
     if (!firstChunkType) {
       firstChunkType = typeStr;
     }
-    const chunkSize = (data[offset + 4] ?? 0) | (data[offset + 5] ?? 0) << 8 | (data[offset + 6] ?? 0) << 16 | (data[offset + 7] ?? 0) << 24;
     if (offset + 8 + chunkSize > data.length) {
       return Result.error({
         type: "invalidRiffStructure",
         message: `Chunk extends beyond file at offset ${offset}`
       });
     }
-    if (!arraysEqual(chunkType, EXIF_CHUNK_TYPE)) {
+    if (typeStr !== "EXIF" && typeStr !== "XMP ") {
       const paddedSize2 = chunkSize + chunkSize % 2;
       const chunkData = data.slice(offset, offset + 8 + paddedSize2);
       chunks.push(chunkData);
@@ -675,24 +758,31 @@ function collectNonExifChunks(data) {
   return Result.ok({ chunks, firstChunkType });
 }
 function buildExifChunk(segments) {
-  const exifSegments = segments.filter(
-    (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake"
-  );
-  if (exifSegments.length === 0) {
+  if (segments.length === 0) {
     return null;
   }
-  const tiffData = buildExifTiffData(exifSegments);
+  const tiffData = buildExifTiffData(segments);
   if (tiffData.length === 0) {
     return null;
   }
   const chunkSize = tiffData.length;
   const paddedSize = chunkSize + chunkSize % 2;
   const chunk = new Uint8Array(8 + paddedSize);
-  chunk.set(EXIF_CHUNK_TYPE, 0);
+  chunk.set(new TextEncoder().encode("EXIF"));
   writeUint32LE(chunk, 4, chunkSize);
   chunk.set(tiffData, 8);
   return chunk;
 }
+function buildXmpChunk(xmpText) {
+  const textBytes = new TextEncoder().encode(xmpText);
+  const chunkSize = textBytes.length;
+  const paddedSize = chunkSize + chunkSize % 2;
+  const chunk = new Uint8Array(8 + paddedSize);
+  chunk.set(new TextEncoder().encode("XMP "));
+  writeUint32LE(chunk, 4, chunkSize);
+  chunk.set(textBytes, 8);
+  return chunk;
+}
 
 // src/api/stringify.ts
 function normalizeLineEndings(text) {
@@ -877,6 +967,7 @@ function parseParametersText(text) {
 function parseSettings(settings) {
   const result = /* @__PURE__ */ new Map();
   if (!settings) return result;
+  if (settings.length > 1e4) return result;
   const regex = /([A-Za-z][A-Za-z0-9 ]*?):\s*([^,]+?)(?=,\s*[A-Za-z][A-Za-z0-9 ]*?:|$)/g;
   for (const match of settings.matchAll(regex)) {
     const key = (match[1] ?? "").trim();
@@ -1405,6 +1496,9 @@ function detectUniqueKeywords(entryRecord) {
   if (entryRecord.Software?.startsWith("NovelAI")) {
     return "novelai";
   }
+  if (entryRecord.CreatorTool?.startsWith("Draw Things")) {
+    return "draw-things";
+  }
   const keyResult = detectByUniqueKey(entryRecord);
   if (keyResult) return keyResult;
   if ("fooocus_scheme" in entryRecord) {
@@ -1424,29 +1518,28 @@ function detectUniqueKeywords(entryRecord) {
   return null;
 }
 function detectFromCommentJson(comment) {
-  try {
-    const parsed = JSON.parse(comment);
-    const keyResult = detectByUniqueKey(parsed);
-    if (keyResult) return keyResult;
-    if ("prompt" in parsed && "workflow" in parsed) {
-      const workflow = parsed.workflow;
-      const prompt = parsed.prompt;
-      const isObject = typeof workflow === "object" || typeof prompt === "object";
-      const isJsonString = typeof workflow === "string" && workflow.startsWith("{") || typeof prompt === "string" && prompt.startsWith("{");
-      if (isObject || isJsonString) {
-        return "comfyui";
-      }
+  const result = parseJson(comment);
+  if (!result.ok || result.type !== "object") return null;
+  const parsed = result.value;
+  const keyResult = detectByUniqueKey(parsed);
+  if (keyResult) return keyResult;
+  if ("prompt" in parsed && "workflow" in parsed) {
+    const workflow = parsed.workflow;
+    const prompt = parsed.prompt;
+    const isObject = typeof workflow === "object" || typeof prompt === "object";
+    const isJsonString = typeof workflow === "string" && workflow.startsWith("{") || typeof prompt === "string" && prompt.startsWith("{");
+    if (isObject || isJsonString) {
+      return "comfyui";
     }
-    if (M_SWARMUI in parsed) {
+  }
+  if (M_SWARMUI in parsed) {
+    return "swarmui";
+  }
+  if ("prompt" in parsed && "parameters" in parsed) {
+    const params = String(parsed.parameters || "");
+    if (params.includes(M_SWARMUI) || params.includes(M_SWARM_VERSION)) {
       return "swarmui";
     }
-    if ("prompt" in parsed && "parameters" in parsed) {
-      const params = String(parsed.parameters || "");
-      if (params.includes(M_SWARMUI) || params.includes(M_SWARM_VERSION)) {
-        return "swarmui";
-      }
-    }
-  } catch {
   }
   return null;
 }
@@ -1544,6 +1637,60 @@ function detectFromA1111Format(text) {
   return null;
 }
 
+// src/parsers/draw-things.ts
+function parseDrawThings(entries) {
+  const jsonText = entries.UserComment?.startsWith("{") ? entries.UserComment : entries.Comment?.startsWith("{") ? entries.Comment : void 0;
+  if (!jsonText) {
+    return Result.error({ type: "unsupportedFormat" });
+  }
+  const parsed = parseJson(jsonText);
+  if (!parsed.ok || parsed.type !== "object") {
+    return Result.error({
+      type: "parseError",
+      message: "Invalid JSON in Draw Things metadata"
+    });
+  }
+  return buildMetadata(parsed.value);
+}
+function parseSize2(size) {
+  if (typeof size !== "string") return { width: 0, height: 0 };
+  const match = size.match(/^(\d+)x(\d+)$/);
+  if (!match) return { width: 0, height: 0 };
+  return { width: Number(match[1]), height: Number(match[2]) };
+}
+function buildMetadata(data) {
+  const str = (key) => {
+    const v = data[key];
+    return typeof v === "string" ? v : void 0;
+  };
+  const num = (key) => {
+    const v = data[key];
+    if (typeof v === "number" && v !== 0) return v;
+    return void 0;
+  };
+  const prompt = (str("c") ?? "").trim();
+  const negativePrompt = (str("uc") ?? "").trim();
+  const { width, height } = parseSize2(data.size);
+  const metadata = {
+    software: "draw-things",
+    prompt,
+    negativePrompt,
+    width,
+    height,
+    model: trimObject({
+      name: str("model")
+    }),
+    sampling: trimObject({
+      sampler: str("sampler"),
+      steps: num("steps"),
+      cfg: num("scale"),
+      seed: num("seed"),
+      denoise: num("strength")
+    })
+  };
+  return Result.ok(metadata);
+}
+
 // src/parsers/easydiffusion.ts
 function extractModelName(path) {
   if (!path) return void 0;
@@ -1552,7 +1699,7 @@ function extractModelName(path) {
 }
 function parseEasyDiffusion(entries) {
   if ("use_stable_diffusion_model" in entries) {
-    return buildMetadata(entries);
+    return buildMetadata2(entries);
   }
   const jsonText = entries.UserComment?.startsWith("{") ? entries.UserComment : entries.parameters?.startsWith("{") ? entries.parameters : void 0;
   if (!jsonText) {
@@ -1565,9 +1712,9 @@ function parseEasyDiffusion(entries) {
       message: "Invalid JSON in Easy Diffusion metadata"
     });
   }
-  return buildMetadata(parsed.value);
+  return buildMetadata2(parsed.value);
 }
-function buildMetadata(data) {
+function buildMetadata2(data) {
   const str = (key) => {
     const v = data[key];
     return typeof v === "string" ? v : void 0;
@@ -1996,8 +2143,10 @@ function parseMetadata(entries) {
     case "civitai": {
       const comfyResult = parseComfyUI(entries);
       if (comfyResult.ok) {
-        comfyResult.value.software = "civitai";
-        return comfyResult;
+        return Result.ok({
+          ...comfyResult.value,
+          software: "civitai"
+        });
       }
       return parseA1111(entries, "civitai");
     }
@@ -2026,6 +2175,8 @@ function parseMetadata(entries) {
     }
     case "ruined-fooocus":
       return parseRuinedFooocus(entries);
+    case "draw-things":
+      return parseDrawThings(entries);
     default:
       return Result.error({ type: "unsupportedFormat" });
   }
@@ -2057,10 +2208,10 @@ function readJpegDimensions(data) {
       offset++;
       continue;
     }
-    const length = (data[offset + 2] ?? 0) << 8 | (data[offset + 3] ?? 0);
+    const length = readUint16BE(data, offset + 2);
     if (marker >= 192 && marker <= 207 && marker !== 196 && marker !== 200 && marker !== 204) {
-      const height = (data[offset + 5] ?? 0) << 8 | (data[offset + 6] ?? 0);
-      const width = (data[offset + 7] ?? 0) << 8 | (data[offset + 8] ?? 0);
+      const height = readUint16BE(data, offset + 5);
+      const width = readUint16BE(data, offset + 7);
       return { width, height };
     }
     offset += 2 + length;
@@ -2082,12 +2233,12 @@ function readWebpDimensions(data) {
     }
     if (chunkType === "VP8 ") {
       const start = offset + 8;
-      const tag = (data[start] ?? 0) | (data[start + 1] ?? 0) << 8 | (data[start + 2] ?? 0) << 16;
+      const tag = readUint24LE(data, start);
       const keyFrame = !(tag & 1);
       if (keyFrame) {
         if (data[start + 3] === 157 && data[start + 4] === 1 && data[start + 5] === 42) {
-          const wRaw = (data[start + 6] ?? 0) | (data[start + 7] ?? 0) << 8;
-          const hRaw = (data[start + 8] ?? 0) | (data[start + 9] ?? 0) << 8;
+          const wRaw = readUint16(data, start + 6, true);
+          const hRaw = readUint16(data, start + 8, true);
           return { width: wRaw & 16383, height: hRaw & 16383 };
         }
       }
@@ -2131,6 +2282,10 @@ function extractTagsFromIfd(data, ifdOffset, isLittleEndian) {
     const count = readUint32(data, offset + 4, isLittleEndian);
     const typeSize = getTypeSize(type);
     const dataSize = count * typeSize;
+    if (dataSize > data.length) {
+      offset += 12;
+      continue;
+    }
     let valueOffset;
     if (dataSize <= 4) {
       valueOffset = offset + 8;
@@ -2266,36 +2421,31 @@ function decodeUserComment(data) {
   }
 }
 function decodeUtf16BE(data) {
-  const chars = [];
-  for (let i = 0; i < data.length - 1; i += 2) {
-    const code = (data[i] ?? 0) << 8 | (data[i + 1] ?? 0);
-    if (code === 0) break;
-    chars.push(String.fromCharCode(code));
-  }
-  return chars.join("");
+  const decoded = new TextDecoder("utf-16be").decode(data);
+  const nullIndex = decoded.indexOf("\0");
+  return nullIndex >= 0 ? decoded.slice(0, nullIndex) : decoded;
 }
 function decodeUtf16LE(data) {
-  const chars = [];
-  for (let i = 0; i < data.length - 1; i += 2) {
-    const code = (data[i] ?? 0) | (data[i + 1] ?? 0) << 8;
-    if (code === 0) break;
-    chars.push(String.fromCharCode(code));
-  }
-  return chars.join("");
+  const decoded = new TextDecoder("utf-16le").decode(data);
+  const nullIndex = decoded.indexOf("\0");
+  return nullIndex >= 0 ? decoded.slice(0, nullIndex) : decoded;
 }
 function decodeAscii(data) {
-  const chars = [];
-  for (let i = 0; i < data.length; i++) {
-    if (data[i] === 0) break;
-    chars.push(String.fromCharCode(data[i] ?? 0));
-  }
-  return chars.join("");
+  const nullIndex = data.indexOf(0);
+  const sliced = nullIndex >= 0 ? data.subarray(0, nullIndex) : data;
+  return new TextDecoder("ascii").decode(sliced);
 }
 
 // src/readers/jpeg.ts
 var APP1_MARKER2 = 225;
 var COM_MARKER2 = 254;
-var EXIF_HEADER2 = new Uint8Array([69, 120, 105, 102, 0, 0]);
+function matchesExifHeader(data, offset) {
+  return data[offset] === 69 && // E
+  data[offset + 1] === 120 && // x
+  data[offset + 2] === 105 && // i
+  data[offset + 3] === 102 && // f
+  data[offset + 4] === 0 && data[offset + 5] === 0;
+}
 function readJpegMetadata(data) {
   if (!isJpeg(data)) {
     return Result.error({ type: "invalidSignature" });
@@ -2307,6 +2457,15 @@ function readJpegMetadata(data) {
     const exifSegments = parseExifMetadataSegments(exifData);
     segments.push(...exifSegments);
   }
+  const xmpApp1 = findXmpApp1Segment(data);
+  if (xmpApp1) {
+    const xmpData = data.slice(xmpApp1.offset, xmpApp1.offset + xmpApp1.length);
+    const xmpText = new TextDecoder("utf-8").decode(xmpData);
+    segments.push({
+      source: { type: "xmpPacket" },
+      data: xmpText
+    });
+  }
   const comSegment = findComSegment(data);
   if (comSegment) {
     const comData = data.slice(
@@ -2335,12 +2494,11 @@ function findApp1Segment(data) {
       offset++;
       continue;
     }
-    const length = (data[offset + 2] ?? 0) << 8 | (data[offset + 3] ?? 0);
-    if (marker === APP1_MARKER2) {
+    const length = readUint16BE(data, offset + 2);
+    if (marker === APP1_MARKER2 && length >= 8) {
       const headerStart = offset + 4;
       if (headerStart + 6 <= data.length) {
-        const header = data.slice(headerStart, headerStart + 6);
-        if (arraysEqual(header, EXIF_HEADER2)) {
+        if (matchesExifHeader(data, headerStart)) {
           return {
             offset: headerStart + 6,
             length: length - 8
@@ -2356,6 +2514,35 @@ function findApp1Segment(data) {
   }
   return null;
 }
+function findXmpApp1Segment(data) {
+  let offset = 2;
+  while (offset < data.length - 4) {
+    if (data[offset] !== 255) {
+      offset++;
+      continue;
+    }
+    const marker = data[offset + 1];
+    if (marker === 255) {
+      offset++;
+      continue;
+    }
+    const length = readUint16BE(data, offset + 2);
+    if (marker === APP1_MARKER2 && length >= XMP_APP1_PREFIX.length + 2) {
+      const headerStart = offset + 4;
+      if (matchesXmpPrefix(data, headerStart)) {
+        return {
+          offset: headerStart + XMP_APP1_PREFIX.length,
+          length: length - 2 - XMP_APP1_PREFIX.length
+        };
+      }
+    }
+    offset += 2 + length;
+    if (marker === 218 || marker === 217) {
+      break;
+    }
+  }
+  return null;
+}
 function findComSegment(data) {
   let offset = 2;
   while (offset < data.length - 4) {
@@ -2368,8 +2555,8 @@ function findComSegment(data) {
       offset++;
       continue;
     }
-    const length = (data[offset + 2] ?? 0) << 8 | (data[offset + 3] ?? 0);
-    if (marker === COM_MARKER2) {
+    const length = readUint16BE(data, offset + 2);
+    if (marker === COM_MARKER2 && length >= 2) {
       return {
         offset: offset + 4,
         length: length - 2
@@ -2469,7 +2656,7 @@ function tryUtf8Decode(data) {
 }
 function parseITXtChunk(data) {
   let offset = 0;
-  const keywordEnd = findNull(data, offset);
+  const keywordEnd = data.indexOf(0, offset);
   if (keywordEnd === -1) return null;
   const keyword = utf8Decode(data.slice(offset, keywordEnd));
   offset = keywordEnd + 1;
@@ -2479,11 +2666,11 @@ function parseITXtChunk(data) {
   if (offset >= data.length) return null;
   const compressionMethod = data[offset] ?? 0;
   offset += 1;
-  const langEnd = findNull(data, offset);
+  const langEnd = data.indexOf(0, offset);
   if (langEnd === -1) return null;
   const languageTag = utf8Decode(data.slice(offset, langEnd));
   offset = langEnd + 1;
-  const transEnd = findNull(data, offset);
+  const transEnd = data.indexOf(0, offset);
   if (transEnd === -1) return null;
   const translatedKeyword = utf8Decode(data.slice(offset, transEnd));
   offset = transEnd + 1;
@@ -2505,20 +2692,8 @@ function parseITXtChunk(data) {
     text
   };
 }
-function findNull(data, offset) {
-  for (let i = offset; i < data.length; i++) {
-    if (data[i] === 0) {
-      return i;
-    }
-  }
-  return -1;
-}
 function latin1Decode(data) {
-  let result = "";
-  for (let i = 0; i < data.length; i++) {
-    result += String.fromCharCode(data[i] ?? 0);
-  }
-  return result;
+  return new TextDecoder("iso-8859-1").decode(data);
 }
 function utf8Decode(data) {
   return new TextDecoder("utf-8").decode(data);
@@ -2528,28 +2703,55 @@ function decompressZlib(_data) {
 }
 
 // src/readers/webp.ts
-var EXIF_CHUNK_TYPE2 = new Uint8Array([69, 88, 73, 70]);
 function readWebpMetadata(data) {
   if (!isWebp(data)) {
     return Result.error({ type: "invalidSignature" });
   }
+  const segments = [];
   const exifChunk = findExifChunk(data);
-  if (!exifChunk) {
-    return Result.ok([]);
+  if (exifChunk) {
+    const exifData = data.slice(
+      exifChunk.offset,
+      exifChunk.offset + exifChunk.length
+    );
+    segments.push(...parseExifMetadataSegments(exifData));
+  }
+  const xmpChunk = findXmpChunk(data);
+  if (xmpChunk) {
+    const xmpData = data.slice(
+      xmpChunk.offset,
+      xmpChunk.offset + xmpChunk.length
+    );
+    const xmpText = new TextDecoder("utf-8").decode(xmpData);
+    segments.push({
+      source: { type: "xmpPacket" },
+      data: xmpText
+    });
   }
-  const exifData = data.slice(
-    exifChunk.offset,
-    exifChunk.offset + exifChunk.length
-  );
-  const segments = parseExifMetadataSegments(exifData);
   return Result.ok(segments);
 }
 function findExifChunk(data) {
   let offset = 12;
-  while (offset < data.length - 8) {
-    const chunkType = data.slice(offset, offset + 4);
+  while (offset + 8 <= data.length) {
     const chunkSize = readUint32LE(data, offset + 4);
-    if (arraysEqual(chunkType, EXIF_CHUNK_TYPE2)) {
+    if (readChunkType(data, offset) === "EXIF") {
+      if (offset + 8 + chunkSize > data.length) return null;
+      return {
+        offset: offset + 8,
+        length: chunkSize
+      };
+    }
+    const paddedSize = chunkSize + chunkSize % 2;
+    offset += 8 + paddedSize;
+  }
+  return null;
+}
+function findXmpChunk(data) {
+  let offset = 12;
+  while (offset + 8 <= data.length) {
+    const chunkSize = readUint32LE(data, offset + 4);
+    if (readChunkType(data, offset) === "XMP ") {
+      if (offset + 8 + chunkSize > data.length) return null;
       return {
         offset: offset + 8,
         length: chunkSize
@@ -2563,20 +2765,37 @@ function findExifChunk(data) {
 
 // src/utils/convert.ts
 function pngChunksToRecord(chunks) {
-  return Object.fromEntries(chunks.map((c) => [c.keyword, c.text]));
+  return Object.fromEntries(
+    chunks.flatMap((chunk) => {
+      if (isXmpKeyword(chunk.keyword)) {
+        const expanded = extractXmpEntries(chunk.text);
+        if (expanded) return Object.entries(expanded);
+      }
+      return [[chunk.keyword, chunk.text]];
+    })
+  );
 }
 function segmentsToRecord(segments) {
   const record = {};
   for (const segment of segments) {
     const keyword = sourceToKeyword(segment.source);
     const text = segment.data;
-    if (segment.source.type === "exifUserComment" && text.startsWith("{")) {
-      const expanded = tryExpandNovelAIWebpFormat(text);
+    if (segment.source.type === "xmpPacket") {
+      const expanded = extractXmpEntries(text);
       if (expanded) {
         Object.assign(record, expanded);
         continue;
       }
     }
+    if (segment.source.type === "exifUserComment") {
+      if (text.startsWith("{")) {
+        const expanded = tryExpandNovelAIWebpFormat(text);
+        if (expanded) {
+          Object.assign(record, expanded);
+          continue;
+        }
+      }
+    }
     record[keyword] = text;
   }
   return record;
@@ -2606,6 +2825,8 @@ function sourceToKeyword(source) {
       return source.prefix ?? "ImageDescription";
     case "exifMake":
       return source.prefix ?? "Make";
+    case "xmpPacket":
+      return "XML:com.adobe.xmp";
   }
 }
 
@@ -2777,6 +2998,24 @@ function convertComfyUISegmentsToPng(segments) {
   return tryParseExtendedFormat(segments) ?? tryParseSaveImagePlusFormat(segments) ?? [];
 }
 
+// src/converters/draw-things.ts
+var XMP_KEYWORD2 = "XML:com.adobe.xmp";
+function convertDrawThingsPngToSegments(chunks) {
+  const xmpChunk = chunks.find((c) => isXmpKeyword(c.keyword));
+  if (!xmpChunk) return [];
+  return [
+    {
+      source: { type: "xmpPacket" },
+      data: xmpChunk.text
+    }
+  ];
+}
+function convertDrawThingsSegmentsToPng(segments) {
+  const xmpSegment = findSegment(segments, "xmpPacket");
+  if (!xmpSegment) return [];
+  return createITxtChunk(XMP_KEYWORD2, xmpSegment.data);
+}
+
 // src/converters/easydiffusion.ts
 function convertEasyDiffusionPngToSegments(chunks) {
   const json = Object.fromEntries(
@@ -2830,12 +3069,11 @@ function convertNovelaiPngToSegments(chunks) {
   );
 }
 function buildUserCommentJson(chunks) {
-  return NOVELAI_KEY_ORDER.map((key) => {
-    const chunk = chunks.find((c) => c.keyword === key);
-    return chunk ? { [key]: chunk.text } : null;
-  }).filter((entry) => entry !== null).reduce(
-    (acc, entry) => Object.assign(acc, entry),
-    {}
+  return Object.fromEntries(
+    NOVELAI_KEY_ORDER.flatMap((key) => {
+      const chunk = chunks.find((c) => c.keyword === key);
+      return chunk ? [[key, chunk.text]] : [];
+    })
   );
 }
 var NOVELAI_KEY_ORDER = [
@@ -3093,6 +3331,10 @@ var convertHfSpace = createFormatConverter(
   createPngToSegments("parameters"),
   createSegmentsToPng("parameters", "text-unicode-escape")
 );
+var convertDrawThings = createFormatConverter(
+  convertDrawThingsPngToSegments,
+  convertDrawThingsSegmentsToPng
+);
 var convertCivitai = createFormatConverter(
   convertCivitaiPngToSegments,
   convertCivitaiSegmentsToPng
@@ -3134,7 +3376,9 @@ var softwareConverters = {
   // InvokeAI
   invokeai: convertInvokeAI,
   // HuggingFace Space
-  "hf-space": convertHfSpace
+  "hf-space": convertHfSpace,
+  // Draw Things (XMP format)
+  "draw-things": convertDrawThings
 };
 
 // src/api/write.ts
@@ -3260,7 +3504,8 @@ var softwareLabels = Object.freeze({
   "hf-space": "Hugging Face Space",
   easydiffusion: "Easy Diffusion",
   fooocus: "Fooocus",
-  "ruined-fooocus": "Ruined Fooocus"
+  "ruined-fooocus": "Ruined Fooocus",
+  "draw-things": "Draw Things"
 });
 export {
   embed,