use process.builtinModules when available

Author: guybedford

src/lib/libatomic.js

@@ -172,7 +172,7 @@ addToLibrary({
 
   emscripten_num_logical_cores: () =>
 #if ENVIRONMENT_MAY_BE_NODE
-    ENVIRONMENT_IS_NODE ? require('node:os').cpus().length :
+    ENVIRONMENT_IS_NODE ? getBuiltinModule('os').cpus().length :
 #endif
     navigator['hardwareConcurrency'],
 

src/lib/libcore.js

@@ -377,7 +377,7 @@ addToLibrary({
       var cmdstr = UTF8ToString(command);
       if (!cmdstr.length) return 0; // this is what glibc seems to do (shell works test?)
 
-      var cp = require('node:child_process');
+      var cp = getBuiltinModule('child_process');
       var ret = cp.spawnSync(cmdstr, [], {shell:true, stdio:'inherit'});
 
       var _W_EXITCODE = (ret, sig) => ((ret) << 8 | (sig));

src/lib/libembind_gen.js

@@ -924,7 +924,7 @@ var LibraryEmbind = {
     const printer = new TsPrinter(moduleDefinitions);
 #endif
     const output = printer.print();
-    var fs = require('node:fs');
+    var fs = getBuiltinModule('fs');
     fs.writeFileSync(process.argv[2], output + '\n');
   },
 

src/lib/libnodepath.js

@@ -12,7 +12,7 @@
 // operations. Hence, using `nodePath` should be safe here.
 
 addToLibrary({
-  $nodePath: "require('node:path')",
+  $nodePath: "getBuiltinModule('path')",
   $PATH__deps: ['$nodePath'],
   $PATH: `{
     isAbs: nodePath.isAbsolute,

src/lib/libnoderawfs.js

@@ -10,7 +10,7 @@ addToLibrary({
     if (!ENVIRONMENT_IS_NODE) {
       throw new Error("NODERAWFS is currently only supported on Node.js environment.")
     }
-    var nodeTTY = require('node:tty');
+    var nodeTTY = getBuiltinModule('tty');
     function _wrapNodeError(func) {
       return (...args) => {
         try {

src/lib/libsockfs.js

@@ -5,10 +5,28 @@
  */
 
 addToLibrary({
+#if ENVIRONMENT_MAY_BE_NODE
+  // Memoized `require()` for the non-builtin `ws` module (getBuiltinModule only
+  // handles builtins).
+  $req: `(() => {
+    var req;
+    return (id) => (req ??= getBuiltinModule('module').createRequire(
+#if EXPORT_ES6
+      import.meta.url
+#else
+      __filename
+#endif
+    ))(id);
+  })()`,
+#endif
   $SOCKFS__postset: () => {
     addAtInit('SOCKFS.root = FS.mount(SOCKFS, {}, null);');
   },
+#if ENVIRONMENT_MAY_BE_NODE
+  $SOCKFS__deps: ['$FS', '$req'],
+#else
   $SOCKFS__deps: ['$FS'],
+#endif
   $SOCKFS: {
 #if expectToReceiveOnModule('websocket')
     websocketArgs: {},
@@ -216,7 +234,7 @@ addToLibrary({
             var WebSocketConstructor;
 #if ENVIRONMENT_MAY_BE_NODE
             if (ENVIRONMENT_IS_NODE) {
-              WebSocketConstructor = /** @type{(typeof WebSocket)} */(require('ws'));
+              WebSocketConstructor = /** @type{(typeof WebSocket)} */(req('ws'));
             } else
 #endif // ENVIRONMENT_MAY_BE_NODE
             {
@@ -518,7 +536,7 @@ addToLibrary({
         if (sock.server) {
            throw new FS.ErrnoError({{{ cDefs.EINVAL }}});  // already listening
         }
-        var WebSocketServer = require('ws').Server;
+        var WebSocketServer = req('ws').Server;
         var host = sock.saddr;
 #if SOCKET_DEBUG
         dbg(`websocket: listen: ${host}:${sock.sport}`);

src/lib/libwasi.js

@@ -570,7 +570,7 @@ var WasiLibrary = {
 #if ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
     // This block is not needed on v19+ since crypto.getRandomValues is builtin
     if (ENVIRONMENT_IS_NODE) {
-      var nodeCrypto = require('node:crypto');
+      var nodeCrypto = getBuiltinModule('crypto');
       return (view) => nodeCrypto.randomFillSync(view);
     }
 #endif // ENVIRONMENT_MAY_BE_NODE

src/lib/libwasm_worker.js

@@ -295,7 +295,7 @@ if (ENVIRONMENT_IS_WASM_WORKER
 
   emscripten_navigator_hardware_concurrency: () => {
 #if ENVIRONMENT_MAY_BE_NODE
-    if (ENVIRONMENT_IS_NODE) return require('node:os').cpus().length;
+    if (ENVIRONMENT_IS_NODE) return getBuiltinModule('os').cpus().length;
 #endif
     return navigator['hardwareConcurrency'];
   },

src/preamble.js

@@ -553,7 +553,7 @@ function instantiateSync(file, info) {
   var binary = getBinarySync(file);
 #if NODE_CODE_CACHING
   if (ENVIRONMENT_IS_NODE) {
-    var v8 = require('node:v8');
+    var v8 = getBuiltinModule('v8');
     // Include the V8 version in the cache name, so that we don't try to
     // load cached code from another version, which fails silently (it seems
     // to load ok, but we do actually recompile the binary every time).

src/runtime_debug.js

@@ -15,8 +15,8 @@ function dbg(...args) {
   // See https://github.com/emscripten-core/emscripten/issues/14804
   if (ENVIRONMENT_IS_NODE) {
     // TODO(sbc): Unify with err/out implementation in shell.sh.
-    var fs = require('node:fs');
-    var utils = require('node:util');
+    var fs = getBuiltinModule('fs');
+    var utils = getBuiltinModule('util');
     function stringify(a) {
       switch (typeof a) {
         case 'object': return utils.inspect(a);