node:vm compatibility

cmake/Sources.json

@@ -48,6 +48,7 @@
       "src/bun.js/bindings/v8/shim/*.cpp",
       "src/bake/*.cpp",
       "src/deps/*.cpp",
+      "src/vm/*.cpp",
       "packages/bun-usockets/src/crypto/*.cpp"
     ]
   },

cmake/sources/CxxSources.txt

@@ -153,6 +153,9 @@ src/bun.js/bindings/NodeTLS.cpp
 src/bun.js/bindings/NodeURL.cpp
 src/bun.js/bindings/NodeValidator.cpp
 src/bun.js/bindings/NodeVM.cpp
+src/bun.js/bindings/NodeVMModule.cpp
+src/bun.js/bindings/NodeVMScript.cpp
+src/bun.js/bindings/NodeVMSourceTextModule.cpp
 src/bun.js/bindings/NoOpForTesting.cpp
 src/bun.js/bindings/ObjectBindings.cpp
 src/bun.js/bindings/objects.cpp
@@ -466,3 +469,5 @@ src/bun.js/modules/NodeUtilTypesModule.cpp
 src/bun.js/modules/ObjectModule.cpp
 src/deps/libuwsockets.cpp
 src/io/io_darwin.cpp
+src/vm/Semaphore.cpp
+src/vm/SigintWatcher.cpp

cmake/targets/BuildBun.cmake

@@ -744,7 +744,7 @@ target_include_directories(${bun} PRIVATE
   ${NODEJS_HEADERS_PATH}/include
 )
 
-if(NOT WIN32) 
+if(NOT WIN32)
   target_include_directories(${bun} PRIVATE ${CWD}/src/bun.js/bindings/libuv)
 endif()
 
@@ -877,7 +877,7 @@ if(NOT WIN32)
       -Wno-nullability-completeness
       -Werror
     )
-    
+
     if(ENABLE_ASAN)
       target_compile_options(${bun} PUBLIC
         -fsanitize=address

src/bun.js/bindings/BunProcess.cpp

@@ -875,8 +875,8 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionChdir, (JSC::JSGlobalObject * globalObj
     RELEASE_AND_RETURN(scope, JSC::JSValue::encode(result));
 }
 
-static HashMap<String, int>* signalNameToNumberMap = nullptr;
 static HashMap<int, String>* signalNumberToNameMap = nullptr;
+static HashMap<String, int>* signalNameToNumberMap = nullptr;
 
 // On windows, signals need to have a handle to the uv_signal_t. When sigaction is used, this is kept track globally for you.
 struct SignalHandleValue {
@@ -1143,7 +1143,7 @@ static void onDidChangeListeners(EventEmitter& eventEmitter, const Identifier& e
 {
     if (Bun__isMainThreadVM()) {
         // IPC handlers
-        if (eventName.string() == "message"_s || eventName.string() == "disconnect"_s) {
+        if (eventName == "message" || eventName == "disconnect") {
             auto* global = jsCast<GlobalObject*>(eventEmitter.scriptExecutionContext()->jsGlobalObject());
             auto& vm = JSC::getVM(global);
             auto messageListenerCount = eventEmitter.listenerCount(vm.propertyNames->message);

src/bun.js/bindings/ErrorCode.cpp

@@ -2224,6 +2224,26 @@ JSC_DEFINE_HOST_FUNCTION(Bun::jsFunctionMakeErrorWithCode, (JSC::JSGlobalObject
         return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_CHILD_PROCESS_STDIO_MAXBUFFER, message));
     }
 
+    case Bun::ErrorCode::ERR_VM_MODULE_STATUS: {
+        auto arg0 = callFrame->argument(1);
+        auto str0 = arg0.toWTFString(globalObject);
+        RETURN_IF_EXCEPTION(scope, {});
+        auto message = makeString("Module status "_s, str0);
+        return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_VM_MODULE_STATUS, message));
+    }
+
+    case Bun::ErrorCode::ERR_VM_MODULE_LINK_FAILURE: {
+        auto arg0 = callFrame->argument(1);
+        auto message = arg0.toWTFString(globalObject);
+        RETURN_IF_EXCEPTION(scope, {});
+        auto cause = callFrame->argument(2);
+        JSObject* error = createError(globalObject, ErrorCode::ERR_VM_MODULE_LINK_FAILURE, message);
+        RETURN_IF_EXCEPTION(scope, {});
+        error->putDirect(vm, Identifier::fromString(vm, "cause"_s), cause);
+        RETURN_IF_EXCEPTION(scope, {});
+        return JSC::JSValue::encode(error);
+    }
+
     case ErrorCode::ERR_IPC_DISCONNECTED:
         return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_IPC_DISCONNECTED, "IPC channel is already disconnected"_s));
     case ErrorCode::ERR_SERVER_NOT_RUNNING:
@@ -2332,6 +2352,14 @@ JSC_DEFINE_HOST_FUNCTION(Bun::jsFunctionMakeErrorWithCode, (JSC::JSGlobalObject
         return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_HTTP_SOCKET_ASSIGNED, "Socket already assigned"_s));
     case ErrorCode::ERR_STREAM_RELEASE_LOCK:
         return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_STREAM_RELEASE_LOCK, "Stream reader cancelled via releaseLock()"_s));
