src: add file name to 'Module did not self-register' error

nornagon · MylesBorins · commit 12d7d645dd04 · 2019-12-17T17:06:36.000-05:00
PR-URL: #30125 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/src/node_binding.cc b/src/node_binding.cc
@@ -485,7 +485,12 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
         mp = dlib->GetSavedModuleFromGlobalHandleMap();
         if (mp == nullptr || mp->nm_context_register_func == nullptr) {
           dlib->Close();
-          env->ThrowError("Module did not self-register.");
+          char errmsg[1024];
+          snprintf(errmsg,
+                   sizeof(errmsg),
+                   "Module did not self-register: '%s'.",
+                   *filename);
+          env->ThrowError(errmsg);
           return false;
         }
       }
diff --git a/test/addons/dlopen-ping-pong/test-worker.js b/test/addons/dlopen-ping-pong/test-worker.js
@@ -16,5 +16,6 @@ require(bindingPath);
 new Worker(`require(${JSON.stringify(bindingPath)})`, { eval: true })
   .on('error', common.mustCall((err) => {
     assert.strictEqual(err.constructor, Error);
-    assert.strictEqual(err.message, 'Module did not self-register.');
+    assert.strictEqual(err.message,
+                       `Module did not self-register: '${bindingPath}'.`);
   }));
diff --git a/test/addons/dlopen-ping-pong/test.js b/test/addons/dlopen-ping-pong/test.js
@@ -19,5 +19,5 @@ assert.strictEqual(module.exports.ping(), 'pong');
 // Check that after the addon is loaded with
 // process.dlopen() a require() call fails.
 console.log('require:', `./build/${common.buildType}/binding`);
-const re = /^Error: Module did not self-register\.$/;
+const re = /^Error: Module did not self-register: '.*[\\/]binding\.node'\.$/;
 assert.throws(() => require(`./build/${common.buildType}/binding`), re);
diff --git a/test/addons/not-a-binding/test.js b/test/addons/not-a-binding/test.js
@@ -2,5 +2,5 @@
 const common = require('../../common');
 const assert = require('assert');
 
-const re = /^Error: Module did not self-register\.$/;
+const re = /^Error: Module did not self-register: '.*[\\/]binding\.node'\.$/;
 assert.throws(() => require(`./build/${common.buildType}/binding`), re);

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,12 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {`
`485`	`485`	`mp = dlib->GetSavedModuleFromGlobalHandleMap();`
`486`	`486`	`if (mp == nullptr \|\| mp->nm_context_register_func == nullptr) {`
`487`	`487`	`dlib->Close();`
`488`		`- env->ThrowError("Module did not self-register.");`
	`488`	`+ char errmsg[1024];`
	`489`	`+ snprintf(errmsg,`
	`490`	`+ sizeof(errmsg),`
	`491`	`+ "Module did not self-register: '%s'.",`
	`492`	`+ *filename);`
	`493`	`+ env->ThrowError(errmsg);`
`489`	`494`	`return false;`
`490`	`495`	`}`
`491`	`496`	`}`