Move server implementation in src

LinwoodDev · Oct 3, 2024 · f7eb5a1 · f7eb5a1
1 parent b0eb4d2
commit f7eb5a1
Show file tree

Hide file tree

Showing 20 changed files with 217 additions and 211 deletions.
diff --git a/api/lib/models.dart b/api/lib/models.dart
@@ -2,10 +2,10 @@ export 'src/models/background.dart';
 export 'src/models/chat.dart';
 export 'src/models/data.dart';
 export 'src/models/deck.dart';
+export 'src/models/definition.dart';
 export 'src/models/dialog.dart';
 export 'src/models/info.dart';
 export 'src/models/meta.dart';
-export 'src/models/definition.dart';
 export 'src/models/server.dart';
 export 'src/models/table.dart';
 export 'src/models/translation.dart';

diff --git a/app/android/settings.gradle b/app/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.6.1' apply false
+    id "com.android.application" version '8.7.0' apply false
     id "org.jetbrains.kotlin.android" version "1.7.10" apply false
 }
 

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -323,10 +323,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_linux
-      sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
+      sha256: "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2+1"
+    version: "0.9.3"
   file_selector_macos:
     dependency: transitive
     description:

diff --git a/docs/package.json b/docs/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.6.2",
     "@astrojs/starlight": "^0.28.2",
     "@phosphor-icons/react": "^2.1.7",
-    "@types/react": "^18.3.10",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
     "astro": "^4.15.10",
     "react": "^18.3.1",

diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/server/.gitignore b/server/.gitignore
@@ -1,6 +1,7 @@
 # https://dart.dev/guides/libraries/private-files
 # Created by `dart pub`
 .dart_tool/
+doc/
 
 # Runtime files
 world.qka

