Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
koishi-plugin-adapter-wecom
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
3rdeye
koishi-plugin-adapter-wecom
Commits
441dbc7f
Commit
441dbc7f
authored
Dec 24, 2022
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bump and fix selfId conflict
parent
32317064
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
51 additions
and
51 deletions
+51
-51
package-lock.json
package-lock.json
+43
-43
package.json
package.json
+1
-1
src/index.ts
src/index.ts
+5
-5
src/message.ts
src/message.ts
+1
-1
src/utils.ts
src/utils.ts
+1
-1
No files found.
package-lock.json
View file @
441dbc7f
...
...
@@ -39,7 +39,7 @@
"ws"
:
"^8.11.0"
},
"peerDependencies"
:
{
"koishi"
:
"^4.10.
6
"
,
"koishi"
:
"^4.10.
10
"
,
"koishi-plugin-cache-aragami"
:
"^2.5.0"
}
},
...
...
@@ -1096,14 +1096,14 @@
}
},
"node_modules/@koishijs/core"
:
{
"version"
:
"4.10.
6
"
,
"resolved"
:
"https://registry.npmjs.org/@koishijs/core/-/core-4.10.
6
.tgz"
,
"integrity"
:
"sha512-
5rOr40u41SZzCvQObqGf2DANakFWWRvDditZG+0Z1/zczX6o+UJy9TXZUHEpTMfvMMEG7+DNECPZz8F6X8drLw
=="
,
"version"
:
"4.10.
10
"
,
"resolved"
:
"https://registry.npmjs.org/@koishijs/core/-/core-4.10.
10
.tgz"
,
"integrity"
:
"sha512-
LooBZCQSm91TL7aBBECjaFaROn+udCAavOwi+AWzbFPBfcuF4ZHFGpQ112yWK70xbQ7YhHUueueqJpkAGOy4RA
=="
,
"peer"
:
true
,
"dependencies"
:
{
"@koishijs/utils"
:
"^6.3.4"
,
"@minatojs/core"
:
"^2.0.3"
,
"@satorijs/core"
:
"^1.4.1
0
"
,
"@satorijs/core"
:
"^1.4.1
1
"
,
"cordis"
:
"^2.6.0"
,
"cosmokit"
:
"^1.3.6"
,
"fastest-levenshtein"
:
"^1.0.16"
...
...
@@ -1186,12 +1186,12 @@
}
},
"node_modules/@satorijs/core"
:
{
"version"
:
"1.4.1
0
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/core/-/core-1.4.1
0
.tgz"
,
"integrity"
:
"sha512-
eTHYuoW6KAh6Fko874b9/50hq+CGD2FMFTT2K2htNdMFhKdGYkum3vpqmudPlThCefH4608rR5jU1vsebsKTrQ
=="
,
"version"
:
"1.4.1
1
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/core/-/core-1.4.1
1
.tgz"
,
"integrity"
:
"sha512-
8EsVA5esShEqYMwwXipGwx7obwVb3Lc0NwBmjZWNj2++WYKYg+jQ0Iatgd2jcJhNX2H9ziqnwu05aHtWo+mSsA
=="
,
"peer"
:
true
,
"dependencies"
:
{
"@satorijs/element"
:
"^2.2.
1
"
,
"@satorijs/element"
:
"^2.2.
2
"
,
"cordis"
:
"^2.6.0"
,
"cordis-axios"
:
"^2.1.6"
,
"cosmokit"
:
"^1.3.6"
,
...
...
@@ -1201,29 +1201,29 @@
}
},
"node_modules/@satorijs/element"
:
{
"version"
:
"2.2.
1
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/element/-/element-2.2.
1
.tgz"
,
"integrity"
:
"sha512-
4oINBNinlxUQL+lsGKkGYgITNSGRfDeUUmE2lzHYbg/WSVg2eK11pNHtwGbud0KxnmNG687NxyF9czgd7t/4hg
=="
,
"version"
:
"2.2.
2
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/element/-/element-2.2.
2
.tgz"
,
"integrity"
:
"sha512-
t6K0weO+GwqHhP/C9GTchck0jDk8c63kiAr9hHEVQX3nx/+fjGquTDGzBc4WzOVc105wePWRvV1UtvRaa0I9FQ
=="
,
"peer"
:
true
,
"dependencies"
:
{
"cosmokit"
:
"^1.3.6"
}
},
"node_modules/@satorijs/satori"
:
{
"version"
:
"1.4.1
0
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.1
0
.tgz"
,
"integrity"
:
"sha512-
6rT02tmMyv/Tw0o9xaCH+uW8c947LcvLI2pDD/RG01X+hyh8OfGbeAK59GtKcIY9lnA3Rma7jCIB7dkMjPpt0
w=="
,
"version"
:
"1.4.1
1
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.1
1
.tgz"
,
"integrity"
:
"sha512-
nQHch/Ya1ClsNO9anJYfNnpiMFHCc1ihxdWuVKKpGOXRxuGMOtnbkB/Qa+NuBT+887E2NsFfTBoFgt8vuExxe
w=="
,
"peer"
:
true
,
"dependencies"
:
{
"@koa/router"
:
"^10.1.1"
,
"@satorijs/core"
:
"1.4.1
0
"
,
"@satorijs/core"
:
"1.4.1
1
"
,
"@types/koa"
:
"*"
,
"@types/koa__router"
:
"*"
,
"@types/ws"
:
"^8.5.3"
,
"agent-base"
:
"^6.0.2"
,
"http-proxy-agent"
:
"^5.0.0"
,
"https-proxy-agent"
:
"^5.0.1"
,
"koa"
:
"^2.1
3.4
"
,
"koa"
:
"^2.1
4.1
"
,
"koa-bodyparser"
:
"^4.3.0"
,
"parseurl"
:
"^1.3.3"
,
"path-to-regexp"
:
"^6.2.1"
,
...
...
@@ -5794,14 +5794,14 @@
}
},
"node_modules/koishi"
:
{
"version"
:
"4.10.
6
"
,
"resolved"
:
"https://registry.npmjs.org/koishi/-/koishi-4.10.
6
.tgz"
,
"integrity"
:
"sha512-
s/VDoMKihMsjodSU9Vhs1Kkk3psQ6/sNx7MNuxAFo5KsXIJOgAQnJ+5TZxiqyGgxNT7NVNB4RHdQVDkYydbG1
Q=="
,
"version"
:
"4.10.
10
"
,
"resolved"
:
"https://registry.npmjs.org/koishi/-/koishi-4.10.
10
.tgz"
,
"integrity"
:
"sha512-
92VxR/7AL8l2eyd0MOWi5Nc/nLe2lX9ftglsMkqHvvImFkQma+2kSuexuxVLjcDmkAL6LWI27VxyuUH35jl5P
Q=="
,
"peer"
:
true
,
"dependencies"
:
{
"@koishijs/core"
:
"^4.10.
6
"
,
"@koishijs/core"
:
"^4.10.
10
"
,
"@koishijs/utils"
:
"^6.3.4"
,
"@satorijs/satori"
:
"^1.4.1
0
"
,
"@satorijs/satori"
:
"^1.4.1
1
"
,
"file-type"
:
"^16.5.4"
,
"ns-require"
:
"^1.1.4"
},
...
...
@@ -8984,14 +8984,14 @@
}
},
"@koishijs/core"
:
{
"version"
:
"4.10.
6
"
,
"resolved"
:
"https://registry.npmjs.org/@koishijs/core/-/core-4.10.
6
.tgz"
,
"integrity"
:
"sha512-
5rOr40u41SZzCvQObqGf2DANakFWWRvDditZG+0Z1/zczX6o+UJy9TXZUHEpTMfvMMEG7+DNECPZz8F6X8drLw
=="
,
"version"
:
"4.10.
10
"
,
"resolved"
:
"https://registry.npmjs.org/@koishijs/core/-/core-4.10.
10
.tgz"
,
"integrity"
:
"sha512-
LooBZCQSm91TL7aBBECjaFaROn+udCAavOwi+AWzbFPBfcuF4ZHFGpQ112yWK70xbQ7YhHUueueqJpkAGOy4RA
=="
,
"peer"
:
true
,
"requires"
:
{
"@koishijs/utils"
:
"^6.3.4"
,
"@minatojs/core"
:
"^2.0.3"
,
"@satorijs/core"
:
"^1.4.1
0
"
,
"@satorijs/core"
:
"^1.4.1
1
"
,
"cordis"
:
"^2.6.0"
,
"cosmokit"
:
"^1.3.6"
,
"fastest-levenshtein"
:
"^1.0.16"
...
...
@@ -9060,12 +9060,12 @@
}
},
"@satorijs/core"
:
{
"version"
:
"1.4.1
0
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/core/-/core-1.4.1
0
.tgz"
,
"integrity"
:
"sha512-
eTHYuoW6KAh6Fko874b9/50hq+CGD2FMFTT2K2htNdMFhKdGYkum3vpqmudPlThCefH4608rR5jU1vsebsKTrQ
=="
,
"version"
:
"1.4.1
1
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/core/-/core-1.4.1
1
.tgz"
,
"integrity"
:
"sha512-
8EsVA5esShEqYMwwXipGwx7obwVb3Lc0NwBmjZWNj2++WYKYg+jQ0Iatgd2jcJhNX2H9ziqnwu05aHtWo+mSsA
=="
,
"peer"
:
true
,
"requires"
:
{
"@satorijs/element"
:
"^2.2.
1
"
,
"@satorijs/element"
:
"^2.2.
2
"
,
"cordis"
:
"^2.6.0"
,
"cordis-axios"
:
"^2.1.6"
,
"cosmokit"
:
"^1.3.6"
,
...
...
@@ -9075,29 +9075,29 @@
}
},
"@satorijs/element"
:
{
"version"
:
"2.2.
1
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/element/-/element-2.2.
1
.tgz"
,
"integrity"
:
"sha512-
4oINBNinlxUQL+lsGKkGYgITNSGRfDeUUmE2lzHYbg/WSVg2eK11pNHtwGbud0KxnmNG687NxyF9czgd7t/4hg
=="
,
"version"
:
"2.2.
2
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/element/-/element-2.2.
2
.tgz"
,
"integrity"
:
"sha512-
t6K0weO+GwqHhP/C9GTchck0jDk8c63kiAr9hHEVQX3nx/+fjGquTDGzBc4WzOVc105wePWRvV1UtvRaa0I9FQ
=="
,
"peer"
:
true
,
"requires"
:
{
"cosmokit"
:
"^1.3.6"
}
},
"@satorijs/satori"
:
{
"version"
:
"1.4.1
0
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.1
0
.tgz"
,
"integrity"
:
"sha512-
6rT02tmMyv/Tw0o9xaCH+uW8c947LcvLI2pDD/RG01X+hyh8OfGbeAK59GtKcIY9lnA3Rma7jCIB7dkMjPpt0
w=="
,
"version"
:
"1.4.1
1
"
,
"resolved"
:
"https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.1
1
.tgz"
,
"integrity"
:
"sha512-
nQHch/Ya1ClsNO9anJYfNnpiMFHCc1ihxdWuVKKpGOXRxuGMOtnbkB/Qa+NuBT+887E2NsFfTBoFgt8vuExxe
w=="
,
"peer"
:
true
,
"requires"
:
{
"@koa/router"
:
"^10.1.1"
,
"@satorijs/core"
:
"1.4.1
0
"
,
"@satorijs/core"
:
"1.4.1
1
"
,
"@types/koa"
:
"*"
,
"@types/koa__router"
:
"*"
,
"@types/ws"
:
"^8.5.3"
,
"agent-base"
:
"^6.0.2"
,
"http-proxy-agent"
:
"^5.0.0"
,
"https-proxy-agent"
:
"^5.0.1"
,
"koa"
:
"^2.1
3.4
"
,
"koa"
:
"^2.1
4.1
"
,
"koa-bodyparser"
:
"^4.3.0"
,
"parseurl"
:
"^1.3.3"
,
"path-to-regexp"
:
"^6.2.1"
,
...
...
@@ -12525,14 +12525,14 @@
}
},
"koishi"
:
{
"version"
:
"4.10.
6
"
,
"resolved"
:
"https://registry.npmjs.org/koishi/-/koishi-4.10.
6
.tgz"
,
"integrity"
:
"sha512-
s/VDoMKihMsjodSU9Vhs1Kkk3psQ6/sNx7MNuxAFo5KsXIJOgAQnJ+5TZxiqyGgxNT7NVNB4RHdQVDkYydbG1
Q=="
,
"version"
:
"4.10.
10
"
,
"resolved"
:
"https://registry.npmjs.org/koishi/-/koishi-4.10.
10
.tgz"
,
"integrity"
:
"sha512-
92VxR/7AL8l2eyd0MOWi5Nc/nLe2lX9ftglsMkqHvvImFkQma+2kSuexuxVLjcDmkAL6LWI27VxyuUH35jl5P
Q=="
,
"peer"
:
true
,
"requires"
:
{
"@koishijs/core"
:
"^4.10.
6
"
,
"@koishijs/core"
:
"^4.10.
10
"
,
"@koishijs/utils"
:
"^6.3.4"
,
"@satorijs/satori"
:
"^1.4.1
0
"
,
"@satorijs/satori"
:
"^1.4.1
1
"
,
"file-type"
:
"^16.5.4"
,
"ns-require"
:
"^1.1.4"
}
...
...
package.json
View file @
441dbc7f
...
...
@@ -45,7 +45,7 @@
"testEnvironment"
:
"node"
},
"peerDependencies"
:
{
"koishi"
:
"^4.10.
6
"
,
"koishi"
:
"^4.10.
10
"
,
"koishi-plugin-cache-aragami"
:
"^2.5.0"
},
"devDependencies"
:
{
...
...
src/index.ts
View file @
441dbc7f
...
...
@@ -95,7 +95,7 @@ export class WeComBotConfig {
platform
=
'
wecom
'
;
get
selfId
()
{
return
this
.
agentId
;
return
`
${
this
.
corpId
}
:
${
this
.
agentId
}
`
;
}
}
...
...
@@ -183,7 +183,7 @@ export default class WeComBot extends Bot<Partial<WeComBotConfig>> {
const
tokenObject
=
new
WeComToken
();
tokenObject
.
token
=
data
.
access_token
;
tokenObject
.
agent
Id
=
this
.
selfId
;
tokenObject
.
self
Id
=
this
.
selfId
;
await
this
.
aragami
.
set
(
tokenObject
,
{
ttl
:
data
.
expires_in
*
1000
});
return
data
.
access_token
;
}
catch
(
e
)
{
...
...
@@ -253,14 +253,14 @@ export default class WeComBot extends Bot<Partial<WeComBotConfig>> {
return
;
}
const
agent
=
data
.
agentlist
.
find
(
(
a
)
=>
a
.
agentid
.
toString
()
===
this
.
self
Id
,
(
a
)
=>
a
.
agentid
.
toString
()
===
this
.
config
.
agent
Id
,
);
if
(
!
agent
)
{
// special things
return
{
userId
:
this
.
selfId
};
return
{
userId
:
this
.
config
.
selfId
};
}
const
self
:
Universal
.
User
=
{
userId
:
agent
.
agentid
.
toString
()
,
userId
:
this
.
config
.
selfId
,
username
:
agent
.
name
,
avatar
:
agent
.
square_logo_url
,
};
...
...
src/message.ts
View file @
441dbc7f
...
...
@@ -26,7 +26,7 @@ export class WeComMessenger extends Messenger<WeComBot> {
return
undefined
;
}
const
payload
=
{
agentid
:
this
.
bot
.
self
Id
,
agentid
:
this
.
bot
.
config
.
agent
Id
,
touser
:
this
.
channelId
,
...
messageInfo
,
};
...
...
src/utils.ts
View file @
441dbc7f
...
...
@@ -151,7 +151,7 @@ export function dispatchSession(bot: WeComBot, message: WecomEventResponse) {
export
class
WeComToken
{
@
CacheKey
()
agent
Id
:
string
;
self
Id
:
string
;
token
:
string
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment