make buildVM returns the built vm

Author: AbanoubGhadban

react_on_rails_pro/packages/node-renderer/src/worker/vm.ts

@@ -39,7 +39,7 @@ interface VMContext {
 const vmContexts = new Map<string, VMContext>();
 
 // Track VM creation promises to handle concurrent buildVM requests
-const vmCreationPromises = new Map<string, Promise<boolean>>();
+const vmCreationPromises = new Map<string, Promise<VMContext>>();
 
 /**
  * Returns all bundle paths that have a VM context
@@ -178,18 +178,18 @@ ${smartTrim(result)}`);
   }
 }
 
-export async function buildVM(filePath: string) {
+export async function buildVM(filePath: string): Promise<VMContext> {
   // Return existing promise if VM is already being created
   if (vmCreationPromises.has(filePath)) {
-    return vmCreationPromises.get(filePath);
+    return vmCreationPromises.get(filePath) as Promise<VMContext>;
   }
 
   // Check if VM for this bundle already exists
   const vmContext = vmContexts.get(filePath);
   if (vmContext) {
     // Update last used time when accessing existing VM
     vmContext.lastUsed = Date.now();
-    return Promise.resolve(true);
+    return Promise.resolve(vmContext);
   }
 
   // Create a new promise for this VM creation
@@ -306,11 +306,12 @@ export async function buildVM(filePath: string) {
       }
 
       // Only now, after VM is fully initialized, store the context
-      vmContexts.set(filePath, {
+      const newVmContext: VMContext = {
         context,
         sharedConsoleHistory,
         lastUsed: Date.now(),
-      });
+      };
+      vmContexts.set(filePath, newVmContext);
 
       // Manage pool size after adding new VM
       manageVMPoolSize();
@@ -331,7 +332,7 @@ export async function buildVM(filePath: string) {
         );
       }
 
-      return true;
+      return newVmContext;
     } catch (error) {
       log.error('Caught Error when creating context in buildVM, %O', error);
       errorReporter.error(error as Error);

react_on_rails_pro/packages/node-renderer/tests/helper.ts

@@ -59,12 +59,12 @@ export function vmSecondaryBundlePath(testName: string) {
 
 export async function createVmBundle(testName: string) {
   await safeCopyFileAsync(getFixtureBundle(), vmBundlePath(testName));
-  return buildVM(vmBundlePath(testName));
+  await buildVM(vmBundlePath(testName));
 }
 
 export async function createSecondaryVmBundle(testName: string) {
   await safeCopyFileAsync(getFixtureSecondaryBundle(), vmSecondaryBundlePath(testName));
-  return buildVM(vmSecondaryBundlePath(testName));
+  await buildVM(vmSecondaryBundlePath(testName));
 }
 
 export function lockfilePath(testName: string) {

react_on_rails_pro/packages/node-renderer/tests/serverRenderRSCReactComponent.test.js

@@ -63,8 +63,7 @@ describe('serverRenderRSCReactComponent', () => {
   // Therefore, we cannot call it directly in the test files. Instead, we run the RSC bundle through the VM and call the method from there.
   const getReactOnRailsRSCObject = async () => {
     // Use the copied rsc-bundle.js file from temp directory
-    await buildVM(tempRscBundlePath);
-    const vmContext = getVMContext(tempRscBundlePath);
+    const vmContext = await buildVM(tempRscBundlePath);
     const { ReactOnRails, React } = vmContext.context;
 
     function SuspensedComponentWithAsyncError() {