muhammara 3.1.1 → 3.2.0

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.2.0] - 2022-10-26
+
+### Added
+
+- Add electron 20.3.3
+- Ignore extra data above the header and below the footer in PDF Parser
+- Add node 19.0.0
+
 ## [3.1.1] - 2022-10-23
 
 ### Fixed
@@ -48,6 +56,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Node < 11 and Electron < 11 removed
 - Renamed typo exported value from eTokenSeprator to eTokenSeparator
 
+## [2.6.1] - 2022-10-23
+
+### Fixed
+
+- Backport: NPE in parser when file ends before it really starts
+
 ## [2.6.0] - 2022-06-30
 
 ### Changed
@@ -280,10 +294,12 @@ with the following changes.
 
 - Initial release
 
-[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/3.1.1...HEAD
+[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/3.2.0...HEAD
+[3.2.0]: https://github.com/julianhille/MuhammaraJS/compare/3.1.1...3.2.0
 [3.1.1]: https://github.com/julianhille/MuhammaraJS/compare/3.1.0...3.1.1
 [3.1.0]: https://github.com/julianhille/MuhammaraJS/compare/3.0.0...3.1.0
-[3.0.0]: https://github.com/julianhille/MuhammaraJS/compare/2.6.0...3.0.0
+[3.0.0]: https://github.com/julianhille/MuhammaraJS/compare/2.6.1...3.0.0
+[2.6.1]: https://github.com/julianhille/MuhammaraJS/compare/2.6.0...2.6.1
 [2.6.0]: https://github.com/julianhille/MuhammaraJS/compare/2.5.0...2.6.0
 [2.5.0]: https://github.com/julianhille/MuhammaraJS/compare/2.4.0...2.5.0
 [2.4.0]: https://github.com/julianhille/MuhammaraJS/compare/2.3.0...2.4.0

package/PDFRStreamForBuffer.js

@@ -8,6 +8,7 @@ function PDFRStreamForBuffer(buffer) {
   this.innerArray = Array.prototype.slice.call(buffer, 0);
   this.rposition = 0;
   this.fileSize = this.innerArray.length;
+  this.mStartPosition = 0;
 }
 
 PDFRStreamForBuffer.prototype.read = function (inAmount) {
@@ -25,7 +26,7 @@ PDFRStreamForBuffer.prototype.notEnded = function () {
 };
 
 PDFRStreamForBuffer.prototype.setPosition = function (inPosition) {
-  this.rposition = inPosition;
+  this.rposition = this.mStartPosition + inPosition;
 };
 
 PDFRStreamForBuffer.prototype.setPositionFromEnd = function (inPosition) {
@@ -37,7 +38,11 @@ PDFRStreamForBuffer.prototype.skip = function (inAmount) {
 };
 
 PDFRStreamForBuffer.prototype.getCurrentPosition = function () {
-  return this.rposition;
+  return this.rposition - this.mStartPosition;
+};
+
+PDFRStreamForBuffer.prototype.moveStartPosition = function (inPosition) {
+  this.mStartPosition = inPosition;
 };
 
 module.exports = PDFRStreamForBuffer;

package/PDFRStreamForFile.js

@@ -8,6 +8,7 @@ function PDFRStreamForFile(inPath) {
   this.path = inPath;
   this.rposition = 0;
   this.fileSize = fs.statSync(inPath)["size"];
+  this.mStartPosition = 0;
 }
 
 PDFRStreamForFile.prototype.read = function (inAmount) {
@@ -25,7 +26,7 @@ PDFRStreamForFile.prototype.notEnded = function () {
 };
 
 PDFRStreamForFile.prototype.setPosition = function (inPosition) {
-  this.rposition = inPosition;
+  this.rposition = this.mStartPosition + inPosition;
 };
 
 PDFRStreamForFile.prototype.setPositionFromEnd = function (inPosition) {
@@ -37,7 +38,11 @@ PDFRStreamForFile.prototype.skip = function (inAmount) {
 };
 
 PDFRStreamForFile.prototype.getCurrentPosition = function () {
-  return this.rposition;
+  return this.rposition - this.mStartPosition;
+};
+
+PDFRStreamForFile.prototype.moveStartPosition = function (inPosition) {
+  this.mStartPosition = inPosition;
 };
 
 function noop() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muhammara",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "Create, read and modify PDF files and streams. A drop in replacement for hummusjs PDF library",
   "homepage": "https://github.com/julianhille/Muhammarajs",
   "license": "Apache-2.0",

package/src/ObjectByteReaderWithPosition.cpp

@@ -129,3 +129,18 @@ void ObjectByteReaderWithPosition::Skip(LongBufferSizeType inSkipSize)
     args[0] = NEW_NUMBER(inSkipSize);
 	func->Call(GET_CURRENT_CONTEXT, OBJECT_FROM_PERSISTENT(mObject), 1, args).ToLocalChecked();
 }
+
+void ObjectByteReaderWithPosition::MoveStartPosition(LongFilePositionType inStartPosition)
+{
+	CREATE_ISOLATE_CONTEXT;
+	CREATE_ESCAPABLE_SCOPE;
+
+	Local<Value> value = OBJECT_FROM_PERSISTENT(mObject)->Get(GET_CURRENT_CONTEXT, NEW_STRING("moveStartPosition")).ToLocalChecked();
+		if(value->IsUndefined())
+				return;
+		Local<Function> func = Local<Function>::Cast(value);
+
+		Local<Value> args[1];
+		args[0] = NEW_NUMBER(inStartPosition);
+	func->Call(GET_CURRENT_CONTEXT, OBJECT_FROM_PERSISTENT(mObject), 1, args).ToLocalChecked();
+}

package/src/ObjectByteReaderWithPosition.h

@@ -38,6 +38,7 @@ public:
 	virtual void SetPositionFromEnd(LongFilePositionType inOffsetFromEnd);
 	virtual LongFilePositionType GetCurrentPosition();
 	virtual void Skip(LongBufferSizeType inSkipSize);
+	virtual void MoveStartPosition(LongFilePositionType inStartPosition);
 
     
 private:

package/src/deps/PDFWriter/IByteReaderWithPosition.h

@@ -52,5 +52,9 @@ public:
 	*/
 	virtual void Skip(LongBufferSizeType inSkipSize) = 0;
 
+	/*
+		Move the start position
+	*/
+	virtual void MoveStartPosition(LongFilePositionType inStartPosition) = 0;
 
 };

package/src/deps/PDFWriter/InputBufferedStream.cpp

@@ -50,6 +50,7 @@ void InputBufferedStream::Assign(IByteReaderWithPosition* inReader)
 {
 	mSourceStream = inReader;
 	mCurrentBufferIndex = mBuffer;
+	mStartPosition = 0;
 }
 
 LongBufferSizeType InputBufferedStream::Read(Byte* inBuffer,LongBufferSizeType inBufferSize)
@@ -121,6 +122,7 @@ void InputBufferedStream::Initiate(IByteReaderWithPosition* inSourceReader,IOBas
 	mBuffer = new Byte[mBufferSize];
 	mLastAvailableIndex = mCurrentBufferIndex = mBuffer;
 	mSourceStream = inSourceReader;
+	mStartPosition = 0;
 }
 
 void InputBufferedStream::Skip(LongBufferSizeType inSkipSize)
@@ -140,7 +142,7 @@ void InputBufferedStream::Skip(LongBufferSizeType inSkipSize)
 void InputBufferedStream::SetPosition(LongFilePositionType inOffsetFromStart)
 {
 	mLastAvailableIndex = mCurrentBufferIndex = mBuffer;
-	mSourceStream->SetPosition(inOffsetFromStart);
+	mSourceStream->SetPosition(mStartPosition + inOffsetFromStart);
 }
 
 void InputBufferedStream::SetPositionFromEnd(LongFilePositionType inOffsetFromEnd)
@@ -158,5 +160,10 @@ LongFilePositionType InputBufferedStream::GetCurrentPosition()
 {
 	// when reading the current position is the current stream position minus how much is left
 	// to read from the buffer
-	return mSourceStream->GetCurrentPosition() - (mLastAvailableIndex - mCurrentBufferIndex);
-}
+	return mSourceStream->GetCurrentPosition() - (mLastAvailableIndex - mCurrentBufferIndex) - mStartPosition;
+}
+
+void InputBufferedStream::MoveStartPosition(LongFilePositionType inStartPosition)
+{
+	mStartPosition = inStartPosition;
+}

package/src/deps/PDFWriter/InputBufferedStream.h

@@ -62,6 +62,7 @@ public:
 	virtual void SetPosition(LongFilePositionType inOffsetFromStart);
 	virtual void SetPositionFromEnd(LongFilePositionType inOffsetFromEnd);
 	virtual LongFilePositionType GetCurrentPosition();
+	virtual void MoveStartPosition(LongFilePositionType inStartPosition);
 
 	IByteReaderWithPosition* GetSourceStream();
 
@@ -71,6 +72,7 @@ private:
 	IOBasicTypes::Byte* mCurrentBufferIndex;
 	IOBasicTypes::Byte* mLastAvailableIndex;
 	IByteReaderWithPosition* mSourceStream;
+	LongFilePositionType mStartPosition;
 
 	void Initiate(IByteReaderWithPosition* inSourceReader,IOBasicTypes::LongBufferSizeType inBufferSize);
 

package/src/deps/PDFWriter/InputByteArrayStream.cpp

@@ -31,6 +31,7 @@ InputByteArrayStream::InputByteArrayStream(Byte* inByteArray,LongFilePositionTyp
 	mByteArray = inByteArray;
 	mArrayLength = inArrayLength;
 	mCurrentPosition = 0;
+	mStartPosition = 0;
 }
 
 InputByteArrayStream::~InputByteArrayStream(void)
@@ -42,6 +43,7 @@ void InputByteArrayStream::Assign(IOBasicTypes::Byte* inByteArray,IOBasicTypes::
 	mByteArray = inByteArray;
 	mArrayLength = inArrayLength;
 	mCurrentPosition = 0;
+	mStartPosition = 0;
 }
 
 LongBufferSizeType InputByteArrayStream::Read(IOBasicTypes::Byte* inBuffer,IOBasicTypes::LongBufferSizeType inBufferSize)
@@ -73,7 +75,7 @@ void InputByteArrayStream::Skip(LongBufferSizeType inSkipSize)
 
 void InputByteArrayStream::SetPosition(LongFilePositionType inOffsetFromStart)
 {
-	mCurrentPosition = inOffsetFromStart > mArrayLength ? mArrayLength:inOffsetFromStart;
+	mCurrentPosition = inOffsetFromStart > mArrayLength - mStartPosition ? mArrayLength : (mStartPosition + inOffsetFromStart);
 }
 
 void InputByteArrayStream::SetPositionFromEnd(LongFilePositionType inOffsetFromEnd)
@@ -83,5 +85,10 @@ void InputByteArrayStream::SetPositionFromEnd(LongFilePositionType inOffsetFromE
 
 LongFilePositionType InputByteArrayStream::GetCurrentPosition()
 {
-	return mCurrentPosition;
+	return mCurrentPosition - mStartPosition;
+}
+
+void InputByteArrayStream::MoveStartPosition(LongFilePositionType inStartPosition)
+{
+	mStartPosition = inStartPosition;
 }

package/src/deps/PDFWriter/InputByteArrayStream.h

@@ -38,11 +38,13 @@ public:
 	virtual void SetPosition(LongFilePositionType inOffsetFromStart);
 	virtual void SetPositionFromEnd(LongFilePositionType inOffsetFromEnd);
 	virtual LongFilePositionType GetCurrentPosition();
+	virtual void MoveStartPosition(LongFilePositionType inStartPosition);
 
 private:
 
 	IOBasicTypes::Byte* mByteArray;
 	LongFilePositionType mArrayLength;
 	LongFilePositionType mCurrentPosition;
+	LongFilePositionType mStartPosition;
 
 };

package/src/deps/PDFWriter/InputFileStream.cpp

@@ -26,6 +26,7 @@ using namespace PDFHummus;
 InputFileStream::InputFileStream(void)
 {
 	mStream = NULL;
+	mStartPosition = 0;
 }
 
 InputFileStream::~InputFileStream(void)
@@ -39,6 +40,7 @@ InputFileStream::InputFileStream(const std::string& inFilePath)
 {
 	mStream = NULL;
 	Open(inFilePath);
+	mStartPosition = 0;
 }
 
 EStatusCode InputFileStream::Open(const std::string& inFilePath)
@@ -78,13 +80,13 @@ void InputFileStream::Skip(LongBufferSizeType inSkipSize)
 void InputFileStream::SetPosition(LongFilePositionType inOffsetFromStart)
 {
 	if(mStream)
-		SAFE_FSEEK64(mStream,inOffsetFromStart,SEEK_SET);
+		SAFE_FSEEK64(mStream,mStartPosition + inOffsetFromStart,SEEK_SET);
 }
 
 LongFilePositionType InputFileStream::GetCurrentPosition()
 {
 	if(mStream)
-		return SAFE_FTELL64(mStream);
+		return SAFE_FTELL64(mStream) - mStartPosition;
 	else
 		return 0;
 }
@@ -115,3 +117,8 @@ void InputFileStream::SetPositionFromEnd(LongFilePositionType inOffsetFromEnd)
 			SAFE_FSEEK64(mStream,0,SEEK_SET);
 	}
 }
+
+void InputFileStream::MoveStartPosition(LongFilePositionType inStartPosition)
+{
+	mStartPosition = inStartPosition;
+}

package/src/deps/PDFWriter/InputFileStream.h

@@ -50,10 +50,12 @@ public:
 	virtual void SetPosition(LongFilePositionType inOffsetFromStart);
 	virtual void SetPositionFromEnd(LongFilePositionType inOffsetFromEnd);
 	virtual LongFilePositionType GetCurrentPosition();
+	virtual void MoveStartPosition(LongFilePositionType inStartPosition);
 
 	LongFilePositionType GetFileSize();
 
 private:
 
 	FILE* mStream;
+	LongFilePositionType mStartPosition;
 };

