Augment binary module search to aid Webpack use

Author: Christopher Jones

CHANGELOG.md

@@ -22,6 +22,10 @@
 - Fixed various execution failures with Node.js 13.2 due to Node.js NULL pointer behavior change ([ODPI-C
   change](https://github.com/oracle/odpi/commit/7693865bb6a98568546aa319cc0fdb9e208cf9d4)).
 
+- Added a directory the binary module search to help Webpack use, though a copy
+  plugin is still required, see
+  [here](https://github.com/oracle/node-oracledb/issues/1156#issuecomment-571554125).
+
 - Fixed some static code analysis warnings.
 
 ## node-oracledb v4.1.0 (26 Nov 2019)

lib/oracledb.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved
 
 //-----------------------------------------------------------------------------
 //
@@ -59,7 +59,10 @@ const defaultPoolAlias = 'default';
 const binaryLocations = [
   '../' + nodbUtil.RELEASE_DIR + '/' + nodbUtil.BINARY_FILE,  // pre-built binary
   '../' + nodbUtil.RELEASE_DIR + '/' + 'oracledb.node',       // binary built from source
-  '../build/Debug/oracledb.node'                              // debug binary
+  '../build/Debug/oracledb.node',                             // debug binary
+  // Ease Webpack use, see https://github.com/oracle/node-oracledb/issues/1156
+  './node_modules/oracledb/' + nodbUtil.RELEASE_DIR + '/' + nodbUtil.BINARY_FILE,
+  './node_modules/oracledb/' + nodbUtil.RELEASE_DIR + '/' + 'oracledb.node'
 ];
 
 let oracledbCLib;
@@ -71,7 +74,7 @@ for (let i = 0; i < binaryLocations.length; i++) {
     if (err.code !== 'MODULE_NOT_FOUND' || i == binaryLocations.length - 1) {
       let nodeInfo;
       if (err.code === 'MODULE_NOT_FOUND') {
-        // none of the three binaries could be found
+        // a binary was not found in any of the search directories
         nodeInfo = `\n  Looked for ${binaryLocations.map(x => require('path').resolve(__dirname, x)).join(', ')}\n  ${nodbUtil.getInstallURL()}\n`;
       } else {
         nodeInfo = `\n  Node.js require('oracledb') error was:\n  ${err.message}\n  ${nodbUtil.getInstallHelp()}\n`;