Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.www.
wechaty
提交
a1832963
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,发现更多精彩内容 >>
提交
a1832963
编写于
10月 27, 2017
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix the block message detected code
上级
6bd62d0e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
74 addition
and
7 deletion
+74
-7
src/puppet-web/bridge.spec.ts
src/puppet-web/bridge.spec.ts
+41
-0
src/puppet-web/bridge.ts
src/puppet-web/bridge.ts
+33
-7
未找到文件。
src/puppet-web/bridge.spec.ts
浏览文件 @
a1832963
...
...
@@ -43,7 +43,40 @@ test('PuppetWebBridge', async t => {
}
})
test
(
'
preHtmlToXml()
'
,
async
t
=>
{
const
BLOCKED_HTML_ZH
=
[
'
<pre style="word-wrap: break-word; white-space: pre-wrap;">
'
,
'
<error>
'
,
'
<ret>1203</ret>
'
,
'
<message>当前登录环境异常。为了你的帐号安全,暂时不能登录web微信。你可以通过Windows微信、Mac微信或者手机客户端微信登录。</message>
'
,
'
</error>
'
,
'
</pre>
'
,
].
join
(
''
)
const
BLOCKED_XML_ZH
=
[
'
<error>
'
,
'
<ret>1203</ret>
'
,
'
<message>当前登录环境异常。为了你的帐号安全,暂时不能登录web微信。你可以通过Windows微信、Mac微信或者手机客户端微信登录。</message>
'
,
'
</error>
'
,
].
join
(
''
)
const
profile
=
new
Profile
()
const
bridge
=
new
Bridge
({
profile
})
const
xml
=
bridge
.
preHtmlToXml
(
BLOCKED_HTML_ZH
)
t
.
equal
(
xml
,
BLOCKED_XML_ZH
,
'
should parse html to xml
'
)
})
test
(
'
testBlockedMessage()
'
,
async
t
=>
{
const
BLOCKED_HTML_ZH
=
[
'
<pre style="word-wrap: break-word; white-space: pre-wrap;">
'
,
'
<error>
'
,
'
<ret>1203</ret>
'
,
'
<message>当前登录环境异常。为了你的帐号安全,暂时不能登录web微信。你可以通过手机客户端或者windows微信登录。</message>
'
,
'
</error>
'
,
'
</pre>
'
,
].
join
(
''
)
const
BLOCKED_XML_ZH
=
`
<error>
<ret>1203</ret>
...
...
@@ -74,6 +107,14 @@ test('testBlockedMessage()', async t => {
t
.
equal
(
msg
,
false
,
'
should return false when no block message
'
)
})
test
(
'
html
'
,
async
t
=>
{
const
profile
=
new
Profile
()
const
bridge
=
new
Bridge
({
profile
})
const
msg
=
await
bridge
.
testBlockedMessage
(
BLOCKED_HTML_ZH
)
t
.
equal
(
msg
,
BLOCKED_TEXT_ZH
,
'
should get zh blocked message
'
)
})
test
(
'
zh
'
,
async
t
=>
{
const
profile
=
new
Profile
()
const
bridge
=
new
Bridge
({
profile
})
...
...
src/puppet-web/bridge.ts
浏览文件 @
a1832963
...
...
@@ -36,7 +36,7 @@ const retryPromise = require('retry-promise').default
import
{
log
}
from
'
../config
'
import
Profile
from
'
../profile
'
import
Misc
from
'
../misc
'
import
{
MediaData
,
MsgRawObj
,
...
...
@@ -81,8 +81,21 @@ export class Bridge extends EventEmitter {
this
.
state
.
on
(
true
)
log
.
verbose
(
'
PuppetWebBridge
'
,
'
init() initPage() done
'
)
}
catch
(
e
)
{
this
.
state
.
off
(
true
)
log
.
error
(
'
PuppetWebBridge
'
,
'
init() exception: %s
'
,
e
)
this
.
state
.
off
(
true
)
try
{
if
(
this
.
page
)
{
await
this
.
page
.
close
()
}
if
(
this
.
browser
)
{
await
this
.
browser
.
close
()
}
}
catch
(
e2
)
{
log
.
error
(
'
PuppetWebBridge
'
,
'
init() exception %s, close page/browser exception %s
'
,
e
,
e2
)
}
this
.
emit
(
'
error
'
,
e
)
throw
e
}
}
...
...
@@ -123,7 +136,6 @@ export class Bridge extends EventEmitter {
}
catch
(
e
)
{
log
.
error
(
'
PuppetWebBridge
'
,
'
init() dialog.dismiss() reject: %s
'
,
e
)
}
this
.
emit
(
'
error
'
,
new
Error
(
`
${
dialog
.
type
}
(
${
dialog
.
message
()}
)`
))
}
...
...
@@ -151,7 +163,6 @@ export class Bridge extends EventEmitter {
return
resolve
()
}
catch
(
e
)
{
log
.
error
(
'
PuppetWebBridge
'
,
'
init() initPage() onLoad() exception: %s
'
,
e
)
this
.
emit
(
'
error
'
,
e
)
return
reject
(
e
)
}
}
...
...
@@ -185,6 +196,8 @@ export class Bridge extends EventEmitter {
const
TIMEOUT
=
10
*
1000
await
new
Promise
<
void
>
(
async
(
resolve
,
reject
)
=>
{
const
timer
=
setTimeout
(
async
()
=>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
readyAngular() timeout
'
)
const
text
=
await
this
.
evaluate
(()
=>
{
return
document
.
body
.
innerHTML
})
as
any
as
string
// BUG of Puppet Type Definition
...
...
@@ -192,9 +205,7 @@ export class Bridge extends EventEmitter {
const
blockedMessage
=
await
this
.
testBlockedMessage
(
text
)
if
(
blockedMessage
)
{
// Wechat Account Blocked
log
.
error
(
'
PuppetWeb
'
,
'
initBridge() Wechat Account Blocked for using Web: %s
'
,
blockedMessage
)
const
err
=
new
Error
(
blockedMessage
)
this
.
emit
(
'
error
'
,
err
)
return
reject
(
err
)
}
...
...
@@ -657,6 +668,17 @@ export class Bridge extends EventEmitter {
}
}
public
preHtmlToXml
(
text
:
string
):
string
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
preHtmlToXml()
'
)
const
preRegex
=
/^<pre
[^
>
]
*>
([^
<
]
+
)
<
\/
pre>$/i
const
matches
=
text
.
match
(
preRegex
)
if
(
!
matches
)
{
return
text
}
return
Misc
.
unescapeHtml
(
matches
[
1
])
}
/**
* Throw if there's a blocked message
*/
...
...
@@ -665,6 +687,9 @@ export class Bridge extends EventEmitter {
log
.
verbose
(
'
PuppetWebBridge
'
,
'
testBlockedMessage(%s)
'
,
textSnip
)
// see unit test for detail
text
=
this
.
preHtmlToXml
(
text
)
interface
BlockedMessage
{
error
?:
{
ret
:
number
,
...
...
@@ -688,6 +713,8 @@ export class Bridge extends EventEmitter {
const
ret
=
+
obj
.
error
.
ret
const
message
=
obj
.
error
.
message
log
.
warn
(
'
PuppetWebBridge
'
,
'
testBlockedMessage() error.ret=%s
'
,
ret
)
if
(
ret
===
1203
)
{
// <error>
// <ret>1203</ret>
...
...
@@ -695,7 +722,6 @@ export class Bridge extends EventEmitter {
// </error>
return
resolve
(
message
)
}
log
.
warn
(
'
PuppetWebBridge
'
,
'
testBlockedMessage() code: %s type: %s
'
,
ret
,
typeof
ret
)
return
resolve
(
message
)
// other error message
})
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录