Feat/Kraken Bundle #866

answershuto · 2021-11-10T12:32:53Z

处理 window.open 等跳转问题
重构 load 传参接口设计以及逻辑，保证有 url（或 path），保证 parseURL 等处理没问题。
history 与 bundleURL 重复设计问题是，所有历史页面（url 以及 bundleContent 等）都放到 history 中统一管理。
重构 KrakenBundle 逻辑，提供开发者自定义传入 bundle 用以初始化，以代替原本 content 或者 url 等传参，Bundle 初始化不依赖上下文，可以通过 url、path 或者 js context 等初始化，resolve 处理加载等逻辑时再传递上下文，bundle 可以在任意上下文中执行，eval 执行 js 或者 html。URIParser 统一在基类的 resolve 中处理掉。
bundle resove 基类统一处理 parseURL。
增加 assets 协议。

API：

Kraken({
  bundle: KrakenBundle.fromHref('http://127.0.0.1:3300/kraken_debug_server.js'),
})

close #861

wssgcg1213 · 2021-11-23T06:09:06Z

fromURL 会比 fromHref 好一点

wssgcg1213 · 2021-11-23T06:11:15Z

href 是 Hypertext Reference 的简写

answershuto · 2021-11-23T06:22:29Z

assets 跟 url 放一起了，未来还会有 file（如果有）等，统一当作 href 处理，内部根据协议再去判断，而不是传入的时候区分好，因为比如 src="xxxxxxx" 的情况是直接new bundle 的。 @wssgcg1213

wssgcg1213 · 2021-12-03T09:35:37Z

integration_tests/lib/main.dart

