fuck shit up

2024-05-19 17:22:06 +02:00 · 2024-05-19 17:22:06 +02:00 · ffbb1dd95a
commit ffbb1dd95a
parent c802251c9d
10 changed files with 59 additions and 269 deletions
--- a/lib/api/register.dart
+++ b/lib/api/register.dart
@ -1,97 +1,23 @@
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:uuid/uuid.dart';
-
-class PlayerInfo {
-  final UuidValue? playerID;
-  final UuidValue? lobbyID;
+class CreateGameResponse {
  final String? passphrase;

-  const PlayerInfo({
-    required this.playerID,
-    required this.lobbyID,
+  const CreateGameResponse({
    required this.passphrase,
  });

-  factory PlayerInfo.empty() {
-    return const PlayerInfo(playerID: null, lobbyID: null, passphrase: null);
+  factory CreateGameResponse.empty() {
+    return const CreateGameResponse(passphrase: null);
  }

-  factory PlayerInfo.fromJson(Map<String, dynamic> json) {
-    final playerid = UuidValue.fromString(json['playerID']);
-    final lobbyid = UuidValue.fromString(json['lobbyID']);
+  factory CreateGameResponse.fromJson(Map<String, dynamic> json) {
    final passphrase = json['passphrase'];

-    return PlayerInfo(
-        playerID: playerid, lobbyID: lobbyid, passphrase: passphrase);
+    return CreateGameResponse(passphrase: passphrase);
  }

  Map<String, dynamic> toJson() {
-    String? pid;
-    String? lid;
-
-    if (playerID != null) {
-      pid = playerID.toString();
-    }
-
-    if (lobbyID != null) {
-      lid = lobbyID.toString();
-    }
-
    return {
-      'playerID': pid,
-      'lobbyID': lid,
      'passphrase': passphrase,
    };
  }
-
-  void store() async {
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-
-    await prefs.setBool("contains", true);
-    await prefs.setString("playerID", playerID.toString());
-    await prefs.setString("lobbyID", lobbyID.toString());
-    await prefs.setString("passphrase", passphrase.toString());
-  }
-
-  void delete() async {
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-
-    await prefs.setBool("contains", false);
-  }
-
-  static Future<PlayerInfo?> get() async {
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    var contains = prefs.getBool("contains");
-    var playerID = prefs.getString("playerID");
-    var lobbyID = prefs.getString("lobbyID");
-    var passphrase = prefs.getString("passphrase");
-
-    if (contains == null ||
-        !contains ||
-        playerID == null ||
-        lobbyID == null ||
-        passphrase == null) {
-      return null;
-    }
-
-    return PlayerInfo(
-        playerID: UuidValue.fromString(playerID),
-        lobbyID: UuidValue.fromString(lobbyID),
-        passphrase: passphrase);
-  }
-}
-
-class WebsocketMessageIdentifyPlayer {
-  final String playerID;
-  final String lobbyID;
-  final String? passphrase;
-
-  const WebsocketMessageIdentifyPlayer({
-    required this.playerID,
-    required this.lobbyID,
-    required this.passphrase,
-  });
-
-  Map<String, dynamic> toJson() =>
-      {'lobbyID': lobbyID, 'playerID': playerID, 'passphrase': passphrase};
 }
--- a/lib/connection/ws_connection.dart
+++ b/lib/connection/ws_connection.dart
@ -40,19 +40,11 @@ class ServerConnection {
    channel!.sink.add(message);
  }

-  void connect(String playerID, lobbyID, String? passphrase) {
+  void connect(String? passphrase) {
    disconnectExistingConnection();
    channel = WebSocketChannel.connect(Uri.parse(config.getWebsocketURL()));

-    send(
-      jsonEncode(
-        WebsocketMessageIdentifyPlayer(
-          playerID: (playerID),
-          lobbyID: (lobbyID),
-          passphrase: (passphrase),
-        ),
-      ),
-    );
+    send(jsonEncode(passphrase));

    log(channel!.closeCode.toString());
    broadcast = channel!.stream.asBroadcastStream();
--- a/lib/connection_cubit/connection_cubit.dart
+++ b/lib/connection_cubit/connection_cubit.dart
@ -15,8 +15,8 @@ class ConnectionCubit extends Cubit<ConnectionCubitState> {
    return _instance;
  }

-  void connect(String playerID, lobbyID, String? passphrase) {
-    ServerConnection.getInstance().connect(playerID, lobbyID, passphrase);
+  void connect(String? passphrase) {
+    ServerConnection.getInstance().connect(passphrase);
  }

  void opponentConnected() {
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 import 'package:mchess/chess/chess_app.dart';

 void main() {
-  GoRouter.optionURLReflectsImperativeAPIs = true;
  runApp(const ChessApp());
 }
--- a/lib/pages/chess_game.dart
+++ b/lib/pages/chess_game.dart
@ -9,17 +9,10 @@ import 'package:mchess/chess_bloc/tap_bloc.dart';
 import 'package:mchess/utils/chess_utils.dart';
 import 'package:mchess/utils/widgets/promotion_dialog.dart';
 import 'package:universal_platform/universal_platform.dart';
-import 'package:uuid/uuid.dart';

 class ChessGame extends StatefulWidget {
-  final UuidValue playerID;
-  final UuidValue lobbyID;
  final String? passphrase;
-  const ChessGame(
-      {required this.playerID,
-      required this.lobbyID,
-      required this.passphrase,
-      super.key});
+  const ChessGame({required this.passphrase, super.key});

  @override
  State<ChessGame> createState() => _ChessGameState();
@ -85,29 +78,3 @@ class _ChessGameState extends State<ChessGame> {
    );
  }
 }
-
-class ChessGameArguments {
-  final UuidValue lobbyID;
-  final UuidValue playerID;
-  final String? passphrase;
-
-  ChessGameArguments({
-    required this.lobbyID,
-    required this.playerID,
-    required this.passphrase,
-  });
-
-  bool isValid() {
-    try {
-      lobbyID.validate();
-      playerID.validate();
-    } catch (e) {
-      return false;
-    }
-
-    if (passphrase == null) return false;
-    if (passphrase!.isEmpty) return false;
-
-    return true;
-  }
-}
--- a/lib/pages/create_game.dart
+++ b/lib/pages/create_game.dart
@ -1,4 +1,5 @@
 import 'dart:developer';
+import 'dart:io';

 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@ -13,36 +14,26 @@ import 'dart:convert';
 import 'package:mchess/pages/chess_game.dart';
 import 'package:mchess/utils/config.dart' as config;

-class HostGameWidget extends StatefulWidget {
-  const HostGameWidget({super.key});
+class CreateGameWidget extends StatefulWidget {
+  const CreateGameWidget({super.key});

  @override
-  State<HostGameWidget> createState() => _HostGameWidgetState();
+  State<CreateGameWidget> createState() => _CreateGameWidgetState();
 }

-class _HostGameWidgetState extends State<HostGameWidget> {
-  late Future<PlayerInfo?> registerResponse;
-  late ChessGameArguments chessGameArgs;
-
+class _CreateGameWidgetState extends State<CreateGameWidget> {
  @override
  void initState() {
-    registerResponse = hostPrivateGame();
+    registerResponse = createPrivateGame();
    connectToWebsocket(registerResponse);
    super.initState();
  }

-  void connectToWebsocket(Future<PlayerInfo?> resp) {
+  void connectToWebsocket(Future<CreateGameResponse?> resp) {
    resp.then((value) {
      if (value == null) return;

-      chessGameArgs = ChessGameArguments(
-          lobbyID: value.lobbyID!,
-          playerID: value.playerID!,
-          passphrase: value.passphrase);
-
      ConnectionCubit.getInstance().connect(
-        value.playerID!.uuid,
-        value.lobbyID!.uuid,
        value.passphrase,
      );
    });
@ -67,8 +58,8 @@ class _HostGameWidgetState extends State<HostGameWidget> {
                listener: (context, state) {
                  // We wait for our opponent to connect
                  if (state.opponentConnected) {
-                    snapshot.data?.store();
-                    context.pushReplacement('/game', extra: chessGameArgs);
+                    context.pushReplacement('/game/$passphrase',
+                        extra: chessGameArgs);
                  }
                },
                child: Column(
@ -108,11 +99,11 @@ class _HostGameWidgetState extends State<HostGameWidget> {
    );
  }

-  Future<PlayerInfo?> hostPrivateGame() async {
+  Future<CreateGameResponse?> createPrivateGame() async {
    Response response;

    try {
-      response = await http.get(Uri.parse(config.getHostURL()),
+      response = await http.get(Uri.parse(config.getCreateGameURL()),
          headers: {"Accept": "application/json"});
    } catch (e) {
      log(e.toString());
@ -131,10 +122,9 @@ class _HostGameWidgetState extends State<HostGameWidget> {
      return null;
    }

-    if (response.statusCode == 200) {
+    if (response.statusCode == HttpStatus.ok) {
      log(response.body);
-      var info = PlayerInfo.fromJson(jsonDecode(response.body));
-      return info;
+      return CreateGameResponse.fromJson(jsonDecode(response.body));
    }
    return null;
  }
--- a/lib/pages/lobby_selector.dart
+++ b/lib/pages/lobby_selector.dart
@ -1,15 +1,8 @@
-import 'dart:convert';
-import 'dart:developer';
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:http/http.dart' as http;
-import 'package:mchess/api/register.dart';
 import 'package:mchess/connection/ws_connection.dart';
 import 'package:mchess/connection_cubit/connection_cubit.dart';
-import 'package:mchess/pages/chess_game.dart';
-import 'package:mchess/utils/config.dart' as config;
+import 'package:mchess/utils/passpharse.dart';

 class LobbySelector extends StatefulWidget {
  const LobbySelector({super.key});
@ -21,7 +14,7 @@ class LobbySelector extends StatefulWidget {
 class _LobbySelectorState extends State<LobbySelector> {
  final buttonStyle = const ButtonStyle();
  final phraseController = TextEditingController();
-  late Future<PlayerInfo?> joinGameFuture;
+  late Future<String?> joinGameFuture;

  @override
  Widget build(BuildContext context) {
@ -31,7 +24,7 @@ class _LobbySelectorState extends State<LobbySelector> {
          mainAxisAlignment: MainAxisAlignment.center,
          children: [
            ElevatedButton(
-              onPressed: () => buildJoinOrHostDialog(context),
+              onPressed: () => buildJoinOrCreateDialog(context),
              child: const Row(
                mainAxisSize: MainAxisSize.min,
                children: [
@ -49,7 +42,7 @@ class _LobbySelectorState extends State<LobbySelector> {
    );
  }

-  Future<void> buildJoinOrHostDialog(BuildContext context) {
+  Future<void> buildJoinOrCreateDialog(BuildContext context) {
    //TODO: find a better place to disconnect old websocket connection
    ServerConnection.getInstance().disconnectExistingConnection();

@ -59,17 +52,17 @@ class _LobbySelectorState extends State<LobbySelector> {
        return Scaffold(
          backgroundColor: Colors.transparent,
          body: AlertDialog(
-            title: const Text('Host or join?'),
+            title: const Text('Create or join?'),
            actions: <Widget>[
              TextButton(
                child: const Text('Cancel'),
                onPressed: () => context.pop(),
              ),
              TextButton(
-                  child: const Text('Host'),
+                  child: const Text('Create'),
                  onPressed: () {
-                    context.pop(); //close dialog before going to host
-                    context.goNamed('host');
+                    context.pop(); //close dialog before going to createGame
+                    context.goNamed('createGame');
                  }),
              TextButton(
                child: const Text('Join'),
@ -126,106 +119,15 @@ class _LobbySelectorState extends State<LobbySelector> {
  }

  void submitPassphrase(BuildContext ctx) {
-    joinGameFuture = joinPrivateGame(ctx);
-    joinGameFuture.then((value) {
-      if (value != null) {
-        phraseController.clear();
-        ctx.pop();
-        switchToGame(value);
-      }
-    });
+    switchToGame(phraseController.text);
  }

-  void switchToGame(PlayerInfo info) {
-    var chessGameArgs = ChessGameArguments(
-        lobbyID: info.lobbyID!,
-        playerID: info.playerID!,
-        passphrase: info.passphrase);
-
+  void switchToGame(String phrase) {
    ConnectionCubit.getInstance().connect(
-      info.playerID!.uuid,
-      info.lobbyID!.uuid,
-      info.passphrase,
+      phrase,
    );

-    if (!chessGameArgs.isValid()) {
-      context.goNamed('lobbySelector');
-      const snackBar = SnackBar(
-        backgroundColor: Colors.amberAccent,
-        content: Text("Game information is corrupted"),
-      );
-      ScaffoldMessenger.of(context).clearSnackBars();
-      ScaffoldMessenger.of(context).showSnackBar(snackBar);
-
-      return;
-    }
-
-    context.goNamed('game', extra: chessGameArgs);
-  }
-
-  Future<PlayerInfo?> joinPrivateGame(BuildContext context) async {
-    http.Response response;
-
-    var existingInfo = await PlayerInfo.get();
-
-    log("lobbyID: ${existingInfo?.lobbyID} and playerID: ${existingInfo?.playerID} and passphrase: ${existingInfo?.passphrase}");
-
-    PlayerInfo info;
-    if (existingInfo?.passphrase == phraseController.text) {
-      // We have player info for this exact passphrase
-      info = PlayerInfo(
-          playerID: existingInfo?.playerID,
-          lobbyID: existingInfo?.lobbyID,
-          passphrase: phraseController.text);
-    } else {
-      info = PlayerInfo(
-          playerID: null, lobbyID: null, passphrase: phraseController.text);
-    }
-
-    var decodedInfo = jsonEncode(info);
-    log("decodedInfo: $decodedInfo");
-
-    try {
-      response = await http.post(Uri.parse(config.getJoinURL()),
-          body: decodedInfo, headers: {"Accept": "application/json"});
-    } catch (e) {
-      log(e.toString());
-
-      if (!context.mounted) return null;
-
-      const snackBar = SnackBar(
-        backgroundColor: Colors.amberAccent,
-        content: Text("mChess server is not responding. Try again or give up"),
-      );
-      ScaffoldMessenger.of(context).clearSnackBars();
-      ScaffoldMessenger.of(context).showSnackBar(snackBar);
-      return null;
-    }
-
-    if (response.statusCode == HttpStatus.notFound) {
-      const snackBar = SnackBar(
-        backgroundColor: Colors.amberAccent,
-        content: Text("Passphrase could not be found."),
-      );
-
-      if (!context.mounted) return null;
-
-      ScaffoldMessenger.of(context).clearSnackBars();
-      ScaffoldMessenger.of(context).showSnackBar(snackBar);
-      return null;
-    }
-
-    if (response.statusCode == HttpStatus.ok) {
-      var info = PlayerInfo.fromJson(jsonDecode(response.body));
-      info.store();
-      log('Player info received from server: ');
-      log('lobbyID: ${info.lobbyID}');
-      log('playerID: ${info.playerID}');
-      log('passphrase: ${info.passphrase}');
-
-      return info;
-    }
-
-    return null;
+    var urlPassphrase = phrase.phraseToURL();
+    context.goNamed('game', pathParameters: {'phrase': urlPassphrase});
  }
 }
--- a/lib/utils/chess_router.dart
+++ b/lib/utils/chess_router.dart
@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mchess/pages/chess_game.dart';
 import 'package:mchess/pages/lobby_selector.dart';
-import 'package:mchess/pages/host_game.dart';
+import 'package:mchess/pages/create_game.dart';

 final navigatorKey = GlobalKey<NavigatorState>();

@ -27,13 +27,13 @@ class ChessAppRouter {
        },
        routes: [
          GoRoute(
-              path: 'host',
-              name: 'host',
+              path: 'createGame',
+              name: 'createGame',
              builder: (context, state) {
-                return const HostGameWidget();
+                return const CreateGameWidget();
              }),
          GoRoute(
-            path: 'game',
+            path: 'game/:phrase',
            name: 'game',
            builder: (context, state) {
              var args = state.extra as ChessGameArguments;
--- a/lib/utils/config.dart
+++ b/lib/utils/config.dart
@ -1,9 +1,9 @@
 const prodURL = 'chess.sw-gross.de:9999';
 const debugURL = 'localhost:8080';

-const useDbgUrl = false;
+const useDbgUrl = true;

-String getHostURL() {
+String getCreateGameURL() {
  var prot = 'https';
  var domain = prodURL;
  if (useDbgUrl) {
--- a/lib/utils/passpharse.dart
+++ b/lib/utils/passpharse.dart
@ -0,0 +1,15 @@
+extension PassphraseURL on String {
+  String phraseToURL() {
+    var words = split(' ');
+
+    for (var i = 0; i < words.length; i++) {
+      words[i] = words[i].capitalize();
+    }
+
+    return words.join();
+  }
+
+  String capitalize() {
+    return "${this[0].toUpperCase()}${substring(1).toLowerCase()}";
+  }
+}