Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.Veneno.
wechaty
提交
6b430e5d
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,发现更多精彩内容 >>
提交
6b430e5d
编写于
6月 10, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
replace npmlog to use env, fix phantomjs setCookie warning for ALL_CAP_NAMES
上级
14935d42
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
42 addition
and
37 deletion
+42
-37
src/contact.js
src/contact.js
+1
-1
src/message-image.js
src/message-image.js
+1
-0
src/message.js
src/message.js
+2
-1
src/puppet-web-bridge.js
src/puppet-web-bridge.js
+2
-1
src/puppet-web-browser.js
src/puppet-web-browser.js
+3
-3
src/puppet-web-server.js
src/puppet-web-server.js
+2
-1
src/puppet-web.js
src/puppet-web.js
+14
-11
src/puppet.js
src/puppet.js
+1
-1
src/room.js
src/room.js
+1
-1
src/ssl-pem.js
src/ssl-pem.js
+3
-3
test/contact-spec.js
test/contact-spec.js
+2
-2
test/message-spec.js
test/message-spec.js
+2
-2
test/puppet-web-bridge-spec.js
test/puppet-web-bridge-spec.js
+1
-2
test/puppet-web-browser-spec.js
test/puppet-web-browser-spec.js
+1
-0
test/puppet-web-server-spec.js
test/puppet-web-server-spec.js
+2
-2
test/room-spec.js
test/room-spec.js
+1
-3
test/webdriver-spec.js
test/webdriver-spec.js
+2
-3
test/wechaty-spec.js
test/wechaty-spec.js
+1
-0
未找到文件。
src/contact.js
浏览文件 @
6b430e5d
...
...
@@ -6,7 +6,7 @@
* https://github.com/zixia/wechaty
*
*/
const
log
=
require
(
'
npmlog
'
)
const
log
=
require
(
'
./npmlog-env
'
)
class
Contact
{
constructor
(
id
)
{
...
...
src/message-image.js
浏览文件 @
6b430e5d
...
...
@@ -6,6 +6,7 @@
* https://github.com/zixia/wechaty
*
*/
const
log
=
require
(
'
./npmlog-env
'
)
const
Message
=
require
(
'
./message
'
)
...
...
src/message.js
浏览文件 @
6b430e5d
...
...
@@ -9,7 +9,8 @@
const
Contact
=
require
(
'
./contact
'
)
const
Room
=
require
(
'
./room
'
)
const
log
=
require
(
'
npmlog
'
)
const
log
=
require
(
'
./npmlog-env
'
)
class
Message
{
constructor
(
rawObj
)
{
...
...
src/puppet-web-bridge.js
浏览文件 @
6b430e5d
...
...
@@ -10,7 +10,8 @@
*
*/
const
retryPromise
=
require
(
'
retry-promise
'
).
default
const
log
=
require
(
'
npmlog
'
)
const
log
=
require
(
'
./npmlog-env
'
)
class
Bridge
{
constructor
(
options
)
{
...
...
src/puppet-web-browser.js
浏览文件 @
6b430e5d
...
...
@@ -11,9 +11,10 @@
const
fs
=
require
(
'
fs
'
)
const
path
=
require
(
'
path
'
)
const
WebDriver
=
require
(
'
selenium-webdriver
'
)
const
log
=
require
(
'
npmlog
'
)
const
retryPromise
=
require
(
'
retry-promise
'
).
default
// https://github.com/olalonde/retry-promise
const
log
=
require
(
'
./npmlog-env
'
)
class
Browser
{
constructor
(
options
)
{
log
.
verbose
(
'
Browser
'
,
'
constructor()
'
)
...
...
@@ -190,8 +191,7 @@ class Browser {
return
this
.
driver
.
manage
()
.
addCookie
(
cookie
.
name
,
cookie
.
value
,
cookie
.
path
,
cookie
.
domain
,
cookie
.
secure
,
cookie
.
expiry
)
,
cookie
.
domain
,
cookie
.
secure
,
cookie
.
expiry
)
}
}
...
...
src/puppet-web-server.js
浏览文件 @
6b430e5d
...
...
@@ -14,7 +14,8 @@ const io = require('socket.io')
const
path
=
require
(
'
path
'
)
const
https
=
require
(
'
https
'
)
const
bodyParser
=
require
(
'
body-parser
'
)
const
log
=
require
(
'
npmlog
'
)
const
log
=
require
(
'
./npmlog-env
'
)
const
Express
=
require
(
'
express
'
)
const
EventEmitter
=
require
(
'
events
'
)
...
...
src/puppet-web.js
浏览文件 @
6b430e5d
...
...
@@ -189,7 +189,7 @@ class PuppetWeb extends Puppet {
log
.
verbose
(
'
PuppetWeb
'
,
`user
${
this
.
user
.
name
()}
logined`
)
this
.
emit
(
'
login
'
,
this
.
user
)
yield
this
.
saveSession
()
yield
this
.
saveSession
()
.
catch
(()
=>
{
/* fall safe */
})
}).
catch
(
e
=>
log
.
error
(
'
PuppetWeb
'
,
'
onServerLogin co rejected: %s
'
,
e
))
}
...
...
@@ -213,9 +213,6 @@ class PuppetWeb extends Puppet {
* after received `unload`, we re-inject the Wechaty js code into browser.
*/
onServerUnload
(
data
)
{
//XXX
return
log
.
verbose
(
'
PuppetWeb
'
,
'
server received unload event
'
)
this
.
onServerLogout
(
data
)
// XXX: should emit event[logout] from browser
...
...
@@ -282,7 +279,7 @@ class PuppetWeb extends Puppet {
log
.
verbose
(
'
PuppetWeb
'
,
`checkSession(
${
this
.
session
}
)`
)
return
this
.
browser
.
driver
.
manage
().
getCookies
()
.
then
(
cookies
=>
{
log
.
silly
(
'
PuppetWeb
'
,
'
checkSession %s
'
,
require
(
'
util
'
).
inspect
(
cookies
.
map
(
c
=>
{
return
{
name
:
c
.
name
,
value
:
c
.
value
}
})
))
log
.
silly
(
'
PuppetWeb
'
,
'
checkSession %s
'
,
require
(
'
util
'
).
inspect
(
cookies
/*.map(c => { return {name: c.name, value: c.value, expiresType: typeof c.expires, expires: c.expires} })*/
))
return
cookies
})
}
...
...
@@ -294,13 +291,19 @@ class PuppetWeb extends Puppet {
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
browser
.
driver
.
manage
().
getCookies
()
.
then
(
cookies
=>
{
const
skipNames
=
[
'
ChromeDriver
'
,
'
MM_WX_SOUND_STATE
'
,
'
MM_WX_NOTIFY_STATE
'
]
const
skipNamesRegex
=
new
RegExp
(
skipNames
.
join
(
'
|
'
),
'
i
'
)
const
filteredCookies
=
cookies
.
filter
(
c
=>
{
if
(
/ChromeDriver/i
.
test
(
c
.
name
))
{
return
false
}
if
(
skipNamesRegex
.
test
(
c
.
name
))
{
return
false
}
// else if (!/wx\.qq\.com/i.test(c.domain)) { return false }
else
{
return
true
}
})
log
.
silly
(
'
PuppetWeb
'
,
'
saving %d cookies for session: %s
'
,
cookies
.
length
,
util
.
inspect
(
filteredCookies
.
map
(
c
=>
c
.
name
))
)
,
util
.
inspect
(
filteredCookies
/*.map(c => { return {name: c.name, value: c.value, expiresType: typeof c.expires, expires: c.expires} })*/
))
const
jsonStr
=
JSON
.
stringify
(
filteredCookies
)
fs
.
writeFile
(
filename
,
jsonStr
,
function
(
err
)
{
...
...
@@ -326,13 +329,13 @@ class PuppetWeb extends Puppet {
return
reject
(
'
error code:
'
+
err
.
code
)
}
const
cookies
=
JSON
.
parse
(
jsonStr
)
log
.
verbose
(
'
PuppetWeb
'
,
'
loading %d cookies for session
'
,
cookies
.
length
)
log
.
info
(
'
PuppetWeb
'
,
'
loading %d cookies for session %s
'
,
cookies
.
length
,
this
.
session
)
const
ps
=
this
.
browser
.
addCookies
(
cookies
)
return
Promise
.
all
(
ps
)
.
then
(()
=>
resolve
(
cookies
))
.
catch
(
e
=>
{
log
.
error
(
'
PuppetWeb
'
,
'
loadSession
2
rejected: %s
'
,
e
)
log
.
error
(
'
PuppetWeb
'
,
'
loadSession rejected: %s
'
,
e
)
reject
(
e
)
})
})
...
...
src/puppet.js
浏览文件 @
6b430e5d
...
...
@@ -11,7 +11,7 @@
*/
const
EventEmitter
=
require
(
'
events
'
)
const
log
=
require
(
'
npmlog
'
)
const
log
=
require
(
'
./npmlog-env
'
)
class
Puppet
extends
EventEmitter
{
constructor
()
{
...
...
src/room.js
浏览文件 @
6b430e5d
...
...
@@ -6,7 +6,7 @@
* https://github.com/zixia/wechaty
*
*/
const
log
=
require
(
'
npmlog
'
)
const
log
=
require
(
'
./npmlog-env
'
)
const
Contact
=
require
(
'
./contact
'
)
class
Room
{
...
...
src/ssl-pem.js
浏览文件 @
6b430e5d
test/contact-spec.js
浏览文件 @
6b430e5d
const
test
=
require
(
'
tap
'
).
test
const
Contact
=
require
(
'
../src/contact
'
)
const
Puppet
=
require
(
'
../src/puppet
'
)
const
log
=
require
(
'
npmlog
'
)
// log.level = 'verbose'
const
log
=
require
(
'
./npmlog-env
'
)
Contact
.
attach
(
new
Puppet
())
...
...
test/message-spec.js
浏览文件 @
6b430e5d
...
...
@@ -2,8 +2,8 @@ const test = require('tap').test
const
Message
=
require
(
'
../src/message
'
)
const
Contact
=
require
(
'
../src/contact
'
)
const
Puppet
=
require
(
'
../src/puppet
'
)
const
log
=
require
(
'
npmlog
'
)
// log.level = 'verbose'
const
log
=
require
(
'
./npmlog-env
'
)
Contact
.
attach
(
new
Puppet
())
...
...
test/puppet-web-bridge-spec.js
浏览文件 @
6b430e5d
...
...
@@ -5,8 +5,7 @@ const Browser = require('../src/puppet-web-browser')
const
Bridge
=
require
(
'
../src/puppet-web-bridge
'
)
const
PORT
=
58788
const
log
=
require
(
'
npmlog
'
)
// log.level = 'silly'
const
log
=
require
(
'
./npmlog-env
'
)
test
(
'
Bridge retry-promise testing
'
,
function
(
t
)
{
co
(
function
*
()
{
...
...
test/puppet-web-browser-spec.js
浏览文件 @
6b430e5d
const
co
=
require
(
'
co
'
)
const
test
=
require
(
'
tap
'
).
test
const
log
=
require
(
'
../src/npmlog-env
'
)
const
Browser
=
require
(
'
../src/puppet-web-browser
'
)
...
...
test/puppet-web-server-spec.js
浏览文件 @
6b430e5d
const
https
=
require
(
'
https
'
)
const
test
=
require
(
'
tap
'
).
test
const
co
=
require
(
'
co
'
)
const
log
=
require
(
'
npmlog
'
)
//log.level = 'silly'
const
log
=
require
(
'
./npmlog-env
'
)
const
PuppetWebServer
=
require
(
'
../src/puppet-web-server
'
)
const
PORT
=
58788
...
...
test/room-spec.js
浏览文件 @
6b430e5d
...
...
@@ -2,9 +2,7 @@ const test = require('tap').test
const
Message
=
require
(
'
../src/message
'
)
const
Room
=
require
(
'
../src/room
'
)
const
Puppet
=
require
(
'
../src/puppet
'
)
const
log
=
require
(
'
npmlog
'
)
//log.level = 'silly'
//log.enableColor()
const
log
=
require
(
'
../src/npmlog-env
'
)
Room
.
attach
(
new
Puppet
())
...
...
test/webdriver-spec.js
浏览文件 @
6b430e5d
...
...
@@ -3,9 +3,8 @@
const
path
=
require
(
'
path
'
)
const
co
=
require
(
'
co
'
)
const
test
=
require
(
'
tap
'
).
test
const
log
=
require
(
'
npmlog
'
)
// log.level = 'verbose'
log
.
level
=
'
silly
'
const
log
=
require
(
'
../src/npmlog-env
'
)
const
WebDriver
=
require
(
'
selenium-webdriver
'
)
const
Browser
=
WebDriver
.
Browser
...
...
test/wechaty-spec.js
浏览文件 @
6b430e5d
const
test
=
require
(
'
tap
'
).
test
const
log
=
require
(
'
./npmlog-env
'
)
test
(
'
Wechaty Library
'
,
function
(
t
)
{
const
Wechaty
=
require
(
'
../
'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录