SCToolBox/app
1
0
Fork 0
mirror of https://ghfast.top/https://github.com/StarCitizenToolBox/app.git synced 2025-06-28 12:34:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

update RSHttp

Browse Source
This commit is contained in:
xkeyC
2024-02-07 19:32:36 +08:00
parent 7e1352c0be
commit 5fa62351f2
19 changed files with 1202 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/api/analytics.dart
View File

@ -2,8 +2,8 @@ import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:starcitizen_doctor/common/conf/url_conf.dart';
import 'package:starcitizen_doctor/common/io/rs_http.dart';
import 'package:starcitizen_doctor/common/utils/base_utils.dart';
import 'package:starcitizen_doctor/common/rust/api/http_api.dart' as rust_http;
class AnalyticsApi {
static touch(String key) async {
@ -11,9 +11,8 @@ class AnalyticsApi {
if (kDebugMode) return;
dPrint("AnalyticsApi.touch === $key start");
try {
await rust_http.postJsonString(
url: "${URLConf.xkeycApiHome}/analytics/$key",
jsonData: json.encode({"test": "a"}));
await RSHttp.postData("${URLConf.xkeycApiHome}/analytics/$key",
data: utf8.encode(json.encode({"test": "a"})), contentType: "application/json");
dPrint("AnalyticsApi.touch === $key over");
} catch (e) {
dPrint("AnalyticsApi.touch === $key Error:$e");

14
lib/api/api.dart
View File

@ -1,7 +1,7 @@
import 'dart:convert';
import 'package:starcitizen_doctor/common/conf/url_conf.dart';
import 'package:starcitizen_doctor/common/rust/api/http_api.dart' as rust_http;
import 'package:starcitizen_doctor/common/io/rs_http.dart';
import 'package:starcitizen_doctor/data/app_placard_data.dart';
import 'package:starcitizen_doctor/data/app_version_data.dart';
import 'package:starcitizen_doctor/data/countdown_festival_item_data.dart';
@ -33,9 +33,8 @@ class Api {
static Future<Map<String, dynamic>> getAppReleaseDataByVersionName(
String version) async {
final r = await rust_http.getString(
url:
"${URLConf.gitlabApiPath}/repos/SCToolBox/Release/releases/tags/$version");
final r = await RSHttp.getText(
"${URLConf.gitlabApiPath}/repos/SCToolBox/Release/releases/tags/$version");
return json.decode(r);
}
@ -52,8 +51,8 @@ class Api {
}
static Future<List> getScServerStatus() async {
final r = await rust_http.getString(
url: "https://status.robertsspaceindustries.com/index.json");
final r = await RSHttp.getText(
"https://status.robertsspaceindustries.com/index.json");
final map = json.decode(r);
return map["systems"];
}
@ -65,8 +64,7 @@ class Api {
}
static Future<String> getRepoData(String dir, String name) async {
final r =
await rust_http.getString(url: "${URLConf.apiRepoPath}/$dir/$name");
final r = await RSHttp.getText("${URLConf.apiRepoPath}/$dir/$name");
return r;
}
}

8
lib/api/rss.dart
View File

@ -1,20 +1,20 @@
import 'dart:io';
import 'package:dart_rss/dart_rss.dart';
import 'package:starcitizen_doctor/common/rust/api/http_api.dart' as rust_http;
import 'package:starcitizen_doctor/common/io/rs_http.dart';
import 'package:starcitizen_doctor/common/conf/url_conf.dart';
class RSSApi {
static Future<List<RssItem>> getRssVideo() async {
final r = await rust_http.getString(url: URLConf.rssVideoUrl);
final r = await RSHttp.getText(URLConf.rssVideoUrl);
final f = RssFeed.parse(r);
return f.items.sublist(0, 8);
}
static Future<List<RssItem>> getRssText() async {
final r1 = await rust_http.getString(url: URLConf.rssTextUrl1);
final r1 = await RSHttp.getText(URLConf.rssTextUrl1);
final r1f = RssFeed.parse(r1);
final r2 = await rust_http.getString(url: URLConf.rssTextUrl2);
final r2 = await RSHttp.getText(URLConf.rssTextUrl2);
final r2f = RssFeed.parse(r2);
final items = r1f.items..addAll(r2f.items);
items.sort((a, b) {

29
lib/common/io/rs_http.dart Normal file
View File

@ -0,0 +1,29 @@
import 'dart:convert';
import 'dart:typed_data';
import 'package:starcitizen_doctor/common/rust/api/http_api.dart' as rust_http;
import 'package:starcitizen_doctor/common/rust/api/http_api.dart';
class RSHttp {
static Future<String> getText(String url,
{Map<String, String>? headers}) async {
final r = await rust_http.fetch(
method: MyMethod.gets, url: url, headers: headers);
if (r.data == null) return "";
final str = utf8.decode(r.data!);
return str;
}
static Future postData(String url,
{Map<String, String>? headers,
String? contentType,
Uint8List? data}) async {
if (contentType != null) {
headers ??= {};
headers["Content-Type"] = contentType;
}
final r = await rust_http.fetch(
method: MyMethod.post, url: url, headers: headers, inputData: data);
return r.statusCode == 200;
}
}

53
lib/common/rust/api/http_api.dart
View File

@ -4,16 +4,53 @@
// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
import '../frb_generated.dart';
import '../http_package.dart';
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
Future<String> getString(
{required String url, Map<String, String>? headers, dynamic hint}) =>
RustLib.instance.api.getString(url: url, headers: headers, hint: hint);
Future<void> setDefaultHeader(
{required Map<String, String> headers, dynamic hint}) =>
RustLib.instance.api.setDefaultHeader(headers: headers, hint: hint);
Future<String> postJsonString(
{required String url,
Future<RustHttpResponse> fetch(
{required MyMethod method,
required String url,
Map<String, String>? headers,
String? jsonData,
Uint8List? inputData,
dynamic hint}) =>
RustLib.instance.api.postJsonString(
url: url, headers: headers, jsonData: jsonData, hint: hint);
RustLib.instance.api.fetch(
method: method,
url: url,
headers: headers,
inputData: inputData,
hint: hint);
// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::rust_async::RwLock<reqwest :: Version>>
@sealed
class ReqwestVersion extends RustOpaque {
ReqwestVersion.dcoDecode(List<dynamic> wire)
: super.dcoDecode(wire, _kStaticData);
ReqwestVersion.sseDecode(int ptr, int externalSizeOnNative)
: super.sseDecode(ptr, externalSizeOnNative, _kStaticData);
static final _kStaticData = RustArcStaticData(
rustArcIncrementStrongCount:
RustLib.instance.api.rust_arc_increment_strong_count_ReqwestVersion,
rustArcDecrementStrongCount:
RustLib.instance.api.rust_arc_decrement_strong_count_ReqwestVersion,
rustArcDecrementStrongCountPtr:
RustLib.instance.api.rust_arc_decrement_strong_count_ReqwestVersionPtr,
);
}
enum MyMethod {
options,
gets,
post,
put,
delete,
head,
trace,
connect,
patch,
}

336
lib/common/rust/frb_generated.dart
View File

@ -9,6 +9,7 @@ import 'dart:async';
import 'dart:convert';
import 'downloader.dart';
import 'frb_generated.io.dart' if (dart.library.html) 'frb_generated.web.dart';
import 'http_package.dart';
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
/// Main entrypoint of the Rust API
@ -73,14 +74,24 @@ abstract class RustLibApi extends BaseApi {
required int connectionCount,
dynamic hint});
Future<String> getString(
{required String url, Map<String, String>? headers, dynamic hint});
Future<String> postJsonString(
{required String url,
Future<RustHttpResponse> fetch(
{required MyMethod method,
required String url,
Map<String, String>? headers,
String? jsonData,
Uint8List? inputData,
dynamic hint});
Future<void> setDefaultHeader(
{required Map<String, String> headers, dynamic hint});
RustArcIncrementStrongCountFnType
get rust_arc_increment_strong_count_ReqwestVersion;
RustArcDecrementStrongCountFnType
get rust_arc_decrement_strong_count_ReqwestVersion;
CrossPlatformFinalizerArg
get rust_arc_decrement_strong_count_ReqwestVersionPtr;
}
class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
@ -150,63 +161,80 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
);
@override
Future<String> getString(
{required String url, Map<String, String>? headers, dynamic hint}) {
return handler.executeNormal(NormalTask(
callFfi: (port_) {
final serializer = SseSerializer(generalizedFrbRustBinding);
sse_encode_String(url, serializer);
sse_encode_opt_Map_String_String(headers, serializer);
pdeCallFfi(generalizedFrbRustBinding, serializer,
funcId: 3, port: port_);
},
codec: SseCodec(
decodeSuccessData: sse_decode_String,
decodeErrorData: null,
),
constMeta: kGetStringConstMeta,
argValues: [url, headers],
apiImpl: this,
hint: hint,
));
}
TaskConstMeta get kGetStringConstMeta => const TaskConstMeta(
debugName: "get_string",
argNames: ["url", "headers"],
);
@override
Future<String> postJsonString(
{required String url,
Future<RustHttpResponse> fetch(
{required MyMethod method,
required String url,
Map<String, String>? headers,
String? jsonData,
Uint8List? inputData,
dynamic hint}) {
return handler.executeNormal(NormalTask(
callFfi: (port_) {
final serializer = SseSerializer(generalizedFrbRustBinding);
sse_encode_my_method(method, serializer);
sse_encode_String(url, serializer);
sse_encode_opt_Map_String_String(headers, serializer);
sse_encode_opt_String(jsonData, serializer);
sse_encode_opt_list_prim_u_8_strict(inputData, serializer);
pdeCallFfi(generalizedFrbRustBinding, serializer,
funcId: 4, port: port_);
},
codec: SseCodec(
decodeSuccessData: sse_decode_String,
decodeSuccessData: sse_decode_rust_http_response,
decodeErrorData: null,
),
constMeta: kPostJsonStringConstMeta,
argValues: [url, headers, jsonData],
constMeta: kFetchConstMeta,
argValues: [method, url, headers, inputData],
apiImpl: this,
hint: hint,
));
}
TaskConstMeta get kPostJsonStringConstMeta => const TaskConstMeta(
debugName: "post_json_string",
argNames: ["url", "headers", "jsonData"],
TaskConstMeta get kFetchConstMeta => const TaskConstMeta(
debugName: "fetch",
argNames: ["method", "url", "headers", "inputData"],
);
@override
Future<void> setDefaultHeader(
{required Map<String, String> headers, dynamic hint}) {
return handler.executeNormal(NormalTask(
callFfi: (port_) {
final serializer = SseSerializer(generalizedFrbRustBinding);
sse_encode_Map_String_String(headers, serializer);
pdeCallFfi(generalizedFrbRustBinding, serializer,
funcId: 3, port: port_);
},
codec: SseCodec(
decodeSuccessData: sse_decode_unit,
decodeErrorData: null,
),
constMeta: kSetDefaultHeaderConstMeta,
argValues: [headers],
apiImpl: this,
hint: hint,
));
}
TaskConstMeta get kSetDefaultHeaderConstMeta => const TaskConstMeta(
debugName: "set_default_header",
argNames: ["headers"],
);
RustArcIncrementStrongCountFnType
get rust_arc_increment_strong_count_ReqwestVersion => wire
.rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion;
RustArcDecrementStrongCountFnType
get rust_arc_decrement_strong_count_ReqwestVersion => wire
.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion;
@protected
ReqwestVersion
dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return ReqwestVersion.dcoDecode(raw as List<dynamic>);
}
@protected
Map<String, String> dco_decode_Map_String_String(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
@ -214,12 +242,26 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
.map((e) => MapEntry(e.$1, e.$2)));
}
@protected
ReqwestVersion
dco_decode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return ReqwestVersion.dcoDecode(raw as List<dynamic>);
}
@protected
String dco_decode_String(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return raw as String;
}
@protected
int dco_decode_box_autoadd_u_64(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return dco_decode_u_64(raw);
}
@protected
DownloadCallbackData dco_decode_download_callback_data(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
@ -258,9 +300,9 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
// Codec=Dco (DartCObject based), see doc to use other codecs
switch (raw[0]) {
case 0:
return MyDownloaderStatus_NoStart();
return const MyDownloaderStatus_NoStart();
case 1:
return MyDownloaderStatus_Running();
return const MyDownloaderStatus_Running();
case 2:
return MyDownloaderStatus_Pending(
dco_decode_my_network_item_pending_type(raw[1]),
@ -270,12 +312,18 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
dco_decode_String(raw[1]),
);
case 4:
return MyDownloaderStatus_Finished();
return const MyDownloaderStatus_Finished();
default:
throw Exception("unreachable");
}
}
@protected
MyMethod dco_decode_my_method(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return MyMethod.values[raw as int];
}
@protected
MyNetworkItemPendingType dco_decode_my_network_item_pending_type(
dynamic raw) {
@ -290,9 +338,15 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
}
@protected
String? dco_decode_opt_String(dynamic raw) {
int? dco_decode_opt_box_autoadd_u_64(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return raw == null ? null : dco_decode_String(raw);
return raw == null ? null : dco_decode_box_autoadd_u_64(raw);
}
@protected
Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return raw == null ? null : dco_decode_list_prim_u_8_strict(raw);
}
@protected
@ -308,6 +362,31 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
);
}
@protected
RustHttpResponse dco_decode_rust_http_response(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
final arr = raw as List<dynamic>;
if (arr.length != 7)
throw Exception('unexpected arr length: expect 7 but see ${arr.length}');
return RustHttpResponse(
statusCode: dco_decode_u_16(arr[0]),
headers: dco_decode_Map_String_String(arr[1]),
url: dco_decode_String(arr[2]),
contentLength: dco_decode_opt_box_autoadd_u_64(arr[3]),
version:
dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
arr[4]),
remoteAddr: dco_decode_String(arr[5]),
data: dco_decode_opt_list_prim_u_8_strict(arr[6]),
);
}
@protected
int dco_decode_u_16(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return raw as int;
}
@protected
int dco_decode_u_64(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
@ -326,6 +405,21 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
return;
}
@protected
int dco_decode_usize(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
return dcoDecodeI64OrU64(raw);
}
@protected
ReqwestVersion
sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
return ReqwestVersion.sseDecode(
sse_decode_usize(deserializer), sse_decode_i_32(deserializer));
}
@protected
Map<String, String> sse_decode_Map_String_String(
SseDeserializer deserializer) {
@ -334,6 +428,15 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
return Map.fromEntries(inner.map((e) => MapEntry(e.$1, e.$2)));
}
@protected
ReqwestVersion
sse_decode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
return ReqwestVersion.sseDecode(
sse_decode_usize(deserializer), sse_decode_i_32(deserializer));
}
@protected
String sse_decode_String(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
@ -341,6 +444,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
return utf8.decoder.convert(inner);
}
@protected
int sse_decode_box_autoadd_u_64(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
return (sse_decode_u_64(deserializer));
}
@protected
DownloadCallbackData sse_decode_download_callback_data(
SseDeserializer deserializer) {
@ -392,9 +501,9 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
var tag_ = sse_decode_i_32(deserializer);
switch (tag_) {
case 0:
return MyDownloaderStatus_NoStart();
return const MyDownloaderStatus_NoStart();
case 1:
return MyDownloaderStatus_Running();
return const MyDownloaderStatus_Running();
case 2:
var var_field0 = sse_decode_my_network_item_pending_type(deserializer);
return MyDownloaderStatus_Pending(var_field0);
@ -402,12 +511,19 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
var var_field0 = sse_decode_String(deserializer);
return MyDownloaderStatus_Error(var_field0);
case 4:
return MyDownloaderStatus_Finished();
return const MyDownloaderStatus_Finished();
default:
throw UnimplementedError('');
}
}
@protected
MyMethod sse_decode_my_method(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
var inner = sse_decode_i_32(deserializer);
return MyMethod.values[inner];
}
@protected
MyNetworkItemPendingType sse_decode_my_network_item_pending_type(
SseDeserializer deserializer) {
@ -429,11 +545,22 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
}
@protected
String? sse_decode_opt_String(SseDeserializer deserializer) {
int? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
if (sse_decode_bool(deserializer)) {
return (sse_decode_String(deserializer));
return (sse_decode_box_autoadd_u_64(deserializer));
} else {
return null;
}
}
@protected
Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
if (sse_decode_bool(deserializer)) {
return (sse_decode_list_prim_u_8_strict(deserializer));
} else {
return null;
}
@ -448,6 +575,34 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
return (var_field0, var_field1);
}
@protected
RustHttpResponse sse_decode_rust_http_response(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
var var_statusCode = sse_decode_u_16(deserializer);
var var_headers = sse_decode_Map_String_String(deserializer);
var var_url = sse_decode_String(deserializer);
var var_contentLength = sse_decode_opt_box_autoadd_u_64(deserializer);
var var_version =
sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
deserializer);
var var_remoteAddr = sse_decode_String(deserializer);
var var_data = sse_decode_opt_list_prim_u_8_strict(deserializer);
return RustHttpResponse(
statusCode: var_statusCode,
headers: var_headers,
url: var_url,
contentLength: var_contentLength,
version: var_version,
remoteAddr: var_remoteAddr,
data: var_data);
}
@protected
int sse_decode_u_16(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
return deserializer.buffer.getUint16();
}
@protected
int sse_decode_u_64(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
@ -465,12 +620,26 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
// Codec=Sse (Serialization based), see doc to use other codecs
}
@protected
int sse_decode_usize(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
return deserializer.buffer.getUint64();
}
@protected
bool sse_decode_bool(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
return deserializer.buffer.getUint8() != 0;
}
@protected
void
sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ReqwestVersion self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_usize(self.sseEncode(move: true), serializer);
}
@protected
void sse_encode_Map_String_String(
Map<String, String> self, SseSerializer serializer) {
@ -479,12 +648,26 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
self.entries.map((e) => (e.key, e.value)).toList(), serializer);
}
@protected
void
sse_encode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ReqwestVersion self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_usize(self.sseEncode(move: null), serializer);
}
@protected
void sse_encode_String(String self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_list_prim_u_8_strict(utf8.encoder.convert(self), serializer);
}
@protected
void sse_encode_box_autoadd_u_64(int self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_u_64(self, serializer);
}
@protected
void sse_encode_download_callback_data(
DownloadCallbackData self, SseSerializer serializer) {
@ -540,6 +723,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
}
}
@protected
void sse_encode_my_method(MyMethod self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_i_32(self.index, serializer);
}
@protected
void sse_encode_my_network_item_pending_type(
MyNetworkItemPendingType self, SseSerializer serializer) {
@ -559,12 +748,23 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
}
@protected
void sse_encode_opt_String(String? self, SseSerializer serializer) {
void sse_encode_opt_box_autoadd_u_64(int? self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_bool(self != null, serializer);
if (self != null) {
sse_encode_String(self, serializer);
sse_encode_box_autoadd_u_64(self, serializer);
}
}
@protected
void sse_encode_opt_list_prim_u_8_strict(
Uint8List? self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_bool(self != null, serializer);
if (self != null) {
sse_encode_list_prim_u_8_strict(self, serializer);
}
}
@ -576,6 +776,26 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
sse_encode_String(self.$2, serializer);
}
@protected
void sse_encode_rust_http_response(
RustHttpResponse self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_u_16(self.statusCode, serializer);
sse_encode_Map_String_String(self.headers, serializer);
sse_encode_String(self.url, serializer);
sse_encode_opt_box_autoadd_u_64(self.contentLength, serializer);
sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
self.version, serializer);
sse_encode_String(self.remoteAddr, serializer);
sse_encode_opt_list_prim_u_8_strict(self.data, serializer);
}
@protected
void sse_encode_u_16(int self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
serializer.buffer.putUint16(self);
}
@protected
void sse_encode_u_64(int self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
@ -593,6 +813,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
// Codec=Sse (Serialization based), see doc to use other codecs
}
@protected
void sse_encode_usize(int self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
serializer.buffer.putUint64(self);
}
@protected
void sse_encode_bool(bool self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs

129
lib/common/rust/frb_generated.io.dart
View File

@ -10,6 +10,7 @@ import 'dart:convert';
import 'dart:ffi' as ffi;
import 'downloader.dart';
import 'frb_generated.dart';
import 'http_package.dart';
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_io.dart';
abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@ -20,12 +21,29 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
required super.portManager,
});
CrossPlatformFinalizerArg
get rust_arc_decrement_strong_count_ReqwestVersionPtr => wire
._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersionPtr;
@protected
ReqwestVersion
dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic raw);
@protected
Map<String, String> dco_decode_Map_String_String(dynamic raw);
@protected
ReqwestVersion
dco_decode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic raw);
@protected
String dco_decode_String(dynamic raw);
@protected
int dco_decode_box_autoadd_u_64(dynamic raw);
@protected
DownloadCallbackData dco_decode_download_callback_data(dynamic raw);
@ -41,6 +59,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
MyDownloaderStatus dco_decode_my_downloader_status(dynamic raw);
@protected
MyMethod dco_decode_my_method(dynamic raw);
@protected
MyNetworkItemPendingType dco_decode_my_network_item_pending_type(dynamic raw);
@ -48,11 +69,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
Map<String, String>? dco_decode_opt_Map_String_String(dynamic raw);
@protected
String? dco_decode_opt_String(dynamic raw);
int? dco_decode_opt_box_autoadd_u_64(dynamic raw);
@protected
Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
@protected
(String, String) dco_decode_record_string_string(dynamic raw);
@protected
RustHttpResponse dco_decode_rust_http_response(dynamic raw);
@protected
int dco_decode_u_16(dynamic raw);
@protected
int dco_decode_u_64(dynamic raw);
@ -62,13 +92,29 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
void dco_decode_unit(dynamic raw);
@protected
int dco_decode_usize(dynamic raw);
@protected
ReqwestVersion
sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
SseDeserializer deserializer);
@protected
Map<String, String> sse_decode_Map_String_String(
SseDeserializer deserializer);
@protected
ReqwestVersion
sse_decode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
SseDeserializer deserializer);
@protected
String sse_decode_String(SseDeserializer deserializer);
@protected
int sse_decode_box_autoadd_u_64(SseDeserializer deserializer);
@protected
DownloadCallbackData sse_decode_download_callback_data(
SseDeserializer deserializer);
@ -87,6 +133,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
MyDownloaderStatus sse_decode_my_downloader_status(
SseDeserializer deserializer);
@protected
MyMethod sse_decode_my_method(SseDeserializer deserializer);
@protected
MyNetworkItemPendingType sse_decode_my_network_item_pending_type(
SseDeserializer deserializer);
@ -96,12 +145,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
SseDeserializer deserializer);
@protected
String? sse_decode_opt_String(SseDeserializer deserializer);
int? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer);
@protected
Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
@protected
(String, String) sse_decode_record_string_string(
SseDeserializer deserializer);
@protected
RustHttpResponse sse_decode_rust_http_response(SseDeserializer deserializer);
@protected
int sse_decode_u_16(SseDeserializer deserializer);
@protected
int sse_decode_u_64(SseDeserializer deserializer);
@ -111,16 +169,32 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
void sse_decode_unit(SseDeserializer deserializer);
@protected
int sse_decode_usize(SseDeserializer deserializer);
@protected
bool sse_decode_bool(SseDeserializer deserializer);
@protected
void
sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ReqwestVersion self, SseSerializer serializer);
@protected
void sse_encode_Map_String_String(
Map<String, String> self, SseSerializer serializer);
@protected
void
sse_encode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ReqwestVersion self, SseSerializer serializer);
@protected
void sse_encode_String(String self, SseSerializer serializer);
@protected
void sse_encode_box_autoadd_u_64(int self, SseSerializer serializer);
@protected
void sse_encode_download_callback_data(
DownloadCallbackData self, SseSerializer serializer);
@ -140,6 +214,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
void sse_encode_my_downloader_status(
MyDownloaderStatus self, SseSerializer serializer);
@protected
void sse_encode_my_method(MyMethod self, SseSerializer serializer);
@protected
void sse_encode_my_network_item_pending_type(
MyNetworkItemPendingType self, SseSerializer serializer);
@ -149,12 +226,23 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
Map<String, String>? self, SseSerializer serializer);
@protected
void sse_encode_opt_String(String? self, SseSerializer serializer);
void sse_encode_opt_box_autoadd_u_64(int? self, SseSerializer serializer);
@protected
void sse_encode_opt_list_prim_u_8_strict(
Uint8List? self, SseSerializer serializer);
@protected
void sse_encode_record_string_string(
(String, String) self, SseSerializer serializer);
@protected
void sse_encode_rust_http_response(
RustHttpResponse self, SseSerializer serializer);
@protected
void sse_encode_u_16(int self, SseSerializer serializer);
@protected
void sse_encode_u_64(int self, SseSerializer serializer);
@ -164,6 +252,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
void sse_encode_unit(void self, SseSerializer serializer);
@protected
void sse_encode_usize(int self, SseSerializer serializer);
@protected
void sse_encode_bool(bool self, SseSerializer serializer);
}
@ -181,4 +272,36 @@ class RustLibWire implements BaseWire {
/// The symbols are looked up in [dynamicLibrary].
RustLibWire(ffi.DynamicLibrary dynamicLibrary)
: _lookup = dynamicLibrary.lookup;
void
rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ffi.Pointer<ffi.Void> ptr,
) {
return _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ptr,
);
}
late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersionPtr =
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
'frbgen_starcitizen_doctor_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion');
late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion =
_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersionPtr
.asFunction<void Function(ffi.Pointer<ffi.Void>)>();
void
rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ffi.Pointer<ffi.Void> ptr,
) {
return _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ptr,
);
}
late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersionPtr =
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
'frbgen_starcitizen_doctor_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion');
late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion =
_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersionPtr
.asFunction<void Function(ffi.Pointer<ffi.Void>)>();
}

