nyne/venera
1
0
Fork 0
mirror of https://github.com/venera-app/venera.git synced 2025-09-27 07:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve code

Browse Source
This commit is contained in:
nyne
2024-10-17 14:28:29 +08:00
parent c33f2c9918
commit e1e571052f
3 changed files with 148 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/components/loading.dart
View File

@@ -106,6 +106,22 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object>
Future<Res<S>> loadData();
Future<Res<S>> loadDataWithRetry() async {
int retry = 0;
while (true) {
var res = await loadData();
if (res.success) {
return res;
} else {
if (retry >= 3) {
return res;
}
retry++;
await Future.delayed(const Duration(milliseconds: 200));
}
}
}
FutureOr<void> onDataLoaded() {}
Widget buildContent(BuildContext context, S data);
@@ -125,7 +141,7 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object>
isLoading = true;
error = null;
});
loadData().then((value) async {
loadDataWithRetry().then((value) async {
if (value.success) {
data = value.data;
await onDataLoaded();
@@ -153,7 +169,7 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object>
void initState() {
isLoading = true;
Future.microtask(() {
loadData().then((value) async {
loadDataWithRetry().then((value) async {
if (value.success) {
data = value.data;
await onDataLoaded();

1
lib/foundation/comic_source/parser.dart
View File

@@ -483,7 +483,6 @@ class ComicSourceParser {
if (res is! Map<String, dynamic>) throw "Invalid data";
res['comicId'] = id;
res['sourceKey'] = _key;
JsEngine().clearHtml();
return Res(ComicDetails.fromJson(res));
} catch (e, s) {
Log.error("Network", "$e\n$s");

133
lib/foundation/js_engine.dart
View File

@@ -28,7 +28,6 @@ import 'comic_source/comic_source.dart';
import 'consts.dart';
import 'log.dart';
class JavaScriptRuntimeException implements Exception {
final String message;
@@ -72,14 +71,14 @@ class JsEngine with _JSEngineApi{
_closed = false;
_engine = FlutterQjs();
_engine!.dispatch();
var setGlobalFunc = _engine!.evaluate(
"(key, value) => { this[key] = value; }");
var setGlobalFunc =
_engine!.evaluate("(key, value) => { this[key] = value; }");
(setGlobalFunc as JSInvokable)(["sendMessage", _messageReceiver]);
setGlobalFunc.free();
var jsInit = await rootBundle.load("assets/init.js");
_engine!.evaluate(utf8.decode(jsInit.buffer.asUint8List()), name: "<init>");
}
catch(e, s){
_engine!
.evaluate(utf8.decode(jsInit.buffer.asUint8List()), name: "<init>");
} catch (e, s) {
Log.error('JS Engine', 'JS Engine Init Error:\n$e\n$s');
}
}
@@ -106,8 +105,7 @@ class JsEngine with _JSEngineApi{
{
String key = message["key"];
String dataKey = message["data_key"];
return ComicSource.find(key)
?.data[dataKey];
return ComicSource.find(key)?.data[dataKey];
}
case 'save_data':
{
@@ -158,9 +156,9 @@ class JsEngine with _JSEngineApi{
String key = message["key"];
String settingKey = message["setting_key"];
var source = ComicSource.find(key)!;
return source.data["setting"]?[settingKey]
?? source.settings?[settingKey]['default']
?? (throw "Setting not found: $settingKey");
return source.data["setting"]?[settingKey] ??
source.settings?[settingKey]['default'] ??
(throw "Setting not found: $settingKey");
}
case "isLogged":
{
@@ -168,8 +166,7 @@ class JsEngine with _JSEngineApi{
}
}
}
}
catch(e, s){
} catch (e, s) {
Log.error("Failed to handle message: $message\n$e\n$s", "JsEngine");
rethrow;
}
@@ -184,18 +181,22 @@ class JsEngine with _JSEngineApi{
if (headers["user-agent"] == null && headers["User-Agent"] == null) {
headers["User-Agent"] = webUA;
}
response = await _dio!.request(req["url"], data: req["data"], options: Options(
response = await _dio!.request(req["url"],
data: req["data"],
options: Options(
method: req['http_method'],
responseType: req["bytes"] == true ? ResponseType.bytes : ResponseType.plain,
headers: headers
));
responseType: req["bytes"] == true
? ResponseType.bytes
: ResponseType.plain,
headers: headers));
} catch (e) {
error = e.toString();
}
Map<String, String> headers = {};
response?.headers.forEach((name, values) => headers[name] = values.join(','));
response?.headers
.forEach((name, values) => headers[name] = values.join(','));
dynamic body = response?.data;
if (body is! Uint8List && body is List<int>) {
@@ -224,26 +225,40 @@ class JsEngine with _JSEngineApi{
mixin class _JSEngineApi {
final Map<int, dom.Document> _documents = {};
final Map<int, List<int>> _documentElements = {};
final Map<int, List<int>> _documentNodes = {};
final Map<int, dom.Element> _elements = {};
final Map<int, dom.Node> _nodes = {};
CookieJarSql? _cookieJar;
int _elementKey = 0;
int _nodeKey = 0;
dynamic handleHtmlCallback(Map<String, dynamic> data) {
switch (data["function"]) {
case "parse":
_documents[data["key"]] = html.parse(data["data"]);
_documentElements[data["key"]] = [];
_documentNodes[data["key"]] = [];
Future.delayed(const Duration(seconds: 1), () {
handleHtmlCallback({"function": "dispose", "key": data["key"]});
});
return null;
case "querySelector":
var res = _documents[data["key"]]!.querySelector(data["query"]);
if (res == null) return null;
_elements[_elements.length] = res;
return _elements.length - 1;
_elements[_elementKey] = res;
_elementKey++;
_documentElements[data["key"]]!.add(_elementKey - 1);
return _elementKey - 1;
case "querySelectorAll":
var res = _documents[data["key"]]!.querySelectorAll(data["query"]);
var keys = <int>[];
for (var element in res) {
_elements[_elements.length] = element;
keys.add(_elements.length - 1);
_elements[_elementKey] = element;
keys.add(_elementKey);
_documentElements[data["key"]]!.add(_elementKey);
_elementKey++;
}
return keys;
case "getText":
@@ -254,29 +269,42 @@ mixin class _JSEngineApi{
var res = _elements[data["key"]]!.querySelector(data["query"]);
if (res == null) return null;
_elements[_elements.length] = res;
var docKey = _documentElements.keys
.firstWhere((key) => _documentElements[key]!.contains(data["key"]));
_documentElements[docKey]!.add(_elements.length - 1);
return _elements.length - 1;
case "dom_querySelectorAll":
var res = _elements[data["key"]]!.querySelectorAll(data["query"]);
var keys = <int>[];
var docKey = _documentElements.keys
.firstWhere((key) => _documentElements[key]!.contains(data["key"]));
for (var element in res) {
_elements[_elements.length] = element;
keys.add(_elements.length - 1);
_documentElements[docKey]!.add(_elements.length - 1);
}
return keys;
case "getChildren":
var res = _elements[data["key"]]!.children;
var keys = <int>[];
var docKey = _documentElements.keys
.firstWhere((key) => _documentElements[key]!.contains(data["key"]));
for (var element in res) {
_elements[_elements.length] = element;
keys.add(_elements.length - 1);
_documentElements[docKey]!.add(_elements.length - 1);
}
return keys;
case "getNodes":
var res = _elements[data["key"]]!.nodes;
var keys = <int>[];
var docKey = _documentElements.keys
.firstWhere((key) => _documentElements[key]!.contains(data["key"]));
for (var node in res) {
_nodes[_nodes.length] = node;
keys.add(_nodes.length - 1);
_nodes[_nodeKey] = node;
keys.add(_nodeKey);
_documentNodes[docKey]!.add(_nodeKey);
_nodeKey++;
}
return keys;
case "getInnerHTML":
@@ -284,8 +312,9 @@ mixin class _JSEngineApi{
case "getParent":
var res = _elements[data["key"]]!.parent;
if (res == null) return null;
_elements[_elements.length] = res;
return _elements.length - 1;
_elements[_elementKey] = res;
_documentElements[data["key"]]!.add(_elementKey);
return _elementKey++;
case "node_text":
return _nodes[data["key"]]!.text;
case "node_type":
@@ -299,10 +328,25 @@ mixin class _JSEngineApi{
case "node_to_element":
var node = _nodes[data["key"]]!;
if (node is dom.Element) {
_elements[_elements.length] = node;
return _elements.length - 1;
_elements[_elementKey] = node;
var docKey = _documentNodes.keys
.firstWhere((key) => _documentElements[key]!.contains(data["key"]));
_documentElements[docKey]!.add(_elementKey);
return _elementKey++;
}
return null;
case "dispose":
var docKey = data["key"];
_documents.remove(docKey);
for (var elementKey in _documentElements[docKey]!) {
_elements.remove(elementKey);
}
_documentElements.remove(docKey);
for (var nodeKey in _documentNodes[docKey]!) {
_nodes.remove(nodeKey);
}
_documentNodes.remove(docKey);
return null;
}
}
@@ -321,7 +365,8 @@ mixin class _JSEngineApi{
return null;
case "get":
var cookies = _cookieJar!.loadForRequest(Uri.parse(data["url"]));
return cookies.map((e) => {
return cookies
.map((e) => {
"name": e.name,
"value": e.value,
"domain": e.domain,
@@ -331,7 +376,8 @@ mixin class _JSEngineApi{
"secure": e.secure,
"httpOnly": e.httpOnly,
"session": e.expires == null,
}).toList();
})
.toList();
case "delete":
clearCookies([data["url"]]);
return null;
@@ -359,16 +405,12 @@ mixin class _JSEngineApi{
try {
switch (type) {
case "utf8":
return isEncode
? utf8.encode(value)
: utf8.decode(value);
return isEncode ? utf8.encode(value) : utf8.decode(value);
case "base64":
if (value is String) {
value = utf8.encode(value);
}
return isEncode
? base64Encode(value)
: base64Decode(value);
return isEncode ? base64Encode(value) : base64Decode(value);
case "md5":
return Uint8List.fromList(md5.convert(value).bytes);
case "sha1":
@@ -380,13 +422,15 @@ mixin class _JSEngineApi{
case "hmac":
var key = data["key"];
var hash = data["hash"];
var hmac = Hmac(switch(hash) {
var hmac = Hmac(
switch (hash) {
"md5" => md5,
"sha1" => sha1,
"sha256" => sha256,
"sha512" => sha512,
_ => throw "Unsupported hash: $hash"
}, key);
},
key);
if (data['isString'] == true) {
return hmac.convert(value).toString();
} else {
@@ -431,16 +475,15 @@ mixin class _JSEngineApi{
if (!isEncode) {
var key = data["key"];
final cipher = PKCS1Encoding(RSAEngine());
cipher.init(
false, PrivateKeyParameter<RSAPrivateKey>(_parsePrivateKey(key)));
cipher.init(false,
PrivateKeyParameter<RSAPrivateKey>(_parsePrivateKey(key)));
return _processInBlocks(cipher, value);
}
return null;
default:
return value;
}
}
catch(e) {
} catch (e) {
Log.error("JS Engine", "Failed to convert $type: $e");
return null;
}
@@ -460,11 +503,11 @@ mixin class _JSEngineApi{
final p = pkSeq.elements![4] as ASN1Integer;
final q = pkSeq.elements![5] as ASN1Integer;
return RSAPrivateKey(modulus.integer!, privateExponent.integer!, p.integer!, q.integer!);
return RSAPrivateKey(
modulus.integer!, privateExponent.integer!, p.integer!, q.integer!);
}
Uint8List _processInBlocks(
AsymmetricBlockCipher engine, Uint8List input) {
Uint8List _processInBlocks(AsymmetricBlockCipher engine, Uint8List input) {
final numBlocks = input.length ~/ engine.inputBlockSize +
((input.length % engine.inputBlockSize != 0) ? 1 : 0);