muhammara 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [4.1.0] - 2023-12-13
+
+### Fixed
+
+- definitions: appendPage optionnal parameter
+- Build musl/musl-arm with node 20
+- Support negative rotation in recipe page changes
+- registerFont now returns recipe as stated in typescript definition
+
+### Added
+
+- Add nodejs v21.0.0
+
+## [4.0.0] - 2023-07-14
+
 ### Fixed
 
 - Underline in text object
@@ -21,14 +36,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Electron v24.1, 24.2, 24.3, 24.4, 24.5, 24.6
 - Add node 20.x
 - Add electron v25.0, 25.1, 25.2, 25.3
+- Option to add annotation replies to annotations
+- Textboxes now show title and date as annotations in pdfs
 
 ### Removed
 
 - Dependency to static-eval and static-module as they are not used directly
+- Node versions: 11.x - 14.x
+- Electron versions: 11.x - 14.2
 
 ### Changed
 
+- Updated node-gyp version to 1.0.10
 - Older node ubuntu 18.04 builds are now building on docker, as github actions removed 18.04
+- CI linux builds use ubuntu 20.04 instead of 18.04 -> glibc Update, see readme for breaking changes in v4
 
 ## [3.8.0] - 2023-03-01
 
@@ -391,7 +412,9 @@ with the following changes.
 
 - Initial release
 
