AriasCreations/TimeTracker
3
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Attempt to fix web viewer being unable to load NBT

Browse source
This commit is contained in:
zontreck 2025-05-25 13:33:27 -07:00
parent 4a8d515f4d
commit b1063f5057
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/consts.dart
View file

@ -9,7 +9,7 @@ class TTConsts {
static get SESSION_SERVER => static get SESSION_SERVER =>
"https://api.zontreck.com/timetrack/$UPDATE_CHANNEL/timetrack.php"; "https://api.zontreck.com/timetrack/$UPDATE_CHANNEL/timetrack.php";
static const VERSION = "1.0.0-beta.17"; static const VERSION = "1.0.0-beta.18";
static bool UPDATE_AVAILABLE = false; static bool UPDATE_AVAILABLE = false;
static UpdateChannel UPDATE_CHANNEL = UpdateChannel.beta; static UpdateChannel UPDATE_CHANNEL = UpdateChannel.beta;

8
lib/data.dart
View file

@ -264,6 +264,7 @@ class SessionData {
Map<String, dynamic> payload = { Map<String, dynamic> payload = {
"cmd": "create", "cmd": "create",
"type": "nbt",
"data": base64Encoder.encode(nbtData), "data": base64Encoder.encode(nbtData),
}; };
@ -444,6 +445,7 @@ class SessionData {
if (cType == "application/json") { if (cType == "application/json") {
return LoadData(reply.data as Map<String, dynamic>); return LoadData(reply.data as Map<String, dynamic>);
} else if (cType == "application/nbt") { } else if (cType == "application/nbt") {
print("Data is in NBT Format");
Uint8List lst = base64Encoder.decode(reply.data as String); Uint8List lst = base64Encoder.decode(reply.data as String);
// Convert this to a CompoundTag // Convert this to a CompoundTag
CompoundTag ct = await NbtIo.readFromStream(lst) as CompoundTag; CompoundTag ct = await NbtIo.readFromStream(lst) as CompoundTag;
@ -451,7 +453,11 @@ class SessionData {
return true; return true;
} else } else
return false; return false;
} catch (E) { } catch (E, stack) {
print(E);
print(stack);
return false; return false;
} }
} }

2
pubspec.yaml
View file

@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.0-beta.17 version: 1.0.0-beta.18
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2

11
server/php/timetrack.php
View file

@ -35,10 +35,9 @@ switch($jsx['cmd']) {
$stmt->close(); $stmt->close();
// Prepare data as JSON and insert into `data` table // Prepare data as JSON and insert into `data` table
if(is_array($jsx['data'])) { if($jsx['type'] == "json") {
$data = json_encode($jsx['data']); $data = json_encode($jsx['data']);
} // else: The data is binary or NBT. }else if($jsx ['type'] == "nbt") {
else {
$data = base64_decode($jsx['data']); $data = base64_decode($jsx['data']);
} }
@ -79,12 +78,16 @@ switch($jsx['cmd']) {
$stmt->close(); $stmt->close();
// Decode the JSON blob (optional — if you want raw JSON output) // Decode the JSON blob (optional — if you want raw JSON output)
if(substr($sessionData, 0, 1) == "{") { $testDecoded = json_decode($sessionData, true);
if(json_last_error() == JSON_ERROR_NONE) {
header("Content-Type: application/json"); header("Content-Type: application/json");
die($sessionData); die($sessionData);
}else { }else {
header("Content-Type: application/nbt"); header("Content-Type: application/nbt");
die(base64_encode($sessionData)); die(base64_encode($sessionData));
//die($sessionData);
} }
break; break;
} }