@@ -82,7 +83,7 @@ void main() async {
    var kraken = krakenMap[i] = Kraken(
      viewportWidth: 360,
      viewportHeight: 640,
-      bundleContent: 'console.log("Starting integration tests...")',
+      bundle: KrakenBundle.fromWithContent('console.log("Starting integration tests...")'),


fromWithContent 应该是 fromContent

wssgcg1213 · 2021-12-03T09:36:40Z

kraken/lib/widget.dart

@@ -226,34 +217,66 @@ class Kraken extends StatefulWidget {
    defineElement(tagName.toUpperCase(), creator);
  }

+  loadHref(KrakenBundle bundle) async {


这个不对呀,

void loadBundle(KrakenBundle bundle)

wssgcg1213 · 2021-12-03T09:38:44Z

kraken/lib/src/launcher/bundle.dart

      : super(url) {
    this.content = content;
  }

-  RawBundle.fromByteCode(Uint8List byteCode, Uri url) : super(url) {
+  RawBundle.fromByteCode(Uint8List byteCode, String url)


fromBytecode 吧,

这个单词不是个组合词, 之前的用法就有问题

wssgcg1213 · 2021-12-03T09:39:20Z

kraken/lib/src/launcher/bundle.dart

@@ -192,6 +207,11 @@ class NetworkAssetBundle extends AssetBundle {
  Future<ByteData> load(String key) async {
    final HttpClientRequest request = await httpClient.getUrl(_urlFromKey(key));
    request.headers.set('Accept', getAcceptHeader());
+    if (additionalHttpHeaders != null) {
+      additionalHttpHeaders?.forEach((key, value) {


additionalHttpHeaders?.forEach(request.headers.set);

这个 ?. 多余了, 跟前面的判空是一个逻辑

wssgcg1213 · 2021-12-03T09:39:33Z

kraken/lib/src/launcher/bundle.dart

      : super(url);

+  Map<String, String>? additionalHttpHeaders = {};


没有其他人用, 这个可以私有的

wssgcg1213 · 2021-12-03T09:41:28Z

kraken/lib/src/launcher/controller.dart

@@ -622,27 +631,45 @@ class KrakenController {
    historyModule.href = value;
  }

+  set bundleContent(String? value) {


bundle 已经抽象掉了, 应该 set bundle(KrakenBundle bundle);

wssgcg1213 · 2021-12-03T09:42:40Z

kraken/lib/src/launcher/launcher.dart

+        bundle = KrakenBundle.fromWithContent(bundleContent, url: bundleURL);
+      } else {
+        bundle = KrakenBundle.fromUrl(bundleURL);
+      }


你看这里的一堆判断就很恶心了, 抽象成 bundle 的目的就是消灭这些判断的, 直接 load bundle 就行了

wssgcg1213 · 2021-12-03T09:42:55Z

kraken/lib/src/module/history.dart


 import 'package:kraken/dom.dart';
 import 'package:kraken/kraken.dart';
 import 'package:kraken/module.dart';

 class HistoryItem {
-  HistoryItem(this.href, this.state, this.needJump);
+  HistoryItem(this.href, this.state, this.needJump, { this.bundleContent, this.bundleByteCode });


this.bundle

wssgcg1213 · 2021-12-03T10:01:01Z

kraken/lib/src/module/navigation.dart


    Uri targetUri = Uri.parse(targetUrl);
-    Uri? sourceUri = sourceUrl != null ? Uri.parse(sourceUrl) : null;
+    Uri sourceUri =  Uri.parse(sourceUrl);


wssgcg1213 · 2021-12-03T10:02:24Z

kraken/lib/src/launcher/launcher.dart

@@ -22,6 +23,7 @@ void launch({
  String? bundleURL,
  String? bundlePath,
  String? bundleContent,
+  Uint8List? bundleByteCode,


answershuto added 24 commits November 10, 2021 14:34

♻️ chore: delete invalid code.

27f1ad9

✨ feat: add navigate type to handleNavigationAction.

3f60086

🔥 feat: _bundlePath and _bundleURL should be deprecated.

a67065a

🐛 fix: set bundle or url should be save to history modeule.

6b94986

✨ feat: modify loadURL of widget.

55dee63

✨ feat: modify history api for add bundleContent.

59ac7e3

fix: dealwith href.

b9344ae

♻️ refactor: refactor api of Kraken Widget to load bundle.

9e7aaf1

✨ resolve should be mustCallSuper.

4a4710b

♻️ chore: modify url to src.

80ee769

♻️ chore: modify kraken widget of main.dart.

e64bd77

Merge branch 'main' into fix/window_open

60034b1

✅ test: modify main of test.

2910bf3

♻️ chore: dealwith lint.

a7c84c5

🐛 fix: set href should new bundle.

cc5ecfe

✨ feat: modify api of kraken for plugin test.

d30bcdb

🐛 fix: href of script should work.

3b482cd

✨ chore: modify main of kraken example.

2705571

♻️ test: modify bundle of test.

dccc7b6

♻️ chore: loadURL and loadPath should be deprecated.

817fdb9

♻️ chore: modify api of widget.

a872346

♻️ chore: dealwith lint.

7ac7ea3

♻️ chore: dealwith lint.

b74af60

♻️ chore: modify kraken widget of performance.

8bc6984

answershuto changed the title ~~[WIP]Fix/window open~~ Fix/window open Nov 16, 2021

answershuto added 2 commits November 23, 2021 14:50

Merge branch 'main' into fix/window_open

21474fe

♻️ chore: dealwith err.

5aee668

answershuto added 5 commits December 3, 2021 14:20

✨ feat: add additionalHttpHeaders to fromUrl of KrakenBundle.

6c88260

✅ test: modify main of test.

42cd8c2

✅ test: modify script test.

40df352

✅ test: modify test of plugin.

915eeba

✅ test: modify test of performance.

a97715a

wssgcg1213 reviewed Dec 3, 2021

View reviewed changes

answershuto added 4 commits December 3, 2021 17:43

🎨 chore: modify additionalHttpHeaders to _additionalHttpHeaders.

7ad8ada

🎨 chore: modify fromWithContent to fromContent.

37647c9

🎨 chore: modify fromByteCode to fromBytecode.

ae0dc1b

🎨 chore: modify byteCode to bytecode.

7637bdc

wssgcg1213 reviewed Dec 3, 2021

View reviewed changes

answershuto added 7 commits December 3, 2021 18:13

✨ feat: modify bundle for launch.

2638f19

🎨 chore: remove the blank space.

23e9b9f

🎨 chore: bundle is not required.

f2465b1

🎨 chore: deal with lint.

3b6fd59

✨ feat: use bundle replace src.

abf0dcc

🎨 chore: dealwith lint.

281ccf0

✅ test: modify test of plugin.

5aa6671

wssgcg1213 approved these changes Dec 6, 2021

View reviewed changes

temper357 approved these changes Dec 7, 2021

View reviewed changes

answershuto merged commit f95b2e7 into main Dec 7, 2021

answershuto deleted the fix/window_open branch December 7, 2021 02:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/Kraken Bundle #866

Feat/Kraken Bundle #866

answershuto commented Nov 10, 2021 •

edited

wssgcg1213 commented Nov 23, 2021

wssgcg1213 commented Nov 23, 2021

answershuto commented Nov 23, 2021 •

edited

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

wssgcg1213 Dec 3, 2021

		: super(url);

		Map<String, String>? additionalHttpHeaders = {};

Feat/Kraken Bundle #866

Feat/Kraken Bundle #866

Conversation

answershuto commented Nov 10, 2021 • edited

wssgcg1213 commented Nov 23, 2021

wssgcg1213 commented Nov 23, 2021

answershuto commented Nov 23, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

answershuto commented Nov 10, 2021 •

edited

answershuto commented Nov 23, 2021 •

edited