Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.Veneno.
wechaty
提交
d85ba62f
W
wechaty
项目概览
.Veneno.
/
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,发现更多精彩内容 >>
提交
d85ba62f
编写于
10月 23, 2017
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix init race condition
上级
dd2238de
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
6 deletion
+11
-6
src/puppet-web/bridge.spec.ts
src/puppet-web/bridge.spec.ts
+1
-1
src/puppet-web/bridge.ts
src/puppet-web/bridge.ts
+8
-3
test/puppet-web/bridge.spec.ts
test/puppet-web/bridge.spec.ts
+2
-2
未找到文件。
src/puppet-web/bridge.spec.ts
浏览文件 @
d85ba62f
...
...
@@ -31,7 +31,7 @@ import Profile from '../profile'
import
Bridge
from
'
./bridge
'
test
.
only
(
'
PuppetWebBridge
'
,
async
t
=>
{
test
(
'
PuppetWebBridge
'
,
async
t
=>
{
const
profile
=
new
Profile
()
const
bridge
=
new
Bridge
({
profile
})
try
{
...
...
src/puppet-web/bridge.ts
浏览文件 @
d85ba62f
...
...
@@ -128,7 +128,7 @@ export class Bridge extends EventEmitter {
this
.
emit
(
'
error
'
,
new
Error
(
`
${
dialog
.
type
}
(
${
dialog
.
message
()}
)`
))
}
const
onLoad
=
async
()
=>
{
const
onLoad
=
async
(
done
:
()
=>
void
)
=>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
initPage() on(load) %s
'
,
page
.
url
())
if
(
this
.
state
.
off
())
{
...
...
@@ -168,13 +168,16 @@ export class Bridge extends EventEmitter {
log
.
error
(
'
PuppetWebBridge
'
,
'
init() initPage() onLoad() exception: %s
'
,
e
)
this
.
emit
(
'
error
'
,
e
)
}
finally
{
done
()
}
}
page
.
on
(
'
dialog
'
,
onDialog
)
page
.
on
(
'
load
'
,
onLoad
)
page
.
on
(
'
error
'
,
e
=>
this
.
emit
(
'
error
'
,
e
))
const
loaded
=
new
Promise
(
resolve
=>
page
.
on
(
'
load
'
,
()
=>
onLoad
(
resolve
)))
///////////////////
const
cookieList
=
this
.
options
.
profile
.
get
(
'
cookies
'
)
as
Cookie
[]
...
...
@@ -190,6 +193,8 @@ export class Bridge extends EventEmitter {
await
page
.
reload
()
// reload page to make effect of the new cookie.
}
await
loaded
// wait the page on load finish
return
page
}
...
...
@@ -677,7 +682,7 @@ export class Bridge extends EventEmitter {
return
resolve
()
}
const
ret
=
+
obj
.
error
.
ret
const
message
=
obj
.
error
.
message
as
string
const
message
=
obj
.
error
.
message
const
e
=
new
Error
(
message
)
...
...
test/puppet-web/bridge.spec.ts
浏览文件 @
d85ba62f
...
...
@@ -71,12 +71,12 @@ test('retryPromise()', async t => {
declare
const
WechatyBro
test
.
only
(
'
WechatyBro.ding()
'
,
async
t
=>
{
test
(
'
WechatyBro.ding()
'
,
async
t
=>
{
const
profile
=
new
Profile
(
Math
.
random
().
toString
(
36
).
substr
(
2
,
5
))
const
bridge
=
new
Bridge
({
profile
,
})
t
.
ok
(
bridge
,
'
should instanciated a bridge
with mocked puppet
'
)
t
.
ok
(
bridge
,
'
should instanciated a bridge
'
)
try
{
await
bridge
.
init
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录