117
lib/common/rust/frb_generated.web.dart
View File

@ -9,6 +9,7 @@ import 'dart:async';
import 'dart:convert';
import 'downloader.dart';
import 'frb_generated.dart';
import 'http_package.dart';
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_web.dart';
abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@ -19,12 +20,29 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
required super.portManager,
});
CrossPlatformFinalizerArg
get rust_arc_decrement_strong_count_ReqwestVersionPtr => wire
.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion;
@protected
ReqwestVersion
dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic raw);
@protected
Map<String, String> dco_decode_Map_String_String(dynamic raw);
@protected
ReqwestVersion
dco_decode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic raw);
@protected
String dco_decode_String(dynamic raw);
@protected
int dco_decode_box_autoadd_u_64(dynamic raw);
@protected
DownloadCallbackData dco_decode_download_callback_data(dynamic raw);
@ -40,6 +58,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
MyDownloaderStatus dco_decode_my_downloader_status(dynamic raw);
@protected
MyMethod dco_decode_my_method(dynamic raw);
@protected
MyNetworkItemPendingType dco_decode_my_network_item_pending_type(dynamic raw);
@ -47,11 +68,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
Map<String, String>? dco_decode_opt_Map_String_String(dynamic raw);
@protected
String? dco_decode_opt_String(dynamic raw);
int? dco_decode_opt_box_autoadd_u_64(dynamic raw);
@protected
Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
@protected
(String, String) dco_decode_record_string_string(dynamic raw);
@protected
RustHttpResponse dco_decode_rust_http_response(dynamic raw);
@protected
int dco_decode_u_16(dynamic raw);
@protected
int dco_decode_u_64(dynamic raw);
@ -61,13 +91,29 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
void dco_decode_unit(dynamic raw);
@protected
int dco_decode_usize(dynamic raw);
@protected
ReqwestVersion
sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
SseDeserializer deserializer);
@protected
Map<String, String> sse_decode_Map_String_String(
SseDeserializer deserializer);
@protected
ReqwestVersion
sse_decode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
SseDeserializer deserializer);
@protected
String sse_decode_String(SseDeserializer deserializer);
@protected
int sse_decode_box_autoadd_u_64(SseDeserializer deserializer);
@protected
DownloadCallbackData sse_decode_download_callback_data(
SseDeserializer deserializer);
@ -86,6 +132,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
MyDownloaderStatus sse_decode_my_downloader_status(
SseDeserializer deserializer);
@protected
MyMethod sse_decode_my_method(SseDeserializer deserializer);
@protected
MyNetworkItemPendingType sse_decode_my_network_item_pending_type(
SseDeserializer deserializer);
@ -95,12 +144,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
SseDeserializer deserializer);
@protected
String? sse_decode_opt_String(SseDeserializer deserializer);
int? sse_decode_opt_box_autoadd_u_64(SseDeserializer deserializer);
@protected
Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
@protected
(String, String) sse_decode_record_string_string(
SseDeserializer deserializer);
@protected
RustHttpResponse sse_decode_rust_http_response(SseDeserializer deserializer);
@protected
int sse_decode_u_16(SseDeserializer deserializer);
@protected
int sse_decode_u_64(SseDeserializer deserializer);
@ -110,16 +168,32 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
void sse_decode_unit(SseDeserializer deserializer);
@protected
int sse_decode_usize(SseDeserializer deserializer);
@protected
bool sse_decode_bool(SseDeserializer deserializer);
@protected
void
sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ReqwestVersion self, SseSerializer serializer);
@protected
void sse_encode_Map_String_String(
Map<String, String> self, SseSerializer serializer);
@protected
void
sse_encode_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ReqwestVersion self, SseSerializer serializer);
@protected
void sse_encode_String(String self, SseSerializer serializer);
@protected
void sse_encode_box_autoadd_u_64(int self, SseSerializer serializer);
@protected
void sse_encode_download_callback_data(
DownloadCallbackData self, SseSerializer serializer);
@ -139,6 +213,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
void sse_encode_my_downloader_status(
MyDownloaderStatus self, SseSerializer serializer);
@protected
void sse_encode_my_method(MyMethod self, SseSerializer serializer);
@protected
void sse_encode_my_network_item_pending_type(
MyNetworkItemPendingType self, SseSerializer serializer);
@ -148,12 +225,23 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
Map<String, String>? self, SseSerializer serializer);
@protected
void sse_encode_opt_String(String? self, SseSerializer serializer);
void sse_encode_opt_box_autoadd_u_64(int? self, SseSerializer serializer);
@protected
void sse_encode_opt_list_prim_u_8_strict(
Uint8List? self, SseSerializer serializer);
@protected
void sse_encode_record_string_string(
(String, String) self, SseSerializer serializer);
@protected
void sse_encode_rust_http_response(
RustHttpResponse self, SseSerializer serializer);
@protected
void sse_encode_u_16(int self, SseSerializer serializer);
@protected
void sse_encode_u_64(int self, SseSerializer serializer);
@ -163,6 +251,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
void sse_encode_unit(void self, SseSerializer serializer);
@protected
void sse_encode_usize(int self, SseSerializer serializer);
@protected
void sse_encode_bool(bool self, SseSerializer serializer);
}
@ -171,6 +262,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
class RustLibWire implements BaseWire {
RustLibWire.fromExternalLibrary(ExternalLibrary lib);
void rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic ptr) =>
wasmModule
.rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ptr);
void rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic ptr) =>
wasmModule
.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
ptr);
}
@JS('wasm_bindgen')
@ -184,4 +287,12 @@ class RustLibWasmModule implements WasmModule {
@override
external RustLibWasmModule bind(dynamic thisArg, String moduleName);
external void
rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic ptr);
external void
rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedrust_asyncRwLockreqwestVersion(
dynamic ptr);
}

