Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_46011646
wechaty
提交
d97e750d
W
wechaty
项目概览
weixin_46011646
/
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,发现更多精彩内容 >>
提交
d97e750d
编写于
11月 13, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code clean
上级
8f44b947
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
22 deletion
+36
-22
bin/pre-push
bin/pre-push
+1
-0
src/message.ts
src/message.ts
+5
-1
src/puppet-web/bridge.ts
src/puppet-web/bridge.ts
+19
-16
src/puppet-web/browser.ts
src/puppet-web/browser.ts
+11
-5
未找到文件。
bin/pre-push
浏览文件 @
d97e750d
...
...
@@ -35,4 +35,5 @@ npm run lint
# must run this after the above `test` ([ -z ...]),
# or will whow a error: error: failed to push some refs to 'git@github.com:wechaty/wechaty.git'
echo
"PRE-PUSH HOOK PASSED"
echo
src/message.ts
浏览文件 @
d97e750d
...
...
@@ -359,9 +359,13 @@ export class Message implements Sayable {
return
null
}
public
content
(
content
?:
string
):
string
{
public
content
():
string
public
content
(
content
:
string
):
void
public
content
(
content
?:
string
):
string
|
void
{
if
(
content
)
{
this
.
obj
.
content
=
content
return
}
return
this
.
obj
.
content
}
...
...
src/puppet-web/bridge.ts
浏览文件 @
d97e750d
...
...
@@ -405,6 +405,9 @@ export class Bridge {
// }
try
{
let
ret
/**
* Async functions name is start with `Async` in WechatyBro
*/
if
(
/Async$/
.
test
(
wechatyFunc
))
{
ret
=
await
this
.
executeAsync
(
wechatyScript
)
}
else
{
...
...
@@ -422,38 +425,38 @@ export class Bridge {
/**
* call REAL browser excute for other methods
*/
public
execute
(
script
,
...
args
):
Promise
<
any
>
{
public
async
execute
(
script
,
...
args
):
Promise
<
any
>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
execute()
'
)
if
(
!
this
.
puppet
||
!
this
.
puppet
.
browser
)
{
return
Promise
.
reject
(
new
Error
(
'
execute(): no puppet or no puppet.browser in bridge
'
)
)
throw
new
Error
(
'
execute(): no puppet or no puppet.browser in bridge
'
)
}
return
this
.
puppet
.
browser
.
execute
(
script
,
...
args
)
.
catch
(
e
=>
{
log
.
warn
(
'
PuppetWebBridge
'
,
'
execute() exception: %s
'
,
e
.
message
)
throw
e
})
.
catch
(
e
=>
{
log
.
warn
(
'
PuppetWebBridge
'
,
'
execute() exception: %s
'
,
e
.
message
)
throw
e
})
}
private
executeAsync
(
script
,
...
args
):
Promise
<
any
>
{
private
async
executeAsync
(
script
,
...
args
):
Promise
<
any
>
{
if
(
!
this
.
puppet
||
!
this
.
puppet
.
browser
)
{
return
Promise
.
reject
(
new
Error
(
'
execute(): no puppet or no puppet.browser in bridge
'
)
)
throw
new
Error
(
'
execute(): no puppet or no puppet.browser in bridge
'
)
}
return
this
.
puppet
.
browser
.
executeAsync
(
script
,
...
args
)
.
catch
(
e
=>
{
log
.
warn
(
'
PuppetWebBridge
'
,
'
executeAsync() exception: %s
'
,
e
.
message
)
throw
e
})
.
catch
(
e
=>
{
log
.
warn
(
'
PuppetWebBridge
'
,
'
executeAsync() exception: %s
'
,
e
.
message
)
throw
e
})
}
public
ding
(
data
):
Promise
<
any
>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
ding(%s)
'
,
data
)
return
this
.
proxyWechaty
(
'
ding
'
,
data
)
.
catch
(
e
=>
{
log
.
error
(
'
PuppetWebBridge
'
,
'
ding(%s) exception: %s
'
,
data
,
e
.
message
)
throw
e
})
.
catch
(
e
=>
{
log
.
error
(
'
PuppetWebBridge
'
,
'
ding(%s) exception: %s
'
,
data
,
e
.
message
)
throw
e
})
}
}
...
...
src/puppet-web/browser.ts
浏览文件 @
d97e750d
...
...
@@ -362,15 +362,20 @@ export class Browser extends EventEmitter {
// too noisy!
// log.silly('PuppetWebBrowser', 'dead() checking ... ')
if
(
this
.
state
.
target
()
===
'
close
'
||
this
.
state
.
current
()
===
'
close
'
||
this
.
state
.
inprocess
()
)
{
log
.
verbose
(
'
PuppetWebBrowser
'
,
'
dead() browser is in dead state
'
)
return
true
}
let
msg
let
dead
=
false
if
(
forceReason
)
{
dead
=
true
msg
=
forceReason
}
else
if
(
this
.
state
.
target
()
!==
'
open
'
)
{
dead
=
true
msg
=
'
state.target() not open
'
}
else
if
(
!
this
.
driver
)
{
// FIXME: this.driver is BrowserDriver, should add a method to check if availble 201610
dead
=
true
msg
=
'
no driver or session
'
...
...
@@ -400,8 +405,9 @@ export class Browser extends EventEmitter {
return
dead
}
public
addCookie
(
cookies
:
CookieType
[]):
Promise
<
void
>
public
addCookie
(
cookie
:
CookieType
):
Promise
<
void
>
public
addCookie
(
cookies
:
CookieType
[]):
Promise
<
void
>
public
addCookie
(
cookie
:
CookieType
):
Promise
<
void
>
public
addCookie
(
cookie
:
CookieType
|
CookieType
[]):
Promise
<
void
>
{
return
this
.
cookie
.
add
(
cookie
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录