Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.www.
wechaty
提交
443db39a
W
wechaty
项目概览
.www.
/
wechaty
与 Fork 源项目一致
Fork自
wechaty / wechaty
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wechaty
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
443db39a
编写于
11月 10, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code clean for execute script
上级
f0653861
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
19 deletion
+31
-19
src/puppet-web/bridge.ts
src/puppet-web/bridge.ts
+30
-18
src/puppet-web/browser.ts
src/puppet-web/browser.ts
+1
-1
未找到文件。
src/puppet-web/bridge.ts
浏览文件 @
443db39a
...
...
@@ -335,7 +335,7 @@ export class Bridge {
/**
* Proxy Call to Wechaty in Bridge
*/
public
proxyWechaty
(
wechatyFunc
,
...
args
):
Promise
<
any
>
{
public
async
proxyWechaty
(
wechatyFunc
,
...
args
):
Promise
<
any
>
{
const
argsEncoded
=
new
Buffer
(
encodeURIComponent
(
JSON
.
stringify
(
args
)
...
...
@@ -359,27 +359,39 @@ export class Bridge {
// console.log('proxyWechaty wechatyFunc args[0]: ')
// console.log(args[0])
try
{
const
noWechaty
=
await
this
.
execute
(
'
return typeof WechatyBro === "undefined"
'
)
if
(
noWechaty
)
{
throw
new
Error
(
'
there is no WechatyBro in browser(yet)
'
)
}
}
catch
(
e
)
{
log
.
error
(
'
PuppetWebBridge
'
,
'
proxyWechaty() noWechaty exception: %s
'
,
e
.
message
)
throw
e
}
/**
*
* WechatyBro method named end with "Async", will be treated as a Async function
*/
let
funcExecuter
if
(
/Async$/
.
test
(
wechatyFunc
))
{
funcExecuter
=
this
.
executeAsync
.
bind
(
this
)
}
else
{
funcExecuter
=
this
.
execute
.
bind
(
this
)
// let funcExecuter
// if (/Async$/.test(wechatyFunc)) {
// funcExecuter = this.executeAsync.bind(this)
// } else {
// funcExecuter = this.execute.bind(this)
// }
try
{
let
ret
if
(
/Async$/
.
test
(
wechatyFunc
))
{
ret
=
await
this
.
executeAsync
(
wechatyScript
)
}
else
{
ret
=
await
this
.
execute
(
wechatyScript
)
}
return
ret
}
catch
(
e
)
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
proxyWechaty(%s, %s)
'
,
wechatyFunc
,
args
.
join
(
'
,
'
))
log
.
warn
(
'
PuppetWebBridge
'
,
'
proxyWechaty() exception: %s
'
,
e
.
message
)
throw
e
}
return
this
.
execute
(
'
return typeof WechatyBro === "undefined"
'
)
.
then
(
noWechaty
=>
{
if
(
noWechaty
)
{
throw
new
Error
(
'
there is no WechatyBro in browser(yet)
'
)
}
})
.
then
(()
=>
funcExecuter
(
wechatyScript
))
.
catch
(
e
=>
{
log
.
warn
(
'
PuppetWebBridge
'
,
'
proxyWechaty() exception: %s
'
,
e
.
message
)
throw
e
})
}
/**
...
...
src/puppet-web/browser.ts
浏览文件 @
443db39a
...
...
@@ -285,7 +285,7 @@ export class Browser extends EventEmitter {
return
await
this
.
driver
.
executeScript
.
apply
(
this
.
driver
,
arguments
)
}
catch
(
e
)
{
// this.dead(e)
log
.
verbose
(
'
PuppetWebBrowser
'
,
'
execute() script: %s
'
,
script
)
log
.
silly
(
'
PuppetWebBrowser
'
,
'
execute() script: %s
'
,
script
)
log
.
warn
(
'
PuppetWebBrowser
'
,
'
execute() exception: %s, %s
'
,
e
.
message
.
substr
(
0
,
99
),
e
.
stack
)
throw
e
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录