add error db checkUpdate lock

GlobeMC · Oct 1, 2023 · bea57e5 · bea57e5
1 parent 78855be
commit bea57e5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/cmds/mcla/errdb.go b/cmds/mcla/errdb.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/GlobeMC/mcla"
@@ -41,6 +42,7 @@ type versionDataT struct {
 
 type ghErrDB struct {
 	Prefix string
+	checking atomic.Bool
 	cachedVersion versionDataT
 	lastCheck time.Time
 }
@@ -100,8 +102,13 @@ func (db *ghErrDB)getErrorDesc(id int)(desc *mcla.ErrorDesc, err error){
 }
 
 func (db *ghErrDB)checkUpdate()(err error){
+	if !db.checking.CompareAndSwap(false, true) {
+		return
+	}
+	defer db.checking.Store(false)
+
 	if !db.lastCheck.IsZero() && time.Since(db.lastCheck) <= time.Minute {
-		return nil
+		return
 	}
 
 	newVersion, err := db.fetchGhDBVersion()

diff --git a/cmds/mcla_wasm/errdb.go b/cmds/mcla_wasm/errdb.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/url"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	. "github.com/GlobeMC/mcla"
@@ -40,6 +41,7 @@ type versionDataT struct {
 
 type ghErrDB struct {
 	Prefix string
+	checking atomic.Bool
 	cachedVersion versionDataT
 	lastCheck time.Time
 }
@@ -96,6 +98,11 @@ func (db *ghErrDB)getErrorDesc(id int)(desc *ErrorDesc, err error){
 }
 
 func (db *ghErrDB)checkUpdate()(err error){
+	if !db.checking.CompareAndSwap(false, true) {
+		return
+	}
+	defer db.checking.Store(false)
+
 	if !db.lastCheck.IsZero() && time.Since(db.lastCheck) <= time.Minute {
 		return nil
 	}

diff --git a/cmds/mcla_wasm/main.go b/cmds/mcla_wasm/main.go
@@ -46,6 +46,8 @@ func getAPI()(m Map){
 }
 
 func main(){
+	defaultErrDB.checkUpdate() // refresh caches
+
 	api := getAPI()
 	api["release"] = js.FuncOf(func(_ js.Value, _ []js.Value)(_ any){
 		global.Delete("MCLA")