ch/Schafkopf-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert database to actor

Browse Source
This commit is contained in:
Christoph Hagen 2023-11-01 11:56:02 +01:00
parent f3c59e0f3f
commit 62ae594e06
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/App/Management/SQLiteDatabase.swift
View File

@ -37,7 +37,7 @@ private extension Configuration.EMail {
} }
} }
final class SQLiteDatabase { actor SQLiteDatabase {
/// A mapping between player name and generated access tokens for a session /// A mapping between player name and generated access tokens for a session
private var sessionTokenForPlayer = [PlayerName: SessionToken]() private var sessionTokenForPlayer = [PlayerName: SessionToken]()

18
Sources/App/routes.swift
View File

@ -156,7 +156,7 @@ func loginPlayer(_ app: Application) {
guard try request.password.verify(password, created: hash) else { guard try request.password.verify(password, created: hash) else {
throw Abort(.unauthorized) // 401 throw Abort(.unauthorized) // 401
} }
return server.startNewSessionForRegisteredPlayer(named: name) return await server.startNewSessionForRegisteredPlayer(named: name)
} }
} }
@ -177,7 +177,7 @@ func resumeSession(_ app: Application) {
app.post("player", "resume") { request -> String in app.post("player", "resume") { request -> String in
let token = try request.header(.token) let token = try request.header(.token)
guard let player = server.registeredPlayerExists(withSessionToken: token) else { guard let player = await server.registeredPlayerExists(withSessionToken: token) else {
throw Abort(.unauthorized) // 401 throw Abort(.unauthorized) // 401
} }
return player return player
@ -221,10 +221,10 @@ func getTableForPlayer(_ app: Application) {
app.post("player", "table") { request -> String in app.post("player", "table") { request -> String in
let token = try request.header(.token) let token = try request.header(.token)
guard let player = server.registeredPlayerExists(withSessionToken: token) else { guard let player = await server.registeredPlayerExists(withSessionToken: token) else {
throw Abort(.unauthorized) // 401 throw Abort(.unauthorized) // 401
} }
guard let info = server.currentTableOfPlayer(named: player) else { guard let info = await server.currentTableOfPlayer(named: player) else {
return "" return ""
} }
return try encodeJSON(info) return try encodeJSON(info)
@ -279,7 +279,7 @@ func createTable(_ app: Application) {
throw Abort(.badRequest) // 400 throw Abort(.badRequest) // 400
} }
guard let player = server.registeredPlayerExists(withSessionToken: token) else { guard let player = await server.registeredPlayerExists(withSessionToken: token) else {
throw Abort(.unauthorized) // 401 throw Abort(.unauthorized) // 401
} }
let result = try await server.createTable(named: tableName, player: player, isPublic: isPublic, in: request.db) let result = try await server.createTable(named: tableName, player: player, isPublic: isPublic, in: request.db)
@ -304,10 +304,10 @@ func getPublicTables(_ app: Application) {
app.post("tables", "public") { request -> String in app.post("tables", "public") { request -> String in
let token = try request.header(.token) let token = try request.header(.token)
guard server.isValid(sessionToken: token) else { guard await server.isValid(sessionToken: token) else {
throw Abort(.unauthorized) // 401 throw Abort(.unauthorized) // 401
} }
let list = server.getPublicTableInfos() let list = await server.getPublicTableInfos()
return try encodeJSON(list) return try encodeJSON(list)
} }
} }
@ -376,9 +376,9 @@ func performActionForPlayer(_ app: Application) {
let result: PlayerActionResult let result: PlayerActionResult
if let action = PlayerAction(rawValue: actionString) { if let action = PlayerAction(rawValue: actionString) {
result = server.performAction(playerToken: token, action: action) result = await server.performAction(playerToken: token, action: action)
} else if let game = GameType(rawValue: actionString) { } else if let game = GameType(rawValue: actionString) {
result = server.select(game: game, playerToken: token) result = await server.select(game: game, playerToken: token)
} else { } else {
throw Abort(.badRequest) throw Abort(.badRequest)
} }