pst-extractor 1.11.0 → 1.12.0

package/dist/PSTDescriptorItem.class.d.ts

@@ -16,7 +16,7 @@ export declare class PSTDescriptorItem {
      * @param {PSTFile} pstFile
      * @memberof PSTDescriptorItem
      */
-    constructor(data: Buffer, offset: number, pstFile: PSTFile);
+    constructor(data: Buffer, offset: number, pstFile: PSTFile, entryType: number);
     /**
      * Get a node input stream from the offset index and read into a buffer.
      * @returns {Buffer}

package/dist/PSTDescriptorItem.class.js

@@ -25,7 +25,7 @@ class PSTDescriptorItem {
      * @param {PSTFile} pstFile
      * @memberof PSTDescriptorItem
      */
-    constructor(data, offset, pstFile) {
+    constructor(data, offset, pstFile, entryType) {
         this.dataBlockData = null;
         this.dataBlockOffsets = [];
         this._pstFile = pstFile;
@@ -33,15 +33,25 @@ class PSTDescriptorItem {
             this._descriptorIdentifier = PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset, offset + 4).toNumber();
             this._offsetIndexIdentifier =
                 PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset + 4, offset + 8).toNumber() & 0xfffffffe;
-            this._subNodeOffsetIndexIdentifier =
-                PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset + 8, offset + 12).toNumber() & 0xfffffffe;
+            if (entryType == PSTFile_class_1.PSTFile.SLBLOCK_ENTRY) {
+                this._subNodeOffsetIndexIdentifier =
+                    PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset + 8, offset + 12).toNumber() & 0xfffffffe;
+            }
+            else {
+                this._subNodeOffsetIndexIdentifier = 0;
+            }
         }
         else {
             this._descriptorIdentifier = PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset, offset + 4).toNumber();
             this._offsetIndexIdentifier =
                 PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset + 8, offset + 16).toNumber() & 0xfffffffe;
-            this._subNodeOffsetIndexIdentifier =
-                PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset + 16, offset + 24).toNumber() & 0xfffffffe;
+            if (entryType == PSTFile_class_1.PSTFile.SLBLOCK_ENTRY) {
+                this._subNodeOffsetIndexIdentifier =
+                    PSTUtil_class_1.PSTUtil.convertLittleEndianBytesToLong(data, offset + 16, offset + 24).toNumber() & 0xfffffffe;
+            }
+            else {
+                this._subNodeOffsetIndexIdentifier = 0;
+            }
         }
     }
     /**

package/dist/PSTFile.class.d.ts

@@ -24,6 +24,8 @@ export declare class PSTFile {
     static PS_MAPI: number;
     static PSETID_AirSync: number;
     static PSETID_Sharing: number;
+    static SLBLOCK_ENTRY: number;
+    static SIBLOCK_ENTRY: number;
     private guidMap;
     private _encryptionType;
     get encryptionType(): number;

package/dist/PSTFile.class.js

@@ -602,6 +602,11 @@ class PSTFile {
             throw new Error('PSTFile::getPSTDescriptorItems Unable to process descriptor node, bad signature: ' +
                 sig);
         }
+        // NID nodes defines in subnode can be either SLBLOCK (0) or SIBLOCK_ENTRY (1)
+        const blockType = inputStream.read();
+        if ((blockType !== PSTFile.SLBLOCK_ENTRY) && (blockType !== PSTFile.SIBLOCK_ENTRY)) {
+            throw new Error("Unable to process descriptor node, unknown BLOCK type: " + blockType);
+        }
         const output = new Map();
         const numberOfItems = inputStream.seekAndReadLong(long_1.default.fromValue(2), 2);
         let offset;
@@ -615,13 +620,31 @@ class PSTFile {
         inputStream.seek(long_1.default.ZERO);
         inputStream.readCompletely(data);
         for (let x = 0; x < numberOfItems.toNumber(); x++) {
-            const item = new PSTDescriptorItem_class_1.PSTDescriptorItem(data, offset, this);
-            output.set(item.descriptorIdentifier, item);
+            const item = new PSTDescriptorItem_class_1.PSTDescriptorItem(data, offset, this, blockType);
+            if (blockType == PSTFile.SLBLOCK_ENTRY) {
+                output.set(item.descriptorIdentifier, item);
+            }
+            else {
+                const subItems = this.getPSTDescriptorItems(long_1.default.fromNumber(item.offsetIndexIdentifier));
+                subItems.forEach((value, key) => {
+                    output.set(key, value);
+                });
+            }
             if (this._pstFileType === PSTFile.PST_TYPE_ANSI) {
-                offset += 12;
+                if (blockType === PSTFile.SLBLOCK_ENTRY) {
+                    offset += 12;
+                }
+                else {
+                    offset += 8;
+                }
             }
             else {
-                offset += 24;
+                if (blockType === PSTFile.SLBLOCK_ENTRY) {
+                    offset += 24;
+                }
+                else {
+                    offset += 16;
+                }
             }
         }
         return output;
@@ -826,5 +849,7 @@ PSTFile.PSETID_UnifiedMessaging = 11;
 PSTFile.PS_MAPI = 12;
 PSTFile.PSETID_AirSync = 13;
 PSTFile.PSETID_Sharing = 14;
+PSTFile.SLBLOCK_ENTRY = 0;
+PSTFile.SIBLOCK_ENTRY = 1;
 // node tree maps
 PSTFile.nodeMap = new NodeMap_class_1.NodeMap();

package/dist/PSTTable7C.class.js

@@ -178,16 +178,17 @@ class PSTTable7C extends PSTTable_class_1.PSTTable {
             currentItem.set(item.entryType.toNumber(), item);
             let col = 0;
             if (this.overrideCol > -1) {
-                col = this.overrideCol - 1;
+                col = this.overrideCol;
             }
-            while (col < this.numColumns - 1) {
-                col++;
+            while (col < this.numColumns) {
                 // Does this column exist for this row?
                 const bitIndex = Math.trunc(this.columnDescriptors[col].iBit / 8);
                 const bit = this.columnDescriptors[col].iBit % 8;
                 // https://learn.microsoft.com/en-us/openspecs/office_file_formats/ms-pst/c48fa6b4-bfd4-49d7-80f8-8718bc4bcddc
-                if (bitIndex >= bitmap.length || (bitmap[bitIndex] & (1 << (7 - bit))) == 0) {
+                if (bitIndex >= bitmap.length ||
+                    (bitmap[bitIndex] & (1 << (7 - bit))) == 0) {
                     // Column doesn't exist
+                    col++;
                     continue;
                 }
                 item = new PSTTableItem_class_1.PSTTableItem();
@@ -249,6 +250,7 @@ class PSTTable7C extends PSTTable_class_1.PSTTable {
                         }
                         break;
                 }
+                col++;
                 currentItem.set(item.entryType.toNumber(), item);
             }
             itemList[dataSetNumber] = currentItem;

package/dist/PSTUtil.class.js

@@ -101,10 +101,8 @@ class PSTUtil {
             }
         }
         catch (err) {
-            console.error('PSTUtil::createJavascriptString Unable to decode string\n' + err);
-            throw err;
+            return iconv_lite_1.default.decode(data, 'utf8').toString();
         }
-        return '';
     }
     /**
      * Copy from one array to another