Fixed JS function being overwritten in last commit, added DB cache, fixed tests

Author: Forceu

cmd/gokapi/Main.go

@@ -34,7 +34,7 @@ import (
 
 // versionGokapi is the current version in readable form.
 // Other version numbers can be modified in /build/go-generate/updateVersionNumbers.go
-const versionGokapi = "2.0.0-beta2"
+const versionGokapi = "2.0.0"
 
 // The following calls update the version numbers, update documentation, minify Js/CSS and build the WASM modules
 //go:generate go run "../../build/go-generate/updateVersionNumbers.go"

internal/configuration/database/Database.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/forceu/gokapi/internal/configuration/database/dbabstraction"
+	"github.com/forceu/gokapi/internal/configuration/database/dbcache"
 	"github.com/forceu/gokapi/internal/helper"
 	"github.com/forceu/gokapi/internal/models"
 	"net/url"
@@ -15,6 +16,7 @@ var db dbabstraction.Database
 // Connect establishes a connection to the database and creates the table structure, if necessary
 func Connect(config models.DbConnection) {
 	var err error
+	dbcache.Init()
 	db, err = dbabstraction.GetNew(config)
 	if err != nil {
 		panic(err)
@@ -270,7 +272,10 @@ func SaveUser(user models.User, isNewUser bool) {
 
 // UpdateUserLastOnline writes the last online time to the database
 func UpdateUserLastOnline(id int) {
-	db.UpdateUserLastOnline(id)
+	// To reduce database writes, the entry is only updated if the last timestamp is more than 30 seconds old
+	if dbcache.LastOnlineRequiresSave(id) {
+		db.UpdateUserLastOnline(id)
+	}
 }
 
 // DeleteUser deletes a user with the given ID

internal/configuration/database/Database_test.go

@@ -3,6 +3,7 @@ package database
 import (
 	"github.com/alicebob/miniredis/v2"
 	"github.com/forceu/gokapi/internal/configuration/database/dbabstraction"
+	"github.com/forceu/gokapi/internal/configuration/database/dbcache"
 	"github.com/forceu/gokapi/internal/models"
 	"github.com/forceu/gokapi/internal/test"
 	"log"
@@ -306,7 +307,10 @@ func TestUsers(t *testing.T) {
 		return len(GetAllUsers())
 	}, 2)
 	test.IsEqual(t, allUsersSqlite, allUsersRedis)
-	runAllTypesNoOutput(t, func() { UpdateUserLastOnline(1) })
+	runAllTypesNoOutput(t, func() {
+		dbcache.Init()
+		UpdateUserLastOnline(1)
+	})
 	runAllTypesCompareTwoOutputs(t, func() (any, any) {
 		retrievedUser, ok := GetUser(1)
 		isUpdated := time.Now().Unix()-retrievedUser.LastOnline < 5 && time.Now().Unix()-retrievedUser.LastOnline > -1

internal/configuration/database/dbcache/DbCache.go

@@ -0,0 +1,26 @@
+package dbcache
+
+import (
+	"sync"
+	"time"
+)
+
+var lastOnlineTimeUpdate map[int]int64
+var lastOnlineTimeMutex sync.Mutex
+
+// Init starts the DB Cache
+func Init() {
+	lastOnlineTimeUpdate = make(map[int]int64)
+}
+
+// LastOnlineRequiresSave returns true if the last update time of the user is older than 60 seconds.
+func LastOnlineRequiresSave(userId int) bool {
+	lastOnlineTimeMutex.Lock()
+	timestamp := time.Now().Unix()
+	defer lastOnlineTimeMutex.Unlock()
+	if lastOnlineTimeUpdate[userId] < (timestamp - 60) {
+		lastOnlineTimeUpdate[userId] = timestamp
+		return true
+	}
+	return false
+}

internal/configuration/database/provider/sqlite/Sqlite.go

@@ -164,8 +164,8 @@ func (p DatabaseProvider) init(dbConfig models.DbConnection) (DatabaseProvider,
 		if err != nil {
 			return DatabaseProvider{}, err
 		}
-		p.sqliteDb.SetMaxOpenConns(10000)
-		p.sqliteDb.SetMaxIdleConns(10000)
+		p.sqliteDb.SetMaxOpenConns(5)
+		p.sqliteDb.SetMaxIdleConns(5)
 
 		if !helper.FileExists(dbConfig.HostUrl) {
 			return p, p.createNewDatabase()

internal/configuration/database/provider/sqlite/users.go

@@ -98,8 +98,7 @@ func (p DatabaseProvider) SaveUser(user models.User, isNewUser bool) {
 // UpdateUserLastOnline writes the last online time to the database
 func (p DatabaseProvider) UpdateUserLastOnline(id int) {
 	timeNow := time.Now().Unix()
-	// To reduce database writes, the entry is only updated, if the last timestamp is more than 30 seconds old
-	_, err := p.sqliteDb.Exec("UPDATE Users SET LastOnline= ? WHERE Id = ? AND (? - LastOnline > 30)", timeNow, id, timeNow)
+	_, err := p.sqliteDb.Exec("UPDATE Users SET LastOnline= ? WHERE Id = ?", timeNow, id, timeNow)
 	helper.Check(err)
 }
 

internal/test/testconfiguration/TestConfiguration.go

@@ -70,6 +70,8 @@ func Create(initFiles bool) {
 		os.WriteFile(dataDir+"/c4f9375f9834b4e7f0a528cc65c055702bf5f24a", []byte("456"), 0777)
 		os.WriteFile(dataDir+"/e017693e4a04a59d0b0f400fe98177fe7ee13cf7", []byte("789"), 0777)
 		os.WriteFile(dataDir+"/2341354656543213246465465465432456898794", []byte("abc"), 0777)
+		os.WriteFile(dataDir+"/03cfd743661f07975fa2f1220c5194cbaff48451", []byte("def"), 0777)
+		os.WriteFile(dataDir+"/pendingdeletion", []byte("ghi"), 0777)
 		os.WriteFile(dataDir+"/unlimitedtest", []byte("def"), 0777)
 		os.WriteFile(baseDir+"/fileupload.jpg", []byte("abc"), 0777)
 	}

internal/webserver/api/Api_test.go

@@ -1118,23 +1118,23 @@ func TestDeleteFile(t *testing.T) {
 	database.SaveMetaData(models.File{
 		Id:                 "smalltestfile1",
 		Name:               "smalltestfile1",
-		SHA1:               "smalltestfile1",
+		SHA1:               "03cfd743661f07975fa2f1220c5194cbaff48451",
 		ExpireAt:           2147483646,
 		DownloadsRemaining: 1,
 		UserId:             idUser,
 	})
 	database.SaveMetaData(models.File{
 		Id:                 "smalltestfile2",
 		Name:               "smalltestfile2",
-		SHA1:               "smalltestfile2",
+		SHA1:               "03cfd743661f07975fa2f1220c5194cbaff48451",
 		ExpireAt:           2147483646,
 		DownloadsRemaining: 1,
 		UserId:             idSuperAdmin,
 	})
 	database.SaveMetaData(models.File{
 		Id:                 "smalltestfileDelay",
 		Name:               "smalltestfileDelay",
-		SHA1:               "2341354656543213246465465465432456898794",
+		SHA1:               "03cfd743661f07975fa2f1220c5194cbaff48451",
 		ExpireAt:           2147483646,
 		DownloadsRemaining: 1,
 		UserId:             idUser,
@@ -1199,47 +1199,47 @@ func testDeleteFileCall(t *testing.T, apiKey, fileId, delay string, resultCode i
 func TestRestoreFile(t *testing.T) {
 	config := configuration.Get()
 	fileUser := models.File{
-		Id:                 "smalltestfile1",
-		Name:               "smalltestfile1",
-		SHA1:               "e017693e4a04a59d0b0f400fe98177fe7ee13cf7",
+		Id:                 "pendingdeletion1",
+		Name:               "pendingdeletion1",
+		SHA1:               "pendingdeletion",
 		ExpireAt:           2147483646,
 		DownloadsRemaining: 1,
 		UserId:             idUser,
 	}
 	fileAdmin := models.File{
-		Id:                 "smalltestfile2",
-		Name:               "smalltestfile2",
-		SHA1:               "2341354656543213246465465465432456898794",
+		Id:                 "pendingdeletion2",
+		Name:               "pendingdeletion2",
+		SHA1:               "pendingdeletion",
 		ExpireAt:           2147483646,
 		DownloadsRemaining: 1,
 		UserId:             idSuperAdmin,
 	}
 	database.SaveMetaData(fileUser)
 	database.SaveMetaData(fileAdmin)
-	_, ok := database.GetMetaDataById("smalltestfile1")
+	_, ok := database.GetMetaDataById(fileUser.Id)
 	test.IsEqualBool(t, ok, true)
-	_, ok = database.GetMetaDataById("smalltestfile2")
+	_, ok = database.GetMetaDataById(fileAdmin.Id)
 	test.IsEqualBool(t, ok, true)
 
 	apiKey := testAuthorisation(t, "/files/restore", models.ApiPermDelete)
 	testRestoreFileCall(t, apiKey.Id, "", 400, `{"Result":"error","ErrorMessage":"header id is required"}`)
 	testRestoreFileCall(t, apiKey.Id, "invalid", 404, `{"Result":"error","ErrorMessage":"Invalid file ID provided or file has already been deleted."}`)
-	testRestoreFileCall(t, apiKey.Id, "smalltestfile1", 200, fileUser.ToJsonResult(config.ServerUrl, config.IncludeFilename))
-	testRestoreFileCall(t, apiKey.Id, "smalltestfile2", 401, `{"Result":"error","ErrorMessage":"No permission to restore this file"}`)
+	testRestoreFileCall(t, apiKey.Id, fileUser.Id, 200, fileUser.ToJsonResult(config.ServerUrl, config.IncludeFilename))
+	testRestoreFileCall(t, apiKey.Id, fileAdmin.Id, 401, `{"Result":"error","ErrorMessage":"No permission to restore this file"}`)
 
 	storage.DeleteFileSchedule(fileUser.Id, 1, true)
 	storage.DeleteFileSchedule(fileAdmin.Id, 1, true)
 
-	time.Sleep(500 * time.Millisecond)
+	time.Sleep(400 * time.Millisecond)
 	file, ok := database.GetMetaDataById(fileUser.Id)
 	test.IsEqualBool(t, ok, true)
 	test.IsEqualBool(t, file.PendingDeletion != 0, true)
 	file, ok = database.GetMetaDataById(fileAdmin.Id)
 	test.IsEqualBool(t, ok, true)
 	test.IsEqualBool(t, file.PendingDeletion != 0, true)
 
-	testRestoreFileCall(t, apiKey.Id, "smalltestfile1", 200, fileUser.ToJsonResult(config.ServerUrl, config.IncludeFilename))
-	testRestoreFileCall(t, apiKey.Id, "smalltestfile2", 401, `{"Result":"error","ErrorMessage":"No permission to restore this file"}`)
+	testRestoreFileCall(t, apiKey.Id, fileUser.Id, 200, fileUser.ToJsonResult(config.ServerUrl, config.IncludeFilename))
+	testRestoreFileCall(t, apiKey.Id, fileAdmin.Id, 401, `{"Result":"error","ErrorMessage":"No permission to restore this file"}`)
 
 	file, ok = database.GetMetaDataById(fileUser.Id)
 	test.IsEqualBool(t, ok, true)
@@ -1249,7 +1249,6 @@ func TestRestoreFile(t *testing.T) {
 	test.IsEqualBool(t, file.PendingDeletion != 0, true)
 
 	time.Sleep(600 * time.Millisecond)
-
 	file, ok = database.GetMetaDataById(fileUser.Id)
 	test.IsEqualBool(t, ok, true)
 	test.IsEqualInt64(t, file.PendingDeletion, 0)

internal/webserver/web/static/js/admin_ui_users.js

@@ -193,7 +193,7 @@ function addNewUser() {
 
 function addRowUser(userid, name) {
 
-    userid = sanitizeId(userid);
+    userid = sanitizeUserId(userid);
 
     let table = document.getElementById("usertable");
     let row = table.insertRow(1);
@@ -289,7 +289,7 @@ function addRowUser(userid, name) {
     }, 700);
 }
 
-function sanitizeId(id) {
+function sanitizeUserId(id) {
     const numericId = id.toString().trim();
     if (!/^\d+$/.test(numericId)) {
         throw new Error("Invalid ID: must contain only digits.");