muhammara 2.2.0 → 2.5.0

package/muhammara.js

@@ -15,7 +15,7 @@ muhammara.PDFWriter.prototype.getEvents = function() {
     return this.events;
 }
 
-muhammara.PDFWriter.prototype.triggerDocumentExtensionEvent = function(eventName,eventParams) {
+muhammara.PDFWriter.prototype.triggerDocumentExtensionEvent = function(eventName, eventParams) {
     eventParams.writer = this;
     this.getEvents().emit(eventName,eventParams);
 }

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

@@ -1,5 +1,9 @@
 # node-pre-gyp changelog
 
+## 1.0.9
+- Upgraded node-fetch to 2.6.7 to address [CVE-2022-0235](https://www.cve.org/CVERecord?id=CVE-2022-0235)
+- Upgraded detect-libc to 2.0.0 to use non-blocking NodeJS(>=12) Report API
+
 ## 1.0.8
 - Downgraded npmlog to maintain node v10 and v8 support (https://github.com/mapbox/node-pre-gyp/pull/624)
 

package/node_modules/@mapbox/node-pre-gyp/lib/util/versioning.js

@@ -302,7 +302,7 @@ module.exports.evaluate = function(package_json, options, napi_build_version) {
     target_platform: options.target_platform || process.platform,
     arch: options.target_arch || process.arch,
     target_arch: options.target_arch || process.arch,
-    libc: options.target_libc || detect_libc.family || 'unknown',
+    libc: options.target_libc || detect_libc.familySync() || 'unknown',
     module_main: package_json.main,
     toolset: options.toolset || '', // address https://github.com/mapbox/node-pre-gyp/issues/119
     bucket: package_json.binary.bucket,

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

@@ -1,8 +1,8 @@
 {
   "_from": "@mapbox/node-pre-gyp@^1.0.5",
-  "_id": "@mapbox/node-pre-gyp@1.0.8",
+  "_id": "@mapbox/node-pre-gyp@1.0.9",
   "_inBundle": false,
-  "_integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==",
+  "_integrity": "sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==",
   "_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.8.tgz",
-  "_shasum": "32abc8a5c624bc4e46c43d84dfb8b26d33a96f58",
+  "_resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz",
+  "_shasum": "09a8781a3a036151cdebbe8719d6f8b25d4058bc",
   "_spec": "@mapbox/node-pre-gyp@^1.0.5",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS",
   "author": {
@@ -35,10 +35,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "detect-libc": "^1.0.3",
+    "detect-libc": "^2.0.0",
     "https-proxy-agent": "^5.0.0",
     "make-dir": "^3.1.0",
-    "node-fetch": "^2.6.5",
+    "node-fetch": "^2.6.7",
     "nopt": "^5.0.0",
     "npmlog": "^5.0.1",
     "rimraf": "^3.0.2",
@@ -50,15 +50,15 @@
   "devDependencies": {
     "@mapbox/cloudfriend": "^5.1.0",
     "@mapbox/eslint-config-mapbox": "^3.0.0",
-    "aws-sdk": "^2.1012.0",
+    "aws-sdk": "^2.1087.0",
     "codecov": "^3.8.3",
     "eslint": "^7.32.0",
     "eslint-plugin-node": "^11.1.0",
     "mock-aws-s3": "^4.0.2",
     "nock": "^12.0.3",
-    "node-addon-api": "^4.2.0",
+    "node-addon-api": "^4.3.0",
     "nyc": "^15.1.0",
-    "tape": "^5.3.1",
+    "tape": "^5.5.2",
     "tar-fs": "^2.1.1"
   },
   "homepage": "https://github.com/mapbox/node-pre-gyp#readme",
@@ -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.8"
+  "version": "1.0.9"
 }

package/node_modules/concat-map/package.json

@@ -2,7 +2,7 @@
   "_from": "concat-map@0.0.1",
   "_id": "concat-map@0.0.1",
   "_inBundle": false,
-  "_integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+  "_integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
   "_location": "/concat-map",
   "_phantomChildren": {},
   "_requested": {

package/node_modules/console-control-strings/package.json

@@ -2,7 +2,7 @@
   "_from": "console-control-strings@^1.1.0",
   "_id": "console-control-strings@1.1.0",
   "_inBundle": false,
-  "_integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+  "_integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
   "_location": "/console-control-strings",
   "_phantomChildren": {},
   "_requested": {

package/node_modules/debug/README.md

@@ -241,6 +241,9 @@ setInterval(function(){
 }, 1200);
 ```
 
+In Chromium-based web browsers (e.g. Brave, Chrome, and Electron), the JavaScript console will—by default—only show messages logged by `debug` if the "Verbose" log level is _enabled_.
+
+<img width="647" src="https://user-images.githubusercontent.com/7143133/152083257-29034707-c42c-4959-8add-3cee850e6fcf.png">
 
 ## Output streams
 

package/node_modules/debug/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "debug@4",
-  "_id": "debug@4.3.3",
+  "_id": "debug@4.3.4",
   "_inBundle": false,
-  "_integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+  "_integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
   "_location": "/debug",
   "_phantomChildren": {},
   "_requested": {
@@ -19,8 +19,8 @@
     "/agent-base",
     "/https-proxy-agent"
   ],
-  "_resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-  "_shasum": "04266e0b70a98d4462e6e288e38259213332b664",
+  "_resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+  "_shasum": "1319f6579357f2338d3337d2cdd4914bb5dcc865",
   "_spec": "debug@4",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/https-proxy-agent",
   "author": {
@@ -98,5 +98,5 @@
     "test:coverage": "cat ./coverage/lcov.info | coveralls",
     "test:node": "istanbul cover _mocha -- test.js"
   },
-  "version": "4.3.3"
+  "version": "4.3.4"
 }

package/node_modules/debug/src/common.js

@@ -179,7 +179,7 @@ function setup(env) {
 			namespaces = split[i].replace(/\*/g, '.*?');
 
 			if (namespaces[0] === '-') {
-				createDebug.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+				createDebug.skips.push(new RegExp('^' + namespaces.slice(1) + '$'));
 			} else {
 				createDebug.names.push(new RegExp('^' + namespaces + '$'));
 			}

package/node_modules/delegates/package.json

@@ -2,7 +2,7 @@
   "_from": "delegates@^1.0.0",
   "_id": "delegates@1.0.0",
   "_inBundle": false,
-  "_integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+  "_integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
   "_location": "/delegates",
   "_phantomChildren": {},
   "_requested": {

package/node_modules/detect-libc/README.md

@@ -1,16 +1,15 @@
 # detect-libc
 
-Node.js module to detect the C standard library (libc) implementation
-family and version in use on a given Linux system.
+Node.js module to detect details of the C standard library (libc)
+implementation provided by a given Linux system.
 
-Provides a value suitable for use with the `LIBC` option of
-[prebuild](https://www.npmjs.com/package/prebuild),
-[prebuild-ci](https://www.npmjs.com/package/prebuild-ci) and
-[prebuild-install](https://www.npmjs.com/package/prebuild-install),
-therefore allowing build and provision of pre-compiled binaries
-for musl-based Linux e.g. Alpine as well as glibc-based.
+Currently supports detection of GNU glibc and MUSL libc.
 
-Currently supports libc detection of `glibc` and `musl`.
+Provides asychronous and synchronous functions for the
+family (e.g. `glibc`, `musl`) and version (e.g. `1.23`, `1.2.3`).
+
+For previous v1.x releases, please see the
+[v1](https://github.com/lovell/detect-libc/tree/v1) branch.
 
 ## Install
 
@@ -18,54 +17,137 @@ Currently supports libc detection of `glibc` and `musl`.
 npm install detect-libc
 ```
 
-## Usage
+## API
+
+### GLIBC
+
+```ts
+const GLIBC: string = 'glibc';
+```
+
+A String constant containing the value `glibc`.
+
+### MUSL
+
+```ts
+const MUSL: string = 'musl';
+```
+
+A String constant containing the value `musl`.
+
+### family
+
+```ts
+function family(): Promise<string | null>;
+```
+
+Resolves asychronously with:
 
-### API
+* `glibc` or `musl` when the libc family can be determined
+* `null` when the libc family cannot be determined
+* `null` when run on a non-Linux platform
 
 ```js
-const { GLIBC, MUSL, family, version, isNonGlibcLinux } = require('detect-libc');
+const { family, GLIBC, MUSL } = require('detect-libc');
+
+switch (await family()) {
+  case GLIBC: ...
+  case MUSL: ...
+  case null: ...
+}
 ```
 
-* `GLIBC` is a String containing the value "glibc" for comparison with `family`.
-* `MUSL` is a String containing the value "musl" for comparison with `family`.
-* `family` is a String representing the system libc family.
-* `version` is a String representing the system libc version number.
-* `isNonGlibcLinux` is a Boolean representing whether the system is a non-glibc Linux, e.g. Alpine.
+### familySync
 
-### detect-libc command line tool
+```ts
+function familySync(): string | null;
+```
 
-When run on a Linux system with a non-glibc libc,
-the child command will be run with the `LIBC` environment variable
-set to the relevant value.
+Synchronous version of `family()`.
 
-On all other platforms will run the child command as-is.
+```js
+const { familySync, GLIBC, MUSL } = require('detect-libc');
 
-The command line feature requires `spawnSync` provided by Node v0.12+.
+switch (familySync()) {
+  case GLIBC: ...
+  case MUSL: ...
+  case null: ...
+}
+```
 
-```sh
-detect-libc child-command
+### version
+
+```ts
+function version(): Promise<string | null>;
+```
+
+Resolves asychronously with:
+
+* The version when it can be determined
+* `null` when the libc family cannot be determined
+* `null` when run on a non-Linux platform
+
+```js
+const { version } = require('detect-libc');
+
+const v = await version();
+if (v) {
+  const [major, minor, patch] = v.split('.');
+}
+```
+
+### versionSync
+
+```ts
+function versionSync(): string | null;
+```
+
+Synchronous version of `version()`.
+
+```js
+const { versionSync } = require('detect-libc');
+
+const v = versionSync();
+if (v) {
+  const [major, minor, patch] = v.split('.');
+}
+```
+
+### isNonGlibcLinux
+
+```ts
+function isNonGlibcLinux(): Promise<boolean>;
 ```
 
-## Integrating with prebuild
-
-```json
-  "scripts": {
-    "install": "detect-libc prebuild-install || node-gyp rebuild",
-    "test": "mocha && detect-libc prebuild-ci"
-  },
-  "dependencies": {
-    "detect-libc": "^1.0.2",
-    "prebuild-install": "^2.2.0"
-  },
-  "devDependencies": {
-    "prebuild": "^6.2.1",
-    "prebuild-ci": "^2.2.3"
-  }
+Resolves asychronously with:
+
+* `false` when the libc family is `glibc`
+* `true` when the libc family is not `glibc`
+* `false` when run on a non-Linux platform
+
+```js
+const { isNonGlibcLinux } = require('detect-libc');
+
+if (await isNonGlibcLinux()) { ... }
+```
+
+### isNonGlibcLinuxSync
+
+```ts
+function isNonGlibcLinuxSync(): boolean;
+```
+
+Synchronous version of `isNonGlibcLinux()`.
+
+```js
+const { isNonGlibcLinuxSync } = require('detect-libc');
+
+if (isNonGlibcLinuxSync()) { ... }
 ```
 
-## Licence
+## Licensing
 
-Copyright 2017 Lovell Fuller
+Copyright 2017, 2022 Lovell Fuller
 
 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

@@ -0,0 +1,11 @@
+export const GLIBC: 'glibc';
+export const MUSL: 'musl';
+
+export function family(): Promise<string | null>;
+export function familySync(): string | null;
+
+export function isNonGlibcLinux(): Promise<boolean>;
+export function isNonGlibcLinuxSync(): boolean;
+
+export function version(): Promise<string | null>;
+export function versionSync(): string | null;

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

@@ -1,92 +1,178 @@
 'use strict';
 
-var platform = require('os').platform();
-var spawnSync = require('child_process').spawnSync;
-var readdirSync = require('fs').readdirSync;
+const childProcess = require('child_process');
+const { isLinux, getReport } = require('./process');
 
-var GLIBC = 'glibc';
-var MUSL = 'musl';
+const command = 'getconf GNU_LIBC_VERSION 2>&1 || true; ldd --version 2>&1 || true';
+let commandOut = '';
 
-var spawnOptions = {
-  encoding: 'utf8',
-  env: process.env
+const safeCommand = () => {
+  if (!commandOut) {
+    return new Promise((resolve) => {
+      childProcess.exec(command, (err, out) => {
+        commandOut = err ? ' ' : out;
+        resolve(commandOut);
+      });
+    });
+  }
+  return commandOut;
+};
+
+const safeCommandSync = () => {
+  if (!commandOut) {
+    try {
+      commandOut = childProcess.execSync(command, { encoding: 'utf8' });
+    } catch (_err) {
+      commandOut = ' ';
+    }
+  }
+  return commandOut;
+};
+
+/**
+ * A String constant containing the value `glibc`.
+ * @type {string}
+ * @public
+ */
+const GLIBC = 'glibc';
+
+/**
+ * A String constant containing the value `musl`.
+ * @type {string}
+ * @public
+ */
+const MUSL = 'musl';
+
+const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-');
+
+const familyFromReport = () => {
+  const report = getReport();
+  if (report.header && report.header.glibcVersionRuntime) {
+    return GLIBC;
+  }
+  if (Array.isArray(report.sharedObjects)) {
+    if (report.sharedObjects.some(isFileMusl)) {
+      return MUSL;
+    }
+  }
+  return null;
+};
+
+const familyFromCommand = (out) => {
+  const [getconf, ldd1] = out.split(/[\r\n]+/);
+  if (getconf && getconf.includes(GLIBC)) {
+    return GLIBC;
+  }
+  if (ldd1 && ldd1.includes(MUSL)) {
+    return MUSL;
+  }
+  return null;
 };
 
-if (!spawnSync) {
-  spawnSync = function () {
-    return { status: 126, stdout: '', stderr: '' };
-  };
-}
-
-function contains (needle) {
-  return function (haystack) {
-    return haystack.indexOf(needle) !== -1;
-  };
-}
-
-function versionFromMuslLdd (out) {
-  return out.split(/[\r\n]+/)[1].trim().split(/\s/)[1];
-}
-
-function safeReaddirSync (path) {
-  try {
-    return readdirSync(path);
-  } catch (e) {}
-  return [];
-}
-
-var family = '';
-var version = '';
-var method = '';
-
-if (platform === 'linux') {
-  // Try getconf
-  var glibc = spawnSync('getconf', ['GNU_LIBC_VERSION'], spawnOptions);
-  if (glibc.status === 0) {
-    family = GLIBC;
-    version = glibc.stdout.trim().split(' ')[1];
-    method = 'getconf';
-  } else {
-    // Try ldd
-    var ldd = spawnSync('ldd', ['--version'], spawnOptions);
-    if (ldd.status === 0 && ldd.stdout.indexOf(MUSL) !== -1) {
-      family = MUSL;
-      version = versionFromMuslLdd(ldd.stdout);
-      method = 'ldd';
-    } else if (ldd.status === 1 && ldd.stderr.indexOf(MUSL) !== -1) {
-      family = MUSL;
-      version = versionFromMuslLdd(ldd.stderr);
-      method = 'ldd';
-    } else {
-      // Try filesystem (family only)
-      var lib = safeReaddirSync('/lib');
-      if (lib.some(contains('-linux-gnu'))) {
-        family = GLIBC;
-        method = 'filesystem';
-      } else if (lib.some(contains('libc.musl-'))) {
-        family = MUSL;
-        method = 'filesystem';
-      } else if (lib.some(contains('ld-musl-'))) {
-        family = MUSL;
-        method = 'filesystem';
-      } else {
-        var usrSbin = safeReaddirSync('/usr/sbin');
-        if (usrSbin.some(contains('glibc'))) {
-          family = GLIBC;
-          method = 'filesystem';
-        }
-      }
+/**
+ * Resolves with the libc family when it can be determined, `null` otherwise.
+ * @returns {Promise<?string>}
+ */
+const family = async () => {
+  let family = null;
+  if (isLinux()) {
+    family = familyFromReport();
+    if (!family) {
+      const out = await safeCommand();
+      family = familyFromCommand(out);
     }
   }
-}
+  return family;
+};
 
-var isNonGlibcLinux = (family !== '' && family !== GLIBC);
+/**
+ * Returns the libc family when it can be determined, `null` otherwise.
+ * @returns {?string}
+ */
+const familySync = () => {
+  let family = null;
+  if (isLinux()) {
+    family = familyFromReport();
+    if (!family) {
+      const out = safeCommandSync();
+      family = familyFromCommand(out);
+    }
+  }
+  return family;
+};
+
+/**
+ * Resolves `true` only when the platform is Linux and the libc family is not `glibc`.
+ * @returns {Promise<boolean>}
+ */
+const isNonGlibcLinux = async () => isLinux() && await family() !== GLIBC;
+
+/**
+ * Returns `true` only when the platform is Linux and the libc family is not `glibc`.
+ * @returns {boolean}
+ */
+const isNonGlibcLinuxSync = () => isLinux() && familySync() !== GLIBC;
+
+const versionFromReport = () => {
+  const report = getReport();
+  if (report.header && report.header.glibcVersionRuntime) {
+    return report.header.glibcVersionRuntime;
+  }
+  return null;
+};
+
+const versionSuffix = (s) => s.trim().split(/\s+/)[1];
+
+const versionFromCommand = (out) => {
+  const [getconf, ldd1, ldd2] = out.split(/[\r\n]+/);
+  if (getconf && getconf.includes(GLIBC)) {
+    return versionSuffix(getconf);
+  }
+  if (ldd1 && ldd2 && ldd1.includes(MUSL)) {
+    return versionSuffix(ldd2);
+  }
+  return null;
+};
+
+/**
+ * Resolves with the libc version when it can be determined, `null` otherwise.
+ * @returns {Promise<?string>}
+ */
+const version = async () => {
+  let version = null;
+  if (isLinux()) {
+    version = versionFromReport();
+    if (!version) {
+      const out = await safeCommand();
+      version = versionFromCommand(out);
+    }
+  }
+  return version;
+};
+
+/**
+ * Returns the libc version when it can be determined, `null` otherwise.
+ * @returns {?string}
+ */
+const versionSync = () => {
+  let version = null;
+  if (isLinux()) {
+    version = versionFromReport();
+    if (!version) {
+      const out = safeCommandSync();
+      version = versionFromCommand(out);
+    }
+  }
+  return version;
+};
 
 module.exports = {
-  GLIBC: GLIBC,
-  MUSL: MUSL,
-  family: family,
-  version: version,
-  method: method,
-  isNonGlibcLinux: isNonGlibcLinux
+  GLIBC,
+  MUSL,
+  family,
+  familySync,
+  isNonGlibcLinux,
+  isNonGlibcLinuxSync,
+  version,
+  versionSync
 };

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

@@ -0,0 +1,16 @@
+'use strict';
+
+const isLinux = () => process.platform === 'linux';
+
+let report = null;
+const getReport = () => {
+  if (!report) {
+    /* istanbul ignore next */
+    report = isLinux() && process.report
+      ? process.report.getReport()
+      : {};
+  }
+  return report;
+};
+
+module.exports = { isLinux, getReport };