Implement preload of metacall package for node loader.

metacall · Jan 20, 2021 · fc86e09 · fc86e09
1 parent 8d99bcb
commit fc86e09
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/source/loaders/node_loader/bootstrap/lib/bootstrap.js b/source/loaders/node_loader/bootstrap/lib/bootstrap.js
@@ -7,9 +7,17 @@ const util = require('util');
 
 const cherow = require('./node_modules/cherow');
 
-// eslint-disable-next-line no-empty-function
 function node_loader_trampoline_initialize() {
-	// Nothing to initialize yet
+	try {
+		// Preload MetaCall Monkey Patch
+		require('metacall');
+	} catch (e) {
+		if (e.code === 'MODULE_NOT_FOUND') {
+			// console.log('NodeJS Warning: MetaCall could not be preloaded');
+		} else {
+			console.log(`NodeJS Error (while preloading MetaCall): ${e.message}`);
+		}
+	}
 }
 
 function node_loader_trampoline_is_callable(value) {

diff --git a/source/ports/node_port/index.js b/source/ports/node_port/index.js
@@ -160,6 +160,15 @@ mod.prototype.require = function (name) {
 		/* Probably in the future we can differenciate between them, but it is not trivial */
 	};
 
+	/* Try to load it with NodeJS first */
+	try {
+		return node_require.apply(this, [ name ]);
+	} catch (e) {
+		if (e.code !== 'MODULE_NOT_FOUND') {
+			throw e;
+		}
+	}
+
 	const index = name.lastIndexOf('.');
 
 	if (index !== -1) {
@@ -204,8 +213,7 @@ mod.prototype.require = function (name) {
 };
 
 /* Debug logs */
-if (process.env['NODE_ENV'] === 'debug' && addon !== undefined)
-{
+if (process.env['NODE_ENV'] === 'debug' && addon !== undefined) {
 	addon.metacall_logs();
 }