Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.Veneno.
wechaty
提交
99d37f61
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,发现更多精彩内容 >>
提交
99d37f61
编写于
6月 10, 2018
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
check token before start
上级
21e11cf6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
7 deletion
+33
-7
src/puppet-padchat/config.ts
src/puppet-padchat/config.ts
+24
-1
src/puppet-padchat/padchat-rpc.ts
src/puppet-padchat/padchat-rpc.ts
+6
-3
src/puppet-padchat/puppet-padchat.ts
src/puppet-padchat/puppet-padchat.ts
+3
-3
未找到文件。
src/puppet-padchat/config.ts
浏览文件 @
99d37f61
import
{
log
,
}
from
'
brolog
'
export
const
WECHATY_PUPPET_PADCHAT_ENDPOINT
=
process
.
env
[
'
WECHATY_PUPPET_PADCHAT_ENDPOINT
'
]
||
'
ws://54.223.36.77:9091/wx
'
export
const
WECHATY_PUPPET_PADCHAT_ENDPOINT
=
process
.
env
[
'
WECHATY_PUPPET_PADCHAT_ENDPOINT
'
]
||
'
ws://54.223.36.77:9091/wx
'
export
const
WECHATY_PUPPET_PADCHAT_TOKEN
=
process
.
env
[
'
WECHATY_PUPPET_PADCHAT_TOKEN
'
]
||
'
padchattest
'
const
WECHATY_PUPPET_PADCHAT_TOKEN
=
process
.
env
[
'
WECHATY_PUPPET_PADCHAT_TOKEN
'
]
as
string
if
(
!
WECHATY_PUPPET_PADCHAT_TOKEN
)
{
log
.
error
(
'
PuppetPadchatConfig
'
,
`
WECHATY_PUPPET_PADCHAT_TOKEN environment variable not found.
PuppetPadchat need a token before it can be used,
Please set WECHATY_PUPPET_PADCHAT_TOKEN then retry again.
Learn more about it at: https://github.com/Chatie/wechaty/issues/1296
`
)
process
.
exit
(
1
)
}
export
{
WECHATY_PUPPET_PADCHAT_TOKEN
,
}
src/puppet-padchat/padchat-rpc.ts
浏览文件 @
99d37f61
...
@@ -311,7 +311,7 @@ export class PadchatRpc extends EventEmitter {
...
@@ -311,7 +311,7 @@ export class PadchatRpc extends EventEmitter {
/**
/**
* Init with WebSocket Server
* Init with WebSocket Server
*/
*/
p
ublic
async
init
():
Promise
<
InitType
>
{
p
rotected
async
init
():
Promise
<
InitType
>
{
const
result
:
InitType
=
await
this
.
rpcCall
(
'
init
'
)
const
result
:
InitType
=
await
this
.
rpcCall
(
'
init
'
)
log
.
silly
(
'
PadchatRpc
'
,
'
init result: %s
'
,
JSON
.
stringify
(
result
))
log
.
silly
(
'
PadchatRpc
'
,
'
init result: %s
'
,
JSON
.
stringify
(
result
))
if
(
!
result
||
result
.
status
!==
0
)
{
if
(
!
result
||
result
.
status
!==
0
)
{
...
@@ -323,7 +323,7 @@ export class PadchatRpc extends EventEmitter {
...
@@ -323,7 +323,7 @@ export class PadchatRpc extends EventEmitter {
/**
/**
* Get WX block memory
* Get WX block memory
*/
*/
p
ublic
async
WXInitialize
():
Promise
<
WXInitializeType
>
{
p
rotected
async
WXInitialize
():
Promise
<
WXInitializeType
>
{
log
.
verbose
(
'
PadchatRpc
'
,
'
WXInitialize()
'
)
log
.
verbose
(
'
PadchatRpc
'
,
'
WXInitialize()
'
)
const
result
=
await
this
.
rpcCall
(
'
WXInitialize
'
)
const
result
=
await
this
.
rpcCall
(
'
WXInitialize
'
)
...
@@ -335,7 +335,7 @@ export class PadchatRpc extends EventEmitter {
...
@@ -335,7 +335,7 @@ export class PadchatRpc extends EventEmitter {
return
result
return
result
}
}
p
ublic
async
WXGetQRCode
():
Promise
<
WXGetQRCodeType
>
{
p
rotected
async
WXGetQRCode
():
Promise
<
WXGetQRCodeType
>
{
const
result
=
await
this
.
rpcCall
(
'
WXGetQRCode
'
)
const
result
=
await
this
.
rpcCall
(
'
WXGetQRCode
'
)
// if (!result || !(result.qr_code)) {
// if (!result || !(result.qr_code)) {
// result = await this.WXGetQRCodeTwice()
// result = await this.WXGetQRCodeTwice()
...
@@ -386,6 +386,9 @@ export class PadchatRpc extends EventEmitter {
...
@@ -386,6 +386,9 @@ export class PadchatRpc extends EventEmitter {
/**
/**
* Generate 62 data
* Generate 62 data
*
* 1. Call multiple times in the same session, will return the same data
* 2. Call multiple times between sessions with the same token, will return the same data
*/
*/
public
async
WXGenerateWxDat
():
Promise
<
string
>
{
public
async
WXGenerateWxDat
():
Promise
<
string
>
{
const
result
:
WXGenerateWxDatType
=
await
this
.
rpcCall
(
'
WXGenerateWxDat
'
)
const
result
:
WXGenerateWxDatType
=
await
this
.
rpcCall
(
'
WXGenerateWxDat
'
)
...
...
src/puppet-padchat/puppet-padchat.ts
浏览文件 @
99d37f61
...
@@ -101,7 +101,7 @@ export class PuppetPadchat extends Puppet {
...
@@ -101,7 +101,7 @@ export class PuppetPadchat extends Puppet {
max
:
1000
,
max
:
1000
,
// length: function (n) { return n * 2},
// length: function (n) { return n * 2},
dispose
:
function
(
key
:
string
,
val
:
any
)
{
dispose
:
function
(
key
:
string
,
val
:
any
)
{
log
.
silly
(
'
Puppet
'
,
'
constructor() lruOptions.dispose(%s, %s)
'
,
key
,
JSON
.
stringify
(
val
))
log
.
silly
(
'
Puppet
Padchat
'
,
'
constructor() lruOptions.dispose(%s, %s)
'
,
key
,
JSON
.
stringify
(
val
))
},
},
maxAge
:
1000
*
60
*
60
,
maxAge
:
1000
*
60
*
60
,
}
}
...
@@ -113,8 +113,8 @@ export class PuppetPadchat extends Puppet {
...
@@ -113,8 +113,8 @@ export class PuppetPadchat extends Puppet {
this
.
bridge
=
new
Bridge
({
this
.
bridge
=
new
Bridge
({
memory
:
this
.
options
.
memory
,
memory
:
this
.
options
.
memory
,
token
:
WECHATY_PUPPET_PADCHAT_TOKEN
,
token
:
WECHATY_PUPPET_PADCHAT_TOKEN
,
endpoint
:
WECHATY_PUPPET_PADCHAT_ENDPOINT
,
endpoint
:
WECHATY_PUPPET_PADCHAT_ENDPOINT
,
})
})
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录