diff --git a/server/bin/quokka_server.dart b/server/bin/quokka_server.dart
@@ -1,4 +1,4 @@
-import 'package:quokka_server/main.dart';
+import 'package:quokka_server/src/main.dart';
 
 Future<void> main(List<String> arguments) {
   return runServer(arguments);

diff --git a/server/lib/quokka_server.dart b/server/lib/quokka_server.dart
@@ -1,14 +1,15 @@
 /// Official quokka server library
 library;
 
-export 'asset.dart';
-export 'main.dart';
-export 'server.dart';
-export 'programs/kick.dart';
-export 'programs/packs.dart';
-export 'programs/players.dart';
-export 'programs/save.dart';
-export 'programs/say.dart';
-export 'programs/stop.dart';
-export 'package:networker/networker.dart';
 export 'package:quokka_api/quokka_api.dart';
+export 'src/asset.dart';
+export 'src/events.dart';
+export 'src/main.dart';
+export 'src/server.dart';
+export 'src/programs/kick.dart';
+export 'src/programs/packs.dart';
+export 'src/programs/players.dart';
+export 'src/programs/save.dart';
+export 'src/programs/say.dart';
+export 'src/programs/stop.dart';
+export 'package:networker/networker.dart';
diff --git a/server/lib/asset.dart → server/lib/src/asset.dart b/server/lib/asset.dart → server/lib/src/asset.dart
diff --git a/server/lib/events.dart → server/lib/src/events.dart b/server/lib/events.dart → server/lib/src/events.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:networker/networker.dart';
 import 'package:quokka_api/quokka_api.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 mixin ServerReference {
   QuokkaServer get server;

diff --git a/server/lib/main.dart → server/lib/src/main.dart b/server/lib/main.dart → server/lib/src/main.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:args/args.dart';
 import 'package:quokka_api/quokka_api.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 const String version = '0.0.1';
 

diff --git a/server/lib/programs/kick.dart → server/lib/src/programs/kick.dart b/server/lib/programs/kick.dart → server/lib/src/programs/kick.dart
@@ -1,5 +1,5 @@
 import 'package:consoler/consoler.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 class KickProgram extends ConsoleProgram {
   final QuokkaServer server;

diff --git a/server/lib/programs/packs.dart → server/lib/src/programs/packs.dart b/server/lib/programs/packs.dart → server/lib/src/programs/packs.dart
@@ -1,6 +1,6 @@
 import 'package:consoler/consoler.dart';
 import 'package:quokka_api/quokka_api.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 class PacksProgram extends ConsoleProgram {
   final QuokkaServer server;

diff --git a/server/lib/programs/players.dart → server/lib/src/programs/players.dart b/server/lib/programs/players.dart → server/lib/src/programs/players.dart
@@ -1,5 +1,5 @@
 import 'package:consoler/consoler.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 class PlayersProgram extends ConsoleProgram {
   final QuokkaServer server;

diff --git a/server/lib/programs/save.dart → server/lib/src/programs/save.dart b/server/lib/programs/save.dart → server/lib/src/programs/save.dart
@@ -1,5 +1,5 @@
 import 'package:consoler/consoler.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 class SaveProgram extends ConsoleProgram {
   final QuokkaServer server;

diff --git a/server/lib/programs/say.dart → server/lib/src/programs/say.dart b/server/lib/programs/say.dart → server/lib/src/programs/say.dart
@@ -1,6 +1,6 @@
 import 'package:consoler/consoler.dart';
 import 'package:quokka_api/quokka_api.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 class SayProgram extends ConsoleProgram {
   final QuokkaServer server;

diff --git a/server/lib/programs/stop.dart → server/lib/src/programs/stop.dart b/server/lib/programs/stop.dart → server/lib/src/programs/stop.dart
@@ -1,5 +1,5 @@
 import 'package:consoler/consoler.dart';
-import 'package:quokka_server/server.dart';
+import 'package:quokka_server/src/server.dart';
 
 class StopProgram extends ConsoleProgram {
   final QuokkaServer server;

diff --git a/server/lib/server.dart → server/lib/src/server.dart b/server/lib/server.dart → server/lib/src/server.dart
@@ -8,13 +8,13 @@ import 'package:consoler/consoler.dart';
 import 'package:networker/networker.dart';
 import 'package:networker_socket/server.dart';
 import 'package:quokka_api/quokka_api.dart';
-import 'package:quokka_server/asset.dart';
-import 'package:quokka_server/events.dart';
-import 'package:quokka_server/programs/packs.dart';
-import 'package:quokka_server/programs/players.dart';
-import 'package:quokka_server/programs/save.dart';
-import 'package:quokka_server/programs/say.dart';
-import 'package:quokka_server/programs/stop.dart';
+import 'package:quokka_server/src/asset.dart';
+import 'package:quokka_server/src/events.dart';
+import 'package:quokka_server/src/programs/packs.dart';
+import 'package:quokka_server/src/programs/players.dart';
+import 'package:quokka_server/src/programs/save.dart';
+import 'package:quokka_server/src/programs/say.dart';
+import 'package:quokka_server/src/programs/stop.dart';
 
 Future<WorldState?> _computeEvent(ServerWorldEvent event, WorldState state,
     Map<String, FileMetadata> signature) {
@@ -27,7 +27,7 @@ final class QuokkaServer extends Bloc<ServerWorldEvent, WorldState> {
   final ServerAssetManager assetManager;
   final String? worldFile;
   final eventSystem = EventSystem();
-  bool _temp = false;
+  bool autosave = false;
 
   NetworkerSocketServer? _server;
   NetworkerPipe<dynamic, WorldEvent>? _pipe;
@@ -94,7 +94,7 @@ final class QuokkaServer extends Bloc<ServerWorldEvent, WorldState> {
     }
     log("Starting server on port $port", level: LogLevel.info);
     log('Verbose logging activated', level: LogLevel.verbose);
-    _temp = autosave;
+    this.autosave = autosave;
     final server =
         _server = NetworkerSocketServer(InternetAddress.anyIPv4, port,
             filterConnections: buildFilterConnections(
@@ -173,7 +173,7 @@ final class QuokkaServer extends Bloc<ServerWorldEvent, WorldState> {
   }
 
   Future<void> save({bool force = false}) async {
-    if (!force && _temp) return;
+    if (!force && autosave) return;
     final bytes = state.save().exportAsBytes();
     await File(defaultWorldFile).writeAsBytes(bytes);
   }

diff --git a/server/test/dialog.dart b/server/test/dialog.dart
@@ -40,26 +40,30 @@ In conclusion, programming has become an indispensable skill in the modern world
 
 Future<void> onLoad(QuokkaServer server) async {
   print("on load was called");
-  server.eventSystem.on<ObjectsMoved>().listen((e) {
-    print("Listener was called, opening dialog");
-    e.sendEvent(DialogOpened(
-      GameDialog(id: "testDialog", title: "TestDialog")
-          .markdown(testContent)
-          .textField(
-            "TestTextField",
-            id: "testTextField",
-            placeholder: "TestPlaceholder",
-            multiline: true,
-            password: true,
-          )
-          .action(GameDialogButton("TestButton")),
-    ));
-  });
-  server.eventSystem.on<DialogCloseRequest>().listen((e) {
-    final value = e.clientEvent.value;
-    print("Dialog ${e.clientEvent.id} closed, got ${e.clientEvent.value}");
-    if (value != null) {
-      e.cancel();
-    }
-  });
+  server.eventSystem
+    ..on<ObjectsMoved>().listen((e) {
+      print("Listener was called, opening dialog");
+      e.sendEvent(DialogOpened(
+        GameDialog(id: "testDialog", title: "TestDialog")
+            .markdown(testContent)
+            .textField(
+              "TestTextField",
+              id: "testTextField",
+              placeholder: "TestPlaceholder",
+              multiline: true,
+              password: true,
+            )
+            .action(GameDialogButton("TestButton")),
+      ));
+    })
+    ..on<Null>().listen((e) {
+      print("play joined");
+    })
+    ..on<DialogCloseRequest>().listen((e) {
+      final value = e.clientEvent.value;
+      print("Dialog ${e.clientEvent.id} closed, got ${e.clientEvent.value}");
+      if (value != null) {
+        e.cancel();
+      }
+    });
 }
diff --git a/server/test/duplicate.dart b/server/test/duplicate.dart
@@ -16,7 +16,7 @@ Future<void> onLoad(QuokkaServer server) async {
       final event = e.clientEvent;
       final table = e.getTableOrDefault(event.table);
       final cell = table.getCell(event.from);
-      final objects = List<GameObject>.from(table.getCell(event.to).objects);
+      final objects = <GameObject>[];
       for (final index in event.objects) {
         final object = cell.objects[index];
         objects.add(object);