From 3a76e4faf505514415335a3ff0f3885dae85a093 Mon Sep 17 00:00:00 2001 From: luciolong Date: Tue, 16 Jan 2024 11:50:10 +0800 Subject: [PATCH 1/7] fix(voltron): resolve remoteServerUrl parse version id failed --- framework/voltron/CHANGELOG.md | 4 ++++ .../voltron/lib/inspector/dev_remote_server_data.dart | 8 +++----- framework/voltron/pubspec.yaml | 2 +- framework/voltron/test/flutter_render_test.dart | 8 ++++++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/framework/voltron/CHANGELOG.md b/framework/voltron/CHANGELOG.md index d6663da7d66..bf8cc2ac537 100644 --- a/framework/voltron/CHANGELOG.md +++ b/framework/voltron/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.38 + +- resolve remoteServerUrl parse version id failed + ## 0.0.37 - resolve merge conflicts diff --git a/framework/voltron/lib/inspector/dev_remote_server_data.dart b/framework/voltron/lib/inspector/dev_remote_server_data.dart index be0c10322d4..4759987ed7d 100644 --- a/framework/voltron/lib/inspector/dev_remote_server_data.dart +++ b/framework/voltron/lib/inspector/dev_remote_server_data.dart @@ -53,12 +53,10 @@ class DevRemoteServerData { _wsUrl = url.queryParameters['debugUrl']; var tempPath = _path; if (tempPath != null && tempPath.startsWith("/")) { - if (tempPath.startsWith("/")) { - _path = tempPath.substring(1); // remove first character / - } - int index = tempPath.indexOf("/"); + _path = tempPath.substring(1); // remove first character / + int index = _path?.indexOf("/") ?? -1; if (index >= 0) { - _versionId = tempPath.substring(0, index); + _versionId = _path?.substring(0, index); } } LogUtils.i( diff --git a/framework/voltron/pubspec.yaml b/framework/voltron/pubspec.yaml index 4a4629e7e11..e2f23382aa6 100644 --- a/framework/voltron/pubspec.yaml +++ b/framework/voltron/pubspec.yaml @@ -22,7 +22,7 @@ name: voltron description: A flutter plugin project to render hippy page. -version: 0.0.37 +version: 0.0.38 homepage: https://hippyjs.org repository: https://github.com/Tencent/Hippy diff --git a/framework/voltron/test/flutter_render_test.dart b/framework/voltron/test/flutter_render_test.dart index a7e29218a13..21b6dae4299 100644 --- a/framework/voltron/test/flutter_render_test.dart +++ b/framework/voltron/test/flutter_render_test.dart @@ -1,4 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; +import 'package:voltron/inspector/dev_remote_server_data.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -15,4 +16,11 @@ void main() { Function function = addNum; expect(Function.apply(function, [1, 2]), 3); }); + + test('dev_server_data', () { + final data = DevRemoteServerData('http://1.1.1.1:8080/abcdefg/index.bundle?debugUrl=ws%3A%2F%2F0.0.0.0%3A8080%2Fdebugger-proxy'); + expect(data.isValid(), true); + expect(data.getVersionId(), 'abcdefg'); + expect(data.getHost(), '1.1.1.1:8080'); + }); } From be536819e85f5d6b59c6c924685230a9909b21bb Mon Sep 17 00:00:00 2001 From: luciolong Date: Tue, 16 Jan 2024 13:13:02 +0800 Subject: [PATCH 2/7] fix(voltron): add license for flutter_render_test.dart --- .../voltron/test/flutter_render_test.dart | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/framework/voltron/test/flutter_render_test.dart b/framework/voltron/test/flutter_render_test.dart index 21b6dae4299..867cb3a4fd3 100644 --- a/framework/voltron/test/flutter_render_test.dart +++ b/framework/voltron/test/flutter_render_test.dart @@ -1,3 +1,23 @@ +// +// Tencent is pleased to support the open source community by making +// Hippy available. +// +// Copyright (C) 2022 THL A29 Limited, a Tencent company. +// All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + import 'package:flutter_test/flutter_test.dart'; import 'package:voltron/inspector/dev_remote_server_data.dart'; From 8c00fe2cdef43a2dd8d0052617834f8d3fa465f4 Mon Sep 17 00:00:00 2001 From: luciolong Date: Wed, 17 Jan 2024 11:09:12 +0800 Subject: [PATCH 3/7] fix(voltron): remoteServerUrl connect without path --- framework/voltron/lib/inspector/dev_server_helper.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/voltron/lib/inspector/dev_server_helper.dart b/framework/voltron/lib/inspector/dev_server_helper.dart index 40724133af2..d8d0fe497f3 100644 --- a/framework/voltron/lib/inspector/dev_server_helper.dart +++ b/framework/voltron/lib/inspector/dev_server_helper.dart @@ -44,7 +44,7 @@ class DevServerHelper { bool jsMinify, ) { if (_remoteServerData.isValid()) { - return "${_remoteServerData.getScheme()}://${_remoteServerData.getHost()}${_remoteServerData.getPath()}?dev=$devMode&hot=$hmr&minify=$jsMinify"; + return "${_remoteServerData.getScheme()}://${_remoteServerData.getHost()}/${_remoteServerData.getPath()}?dev=$devMode&hot=$hmr&minify=$jsMinify"; } return "http://$host/$bundleName?dev=$devMode&hot=$hmr&minify=$jsMinify"; } From a5fd41c2e135d95d065495091d6d5ef944951b7f Mon Sep 17 00:00:00 2001 From: luciolong Date: Wed, 17 Jan 2024 11:09:21 +0800 Subject: [PATCH 4/7] fix(voltron): remoteServerUrl connect without path --- framework/voltron/CHANGELOG.md | 4 ++++ framework/voltron/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/voltron/CHANGELOG.md b/framework/voltron/CHANGELOG.md index bf8cc2ac537..33eb377bd28 100644 --- a/framework/voltron/CHANGELOG.md +++ b/framework/voltron/CHANGELOG.md @@ -1,5 +1,9 @@ ## 0.0.38 +- resolve remoteServerUrl connect without '/' + +## 0.0.38 + - resolve remoteServerUrl parse version id failed ## 0.0.37 diff --git a/framework/voltron/pubspec.yaml b/framework/voltron/pubspec.yaml index e2f23382aa6..8d846b2e75c 100644 --- a/framework/voltron/pubspec.yaml +++ b/framework/voltron/pubspec.yaml @@ -22,7 +22,7 @@ name: voltron description: A flutter plugin project to render hippy page. -version: 0.0.38 +version: 0.0.39 homepage: https://hippyjs.org repository: https://github.com/Tencent/Hippy From 9a216a353f8cd69331712a2ab1c7e2acffeca608 Mon Sep 17 00:00:00 2001 From: luciolong Date: Wed, 17 Jan 2024 11:14:47 +0800 Subject: [PATCH 5/7] fix(voltron): remoteServerUrl connect without path --- framework/voltron/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/voltron/CHANGELOG.md b/framework/voltron/CHANGELOG.md index 33eb377bd28..d123abacf4c 100644 --- a/framework/voltron/CHANGELOG.md +++ b/framework/voltron/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.0.38 +## 0.0.39 - resolve remoteServerUrl connect without '/' From 34ddd45af27dbfc20875b10a9e782f8620f13409 Mon Sep 17 00:00:00 2001 From: luciolong Date: Tue, 23 Jul 2024 12:37:05 +0800 Subject: [PATCH 6/7] fix(voltron): fix voltron http request dio null error --- framework/voltron/CHANGELOG.md | 4 ++++ framework/voltron/lib/adapter/http.dart | 2 +- framework/voltron/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/framework/voltron/CHANGELOG.md b/framework/voltron/CHANGELOG.md index bf8cc2ac537..bfc1ba248b9 100644 --- a/framework/voltron/CHANGELOG.md +++ b/framework/voltron/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.40 + +-resolve dio error data is null + ## 0.0.38 - resolve remoteServerUrl parse version id failed diff --git a/framework/voltron/lib/adapter/http.dart b/framework/voltron/lib/adapter/http.dart index 0d5a1cf8480..b866e2015d7 100644 --- a/framework/voltron/lib/adapter/http.dart +++ b/framework/voltron/lib/adapter/http.dart @@ -65,7 +65,7 @@ abstract class VoltronHttpAdapter with Destroyable { statusMessage: e.response?.statusMessage ?? '', headerMap: e.response?.headers.map ?? {}, requestOptions: e.requestOptions, - data: e.response?.data, + data: e.response?.data??'', ); } else { httpResponse = VoltronHttpResponse( diff --git a/framework/voltron/pubspec.yaml b/framework/voltron/pubspec.yaml index e2f23382aa6..29ccb4de788 100644 --- a/framework/voltron/pubspec.yaml +++ b/framework/voltron/pubspec.yaml @@ -22,7 +22,7 @@ name: voltron description: A flutter plugin project to render hippy page. -version: 0.0.38 +version: 0.0.40 homepage: https://hippyjs.org repository: https://github.com/Tencent/Hippy From c0f936d6f753339715301c12244c10bccb64da3c Mon Sep 17 00:00:00 2001 From: luciolong Date: Tue, 23 Jul 2024 14:07:20 +0800 Subject: [PATCH 7/7] fix(voltron): fix voltron http request dio null error --- framework/voltron/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/voltron/CHANGELOG.md b/framework/voltron/CHANGELOG.md index 89fe057e63a..5669cca245d 100644 --- a/framework/voltron/CHANGELOG.md +++ b/framework/voltron/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.0.40 --resolve dio error data is null +- resolve dio error data is null ## 0.0.39