Fix package, and small files being truncated

package.json

@@ -1,13 +1,11 @@
 {
   "name": "@freiraum/msgreader",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "",
   "main": "lib/index.js",
   "private": false,
   "scripts": {
-    "build": "node_modules/@babel/cli/bin/babel.js src --out-dir lib",
-    "test": "echo \"Error: no test specified\"",
-    "prepare": "npm run build"
+    "build": "node_modules/@babel/cli/bin/babel.js src --out-dir lib"
   },
   "babel": {
     "presets": [

src/MsgReader.js

@@ -278,15 +278,24 @@ function fieldsDataDirInner(ds, msgData, dirProperty, fields) {
   }
 }
 
+function isAddPropertyValue(fieldName, fieldTypeMapped) {
+  return fieldName !== 'body' || fieldTypeMapped !== 'binary';
+}
+
 function fieldsDataDocument(ds, msgData, documentProperty, fields) {
   var value = documentProperty.name.substring(12).toLowerCase();
   var fieldClass = value.substring(0, 4);
   var fieldType = value.substring(4, 8);
 
   var fieldName = CONST.MSG.FIELD.NAME_MAPPING[fieldClass];
+  var fieldTypeMapped = CONST.MSG.FIELD.TYPE_MAPPING[fieldType];
 
   if (fieldName) {
-    fields[fieldName] = getFieldValue(ds, msgData, documentProperty, fieldType);
+	var fieldValue = getFieldValue(ds, msgData, documentProperty, fieldTypeMapped);
+
+    if (isAddPropertyValue(fieldName, fieldTypeMapped)) {
+      fields[fieldName] = applyValueConverter(fieldName, fieldTypeMapped, fieldValue);
+    }
   }
   if (fieldClass == CONST.MSG.FIELD.CLASS_MAPPING.ATTACHMENT_DATA) {
 
@@ -296,6 +305,14 @@ function fieldsDataDocument(ds, msgData, documentProperty, fields) {
   }
 }
 
+// todo: html body test
+function applyValueConverter(fieldName, fieldTypeMapped, fieldValue) {
+  if (fieldTypeMapped === 'binary' && fieldName === 'bodyHTML') {
+    return convertUint8ArrayToString(fieldValue);
+  }
+  return fieldValue
+}
+
 function getFieldType(fieldProperty) {
   var value = fieldProperty.name.substring(12).toLowerCase();
   return value.substring(4, 8);
@@ -324,8 +341,7 @@ var extractorFieldValue = {
       },
       'binary': function extractBatBinary(ds, msgData, blockStartOffset, bigBlockOffset, blockSize) {
         ds.seek(blockStartOffset + bigBlockOffset);
-        var toReadLength = Math.min(Math.min(msgData.bigBlockSize - bigBlockOffset, blockSize), CONST.MSG.SMALL_BLOCK_SIZE);
-        return ds.readUint8Array(toReadLength);
+        return ds.readUint8Array(blockSize);
       }
     }
   },
@@ -388,19 +404,23 @@ function getChainByBlockSmall(ds, msgData, fieldProperty) {
   return blockChain;
 }
 
-function getFieldValue(ds, msgData, fieldProperty, type) {
+function getFieldValue(ds, msgData, fieldProperty, typeMapped) {
   var value = null;
 
   var valueExtractor =
     fieldProperty.sizeBlock < CONST.MSG.BIG_BLOCK_MIN_DOC_SIZE ? extractorFieldValue.sbat : extractorFieldValue.bat;
-  var dataTypeExtractor = valueExtractor.dataType[CONST.MSG.FIELD.TYPE_MAPPING[type]];
+  var dataTypeExtractor = valueExtractor.dataType[typeMapped];
 
   if (dataTypeExtractor) {
     value = valueExtractor.extractor(ds, msgData, fieldProperty, dataTypeExtractor);
   }
   return value;
 }
 
+function convertUint8ArrayToString(uint8ArraValue) {
+  return new TextDecoder("utf-8").decode(uint8ArraValue);
+}
+
 export default class MsgReader {
   constructor(arrayBuffer) {
     this.ds = new DataStream(arrayBuffer, 0, DataStream.LITTLE_ENDIAN);
@@ -423,7 +443,8 @@ export default class MsgReader {
   getAttachment(attach) {
     var attachData = typeof attach === 'number' ? this.fileData.fieldsData.attachments[attach] : attach;
     var fieldProperty = this.fileData.propertyData[attachData.dataId];
-    var fieldData = getFieldValue(this.ds, this.fileData, fieldProperty, getFieldType(fieldProperty));
+	var fieldTypeMapped = CONST.MSG.FIELD.TYPE_MAPPING[getFieldType(fieldProperty)];
+    var fieldData = getFieldValue(this.ds, this.fileData, fieldProperty, fieldTypeMapped);
 
     return {fileName: attachData.fileName, content: fieldData};
   }

src/const.js

@@ -57,11 +57,13 @@ export default {
         '0c1a': 'senderName',
         '5d02': 'senderEmail',
         '1000': 'body',
+        '1013': 'bodyHTML',
         '007d': 'headers',
         // attachment specific
         '3703': 'extension',
         '3704': 'fileNameShort',
         '3707': 'fileName',
+        '370e': 'mimeType',
         '3712': 'pidContentId',
         // recipient specific
         '3001': 'name',