Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Nov 8, 2022
1 parent 1dbbde5 commit e3e388b
Show file tree
Hide file tree
Showing 16 changed files with 785 additions and 86 deletions.
13 changes: 12 additions & 1 deletion packages/dart/galaxeus_lib/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## 0.0.21
- fix tcp server and tcp client, now support auto reconnect

## 0.0.22
- fix score

## 0.0.23
- fix score


## 0.0.0

- Initial version.
Expand All @@ -15,4 +25,5 @@
- update

## 0.0.5
- update
- update

2 changes: 2 additions & 0 deletions packages/dart/galaxeus_lib/lib/extension/list.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: non_constant_identifier_names

part of galaxeus_lib;

extension GalaxeusExtensionList on List {
Expand Down
18 changes: 14 additions & 4 deletions packages/dart/galaxeus_lib/lib/extension/tcp.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,21 @@ extension TcpSendDataSocket on Socket {
void send(List<int> data) {
return add(data);
}
void sendString(String data) {

void sendString(
String data, {
bool isCompress = false,
}) {
if (isCompress) {
return add(gzip.encode(utf8.encode(data)));
}
return add(utf8.encode(data));
}
void sendJson(Map data) {
return add(utf8.encode(json.encode(data)));
}

void sendJson(
Map data, {
bool isCompress = false,
}) {
return sendString(json.encode(data), isCompress: isCompress);
}
}
5 changes: 3 additions & 2 deletions packages/dart/galaxeus_lib/lib/galaxeus_lib.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:universal_io/io.dart';
export 'package:http/http.dart';
import 'package:collection/collection.dart';

import "package:tcp_client_dart/tcp_client_dart.dart";
part 'extension/list.dart';
part 'extension/map.dart';
part 'extension/string.dart';
Expand All @@ -20,6 +19,7 @@ part 'src/device_id.dart';
part 'src/event_emitter.dart';
part 'src/fetch.dart';
part 'src/json_to_dart.dart';
part "src/json_to_message.dart";
part 'src/json_to_update.dart';
part 'src/production.dart';
part 'src/tcp_client.dart';
Expand All @@ -34,7 +34,8 @@ String getUuid(int length, {String? text}) {
ch = text;
}
Random r = Random();
return String.fromCharCodes(Iterable.generate(length, (_) => ch.codeUnitAt(r.nextInt(ch.length))));
return String.fromCharCodes(
Iterable.generate(length, (_) => ch.codeUnitAt(r.nextInt(ch.length))));
}

T getRandomElement<T>(List<T> list) {
Expand Down
13 changes: 9 additions & 4 deletions packages/dart/galaxeus_lib/lib/src/device_id.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@ part of galaxeus_lib;

DeviceId? getDeviceId({bool isGetProductId = false}) {
if (Platform.isAndroid) {
ProcessResult res = Process.runSync("settings", ["get", "secure", "android_id"]);
ProcessResult res =
Process.runSync("settings", ["get", "secure", "android_id"]);
return DeviceId(res);
}

if (Platform.isWindows) {
ProcessResult res = Process.runSync("wmic", ["os", "get", "serialnumber"]);
return DeviceId(res);
}

if (Platform.isLinux) {
if (isGetProductId) {
ProcessResult res = Process.runSync("dmidecode", ["-s", "system-uuid"]);
return DeviceId(res);
} else {
} else {
ProcessResult res = Process.runSync("cat", ["/etc/machine-id"]);
return DeviceId(res);
}
Expand All @@ -40,7 +41,11 @@ class DeviceId {

String get deviceId {
if (Platform.isWindows) {
return RegExp(r"([a-z0-9]+)-([a-z0-9]+)-([a-z0-9]+)-([a-z0-9]+)", caseSensitive: false).stringMatch(data.stdout.toString().replaceAll(RegExp(r"\n"), "")) ?? "";
return RegExp(r"([a-z0-9]+)-([a-z0-9]+)-([a-z0-9]+)-([a-z0-9]+)",
caseSensitive: false)
.stringMatch(
data.stdout.toString().replaceAll(RegExp(r"\n"), "")) ??
"";
}
return data.stdout.toString().replaceAll(RegExp(r"\n"), "");
}
Expand Down
14 changes: 8 additions & 6 deletions packages/dart/galaxeus_lib/lib/src/fetch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ Future<Response> fetch(
if (method == "get") {
response = await get(Uri.parse(url), headers: headers);
} else if (method == "post") {
response = await post(Uri.parse(url), body: body, headers: headers, encoding: encoding);
response = await post(Uri.parse(url),
body: body, headers: headers, encoding: encoding);
} else if (method == "put") {
response = await put(Uri.parse(url), body: body, headers: headers, encoding: encoding);
response = await put(Uri.parse(url),
body: body, headers: headers, encoding: encoding);
} else if (method == "patch") {
response = await patch(Uri.parse(url), body: body, headers: headers, encoding: encoding);
response = await patch(Uri.parse(url),
body: body, headers: headers, encoding: encoding);
} else if (method == "delete") {
response = await delete(Uri.parse(url), body: body, headers: headers, encoding: encoding);
response = await delete(Uri.parse(url),
body: body, headers: headers, encoding: encoding);
} else if (method == "head") {
response = await head(Uri.parse(url), headers: headers);
} else {
Expand All @@ -55,8 +59,6 @@ extension OnFetch on Response {
print(e);
return null;
}

return null;
}
}

Expand Down
Loading

0 comments on commit e3e388b

Please sign in to comment.