package/src/deps/PDFWriter/InputStringBufferStream.cpp

@@ -24,11 +24,13 @@
 InputStringBufferStream::InputStringBufferStream(MyStringBuf* inBufferToReadFrom)
 {
 	mBufferToReadFrom = inBufferToReadFrom;
+	mStartPosition = 0;
 }
 
 void InputStringBufferStream::Assign(MyStringBuf* inBufferToReadFrom)
 {
 	mBufferToReadFrom = inBufferToReadFrom;
+	mStartPosition = 0;
 }
 
 InputStringBufferStream::~InputStringBufferStream(void)
@@ -52,7 +54,7 @@ void InputStringBufferStream::Skip(LongBufferSizeType inSkipSize)
 
 void InputStringBufferStream::SetPosition(LongFilePositionType inOffsetFromStart)
 {
-	mBufferToReadFrom->pubseekoff((long)inOffsetFromStart,std::ios_base::beg);
+	mBufferToReadFrom->pubseekoff((long)mStartPosition + (long)inOffsetFromStart,std::ios_base::beg);
 }
 
 void InputStringBufferStream::SetPositionFromEnd(LongFilePositionType inOffsetFromEnd)
@@ -63,5 +65,10 @@ void InputStringBufferStream::SetPositionFromEnd(LongFilePositionType inOffsetFr
 
 LongFilePositionType InputStringBufferStream::GetCurrentPosition()
 {
-	return mBufferToReadFrom->GetCurrentReadPosition();
-}
+	return mBufferToReadFrom->GetCurrentReadPosition() - mStartPosition;
+}
+
+void InputStringBufferStream::MoveStartPosition(LongFilePositionType inStartPosition)
+{
+	mStartPosition = inStartPosition;
+}