51
lib/common/rust/http_package.dart Normal file
View File

@ -0,0 +1,51 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.23.
// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
import 'api/http_api.dart';
import 'frb_generated.dart';
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
class RustHttpResponse {
final int statusCode;
final Map<String, String> headers;
final String url;
final int? contentLength;
final ReqwestVersion version;
final String remoteAddr;
final Uint8List? data;
const RustHttpResponse({
required this.statusCode,
required this.headers,
required this.url,
this.contentLength,
required this.version,
required this.remoteAddr,
this.data,
});
@override
int get hashCode =>
statusCode.hashCode ^
headers.hashCode ^
url.hashCode ^
contentLength.hashCode ^
version.hashCode ^
remoteAddr.hashCode ^
data.hashCode;
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is RustHttpResponse &&
runtimeType == other.runtimeType &&
statusCode == other.statusCode &&
headers == other.headers &&
url == other.url &&
contentLength == other.contentLength &&
version == other.version &&
remoteAddr == other.remoteAddr &&
data == other.data;
}

6
lib/ui/home/home_ui_model.dart
View File

@ -4,7 +4,7 @@ import 'dart:io';
import 'package:dart_rss/dart_rss.dart';
import 'package:desktop_webview_window/desktop_webview_window.dart';
import 'package:starcitizen_doctor/common/rust/api/http_api.dart' as rust_http;
import 'package:starcitizen_doctor/common/io/rs_http.dart';
import 'package:hive/hive.dart';
import 'package:starcitizen_doctor/api/analytics.dart';
import 'package:starcitizen_doctor/api/api.dart';
@ -107,8 +107,8 @@ class HomeUIModel extends BaseUIModel {
updateSCServerStatus();
notifyListeners();
appWebLocalizationVersionsData = AppWebLocalizationVersionsData.fromJson(
json.decode((await rust_http.getString(
url: "${URLConf.webTranslateHomeUrl}/versions.json"))));
json.decode((await RSHttp.getText(
"${URLConf.webTranslateHomeUrl}/versions.json"))));
countdownFestivalListData = await Api.getFestivalCountdownList();
notifyListeners();
_loadRRS();

4
lib/ui/home/webview/webview.dart
View File

@ -10,9 +10,9 @@ import 'package:hive/hive.dart';
import 'package:local_auth/local_auth.dart';
import 'package:starcitizen_doctor/common/conf/app_conf.dart';
import 'package:starcitizen_doctor/common/conf/url_conf.dart';
import 'package:starcitizen_doctor/common/io/rs_http.dart';
import 'package:starcitizen_doctor/common/win32/credentials.dart';
import 'package:starcitizen_doctor/data/app_web_localization_versions_data.dart';
import 'package:starcitizen_doctor/common/rust/api/http_api.dart' as rust_http;
import '../../../base/ui.dart';
@ -256,7 +256,7 @@ class WebViewModel {
}
}
final startTime = DateTime.now();
final r = await rust_http.getString(url: url);
final r = await RSHttp.getText(url);
final endTime = DateTime.now();
final data = json.decode(r);
if (cacheKey.isNotEmpty) {