muhammara 2.5.0 → 2.6.0

package/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.6.0] - 2022-06-30
+
+### Changed
+
+- Fixes hard crash to exception when creating a stream with null object and calling createWriter with it
+- Fixes missing buffer information for recrypt typescript definition
+- Fixes missing options for append pdf pages
+- Fixes NPE when stream is not readable in write stream object (PDFDocumentHandler)
+
 ## [2.5.0] - 2022-06-23
 
 ### Added
@@ -232,7 +241,8 @@ with the following changes.
 
 * Initial release
 
-[Unreleased]: https://github.com/julianhille/MuhammaraJS/compare/2.5.0...HEAD
+[Unreleased]: https://github.com/julianhille/MuhammaraJS/compare/2.6.0...HEAD
+[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
 [2.3.0]: https://github.com/julianhille/MuhammaraJS/compare/2.2.0...2.3.0

package/muhammara.d.ts

@@ -40,8 +40,8 @@ declare module 'muhammara' {
     options?: PDFRecryptOptions,
   ): void;
   export function recrypt(
-    originalPdfStream: PDFRStreamForFile,
-    newPdfStream: PDFWStreamForFile,
+    originalPdfStream: PDFRStreamForFile | PDFRStreamForBuffer,
+    newPdfStream: PDFWStreamForFile | PDFWStreamForBuffer,
     options?: PDFRecryptOptions,
   ): void;
 
@@ -652,6 +652,8 @@ declare module 'muhammara' {
     specificRanges?: [[number, number]];
   }
 
+  export interface AppendOptions extends MergeOptions {}
+
   export type inInterPagesCallback = () => {}
 
 
@@ -680,7 +682,7 @@ declare module 'muhammara' {
     retrieveJPGImageInformation(filePath: FilePath): JPEGInformation;
     getObjectsContext(): ObjectsContext;
     getDocumentContext(): DocumentContext;
-    appendPDFPagesFromPDF(source: FilePath | ReadStream): number[];
+    appendPDFPagesFromPDF(source: FilePath | ReadStream, options?: AppendOptions): number[];
     mergePDFPagesToPage(page: PDFPage, file: FilePath | PDFRStreamForFile, options?: MergeOptions, callback?: inInterPagesCallback): this;
     mergePDFPagesToPage(page: PDFPage, file: FilePath | PDFRStreamForFile, callback?: inInterPagesCallback) : this;
     createPDFCopyingContext(source: FilePath | ReadStream): DocumentCopyingContext;

package/node_modules/minipass/index.d.ts

@@ -76,8 +76,8 @@ export default class Minipass<
   // Options required if not reading buffers
   constructor(
     ...args: RType extends Buffer
-      ? [options?: Options<RType>]
-      : [options: Options<RType>]
+      ? [] | [Options<RType>]
+      : [Options<RType>]
   )
 
   write(chunk: WType, cb?: () => void): boolean

package/node_modules/minipass/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "minipass@^3.0.0",
-  "_id": "minipass@3.3.3",
+  "_id": "minipass@3.3.4",
   "_inBundle": false,
-  "_integrity": "sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==",
+  "_integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
   "_location": "/minipass",
   "_phantomChildren": {},
   "_requested": {
@@ -20,8 +20,8 @@
     "/minizlib",
     "/tar"
   ],
-  "_resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.3.tgz",
-  "_shasum": "fd1f0e6c06449c10dadda72618b59c00f3d6378d",
+  "_resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
+  "_shasum": "ca99f95dd77c43c7a76bf51e6d200025eee0ffae",
   "_spec": "minipass@^3.0.0",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/tar",
   "author": {
@@ -86,5 +86,5 @@
   "tap": {
     "check-coverage": true
   },
-  "version": "3.3.3"
+  "version": "3.3.4"
 }

package/package.json

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

package/src/ObjectByteWriterWithPosition.cpp

@@ -52,12 +52,20 @@ IOBasicTypes::LongBufferSizeType ObjectByteWriterWithPosition::Write(const IOBas
     
     Local<Value> args[1];
     args[0] = anArray;
-    
-	Local<Value> result = func->Call(GET_CURRENT_CONTEXT,  OBJECT_FROM_PERSISTENT(mObject), 1, args).ToLocalChecked();
+    MaybeLocal<Value> maybe;
+    TryCatch try_catch(Isolate::GetCurrent());
+
+    maybe = func->Call(GET_CURRENT_CONTEXT,  OBJECT_FROM_PERSISTENT(mObject), 1, args);
+    Local <Value> result;
+
+    if (!maybe.ToLocal(&result)) {
+       try_catch.ReThrow();
+       return 0;
+    }
     if(result.IsEmpty())
     {
-		THROW_EXCEPTION("wrong return value. it's empty. return the number of written characters");
-		return 0;
+        THROW_EXCEPTION("wrong return value. it's empty. return the number of written characters");
+        return 0;
     }
     else if(result->IsNumber())
     {
@@ -65,8 +73,8 @@ IOBasicTypes::LongBufferSizeType ObjectByteWriterWithPosition::Write(const IOBas
     }
     else
     {
-		THROW_EXCEPTION("wrong return value. write should return the number of written characters");
-		return 0;
+        THROW_EXCEPTION("wrong return value. write should return the number of written characters");
+        return 0;
     }
 }
 
@@ -81,4 +89,4 @@ IOBasicTypes::LongFilePositionType ObjectByteWriterWithPosition::GetCurrentPosit
     Local<Function> func = Local<Function>::Cast(value);
     
 	return TO_NUMBER(func->Call(GET_CURRENT_CONTEXT, OBJECT_FROM_PERSISTENT(mObject), 0, NULL).ToLocalChecked())->Value();
-}
+}

package/src/deps/PDFWriter/PDFDocumentHandler.cpp

@@ -2032,6 +2032,10 @@ EStatusCode PDFDocumentHandler::WriteStreamObject(PDFStreamInput* inStream, IObj
 	if(!readingDecrypted) {
 		streamReader = mParser->StartReadingFromStreamForPlainCopying(inStream);
 	}
+
+	if (streamReader == NULL) {
+               status = PDFHummus::eFailure;
+	}
 	
 	while (it.MoveNext() && PDFHummus::eSuccess == status)
 	{