Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
2f4a0220
E
engine
项目概览
qq_34031325
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2f4a0220
编写于
7月 30, 2018
作者:
J
Jason Simmons
提交者:
GitHub
7月 30, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return proper JSON-RPC error responses from service protocol failures (#5889)
Fixes
https://github.com/flutter/flutter/issues/19571
上级
d34eb1db
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
7 deletion
+16
-7
shell/common/shell.cc
shell/common/shell.cc
+16
-7
未找到文件。
shell/common/shell.cc
浏览文件 @
2f4a0220
...
@@ -773,7 +773,7 @@ Shell::GetServiceProtocolDescription() const {
...
@@ -773,7 +773,7 @@ Shell::GetServiceProtocolDescription() const {
}
}
static
void
ServiceProtocolParameterError
(
rapidjson
::
Document
&
response
,
static
void
ServiceProtocolParameterError
(
rapidjson
::
Document
&
response
,
std
::
string
parameter_name
)
{
std
::
string
error_details
)
{
auto
&
allocator
=
response
.
GetAllocator
();
auto
&
allocator
=
response
.
GetAllocator
();
response
.
SetObject
();
response
.
SetObject
();
const
int64_t
kInvalidParams
=
-
32602
;
const
int64_t
kInvalidParams
=
-
32602
;
...
@@ -781,11 +781,20 @@ static void ServiceProtocolParameterError(rapidjson::Document& response,
...
@@ -781,11 +781,20 @@ static void ServiceProtocolParameterError(rapidjson::Document& response,
response
.
AddMember
(
"message"
,
"Invalid params"
,
allocator
);
response
.
AddMember
(
"message"
,
"Invalid params"
,
allocator
);
{
{
rapidjson
::
Value
details
(
rapidjson
::
kObjectType
);
rapidjson
::
Value
details
(
rapidjson
::
kObjectType
);
details
.
AddMember
(
"details"
,
parameter_name
,
allocator
);
details
.
AddMember
(
"details"
,
error_details
,
allocator
);
response
.
AddMember
(
"data"
,
details
,
allocator
);
response
.
AddMember
(
"data"
,
details
,
allocator
);
}
}
}
}
static
void
ServiceProtocolFailureError
(
rapidjson
::
Document
&
response
,
std
::
string
message
)
{
auto
&
allocator
=
response
.
GetAllocator
();
response
.
SetObject
();
const
int64_t
kJsonServerError
=
-
32000
;
response
.
AddMember
(
"code"
,
kJsonServerError
,
allocator
);
response
.
AddMember
(
"message"
,
message
,
allocator
);
}
// Service protocol handler
// Service protocol handler
bool
Shell
::
OnServiceProtocolScreenshot
(
bool
Shell
::
OnServiceProtocolScreenshot
(
const
blink
::
ServiceProtocol
::
Handler
::
ServiceProtocolMap
&
params
,
const
blink
::
ServiceProtocol
::
Handler
::
ServiceProtocolMap
&
params
,
...
@@ -803,8 +812,7 @@ bool Shell::OnServiceProtocolScreenshot(
...
@@ -803,8 +812,7 @@ bool Shell::OnServiceProtocolScreenshot(
response
.
AddMember
(
"screenshot"
,
image
,
allocator
);
response
.
AddMember
(
"screenshot"
,
image
,
allocator
);
return
true
;
return
true
;
}
}
ServiceProtocolParameterError
(
response
,
ServiceProtocolFailureError
(
response
,
"Could not capture image screenshot."
);
"Could not capture image screenshot."
);
return
false
;
return
false
;
}
}
...
@@ -825,7 +833,7 @@ bool Shell::OnServiceProtocolScreenshotSKP(
...
@@ -825,7 +833,7 @@ bool Shell::OnServiceProtocolScreenshotSKP(
response
.
AddMember
(
"skp"
,
skp
,
allocator
);
response
.
AddMember
(
"skp"
,
skp
,
allocator
);
return
true
;
return
true
;
}
}
ServiceProtocol
Parameter
Error
(
response
,
"Could not capture SKP screenshot."
);
ServiceProtocol
Failure
Error
(
response
,
"Could not capture SKP screenshot."
);
return
false
;
return
false
;
}
}
...
@@ -897,7 +905,8 @@ bool Shell::OnServiceProtocolRunInView(
...
@@ -897,7 +905,8 @@ bool Shell::OnServiceProtocolRunInView(
return
true
;
return
true
;
}
else
{
}
else
{
FML_DLOG
(
ERROR
)
<<
"Could not run configuration in engine."
;
FML_DLOG
(
ERROR
)
<<
"Could not run configuration in engine."
;
response
.
AddMember
(
"type"
,
"Failure"
,
allocator
);
ServiceProtocolFailureError
(
response
,
"Could not run configuration in engine."
);
return
false
;
return
false
;
}
}
...
@@ -951,7 +960,7 @@ bool Shell::OnServiceProtocolSetAssetBundlePath(
...
@@ -951,7 +960,7 @@ bool Shell::OnServiceProtocolSetAssetBundlePath(
return
true
;
return
true
;
}
else
{
}
else
{
FML_DLOG
(
ERROR
)
<<
"Could not update asset directory."
;
FML_DLOG
(
ERROR
)
<<
"Could not update asset directory."
;
response
.
AddMember
(
"type"
,
"Failure"
,
allocator
);
ServiceProtocolFailureError
(
response
,
"Could not update asset directory."
);
return
false
;
return
false
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录