package/src/deps/PDFWriter/InputStringBufferStream.h

@@ -43,9 +43,11 @@ public:
 	virtual void SetPosition(LongFilePositionType inOffsetFromStart);
 	virtual void SetPositionFromEnd(LongFilePositionType inOffsetFromEnd);
 	virtual LongFilePositionType GetCurrentPosition();
+	virtual void MoveStartPosition(LongFilePositionType inStartPosition);
 
 private:
 	MyStringBuf* mBufferToReadFrom;
+	LongFilePositionType mStartPosition;
 
 
 };

package/src/deps/PDFWriter/InputStringStream.cpp

@@ -32,6 +32,7 @@ InputStringStream::InputStringStream(const string& inString)
 	mStartPosition = inString.begin();
 	mEndPosition = inString.end();
 	mCurrentPosition = mStartPosition;
+	mString = inString;
 }
 
 InputStringStream::~InputStringStream(void)
@@ -43,6 +44,7 @@ void InputStringStream::Assign(const string& inString)
 	mStartPosition = inString.begin();
 	mEndPosition = inString.end();
 	mCurrentPosition = mStartPosition;
+	mString = inString;
 }
 
 LongBufferSizeType InputStringStream::Read(Byte* inBuffer, LongBufferSizeType inBufferSize)
