fix: js eventloop data race

shiroyk · Dec 3, 2024 · 3e2fa12 · 3e2fa12
1 parent 2949197
commit 3e2fa12
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/js/eventloop.go b/js/eventloop.go
@@ -45,13 +45,14 @@ func (e *EventLoop) Start(f func()) {
 			continue
 		}
 
+		done := e.doneJobs
+		e.doneJobs = e.doneJobs[:0]
 		e.cond.L.Unlock()
 
-		if len(e.doneJobs) > 0 {
-			for _, job := range e.doneJobs {
+		if len(done) > 0 {
+			for _, job := range done {
 				job()
 			}
-			e.doneJobs = e.doneJobs[:0]
 		}
 
 		return

diff --git a/js/utils.go b/js/utils.go
@@ -56,8 +56,8 @@ func Unwrap(value sobek.Value) (any, error) {
 	}
 }
 
-// ModuleCallable return the sobek.CyclicModuleRecord default export as sobek.Callable.
-func ModuleCallable(rt *sobek.Runtime, resolve sobek.HostResolveImportedModuleFunc, module sobek.CyclicModuleRecord) (sobek.Callable, error) {
+// ModuleInstance return the sobek.ModuleInstance.
+func ModuleInstance(rt *sobek.Runtime, resolve sobek.HostResolveImportedModuleFunc, module sobek.CyclicModuleRecord) (sobek.ModuleInstance, error) {
 	instance := rt.GetModuleInstance(module)
 	if instance == nil {
 		if err := module.Link(); err != nil {
@@ -70,7 +70,16 @@ func ModuleCallable(rt *sobek.Runtime, resolve sobek.HostResolveImportedModuleFu
 		case sobek.PromiseStateFulfilled:
 		default:
 		}
-		instance = rt.GetModuleInstance(module)
+		return rt.GetModuleInstance(module), nil
+	}
+	return instance, nil
+}
+
+// ModuleCallable return the sobek.CyclicModuleRecord default export as sobek.Callable.
+func ModuleCallable(rt *sobek.Runtime, resolve sobek.HostResolveImportedModuleFunc, module sobek.CyclicModuleRecord) (sobek.Callable, error) {
+	instance, err := ModuleInstance(rt, resolve, module)
+	if err != nil {
+		return nil, err
 	}
 	value := instance.GetBindingValue("default")
 	call, ok := sobek.AssertFunction(value)