Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.www.
wechaty
提交
bdf55866
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,发现更多精彩内容 >>
提交
bdf55866
编写于
10月 23, 2017
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add StateSwitch to bridge to resolve async race condition
上级
de67c47f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
9 deletion
+40
-9
src/puppet-web/bridge.spec.ts
src/puppet-web/bridge.spec.ts
+10
-6
src/puppet-web/bridge.ts
src/puppet-web/bridge.ts
+30
-3
未找到文件。
src/puppet-web/bridge.spec.ts
浏览文件 @
bdf55866
...
...
@@ -31,12 +31,16 @@ import Profile from '../profile'
import
Bridge
from
'
./bridge
'
test
(
'
PuppetWebBridge
'
,
async
t
=>
{
test
.
only
(
'
PuppetWebBridge
'
,
async
t
=>
{
const
profile
=
new
Profile
()
const
bridge
=
new
Bridge
({
profile
})
await
bridge
.
init
()
t
.
ok
(
bridge
,
'
Bridge instnace
'
)
await
bridge
.
quit
()
try
{
await
bridge
.
init
()
await
bridge
.
quit
()
t
.
pass
(
'
Bridge instnace
'
)
}
catch
(
e
)
{
t
.
fail
(
'
Bridge instance:
'
+
e
)
}
})
test
(
'
testBlockedMessage()
'
,
async
t
=>
{
...
...
@@ -111,7 +115,7 @@ test('clickSwitchAccount()', async t => {
const
profile
=
new
Profile
()
const
bridge
=
new
Bridge
({
profile
}
)
test
(
'
switch account
'
,
async
t
=>
{
test
(
'
switch account
needed
'
,
async
t
=>
{
const
browser
=
await
launch
()
const
page
=
await
browser
.
newPage
()
...
...
@@ -124,7 +128,7 @@ test('clickSwitchAccount()', async t => {
t
.
equal
(
clicked
,
true
,
'
should click the switch account button
'
)
})
test
(
'
switch account
'
,
async
t
=>
{
test
(
'
switch account
not needed
'
,
async
t
=>
{
const
browser
=
await
launch
()
const
page
=
await
browser
.
newPage
()
...
...
src/puppet-web/bridge.ts
浏览文件 @
bdf55866
...
...
@@ -28,6 +28,7 @@ import {
launch
,
Page
,
}
from
'
puppeteer
'
import
StateSwitch
from
'
state-switch
'
import
{
parseString
}
from
'
xml2js
'
/* tslint:disable:no-var-requires */
...
...
@@ -56,26 +57,31 @@ declare const WechatyBro
export
class
Bridge
extends
EventEmitter
{
private
browser
:
Browser
private
page
:
Page
private
state
:
StateSwitch
constructor
(
public
options
:
BridgeOptions
,
)
{
super
()
log
.
verbose
(
'
PuppetWebBridge
'
,
'
constructor()
'
)
this
.
state
=
new
StateSwitch
(
'
PuppetWebBridge
'
,
log
)
}
public
async
init
():
Promise
<
void
>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
init()
'
)
this
.
state
.
on
(
'
pending
'
)
try
{
this
.
browser
=
await
this
.
initBrowser
()
log
.
verbose
(
'
PuppetWebBridge
'
,
'
init() initBrowser() done
'
)
this
.
page
=
await
this
.
initPage
(
this
.
browser
)
log
.
verbose
(
'
PuppetWebBridge
'
,
'
init() initPage() done
'
)
this
.
state
.
on
(
true
)
log
.
verbose
(
'
PuppetWebBridge
'
,
'
init() initPage() done
'
)
}
catch
(
e
)
{
this
.
state
.
off
(
true
)
log
.
error
(
'
PuppetWebBridge
'
,
'
init() exception: %s
'
,
e
)
throw
e
}
...
...
@@ -124,11 +130,23 @@ export class Bridge extends EventEmitter {
const
onLoad
=
async
()
=>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
initPage() on(load) %s
'
,
page
.
url
())
if
(
this
.
state
.
off
())
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
initPage() onLoad() OFF state detected. NOP
'
)
return
}
try
{
await
page
.
exposeFunction
(
'
emit
'
,
this
.
emit
.
bind
(
this
))
}
catch
(
e
)
{
if
(
this
.
state
.
off
())
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
initPage() onLoad() OFF state detected. NOP
'
)
return
}
// exposed function will stay in the browser after reload the page
log
.
verbose
(
'
PuppetWebBridge
'
,
'
initPage() onLoad() page.exposeFunction(emit) exception: %s
'
,
e
)
log
.
verbose
(
'
PuppetWebBridge
'
,
'
initPage() onLoad() page.exposeFunction(emit) already exist
'
)
log
.
silly
(
'
PuppetWebBridge
'
,
'
initPage() onLoad() page.exposeFunction(emit) exception: %s
'
,
e
)
}
try
{
...
...
@@ -143,6 +161,11 @@ export class Bridge extends EventEmitter {
}
}
catch
(
e
)
{
if
(
this
.
state
.
off
())
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
initPage() onLoad() OFF state detected. NOP
'
)
return
}
log
.
error
(
'
PuppetWebBridge
'
,
'
init() initPage() onLoad() exception: %s
'
,
e
)
this
.
emit
(
'
error
'
,
e
)
}
...
...
@@ -239,6 +262,8 @@ export class Bridge extends EventEmitter {
public
async
quit
():
Promise
<
void
>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
quit()
'
)
this
.
state
.
off
(
'
pending
'
)
try
{
await
this
.
page
.
close
()
log
.
silly
(
'
PuppetWebBridge
'
,
'
quit() page.close()-ed
'
)
...
...
@@ -247,6 +272,8 @@ export class Bridge extends EventEmitter {
}
catch
(
e
)
{
log
.
warn
(
'
PuppetWebBridge
'
,
'
quit() exception: %s
'
,
e
)
this
.
emit
(
'
error
'
,
e
)
}
finally
{
this
.
state
.
off
(
true
)
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录