@@ -79,3 +81,8 @@ LongFilePositionType InputStringStream::GetCurrentPosition()
 {
 	return mCurrentPosition - mStartPosition;
 }
+
+void InputStringStream::MoveStartPosition(LongFilePositionType inStartPosition)
+{
+	mStartPosition = mString.begin() + (string::size_type)inStartPosition;
+}

package/src/deps/PDFWriter/InputStringStream.h

@@ -40,11 +40,13 @@ public:
 	virtual void SetPosition(LongFilePositionType inOffsetFromStart);
 	virtual void SetPositionFromEnd(LongFilePositionType inOffsetFromEnd);
 	virtual LongFilePositionType GetCurrentPosition();
+	virtual void MoveStartPosition(LongFilePositionType inStartPosition);
 
 private:
 
 	std::string::const_iterator mStartPosition;
 	std::string::const_iterator mEndPosition;
 	std::string::const_iterator mCurrentPosition;
+	std::string mString;
 
 };

package/src/deps/PDFWriter/PDFParser.cpp

@@ -166,14 +166,20 @@ EStatusCode PDFParser::ParseHeaderLine()
 		return PDFHummus::eFailure;
 	}
 
-	if(tokenizerResult.second.compare(0,scPDFMagic.size(),scPDFMagic) != 0)
+	do
 	{
-		TRACE_LOG1("PDFParser::ParseHeaderLine, file does not begin as a PDF file. a PDF file should start with \"%%PDF-\". file header = %s",tokenizerResult.second.substr(0, MAX_TRACE_SIZE - 200).c_str());
-		return PDFHummus::eFailure;
-	}
+		if(tokenizerResult.second.compare(0,scPDFMagic.size(),scPDFMagic) == 0)
+		{
+			mPDFLevel = Double(tokenizerResult.second.substr(scPDFMagic.size()));
+			mStream->MoveStartPosition(mStream->GetCurrentPosition() - tokenizerResult.second.size() - 1);
+			return PDFHummus::eSuccess;
+		}
 
-	mPDFLevel = Double(tokenizerResult.second.substr(scPDFMagic.size()));
-	return PDFHummus::eSuccess;
+		tokenizerResult = tokenizer.GetNextToken();
+	} while (tokenizerResult.first && mStream->GetCurrentPosition() < 1024);
+
+	TRACE_LOG("PDFParser::ParseHeaderLine, file does not begin as a PDF file. a PDF file should contain \"%%PDF-\" within the first 1024 bytes.");
+	return PDFHummus::eFailure;
 }
 
 static const std::string scEOF = "%%EOF";