@enslo/sd-metadata 2.1.0 → 2.1.1

package/dist/index.js

@@ -66,76 +66,6 @@ var Result = {
 function toUint8Array(input) {
   return input instanceof ArrayBuffer ? new Uint8Array(input) : input;
 }
-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);
-}
-function readUint32LE(data, offset) {
-  return (data[offset] ?? 0) | (data[offset + 1] ?? 0) << 8 | (data[offset + 2] ?? 0) << 16 | (data[offset + 3] ?? 0) << 24;
-}
-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 readChunkType(data, offset) {
-  return String.fromCharCode(
-    data[offset] ?? 0,
-    data[offset + 1] ?? 0,
-    data[offset + 2] ?? 0,
-    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 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 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 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 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;
-  }
-}
-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 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;
@@ -161,6 +91,78 @@ function detectFormat(data) {
   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 new DataView(data.buffer, data.byteOffset, data.byteLength).getUint32(
+    offset
+  );
+}
+function readUint32LE(data, offset) {
+  return new DataView(data.buffer, data.byteOffset, data.byteLength).getUint32(
+    offset,
+    true
+  );
+}
+function readUint32(data, offset, isLittleEndian) {
+  return new DataView(data.buffer, data.byteOffset, data.byteLength).getUint32(
+    offset,
+    isLittleEndian
+  );
+}
+function readChunkType(data, offset) {
+  return String.fromCharCode(
+    data[offset] ?? 0,
+    data[offset + 1] ?? 0,
+    data[offset + 2] ?? 0,
+    data[offset + 3] ?? 0
+  );
+}
+function writeUint16BE(data, offset, value) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint16(
+    offset,
+    value
+  );
+}
+function writeUint16(data, offset, value, isLittleEndian) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint16(
+    offset,
+    value,
+    isLittleEndian
+  );
+}
+function writeUint32BE(data, offset, value) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint32(
+    offset,
+    value
+  );
+}
+function writeUint32LE(data, offset, value) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint32(
+    offset,
+    value,
+    true
+  );
+}
+function writeUint32(data, offset, value, isLittleEndian) {
+  new DataView(data.buffer, data.byteOffset, data.byteLength).setUint32(
+    offset,
+    value,
+    isLittleEndian
+  );
+}
 
 // src/utils/exif-constants.ts
 var USER_COMMENT_TAG = 37510;
@@ -276,23 +278,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) {
@@ -383,7 +385,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) {
@@ -418,8 +420,7 @@ 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;
@@ -430,8 +431,7 @@ function buildComSegment(text) {
   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 +491,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 +546,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,7 +590,6 @@ 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" });
@@ -634,12 +632,7 @@ function writeWebpMetadata(data, segments) {
 }
 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) {
@@ -647,24 +640,18 @@ function collectNonExifChunks(data) {
   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") {
       const paddedSize2 = chunkSize + chunkSize % 2;
       const chunkData = data.slice(offset, offset + 8 + paddedSize2);
       chunks.push(chunkData);
@@ -688,7 +675,7 @@ function buildExifChunk(segments) {
   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;
@@ -877,6 +864,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();
@@ -1424,29 +1412,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;
 }
@@ -1996,8 +1983,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");
     }
@@ -2057,10 +2046,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 +2071,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 +2120,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 +2259,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" });
@@ -2335,12 +2323,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
@@ -2368,8 +2355,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 +2456,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 +2466,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 +2492,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,7 +2503,6 @@ 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" });
@@ -2546,10 +2520,9 @@ function readWebpMetadata(data) {
 }
 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") {
       return {
         offset: offset + 8,
         length: chunkSize
@@ -2830,12 +2803,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 = [