small improvements

AuroraTeam · Oct 15, 2023 · 5e64ef6 · 5e64ef6
1 parent a500643
commit 5e64ef6
Show file tree

Hide file tree

Showing 5 changed files with 451 additions and 49 deletions.
diff --git a/lib/api_response.dart b/lib/api_response.dart
@@ -1,12 +1,15 @@
 import 'dart:convert';
+import 'package:json_annotation/json_annotation.dart';
+part 'api_response.g.dart';
 
-ApiResponse apiResponseFromJson(String str) =>
+ApiResponse parseApiResponseFromJson(String str) =>
     ApiResponse.fromJson(json.decode(str));
 
+@JsonSerializable(fieldRename: FieldRename.snake)
 class ApiResponse {
   final int buildNumber;
   final String version;
-  final String downloadUrl;
+  final Uri downloadUrl;
   final Checksums checksums;
 
   ApiResponse({
@@ -16,22 +19,22 @@ class ApiResponse {
     required this.checksums,
   });
 
-  factory ApiResponse.fromJson(Map<String, dynamic> json) => ApiResponse(
-        buildNumber: json["build_number"],
-        version: json["version"],
-        downloadUrl: json["download_url"],
-        checksums: Checksums.fromJson(json["checksums"]),
-      );
+  factory ApiResponse.fromJson(Map<String, dynamic> json) =>
+      _$ApiResponseFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ApiResponseToJson(this);
 }
 
+@JsonSerializable()
 class Checksums {
+  final String sha256;
+
   Checksums({
     required this.sha256,
   });
 
-  final String sha256;
+  factory Checksums.fromJson(Map<String, dynamic> json) =>
+      _$ChecksumsFromJson(json);
 
-  factory Checksums.fromJson(Map<String, dynamic> json) => Checksums(
-        sha256: json["sha256"],
-      );
+  Map<String, dynamic> toJson() => _$ChecksumsToJson(this);
 }
diff --git a/lib/api_response.g.dart b/lib/api_response.g.dart
diff --git a/lib/injector.dart b/lib/injector.dart
@@ -5,39 +5,45 @@ import 'package:serverwrapper/api_response.dart';
 
 class Injector {
   static final apiUrl =
-      Uri.parse('https://authlib-injector.yushi.moe/artifact/latest.json');
+      Uri.https('authlib-injector.yushi.moe', '/artifact/latest.json');
 
   static Future<void> init(String filename) async {
     var file = File(filename);
     if (!await file.exists()) {
-      await download(file);
-    } else {
-      print("Injector loaded successfully");
+      await _download(file);
     }
+    print("Injector loaded successfully");
   }
 
-  static Future<void> download(File file) async {
-    var response = await get(apiUrl);
+  static Future<void> _download(File file) async {
     ApiResponse parsedResponse;
-
-    if (response.statusCode == 200) {
-      parsedResponse = apiResponseFromJson(response.body);
-    } else {
+    try {
+      var response = await get(apiUrl);
+      if (response.statusCode != 200) {
+        throw Exception('Bad status code ${response.statusCode}');
+      }
+      parsedResponse = parseApiResponseFromJson(response.body);
+    } on Exception catch (e) {
       print('Failed to check Authlib Injector API');
+      print(e);
       exit(1);
     }
 
-    var fileResponse = await get(Uri.parse(parsedResponse.downloadUrl));
-    await file.writeAsBytes(fileResponse.bodyBytes);
+    try {
+      var fileResponse = await get(parsedResponse.downloadUrl);
+      await file.writeAsBytes(fileResponse.bodyBytes);
+    } catch (e) {
+      print('Failed to download Authlib Injector');
+      exit(2);
+    }
 
     var bytes = await file.readAsBytes();
-    var digest = sha256.convert(bytes);
+    var digest = sha256.convert(bytes).toString();
 
-    if (digest.toString() == parsedResponse.checksums.sha256) {
-      print('Injector downloaded successfully');
-    } else {
-      print("Failed to verify checksum");
-      exit(2);
+    if (digest != parsedResponse.checksums.sha256) {
+      print("Authlib checksum mismatch");
+      exit(3);
     }
+    print('Injector downloaded successfully');
   }
 }