@rhyster/wow-casc-dbc 2.11.60 → 2.12.1

package/README.md

@@ -53,6 +53,18 @@ const parser = await DBDParser.parse(reader);
 // ...
 ```
 
+If you download DB2 files from wago.tools, you need to set `detectIsZeroedByData` to let `WDCReader` detect the undecrypted blocks and ignore them.
+
+```javascript
+// ...
+
+const file = await fs.readFile('/path/to/db2/file.db2');
+const reader = new WDCReader(file, { detectIsZeroedByData: true });
+const parser = await DBDParser.parse(reader);
+
+// ...
+```
+
 ### Hotfix
 
 Applying hotfix requires `DBCache.bin` file from the client, and it seems the only way to get this is from the client. So, you need to search for `DBCache.bin` yourself, like `<WoWPath>/_retail_/Cache/ADB/enUS/DBCache.bin` or download it somewhere.

package/dist/index.cjs

@@ -1096,6 +1096,15 @@ const readBitpackedValue = (buffer, fieldOffsetBits, fieldSizeBits, signed = fal
   }
   return signed ? BigInt.asIntN(fieldSizeBits, value >> BigInt(bitOffset)) : BigInt.asUintN(fieldSizeBits, value >> BigInt(bitOffset));
 };
+const isDataRangeAllZero = (buffer, offset, length) => {
+  const end = offset + length;
+  for (let pointer = offset; pointer < end; pointer += 1) {
+    if (buffer[pointer] !== 0) {
+      return false;
+    }
+  }
+  return true;
+};
 class WDCReader {
   tableHash;
   layoutHash;
@@ -1108,7 +1117,28 @@ class WDCReader {
   relationships = /* @__PURE__ */ new Map();
   copyTable = /* @__PURE__ */ new Map();
   hotfixes = /* @__PURE__ */ new Map();
-  constructor(buffer, blocks = [], adb) {
+  constructor(buffer, blocksOrOption, adbInput) {
+    const options = blocksOrOption === void 0 || Array.isArray(blocksOrOption) ? { blocks: blocksOrOption, adb: adbInput } : blocksOrOption;
+    const blocks = options.blocks ?? [];
+    const adb = options.adb ?? adbInput;
+    const detectIsZeroedByData = options.detectIsZeroedByData ?? false;
+    const mergedBlocks = [];
+    if (!detectIsZeroedByData) {
+      blocks.sort((a, b) => a.offset - b.offset).forEach(({ offset, size }) => {
+        const lastBlock = mergedBlocks[mergedBlocks.length - 1];
+        if (mergedBlocks.length > 0 && lastBlock.offset + lastBlock.size >= offset) {
+          lastBlock.size = Math.max(
+            lastBlock.offset + lastBlock.size,
+            offset + size
+          ) - lastBlock.offset;
+        } else {
+          mergedBlocks.push({
+            offset,
+            size
+          });
+        }
+      });
+    }
     const magic = buffer.readUInt32BE(0);
     const version = buffer.readUInt32LE(4);
     const fieldCount = buffer.readUInt32LE(140);
@@ -1301,7 +1331,7 @@ class WDCReader {
       const sectionRecordSize = isNormal ? sectionHeader.recordCount * recordSize + sectionHeader.stringTableSize : sectionHeader.offsetRecordsEnd - sectionPointer;
       const sectionSize = sectionRecordSize + sectionHeader.idListSize + sectionHeader.copyTableCount * 8 + sectionHeader.offsetMapIDCount * 10 + sectionHeader.relationshipDataSize;
       const recordDataSize = isNormal ? recordSize * sectionHeader.recordCount : sectionHeader.offsetRecordsEnd - sectionHeader.fileOffset;
-      const isZeroed = blocks.some((block) => {
+      const isZeroed = detectIsZeroedByData ? sectionHeader.tactKeyHash !== 0n && isDataRangeAllZero(buffer, sectionHeader.fileOffset, recordDataSize) : mergedBlocks.some((block) => {
         const sectionStart = sectionHeader.fileOffset;
         const sectionEnd = sectionStart + sectionSize;
         const blockStart = block.offset;