-[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/3.8.0...HEAD
+[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/4.1.0...HEAD
+[4.1.0]: https://github.com/julianhille/MuhammaraJS/compare/4.0.0...4.1.0
+[4.0.0]: https://github.com/julianhille/MuhammaraJS/compare/3.8.0...4.0.0
 [3.8.0]: https://github.com/julianhille/MuhammaraJS/compare/3.7.0...3.8.0
 [3.7.0]: https://github.com/julianhille/MuhammaraJS/compare/3.6.0...3.7.0
 [3.6.0]: https://github.com/julianhille/MuhammaraJS/compare/3.5.0...3.6.0

package/lib/PDFRStreamForBuffer.js

@@ -5,17 +5,16 @@
 */
 
 function PDFRStreamForBuffer(buffer) {
-  this.innerArray = Array.prototype.slice.call(buffer, 0);
+  this.buffer = buffer;
   this.rposition = 0;
-  this.fileSize = this.innerArray.length;
+  this.fileSize = this.buffer.length;
   this.mStartPosition = 0;
 }
 
 PDFRStreamForBuffer.prototype.read = function (inAmount) {
   var amountToRead = inAmount;
-  var arr = this.innerArray.slice(
-    this.rposition,
-    this.rposition + amountToRead
+  var arr = Array.from(
+    this.buffer.subarray(this.rposition, this.rposition + amountToRead)
   );
   this.rposition += amountToRead;
   return arr;

package/lib/recipe/annotation.js

@@ -27,18 +27,22 @@ exports.comment = function comment(text = "", x, y, options = {}) {
  * @name annot
  * @function
  * @memberof Recipe
- * @todo support for rich texst RC
+ * @todo support for rich text RC
  * @todo support for opacity CA
  * @param {number} x - The coordinate x
  * @param {number} y - The coordinate y
- * @param {string} subtype - The markup annotation type 'Text'|'FreeText'|'Line'|'Square'|'Circle'|'Polygon'|'PolyLine'|'Highlight'|'Underline'|'Squiggly'|'StrikeOut'|'Stamp'|'Caret'|'Ink'|'FileAttachment'|'Sound'
+ * @param {string} subtype - The markup annotation type 'Text'|'Link'|'FreeText'|'Line'|'Square'|'Circle'|'Polygon'|'PolyLine'|'Highlight'|'Underline'|'Squiggly'|'StrikeOut'|'Caret'|'Stamp'|'Ink'|'Popup'|'FileAttachment'|'Sound'|'Movie'|'Screen'|'Widget'|'PrinterMark'|'TrapNet'|'Watermark'|'3D'|'Redact'|'Projection'|'RichMedia'
  * @param {Object} [options] - The options
  * @param {string} [options.title] - The title.
- * @param {boolean} [options.open=false] - Open the annotation by default?
+ * @param {boolean} [options.open=false] - Open the annotation. Annotation will be closed by default. Specific to text annotations; subtype='Text'
+ * @param {boolean} [options.richText] - Rich text
  * @param {'invisible'|'hidden'|'print'|'nozoom'|'norotate'|'noview'|'readonly'|'locked'|'togglenoview'} [options.flag] - The flag property
- * @param {'Comment'|'Key'|'Note'|'Help'|'NewParagraph'|'Paragraph'|'Insert'} [options.icon] - The icon of annotation.
+ * @param {'Comment'|'Key'|'Note'|'Help'|'NewParagraph'|'Paragraph'|'Insert'} [options.icon='Note'] - The icon of annotation. Specific to text annotations. Default value: 'Note'
  * @param {number} [options.width] - Width
  * @param {number} [options.height] - Height
+ * @param {string} [options.date] - Date of annotation
+ * @param {string} [options.subject] - The subject.
+ * @param {Array} [options.replies] - Array of annotation replies
  */
 exports.annot = function annot(
   x,
@@ -46,11 +50,12 @@ exports.annot = function annot(
   subtype,
   options = { text: "", width: 0, height: 0 }
 ) {
-  const { text, width, height } = options;
+  const { text, width, height, replies } = options;
   this.annotationsToWrite.push({
     subtype,
     args: { text, x, y, width, height, options },
     pageNumber: this.pageNumber,
+    replies,
   });
   return this;
 };
@@ -59,8 +64,9 @@ exports.annot = function annot(
 // Link, Popup, Movie, Widget, Screen, PrinterMark, TrapNet, Watermark, 3D
 exports._attachNonMarkupAnnot = function _attachNonMarkupAnnot() {};
 
-exports._annot = function _annot(subtype, args = {}, pageNumber) {
-  const { x, y, width, height, text, options } = args;
+exports._annot = function _annot(subtype, args = {}, pageNumber, ref) {
+  const { x, y, width, height, options, reply } = args;
+  let { text } = args;
   this._startDictionary(pageNumber);
   const { rotate } = this.metadata[pageNumber];
   let { nx, ny } = this._calibrateCoordinateForAnnots(x, y, 0, 0, pageNumber);
@@ -92,7 +98,7 @@ exports._annot = function _annot(subtype, args = {}, pageNumber) {
     {
       title: "",
       subject: "",
-      date: new Date(),
+      date: "",
       open: false,
       flag: "", // 'readonly'
     },
@@ -103,6 +109,15 @@ exports._annot = function _annot(subtype, args = {}, pageNumber) {
   const ey = nHeight ? nHeight : 0;
   const position = [nx, ny, nx + ex, ny + ey];
 
+  if (reply && ref) {
+    text = reply.text;
+    params.title = reply.title || params.title;
+    params.date = reply.date || params.date;
+    params.subject = reply.subject || params.subject;
+    params.richText = Boolean(reply.richText);
+    params.flag = reply.flag || params.flag;
+  }
+
   this.dictionaryContext
     .writeKey("Type")
     .writeNameValue("Annot")
@@ -117,7 +132,9 @@ exports._annot = function _annot(subtype, args = {}, pageNumber) {
     .writeKey("T")
     .writeLiteralStringValue(params.title || "")
     .writeKey("M")
-    .writeLiteralStringValue(this.writer.createPDFDate(params.date).toString())
+    .writeLiteralStringValue(
+      this.writer.createPDFDate(new Date(params.date)).toString()
+    )
     .writeKey("Open")
     .writeBooleanValue(params.open)
     .writeKey("F")
@@ -127,9 +144,9 @@ exports._annot = function _annot(subtype, args = {}, pageNumber) {
    * Rich Text Strings
    * 12.7.3.4
    */
-  if (text && options.richText) {
+  if (text && params.richText) {
     const richText =
-      text.substring(0, 5) !== "<?xml" ? contentToRC(text) : options.richText;
+      text.substring(0, 5) !== "<?xml" ? contentToRC(text) : params.richText;
     const richTextContent = richText;
     this.dictionaryContext
       .writeKey("RC")
@@ -141,6 +158,14 @@ exports._annot = function _annot(subtype, args = {}, pageNumber) {
       .writeLiteralStringValue(textContent);
   }
 
+  if (reply && ref) {
+    this.dictionaryContext
+      .writeKey("IRT")
+      .writeObjectReferenceValue(ref)
+      .writeKey("RT")
+      .writeNameValue("R");
+  }
+
   let { border, color } = options;
 
   if (this._getTextMarkupAnnotationSubtype(subtype)) {
@@ -212,12 +237,19 @@ exports._annot = function _annot(subtype, args = {}, pageNumber) {
   if (params.icon) {
     this.dictionaryContext.writeKey("Name").writeNameValue(params.icon);
   }
-  this._endDictionary(pageNumber);
+  return this._endDictionary(pageNumber);
 };
 
 exports._writeAnnotations = function _writeAnnotations() {
   this.annotationsToWrite.forEach((annot) => {
-    this._annot(annot.subtype, annot.args, annot.pageNumber);
+    const ref = this._annot(annot.subtype, annot.args, annot.pageNumber);
+
+    if (annot.replies) {
+      annot.replies.forEach((reply) => {
+        annot.args.reply = reply;
+        this._annot(annot.subtype, annot.args, annot.pageNumber, ref);
+      });
+    }
   });
   this.annotations.forEach((pageAnnots, index) => {
     this._writeAnnotation(index);
@@ -276,6 +308,8 @@ exports._endDictionary = function _endDictionary(pageNumber) {
   const pageIndex = pageNumber - 1;
   this.annotations[pageIndex] = this.annotations[pageIndex] || [];
   this.annotations[pageIndex].push(this.dictionaryObject);
+
+  return this.dictionaryObject;
 };
 
 exports._getTextMarkupAnnotationSubtype =

package/lib/recipe/font.js

@@ -79,6 +79,8 @@ exports._registerFont = function _registerFont(
       break;
   }
   this.fonts[family] = font;
+
+  return this;
 };
 
 function _getFontFile(self, options = {}) {

package/lib/recipe/page.js

@@ -184,12 +184,15 @@ exports._resumePageRotation = function _resumePageRotation(
 
   switch (rotate) {
     case 90:
+    case -270:
       context.cm(0, 1, -1, 0, height - startX, startY);
       break;
     case 180:
+    case -180:
       context.cm(-1, 0, 0, -1, width, height);
       break;
     case 270:
+    case -90:
       context.cm(0, -1, 1, 0, startX, width - startY);
       break;
 

package/lib/recipe/text.js

@@ -238,6 +238,13 @@ exports._makeTextBox = function _makeTextBox(options) {
  * @param {string|number[]} [options.textBox.style.fill] - Text Box border background color (HexColor, PercentColor or DecimalColor)
  * @param {number} [options.textBox.style.opacity=1] - Text Box border background opacity
  * @param {boolean|number|number[]} [options.textBox.style.borderRadius=0] - Border radius to apply to get rounded corners.
+ * @param {string} [options.title] - Title of annotation
+ * @param {boolean} [options.open=false] - Open the annotation. Annotation will be closed by default. Specific to text annotations; subtype='Text'
+ * @param {boolean} [options.richText] - Rich text in annotation
+ * @param {AnnotOptionsFlag} [options.flag] - The flag property of annotation
+ * @param {AnnotOptionsIcon} [options.icon='Note'] - The icon of annotation. Specific to text annotations. Default value: 'Note'
+ * @param {string} [options.date] - Date of text to show up on annotation
+ * @param {string} [options.subject] - Subject of annotation
  * When true is given, the default radius size for all corners is 5. A four number array may be used to give specific sizees to each
  * corner. The numbering starts from the top, left corner, and goes clockwise around the text box.
  */
@@ -562,13 +569,24 @@ exports.text = function text(text = "", x, y, options = {}) {
               typeof targetAnnotations[key] != "object"
                 ? {}
                 : targetAnnotations[key];
+            const { title, open, richText, flag, icon, date, subject } =
+              targetAnnotations;
             Object.assign(markupOption, {
               height: textHeight * 1.4,
               width: currentLineWidth,
               text: markupOption.text || "",
               _textHeight: textHeight,
+              // add options to annotation
+              title: title || "",
+              open: Boolean(open),
+              richText: Boolean(richText),
+              flag: flag || "",
+              icon: icon || "",
+              date: date || "",
+              subject: subject || "",
             });
             const { ox, oy } = this._reverseCoordinate(x, y - textHeight * 0.2);
+
             this.annot(ox, oy, subtype, markupOption);
           }
         }

package/muhammara.d.ts

@@ -820,6 +820,7 @@ declare module "muhammara" {
 
     type AnnotSubtype =
       | "Text"
+      | "Link"
       | "FreeText"
       | "Line"
       | "Square"
@@ -830,11 +831,22 @@ declare module "muhammara" {
       | "Underline"
       | "Squiggly"
       | "StrikeOut"
-      | "Stamp"
       | "Caret"
+      | "Stamp"
       | "Ink"
+      | "Popup"
       | "FileAttachment"
-      | "Sound";
+      | "Sound"
+      | "Movie"
+      | "Screen"
+      | "Widget"
+      | "PrinterMark"
+      | "TrapNet"
+      | "Watermark"
+      | "3D"
+      | "Redact"
+      | "Projection"
+      | "RichMedia";
 
     type AnnotOptionsFlag =
       | "invisible"
@@ -845,7 +857,8 @@ declare module "muhammara" {
       | "noview"
       | "readonly"
       | "locked"
-      | "togglenoview";
+      | "togglenoview"
+      | "lockedcontents";
 
     type AnnotOptionsIcon =
       | "Comment"
@@ -880,6 +893,19 @@ declare module "muhammara" {
       icon?: AnnotOptionsIcon;
       width?: number;
       height?: number;
+      date?: string;
+      subject?: string;
+      replies?: Array<AnnotReply>;
+    }
+
+    interface AnnotReply {
+      subtype?: AnnotSubtype;
+      text: string;
+      title?: string;
+      richText?: boolean;
+      flag?: AnnotOptionsFlag;
+      date?: string;
+      subject?: string;
     }
 
     interface EncryptOptions {
@@ -954,6 +980,13 @@ declare module "muhammara" {
             opacity?: number;
           };
       textBox?: TextBox;
+      title?: string;
+      open?: boolean;
+      richText?: boolean;
+      flag?: AnnotOptionsFlag;
+      icon?: AnnotOptionsIcon;
+      date?: string;
+      subject?: string;
     }
 
     interface LineToOptions {
@@ -1007,9 +1040,17 @@ declare module "muhammara" {
   }
 
   export class Recipe {
-    constructor(src: string, output?: string, options?: Recipe.RecipeOptions);
-
-    constructor(buffer: Buffer, options?: Recipe.RecipeOptions);
+    constructor(
+      src: string,
+      output?: string | null,
+      options?: Recipe.RecipeOptions
+    );
+
+    constructor(
+      buffer: Buffer,
+      output?: string | null,
+      options?: Recipe.RecipeOptions
+    );
 
     comment(
       text: string,
@@ -1025,7 +1066,7 @@ declare module "muhammara" {
       options?: Recipe.AnnotOptions
     ): Recipe;
 
-    appendPage(pdfSrc: string, pages: number | number[]): Recipe;
+    appendPage(pdfSrc: string, pages?: number | number[]): Recipe;
 
     encrypt(options: Recipe.EncryptOptions): Recipe;
 

package/node_modules/@mapbox/node-pre-gyp/.github/workflows/codeql.yml

@@ -0,0 +1,74 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '24 5 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

package/node_modules/@mapbox/node-pre-gyp/CHANGELOG.md

@@ -1,5 +1,8 @@
 # node-pre-gyp changelog
 
+## 1.0.11
+- Fixes dependabot alert [CVE-2021-44906](https://nvd.nist.gov/vuln/detail/CVE-2021-44906)
+
 ## 1.0.10
 - Upgraded minimist to 1.2.6 to address dependabot alert [CVE-2021-44906](https://nvd.nist.gov/vuln/detail/CVE-2021-44906)
 

package/node_modules/@mapbox/node-pre-gyp/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@mapbox/node-pre-gyp@^1.0.10",
-  "_id": "@mapbox/node-pre-gyp@1.0.10",
+  "_id": "@mapbox/node-pre-gyp@1.0.11",
   "_inBundle": false,
-  "_integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
+  "_integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
   "_location": "/@mapbox/node-pre-gyp",
   "_phantomChildren": {},
   "_requested": {
@@ -19,8 +19,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
-  "_shasum": "8e6735ccebbb1581e5a7e652244cadc8a844d03c",
+  "_resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+  "_shasum": "417db42b7f5323d79e93b34a6d7a2a12c0df43fa",
   "_spec": "@mapbox/node-pre-gyp@^1.0.10",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS",
   "author": {
@@ -93,5 +93,5 @@
     "update-crosswalk": "node scripts/abi_crosswalk.js",
     "upload-coverage": "nyc report --reporter json && codecov --clear --flags=unit --file=./coverage/coverage-final.json"
   },
-  "version": "1.0.10"
+  "version": "1.0.11"
 }

package/node_modules/balanced-match/package.json

@@ -16,7 +16,8 @@
     "fetchSpec": "^1.0.0"
   },
   "_requiredBy": [
-    "/brace-expansion"
+    "/brace-expansion",
+    "/mocha/minimatch/brace-expansion"
   ],
   "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
   "_shasum": "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee",

package/node_modules/brace-expansion/package.json

@@ -17,7 +17,7 @@
   },
   "_requiredBy": [
     "/minimatch",
-    "/mocha/minimatch"
+    "/mocha/glob/minimatch"
   ],
   "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
   "_shasum": "3c7fcbf529d87226f3d2f52b966ff5271eb441dd",

package/node_modules/debug/package.json

@@ -17,7 +17,8 @@
   },
   "_requiredBy": [
     "/agent-base",
-    "/https-proxy-agent"
+    "/https-proxy-agent",
+    "/mocha"
   ],
   "_resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
   "_shasum": "1319f6579357f2338d3337d2cdd4914bb5dcc865",

package/node_modules/detect-libc/README.md

@@ -8,6 +8,9 @@ Currently supports detection of GNU glibc and MUSL libc.
 Provides asychronous and synchronous functions for the
 family (e.g. `glibc`, `musl`) and version (e.g. `1.23`, `1.2.3`).
 
+The version numbers of libc implementations
+are not guaranteed to be semver-compliant.
+
 For previous v1.x releases, please see the
 [v1](https://github.com/lovell/detect-libc/tree/v1) branch.
 
@@ -147,7 +150,7 @@ if (isNonGlibcLinuxSync()) { ... }
 
 ## Licensing
 
-Copyright 2017, 2022 Lovell Fuller
+Copyright 2017 Lovell Fuller and others.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/node_modules/detect-libc/index.d.ts

@@ -1,3 +1,6 @@
+// Copyright 2017 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
 export const GLIBC: 'glibc';
 export const MUSL: 'musl';
 

package/node_modules/detect-libc/lib/detect-libc.js

@@ -1,7 +1,14 @@
+// Copyright 2017 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
 'use strict';
 
 const childProcess = require('child_process');
 const { isLinux, getReport } = require('./process');
+const { LDD_PATH, readFile, readFileSync } = require('./filesystem');
+
+let cachedFamilyFilesystem;
+let cachedVersionFilesystem;
 
 const command = 'getconf GNU_LIBC_VERSION 2>&1 || true; ldd --version 2>&1 || true';
 let commandOut = '';
@@ -36,6 +43,12 @@ const safeCommandSync = () => {
  */
 const GLIBC = 'glibc';
 
+/**
+ * A Regexp constant to get the GLIBC Version.
+ * @type {string}
+ */
+const RE_GLIBC_VERSION = /GLIBC\s(\d+\.\d+)/;
+
 /**
  * A String constant containing the value `musl`.
  * @type {string}
@@ -43,6 +56,18 @@ const GLIBC = 'glibc';
  */
 const MUSL = 'musl';
 
+/**
+ * This string is used to find if the {@link LDD_PATH} is GLIBC
+ * @type {string}
+ */
+const GLIBC_ON_LDD = GLIBC.toUpperCase();
+
+/**
+ * This string is used to find if the {@link LDD_PATH} is musl
+ * @type {string}
+ */
+const MUSL_ON_LDD = MUSL.toLowerCase();
+
 const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-');
 
 const familyFromReport = () => {
@@ -69,6 +94,40 @@ const familyFromCommand = (out) => {
   return null;
 };
 
+const getFamilyFromLddContent = (content) => {
+  if (content.includes(MUSL_ON_LDD)) {
+    return MUSL;
+  }
+  if (content.includes(GLIBC_ON_LDD)) {
+    return GLIBC;
+  }
+  return null;
+};
+
+const familyFromFilesystem = async () => {
+  if (cachedFamilyFilesystem !== undefined) {
+    return cachedFamilyFilesystem;
+  }
+  cachedFamilyFilesystem = null;
+  try {
+    const lddContent = await readFile(LDD_PATH);
+    cachedFamilyFilesystem = getFamilyFromLddContent(lddContent);
+  } catch (e) {}
+  return cachedFamilyFilesystem;
+};
+
+const familyFromFilesystemSync = () => {
+  if (cachedFamilyFilesystem !== undefined) {
+    return cachedFamilyFilesystem;
+  }
+  cachedFamilyFilesystem = null;
+  try {
+    const lddContent = readFileSync(LDD_PATH);
+    cachedFamilyFilesystem = getFamilyFromLddContent(lddContent);
+  } catch (e) {}
+  return cachedFamilyFilesystem;
+};
+
 /**
  * Resolves with the libc family when it can be determined, `null` otherwise.
  * @returns {Promise<?string>}
@@ -76,7 +135,10 @@ const familyFromCommand = (out) => {
 const family = async () => {
   let family = null;
   if (isLinux()) {
-    family = familyFromReport();
+    family = await familyFromFilesystem();
+    if (!family) {
+      family = familyFromReport();
+    }
     if (!family) {
       const out = await safeCommand();
       family = familyFromCommand(out);
@@ -92,7 +154,10 @@ const family = async () => {
 const familySync = () => {
   let family = null;
   if (isLinux()) {
-    family = familyFromReport();
+    family = familyFromFilesystemSync();
+    if (!family) {
+      family = familyFromReport();
+    }
     if (!family) {
       const out = safeCommandSync();
       family = familyFromCommand(out);
@@ -113,6 +178,36 @@ const isNonGlibcLinux = async () => isLinux() && await family() !== GLIBC;
  */
 const isNonGlibcLinuxSync = () => isLinux() && familySync() !== GLIBC;
 
+const versionFromFilesystem = async () => {
+  if (cachedVersionFilesystem !== undefined) {
+    return cachedVersionFilesystem;
+  }
+  cachedVersionFilesystem = null;
+  try {
+    const lddContent = await readFile(LDD_PATH);
+    const versionMatch = lddContent.match(RE_GLIBC_VERSION);
+    if (versionMatch) {
+      cachedVersionFilesystem = versionMatch[1];
+    }
+  } catch (e) {}
+  return cachedVersionFilesystem;
+};
+
+const versionFromFilesystemSync = () => {
+  if (cachedVersionFilesystem !== undefined) {
+    return cachedVersionFilesystem;
+  }
+  cachedVersionFilesystem = null;
+  try {
+    const lddContent = readFileSync(LDD_PATH);
+    const versionMatch = lddContent.match(RE_GLIBC_VERSION);
+    if (versionMatch) {
+      cachedVersionFilesystem = versionMatch[1];
+    }
+  } catch (e) {}
+  return cachedVersionFilesystem;
+};
+
 const versionFromReport = () => {
   const report = getReport();
   if (report.header && report.header.glibcVersionRuntime) {
@@ -141,7 +236,10 @@ const versionFromCommand = (out) => {
 const version = async () => {
   let version = null;
   if (isLinux()) {
-    version = versionFromReport();
+    version = await versionFromFilesystem();
+    if (!version) {
+      version = versionFromReport();
+    }
     if (!version) {
       const out = await safeCommand();
       version = versionFromCommand(out);
@@ -157,7 +255,10 @@ const version = async () => {
 const versionSync = () => {
   let version = null;
   if (isLinux()) {
-    version = versionFromReport();
+    version = versionFromFilesystemSync();
+    if (!version) {
+      version = versionFromReport();
+    }
     if (!version) {
       const out = safeCommandSync();
       version = versionFromCommand(out);

package/node_modules/detect-libc/lib/filesystem.js

@@ -0,0 +1,41 @@
+// Copyright 2017 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
+'use strict';
+
+const fs = require('fs');
+
+/**
+ * The path where we can find the ldd
+ */
+const LDD_PATH = '/usr/bin/ldd';
+
+/**
+ * Read the content of a file synchronous
+ *
+ * @param {string} path
+ * @returns {string}
+ */
+const readFileSync = (path) => fs.readFileSync(path, 'utf-8');
+
+/**
+ * Read the content of a file
+ *
+ * @param {string} path
+ * @returns {Promise<string>}
+ */
+const readFile = (path) => new Promise((resolve, reject) => {
+  fs.readFile(path, 'utf-8', (err, data) => {
+    if (err) {
+      reject(err);
+    } else {
+      resolve(data);
+    }
+  });
+});
+
+module.exports = {
+  LDD_PATH,
+  readFileSync,
+  readFile
+};

package/node_modules/detect-libc/lib/process.js

@@ -1,3 +1,6 @@
+// Copyright 2017 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
 'use strict';
 
 const isLinux = () => process.platform === 'linux';

package/node_modules/detect-libc/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "detect-libc@^2.0.0",
-  "_id": "detect-libc@2.0.1",
+  "_id": "detect-libc@2.0.2",
   "_inBundle": false,
-  "_integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+  "_integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
   "_location": "/detect-libc",
   "_phantomChildren": {},
   "_requested": {
@@ -18,8 +18,8 @@
   "_requiredBy": [
     "/@mapbox/node-pre-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-  "_shasum": "e1897aa88fa6ad197862937fbc0441ef352ee0cd",
+  "_resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
+  "_shasum": "8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d",
   "_spec": "detect-libc@^2.0.0",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/@mapbox/node-pre-gyp",
   "author": {
@@ -34,12 +34,17 @@
     {
       "name": "Niklas Salmoukas",
       "email": "niklas@salmoukas.com"
+    },
+    {
+      "name": "Vinícius Lourenço",
+      "email": "vinyygamerlol@gmail.com"
     }
   ],
   "deprecated": false,
   "description": "Node.js module to detect the C standard library (libc) implementation family and version",
   "devDependencies": {
     "ava": "^2.4.0",
+    "benchmark": "^2.1.4",
     "nyc": "^15.1.0",
     "proxyquire": "^2.1.3",
     "semistandard": "^14.2.3"
@@ -65,7 +70,9 @@
     "url": "git://github.com/lovell/detect-libc.git"
   },
   "scripts": {
+    "bench": "node benchmark/detect-libc",
+    "bench:calls": "node benchmark/call-familySync.js && sleep 1 && node benchmark/call-isNonGlibcLinuxSync.js && sleep 1 && node benchmark/call-versionSync.js",
     "test": "semistandard && nyc --reporter=lcov --check-coverage --branches=100 ava test/unit.js"
   },
-  "version": "2.0.1"
+  "version": "2.0.2"
 }

package/node_modules/node-fetch/README.md

@@ -387,7 +387,6 @@ Header              | Value
 ------------------- | --------------------------------------------------------
 `Accept-Encoding`   | `gzip,deflate` _(when `options.compress === true`)_
 `Accept`            | `*/*`
-`Connection`        | `close` _(when no `options.agent` is present)_
 `Content-Length`    | _(automatically calculated, if possible)_
 `Transfer-Encoding` | `chunked` _(when `req.body` is a stream)_
 `User-Agent`        | `node-fetch/1.0 (+https://github.com/bitinn/node-fetch)`
@@ -404,6 +403,8 @@ The `agent` option allows you to specify networking related options which are ou
 
 See [`http.Agent`](https://nodejs.org/api/http.html#http_new_agent_options) for more information.
 
+If no agent is specified, the default agent provided by Node.js is used. Note that [this changed in Node.js 19](https://github.com/nodejs/node/blob/4267b92604ad78584244488e7f7508a690cb80d0/lib/_http_agent.js#L564) to have `keepalive` true by default. If you wish to enable `keepalive` in an earlier version of Node.js, you can override the agent as per the following code sample. 
+
 In addition, the `agent` option accepts a function that returns `http`(s)`.Agent` instance given current [URL](https://nodejs.org/api/url.html), this is useful during a redirection chain across HTTP and HTTPS protocol.
 
 ```js

package/node_modules/node-fetch/lib/index.es.js

@@ -1361,10 +1361,6 @@ function getNodeRequestOptions(request) {
 		agent = agent(parsedURL);
 	}
 
-	if (!headers.has('Connection') && !agent) {
-		headers.set('Connection', 'close');
-	}
-
 	// HTTP-network fetch step 4.2
 	// chunked encoding is handled by Node.js
 
@@ -1778,4 +1774,4 @@ fetch.isRedirect = function (code) {
 fetch.Promise = global.Promise;
 
 export default fetch;
-export { Headers, Request, Response, FetchError };
+export { Headers, Request, Response, FetchError, AbortError };

package/node_modules/node-fetch/lib/index.js

@@ -1365,10 +1365,6 @@ function getNodeRequestOptions(request) {
 		agent = agent(parsedURL);
 	}
 
-	if (!headers.has('Connection') && !agent) {
-		headers.set('Connection', 'close');
-	}
-
 	// HTTP-network fetch step 4.2
 	// chunked encoding is handled by Node.js
 
@@ -1788,3 +1784,4 @@ exports.Headers = Headers;
 exports.Request = Request;
 exports.Response = Response;
 exports.FetchError = FetchError;
+exports.AbortError = AbortError;

package/node_modules/node-fetch/lib/index.mjs

@@ -1359,10 +1359,6 @@ function getNodeRequestOptions(request) {
 		agent = agent(parsedURL);
 	}
 
-	if (!headers.has('Connection') && !agent) {
-		headers.set('Connection', 'close');
-	}
-
 	// HTTP-network fetch step 4.2
 	// chunked encoding is handled by Node.js
 
@@ -1776,4 +1772,4 @@ fetch.isRedirect = function (code) {
 fetch.Promise = global.Promise;
 
 export default fetch;
-export { Headers, Request, Response, FetchError };
+export { Headers, Request, Response, FetchError, AbortError };

package/node_modules/node-fetch/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "node-fetch@^2.6.7",
-  "_id": "node-fetch@2.6.12",
+  "_id": "node-fetch@2.7.0",
   "_inBundle": false,
-  "_integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+  "_integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
   "_location": "/node-fetch",
   "_phantomChildren": {},
   "_requested": {
@@ -18,8 +18,8 @@
   "_requiredBy": [
     "/@mapbox/node-pre-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-  "_shasum": "02eb8e22074018e3d5a83016649d04df0e348fba",
+  "_resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+  "_shasum": "d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d",
   "_spec": "node-fetch@^2.6.7",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/@mapbox/node-pre-gyp",
   "author": {
@@ -112,5 +112,5 @@
     "report": "cross-env BABEL_ENV=coverage nyc --reporter lcov --reporter text mocha -R spec test/test.js",
     "test": "cross-env BABEL_ENV=test mocha --require babel-register --throw-deprecation test/test.js"
   },
-  "version": "2.6.12"
+  "version": "2.7.0"
 }

package/node_modules/tar/lib/pack.js

@@ -79,14 +79,26 @@ const Pack = warner(class Pack extends Minipass {
 
     this.portable = !!opt.portable
     this.zip = null
-    if (opt.gzip) {
-      if (typeof opt.gzip !== 'object') {
-        opt.gzip = {}
+
+    if (opt.gzip || opt.brotli) {
+      if (opt.gzip && opt.brotli) {
+        throw new TypeError('gzip and brotli are mutually exclusive')
       }
-      if (this.portable) {
-        opt.gzip.portable = true
+      if (opt.gzip) {
+        if (typeof opt.gzip !== 'object') {
+          opt.gzip = {}
+        }
+        if (this.portable) {
+          opt.gzip.portable = true
+        }
+        this.zip = new zlib.Gzip(opt.gzip)
+      }
+      if (opt.brotli) {
+        if (typeof opt.brotli !== 'object') {
+          opt.brotli = {}
+        }
+        this.zip = new zlib.BrotliCompress(opt.brotli)
       }
-      this.zip = new zlib.Gzip(opt.gzip)
       this.zip.on('data', chunk => super.write(chunk))
       this.zip.on('end', _ => super.end())
       this.zip.on('drain', _ => this[ONDRAIN]())

package/node_modules/tar/lib/parse.js

@@ -97,6 +97,16 @@ module.exports = warner(class Parser extends EE {
     this.strict = !!opt.strict
     this.maxMetaEntrySize = opt.maxMetaEntrySize || maxMetaEntrySize
     this.filter = typeof opt.filter === 'function' ? opt.filter : noop
+    // Unlike gzip, brotli doesn't have any magic bytes to identify it
+    // Users need to explicitly tell us they're extracting a brotli file
+    // Or we infer from the file extension
+    const isTBR = (opt.file && (
+        opt.file.endsWith('.tar.br') || opt.file.endsWith('.tbr')))
+    // if it's a tbr file it MIGHT be brotli, but we don't know until
+    // we look at it and verify it's not a valid tar file.
+    this.brotli = !opt.gzip && opt.brotli !== undefined ? opt.brotli
+      : isTBR ? undefined
+      : false
 
     // have to set this so that streams are ok piping into it
     this.writable = true
@@ -347,7 +357,9 @@ module.exports = warner(class Parser extends EE {
     }
 
     // first write, might be gzipped
-    if (this[UNZIP] === null && chunk) {
+    const needSniff = this[UNZIP] === null ||
+      this.brotli === undefined && this[UNZIP] === false
+    if (needSniff && chunk) {
       if (this[BUFFER]) {
         chunk = Buffer.concat([this[BUFFER], chunk])
         this[BUFFER] = null
@@ -356,15 +368,45 @@ module.exports = warner(class Parser extends EE {
         this[BUFFER] = chunk
         return true
       }
+
+      // look for gzip header
       for (let i = 0; this[UNZIP] === null && i < gzipHeader.length; i++) {
         if (chunk[i] !== gzipHeader[i]) {
           this[UNZIP] = false
         }
       }
-      if (this[UNZIP] === null) {
+
+      const maybeBrotli = this.brotli === undefined
+      if (this[UNZIP] === false && maybeBrotli) {
+        // read the first header to see if it's a valid tar file. If so,
+        // we can safely assume that it's not actually brotli, despite the
+        // .tbr or .tar.br file extension.
+        // if we ended before getting a full chunk, yes, def brotli
+        if (chunk.length < 512) {
+          if (this[ENDED]) {
+            this.brotli = true
+          } else {
+            this[BUFFER] = chunk
+            return true
+          }
+        } else {
+          // if it's tar, it's pretty reliably not brotli, chances of
+          // that happening are astronomical.
+          try {
+            new Header(chunk.slice(0, 512))
+            this.brotli = false
+          } catch (_) {
+            this.brotli = true
+          }
+        }
+      }
+
+      if (this[UNZIP] === null || (this[UNZIP] === false && this.brotli)) {
         const ended = this[ENDED]
         this[ENDED] = false
-        this[UNZIP] = new zlib.Unzip()
+        this[UNZIP] = this[UNZIP] === null
+          ? new zlib.Unzip()
+          : new zlib.BrotliDecompress()
         this[UNZIP].on('data', chunk => this[CONSUMECHUNK](chunk))
         this[UNZIP].on('error', er => this.abort(er))
         this[UNZIP].on('end', _ => {
@@ -502,6 +544,7 @@ module.exports = warner(class Parser extends EE {
         this[UNZIP].end(chunk)
       } else {
         this[ENDED] = true
+        if (this.brotli === undefined) chunk = chunk || Buffer.alloc(0)
         this.write(chunk)
       }
     }

package/node_modules/tar/lib/replace.js

@@ -23,7 +23,7 @@ module.exports = (opt_, files, cb) => {
     throw new TypeError('file is required')
   }
 
-  if (opt.gzip) {
+  if (opt.gzip || opt.brotli || opt.file.endsWith('.br') || opt.file.endsWith('.tbr')) {
     throw new TypeError('cannot append to compressed archives')
   }
 

package/node_modules/tar/lib/update.js

@@ -13,7 +13,7 @@ module.exports = (opt_, files, cb) => {
     throw new TypeError('file is required')
   }
 
-  if (opt.gzip) {
+  if (opt.gzip || opt.brotli || opt.file.endsWith('.br') || opt.file.endsWith('.tbr')) {
     throw new TypeError('cannot append to compressed archives')
   }
 

package/node_modules/tar/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "tar@^6.1.11",
-  "_id": "tar@6.1.15",
+  "_id": "tar@6.2.0",
   "_inBundle": false,
-  "_integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+  "_integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
   "_location": "/tar",
   "_phantomChildren": {},
   "_requested": {
@@ -18,8 +18,8 @@
   "_requiredBy": [
     "/@mapbox/node-pre-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-  "_shasum": "c9738b0b98845a3b344d334b8fa3041aaba53a69",
+  "_resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
+  "_shasum": "b14ce49a79cb1cd23bc9b016302dea5474493f73",
   "_spec": "tar@^6.1.11",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/@mapbox/node-pre-gyp",
   "author": {
@@ -67,12 +67,7 @@
   },
   "scripts": {
     "genparse": "node scripts/generate-parse-fixtures.js",
-    "lint": "eslint \"**/*.js\"",
-    "lintfix": "npm run lint -- --fix",
-    "postlint": "template-oss-check",
-    "posttest": "npm run lint",
     "snap": "tap",
-    "template-oss-apply": "template-oss-apply --force",
     "test": "tap"
   },
   "tap": {
@@ -102,5 +97,5 @@
       "18.x"
     ]
   },
-  "version": "6.1.15"
+  "version": "6.2.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muhammara",
-  "version": "4.0.0",
+  "version": "4.1.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",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@types/node": "^18.0.0",
     "chai": "^4.3.6",
-    "mocha": "^8.4.0",
+    "mocha": "^10.2.0",
     "npm": "^6.14.5",
     "prettier": "^2.7.1",
     "docdash": "^2.0.1",