fix: no infinite loop on windows requiring optional deps

NODE-3050
mongodb · Mar 24, 2021 · f2a4ff8 · f2a4ff8
1 parent 86bddf1
commit f2a4ff8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 43 deletions.
diff --git a/lib/core/connection/utils.js b/lib/core/connection/utils.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const require_optional = require('require_optional');
+const require_optional = require('optional-require')(require);
 
 function debugOptions(debugFields, options) {
-  var finaloptions = {};
+  const finaloptions = {};
   debugFields.forEach(function(n) {
     finaloptions[n] = options[n];
   });
@@ -12,16 +12,14 @@ function debugOptions(debugFields, options) {
 }
 
 function retrieveBSON() {
-  var BSON = require('bson');
+  const BSON = require('bson');
   BSON.native = false;
 
-  try {
-    var optionalBSON = require_optional('bson-ext');
-    if (optionalBSON) {
-      optionalBSON.native = true;
-      return optionalBSON;
-    }
-  } catch (err) {} // eslint-disable-line
+  const optionalBSON = require_optional('bson-ext');
+  if (optionalBSON) {
+    optionalBSON.native = true;
+    return optionalBSON;
+  }
 
   return BSON;
 }
@@ -35,10 +33,7 @@ function noSnappyWarning() {
 
 // Facilitate loading Snappy optionally
 function retrieveSnappy() {
-  var snappy = null;
-  try {
-    snappy = require_optional('snappy');
-  } catch (error) {} // eslint-disable-line
+  let snappy = require_optional('snappy');
   if (!snappy) {
     snappy = {
       compress: noSnappyWarning,

diff --git a/lib/core/index.js b/lib/core/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 let BSON = require('bson');
-const require_optional = require('require_optional');
+const require_optional = require('optional-require')(require);
 const EJSON = require('./utils').retrieveEJSON();
 
 try {

diff --git a/lib/core/utils.js b/lib/core/utils.js
@@ -1,7 +1,7 @@
 'use strict';
 const os = require('os');
 const crypto = require('crypto');
-const requireOptional = require('require_optional');
+const requireOptional = require('optional-require')(require);
 
 /**
  * Generate a UUIDv4
@@ -46,10 +46,7 @@ const noEJSONError = function() {
 
 // Facilitate loading EJSON optionally
 function retrieveEJSON() {
-  let EJSON = null;
-  try {
-    EJSON = requireOptional('mongodb-extjson');
-  } catch (error) {} // eslint-disable-line
+  let EJSON = requireOptional('mongodb-extjson');
   if (!EJSON) {
     EJSON = {
       parse: noEJSONError,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,13 +16,6 @@
     "driver",
     "official"
   ],
-  "peerOptionalDependencies": {
-    "kerberos": "^1.1.0",
-    "mongodb-client-encryption": "^1.0.0",
-    "mongodb-extjson": "^2.1.2",
-    "snappy": "^6.3.4",
-    "bson-ext": "^2.0.0"
-  },
   "peerDependenciesMeta": {
     "kerberos": {
       "optional": true
@@ -47,7 +40,7 @@
     "bl": "^2.2.1",
     "bson": "^1.1.4",
     "denque": "^1.4.1",
-    "require_optional": "^1.0.1",
+    "optional-require": "^1.0.2",
     "safe-buffer": "^5.1.2"
   },
   "devDependencies": {