Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.www.
wechaty
提交
93784890
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,发现更多精彩内容 >>
提交
93784890
编写于
10月 27, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code clean
上级
0a67b745
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
28 deletion
+11
-28
bin/doctor.ts
bin/doctor.ts
+2
-1
bin/entrypoint.sh
bin/entrypoint.sh
+1
-17
circle.yml
circle.yml
+1
-1
src/puppet-web/browser.ts
src/puppet-web/browser.ts
+7
-9
未找到文件。
bin/doctor.ts
浏览文件 @
93784890
#!/usr/bin/env ts-node
import
*
as
os
from
'
os
'
import
{
Config
,
Wechaty
}
from
'
../
'
import
*
as
os
from
'
os
'
const
wechaty
=
Wechaty
.
instance
()
...
...
bin/entrypoint.sh
浏览文件 @
93784890
...
...
@@ -4,30 +4,14 @@
#
# https://github.com/wechaty/wechaty
#
# Original Code Credit: https://github.com/cusspvz/node.docker/blob/master/entrypoint
#
set
-e
echo
echo
"Starting Wechaty v
$(
wechaty-version
)
..."
echo
# to identify run env (for tests)
# @deprecated 20161001, use cgroup to test
# export WECHATY_DOCKER='docker'
# set CI here, in order to force ava to output use --verbose param, which is fit docker console log
export
CI
=
"FORCE_AVA_OUTPUT_VERBOSE"
# [ "$WECHATY_HEAD" != "" ] && {
# echo "WECHATY_HEAD=$WECHATY_HEAD"
# }
# if [ "$WECHATY_HEAD" != "phantomjs" ]; then
# export DISPLAY=':99.0'
# Xvfb :99 -ac -screen 0 640x480x8 -nolisten tcp &
# echo "Xvfb started on DISPLAY=$DISPLAY"
# fi
# export CI="FORCE_AVA_OUTPUT_VERBOSE"
if
[
"
$1
"
=
"start"
]
;
then
exec
npm start
...
...
circle.yml
浏览文件 @
93784890
...
...
@@ -6,4 +6,4 @@ test:
override
:
-
docker info
-
docker build -t zixia/wechaty:test .
-
docker run -v /dev/shm:/dev/shm zixia/wechaty:test test
-
docker run -
-rm -
v /dev/shm:/dev/shm zixia/wechaty:test test
src/puppet-web/browser.ts
浏览文件 @
93784890
...
...
@@ -222,7 +222,7 @@ export class Browser extends EventEmitter {
public
getBrowserPids
():
Promise
<
string
[]
>
{
log
.
silly
(
'
PuppetWebBrowser
'
,
'
getBrowserPids()
'
)
const
head
=
this
.
setting
.
head
as
string
const
head
=
this
.
setting
.
head
return
new
Promise
((
resolve
,
reject
)
=>
{
require
(
'
ps-tree
'
)(
process
.
pid
,
(
err
,
children
)
=>
{
...
...
@@ -232,21 +232,19 @@ export class Browser extends EventEmitter {
}
let
browserRe
switch
(
true
)
{
case
!
head
:
// no head default to phantomjs
case
/phantomjs/i
.
test
(
head
):
case
/phantom/i
.
test
(
head
):
switch
(
head
)
{
case
'
phantomjs
'
:
browserRe
=
'
phantomjs
'
break
case
!!
(
head
):
// head default to chrome
case
/chrome/i
.
test
(
head
):
case
'
chrome
'
:
browserRe
=
'
chrome(?!driver)|chromium
'
break
default
:
log
.
warn
(
'
PuppetWebBrowser
'
,
'
getBrowserPids() for unsupported head: %s
'
,
head
)
browserRe
=
head
const
e
=
new
Error
(
'
unsupported head:
'
+
head
)
log
.
warn
(
'
PuppetWebBrowser
'
,
'
getBrowserPids() for %s
'
,
e
.
message
)
throw
e
}
let
matchRegex
=
new
RegExp
(
browserRe
,
'
i
'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录