+    case ErrorCode::ERR_VM_MODULE_ALREADY_LINKED:
+        return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_VM_MODULE_ALREADY_LINKED, "Module has already been linked"_s));
+    case ErrorCode::ERR_VM_MODULE_CANNOT_CREATE_CACHED_DATA:
+        return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_VM_MODULE_CANNOT_CREATE_CACHED_DATA, "Cached data cannot be created for a module which has been evaluated"_s));
+    case ErrorCode::ERR_VM_MODULE_NOT_MODULE:
+        return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_VM_MODULE_NOT_MODULE, "Provided module is not an instance of Module"_s));
+    case ErrorCode::ERR_VM_MODULE_DIFFERENT_CONTEXT:
+        return JSC::JSValue::encode(createError(globalObject, ErrorCode::ERR_VM_MODULE_DIFFERENT_CONTEXT, "Linked modules must use the same context"_s));
 
     default: {
         break;

src/bun.js/bindings/ErrorCode.ts

@@ -249,8 +249,6 @@ const errors: ErrorCodeMapping = [
   ["ERR_UNKNOWN_ENCODING", TypeError],
   ["ERR_UNKNOWN_SIGNAL", TypeError],
   ["ERR_USE_AFTER_CLOSE", Error],
-  ["ERR_VM_MODULE_CACHED_DATA_REJECTED", Error],
-  ["ERR_VM_MODULE_LINK_FAILURE", Error],
   ["ERR_WASI_NOT_STARTED", Error],
   ["ERR_WORKER_INIT_FAILED", Error],
   ["ERR_WORKER_NOT_RUNNING", Error],
@@ -283,6 +281,13 @@ const errors: ErrorCodeMapping = [
   ["HPE_INVALID_EOF_STATE", Error],
   ["HPE_INVALID_METHOD", Error],
   ["HPE_INTERNAL", Error],
+  ["ERR_VM_MODULE_STATUS", Error],
+  ["ERR_VM_MODULE_ALREADY_LINKED", Error],
+  ["ERR_VM_MODULE_CANNOT_CREATE_CACHED_DATA", Error],
+  ["ERR_VM_MODULE_NOT_MODULE", Error],
+  ["ERR_VM_MODULE_DIFFERENT_CONTEXT", Error],
+  ["ERR_VM_MODULE_LINK_FAILURE", Error],
+  ["ERR_VM_MODULE_CACHED_DATA_REJECTED", Error],
   ["HPE_INVALID_HEADER_TOKEN", Error],
   ["HPE_HEADER_OVERFLOW", Error],
 ];

src/bun.js/bindings/JSNextTickQueue.cpp

@@ -89,6 +89,7 @@ void JSNextTickQueue::drain(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
         RETURN_IF_EXCEPTION(throwScope, );
         if (mustResetContext) {
             globalObject->m_asyncContextData.get()->putInternalField(vm, 0, jsUndefined());
+            RETURN_IF_EXCEPTION(throwScope, );
         }
         auto* drainFn = internalField(2).get().getObject();
         MarkedArgumentBuffer drainArgs;