Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dbc40b5814 | ||
|
|
0d5696a644 | ||
|
|
ceffa05802 | ||
|
|
d5668920b6 | ||
|
|
516f2da144 | ||
|
|
33c94e1888 | ||
|
|
51ab58cd91 | ||
|
|
aa7798d1d1 | ||
|
|
9067a1fc92 | ||
|
|
4024b6c564 | ||
|
|
d39730928b | ||
|
|
e1f049229c | ||
|
|
8f2676ec19 | ||
|
|
32d26248dc | ||
|
|
16f926401b | ||
|
|
66d60d3599 | ||
|
|
5a35ab6c34 | ||
|
|
ba1542bd31 | ||
|
|
453060945a | ||
|
|
c8351be461 | ||
|
|
9954da22a6 | ||
|
|
907b5611eb | ||
|
|
5f075de212 | ||
|
|
8fcf3c5079 | ||
|
|
07cee90c7a | ||
|
|
75ad495b98 | ||
|
|
0bb7288ad2 | ||
|
|
ad72415532 | ||
|
|
0ad0353fc0 | ||
|
|
9fa0dcd7aa | ||
|
|
1f2e80cd39 | ||
|
|
6cb6034d43 | ||
|
|
25134c6ac6 | ||
|
|
92bf42878a | ||
|
|
9f4582d158 | ||
|
|
68af73970e | ||
|
|
b6ed8d4975 | ||
|
|
d07d3645ce | ||
|
|
123759ab17 | ||
|
|
f2f1f893d8 | ||
|
|
db93a8eed2 | ||
|
|
12ab6d4a7d | ||
|
|
add759e889 | ||
|
|
f315f7977d | ||
|
|
f2f6701ebd | ||
|
|
1a92794d33 | ||
|
|
7640deb798 | ||
|
|
f1e8ef1cf6 | ||
|
|
5e5ac0162e | ||
|
|
0c013820f0 | ||
|
|
4b3a9e5847 | ||
|
|
e4982256a4 | ||
|
|
babc4927a8 | ||
|
|
6dd84cf469 | ||
|
|
a8800e3899 | ||
|
|
5f03496046 | ||
|
|
41500c17a2 | ||
|
|
2dcfde8b9a | ||
|
|
5c3305d8fa | ||
|
|
0d1fe99f53 | ||
|
|
4c03ffeec7 | ||
|
|
8101d17482 | ||
|
|
bc7b4dcc2a | ||
|
|
3db8b9078d | ||
|
|
943dbbefd3 | ||
|
|
480abcb853 | ||
|
|
60aaaff58e | ||
|
|
e3b889bbe8 | ||
|
|
ac5506a43b | ||
|
|
b29f533a3b | ||
|
|
a8ee86b09e | ||
|
|
0238c53302 | ||
|
|
665e3c806f | ||
|
|
8c96838441 | ||
|
|
4a722daec6 | ||
|
|
4e0cdbcb91 | ||
|
|
08976624cd | ||
|
|
fdeba94653 | ||
|
|
d3b100b7e5 | ||
|
|
1de3e18b08 | ||
|
|
d5c3c95682 | ||
|
|
dabe1e29ed | ||
|
|
203d1c0cfc | ||
|
|
7edd8601be | ||
|
|
a4423247f4 | ||
|
|
4834b203a0 | ||
|
|
bbabb32d13 | ||
|
|
95112d6bdf | ||
|
|
36cdca5a3e | ||
|
|
6980a9f3fc | ||
|
|
7b09479cd2 | ||
|
|
5825fd6f36 | ||
|
|
2d5b45dd82 | ||
|
|
52dda1d1fe | ||
|
|
420624bee4 | ||
|
|
8abde7b7d0 | ||
|
|
9e5b1ba28e | ||
|
|
b9c7d3c18e | ||
|
|
10aeccbbe5 | ||
|
|
15d351ebc2 | ||
|
|
7194f31cb6 | ||
|
|
84b7e82446 | ||
|
|
8264423b1a | ||
|
|
37f897f3bf | ||
|
|
fe3efac145 | ||
|
|
9773aebefc | ||
|
|
06f2b8c371 | ||
|
|
e8f0bb8350 | ||
|
|
9bfa6b827b | ||
|
|
b21bc17a58 | ||
|
|
f4d5d417d0 | ||
|
|
91fc83621e | ||
|
|
461feca0ca | ||
|
|
5e9afab3f7 | ||
|
|
2599ca6450 | ||
|
|
fc99ad3a39 | ||
|
|
10e1c3e72c | ||
|
|
af5dedd4d4 | ||
|
|
3b986c1076 | ||
|
|
72f77e8b7c | ||
|
|
e893bf676f | ||
|
|
80eb34f611 | ||
|
|
5d01947552 | ||
|
|
d3a025ef7b | ||
|
|
c466df841e | ||
|
|
b3c6e2a0f3 | ||
|
|
076c9cfed7 | ||
|
|
c3f3d12f83 | ||
|
|
44974034ec | ||
|
|
d6175acd38 | ||
|
|
62eee5f05c | ||
|
|
d4e5201913 | ||
|
|
f4d584765a | ||
|
|
26e224f852 | ||
|
|
252358ed66 | ||
|
|
475afeb7c8 | ||
|
|
7cbbb846eb | ||
|
|
25f947968c | ||
|
|
cad824dcbc | ||
|
|
e506f50b00 | ||
|
|
96ec149a98 | ||
|
|
8c913512f6 | ||
|
|
4cc307299d | ||
|
|
407c6b4c5f | ||
|
|
8f87070434 | ||
|
|
4a63996ee2 | ||
|
|
0358fe7620 | ||
|
|
55e64395ed | ||
|
|
ff5fb18e14 | ||
|
|
52dd960857 | ||
|
|
430221c2de | ||
|
|
217bdf8f92 | ||
|
|
38c6c869bf | ||
|
|
84d46da67e | ||
|
|
eb9d6240d7 | ||
|
|
2d44a871b0 | ||
|
|
3f89f350ff | ||
|
|
1a8407a782 | ||
|
|
cf288a3f73 | ||
|
|
f1f37fb180 | ||
|
|
fb0dd079fd | ||
|
|
a6c584c85c | ||
|
|
77adf35a30 | ||
|
|
dc6951c2a9 | ||
|
|
d14ba3f0f7 | ||
|
|
78ddf36e35 | ||
|
|
d42734624d | ||
|
|
b5dbd9d59b | ||
|
|
bed3e1289b | ||
|
|
b11ca4e60e | ||
|
|
4fcf3aa2bd | ||
|
|
dc39da8ca5 | ||
|
|
c10c87d28e | ||
|
|
c6fe6f1cc5 | ||
|
|
1c2bbeb26d | ||
|
|
17ed3692d0 | ||
|
|
966a00f41e | ||
|
|
fd8d8f89aa | ||
|
|
305bb74072 | ||
|
|
7f4dcdd134 | ||
|
|
aac37dcce1 | ||
|
|
f539c662a5 | ||
|
|
c82f346dd0 | ||
|
|
21b4a87837 | ||
|
|
ae73bcf24b | ||
|
|
2a3b56bde1 | ||
|
|
b8ebededd8 | ||
|
|
227c4c422c | ||
|
|
652bfb93cc | ||
|
|
c2278e3536 | ||
|
|
caa2fca4e8 | ||
|
|
745cb0175c | ||
|
|
e5165a780f | ||
|
|
b4b91af02b | ||
|
|
5649ff9c2e | ||
|
|
5b4bf6c62a | ||
|
|
93cb662282 | ||
|
|
00a8715e58 | ||
|
|
7ecd479b3e | ||
|
|
8fe7d3aaec | ||
|
|
f32a693393 | ||
|
|
17ebc01597 | ||
|
|
827fb698e1 | ||
|
|
32bdf10fd2 | ||
|
|
b795e6c3d2 | ||
|
|
42ba524e4e | ||
|
|
317c6d96e3 | ||
|
|
3692d1499f | ||
|
|
b21fbad8a3 | ||
|
|
743334a68a | ||
|
|
951413eb38 | ||
|
|
32dcdef853 | ||
|
|
34c9254d4a | ||
|
|
14012a4668 | ||
|
|
575debca63 | ||
|
|
763cac8532 | ||
|
|
43faacd7a7 | ||
|
|
1d4e307e96 | ||
|
|
7f8933b0de | ||
|
|
81608ff025 | ||
|
|
db63675b8e | ||
|
|
f74a83bc46 | ||
|
|
bc1deba3e4 | ||
|
|
d6113a8f0a | ||
|
|
2062cd48ea | ||
|
|
1c965ef515 | ||
|
|
58291b7156 | ||
|
|
afd1648d80 | ||
|
|
21814ffa9a | ||
|
|
9d3522da54 | ||
|
|
e07a76755e | ||
|
|
ba46bcdeae | ||
|
|
8d7e44314c | ||
|
|
35a67498c7 | ||
|
|
90dd934f95 | ||
|
|
4087045542 | ||
|
|
d11cef5907 | ||
|
|
76c91d226c | ||
|
|
c2b4dd2afd | ||
|
|
25b39cb39a | ||
|
|
35dcb7b88b | ||
|
|
e5f7e7c26e | ||
|
|
c5c11fd6a6 | ||
|
|
8134083419 | ||
|
|
a87e624198 | ||
|
|
e4c62d20b4 | ||
|
|
fa195d9e55 | ||
|
|
5ef5773d23 | ||
|
|
6eea52afdf | ||
|
|
80e64af30f | ||
|
|
563b6ddc36 | ||
|
|
c051ab9dc4 | ||
|
|
87737a8bdb | ||
|
|
94273d80b0 | ||
|
|
a08ec2a4bd | ||
|
|
d246c556f4 | ||
|
|
65aa365e38 | ||
|
|
eeeae449b4 | ||
|
|
17c10a7ba2 | ||
|
|
69f4383678 | ||
|
|
07852a7295 | ||
|
|
20b7e9b6b5 | ||
|
|
75f43ccea4 | ||
|
|
59e5785e93 | ||
|
|
b38f52dba9 | ||
|
|
2a6b17a48e | ||
|
|
a6c056a894 | ||
|
|
5c3442a71f | ||
|
|
390253242f | ||
|
|
9ab80fe1ac | ||
|
|
91fdd09e7a | ||
|
|
db5bd5c8a4 | ||
|
|
ef94c2fe7c | ||
|
|
72a25ed8e1 | ||
|
|
eb065e218f | ||
|
|
33426736fc | ||
|
|
896658d5ce | ||
|
|
b14135ed72 | ||
|
|
a1baf2e32d | ||
|
|
f9aa2d3bce | ||
|
|
c95d0e0696 | ||
|
|
ad4b84d446 | ||
|
|
3e27d5fcb0 | ||
|
|
48a100f49a | ||
|
|
698649f981 | ||
|
|
780078c3aa | ||
|
|
4c25e4ddee | ||
|
|
c0a5ac2ac5 | ||
|
|
0435409870 | ||
|
|
c521269409 | ||
|
|
1e252b7e4c | ||
|
|
d72b1edc48 | ||
|
|
f7307e8e01 | ||
|
|
127905f04b | ||
|
|
261c6dabd5 | ||
|
|
cae84bbf02 | ||
|
|
cdb2bc52fa | ||
|
|
cd2972eee0 | ||
|
|
4036aa8d0e | ||
|
|
52c6927c44 | ||
|
|
a16e0a21a2 | ||
|
|
e796b21157 | ||
|
|
1c6bc478b4 | ||
|
|
98f39c6388 | ||
|
|
570c83571b | ||
|
|
c0c38d89e0 | ||
|
|
b866cfc03c | ||
|
|
28c2755b37 | ||
|
|
57bfc5c73a | ||
|
|
0f3f7d53a3 | ||
|
|
529e50fd7f | ||
|
|
2fa283f91d | ||
|
|
029a9ade93 | ||
|
|
f1ca8b15c8 | ||
|
|
4d8edd5da9 | ||
|
|
6c63990653 | ||
|
|
5b521409c6 | ||
|
|
3268fc1014 | ||
|
|
19afb4941b | ||
|
|
40e5111d41 | ||
|
|
a3a40e1e74 | ||
|
|
101caa6826 | ||
|
|
875fed8d77 | ||
|
|
69e28eb000 | ||
|
|
e5d3a8360c | ||
|
|
4545d9285b | ||
|
|
6702024805 | ||
|
|
78bad4842b | ||
|
|
b9a913cfed | ||
|
|
6f5a6f353f | ||
|
|
790c4f589d | ||
|
|
cd1bd3461f | ||
|
|
0280dcd6a8 | ||
|
|
fc337292bc | ||
|
|
fb1daa0e21 | ||
|
|
579b9dc0c2 | ||
|
|
dedd0be352 | ||
|
|
1c7d9c3513 | ||
|
|
0c7dfe2af4 | ||
|
|
8d1351a8a3 | ||
|
|
e6e68a6036 | ||
|
|
24658edc45 | ||
|
|
09eaa3116a | ||
|
|
e9bff466b5 | ||
|
|
5d77f50160 | ||
|
|
2ab91e363f | ||
|
|
34d881426f | ||
|
|
13ecaa0ad4 | ||
|
|
ce6185b1f7 | ||
|
|
2cfde6b75a | ||
|
|
37d0354751 | ||
|
|
0a0edcf203 | ||
|
|
d6aad2ea28 | ||
|
|
63084506ee | ||
|
|
c5d313574f | ||
|
|
caab998212 | ||
|
|
aa037cc3d9 | ||
|
|
642bffe374 | ||
|
|
d682b154fc | ||
|
|
d4a06d98cf | ||
|
|
856b5e16b1 | ||
|
|
a0aa208860 | ||
|
|
037a11e04f | ||
|
|
bd8a1d715f | ||
|
|
54ab1dc091 | ||
|
|
9471e63857 | ||
|
|
fa4a403f38 | ||
|
|
d608d65bf4 | ||
|
|
c0f2df172a | ||
|
|
788ef5d81c | ||
|
|
1c6b5cffe1 | ||
|
|
c04382b623 | ||
|
|
0bbe51f8fd | ||
|
|
ff7d7d15a0 | ||
|
|
4b3d083d3a | ||
|
|
a566dd390b | ||
|
|
7d1442da04 | ||
|
|
17fc982f55 | ||
|
|
ba417e2274 | ||
|
|
d345094b75 | ||
|
|
6da477480d | ||
|
|
e274088c06 | ||
|
|
1bcaa73c5c | ||
|
|
ca94e8f621 | ||
|
|
1c4e198f59 | ||
|
|
fdd13f9c66 | ||
|
|
4333ab624e | ||
|
|
9fe1eb3a42 | ||
|
|
ad251a7682 | ||
|
|
1fa740de2d | ||
|
|
466b89064a | ||
|
|
2748cb0ba3 | ||
|
|
aef0d5bdde | ||
|
|
c71e8f024a | ||
|
|
9411f07321 | ||
|
|
9b2a5c9bbf | ||
|
|
2b275523a0 | ||
|
|
31fe2f6da4 | ||
|
|
f95db623a5 | ||
|
|
a46313e483 | ||
|
|
31c330826e | ||
|
|
c4cf800142 | ||
|
|
b64a2b0006 | ||
|
|
a3702f2270 | ||
|
|
d221b1d470 | ||
|
|
0b22a6bc1d | ||
|
|
07e8acd003 | ||
|
|
9fce617c57 | ||
|
|
8d5c736975 | ||
|
|
4ccec05186 | ||
|
|
a4f456f002 | ||
|
|
fbdb941c27 | ||
|
|
a41cd42e8d | ||
|
|
77521e4627 | ||
|
|
b6a1242bac | ||
|
|
2f325cfe26 | ||
|
|
193b0ad0f0 | ||
|
|
ed476b7793 | ||
|
|
720fd94b7f | ||
|
|
ff87da105c | ||
|
|
a875e65536 | ||
|
|
0b2c6bb662 | ||
|
|
e44e2fbbb7 | ||
|
|
b3c93644fd | ||
|
|
a56b7ff636 | ||
|
|
c724236930 | ||
|
|
4853320b2b | ||
|
|
ba1acb6ac1 | ||
|
|
f32a6320fc | ||
|
|
9f914ce36a | ||
|
|
b037644e5a | ||
|
|
afd8c59f83 | ||
|
|
8aa4af3e91 | ||
|
|
630a8a2b97 | ||
|
|
dc34c4d00c | ||
|
|
fb42729dec | ||
|
|
b06989216a | ||
|
|
e5144f08cd | ||
|
|
c4a60190e8 | ||
|
|
efe9e4fa4c | ||
|
|
45800b1559 | ||
|
|
b0b2b8104f | ||
|
|
8dbc012825 | ||
|
|
a434176063 | ||
|
|
a013f750c7 | ||
|
|
aa1f49d02f | ||
|
|
7125a26309 | ||
|
|
329a35ebf0 | ||
|
|
d30043f595 | ||
|
|
745dfa1911 | ||
|
|
76203f49a7 | ||
|
|
870a915377 | ||
|
|
c174fce227 | ||
|
|
2b6e42e919 | ||
|
|
df73e1e5a3 | ||
|
|
3e902311d4 | ||
|
|
64a0037265 | ||
|
|
bcd4e38093 | ||
|
|
181a77d627 | ||
|
|
b353595ba9 | ||
|
|
75e3bb4f17 | ||
|
|
d2fa9192d4 | ||
|
|
4bcadc2de4 | ||
|
|
8ddff74260 | ||
|
|
95940fdb64 | ||
|
|
9cd5708948 | ||
|
|
d361683d79 | ||
|
|
9ad17a01f7 | ||
|
|
22ca1d443c | ||
|
|
2662e875ca | ||
|
|
8ae0d07ec1 | ||
|
|
76a9edb7f5 | ||
|
|
0ccb464e5b | ||
|
|
bef600efa2 | ||
|
|
58a182cd33 | ||
|
|
aa43334f41 | ||
|
|
a2a4c97f6c | ||
|
|
4217ba99fd | ||
|
|
589725f5cc | ||
|
|
3fea4602f8 | ||
|
|
8ea6aae875 | ||
|
|
2c70b2af68 | ||
|
|
54a2cbcb42 | ||
|
|
fdef821c60 | ||
|
|
dfa798a35d | ||
|
|
39b8eb6ff1 | ||
|
|
6cf71f67a9 | ||
|
|
f2e919725e | ||
|
|
869599126e | ||
|
|
3b1b200f6f | ||
|
|
93c646e3e4 | ||
|
|
3552f80a21 | ||
|
|
66d3a63998 | ||
|
|
6447825978 | ||
|
|
18b7df9fca | ||
|
|
c3781cab96 | ||
|
|
776098dba6 | ||
|
|
8d1b4f61e7 | ||
|
|
c13e2bdb96 | ||
|
|
4682254157 | ||
|
|
d7ca6b9213 | ||
|
|
4a76afbde8 | ||
|
|
a68349c23a | ||
|
|
920e005366 | ||
|
|
659f339020 | ||
|
|
3ee2d463af | ||
|
|
686ddb5460 | ||
|
|
e5d62488b7 | ||
|
|
eb93dd5005 | ||
|
|
6999d02d2d | ||
|
|
790e2b1427 | ||
|
|
a29c7cdfe4 | ||
|
|
6b7cd692a6 | ||
|
|
4d3925872a | ||
|
|
2bd0f6934a | ||
|
|
51783f17ed | ||
|
|
ce3aef3526 | ||
|
|
ee70afdfbb | ||
|
|
d96c4a56a2 | ||
|
|
9a39513dea | ||
|
|
8f22d63315 | ||
|
|
7f2a5bb95e | ||
|
|
0118dbd5fb | ||
|
|
09405de26c | ||
|
|
efa5ee0e57 | ||
|
|
80d558f37a | ||
|
|
901adc3fc7 | ||
|
|
01417be954 | ||
|
|
43b780cbe6 | ||
|
|
e83f36a12f | ||
|
|
77e3fc4ab0 | ||
|
|
eafd1adaba | ||
|
|
6b53abb7c9 | ||
|
|
f994c5d284 | ||
|
|
6fda220107 | ||
|
|
da290ed1c3 | ||
|
|
7e9cd80a1c | ||
|
|
379b7413d8 | ||
|
|
9181a4df16 | ||
|
|
df982afd51 | ||
|
|
5c2c3b4317 | ||
|
|
92d1309103 | ||
|
|
c43ee3c1d6 | ||
|
|
e0726e5283 | ||
|
|
5f3775584b | ||
|
|
77873d63c5 | ||
|
|
9e6b09765e | ||
|
|
1ad6ea4049 | ||
|
|
7c41da1cb9 | ||
|
|
adcf4bfc53 | ||
|
|
7a6321a9c1 | ||
|
|
d56b27a7b0 | ||
|
|
ed7657ab5f | ||
|
|
a414838416 | ||
|
|
93646577dc | ||
|
|
46db66038e | ||
|
|
efc4e9ce56 | ||
|
|
8d5eac7f80 | ||
|
|
7b94e49b81 | ||
|
|
c35fd4bdc8 | ||
|
|
98590e2d90 | ||
|
|
e6da0e5dd5 | ||
|
|
cb2baf747d | ||
|
|
a2f2eb03ce | ||
|
|
5c6acbb780 | ||
|
|
1be7031199 | ||
|
|
ed6399bde9 | ||
|
|
6709893781 | ||
|
|
686a426cda | ||
|
|
4f90bc7813 | ||
|
|
e307b289ae | ||
|
|
3baeff61a7 | ||
|
|
93ab9d12ee | ||
|
|
36e1317792 | ||
|
|
fa3e90a021 | ||
|
|
782a69cf13 | ||
|
|
d495f351c0 | ||
|
|
30bd3d2d52 | ||
|
|
ff5a21cca5 | ||
|
|
f8abb73c92 | ||
|
|
e97f323d9a | ||
|
|
3d27a4c05d | ||
|
|
9dbc13dbe4 | ||
|
|
c46a4c75b1 | ||
|
|
0bded73f16 | ||
|
|
1333733684 | ||
|
|
003be934de | ||
|
|
93ef20d358 | ||
|
|
94e1a6f0ba | ||
|
|
8661d09d57 | ||
|
|
0e5e21dc4e | ||
|
|
3b25c4987c | ||
|
|
2212eb17aa | ||
|
|
768bac1db8 | ||
|
|
3aef75085f | ||
|
|
ce8bef638a | ||
|
|
f0a0c90304 | ||
|
|
cd6c32b21d | ||
|
|
b31876d2d1 | ||
|
|
ebab8a190e | ||
|
|
1b7ce8e7a5 | ||
|
|
646bb6bd79 | ||
|
|
5a84b97ca9 | ||
|
|
6d41b5a4a1 | ||
|
|
a8bce36f3b | ||
|
|
ac2132f8ba | ||
|
|
cab4b57abe | ||
|
|
938fb30359 | ||
|
|
62346d7d9d | ||
|
|
cf1e5ca64b | ||
|
|
7d2d683d96 | ||
|
|
fe5042f1c3 | ||
|
|
a1dd76aee0 | ||
|
|
d1c91be167 | ||
|
|
9748d99f34 | ||
|
|
c90ffbeb62 | ||
|
|
eb7fafeabf | ||
|
|
3e50629462 | ||
|
|
65281a4554 | ||
|
|
454ec09d6a | ||
|
|
60e3c6858d | ||
|
|
f911f5b4fc | ||
|
|
ad1694d291 | ||
|
|
1130965f26 | ||
|
|
fe1f28998b | ||
|
|
45727fce05 | ||
|
|
d5c23e5add | ||
|
|
e3a8285f6c | ||
|
|
a791221cf6 | ||
|
|
b954d9b403 | ||
|
|
5e7e24a271 | ||
|
|
ffb1e598f6 | ||
|
|
bc2da8a645 | ||
|
|
6f2be3ed30 | ||
|
|
033a7bffb3 | ||
|
|
f2b2ea61a1 | ||
|
|
6f0783acc4 | ||
|
|
ce60aa3823 | ||
|
|
8075e70606 | ||
|
|
4402fc2d0a | ||
|
|
3e3ecda551 | ||
|
|
50beb8f346 | ||
|
|
8e033e3e06 | ||
|
|
dc029a318b | ||
|
|
8e91bc2c8e | ||
|
|
0ff5b4e90b | ||
|
|
20dec19bfe | ||
|
|
d261fbff26 | ||
|
|
6594b33bcc | ||
|
|
a1bb6cc1b1 | ||
|
|
7ce195b68e | ||
|
|
16d8d04aaa | ||
|
|
59565f7d90 | ||
|
|
43784a2495 | ||
|
|
3811d7469e | ||
|
|
c72b40a1e1 | ||
|
|
f00933969d | ||
|
|
759adc45e3 | ||
|
|
27ecf78372 | ||
|
|
c91b83a7ba | ||
|
|
39373ee63a | ||
|
|
2db64c69ae | ||
|
|
a699b71c02 | ||
|
|
6c07d22cda | ||
|
|
a2ee900ed5 | ||
|
|
e709f31b99 | ||
|
|
35afb12756 | ||
|
|
9bed9fe162 | ||
|
|
4ff5553804 | ||
|
|
32213be7a7 | ||
|
|
84894a73e1 | ||
|
|
b6ea185ce7 | ||
|
|
814ac0f731 | ||
|
|
a40bb29da3 | ||
|
|
e9b90079c0 | ||
|
|
dba383c27e | ||
|
|
42059b5817 | ||
|
|
f92a17c01b | ||
|
|
d6552ce333 | ||
|
|
0db89bde5a | ||
|
|
56a12185d4 | ||
|
|
c40170db5d | ||
|
|
1df3e9c414 | ||
|
|
b1570df8b9 | ||
|
|
023fd1ce36 | ||
|
|
a7fe74bc0c | ||
|
|
26c9abd9da | ||
|
|
a5e34645c5 | ||
|
|
b2831c0a19 | ||
|
|
648c1ea0f9 | ||
|
|
9cd927e06a | ||
|
|
4272413f55 | ||
|
|
e1711b7af6 | ||
|
|
f7d3f27d45 | ||
|
|
3a7a47f82d | ||
|
|
cc211706d5 | ||
|
|
22f74be4cd | ||
|
|
5a00d14f94 | ||
|
|
ecb4e7bf9f | ||
|
|
56e5b546e1 | ||
|
|
272f5a2f4f | ||
|
|
ddcbe78a01 | ||
|
|
00b6c964e2 | ||
|
|
d7d2b06ecc | ||
|
|
fafc59360d | ||
|
|
19e105785e | ||
|
|
b87ac09e43 | ||
|
|
af9092d7c7 | ||
|
|
24a1ffd652 | ||
|
|
662813cc58 | ||
|
|
d890b78290 | ||
|
|
58747d7d4a | ||
|
|
0773a4f39c | ||
|
|
66cc7f8a1f | ||
|
|
01ab40bf4a | ||
|
|
4c09147fd1 | ||
|
|
f9f426d788 | ||
|
|
ff8fa1bf31 | ||
|
|
59f99e4f6a | ||
|
|
7449ce9c3b | ||
|
|
f6bc8f0a1f | ||
|
|
4d10b8cdee | ||
|
|
5a61c5de09 | ||
|
|
f84d0db811 | ||
|
|
36ce3b08fe | ||
|
|
da8ea5b545 | ||
|
|
fad3dbf4cd | ||
|
|
034d12c347 | ||
|
|
c94dbf1d9a | ||
|
|
e516687a9e | ||
|
|
4a2f77b0a6 | ||
|
|
7b29ecba71 | ||
|
|
11241b8e07 | ||
|
|
52bbd1f20b | ||
|
|
4044750515 | ||
|
|
b670c546b9 | ||
|
|
f37bbf93cb | ||
|
|
87311ab41a | ||
|
|
ecb4d1845c | ||
|
|
35c232ab25 | ||
|
|
df0be2e251 | ||
|
|
871b3a102b | ||
|
|
02299e3892 | ||
|
|
6af4d6f5b8 | ||
|
|
4fb5700367 | ||
|
|
8579276381 | ||
|
|
7ba60b22c5 | ||
|
|
031932f41c | ||
|
|
079d0a89b1 | ||
|
|
c4fdce6d64 | ||
|
|
5604c2b29f | ||
|
|
74b5ab2b47 | ||
|
|
c29cbfe123 | ||
|
|
6fe5cb1ffd | ||
|
|
7edd5a7a8e | ||
|
|
c1edc1b99b | ||
|
|
4d1d890f72 | ||
|
|
fe0f82fa2b | ||
|
|
84083a65a8 | ||
|
|
fc91c6bc08 | ||
|
|
09120171ba | ||
|
|
a362f920dc | ||
|
|
9d7729f548 | ||
|
|
ed56e177cf | ||
|
|
9db28bd502 | ||
|
|
aded70eb2e | ||
|
|
dfbad85465 | ||
|
|
52076fe182 | ||
|
|
5575c3cb13 | ||
|
|
637d32efff | ||
|
|
fd54658e53 | ||
|
|
2f39a8d76e | ||
|
|
6a3e793500 | ||
|
|
3b3ffeda6b | ||
|
|
f7d92a3b11 | ||
|
|
d9d9ba8bf1 | ||
|
|
d66ab7d389 |
No files matched your search
+2
-2
@@ -5,7 +5,7 @@ root = true
|
||||
|
||||
# Unix-style newlines with a newline ending every file
|
||||
[*]
|
||||
end_of_line = lf
|
||||
end_of_line = lf|crlf
|
||||
insert_final_newline = true
|
||||
|
||||
# Matches multiple files with brace expansion notation
|
||||
@@ -18,4 +18,4 @@ indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
# Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
|
||||
# You'll need to rely on your linter/formatter like ESLint or Prettier for that.
|
||||
# You'll need to rely on your linter/formatter like ESLint or Prettier for that.
|
||||
+1
-1
@@ -1 +1 @@
|
||||
VITE_BUILD_TYPE = Production
|
||||
VITE_BUILD_TYPE = Production
|
||||
+2
-1
@@ -1,9 +1,10 @@
|
||||
module.exports = {
|
||||
'env': {
|
||||
'browser': true,
|
||||
'es2021': true,
|
||||
'node': true
|
||||
},
|
||||
'ignorePatterns': ['src/core/', 'src/core.lib/'],
|
||||
'ignorePatterns': ['src/core/', 'src/core.lib/','src/proto/'],
|
||||
'extends': [
|
||||
'eslint:recommended',
|
||||
'plugin:@typescript-eslint/recommended'
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
name: "Build"
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
permissions: write-all
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
@@ -9,7 +14,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
target_platform: [linux,darwin]
|
||||
target_platform: [linux]
|
||||
target_arch: [x64, arm64]
|
||||
steps:
|
||||
- name: Clone Main Repository
|
||||
@@ -17,6 +22,7 @@ jobs:
|
||||
with:
|
||||
repository: 'NapNeko/NapCatQQ'
|
||||
submodules: true
|
||||
ref: main
|
||||
token: ${{ secrets.NAPCAT_BUILD }}
|
||||
- name: Use Node.js 20.X
|
||||
uses: actions/setup-node@v4
|
||||
@@ -48,6 +54,7 @@ jobs:
|
||||
with:
|
||||
repository: 'NapNeko/NapCatQQ'
|
||||
submodules: true
|
||||
ref: main
|
||||
token: ${{ secrets.NAPCAT_BUILD }}
|
||||
- name: Use Node.js 20.X
|
||||
uses: actions/setup-node@v4
|
||||
@@ -64,4 +71,4 @@ jobs:
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
|
||||
path: dist
|
||||
path: dist
|
||||
@@ -1,16 +1,42 @@
|
||||
name: "release"
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v*"
|
||||
|
||||
permissions: write-all
|
||||
|
||||
jobs:
|
||||
check-version:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone Repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: main
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Extract version from tag
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
||||
|
||||
- name: Use Node.js 20.X
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.x
|
||||
|
||||
- name: Check Version
|
||||
run: |
|
||||
ls
|
||||
node ./script/checkVersion.cjs
|
||||
sh ./checkVersion.sh
|
||||
build-linux:
|
||||
needs: [check-version]
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
target_platform: [linux,darwin]
|
||||
target_platform: [linux]
|
||||
target_arch: [x64, arm64]
|
||||
steps:
|
||||
- name: Clone Main Repository
|
||||
@@ -18,13 +44,17 @@ jobs:
|
||||
with:
|
||||
repository: 'NapNeko/NapCatQQ'
|
||||
submodules: true
|
||||
ref: main
|
||||
token: ${{ secrets.NAPCAT_BUILD }}
|
||||
- name: Use Node.js 20.X
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.x
|
||||
node-version: 20.x
|
||||
|
||||
- name: Build NuCat Linux
|
||||
run: |
|
||||
export NAPCAT_BUILDSYS=${{ matrix.target_platform }}
|
||||
export NAPCAT_BUILDARCH=${{ matrix.target_arch }}
|
||||
npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }}
|
||||
npm run build:prod
|
||||
cd dist
|
||||
@@ -37,6 +67,7 @@ jobs:
|
||||
path: dist
|
||||
build-win32:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [check-version]
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
@@ -48,23 +79,30 @@ jobs:
|
||||
with:
|
||||
repository: 'NapNeko/NapCatQQ'
|
||||
submodules: true
|
||||
ref: main
|
||||
token: ${{ secrets.NAPCAT_BUILD }}
|
||||
|
||||
- name: Use Node.js 20.X
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.x
|
||||
|
||||
- name: Build NuCat Linux
|
||||
run: |
|
||||
export NAPCAT_BUILDSYS=${{ matrix.target_platform }}
|
||||
export NAPCAT_BUILDARCH=${{ matrix.target_arch }}
|
||||
npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }}
|
||||
npm run build:prod
|
||||
cd dist
|
||||
npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }}
|
||||
cd ..
|
||||
|
||||
- name: Upload Artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
|
||||
path: dist
|
||||
|
||||
release-napcat:
|
||||
needs: [build-win32,build-linux]
|
||||
runs-on: ubuntu-latest
|
||||
@@ -78,15 +116,23 @@ jobs:
|
||||
base=$(basename "$dir")
|
||||
zip -r "${base}.zip" "$dir"
|
||||
done
|
||||
|
||||
- name: Extract version from tag
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
||||
|
||||
- name: Clone Changes Log
|
||||
run: curl -o CHANGELOG.md https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/docs/changelogs/CHANGELOG.v${{ env.VERSION }}.md
|
||||
|
||||
- name: Create Release Draft and Upload Artifacts
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
name: NapCat V0.0.0
|
||||
token: ${{ secrets.NAPCAT_BUILD }}
|
||||
name: NapCat V${{ env.VERSION }}
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
body_path: CHANGELOG.md
|
||||
files: |
|
||||
NapCat.win32.x64.zip
|
||||
NapCat.linux.x64.zip
|
||||
NapCat.linux.arm64.zip
|
||||
NapCat.darwin.x64.zip
|
||||
NapCat.darwin.arm64.zip
|
||||
# NapCat.darwin.x64.zip
|
||||
# NapCat.darwin.arm64.zip
|
||||
draft: true
|
||||
+4
-3
@@ -1,11 +1,11 @@
|
||||
# Logs
|
||||
|
||||
# Develop
|
||||
node_modules/
|
||||
package-lock.json
|
||||
pnpm-lock.yaml
|
||||
out/
|
||||
dist/
|
||||
src/core.lib/common/
|
||||
/src/core.lib/common/
|
||||
/localdebug/
|
||||
|
||||
# Editor
|
||||
.vscode/*
|
||||
@@ -14,3 +14,4 @@ src/core.lib/common/
|
||||
|
||||
# Build
|
||||
*.db
|
||||
checkVersion.sh
|
||||
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2024 NapCatQQ
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -4,162 +4,30 @@
|
||||
|
||||
## 项目介绍
|
||||
|
||||
NapCatQQ(瞌睡猫QQ,不准叫我NCQQ!),像睡着了一样在后台低占用运行的无头(没有界面)的NTQQ
|
||||
NapCatQQ 是基于 PC NTQQ 本体实现一套无头 Bot 框架。
|
||||
|
||||
目前测试在 Windows 上表现优秀,最低可达只占用内存 **20M**左右
|
||||
名字寓意 瞌睡猫QQ,像睡着了一样在后台低占用运行的无需GUI界面的NTQQ。
|
||||
|
||||
由于 Linux 上的 QQ 图形依赖较多,会导致内存占用小高,大约 **100+M**,目前正在研究如何优化
|
||||
## 如何使用
|
||||
|
||||
具体占用会因人而异,QQ 群、好友越多占用越高
|
||||
可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
|
||||
|
||||
## 下载
|
||||
**首次使用** 请务必前往 [官方文档](https://napneko.github.io/) 查看使用文档与教程
|
||||
|
||||
前往 Release 页面下载最新版本
|
||||
|
||||
## 启动
|
||||
|
||||
NapCat 是基于 官方NTQQ 实现的Bot框架,因此先需要安装官方QQ,**注意同个账号不能同时登录原版 QQ 和 NapCatQQ**
|
||||
|
||||
*如果没有安装 QQ 请往后翻查看安装方法*
|
||||
|
||||
修改 `config/onebot11.json`内容,并重名为 `onebot11_<你的QQ号>.json`,如`onebot11_1234567.json`
|
||||
|
||||
json 配置内容参数解释:
|
||||
|
||||
```json5
|
||||
{
|
||||
// 是否启用http服务,如果启用,可以通过http接口发送消息
|
||||
"enableHttp": false,
|
||||
// http服务端口
|
||||
"httpPort": 3000,
|
||||
// 是否启用正向websocket服务
|
||||
"enableWs": false,
|
||||
// 正向websocket服务端口
|
||||
"wsPort": 3001,
|
||||
// 是否启用反向websocket服务
|
||||
"enableWsReverse": false,
|
||||
// 反向websocket对接的地址, 如["ws://127.0.0.1:8080/onebot/v11/ws"]
|
||||
"wsReverseUrls": [],
|
||||
// 是否启用http上报服务
|
||||
"enableHttpPost": false,
|
||||
// http上报地址, 如["http://127.0.0.1:8080/onebot/v11/http"]
|
||||
"httpPostUrls": [],
|
||||
// http上报密钥,可为空
|
||||
"httpSecret": "",
|
||||
// 消息上报格式,array为消息组,string为cq码字符串
|
||||
"messagePostFormat": "array",
|
||||
// 是否上报自己发送的消息
|
||||
"reportSelfMessage": false,
|
||||
// 是否开启调试模式,开启后上报消息会携带一个raw字段,为原始消息内容
|
||||
"debug": false,
|
||||
// 调用get_file接口时如果获取不到url则使用base64字段返回文件内容
|
||||
"enableLocalFile2Url": true,
|
||||
// ws心跳间隔,单位毫秒
|
||||
"heartInterval": 30000,
|
||||
// access_token,可以为空
|
||||
"token": ""
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
### Windows 启动
|
||||
|
||||
运行`powershell ./napcat.ps1`, 或者 `napcat.bat`,如果出现乱码,可以尝试运行`napcat-utf8.ps1` 或 `napcat-utf8.bat`
|
||||
|
||||
*如果出现 powershell 运行不了,以管理员身份打开 powershell,输入 `Set-ExecutionPolicy RemoteSigned`*
|
||||
|
||||
### Linux 启动
|
||||
|
||||
运行`napcat.sh`
|
||||
|
||||
## 使用无需扫码快速登录
|
||||
|
||||
前提是你已经成功登录过QQ,可以加参数` -q <你的QQ>` 进行登录,如`napcat.sh -q 1234567`
|
||||
|
||||
## 安装
|
||||
|
||||
### Linux安装
|
||||
|
||||
#### 安装 Linux QQ(22741),已经安装了的可以跳过
|
||||
|
||||
目前还在研究怎么精简安装,暂时只能安装官方QQ整体依赖
|
||||
|
||||
下载QQ
|
||||
|
||||
[deb x86版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_amd64_01.deb)
|
||||
[deb arm版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_arm64_01.deb)
|
||||
|
||||
[rpm x86版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_x86_64_01.rpm)
|
||||
[rpm arm版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_aarch64_01.rpm)
|
||||
|
||||
```bash
|
||||
sudo apt install ./qq.deb
|
||||
```
|
||||
|
||||
```bash
|
||||
安装QQ的依赖
|
||||
sudo apt install libgbm1 libasound2
|
||||
```
|
||||
|
||||
### Windows 安装
|
||||
|
||||
#### 安装Windows QQ(22741),已经安装了的可以跳过
|
||||
|
||||
[Windows版本QQ下载](https://dldir1.qq.com/qqfile/qq/QQNT/Windows/QQ_9.9.9_240403_x64_01.exe)
|
||||
|
||||
### 编译安装 NapCat
|
||||
|
||||
**如果你是直接下载编译好的版本,可以跳过这一步**
|
||||
|
||||
准备环境 [node18.18](https://nodejs.org/download/release/v18.18.2/)
|
||||
|
||||
```
|
||||
export NODE_ENV=production
|
||||
npm install
|
||||
```
|
||||
|
||||
## 常见问题
|
||||
|
||||
### 二维码无法扫描
|
||||
|
||||
NapCat 会自动保存二维码到目录,可以手动打开图片扫描
|
||||
|
||||
如果没有条件访问本地目录,可以将二维码解析的 url 复制到二维码生成网站上生成二维码,然后手机QQ扫描
|
||||
|
||||
### 语音、视频发送失败
|
||||
|
||||
需要配置 ffmpeg,将 ffmpeg 目录加入环境变量,如果仍未生效,可以修改 napcat 启动脚本加入 FFMPEG_PATH 变量指定到 ffmpeg
|
||||
程序的完整路径
|
||||
|
||||
如 Windows 上修改 napcat.ps1,在第一行加入
|
||||
|
||||
```powershell
|
||||
$env:FFMPEG_PATH="d:\ffmpeg\bin\ffmpeg.exe"
|
||||
```
|
||||
|
||||
### 出现 error code v2:-1 之类的提示
|
||||
|
||||
不用管,这是正常现象,是因为 QQ 本身的问题,不影响使用
|
||||
|
||||
## API 文档
|
||||
|
||||
参考 [LLOneBot](https://llonebot.github.io/zh-CN/develop/api) 的文档
|
||||
|
||||
<!--
|
||||
QQ群:545402644
|
||||
-->
|
||||
|
||||
## 声明
|
||||
## 项目声明
|
||||
|
||||
* 请不要在无关地方宣传NapCatQQ,本项目只是用于学习 node 相关知识,切勿用于违法用途
|
||||
|
||||
* NapCat 不会收集用户隐私信息,但是未来可能会为了更好的利于 NapCat 的优化会收集一些设备信息,如 cpu 架构,系统版本等
|
||||
|
||||
## 相关链接
|
||||
|
||||
[TG群](https://t.me/+nLZEnpne-pQ1OWFl)
|
||||
[Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
|
||||
|
||||
## 鸣谢名单
|
||||
[OpenShamrock]()
|
||||
|
||||
[Lagrange]()
|
||||
[Lagrange](https://github.com/LagrangeDev/Lagrange.Core)
|
||||
|
||||
<!--
|
||||
QQ群:545402644
|
||||
-->
|
||||
@@ -0,0 +1,17 @@
|
||||
# v1.3.3
|
||||
|
||||
QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
|
||||
|
||||
## 修复与优化
|
||||
* 尝试修复多开崩溃问题
|
||||
* 修复群列表更新问题
|
||||
* 修复兼容性问题支持Win7
|
||||
* 修复下载 http 资源缺少UA
|
||||
* 优化少量消息合并转发速度
|
||||
* 修复加载群通知时出现 getUserDetailInfo timeout 导致程序崩溃
|
||||
|
||||
## 新增与调整
|
||||
* 新增设置群公告 Api: /_send_group_notice
|
||||
* 新增重启实现 包括重启快速登录/普通重启 副作用: 原进程 无法清理
|
||||
|
||||
新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
|
||||
@@ -0,0 +1,18 @@
|
||||
# v1.3.5
|
||||
|
||||
QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
|
||||
|
||||
## 修复与优化
|
||||
* 优化启动脚本
|
||||
* 修复非管理时群成员减少事件上报 **无法获取操作者与操作类型**
|
||||
* 修复快速重启进程清理问题
|
||||
* 优化配置文件格式 支持自动更新配置 但仍然建议 **备份配置**
|
||||
* 修复正向反向ws多个客户端周期多次心跳问题
|
||||
|
||||
## 新增与调整
|
||||
* 支持WebUi热重载
|
||||
* 新增启动输出WEBUI秘钥
|
||||
* 新增群荣誉信息 /get_group_honor_info
|
||||
* 支持获取群系统消息 /get_group_system_msg
|
||||
|
||||
新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
|
||||
@@ -0,0 +1,11 @@
|
||||
# v1.3.6
|
||||
|
||||
QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
|
||||
|
||||
## 修复与优化
|
||||
* 修复戳一戳多次上报问题
|
||||
|
||||
## 新增与调整
|
||||
|
||||
|
||||
新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
|
||||
@@ -0,0 +1,15 @@
|
||||
# v1.3.8
|
||||
|
||||
QQ Version: Windows 9.9.9-23873 / Linux 3.2.7-23361
|
||||
|
||||
## 修复与优化
|
||||
* 优化打包后体积问题
|
||||
* 修复QQ等级获取
|
||||
* 兼容 9.7.x 版本换行符 统一为 \n
|
||||
* 修复处理加群请求 字段异常情况
|
||||
* 修复退群通知问题
|
||||
|
||||
## 新增与调整
|
||||
|
||||
|
||||
新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
|
||||
@@ -0,0 +1,11 @@
|
||||
# v1.3.9
|
||||
|
||||
QQ Version: Windows 9.9.10-23873 / Linux 3.2.7-23361
|
||||
|
||||
## 修复与优化
|
||||
* 修复QQ等级获取与兼容性问题
|
||||
|
||||
## 新增与调整
|
||||
|
||||
|
||||
新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
|
||||
@@ -0,0 +1,12 @@
|
||||
# v1.4.0
|
||||
|
||||
QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
|
||||
|
||||
## 修复与优化
|
||||
|
||||
## 新增与调整
|
||||
* 支持空间Cookies获取
|
||||
* 支持获取在线设备 API /get_online_clients
|
||||
* 支持图片OCR API: /.ocr_image /ocr_image
|
||||
|
||||
新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
|
||||
@@ -0,0 +1,14 @@
|
||||
# v1.4.1
|
||||
|
||||
QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
|
||||
|
||||
## 修复与优化
|
||||
* 提高部分Api兼容性
|
||||
* 优化日志膨胀问题
|
||||
* 在线状态刷新问题修复
|
||||
## 新增与调整
|
||||
* 支持非管理群 本地记录时间数据 (建议 **备份配置 清空配置 重新配置**)
|
||||
* 新增英译中接口 Api: /translate_en2zh
|
||||
* 新增群文件管理相关扩展接口 Api: /get_group_file_count /get_group_file_list /set_group_file_folder /del_group_file /del_group_file_folder
|
||||
|
||||
新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
|
||||
+66
-63
@@ -1,63 +1,66 @@
|
||||
{
|
||||
"name": "napcat",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"version": "1.0.2",
|
||||
"scripts": {
|
||||
"watch:dev": "vite --mode development",
|
||||
"watch:prod": "vite --mode production",
|
||||
"build:dev": "vite build --mode development",
|
||||
"build:prod": "vite build --mode production",
|
||||
"build": "npm run build:dev",
|
||||
"build:core": "cd ./src/core && vite build --mode production",
|
||||
"watch": "npm run watch:dev",
|
||||
"debug-win": "powershell dist/napcat.ps1",
|
||||
"lint": "eslint --fix src/**/*.{js,ts}",
|
||||
"release": "npm run build:prod",
|
||||
"depend": "cd dist && npm install --omit=dev"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@log4js-node/log4js-api": "^1.0.2",
|
||||
"@rollup/plugin-commonjs": "^25.0.7",
|
||||
"@rollup/plugin-node-resolve": "^15.2.3",
|
||||
"@rollup/plugin-typescript": "^11.1.6",
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/figlet": "^1.5.8",
|
||||
"@types/fluent-ffmpeg": "^2.1.24",
|
||||
"@types/node": "^20.11.30",
|
||||
"@types/qrcode-terminal": "^0.12.2",
|
||||
"@types/uuid": "^9.0.8",
|
||||
"@types/ws": "^8.5.10",
|
||||
"@typescript-eslint/eslint-plugin": "^7.4.0",
|
||||
"@typescript-eslint/parser": "^7.4.0",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-import-resolver-typescript": "^3.6.1",
|
||||
"eslint-plugin-import": "^2.29.1",
|
||||
"i": "^0.3.7",
|
||||
"javascript-obfuscator": "^4.1.0",
|
||||
"protobufjs-cli": "^1.1.2",
|
||||
"rollup": "^4.13.2",
|
||||
"rollup-plugin-dts": "^6.1.0",
|
||||
"rollup-plugin-obfuscator": "^1.1.0",
|
||||
"typescript": "^5.3.3",
|
||||
"vite": "^5.2.6",
|
||||
"vite-plugin-cp": "^4.0.8",
|
||||
"vite-plugin-dts": "^3.8.2",
|
||||
"vite-tsconfig-paths": "^4.3.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"commander": "^12.0.0",
|
||||
"express": "^5.0.0-beta.2",
|
||||
"file-type": "^19.0.0",
|
||||
"fluent-ffmpeg": "^2.1.2",
|
||||
"image-size": "^1.1.1",
|
||||
"log4js": "^6.9.1",
|
||||
"protobufjs": "^7.2.6",
|
||||
"qrcode-terminal": "^0.12.0",
|
||||
"silk-wasm": "^3.3.4",
|
||||
"sqlite3": "^5.1.7",
|
||||
"uuid": "^9.0.1",
|
||||
"ws": "^8.16.0",
|
||||
"yaml": "^2.4.1"
|
||||
}
|
||||
}
|
||||
{
|
||||
"name": "napcat",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"version": "1.4.1",
|
||||
"scripts": {
|
||||
"watch:dev": "vite --mode development",
|
||||
"watch:prod": "vite --mode production",
|
||||
"build:dev": "vite build --mode development",
|
||||
"build:prod": "vite build --mode production",
|
||||
"build": "npm run build:dev",
|
||||
"build:core": "cd ./src/core && npm run build && cd ../.. && node ./script/copy-core.cjs",
|
||||
"build:webui": "cd ./src/webui && vite build",
|
||||
"watch": "npm run watch:dev",
|
||||
"debug-win": "powershell dist/napcat.ps1",
|
||||
"lint": "eslint --fix src/**/*.{js,ts}",
|
||||
"release": "npm run build:prod",
|
||||
"depend": "cd dist && npm install --omit=dev"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@log4js-node/log4js-api": "^1.0.2",
|
||||
"@rollup/plugin-node-resolve": "^15.2.3",
|
||||
"@rollup/plugin-typescript": "^11.1.6",
|
||||
"@types/cors": "^2.8.17",
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/figlet": "^1.5.8",
|
||||
"@types/fluent-ffmpeg": "^2.1.24",
|
||||
"@types/node": "^20.11.30",
|
||||
"@types/qrcode-terminal": "^0.12.2",
|
||||
"@types/uuid": "^9.0.8",
|
||||
"@types/ws": "^8.5.10",
|
||||
"@typescript-eslint/eslint-plugin": "^7.4.0",
|
||||
"@typescript-eslint/parser": "^7.4.0",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-import-resolver-typescript": "^3.6.1",
|
||||
"eslint-plugin-import": "^2.29.1",
|
||||
"i": "^0.3.7",
|
||||
"javascript-obfuscator": "^4.1.0",
|
||||
"rollup": "^4.13.2",
|
||||
"rollup-plugin-dts": "^6.1.0",
|
||||
"rollup-plugin-obfuscator": "^1.1.0",
|
||||
"typescript": "^5.3.3",
|
||||
"vite": "^5.2.6",
|
||||
"vite-plugin-cp": "^4.0.8",
|
||||
"vite-plugin-dts": "^3.8.2",
|
||||
"vite-tsconfig-paths": "^4.3.2",
|
||||
"@protobuf-ts/plugin": "^2.9.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"ajv": "^8.13.0",
|
||||
"commander": "^12.0.0",
|
||||
"cors": "^2.8.5",
|
||||
"express": "^5.0.0-beta.2",
|
||||
"fast-xml-parser": "^4.3.6",
|
||||
"file-type": "^19.0.0",
|
||||
"fluent-ffmpeg": "^2.1.2",
|
||||
"image-size": "^1.1.1",
|
||||
"json-schema-to-ts": "^3.1.0",
|
||||
"log4js": "^6.9.1",
|
||||
"qrcode-terminal": "^0.12.0",
|
||||
"silk-wasm": "^3.3.4",
|
||||
"sqlite3": "^5.1.7",
|
||||
"uuid": "^9.0.1",
|
||||
"ws": "^8.16.0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
const fs = require("fs");
|
||||
const process = require("process");
|
||||
|
||||
console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
|
||||
try {
|
||||
const packageJson = require("../package.json");
|
||||
const currentVersion = packageJson.version;
|
||||
const targetVersion = process.env.VERSION;
|
||||
|
||||
console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, "targetVersion:", targetVersion);
|
||||
|
||||
// 验证 targetVersion 格式
|
||||
if (!targetVersion || typeof targetVersion !== 'string') {
|
||||
console.error("[NapCat] [CheckVersion] 目标版本格式不正确或未设置!");
|
||||
return;
|
||||
}
|
||||
|
||||
// 写入脚本文件的统一函数
|
||||
const writeScriptToFile = (content) => {
|
||||
fs.writeFileSync("./checkVersion.sh", content, { flag: 'w' });
|
||||
console.log("[NapCat] [CheckVersion] checkVersion.sh 文件已更新。");
|
||||
};
|
||||
|
||||
if (currentVersion === targetVersion) {
|
||||
// 不需要更新版本,写入一个简单的脚本
|
||||
const simpleScript = "#!/bin/bash\necho \"CheckVersion Is Done\"";
|
||||
writeScriptToFile(simpleScript);
|
||||
} else {
|
||||
// 更新版本,构建安全的sed命令
|
||||
const safeScriptContent = `
|
||||
#!/bin/bash
|
||||
git config --global user.email "bot@test.wumiao.wang"
|
||||
git config --global user.name "Version"
|
||||
sed -i "s/\\\"version\\\": \\\"${currentVersion}\\\"/\\\"version\\\": \\\"${targetVersion}\\\"/g" package.json
|
||||
git add .
|
||||
git commit -m "chore:version change"
|
||||
git push -u origin main`;
|
||||
writeScriptToFile(safeScriptContent);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("[NapCat] [CheckVersion] 检测过程中发生错误:", error);
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
let fs = require('fs');
|
||||
let path = require('path');
|
||||
|
||||
const coreDistDir = path.join(path.resolve(__dirname, '../'), 'src/core/dist/core/src');
|
||||
const coreLibDir = path.join(path.resolve(__dirname, '../'), 'src/core.lib/src');
|
||||
|
||||
function copyDir(currentPath, outputDir) {
|
||||
fs.readdir(currentPath, { withFileTypes: true }, (err, entries) => {
|
||||
if (err?.errno === -4058) return;
|
||||
|
||||
entries.forEach(entry => {
|
||||
const localBasePath = path.join(currentPath, entry.name);
|
||||
const outputLocalBasePath = path.join(outputDir, entry.name);
|
||||
|
||||
if (entry.isDirectory()) {
|
||||
// 如果是目录,递归调用
|
||||
if (!fs.existsSync(outputLocalBasePath)) {
|
||||
fs.mkdirSync(outputLocalBasePath, { recursive: true });
|
||||
}
|
||||
copyDir(localBasePath, outputLocalBasePath);
|
||||
}
|
||||
else{
|
||||
// 如果是文件,直接复制
|
||||
fs.copyFile(localBasePath, outputLocalBasePath, (err) => {
|
||||
if (err) throw err;
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
copyDir(coreDistDir, coreLibDir);
|
||||
@@ -0,0 +1,21 @@
|
||||
import fs from 'fs'
|
||||
import path from 'path'
|
||||
import { version } from '../src/onebot11/version'
|
||||
|
||||
const manifestPath = path.join(__dirname, '../package.json')
|
||||
|
||||
function readManifest (): any {
|
||||
if (fs.existsSync(manifestPath)) {
|
||||
return JSON.parse(fs.readFileSync(manifestPath, 'utf-8'))
|
||||
}
|
||||
}
|
||||
|
||||
function writeManifest (manifest: any) {
|
||||
fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2))
|
||||
}
|
||||
|
||||
const manifest = readManifest()
|
||||
if (version !== manifest.version) {
|
||||
manifest.version = version
|
||||
writeManifest(manifest)
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
chcp 65001
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
"H:\Program Files\QQNT最新版\QQ.exe" %~dp0/napcat.cjs %*
|
||||
File renamed without changes.
@@ -15,4 +15,4 @@ for %%a in ("!RetString!") do (
|
||||
set "QQPath=!pathWithoutUninstall!QQ.exe"
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
echo !QQPath!
|
||||
"!QQPath!" ./napcat.cjs %*
|
||||
"!QQPath!" ./napcat.mjs %*
|
||||
+32
-4
@@ -5,11 +5,39 @@ function Get-QQpath {
|
||||
return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
|
||||
}
|
||||
catch {
|
||||
return "D:\QQ.exe"
|
||||
throw "get QQ path error: $_"
|
||||
}
|
||||
}
|
||||
function Select-QQPath {
|
||||
Add-Type -AssemblyName System.Windows.Forms
|
||||
[System.Windows.Forms.Application]::EnableVisualStyles()
|
||||
|
||||
$dialogTitle = "Select QQ.exe"
|
||||
|
||||
$filePicker = New-Object System.Windows.Forms.OpenFileDialog
|
||||
$filePicker.Title = $dialogTitle
|
||||
$filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
|
||||
$filePicker.FilterIndex = 1
|
||||
$null = $filePicker.ShowDialog()
|
||||
if (-not ($filePicker.FileName)) {
|
||||
throw "User did not select an .exe file."
|
||||
}
|
||||
return $filePicker.FileName
|
||||
}
|
||||
|
||||
$params = $args -join " "
|
||||
$QQpath = Get-QQpath
|
||||
$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
|
||||
Try {
|
||||
$QQpath = Get-QQpath
|
||||
}
|
||||
Catch {
|
||||
$QQpath = Select-QQPath
|
||||
}
|
||||
|
||||
if (!(Test-Path $QQpath)) {
|
||||
throw "provided QQ path is invalid: $QQpath"
|
||||
}
|
||||
|
||||
$Bootfile = Join-Path $PSScriptRoot "napcat.mjs"
|
||||
$env:ELECTRON_RUN_AS_NODE = 1
|
||||
Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$QQpath' $Bootfile $params}"
|
||||
$commandInfo = Get-Command $QQpath -ErrorAction Stop
|
||||
Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' $Bootfile $params}"
|
||||
+1
-1
@@ -14,4 +14,4 @@ for %%a in ("!RetString!") do (
|
||||
set "QQPath=!pathWithoutUninstall!QQ.exe"
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
echo !QQPath!
|
||||
"!QQPath!" ./napcat.cjs %*
|
||||
"!QQPath!" ./napcat.mjs %*
|
||||
+32
-4
@@ -5,11 +5,39 @@ function Get-QQpath {
|
||||
return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
|
||||
}
|
||||
catch {
|
||||
return "D:\QQ.exe"
|
||||
throw "get QQ path error: $_"
|
||||
}
|
||||
}
|
||||
function Select-QQPath {
|
||||
Add-Type -AssemblyName System.Windows.Forms
|
||||
[System.Windows.Forms.Application]::EnableVisualStyles()
|
||||
|
||||
$dialogTitle = "Select QQ.exe"
|
||||
|
||||
$filePicker = New-Object System.Windows.Forms.OpenFileDialog
|
||||
$filePicker.Title = $dialogTitle
|
||||
$filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
|
||||
$filePicker.FilterIndex = 1
|
||||
$null = $filePicker.ShowDialog()
|
||||
if (-not ($filePicker.FileName)) {
|
||||
throw "User did not select an .exe file."
|
||||
}
|
||||
return $filePicker.FileName
|
||||
}
|
||||
|
||||
$params = $args -join " "
|
||||
$QQpath = Get-QQpath
|
||||
$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
|
||||
Try {
|
||||
$QQpath = Get-QQpath
|
||||
}
|
||||
Catch {
|
||||
$QQpath = Select-QQPath
|
||||
}
|
||||
|
||||
if (!(Test-Path $QQpath)) {
|
||||
throw "provided QQ path is invalid: $QQpath"
|
||||
}
|
||||
|
||||
$Bootfile = Join-Path $PSScriptRoot "napcat.mjs"
|
||||
$env:ELECTRON_RUN_AS_NODE = 1
|
||||
Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$QQpath' $Bootfile $params}"
|
||||
$commandInfo = Get-Command $QQpath -ErrorAction Stop
|
||||
Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$($commandInfo.Path)' $Bootfile $params}"
|
||||
+19
-2
@@ -1,4 +1,21 @@
|
||||
#!/bin/bash
|
||||
SCRIPT_DIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
|
||||
|
||||
get_script_dir() {
|
||||
local script_path="${1:-$0}"
|
||||
local script_dir
|
||||
script_path=$(readlink -f "$script_path")
|
||||
script_dir=$(dirname "$script_path")
|
||||
|
||||
echo "$script_dir"
|
||||
}
|
||||
|
||||
SCRIPT_DIR=$(get_script_dir)
|
||||
|
||||
export ELECTRON_RUN_AS_NODE=1
|
||||
/opt/QQ/qq ${SCRIPT_DIR}/napcat.cjs $@
|
||||
|
||||
if ! [ -x /opt/QQ/qq ]; then
|
||||
echo "Error: /opt/QQ/qq is not executable or does not exist." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
/opt/QQ/qq "${SCRIPT_DIR}/napcat.mjs" "$@"
|
||||
@@ -1,85 +0,0 @@
|
||||
import {
|
||||
type Friend,
|
||||
type FriendRequest,
|
||||
type Group,
|
||||
type GroupMember, GroupNotify,
|
||||
type SelfInfo
|
||||
} from '@/core/qqnt/entities';
|
||||
import { isNumeric } from './utils/helper';
|
||||
import { log } from '@/common/utils/log';
|
||||
|
||||
export const selfInfo: SelfInfo = {
|
||||
uid: '',
|
||||
uin: '',
|
||||
nick: '',
|
||||
online: true
|
||||
};
|
||||
|
||||
// groupCode -> Group
|
||||
export const groups: Map<string, Group> = new Map<string, Group>();
|
||||
|
||||
// 群号 -> 群成员map(uid=>GroupMember)
|
||||
export const groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
|
||||
|
||||
// uid -> Friend
|
||||
export const friends: Map<string, Friend> = new Map<string, Friend>();
|
||||
|
||||
export const friendRequests: Record<string, FriendRequest> = {}; // flag->FriendRequest
|
||||
export const groupNotifies: Record<string, GroupNotify> = {}; // flag->GroupNotify
|
||||
|
||||
export const napCatError = {
|
||||
ffmpegError: '',
|
||||
httpServerError: '',
|
||||
wsServerError: '',
|
||||
otherError: 'NapCat未能正常启动,请检查日志查看错误'
|
||||
};
|
||||
|
||||
export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
|
||||
uinOrUid = uinOrUid.toString();
|
||||
if (isNumeric(uinOrUid)) {
|
||||
const friendList = Array.from(friends.values());
|
||||
return friendList.find(friend => friend.uin === uinOrUid);
|
||||
} else {
|
||||
return friends.get(uinOrUid);
|
||||
}
|
||||
}
|
||||
|
||||
export async function getGroup(qq: string): Promise<Group | undefined> {
|
||||
const group = groups.get(qq.toString());
|
||||
return group;
|
||||
}
|
||||
|
||||
export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
|
||||
groupQQ = groupQQ.toString();
|
||||
memberUinOrUid = memberUinOrUid.toString();
|
||||
const members = groupMembers.get(groupQQ);
|
||||
if (!members) {
|
||||
return null;
|
||||
}
|
||||
// log('getGroupMember', members);
|
||||
if (isNumeric(memberUinOrUid)) {
|
||||
return Array.from(members.values()).find(member => member.uin === memberUinOrUid);
|
||||
} else {
|
||||
return members.get(memberUinOrUid);
|
||||
}
|
||||
}
|
||||
|
||||
export async function refreshGroupMembers(groupQQ: string) {
|
||||
// const group = groups.find(group => group.groupCode === groupQQ)
|
||||
// if (group) {
|
||||
// group.members = await NTQQGroupApi.getGroupMembers(groupQQ)
|
||||
// }
|
||||
}
|
||||
|
||||
export const uid2UinMap: Record<string, string> = {}; // 一串加密的字符串(uid) -> qq号
|
||||
|
||||
export function getUidByUin(uin: string) {
|
||||
for (const uid in uid2UinMap) {
|
||||
if (uid2UinMap[uid] === uin) {
|
||||
return uid;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const tempGroupCodeMap: Record<string, string> = {}; // peerUid => 群号
|
||||
|
||||
+30
-19
@@ -1,17 +1,19 @@
|
||||
import express, { Express, Request, Response } from 'express';
|
||||
import cors from 'cors';
|
||||
import http from 'http';
|
||||
import { log } from '../utils/log';
|
||||
import { log, logDebug, logError } from '../utils/log';
|
||||
import { ob11Config } from '@/onebot11/config';
|
||||
|
||||
type RegisterHandler = (res: Response, payload: any) => Promise<any>
|
||||
|
||||
export abstract class HttpServerBase {
|
||||
name: string = 'LLOneBot';
|
||||
name: string = 'NapCatQQ';
|
||||
private readonly expressAPP: Express;
|
||||
private server: http.Server | null = null;
|
||||
|
||||
constructor() {
|
||||
this.expressAPP = express();
|
||||
this.expressAPP.use(cors());
|
||||
this.expressAPP.use(express.urlencoded({ extended: true, limit: '5000mb' }));
|
||||
this.expressAPP.use((req, res, next) => {
|
||||
// 兼容处理没有带content-type的请求
|
||||
@@ -21,7 +23,7 @@ export abstract class HttpServerBase {
|
||||
// 调用原始的express.json()处理器
|
||||
originalJson(req, res, (err) => {
|
||||
if (err) {
|
||||
log('Error parsing JSON:', err);
|
||||
logError('Error parsing JSON:', err);
|
||||
return res.status(400).send('Invalid JSON');
|
||||
}
|
||||
next();
|
||||
@@ -35,14 +37,14 @@ export abstract class HttpServerBase {
|
||||
const authHeader = req.get('authorization');
|
||||
if (authHeader) {
|
||||
clientToken = authHeader.split('Bearer ').pop() || '';
|
||||
log('receive http header token', clientToken);
|
||||
//logDebug('receive http header token', clientToken);
|
||||
} else if (req.query.access_token) {
|
||||
if (Array.isArray(req.query.access_token)) {
|
||||
clientToken = req.query.access_token[0].toString();
|
||||
} else {
|
||||
clientToken = req.query.access_token.toString();
|
||||
}
|
||||
log('receive http url token', clientToken);
|
||||
//logDebug('receive http url token', clientToken);
|
||||
}
|
||||
|
||||
if (serverToken && clientToken != serverToken) {
|
||||
@@ -51,29 +53,29 @@ export abstract class HttpServerBase {
|
||||
next();
|
||||
}
|
||||
|
||||
start(port: number) {
|
||||
start(port: number, host: string) {
|
||||
try {
|
||||
this.expressAPP.get('/', (req: Request, res: Response) => {
|
||||
res.send(`${this.name}已启动`);
|
||||
});
|
||||
this.listen(port);
|
||||
this.listen(port, host);
|
||||
} catch (e: any) {
|
||||
log('HTTP服务启动失败', e.toString());
|
||||
// llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
|
||||
logError('HTTP服务启动失败', e.toString());
|
||||
// httpServerError = "HTTP服务启动失败, " + e.toString()
|
||||
}
|
||||
}
|
||||
|
||||
stop() {
|
||||
// llonebotError.httpServerError = ""
|
||||
// httpServerError = ""
|
||||
if (this.server) {
|
||||
this.server.close();
|
||||
this.server = null;
|
||||
}
|
||||
}
|
||||
|
||||
restart(port: number) {
|
||||
restart(port: number, host: string) {
|
||||
this.stop();
|
||||
this.start(port);
|
||||
this.start(port, host);
|
||||
}
|
||||
|
||||
abstract handleFailed(res: Response, payload: any, err: any): void
|
||||
@@ -86,7 +88,7 @@ export abstract class HttpServerBase {
|
||||
// @ts-expect-error wait fix
|
||||
if (!this.expressAPP[method]) {
|
||||
const err = `${this.name} register router failed,${method} not exist`;
|
||||
log(err);
|
||||
logError(err);
|
||||
throw err;
|
||||
}
|
||||
// @ts-expect-error wait fix
|
||||
@@ -94,8 +96,10 @@ export abstract class HttpServerBase {
|
||||
let payload = req.body;
|
||||
if (method == 'get') {
|
||||
payload = req.query;
|
||||
} else if (req.query) {
|
||||
payload = { ...req.query, ...req.body };
|
||||
}
|
||||
log('收到http请求', url, payload);
|
||||
logDebug('收到http请求', url, payload);
|
||||
try {
|
||||
res.send(await handler(res, payload));
|
||||
} catch (e: any) {
|
||||
@@ -104,10 +108,17 @@ export abstract class HttpServerBase {
|
||||
});
|
||||
}
|
||||
|
||||
protected listen(port: number) {
|
||||
this.server = this.expressAPP.listen(port, '0.0.0.0', () => {
|
||||
const info = `${this.name} started 0.0.0.0:${port}`;
|
||||
log(info);
|
||||
});
|
||||
protected listen(port: number, host: string = '0.0.0.0') {
|
||||
host = host || '0.0.0.0';
|
||||
try {
|
||||
this.server = this.expressAPP.listen(port, host, () => {
|
||||
const info = `${this.name} started ${host}:${port}`;
|
||||
log(info);
|
||||
}).on('error', (err) => {
|
||||
logError('HTTP服务启动失败', err.toString());
|
||||
});
|
||||
} catch (e: any) {
|
||||
logError('HTTP服务启动失败, 请检查监听的ip地址和端口', e.stack.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,11 +27,17 @@ export class WebsocketServerBase {
|
||||
constructor() {
|
||||
}
|
||||
|
||||
start(port: number) {
|
||||
start(port: number, host: string = '') {
|
||||
try {
|
||||
this.ws = new WebSocketServer({ port });
|
||||
this.ws = new WebSocketServer({
|
||||
port,
|
||||
host: '',
|
||||
maxPayload: 1024 * 1024 * 1024
|
||||
}).on('error', () => {
|
||||
});
|
||||
log(`ws服务启动成功, ${host}:${port}`);
|
||||
} catch (e: any) {
|
||||
throw Error('ws服务启动失败, ' + e.toString());
|
||||
throw Error('ws服务启动失败, 请检查监听的ip和端口' + e.toString());
|
||||
}
|
||||
this.ws.on('connection', (wsClient, req) => {
|
||||
const url: string = req.url!.split('?').shift() || '/';
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
import { sleep } from '@/common/utils/helper';
|
||||
|
||||
type AsyncQueueTask = (() => void) | (()=>Promise<void>);
|
||||
|
||||
|
||||
export class AsyncQueue {
|
||||
private tasks: (AsyncQueueTask)[] = [];
|
||||
|
||||
public addTask(task: AsyncQueueTask) {
|
||||
this.tasks.push(task);
|
||||
// console.log('addTask', this.tasks.length);
|
||||
if (this.tasks.length === 1) {
|
||||
this.runQueue().then().catch(()=>{});
|
||||
}
|
||||
}
|
||||
|
||||
private async runQueue() {
|
||||
// console.log('runQueue', this.tasks.length);
|
||||
while (this.tasks.length > 0) {
|
||||
const task = this.tasks[0];
|
||||
// console.log('typeof task', typeof task);
|
||||
try {
|
||||
const taskRet = task();
|
||||
// console.log('type of taskRet', typeof taskRet, taskRet);
|
||||
if (taskRet instanceof Promise) {
|
||||
await taskRet;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
this.tasks.shift();
|
||||
await sleep(100);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
import path from 'node:path';
|
||||
import fs from 'node:fs';
|
||||
import { log, logDebug, logError } from '@/common/utils/log';
|
||||
import { dirname } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
|
||||
const configDir = path.resolve(__dirname, 'config');
|
||||
fs.mkdirSync(configDir, { recursive: true });
|
||||
|
||||
|
||||
export class ConfigBase<T>{
|
||||
|
||||
constructor() {
|
||||
}
|
||||
|
||||
protected getKeys(): string[] | null {
|
||||
// 决定 key 在json配置文件中的顺序
|
||||
return null;
|
||||
}
|
||||
|
||||
getConfigDir(){
|
||||
const configDir = path.resolve(__dirname, 'config');
|
||||
fs.mkdirSync(configDir, { recursive: true });
|
||||
return configDir;
|
||||
}
|
||||
getConfigPath(): string {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
||||
read() {
|
||||
const configPath = this.getConfigPath();
|
||||
if (!fs.existsSync(configPath)) {
|
||||
try{
|
||||
fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
|
||||
log(`配置文件${configPath}已创建\n如果修改此文件后需要重启 NapCat 生效`);
|
||||
}
|
||||
catch (e: any) {
|
||||
logError(`创建配置文件 ${configPath} 时发生错误:`, e.message);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
try {
|
||||
const data = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
|
||||
logDebug(`配置文件${configPath}已加载`, data);
|
||||
Object.assign(this, data);
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-expect-error
|
||||
this.save(this); // 保存一次,让新版本的字段写入
|
||||
return this;
|
||||
} catch (e: any) {
|
||||
if (e instanceof SyntaxError) {
|
||||
logError(`配置文件 ${configPath} 格式错误,请检查配置文件:`, e.message);
|
||||
} else {
|
||||
logError(`读取配置文件 ${configPath} 时发生错误:`, e.message);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
save(config: T) {
|
||||
Object.assign(this, config);
|
||||
const configPath = this.getConfigPath();
|
||||
try {
|
||||
fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
|
||||
} catch (e: any) {
|
||||
logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,145 @@
|
||||
import { logError, logDebug } from "@/common/utils/log";
|
||||
|
||||
type group_id = number;
|
||||
type user_id = number;
|
||||
|
||||
class cacheNode<T> {
|
||||
value: T;
|
||||
groupId: group_id;
|
||||
userId: user_id;
|
||||
prev: cacheNode<T> | null;
|
||||
next: cacheNode<T> | null;
|
||||
timestamp: number;
|
||||
|
||||
constructor(groupId: group_id, userId: user_id, value: T) {
|
||||
this.groupId = groupId;
|
||||
this.userId = userId;
|
||||
this.value = value;
|
||||
this.prev = null;
|
||||
this.next = null;
|
||||
this.timestamp = Date.now();
|
||||
}
|
||||
}
|
||||
|
||||
type cache<T> = { [key: group_id]: { [key: user_id]: cacheNode<T> } };
|
||||
class LRU<T> {
|
||||
private maxAge: number;
|
||||
private maxSize: number;
|
||||
private currentSize: number;
|
||||
private cache: cache<T>;
|
||||
private head: cacheNode<T> | null = null;
|
||||
private tail: cacheNode<T> | null = null;
|
||||
private onFuncs: ((node: cacheNode<T>) => void)[] = [];
|
||||
|
||||
constructor(maxAge: number = 2e4, maxSize: number = 5e3) {
|
||||
this.maxAge = maxAge;
|
||||
this.maxSize = maxSize;
|
||||
this.cache = Object.create(null);
|
||||
this.currentSize = 0;
|
||||
|
||||
if (maxSize == 0) return;
|
||||
setInterval(() => this.removeExpired(), this.maxAge);
|
||||
}
|
||||
|
||||
// 移除LRU节点
|
||||
private removeLRUNode(node: cacheNode<T>) {
|
||||
logDebug(
|
||||
"removeLRUNode",
|
||||
node.groupId,
|
||||
node.userId,
|
||||
node.value,
|
||||
this.currentSize
|
||||
);
|
||||
node.prev = node.next = null;
|
||||
delete this.cache[node.groupId][node.userId];
|
||||
this.removeNode(node);
|
||||
this.onFuncs.forEach((func) => func(node));
|
||||
this.currentSize--;
|
||||
}
|
||||
|
||||
public on(func: (node: cacheNode<T>) => void) {
|
||||
this.onFuncs.push(func);
|
||||
}
|
||||
|
||||
private removeExpired() {
|
||||
const now = Date.now();
|
||||
let current = this.tail;
|
||||
const nodesToRemove: cacheNode<T>[] = [];
|
||||
let removedCount = 0;
|
||||
|
||||
// 收集需要删除的节点
|
||||
while (current && now - current.timestamp > this.maxAge) {
|
||||
nodesToRemove.push(current);
|
||||
current = current.prev;
|
||||
removedCount++;
|
||||
if (removedCount >= 100) break;
|
||||
}
|
||||
|
||||
// 更新链表指向
|
||||
if (nodesToRemove.length > 0) {
|
||||
const newTail = nodesToRemove[nodesToRemove.length - 1].prev;
|
||||
if (newTail) {
|
||||
newTail.next = null;
|
||||
} else {
|
||||
this.head = null;
|
||||
}
|
||||
this.tail = newTail;
|
||||
}
|
||||
|
||||
nodesToRemove.forEach((node) => {
|
||||
node.prev = node.next = null;
|
||||
delete this.cache[node.groupId][node.userId];
|
||||
|
||||
this.currentSize--;
|
||||
this.onFuncs.forEach((func) => func(node));
|
||||
});
|
||||
}
|
||||
|
||||
private addNode(node: cacheNode<T>) {
|
||||
node.next = this.head;
|
||||
if (this.head) this.head.prev = node;
|
||||
if (!this.tail) this.tail = node;
|
||||
this.head = node;
|
||||
}
|
||||
|
||||
private removeNode(node: cacheNode<T>) {
|
||||
if (node.prev) node.prev.next = node.next;
|
||||
if (node.next) node.next.prev = node.prev;
|
||||
if (node === this.head) this.head = node.next;
|
||||
if (node === this.tail) this.tail = node.prev;
|
||||
}
|
||||
|
||||
private moveToHead(node: cacheNode<T>) {
|
||||
if (this.head === node) return;
|
||||
|
||||
this.removeNode(node);
|
||||
this.addNode(node);
|
||||
node.prev = null;
|
||||
}
|
||||
|
||||
public set(groupId: group_id, userId: user_id, value: T) {
|
||||
if (!this.cache[groupId]) {
|
||||
this.cache[groupId] = Object.create(null);
|
||||
}
|
||||
|
||||
const groupObject = this.cache[groupId];
|
||||
|
||||
if (groupObject[userId]) {
|
||||
const node = groupObject[userId];
|
||||
node.value = value;
|
||||
node.timestamp = Date.now();
|
||||
this.moveToHead(node);
|
||||
} else {
|
||||
const node = new cacheNode(groupId, userId, value);
|
||||
groupObject[userId] = node;
|
||||
this.currentSize++;
|
||||
this.addNode(node);
|
||||
if (this.currentSize > this.maxSize) {
|
||||
const tail = this.tail!;
|
||||
this.removeLRUNode(tail);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export default LRU;
|
||||
@@ -37,24 +37,36 @@ type QQVersionConfigInfo = {
|
||||
}
|
||||
|
||||
let _qqVersionConfigInfo: QQVersionConfigInfo = {
|
||||
'baseVersion': '9.9.9-22578',
|
||||
'curVersion': '9.9.9-22578',
|
||||
'baseVersion': '9.9.9-23361',
|
||||
'curVersion': '9.9.9-23361',
|
||||
'prevVersion': '',
|
||||
'onErrorVersions': [],
|
||||
'buildId': '22578'
|
||||
'buildId': '23361'
|
||||
};
|
||||
|
||||
if (fs.existsSync(configVersionInfoPath)) {
|
||||
_qqVersionConfigInfo = JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
|
||||
try {
|
||||
const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
|
||||
_qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
|
||||
} catch (e) {
|
||||
console.error('Load QQ version config info failed, Use default version', e);
|
||||
}
|
||||
}
|
||||
|
||||
export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
|
||||
|
||||
export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
|
||||
export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toString());
|
||||
// platform_type: 3,
|
||||
// app_type: 4,
|
||||
// app_version: '9.9.9-23159',
|
||||
// qua: 'V1_WIN_NQ_9.9.9_23159_GW_B',
|
||||
// appid: '537213764',
|
||||
// platVer: '10.0.26100',
|
||||
// clientVer: '9.9.9-23159',
|
||||
|
||||
let _appid: string = '537213335'; // 默认为 Windows 平台的 appid
|
||||
let _appid: string = '537213803'; // 默认为 Windows 平台的 appid
|
||||
if (systemPlatform === 'linux') {
|
||||
_appid = '537213710';
|
||||
_appid = '537213827';
|
||||
}
|
||||
// todo: mac 平台的 appid
|
||||
export const appid = _appid;
|
||||
@@ -1,7 +1,7 @@
|
||||
import fs from 'fs';
|
||||
import { encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm';
|
||||
import fsPromise from 'fs/promises';
|
||||
import { log } from './log';
|
||||
import { log, logError } from './log';
|
||||
import path from 'node:path';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { spawn } from 'node:child_process';
|
||||
@@ -129,7 +129,7 @@ export async function encodeSilk(filePath: string) {
|
||||
};
|
||||
}
|
||||
} catch (error: any) {
|
||||
log('convert silk failed', error.stack);
|
||||
logError('convert silk failed', error.stack);
|
||||
return {};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import * as os from 'os';
|
||||
import path from 'node:path';
|
||||
import fs from 'fs';
|
||||
import { dirname } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
export function getModuleWithArchName(moduleName: string) {
|
||||
const systemPlatform = os.platform();
|
||||
const cpuArch = os.arch();
|
||||
return `${moduleName}-${systemPlatform}-${cpuArch}.node`;
|
||||
}
|
||||
|
||||
export function cpModule(moduleName: string) {
|
||||
const currentDir = path.resolve(__dirname);
|
||||
const fileName = `./${getModuleWithArchName(moduleName)}`;
|
||||
try {
|
||||
fs.copyFileSync(path.join(currentDir, fileName), path.join(currentDir, `${moduleName}.node`));
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
+509
-323
@@ -1,323 +1,509 @@
|
||||
import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
|
||||
|
||||
import sqlite3 from 'sqlite3';
|
||||
import { log } from '@/common/utils/log';
|
||||
|
||||
type DBMsg = {
|
||||
id: number,
|
||||
longId: string,
|
||||
seq: number,
|
||||
peerUid: string,
|
||||
msg: string
|
||||
}
|
||||
|
||||
type DBFile = {
|
||||
name: string; // 文件名
|
||||
path: string;
|
||||
url: string;
|
||||
size: number;
|
||||
uuid: string;
|
||||
msgId: string;
|
||||
elementId: string;
|
||||
element: PicElement | VideoElement | FileElement | PttElement;
|
||||
elementType: ElementType.PIC | ElementType.VIDEO | ElementType.FILE | ElementType.PTT;
|
||||
}
|
||||
|
||||
|
||||
class DBUtilBase {
|
||||
protected db: sqlite3.Database | undefined;
|
||||
|
||||
createConnection(dbPath: string) {
|
||||
if (this.db) {
|
||||
return;
|
||||
}
|
||||
this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
|
||||
if (err) {
|
||||
log('Could not connect to database', err);
|
||||
return;
|
||||
}
|
||||
this.createTable();
|
||||
});
|
||||
}
|
||||
|
||||
protected createTable() {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
||||
close() {
|
||||
this.db?.close();
|
||||
}
|
||||
}
|
||||
|
||||
class DBUtil extends DBUtilBase {
|
||||
private msgCache: Map<string, RawMessage> = new Map<string, RawMessage>();
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
const interval = 1000 * 60 * 10; // 10分钟清理一次缓存
|
||||
setInterval(() => {
|
||||
log('清理消息缓存');
|
||||
this.msgCache.forEach((msg, key) => {
|
||||
if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
|
||||
this.msgCache.delete(key);
|
||||
}
|
||||
});
|
||||
}, interval);
|
||||
}
|
||||
|
||||
|
||||
protected createTable() {
|
||||
// 消息记录
|
||||
const createTableSQL = `
|
||||
CREATE TABLE IF NOT EXISTS msgs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
long_id TEXT NOT NULL UNIQUE,
|
||||
seq INTEGER NOT NULL,
|
||||
peer_uid TEXT NOT NULL,
|
||||
msg TEXT NOT NULL
|
||||
)`;
|
||||
this.db!.run(createTableSQL, function (err) {
|
||||
if (err) {
|
||||
log('Could not create table', err);
|
||||
}
|
||||
});
|
||||
|
||||
// 文件缓存
|
||||
const createFileTableSQL = `
|
||||
CREATE TABLE IF NOT EXISTS files (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL,
|
||||
path TEXT NOT NULL,
|
||||
url TEXT,
|
||||
size INTEGER NOT NULL,
|
||||
uuid TEXT,
|
||||
elementType INTEGER,
|
||||
element TEXT NOT NULL,
|
||||
elementId TEXT NOT NULL,
|
||||
msgId TEXT NOT NULL
|
||||
)`;
|
||||
this.db!.run(createFileTableSQL, function (err) {
|
||||
if (err) {
|
||||
log('Could not create table files', err);
|
||||
}
|
||||
});
|
||||
|
||||
// 接收到的临时会话消息uid
|
||||
const createTempUinTableSQL = `
|
||||
CREATE TABLE IF NOT EXISTS temp_uins (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
uid TEXT,
|
||||
uin TEXT
|
||||
)`;
|
||||
this.db!.run(createTempUinTableSQL, function (err) {
|
||||
if (err) {
|
||||
log('Could not create table temp_uins', err);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private async getMsg(query: string, params: any[]) {
|
||||
const stmt = this.db!.prepare(query);
|
||||
return new Promise<RawMessage | null>((resolve, reject) => {
|
||||
stmt.get(...params, (err: any, row: DBMsg) => {
|
||||
// log("getMsg", row, err);
|
||||
if (err) {
|
||||
log('Could not get msg by short id', err);
|
||||
resolve(null);
|
||||
}
|
||||
try {
|
||||
const msg = JSON.parse(row.msg);
|
||||
msg.id = row.id;
|
||||
return resolve(msg);
|
||||
} catch (e) {
|
||||
return resolve(null);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async getMsgByShortId(shortId: number): Promise<RawMessage | null> {
|
||||
const getStmt = 'SELECT * FROM msgs WHERE id = ?';
|
||||
return this.getMsg(getStmt, [shortId]);
|
||||
}
|
||||
|
||||
async getMsgByLongId(longId: string): Promise<RawMessage | null> {
|
||||
if (this.msgCache.has(longId)) {
|
||||
return this.msgCache.get(longId)!;
|
||||
}
|
||||
return this.getMsg('SELECT * FROM msgs WHERE long_id = ?', [longId]);
|
||||
}
|
||||
|
||||
async getMsgBySeq(peerUid: string, seq: string): Promise<RawMessage | null> {
|
||||
const stmt = 'SELECT * FROM msgs WHERE peer_uid = ? AND seq = ?';
|
||||
return this.getMsg(stmt, [peerUid, seq]);
|
||||
}
|
||||
|
||||
async addMsg(msg: RawMessage, update = true): Promise<number> {
|
||||
log('正在记录消息到数据库', msg.msgId);
|
||||
const existMsg = await this.getMsgByLongId(msg.msgId);
|
||||
if (existMsg) {
|
||||
// log('消息已存在,更新数据库', msg.msgId);
|
||||
if (update) this.updateMsg(msg).then();
|
||||
return existMsg.id!;
|
||||
}
|
||||
const stmt = this.db!.prepare('INSERT INTO msgs (long_id, seq, peer_uid, msg) VALUES (?, ?, ?, ?)');
|
||||
|
||||
// const runAsync = promisify(stmt.run.bind(stmt));
|
||||
return new Promise((resolve, reject) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
||||
const dbInstance = this;
|
||||
stmt.run(msg.msgId, msg.msgSeq, msg.peerUid, JSON.stringify(msg), function (err: any) {
|
||||
if (err) {
|
||||
if (err.errno === 19) {
|
||||
// log('消息已存在,更新数据库', msg.msgId);
|
||||
dbInstance.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
|
||||
if (msg) {
|
||||
dbInstance.msgCache.set(msg.msgId, msg);
|
||||
// log('获取消息短id成功', msg.id);
|
||||
resolve(msg.id!);
|
||||
} else {
|
||||
log('db could not get msg by long id', err);
|
||||
resolve(-1);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
log('db could not add msg', err);
|
||||
resolve(-1);
|
||||
}
|
||||
} else {
|
||||
// log("addMsg", this);
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-expect-error
|
||||
msg.id = this.lastID;
|
||||
dbInstance.msgCache.set(msg.msgId, msg);
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// log('获取消息短id成功', this.lastID);
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-expect-error
|
||||
resolve(this.lastID);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async updateMsg(msg: RawMessage) {
|
||||
const existMsg = this.msgCache.get(msg.msgId);
|
||||
if (existMsg) {
|
||||
Object.assign(existMsg, msg);
|
||||
}
|
||||
const stmt = this.db!.prepare('UPDATE msgs SET msg = ?, seq = ? WHERE long_id = ?');
|
||||
try {
|
||||
stmt.run(JSON.stringify(msg), msg.msgSeq, msg.msgId);
|
||||
} catch (e) {
|
||||
log('updateMsg db error', e);
|
||||
}
|
||||
}
|
||||
|
||||
async addFileCache(file: DBFile) {
|
||||
const stmt = this.db!.prepare('INSERT INTO files (name, path, url, size, uuid, elementType ,element, elementId, msgId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)');
|
||||
return new Promise((resolve, reject) => {
|
||||
stmt.run(file.name, file.path, file.url, file.size, file.uuid,
|
||||
file.elementType,
|
||||
JSON.stringify(file.element),
|
||||
file.elementId,
|
||||
file.msgId,
|
||||
function (err: any) {
|
||||
if (err) {
|
||||
log('db could not add file', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private async getFileCache(query: string, params: any[]) {
|
||||
const stmt = this.db!.prepare(query);
|
||||
return new Promise<DBFile | null>((resolve, reject) => {
|
||||
stmt.get(...params, (err: any, row: DBFile & { element: string }) => {
|
||||
if (err) {
|
||||
log('db could not get file cache', err);
|
||||
reject(err);
|
||||
}
|
||||
if (row) {
|
||||
row.element = JSON.parse(row.element);
|
||||
}
|
||||
resolve(row);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async getFileCacheByName(name: string): Promise<DBFile | null> {
|
||||
return this.getFileCache('SELECT * FROM files WHERE name = ?', [name]);
|
||||
}
|
||||
|
||||
async getFileCacheByUuid(uuid: string): Promise<DBFile | null> {
|
||||
return this.getFileCache('SELECT * FROM files WHERE uuid = ?', [uuid]);
|
||||
}
|
||||
|
||||
// todo: 是否所有的文件都有uuid?语音消息有没有uuid?
|
||||
async updateFileCache(file: DBFile) {
|
||||
const stmt = this.db!.prepare('UPDATE files SET path = ?, url = ? WHERE uuid = ?');
|
||||
return new Promise((resolve, reject) => {
|
||||
stmt.run(file.path, file.url, function (err: any) {
|
||||
if (err) {
|
||||
log('db could not update file cache', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// 被动收到的临时会话消息uin->uid
|
||||
async getReceivedTempUinMap() {
|
||||
const stmt = 'SELECT * FROM temp_uins';
|
||||
return new Promise<Record<string, string>>((resolve, reject) => {
|
||||
this.db!.all(stmt, (err, rows: { uin: string, uid: string }[]) => {
|
||||
if (err) {
|
||||
log('db could not get temp uin map', err);
|
||||
reject(err);
|
||||
}
|
||||
const map: Record<string, string> = {};
|
||||
rows.forEach(row => {
|
||||
map[row.uin] = row.uid;
|
||||
});
|
||||
resolve(map);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// 通过uin获取临时会话消息uid
|
||||
async getUidByTempUin(uid: string) {
|
||||
const stmt = 'SELECT * FROM temp_uins WHERE uin = ?';
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
this.db!.get(stmt, [uid], (err, row: { uin: string, uid: string }) => {
|
||||
if (err) {
|
||||
log('db could not get temp uin map', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(row?.uid);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async addTempUin(uin: string, uid: string) {
|
||||
const existUid = await this.getUidByTempUin(uin);
|
||||
if (!existUid) {
|
||||
const stmt = this.db!.prepare('INSERT INTO temp_uins (uin, uid) VALUES (?, ?)');
|
||||
return new Promise((resolve, reject) => {
|
||||
stmt.run(uin, uid, function (err: any) {
|
||||
if (err) {
|
||||
log('db could not add temp uin', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const dbUtil = new DBUtil();
|
||||
import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '../../core/src/entities';
|
||||
|
||||
import sqlite3 from 'sqlite3';
|
||||
import { log, logDebug, logError } from '@/common/utils/log';
|
||||
import { NTQQMsgApi } from '@/core';
|
||||
import LRU from "@/common/utils/LRUCache";
|
||||
|
||||
export interface IRember {
|
||||
last_sent_time: number;
|
||||
join_time: number;
|
||||
user_id: number;
|
||||
}
|
||||
|
||||
|
||||
type DBMsg = {
|
||||
id: number,
|
||||
shortId: number,
|
||||
longId: string,
|
||||
seq: number,
|
||||
peerUid: string,
|
||||
chatType: number,
|
||||
}
|
||||
|
||||
type DBFile = {
|
||||
name: string; // 文件名
|
||||
path: string;
|
||||
url: string;
|
||||
size: number;
|
||||
uuid: string;
|
||||
msgId: string;
|
||||
elementId: string;
|
||||
element: PicElement | VideoElement | FileElement | PttElement;
|
||||
elementType: ElementType.PIC | ElementType.VIDEO | ElementType.FILE | ElementType.PTT;
|
||||
}
|
||||
|
||||
|
||||
class DBUtilBase {
|
||||
protected db: sqlite3.Database | undefined;
|
||||
|
||||
async init(dbPath: string) {
|
||||
if (this.db) {
|
||||
return;
|
||||
}
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
|
||||
if (err) {
|
||||
logError('Could not connect to database', err);
|
||||
reject(err);
|
||||
return;
|
||||
}
|
||||
this.createTable();
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
protected createTable() {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
||||
close() {
|
||||
this.db?.close();
|
||||
}
|
||||
}
|
||||
|
||||
class DBUtil extends DBUtilBase {
|
||||
private msgCache: Map<string | number, RawMessage> = new Map<string | number, RawMessage>();
|
||||
private globalMsgShortId = -2147483640;
|
||||
private groupIds: number[] = [];
|
||||
private LURCache = new LRU<number>();
|
||||
private LastSentCache = new (class {
|
||||
private cache: { gid: number; uid: number }[] = [];
|
||||
private maxSize: number;
|
||||
|
||||
constructor(maxSize: number = 5000) {
|
||||
this.maxSize = maxSize;
|
||||
}
|
||||
|
||||
get(gid: number, uid: number): boolean {
|
||||
const exists = this.cache.some(
|
||||
(entry) => entry.gid === gid && entry.uid === uid
|
||||
);
|
||||
if (!exists) {
|
||||
this.cache.push({ gid, uid });
|
||||
if (this.cache.length > this.maxSize) {
|
||||
this.cache.shift();
|
||||
}
|
||||
}
|
||||
|
||||
return exists;
|
||||
}
|
||||
})();
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
const interval = 1000 * 60 * 10; // 10分钟清理一次缓存
|
||||
setInterval(() => {
|
||||
logDebug('清理消息缓存');
|
||||
this.msgCache.forEach((msg, key) => {
|
||||
if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
|
||||
this.msgCache.delete(key);
|
||||
}
|
||||
});
|
||||
}, interval);
|
||||
}
|
||||
|
||||
async init(dbPath: string) {
|
||||
await super.init(dbPath);
|
||||
this.globalMsgShortId = await this.getCurrentMaxShortId();
|
||||
|
||||
|
||||
// 初始化群缓存列表
|
||||
this.db!.serialize(() => {
|
||||
const sql = `SELECT * FROM sqlite_master WHERE type='table'`;
|
||||
this.db!.all(sql, [], (err, rows: { name: string }[]) => {
|
||||
if (err) return logError(err);
|
||||
rows.forEach((row) => this.groupIds.push(parseInt(row.name)));
|
||||
//logDebug(`已加载 ${groupIds.length} 个群`);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
this.LURCache.on(async (node) => {
|
||||
const { value: time, groupId, userId } = node;
|
||||
|
||||
logDebug("插入发言时间", userId, groupId);
|
||||
await this.createGroupInfoTimeTableIfNotExist(groupId);
|
||||
|
||||
const method = await this.getDataSetMethod(groupId, userId);
|
||||
logDebug("插入发言时间方法判断", userId, groupId, method);
|
||||
|
||||
const sql =
|
||||
method == "update"
|
||||
? `UPDATE "${groupId}" SET last_sent_time = ? WHERE user_id = ?`
|
||||
: `INSERT INTO "${groupId}" (last_sent_time, user_id) VALUES (?, ?)`;
|
||||
|
||||
this.db!.all(sql, [time, userId], (err) => {
|
||||
if (err) {
|
||||
return logError("插入/更新发言时间失败", userId, groupId);
|
||||
}
|
||||
logDebug("插入/更新发言时间成功", userId, groupId);
|
||||
});
|
||||
|
||||
});
|
||||
}
|
||||
async getDataSetMethod(groupId: number, userId: number) {
|
||||
// 缓存记录
|
||||
if (this.LastSentCache.get(groupId, userId)) {
|
||||
logDebug("缓存命中", userId, groupId);
|
||||
return "update";
|
||||
}
|
||||
|
||||
// 数据库判断
|
||||
return new Promise<"insert" | "update">((resolve, reject) => {
|
||||
this.db!.all(
|
||||
`SELECT * FROM "${groupId}" WHERE user_id = ?`,
|
||||
[userId],
|
||||
(err, rows) => {
|
||||
if (err) {
|
||||
logError("查询发言时间存在失败", userId, groupId, err);
|
||||
return logError("插入发言时间失败", userId, groupId, err);
|
||||
}
|
||||
|
||||
if (rows.length === 0) {
|
||||
logDebug("查询发言时间不存在", userId, groupId);
|
||||
return resolve("insert");
|
||||
}
|
||||
|
||||
logDebug("查询发言时间存在", userId, groupId);
|
||||
resolve("update");
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
async createGroupInfoTimeTableIfNotExist(groupId: number) {
|
||||
const createTableSQL = (groupId: number) =>
|
||||
`CREATE TABLE IF NOT EXISTS "${groupId}" (
|
||||
user_id INTEGER,
|
||||
last_sent_time INTEGER,
|
||||
join_time INTEGER,
|
||||
PRIMARY KEY (user_id)
|
||||
);`;
|
||||
|
||||
if (this.groupIds.includes(groupId)) {
|
||||
return;
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
const sql = createTableSQL(groupId);
|
||||
this.db!.all(sql, (err) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
return;
|
||||
}
|
||||
this.groupIds.push(groupId);
|
||||
resolve(true);
|
||||
});
|
||||
});
|
||||
}
|
||||
protected createTable() {
|
||||
// 消息记录
|
||||
const createTableSQL = `
|
||||
CREATE TABLE IF NOT EXISTS msgs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
shortId INTEGER NOT NULL UNIQUE,
|
||||
longId TEXT NOT NULL UNIQUE,
|
||||
seq INTEGER NOT NULL,
|
||||
peerUid TEXT NOT NULL,
|
||||
chatType INTEGER NOT NULL
|
||||
)`;
|
||||
this.db!.run(createTableSQL, function (err) {
|
||||
if (err) {
|
||||
logError('Could not create table msgs', err.stack);
|
||||
}
|
||||
});
|
||||
|
||||
// 文件缓存
|
||||
const createFileTableSQL = `
|
||||
CREATE TABLE IF NOT EXISTS files (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL,
|
||||
path TEXT NOT NULL,
|
||||
url TEXT,
|
||||
size INTEGER NOT NULL,
|
||||
uuid TEXT,
|
||||
elementType INTEGER,
|
||||
element TEXT NOT NULL,
|
||||
elementId TEXT NOT NULL,
|
||||
msgId TEXT NOT NULL
|
||||
)`;
|
||||
this.db!.run(createFileTableSQL, function (err) {
|
||||
if (err) {
|
||||
logError('Could not create table files', err);
|
||||
}
|
||||
});
|
||||
|
||||
// 接收到的临时会话消息uid
|
||||
const createTempUinTableSQL = `
|
||||
CREATE TABLE IF NOT EXISTS temp_uins (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
uid TEXT,
|
||||
uin TEXT
|
||||
)`;
|
||||
this.db!.run(createTempUinTableSQL, function (err) {
|
||||
if (err) {
|
||||
logError('Could not create table temp_uins', err);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private async getCurrentMaxShortId() {
|
||||
return new Promise<number>((resolve, reject) => {
|
||||
this.db!.get('SELECT MAX(shortId) as maxId FROM msgs', (err, row: { maxId: number }) => {
|
||||
if (err) {
|
||||
logDebug('Could not get max short id, Use default -2147483640', err);
|
||||
return resolve(-2147483640);
|
||||
}
|
||||
logDebug('数据库中消息最大短id', row?.maxId);
|
||||
resolve(row?.maxId ?? -2147483640);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private async getMsg(query: string, params: any[]) {
|
||||
const stmt = this.db!.prepare(query);
|
||||
return new Promise<RawMessage | null>((resolve, reject) => {
|
||||
stmt.get(...params, (err: any, row: DBMsg) => {
|
||||
// log("getMsg", row, err);
|
||||
if (err) {
|
||||
logError('Could not get msg', err, query, params);
|
||||
return resolve(null);
|
||||
}
|
||||
if (!row) {
|
||||
// logDebug('不存在数据库中的消息,不进行处理', query, params);
|
||||
resolve(null);
|
||||
return;
|
||||
}
|
||||
const msgId = row.longId;
|
||||
NTQQMsgApi.getMsgsByMsgId({ peerUid: row.peerUid, chatType: row.chatType }, [msgId]).then(res => {
|
||||
const msg = res.msgList[0];
|
||||
if (!msg) {
|
||||
resolve(null);
|
||||
return;
|
||||
}
|
||||
msg.id = row.shortId;
|
||||
resolve(msg);
|
||||
}).catch(e => {
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async getMsgByShortId(shortId: number): Promise<RawMessage | null> {
|
||||
if (this.msgCache.has(shortId)) {
|
||||
return this.msgCache.get(shortId)!;
|
||||
}
|
||||
const getStmt = 'SELECT * FROM msgs WHERE shortId = ?';
|
||||
return this.getMsg(getStmt, [shortId]);
|
||||
}
|
||||
|
||||
async getMsgByLongId(longId: string): Promise<RawMessage | null> {
|
||||
if (this.msgCache.has(longId)) {
|
||||
return this.msgCache.get(longId)!;
|
||||
}
|
||||
return this.getMsg('SELECT * FROM msgs WHERE longId = ?', [longId]);
|
||||
}
|
||||
|
||||
async getMsgBySeq(peerUid: string, seq: string): Promise<RawMessage | null> {
|
||||
const stmt = 'SELECT * FROM msgs WHERE peerUid = ? AND seq = ?';
|
||||
return this.getMsg(stmt, [peerUid, seq]);
|
||||
}
|
||||
|
||||
async addMsg(msg: RawMessage, update = true): Promise<number> {
|
||||
const existMsg = await this.getMsgByLongId(msg.msgId);
|
||||
if (existMsg) {
|
||||
// logDebug('消息已存在,更新数据库', msg.msgId);
|
||||
if (update) this.updateMsg(msg).then();
|
||||
return existMsg.id!;
|
||||
}
|
||||
const stmt = this.db!.prepare('INSERT INTO msgs (shortId, longId, seq, peerUid, chatType) VALUES (?, ?, ?, ?, ?)');
|
||||
// const runAsync = promisify(stmt.run.bind(stmt));
|
||||
const shortId = ++this.globalMsgShortId;
|
||||
msg.id = shortId;
|
||||
//logDebug(`记录消息到数据库, 消息长id: ${msg.msgId}, 短id: ${msg.id}`);
|
||||
this.msgCache.set(shortId, msg);
|
||||
this.msgCache.set(msg.msgId, msg);
|
||||
stmt.run(this.globalMsgShortId, msg.msgId, msg.msgSeq.toString(), msg.peerUid, msg.chatType, (err: any) => {
|
||||
if (err) {
|
||||
if (err.errno === 19) {
|
||||
this.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
|
||||
if (msg) {
|
||||
this.msgCache.set(shortId, msg);
|
||||
this.msgCache.set(msg.msgId, msg);
|
||||
// logDebug('获取消息短id成功', msg.id);
|
||||
} else {
|
||||
logError('db could not get msg by long id', err);
|
||||
}
|
||||
}).catch(e => logError('db getMsgByLongId error', e));
|
||||
} else {
|
||||
logError('db could not add msg', err);
|
||||
}
|
||||
}
|
||||
});
|
||||
return shortId;
|
||||
}
|
||||
|
||||
async updateMsg(msg: RawMessage) {
|
||||
const existMsg = this.msgCache.get(msg.msgId);
|
||||
if (existMsg) {
|
||||
Object.assign(existMsg, msg);
|
||||
}
|
||||
//logDebug(`更新消息, shortId:${msg.id}, seq: ${msg.msgSeq}, msgId: ${msg.msgId}`);
|
||||
const stmt = this.db!.prepare('UPDATE msgs SET seq=? WHERE longId=?');
|
||||
stmt.run(msg.msgSeq, msg.msgId, (err: any) => {
|
||||
if (err) {
|
||||
logError('updateMsg db error', err);
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
async addFileCache(file: DBFile) {
|
||||
const stmt = this.db!.prepare('INSERT INTO files (name, path, url, size, uuid, elementType ,element, elementId, msgId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)');
|
||||
return new Promise((resolve, reject) => {
|
||||
stmt.run(file.name, file.path, file.url, file.size, file.uuid,
|
||||
file.elementType,
|
||||
JSON.stringify(file.element),
|
||||
file.elementId,
|
||||
file.msgId,
|
||||
function (err: any) {
|
||||
if (err) {
|
||||
logError('db could not add file', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private async getFileCache(query: string, params: any[]) {
|
||||
const stmt = this.db!.prepare(query);
|
||||
return new Promise<DBFile | null>((resolve, reject) => {
|
||||
stmt.get(...params, (err: any, row: DBFile & { element: string }) => {
|
||||
if (err) {
|
||||
logError('db could not get file cache', err);
|
||||
reject(err);
|
||||
}
|
||||
if (row) {
|
||||
row.element = JSON.parse(row.element);
|
||||
}
|
||||
resolve(row);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async getFileCacheByName(name: string): Promise<DBFile | null> {
|
||||
return this.getFileCache('SELECT * FROM files WHERE name = ?', [name]);
|
||||
}
|
||||
|
||||
async getFileCacheByUuid(uuid: string): Promise<DBFile | null> {
|
||||
return this.getFileCache('SELECT * FROM files WHERE uuid = ?', [uuid]);
|
||||
}
|
||||
|
||||
// todo: 是否所有的文件都有uuid?语音消息有没有uuid?
|
||||
async updateFileCache(file: DBFile) {
|
||||
const stmt = this.db!.prepare('UPDATE files SET path = ?, url = ? WHERE uuid = ?');
|
||||
return new Promise((resolve, reject) => {
|
||||
stmt.run(file.path, file.url, file.uuid, function (err: any) {
|
||||
if (err) {
|
||||
logError('db could not update file cache', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// 被动收到的临时会话消息uin->uid
|
||||
async getReceivedTempUinMap() {
|
||||
const stmt = 'SELECT * FROM temp_uins';
|
||||
return new Promise<Record<string, string>>((resolve, reject) => {
|
||||
this.db!.all(stmt, (err, rows: { uin: string, uid: string }[]) => {
|
||||
if (err) {
|
||||
logError('db could not get temp uin map', err);
|
||||
reject(err);
|
||||
}
|
||||
const map: Record<string, string> = {};
|
||||
rows.forEach(row => {
|
||||
map[row.uin] = row.uid;
|
||||
});
|
||||
resolve(map);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// 通过uin获取临时会话消息uid
|
||||
async getUidByTempUin(uid: string) {
|
||||
const stmt = 'SELECT * FROM temp_uins WHERE uin = ?';
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
this.db!.get(stmt, [uid], (err, row: { uin: string, uid: string }) => {
|
||||
if (err) {
|
||||
logError('db could not get temp uin map', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(row?.uid);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async addTempUin(uin: string, uid: string) {
|
||||
const existUid = await this.getUidByTempUin(uin);
|
||||
if (!existUid) {
|
||||
const stmt = this.db!.prepare('INSERT INTO temp_uins (uin, uid) VALUES (?, ?)');
|
||||
return new Promise((resolve, reject) => {
|
||||
stmt.run(uin, uid, function (err: any) {
|
||||
if (err) {
|
||||
logError('db could not add temp uin', err);
|
||||
reject(err);
|
||||
}
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
async getLastSentTimeAndJoinTime(
|
||||
groupId: number
|
||||
): Promise<IRember[]> {
|
||||
logDebug("读取发言时间", groupId);
|
||||
return new Promise<IRember[]>((resolve, reject) => {
|
||||
this.db!.all(`SELECT * FROM "${groupId}" `, (err, rows: IRember[]) => {
|
||||
if (err) {
|
||||
logError("查询发言时间失败", groupId);
|
||||
return resolve([]);
|
||||
}
|
||||
logDebug("查询发言时间成功", groupId, rows);
|
||||
resolve(rows);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
insertLastSentTime(
|
||||
groupId: number,
|
||||
userId: number,
|
||||
time: number
|
||||
) {
|
||||
this.LURCache.set(groupId, userId, time)
|
||||
}
|
||||
async insertJoinTime(
|
||||
groupId: number,
|
||||
userId: number,
|
||||
time: number
|
||||
) {
|
||||
await this.createGroupInfoTimeTableIfNotExist(groupId);
|
||||
this.db!.all(
|
||||
`INSERT OR REPLACE INTO "${groupId}" (user_id, last_sent_time, join_time) VALUES (?,?,?)`,
|
||||
[userId, time, time],
|
||||
(err) => {
|
||||
if (err)
|
||||
logError(err),
|
||||
Promise.reject(),
|
||||
console.log("插入入群时间失败", userId, groupId);
|
||||
}
|
||||
);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const dbUtil = new DBUtil();
|
||||
@@ -4,14 +4,13 @@ import crypto from 'crypto';
|
||||
import util from 'util';
|
||||
import path from 'node:path';
|
||||
import { log } from './log';
|
||||
import { dbUtil } from './db';
|
||||
import { dbUtil } from '@/common/utils/db';
|
||||
import * as fileType from 'file-type';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { napCatCore } from '@/core';
|
||||
import os from 'node:os';
|
||||
|
||||
export const getNapCatDir = () => {
|
||||
const p = path.join(napCatCore.wrapper.dataPath, 'NapCat');
|
||||
const p = path.join(napCatCore.dataPath, 'NapCat');
|
||||
fs.mkdirSync(p, { recursive: true });
|
||||
return p;
|
||||
};
|
||||
@@ -126,7 +125,7 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
|
||||
}
|
||||
}
|
||||
}
|
||||
const fetchRes = await fetch(url, headers);
|
||||
const fetchRes = await fetch(url, { headers });
|
||||
if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
|
||||
|
||||
const blob = await fetchRes.blob();
|
||||
@@ -194,6 +193,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
|
||||
// res.ext = pathInfo.ext
|
||||
}
|
||||
}
|
||||
fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
|
||||
res.fileName = fileName;
|
||||
filePath = path.join(getTempDir(), uuidv4() + fileName);
|
||||
fs.writeFileSync(filePath, buffer);
|
||||
|
||||
+164
-1
@@ -1,6 +1,13 @@
|
||||
import crypto from 'node:crypto';
|
||||
import { resolve } from 'dns';
|
||||
import path from 'node:path';
|
||||
import fs from 'fs/promises';
|
||||
import { log, logDebug } from './log';
|
||||
import { dirname } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
export function sleep(ms: number): Promise<void> {
|
||||
return new Promise(resolve => setTimeout(resolve, ms));
|
||||
}
|
||||
@@ -19,3 +26,159 @@ export function isNull(value: any) {
|
||||
export function isNumeric(str: string) {
|
||||
return /^\d+$/.test(str);
|
||||
}
|
||||
|
||||
export function truncateString(obj: any, maxLength = 500) {
|
||||
if (obj !== null && typeof obj === 'object') {
|
||||
Object.keys(obj).forEach(key => {
|
||||
if (typeof obj[key] === 'string') {
|
||||
// 如果是字符串且超过指定长度,则截断
|
||||
if (obj[key].length > maxLength) {
|
||||
obj[key] = obj[key].substring(0, maxLength) + '...';
|
||||
}
|
||||
} else if (typeof obj[key] === 'object') {
|
||||
// 如果是对象或数组,则递归调用
|
||||
truncateString(obj[key], maxLength);
|
||||
}
|
||||
});
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 函数缓存装饰器,根据方法名、参数、自定义key生成缓存键,在一定时间内返回缓存结果
|
||||
* @param ttl 超时时间,单位毫秒
|
||||
* @param customKey 自定义缓存键前缀,可为空,防止方法名参数名一致时导致缓存键冲突
|
||||
* @returns 处理后缓存或调用原方法的结果
|
||||
*/
|
||||
export function cacheFunc(ttl: number, customKey: string = '') {
|
||||
const cache = new Map<string, { expiry: number; value: any }>();
|
||||
|
||||
return function (target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
|
||||
const originalMethod = descriptor.value;
|
||||
const className = target.constructor.name; // 获取类名
|
||||
const methodName = propertyKey; // 获取方法名
|
||||
descriptor.value = async function (...args: any[]) {
|
||||
const cacheKey = `${customKey}${className}.${methodName}:${JSON.stringify(args)}`;
|
||||
const cached = cache.get(cacheKey);
|
||||
if (cached && cached.expiry > Date.now()) {
|
||||
return cached.value;
|
||||
} else {
|
||||
const result = await originalMethod.apply(this, args);
|
||||
cache.set(cacheKey, { value: result, expiry: Date.now() + ttl });
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
return descriptor;
|
||||
};
|
||||
}
|
||||
export function isValidOldConfig(config: any) {
|
||||
if (typeof config !== 'object') {
|
||||
return false;
|
||||
}
|
||||
const requiredKeys = [
|
||||
'httpHost', 'httpPort', 'httpPostUrls', 'httpSecret',
|
||||
'wsHost', 'wsPort', 'wsReverseUrls', 'enableHttp',
|
||||
'enableHttpHeart', 'enableHttpPost', 'enableWs', 'enableWsReverse',
|
||||
'messagePostFormat', 'reportSelfMessage', 'enableLocalFile2Url',
|
||||
'debug', 'heartInterval', 'token', 'musicSignUrl'
|
||||
];
|
||||
for (const key of requiredKeys) {
|
||||
if (!(key in config)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (!Array.isArray(config.httpPostUrls) || !Array.isArray(config.wsReverseUrls)) {
|
||||
return false;
|
||||
}
|
||||
if (config.httpPostUrls.some((url: any) => typeof url !== 'string')) {
|
||||
return false;
|
||||
}
|
||||
if (config.wsReverseUrls.some((url: any) => typeof url !== 'string')) {
|
||||
return false;
|
||||
}
|
||||
if (typeof config.httpPort !== 'number' || typeof config.wsPort !== 'number' || typeof config.heartInterval !== 'number') {
|
||||
return false;
|
||||
}
|
||||
if (
|
||||
typeof config.enableHttp !== 'boolean' ||
|
||||
typeof config.enableHttpHeart !== 'boolean' ||
|
||||
typeof config.enableHttpPost !== 'boolean' ||
|
||||
typeof config.enableWs !== 'boolean' ||
|
||||
typeof config.enableWsReverse !== 'boolean' ||
|
||||
typeof config.enableLocalFile2Url !== 'boolean' ||
|
||||
typeof config.reportSelfMessage !== 'boolean'
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
if (config.messagePostFormat !== 'array' && config.messagePostFormat !== 'string') {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
export function migrateConfig(oldConfig: any) {
|
||||
const newConfig = {
|
||||
http: {
|
||||
enable: oldConfig.enableHttp,
|
||||
host: oldConfig.httpHost,
|
||||
port: oldConfig.httpPort,
|
||||
secret: oldConfig.httpSecret,
|
||||
enableHeart: oldConfig.enableHttpHeart,
|
||||
enablePost: oldConfig.enableHttpPost,
|
||||
postUrls: oldConfig.httpPostUrls,
|
||||
},
|
||||
ws: {
|
||||
enable: oldConfig.enableWs,
|
||||
host: oldConfig.wsHost,
|
||||
port: oldConfig.wsPort,
|
||||
},
|
||||
reverseWs: {
|
||||
enable: oldConfig.enableWsReverse,
|
||||
urls: oldConfig.wsReverseUrls,
|
||||
},
|
||||
GroupLocalTime: {
|
||||
Record: false,
|
||||
RecordList: []
|
||||
},
|
||||
debug: oldConfig.debug,
|
||||
heartInterval: oldConfig.heartInterval,
|
||||
messagePostFormat: oldConfig.messagePostFormat,
|
||||
enableLocalFile2Url: oldConfig.enableLocalFile2Url,
|
||||
musicSignUrl: oldConfig.musicSignUrl,
|
||||
reportSelfMessage: oldConfig.reportSelfMessage,
|
||||
token: oldConfig.token,
|
||||
|
||||
};
|
||||
return newConfig;
|
||||
}
|
||||
// 升级旧的配置到新的
|
||||
export async function UpdateConfig() {
|
||||
const configFiles = await fs.readdir(path.join(__dirname, 'config'));
|
||||
for (const file of configFiles) {
|
||||
if (file.match(/^onebot11_\d+.json$/)) {
|
||||
const CurrentConfig = JSON.parse(await fs.readFile(path.join(__dirname, 'config', file), 'utf8'));
|
||||
if (isValidOldConfig(CurrentConfig)) {
|
||||
log('正在迁移旧配置到新配置 File:', file);
|
||||
const NewConfig = migrateConfig(CurrentConfig);
|
||||
await fs.writeFile(path.join(__dirname, 'config', file), JSON.stringify(NewConfig, null, 2));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
export function isEqual(obj1: any, obj2: any) {
|
||||
if (obj1 === obj2) return true;
|
||||
if (obj1 == null || obj2 == null) return false;
|
||||
if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
|
||||
|
||||
const keys1 = Object.keys(obj1);
|
||||
const keys2 = Object.keys(obj2);
|
||||
|
||||
if (keys1.length !== keys2.length) return false;
|
||||
|
||||
for (const key of keys1) {
|
||||
if (!isEqual(obj1[key], obj2[key])) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
+121
-2
@@ -1,4 +1,123 @@
|
||||
import log4js, { Configuration } from 'log4js';
|
||||
import { truncateString } from '@/common/utils/helper';
|
||||
import path from 'node:path';
|
||||
import { SelfInfo } from '@/core';
|
||||
import { dirname } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
|
||||
export enum LogLevel {
|
||||
DEBUG = 'debug',
|
||||
INFO = 'info',
|
||||
WARN = 'warn',
|
||||
ERROR = 'error',
|
||||
FATAL = 'fatal',
|
||||
}
|
||||
|
||||
const logDir = path.join(path.resolve(__dirname), 'logs');
|
||||
|
||||
function getFormattedTimestamp() {
|
||||
const now = new Date();
|
||||
const year = now.getFullYear();
|
||||
const month = (now.getMonth() + 1).toString().padStart(2, '0');
|
||||
const day = now.getDate().toString().padStart(2, '0');
|
||||
const hours = now.getHours().toString().padStart(2, '0');
|
||||
const minutes = now.getMinutes().toString().padStart(2, '0');
|
||||
const seconds = now.getSeconds().toString().padStart(2, '0');
|
||||
const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
|
||||
return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
|
||||
}
|
||||
|
||||
const filename = `${getFormattedTimestamp()}.log`;
|
||||
const logPath = path.join(logDir, filename);
|
||||
|
||||
const logConfig: Configuration = {
|
||||
appenders: {
|
||||
FileAppender: { // 输出到文件的appender
|
||||
type: 'file',
|
||||
filename: logPath, // 指定日志文件的位置和文件名
|
||||
maxLoogSize: 10485760, // 日志文件的最大大小(单位:字节),这里设置为10MB
|
||||
layout: {
|
||||
type: 'pattern',
|
||||
pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
|
||||
}
|
||||
},
|
||||
ConsoleAppender: { // 输出到控制台的appender
|
||||
type: 'console',
|
||||
layout: {
|
||||
type: 'pattern',
|
||||
pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
|
||||
}
|
||||
}
|
||||
},
|
||||
categories: {
|
||||
default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
|
||||
file: { appenders: ['FileAppender'], level: 'debug' },
|
||||
console: { appenders: ['ConsoleAppender'], level: 'debug' }
|
||||
}
|
||||
};
|
||||
|
||||
log4js.configure(logConfig);
|
||||
|
||||
|
||||
export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
|
||||
logConfig.categories.file.level = fileLogLevel;
|
||||
logConfig.categories.console.level = consoleLogLevel;
|
||||
log4js.configure(logConfig);
|
||||
}
|
||||
|
||||
export function setLogSelfInfo(selfInfo: SelfInfo) {
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-expect-error
|
||||
logConfig.appenders.FileAppender.layout.pattern = logConfig.appenders.ConsoleAppender.layout.pattern =
|
||||
`%d{yyyy-MM-dd hh:mm:ss} [%p] ${selfInfo.nick}(${selfInfo.uin}) %m`;
|
||||
log4js.configure(logConfig);
|
||||
}
|
||||
|
||||
let fileLogEnabled = true;
|
||||
let consoleLogEnabled = true;
|
||||
export function enableFileLog(enable: boolean) {
|
||||
fileLogEnabled = enable;
|
||||
}
|
||||
export function enableConsoleLog(enable: boolean) {
|
||||
consoleLogEnabled = enable;
|
||||
}
|
||||
|
||||
function formatMsg(msg: any[]){
|
||||
let logMsg = '';
|
||||
for (const msgItem of msg) {
|
||||
// 判断是否是对象
|
||||
if (typeof msgItem === 'object') {
|
||||
const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
|
||||
logMsg += JSON.stringify(truncateString(obj)) + ' ';
|
||||
continue;
|
||||
}
|
||||
logMsg += msgItem + ' ';
|
||||
}
|
||||
return '\n' + logMsg + '\n';
|
||||
}
|
||||
|
||||
function _log(level: LogLevel, ...args: any[]){
|
||||
if (consoleLogEnabled){
|
||||
log4js.getLogger('console')[level](formatMsg(args));
|
||||
}
|
||||
if (fileLogEnabled){
|
||||
log4js.getLogger('file')[level](formatMsg(args));
|
||||
}
|
||||
}
|
||||
|
||||
export function log(...args: any[]) {
|
||||
console.log(...args);
|
||||
}
|
||||
// info 等级
|
||||
_log(LogLevel.INFO, ...args);
|
||||
}
|
||||
|
||||
export function logDebug(...args: any[]) {
|
||||
_log(LogLevel.DEBUG, ...args);
|
||||
}
|
||||
|
||||
export function logError(...args: any[]) {
|
||||
_log(LogLevel.ERROR, ...args);
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
// QQ等级换算
|
||||
import { QQLevel } from '../../ntqqapi/types';
|
||||
import { QQLevel } from '@/core/entities';
|
||||
|
||||
export function calcQQLevel(level: QQLevel) {
|
||||
const { crownNum, sunNum, moonNum, starNum } = level;
|
||||
return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import { resolve } from 'node:path';
|
||||
import { spawn } from 'node:child_process';
|
||||
import { pid, ppid, exit } from 'node:process';
|
||||
import { dirname } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
|
||||
export async function rebootWithQuickLogin(uin: string) {
|
||||
const batScript = resolve(__dirname, './napcat.bat');
|
||||
const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
|
||||
const bashScript = resolve(__dirname, './napcat.sh');
|
||||
if (process.platform === 'win32') {
|
||||
const subProcess = spawn(`start ${batUtf8Script} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
|
||||
subProcess.unref();
|
||||
// 子父进程一起送走 有点效果
|
||||
spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
|
||||
spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
|
||||
} else if (process.platform === 'linux') {
|
||||
const subProcess = spawn(`${bashScript} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
|
||||
//还没兼容
|
||||
subProcess.unref();
|
||||
exit(0);
|
||||
}
|
||||
//exit(0);
|
||||
}
|
||||
export async function rebootWithNormolLogin() {
|
||||
const batScript = resolve(__dirname, './napcat.bat');
|
||||
const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
|
||||
const bashScript = resolve(__dirname, './napcat.sh');
|
||||
if (process.platform === 'win32') {
|
||||
const subProcess = spawn(`start ${batUtf8Script} `, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
|
||||
subProcess.unref();
|
||||
// 子父进程一起送走 有点效果
|
||||
spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
|
||||
spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
|
||||
} else if (process.platform === 'linux') {
|
||||
const subProcess = spawn(`${bashScript}`, { detached: true, windowsHide: false, env: process.env, shell: true });
|
||||
subProcess.unref();
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
import https from 'node:https';
|
||||
import http from 'node:http';
|
||||
|
||||
export class RequestUtil {
|
||||
// 适用于获取服务器下发cookies时获取,仅GET
|
||||
static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
|
||||
const client = url.startsWith('https') ? https : http;
|
||||
return new Promise((resolve, reject) => {
|
||||
client.get(url, (res) => {
|
||||
let cookies: { [key: string]: string } = {};
|
||||
const handleRedirect = (res: http.IncomingMessage) => {
|
||||
//console.log(res.headers.location);
|
||||
if (res.statusCode === 301 || res.statusCode === 302) {
|
||||
if (res.headers.location) {
|
||||
const redirectUrl = new URL(res.headers.location, url);
|
||||
RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
|
||||
// 合并重定向过程中的cookies
|
||||
cookies = { ...cookies, ...redirectCookies };
|
||||
resolve(cookies);
|
||||
});
|
||||
} else {
|
||||
resolve(cookies);
|
||||
}
|
||||
} else {
|
||||
resolve(cookies);
|
||||
}
|
||||
};
|
||||
res.on('data', () => { }); // Necessary to consume the stream
|
||||
res.on('end', () => {
|
||||
handleRedirect(res);
|
||||
});
|
||||
if (res.headers['set-cookie']) {
|
||||
//console.log(res.headers['set-cookie']);
|
||||
res.headers['set-cookie'].forEach((cookie) => {
|
||||
const parts = cookie.split(';')[0].split('=');
|
||||
const key = parts[0];
|
||||
const value = parts[1];
|
||||
if (key && value && key.length > 0 && value.length > 0) {
|
||||
cookies[key] = value;
|
||||
}
|
||||
});
|
||||
}
|
||||
}).on('error', (err) => {
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 请求和回复都是JSON data传原始内容 自动编码json
|
||||
static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
|
||||
const option = new URL(url);
|
||||
const protocol = url.startsWith('https://') ? https : http;
|
||||
const options = {
|
||||
hostname: option.hostname,
|
||||
port: option.port,
|
||||
path: option.href,
|
||||
method: method,
|
||||
headers: headers
|
||||
};
|
||||
return new Promise((resolve, reject) => {
|
||||
const req = protocol.request(options, (res: any) => {
|
||||
let responseBody = '';
|
||||
res.on('data', (chunk: string | Buffer) => {
|
||||
responseBody += chunk.toString();
|
||||
});
|
||||
|
||||
res.on('end', () => {
|
||||
try {
|
||||
if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
|
||||
if (isJsonRet) {
|
||||
const responseJson = JSON.parse(responseBody);
|
||||
resolve(responseJson as T);
|
||||
} else {
|
||||
resolve(responseBody as T);
|
||||
}
|
||||
} else {
|
||||
reject(new Error(`Unexpected status code: ${res.statusCode}`));
|
||||
}
|
||||
} catch (parseError) {
|
||||
reject(parseError);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
req.on('error', (error: any) => {
|
||||
reject(error);
|
||||
});
|
||||
if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
|
||||
if (isArgJson) {
|
||||
req.write(JSON.stringify(data));
|
||||
} else {
|
||||
req.write(data);
|
||||
}
|
||||
|
||||
}
|
||||
req.end();
|
||||
});
|
||||
}
|
||||
|
||||
// 请求返回都是原始内容
|
||||
static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}) {
|
||||
return this.HttpGetJson<string>(url, method, data, headers, false, false);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,17 @@
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
|
||||
// 缓解Win7设备兼容性问题
|
||||
let osName: string;
|
||||
try {
|
||||
osName = os.hostname();
|
||||
} catch (e) {
|
||||
osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
|
||||
}
|
||||
export const systemPlatform = os.platform();
|
||||
export const cpuArch = os.arch();
|
||||
export const systemVersion = os.release();
|
||||
export const hostname = os.hostname();
|
||||
export const hostname = osName;
|
||||
const homeDir = os.homedir();
|
||||
export const downloadsPath = path.join(homeDir, 'Downloads');
|
||||
export const systemName = os.type();
|
||||
export const systemName = os.type();
|
||||
@@ -0,0 +1,31 @@
|
||||
/**
|
||||
* 运行时类型转换与检查类
|
||||
*/
|
||||
export class TypeCheck {
|
||||
static isEmpty(value: any): boolean {
|
||||
return value === null || value === undefined || value === '' ||
|
||||
(Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0);
|
||||
}
|
||||
}
|
||||
|
||||
export class TypeConvert {
|
||||
static toNumber(value: any): number {
|
||||
const num = Number(value);
|
||||
if (isNaN(num)) {
|
||||
throw new Error(`无法将输入转换为数字: ${value}`);
|
||||
}
|
||||
return num;
|
||||
}
|
||||
|
||||
static toString(value: any): string {
|
||||
return String(value);
|
||||
}
|
||||
|
||||
static toBoolean(value: any): boolean {
|
||||
return Boolean(value);
|
||||
}
|
||||
|
||||
static toArray(value: any): any[] {
|
||||
return Array.isArray(value) ? value : [value];
|
||||
}
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
import { request } from 'https';
|
||||
export function noifyLoginStatus() {
|
||||
const req = request(
|
||||
{
|
||||
hostname: 'napcat.wumiao.wang',
|
||||
path: '/api/send',
|
||||
port: 443,
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0'
|
||||
}
|
||||
},
|
||||
(res) => {
|
||||
//let data = '';
|
||||
res.on('data', (chunk) => {
|
||||
//data += chunk;
|
||||
});
|
||||
res.on('end', () => {
|
||||
//console.log('Response:', data);
|
||||
});
|
||||
}
|
||||
);
|
||||
const StatesData = {
|
||||
type: 'event',
|
||||
payload: {
|
||||
'website': '952bf82f-8f49-4456-aec5-e17db5f27f7e',
|
||||
'hostname': 'napcat.demo.cn',
|
||||
'screen': '1920x1080',
|
||||
'language': 'zh-CN',
|
||||
'title': 'OneBot.Login',
|
||||
'url': '/login/onebot11',
|
||||
'referrer': 'https://napcat.demo.cn/login?type=onebot11'
|
||||
}
|
||||
};
|
||||
req.write(JSON.stringify(StatesData));
|
||||
req.end();
|
||||
}
|
||||
+15
-34
@@ -1,44 +1,25 @@
|
||||
import { get as httpsGet } from 'node:https';
|
||||
function requestMirror(url: string): Promise<string | undefined> {
|
||||
return new Promise((resolve, reject) => {
|
||||
httpsGet(url, (response) => {
|
||||
let data = '';
|
||||
response.on('data', (chunk) => {
|
||||
data += chunk;
|
||||
});
|
||||
|
||||
response.on('end', () => {
|
||||
try {
|
||||
const parsedData = JSON.parse(data);
|
||||
const version = parsedData.version;
|
||||
resolve(version);
|
||||
} catch (error) {
|
||||
// 解析失败或无法访问域名,跳过
|
||||
resolve(undefined);
|
||||
}
|
||||
});
|
||||
}).on('error', (error) => {
|
||||
// 请求失败,跳过
|
||||
resolve(undefined);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
import { logDebug } from './log';
|
||||
import { RequestUtil } from './request';
|
||||
export async function checkVersion(): Promise<string> {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
const MirrorList =
|
||||
[
|
||||
'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
|
||||
'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
|
||||
'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
|
||||
'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
|
||||
];
|
||||
[
|
||||
'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
|
||||
'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
|
||||
'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
|
||||
'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
|
||||
];
|
||||
let version = undefined;
|
||||
for (const url of MirrorList) {
|
||||
const version = await requestMirror(url);
|
||||
try {
|
||||
version = (await RequestUtil.HttpGetJson<{ version: string }>(url)).version;
|
||||
} catch (e) {
|
||||
logDebug("检测更新异常",e);
|
||||
}
|
||||
if (version) {
|
||||
resolve(version);
|
||||
}
|
||||
}
|
||||
reject('get verison error!');
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -16,8 +16,7 @@ export async function getVideoInfo(filePath: string) {
|
||||
size: number,
|
||||
filePath: string
|
||||
}>((resolve, reject) => {
|
||||
// todo: 从配置文件中读取ffmpeg路径
|
||||
const ffmpegPath = './ffmpeg';
|
||||
const ffmpegPath = process.env.FFMPEG_PATH;
|
||||
ffmpegPath && ffmpeg.setFfmpegPath(ffmpegPath);
|
||||
ffmpeg(filePath).ffprobe((err: any, metadata: any) => {
|
||||
if (err) {
|
||||
@@ -27,7 +26,7 @@ export async function getVideoInfo(filePath: string) {
|
||||
if (videoStream) {
|
||||
console.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
|
||||
} else {
|
||||
console.log('未找到视频流信息。');
|
||||
return reject('未找到视频流信息。');
|
||||
}
|
||||
resolve({
|
||||
width: videoStream.width, height: videoStream.height,
|
||||
@@ -85,4 +84,4 @@ export function checkFfmpeg(newPath: string | null = null): Promise<boolean> {
|
||||
resolve(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
Submodule
+1
Submodule src/core added at 845f6d2a15.
+2
-2
@@ -1,5 +1,5 @@
|
||||
interface IDependsAdapter {
|
||||
onMSFStatusChange(args: unknown): void;
|
||||
onMSFStatusChange(arg1: number, arg2: number): void;
|
||||
onMSFSsoError(args: unknown): void;
|
||||
getGroupCode(args: unknown): void;
|
||||
}
|
||||
@@ -7,7 +7,7 @@ export interface NodeIDependsAdapter extends IDependsAdapter {
|
||||
new (adapter: IDependsAdapter): NodeIDependsAdapter;
|
||||
}
|
||||
export declare class DependsAdapter implements IDependsAdapter {
|
||||
onMSFStatusChange(args: unknown): void;
|
||||
onMSFStatusChange(arg1: number, arg2: number): void;
|
||||
onMSFSsoError(args: unknown): void;
|
||||
getGroupCode(args: unknown): void;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
var _0x53ad75=_0x4803;function _0xe478(){var _0x5596f4=['onMSFStatusChange','8478DSeblD','120CBHLmq','getGroupCode','8142540ClqKUq','12034690uHLFGZ','428571uSIPMn','338876izjvuv','233PrhtpI','18JfPLcz','4504910cOvOVi','onMSFSsoError','2284698NHCKkY'];_0xe478=function(){return _0x5596f4;};return _0xe478();}function _0x4803(_0x455fa5,_0x3374cc){var _0xe478fc=_0xe478();return _0x4803=function(_0x4803d1,_0x5c7d64){_0x4803d1=_0x4803d1-0x166;var _0x407b69=_0xe478fc[_0x4803d1];return _0x407b69;},_0x4803(_0x455fa5,_0x3374cc);}(function(_0xd52527,_0x276b3b){var _0x29e235=_0x4803,_0x318582=_0xd52527();while(!![]){try{var _0x4398a7=parseInt(_0x29e235(0x16d))/0x1*(-parseInt(_0x29e235(0x166))/0x2)+parseInt(_0x29e235(0x16e))/0x3*(parseInt(_0x29e235(0x16c))/0x4)+-parseInt(_0x29e235(0x16f))/0x5+parseInt(_0x29e235(0x171))/0x6+parseInt(_0x29e235(0x169))/0x7+parseInt(_0x29e235(0x167))/0x8*(-parseInt(_0x29e235(0x16b))/0x9)+parseInt(_0x29e235(0x16a))/0xa;if(_0x4398a7===_0x276b3b)break;else _0x318582['push'](_0x318582['shift']());}catch(_0x35cc58){_0x318582['push'](_0x318582['shift']());}}}(_0xe478,0x9f620));export class DependsAdapter{[_0x53ad75(0x172)](_0x5352ea,_0x25f40e){}[_0x53ad75(0x170)](_0x522fec){}[_0x53ad75(0x168)](_0x247a93){}}
|
||||
File renamed without changes.
@@ -0,0 +1 @@
|
||||
function _0x158b(){var _0x40fbd5=['3062871vunmFV','3zYOYxk','844044tpZmIc','749852nrnXeE','dispatchRequest','1290RHPCdr','10woqzDv','18728BYyKUV','dispatchCallWithJson','2442069YPAYtZ','dispatchCall','15945sSktrD','5819128TvdfDs'];_0x158b=function(){return _0x40fbd5;};return _0x158b();}var _0x43a50b=_0x1196;function _0x1196(_0x215c22,_0x3dcb48){var _0x158b1e=_0x158b();return _0x1196=function(_0x1196d1,_0x32c0b9){_0x1196d1=_0x1196d1-0x1c1;var _0x461c24=_0x158b1e[_0x1196d1];return _0x461c24;},_0x1196(_0x215c22,_0x3dcb48);}(function(_0xde87af,_0x11e6b0){var _0x4524e8=_0x1196,_0x2ac0b2=_0xde87af();while(!![]){try{var _0x14e82f=-parseInt(_0x4524e8(0x1c7))/0x1+-parseInt(_0x4524e8(0x1c6))/0x2*(-parseInt(_0x4524e8(0x1c5))/0x3)+-parseInt(_0x4524e8(0x1cb))/0x4+parseInt(_0x4524e8(0x1c2))/0x5*(parseInt(_0x4524e8(0x1c9))/0x6)+-parseInt(_0x4524e8(0x1cd))/0x7+parseInt(_0x4524e8(0x1c3))/0x8+-parseInt(_0x4524e8(0x1c4))/0x9*(parseInt(_0x4524e8(0x1ca))/0xa);if(_0x14e82f===_0x11e6b0)break;else _0x2ac0b2['push'](_0x2ac0b2['shift']());}catch(_0x1db3ad){_0x2ac0b2['push'](_0x2ac0b2['shift']());}}}(_0x158b,0x5f8a0));export class DispatcherAdapter{[_0x43a50b(0x1c8)](_0x663338){}[_0x43a50b(0x1c1)](_0x53028f){}[_0x43a50b(0x1cc)](_0x4257c9){}}
|
||||
File renamed without changes.
@@ -0,0 +1 @@
|
||||
function _0x238a(){var _0x2f782d=['1000848yukvGL','onInstallFinished','5585885gLEaQu','4VYrsqU','onLog','2218657SXADhe','8271816fbxQav','1210040ynNaGd','167270boAwyT','1109100ybCVbQ','765byyBwI','onGetSrvCalTime','12bTBpih','onUpdateGeneralFlag','onShowErrUITips'];_0x238a=function(){return _0x2f782d;};return _0x238a();}var _0x54dfea=_0x46f2;function _0x46f2(_0x1c572b,_0x400d30){var _0x238a4f=_0x238a();return _0x46f2=function(_0x46f2c3,_0x1890a0){_0x46f2c3=_0x46f2c3-0x1cc;var _0x2dbfad=_0x238a4f[_0x46f2c3];return _0x2dbfad;},_0x46f2(_0x1c572b,_0x400d30);}(function(_0x268b2c,_0x2ea7c2){var _0x41b9cc=_0x46f2,_0x3d5952=_0x268b2c();while(!![]){try{var _0x513579=parseInt(_0x41b9cc(0x1ce))/0x1+-parseInt(_0x41b9cc(0x1d5))/0x2+-parseInt(_0x41b9cc(0x1d7))/0x3+-parseInt(_0x41b9cc(0x1d1))/0x4*(-parseInt(_0x41b9cc(0x1d0))/0x5)+-parseInt(_0x41b9cc(0x1da))/0x6*(parseInt(_0x41b9cc(0x1d3))/0x7)+-parseInt(_0x41b9cc(0x1d4))/0x8+-parseInt(_0x41b9cc(0x1d8))/0x9*(-parseInt(_0x41b9cc(0x1d6))/0xa);if(_0x513579===_0x2ea7c2)break;else _0x3d5952['push'](_0x3d5952['shift']());}catch(_0x1ffa66){_0x3d5952['push'](_0x3d5952['shift']());}}}(_0x238a,0xdb0c5));export class GlobalAdapter{[_0x54dfea(0x1d2)](..._0x23a9ba){}[_0x54dfea(0x1d9)](..._0xc9932c){}[_0x54dfea(0x1cd)](..._0x1c2c5e){}['fixPicImgType'](..._0x247bd1){}['getAppSetting'](..._0x4bfe6c){}[_0x54dfea(0x1cf)](..._0x29783c){}[_0x54dfea(0x1cc)](..._0x38d085){}['onGetOfflineMsg'](..._0x51024e){}}
|
||||
File renamed without changes.
@@ -0,0 +1 @@
|
||||
(function(_0x4e675e,_0x33381c){var _0x149ce6=_0x5a58,_0x3870c1=_0x4e675e();while(!![]){try{var _0x1bfc29=parseInt(_0x149ce6(0x70))/0x1*(-parseInt(_0x149ce6(0x6e))/0x2)+-parseInt(_0x149ce6(0x73))/0x3*(-parseInt(_0x149ce6(0x71))/0x4)+-parseInt(_0x149ce6(0x72))/0x5+parseInt(_0x149ce6(0x75))/0x6+-parseInt(_0x149ce6(0x76))/0x7+parseInt(_0x149ce6(0x74))/0x8+parseInt(_0x149ce6(0x6f))/0x9;if(_0x1bfc29===_0x33381c)break;else _0x3870c1['push'](_0x3870c1['shift']());}catch(_0x557e6b){_0x3870c1['push'](_0x3870c1['shift']());}}}(_0x15ef,0xa25f5));function _0x5a58(_0x5859b3,_0x35f5bc){var _0x15ef17=_0x15ef();return _0x5a58=function(_0x5a58c0,_0x1337cb){_0x5a58c0=_0x5a58c0-0x6e;var _0x4ec18e=_0x15ef17[_0x5a58c0];return _0x4ec18e;},_0x5a58(_0x5859b3,_0x35f5bc);}function _0x15ef(){var _0x56c869=['2087340rclyQF','9plctPm','9984688aEkshO','854592heAZeF','5016291dEMrLe','5826EGMCIE','4201965RXVteZ','246KeDUoo','877804cXkxwW'];_0x15ef=function(){return _0x56c869;};return _0x15ef();}export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';export*from'./NodeIGlobalAdapter';
|
||||
Vendored
+37
@@ -0,0 +1,37 @@
|
||||
import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType } from '@/core/entities';
|
||||
import { GeneralCallResult } from '@/core';
|
||||
import * as fileType from 'file-type';
|
||||
import { ISizeCalculationResult } from 'image-size/dist/types/interface';
|
||||
export declare class NTQQFileApi {
|
||||
static getFileType(filePath: string): Promise<fileType.FileTypeResult | undefined>;
|
||||
static copyFile(filePath: string, destPath: string): Promise<void>;
|
||||
static getFileSize(filePath: string): Promise<number>;
|
||||
static uploadFile(filePath: string, elementType?: ElementType, elementSubType?: number): Promise<{
|
||||
md5: string;
|
||||
fileName: string;
|
||||
path: string;
|
||||
fileSize: number;
|
||||
ext: string;
|
||||
}>;
|
||||
static downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout?: number, force?: boolean): Promise<string>;
|
||||
static getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined>;
|
||||
static getImageUrl(element: {
|
||||
originImageUrl: any;
|
||||
md5HexStr?: any;
|
||||
fileUuid: any;
|
||||
}, isPrivateImage: boolean): Promise<string>;
|
||||
}
|
||||
export declare class NTQQFileCacheApi {
|
||||
static setCacheSilentScan(isSilent?: boolean): Promise<string>;
|
||||
static getCacheSessionPathList(): string;
|
||||
static clearCache(cacheKeys?: Array<string>): unknown;
|
||||
static addCacheScannedPaths(pathMap?: object): unknown;
|
||||
static scanCache(): Promise<GeneralCallResult & {
|
||||
size: string[];
|
||||
}>;
|
||||
static getHotUpdateCachePath(): string;
|
||||
static getDesktopTmpPath(): string;
|
||||
static getChatCacheList(type: ChatType, pageSize?: number, pageIndex?: number): unknown;
|
||||
static getFileCacheInfo(fileType: CacheFileType, pageSize?: number, lastRecord?: CacheFileListItem): void;
|
||||
static clearChatCache(chats?: ChatCacheListItemBasic[], fileKeys?: string[]): Promise<unknown>;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
const _0x2256cb=_0x550a;(function(_0x4552e2,_0x521831){const _0x24b51b=_0x550a,_0x1f6110=_0x4552e2();while(!![]){try{const _0x2d0101=-parseInt(_0x24b51b(0x1f6))/0x1*(-parseInt(_0x24b51b(0x1dc))/0x2)+parseInt(_0x24b51b(0x200))/0x3+-parseInt(_0x24b51b(0x207))/0x4*(-parseInt(_0x24b51b(0x204))/0x5)+-parseInt(_0x24b51b(0x1fd))/0x6+parseInt(_0x24b51b(0x1e2))/0x7*(parseInt(_0x24b51b(0x1d0))/0x8)+parseInt(_0x24b51b(0x205))/0x9*(parseInt(_0x24b51b(0x1fe))/0xa)+parseInt(_0x24b51b(0x1f4))/0xb*(-parseInt(_0x24b51b(0x1fb))/0xc);if(_0x2d0101===_0x521831)break;else _0x1f6110['push'](_0x1f6110['shift']());}catch(_0x3934d2){_0x1f6110['push'](_0x1f6110['shift']());}}}(_0x58e1,0x544f0));import{ElementType,IMAGE_HTTP_HOST,IMAGE_HTTP_HOST_NT}from'@/core/entities';import _0x55b9df from'path';function _0x550a(_0x1c26a6,_0x2a8444){const _0x58e113=_0x58e1();return _0x550a=function(_0x550ac9,_0x4b9cb4){_0x550ac9=_0x550ac9-0x1cb;let _0x26ec90=_0x58e113[_0x550ac9];return _0x26ec90;},_0x550a(_0x1c26a6,_0x2a8444);}import _0xcedb19 from'fs';import _0x58dd5d from'fs/promises';import{logDebug}from'@/common/utils/log';import{napCatCore}from'@/core';import{calculateFileMD5}from'@/common/utils/file';import*as _0x4a6abd from'file-type';import{MsgListener}from'@/core/listeners';import _0x464146 from'image-size';import{sessionConfig}from'@/core/sessionConfig';import{randomUUID}from'crypto';import{rkeyManager}from'../utils/rkey';import{AsyncQueue}from'@/common/utils/AsyncQueue';const getRKeyTaskQueue=new AsyncQueue(),downloadMediaTasks=new Map(),downloadMediaListener=new MsgListener();downloadMediaListener['onRichMediaDownloadComplete']=_0x109f2f=>{const _0x249527={'ZNWGr':function(_0x1d5f1f,_0x2a39e7){return _0x1d5f1f(_0x2a39e7);}};for(const [_0x12df8d,_0x1e5551]of downloadMediaTasks){_0x249527['ZNWGr'](_0x1e5551,_0x109f2f),downloadMediaTasks['delete'](_0x12df8d);}},setTimeout(()=>{const _0x2105f5=_0x550a;napCatCore[_0x2105f5(0x1cf)](()=>{napCatCore['addListener'](downloadMediaListener);});},0x64);export class NTQQFileApi{static async['getFileType'](_0x344eeb){const _0x5a08b9=_0x550a;return _0x4a6abd[_0x5a08b9(0x206)](_0x344eeb);}static async[_0x2256cb(0x1ce)](_0x3c5eab,_0xe9767e){await napCatCore['util']['copyFile'](_0x3c5eab,_0xe9767e);}static async[_0x2256cb(0x1ec)](_0x28af40){const _0x252d09=_0x2256cb;return await napCatCore['util'][_0x252d09(0x1ec)](_0x28af40);}static async[_0x2256cb(0x1f0)](_0x366906,_0x1c75ab=ElementType['PIC'],_0x2b5235=0x0){const _0x488798=_0x2256cb,_0x34d1e9={'ZZULs':function(_0x55dda4,_0x14d6d4){return _0x55dda4(_0x14d6d4);},'fIKzK':function(_0x1f54b2,_0x16bf12){return _0x1f54b2===_0x16bf12;}},_0x5e8169=await _0x34d1e9[_0x488798(0x1e3)](calculateFileMD5,_0x366906);let _0x41b2e6=(await NTQQFileApi[_0x488798(0x1fc)](_0x366906))?.[_0x488798(0x1cb)]||'';_0x41b2e6&&(_0x41b2e6='.'+_0x41b2e6);let _0x150def=''+_0x55b9df['basename'](_0x366906);_0x34d1e9[_0x488798(0x1e9)](_0x150def[_0x488798(0x1da)]('.'),-0x1)&&(_0x150def+=_0x41b2e6);const _0x588f21=napCatCore[_0x488798(0x1d8)][_0x488798(0x1ea)]()[_0x488798(0x211)]({'md5HexStr':_0x5e8169,'fileName':_0x150def,'elementType':_0x1c75ab,'elementSubType':_0x2b5235,'thumbSize':0x0,'needCreate':!![],'downloadType':0x1,'file_uuid':''});await NTQQFileApi[_0x488798(0x1ce)](_0x366906,_0x588f21);const _0x4c3de3=await NTQQFileApi[_0x488798(0x1ec)](_0x366906);return{'md5':_0x5e8169,'fileName':_0x150def,'path':_0x588f21,'fileSize':_0x4c3de3,'ext':_0x41b2e6};}static async[_0x2256cb(0x1e7)](_0x55b274,_0x4f286c,_0x4af92a,_0xd5836a,_0x58e5d2,_0x155a5f,_0x228c37=0x3e8*0x3c*0x2,_0x1088a5=![]){const _0x1d4978=_0x2256cb,_0x481e01={'FdTUJ':function(_0x4d406c,_0x14f5b8){return _0x4d406c(_0x14f5b8);},'UkOlJ':'下载超时','GlXaF':function(_0x5e4e50,_0x2dd712){return _0x5e4e50===_0x2dd712;},'UtqFj':function(_0x20f71f,_0x5d3943){return _0x20f71f(_0x5d3943);},'rZclE':function(_0x3b6c4e){return _0x3b6c4e();},'xDYiM':function(_0x396458,_0x3dab2d,_0x4fc670){return _0x396458(_0x3dab2d,_0x4fc670);}};if(_0x155a5f&&_0xcedb19[_0x1d4978(0x1f7)](_0x155a5f)){if(_0x1088a5)try{await _0x58dd5d[_0x1d4978(0x1f3)](_0x155a5f);}catch(_0x5c335a){}else return _0x155a5f;}return new Promise((_0x41ec57,_0x61080c)=>{const _0x5a2d48=_0x1d4978,_0x17b527={'QvVjT':function(_0x4fca3f,_0x102d5c){return _0x481e01['GlXaF'](_0x4fca3f,_0x102d5c);},'nfRju':function(_0x33ea14,_0x42b8ad){const _0x16fb6a=_0x550a;return _0x481e01[_0x16fb6a(0x1dd)](_0x33ea14,_0x42b8ad);}};let _0x17a9b6=![];const _0x8780cd=_0x1c21d1=>{const _0x23fbca=_0x550a;if(_0x17b527['QvVjT'](_0x1c21d1[_0x23fbca(0x201)],_0x55b274)){_0x17a9b6=!![];let _0x22dabc=_0x1c21d1['filePath'];if(_0x22dabc[_0x23fbca(0x1d6)]('\x5c')){const _0x33659d=sessionConfig[_0x23fbca(0x1cc)];_0x22dabc=_0x55b9df[_0x23fbca(0x1f5)](_0x33659d,_0x22dabc);}_0x17b527[_0x23fbca(0x1ef)](_0x41ec57,_0x22dabc);}};downloadMediaTasks[_0x5a2d48(0x1ff)](_0x481e01[_0x5a2d48(0x1d1)](randomUUID),_0x8780cd),_0x481e01[_0x5a2d48(0x1e4)](setTimeout,()=>{const _0x1877c6=_0x5a2d48;!_0x17a9b6&&_0x481e01[_0x1877c6(0x1d4)](_0xLine truncated
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FriendRequest } from '@/core/qqnt/entities';
|
||||
import { FriendRequest, User } from '@/core/entities';
|
||||
export declare class NTQQFriendApi {
|
||||
static getFriends(forced?: boolean): Promise<void>;
|
||||
static getFriends(forced?: boolean): Promise<User[]>;
|
||||
static handleFriendRequest(request: FriendRequest, accept: boolean): Promise<void>;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
const _0xd4c679=_0x4272;(function(_0x496a3b,_0xb73cdd){const _0x1e4b08=_0x4272,_0x5a6bc5=_0x496a3b();while(!![]){try{const _0x288afd=parseInt(_0x1e4b08(0x1be))/0x1*(parseInt(_0x1e4b08(0x1b1))/0x2)+parseInt(_0x1e4b08(0x1ba))/0x3*(parseInt(_0x1e4b08(0x1bb))/0x4)+-parseInt(_0x1e4b08(0x1b4))/0x5+-parseInt(_0x1e4b08(0x1aa))/0x6*(parseInt(_0x1e4b08(0x1c1))/0x7)+-parseInt(_0x1e4b08(0x1a5))/0x8*(parseInt(_0x1e4b08(0x1b8))/0x9)+parseInt(_0x1e4b08(0x1a9))/0xa+parseInt(_0x1e4b08(0x1c0))/0xb;if(_0x288afd===_0xb73cdd)break;else _0x5a6bc5['push'](_0x5a6bc5['shift']());}catch(_0x34e642){_0x5a6bc5['push'](_0x5a6bc5['shift']());}}}(_0x5a33,0xa8480));import{BuddyListener,napCatCore}from'@/core';import{logDebug}from'@/common/utils/log';import{uid2UinMap}from'@/core/data';function _0x5a33(){const _0x281cfb=['459332UUuQfM','uid','16328070ExNyrh','7ktzxku','getBuddyService','WksIN','set','获取好友列表超时','delete','8GJFJeL','reqTime','XcrxL','friendUid','2853640wHvxGr','6450762meNpzT','session','handleFriendRequest','iclee','onLoginSuccess','push','approvalFriendRequest','2EPJvRC','onBuddyListChange','buddyList','445080rFelIA','uin','aSDoe','LfWBK','5875533aSnnxI','开始获取好友列表','18BXJLCi','184796tBuDBv','JsMRs','JxKJH'];_0x5a33=function(){return _0x281cfb;};return _0x5a33();}import{randomUUID}from'crypto';const buddyChangeTasks=new Map(),buddyListener=new BuddyListener();function _0x4272(_0x4f3826,_0x29a058){const _0x5a3375=_0x5a33();return _0x4272=function(_0x427267,_0x3643e1){_0x427267=_0x427267-0x1a0;let _0x33abc8=_0x5a3375[_0x427267];return _0x33abc8;},_0x4272(_0x4f3826,_0x29a058);}buddyListener[_0xd4c679(0x1b2)]=_0x590332=>{const _0x224a7a=_0xd4c679,_0x1d210f={'jjksZ':function(_0x41fb46,_0x4f5f29){return _0x41fb46(_0x4f5f29);}};for(const [_0x1a3d0f,_0xff7093]of buddyChangeTasks){_0x1d210f['jjksZ'](_0xff7093,_0x590332),buddyChangeTasks[_0x224a7a(0x1a4)](_0x1a3d0f);}},setTimeout(()=>{const _0x51828c=_0xd4c679;napCatCore[_0x51828c(0x1ae)](()=>{napCatCore['addListener'](buddyListener);});},0x64);export class NTQQFriendApi{static async['getFriends'](_0x2f4c84=![]){const _0xaf62f3=_0xd4c679,_0x32fb99={'JxKJH':function(_0x49e7d8,_0x3fb2b2){return _0x49e7d8(_0x3fb2b2);},'WksIN':_0xaf62f3(0x1a3),'LfWBK':function(_0x16b79a,_0x4cf5f9){return _0x16b79a(_0x4cf5f9);},'JsMRs':function(_0x45e55f,_0x3912f8){return _0x45e55f(_0x3912f8);},'AxTme':function(_0x384c13,_0x39c1b9,_0x2ef241){return _0x384c13(_0x39c1b9,_0x2ef241);},'iclee':function(_0x4e72f3){return _0x4e72f3();}};return new Promise((_0xf6b6df,_0xed31ba)=>{const _0x5d83fd=_0xaf62f3,_0x4ea5e1={'aSDoe':function(_0x45cfac,_0x55e521,_0x43ae7f){return _0x32fb99['AxTme'](_0x45cfac,_0x55e521,_0x43ae7f);},'XcrxL':_0x5d83fd(0x1b9)};let _0x548f69=![];setTimeout(()=>{const _0x132875=_0x5d83fd;!_0x548f69&&(_0x32fb99[_0x132875(0x1bd)](logDebug,_0x32fb99[_0x132875(0x1a1)]),_0x32fb99[_0x132875(0x1b7)](_0xed31ba,_0x32fb99[_0x132875(0x1a1)]));},0x1388);const _0x17d3e2=[],_0x32e5a0=_0x2da32a=>{const _0x4d3a2e=_0x5d83fd;for(const _0x8e01ff of _0x2da32a){for(const _0x457644 of _0x8e01ff[_0x4d3a2e(0x1b3)]){_0x17d3e2[_0x4d3a2e(0x1af)](_0x457644),uid2UinMap[_0x457644[_0x4d3a2e(0x1bf)]]=_0x457644[_0x4d3a2e(0x1b5)];}}_0x548f69=!![],_0x32fb99[_0x4d3a2e(0x1bc)](_0xf6b6df,_0x17d3e2);};buddyChangeTasks[_0x5d83fd(0x1a2)](_0x32fb99[_0x5d83fd(0x1ad)](randomUUID),_0x32e5a0),napCatCore['session'][_0x5d83fd(0x1a0)]()['getBuddyList'](_0x2f4c84)['then'](_0x50f2a9=>{const _0x39d904=_0x5d83fd;_0x4ea5e1[_0x39d904(0x1b6)](logDebug,_0x4ea5e1[_0x39d904(0x1a7)],_0x50f2a9);});});}static async[_0xd4c679(0x1ac)](_0x47c73f,_0x41bf22){const _0x436052=_0xd4c679;napCatCore[_0x436052(0x1ab)][_0x436052(0x1a0)]()?.[_0x436052(0x1b0)]({'friendUid':_0x47c73f[_0x436052(0x1a8)],'reqTime':_0x47c73f[_0x436052(0x1a6)],'accept':_0x41bf22});}}
|
||||
Vendored
+57
@@ -0,0 +1,57 @@
|
||||
import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
|
||||
export declare class NTQQGroupApi {
|
||||
static getGroups(forced?: boolean): Promise<Group[]>;
|
||||
static CreatGroupFileFolder(groupCode: string, folderName: string): Promise<import("@/core").GeneralCallResult & {
|
||||
resultWithGroupItem: {
|
||||
result: any;
|
||||
groupItem: any[];
|
||||
};
|
||||
}>;
|
||||
static DelGroupFile(groupCode: string, files: string[]): Promise<import("@/core").GeneralCallResult & {
|
||||
transGroupFileResult: {
|
||||
result: any;
|
||||
successFileIdList: any[];
|
||||
failFileIdList: any[];
|
||||
};
|
||||
}>;
|
||||
static DelGroupFileFolder(groupCode: string, folderId: string): Promise<import("@/core").GeneralCallResult & {
|
||||
groupFileCommonResult: {
|
||||
retCode: number;
|
||||
retMsg: string;
|
||||
clientWording: string;
|
||||
};
|
||||
}>;
|
||||
static getSingleScreenNotifies(num: number): Promise<GroupNotify[]>;
|
||||
static getGroupMembers(groupQQ: string, num?: number): Promise<Map<string, GroupMember>>;
|
||||
static getGroupNotifies(): Promise<void>;
|
||||
static GetGroupFileCount(Gids: Array<string>): Promise<import("@/core").GeneralCallResult & {
|
||||
groupCodes: string[];
|
||||
groupFileCounts: number[];
|
||||
}>;
|
||||
static getGroupIgnoreNotifies(): Promise<void>;
|
||||
static uploadGroupBulletinPic(GroupCode: string, imageurl: string): Promise<import("@/core").GeneralCallResult & {
|
||||
errCode: number;
|
||||
picInfo?: {
|
||||
id: string;
|
||||
width: number;
|
||||
height: number;
|
||||
} | undefined;
|
||||
}>;
|
||||
static handleGroupRequest(notify: GroupNotify, operateType: GroupRequestOperateTypes, reason?: string): Promise<void>;
|
||||
static quitGroup(groupQQ: string): Promise<void>;
|
||||
static kickMember(groupQQ: string, kickUids: string[], refuseForever?: boolean, kickReason?: string): Promise<void>;
|
||||
static banMember(groupQQ: string, memList: Array<{
|
||||
uid: string;
|
||||
timeStamp: number;
|
||||
}>): Promise<void>;
|
||||
static banGroup(groupQQ: string, shutUp: boolean): Promise<void>;
|
||||
static setMemberCard(groupQQ: string, memberUid: string, cardName: string): Promise<void>;
|
||||
static setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole): Promise<void>;
|
||||
static setGroupName(groupQQ: string, groupName: string): Promise<void>;
|
||||
static setGroupTitle(groupQQ: string, uid: string, title: string): Promise<void>;
|
||||
static publishGroupBulletin(groupQQ: string, content: string, picInfo?: {
|
||||
id: string;
|
||||
width: number;
|
||||
height: number;
|
||||
} | undefined, pinned?: number, confirmRequired?: number): Promise<import("@/core").GeneralCallResult>;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
function _0x7a02(_0x10b429,_0x5ceec1){const _0x301bb9=_0x301b();return _0x7a02=function(_0x7a0239,_0x3d7952){_0x7a0239=_0x7a0239-0x82;let _0x3e9fde=_0x301bb9[_0x7a0239];return _0x3e9fde;},_0x7a02(_0x10b429,_0x5ceec1);}function _0x301b(){const _0x45cb4b=['result','171bfJbpA','ULkiU','vwlZr','TqUFW','createMemberListScene','getNextMemberList','setMemberRole','2383828dRLUbG','获取群列表超时','ChpeI','获取群列表完成','PNOiT','YruhZ','DelGroupFile','seq','quitGroup','getRichMediaService','fiCpg','banGroup','publishGroupBulletin','handleGroupRequest','setGroupShutUp','kickMember','onGroupSingleScreenNotifies','session','18pBdPel','GetGroupFileCount','34696AAsdul','delete','143568VGFjFs','获取群成员列表出错,','gayGy','getGroupService','3698270xfIXcR','haQIq','getGroups','1992275bBNEok','aBRGM','forEach','infos','uploadGroupBulletinPic','36nRfwZI','33eubnmI','RHnuu','modifyGroupName','modifyMemberCardName','addListener','errCode','uin','获取群系统消息列表超时','deleteGroupFile','groupCode','then','createGroupFolder','getPSkey','59479tQVUZI','deleteGroupFolder','errMsg','setMemberShutUp','operateSysNotify','modifyMemberRole','getSingleScreenNotifies','banMember','OKNyP','qun.qq.com','set','127122PsCbjk','OweeW'];_0x301b=function(){return _0x45cb4b;};return _0x301b();}const _0x145eb0=_0x7a02;(function(_0x20672d,_0x1bde0d){const _0x24f43d=_0x7a02,_0x22c0cc=_0x20672d();while(!![]){try{const _0x514035=-parseInt(_0x24f43d(0xa5))/0x1+-parseInt(_0x24f43d(0xc1))/0x2*(-parseInt(_0x24f43d(0xc5))/0x3)+parseInt(_0x24f43d(0xaf))/0x4+parseInt(_0x24f43d(0x87))/0x5+-parseInt(_0x24f43d(0x8c))/0x6*(-parseInt(_0x24f43d(0x9a))/0x7)+-parseInt(_0x24f43d(0xc3))/0x8*(-parseInt(_0x24f43d(0xa8))/0x9)+parseInt(_0x24f43d(0x84))/0xa*(-parseInt(_0x24f43d(0x8d))/0xb);if(_0x514035===_0x1bde0d)break;else _0x22c0cc['push'](_0x22c0cc['shift']());}catch(_0x23041c){_0x22c0cc['push'](_0x22c0cc['shift']());}}}(_0x301b,0x4e96a));import{NTQQUserApi,napCatCore}from'@/core';import{GroupListener}from'@/core/index';import{uid2UinMap}from'@/core/data';import{logDebug}from'@/common/utils/log';import{randomUUID}from'crypto';const groupMemberTasks=new Map(),SingleScreenNotifiesTasks=new Map(),groupListener=new GroupListener();groupListener[_0x145eb0(0xbf)]=(_0x40b4fe,_0x33ce9b,_0x5c6892)=>{for(const [_0x8ca107,_0x4f1fa0]of SingleScreenNotifiesTasks){_0x4f1fa0(_0x40b4fe,_0x33ce9b,_0x5c6892),groupMemberTasks['delete'](_0x8ca107);}},groupListener['onGroupListUpdate']=(_0x15ee71,_0xd05c37)=>{const _0x6789ea=_0x145eb0,_0x25349a={'OweeW':function(_0x3c3057,_0x8f4799,_0x148d9f){return _0x3c3057(_0x8f4799,_0x148d9f);}};for(const [_0x1852cc,_0x374f4f]of groupMemberTasks){_0x25349a[_0x6789ea(0xa6)](_0x374f4f,_0x15ee71,_0xd05c37),groupMemberTasks[_0x6789ea(0xc4)](_0x1852cc);}},setTimeout(()=>{napCatCore['onLoginSuccess'](()=>{const _0x164b0d=_0x7a02;napCatCore[_0x164b0d(0x91)](groupListener);});},0x64);export class NTQQGroupApi{static async[_0x145eb0(0x86)](_0x3658ff=![]){const _0x53d36d=_0x145eb0,_0x32652c={'ChpeI':function(_0x184fd7,_0x11480a){return _0x184fd7(_0x11480a);},'vwlZr':function(_0x561d1d,_0x9a7c72,_0x79c8f7){return _0x561d1d(_0x9a7c72,_0x79c8f7);},'PNOiT':_0x53d36d(0xb2),'pAEfp':function(_0x2723a7,_0x50947a,_0x59451e){return _0x2723a7(_0x50947a,_0x59451e);},'NvBua':function(_0x503755){return _0x503755();}};let _0x12781c=![];return new Promise((_0x45bb56,_0x5cb77d)=>{const _0x440d6f=_0x53d36d;_0x32652c['pAEfp'](setTimeout,()=>{const _0x2f9b54=_0x7a02;!_0x12781c&&(logDebug(_0x2f9b54(0xb0)),_0x32652c[_0x2f9b54(0xb1)](_0x5cb77d,_0x2f9b54(0xb0)));},0x1388);const _0x52eef2=(_0x2668fe,_0x5015f7)=>{const _0x33138e=_0x7a02;_0x12781c=!![],_0x32652c[_0x33138e(0xaa)](logDebug,_0x32652c[_0x33138e(0xb3)],_0x5015f7),_0x32652c[_0x33138e(0xb1)](_0x45bb56,_0x5015f7);};groupMemberTasks['set'](_0x32652c['NvBua'](randomUUID),_0x52eef2),napCatCore[_0x440d6f(0xc0)][_0x440d6f(0x83)]()['getGroupList'](_0x3658ff)[_0x440d6f(0x97)]();});}static async['CreatGroupFileFolder'](_0x439c77,_0x5735a2){const _0x166855=_0x145eb0;return napCatCore['session'][_0x166855(0xb8)]()[_0x166855(0x98)](_0x439c77,_0x5735a2);}static async[_0x145eb0(0xb5)](_0x50672d,_0x2afa1c){const _0x5958cb=_0x145eb0;return napCatCore[_0x5958cb(0xc0)]['getRichMediaService']()[_0x5958cb(0x95)](_0x50672d,[0x66],_0x2afa1c);}static async['DelGroupFileFolder'](_0x3aca96,_0x223b19){const _0x3db4d7=_0x145eb0;return napCatCore[_0x3db4d7(0xc0)][_0x3db4d7(0xb8)]()[_0x3db4d7(0x9b)](_0x3aca96,_0x223b19);}static async[_0x145eb0(0xa0)](_0x31350f){const _0x58c37a=_0x145eb0,_0x18581a={'AQGOd':function(_0x5c2416,_0x5774b4){return _0x5c2416(_0x5774b4);},'ULkiU':_0x58c37a(0x94),'haQIq':function(_0x5580ff,_0xb2d610,_0xf30417){return _0x5580ff(_0xb2d610,_0xf30417);},'aBRGM':function(_0x14dc02){return _0x14dc02();}},_0x5e49f2=napCatCore[_0x58c37a(0xc0)]['getGroupService']();return new Promise((_0x258ce6,_0x399946)=>{const _0x3aee74=_0x58c37a,_0x55cd58={'YruhZ':function(_0x22af08,_0x1930e4){return _0x18581a['AQGOLine truncated
|
||||
@@ -4,4 +4,5 @@ export * from './group';
|
||||
export * from './msg';
|
||||
export * from './user';
|
||||
export * from './webapi';
|
||||
export * from './window';
|
||||
export * from './sign';
|
||||
export * from './system';
|
||||
@@ -0,0 +1 @@
|
||||
function _0x30de(){var _0x4dfdea=['30892fYcrRX','1978106FrErvJ','6017192UzyTuC','1143429tFSDZD','801784hQOjok','1050YkgOKc','32736447tmErVs','36awLbjC','1516245WndRLq'];_0x30de=function(){return _0x4dfdea;};return _0x30de();}(function(_0x1de97e,_0x53b6d7){var _0x5147ea=_0x3127,_0x10a0e3=_0x1de97e();while(!![]){try{var _0x49fe07=-parseInt(_0x5147ea(0xa3))/0x1+parseInt(_0x5147ea(0xa0))/0x2+parseInt(_0x5147ea(0x9e))/0x3+parseInt(_0x5147ea(0x9f))/0x4*(-parseInt(_0x5147ea(0xa4))/0x5)+-parseInt(_0x5147ea(0x9d))/0x6*(parseInt(_0x5147ea(0xa2))/0x7)+-parseInt(_0x5147ea(0xa1))/0x8+parseInt(_0x5147ea(0xa5))/0x9;if(_0x49fe07===_0x53b6d7)break;else _0x10a0e3['push'](_0x10a0e3['shift']());}catch(_0x3d504e){_0x10a0e3['push'](_0x10a0e3['shift']());}}}(_0x30de,0xee486));export*from'./file';export*from'./friend';export*from'./group';function _0x3127(_0x110d8c,_0x21de71){var _0x30de91=_0x30de();return _0x3127=function(_0x3127d4,_0x291243){_0x3127d4=_0x3127d4-0x9d;var _0x30a550=_0x30de91[_0x3127d4];return _0x30a550;},_0x3127(_0x110d8c,_0x21de71);}export*from'./msg';export*from'./user';export*from'./webapi';export*from'./sign';export*from'./system';
|
||||
Vendored
+31
@@ -0,0 +1,31 @@
|
||||
import { GetFileListParam, Peer, RawMessage, SendMessageElement } from '@/core/entities';
|
||||
import { GeneralCallResult } from '@/core/services/common';
|
||||
export declare class NTQQMsgApi {
|
||||
static setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set?: boolean): Promise<unknown>;
|
||||
static getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
|
||||
msgList: RawMessage[];
|
||||
} | undefined>;
|
||||
static getMsgsByMsgId(peer: Peer, msgIds: string[]): Promise<GeneralCallResult & {
|
||||
msgList: RawMessage[];
|
||||
}>;
|
||||
static getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
|
||||
msgList: RawMessage[];
|
||||
}>;
|
||||
static activateChat(peer: Peer): Promise<void>;
|
||||
static activateChatAndGetHistory(peer: Peer): Promise<void>;
|
||||
static setMsgRead(peer: Peer): Promise<GeneralCallResult>;
|
||||
static getGroupFileList(GroupCode: string, params: GetFileListParam): Promise<{
|
||||
FileList: Array<any>;
|
||||
totalSpace: number;
|
||||
usedSpace: number;
|
||||
allUpload: boolean;
|
||||
}>;
|
||||
static getMsgHistory(peer: Peer, msgId: string, count: number): Promise<GeneralCallResult & {
|
||||
msgList: RawMessage[];
|
||||
}>;
|
||||
static fetchRecentContact(): Promise<void>;
|
||||
static recallMsg(peer: Peer, msgIds: string[]): Promise<void>;
|
||||
static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete?: boolean, timeout?: number): Promise<RawMessage>;
|
||||
static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<GeneralCallResult>;
|
||||
static multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage>;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
const _0x1c8b79=_0xdca5;(function(_0x365349,_0x25cb60){const _0xdcd108=_0xdca5,_0x2657b7=_0x365349();while(!![]){try{const _0x23c33e=-parseInt(_0xdcd108(0x142))/0x1+-parseInt(_0xdcd108(0x102))/0x2+-parseInt(_0xdcd108(0x10d))/0x3+-parseInt(_0xdcd108(0x108))/0x4+-parseInt(_0xdcd108(0x112))/0x5*(-parseInt(_0xdcd108(0x12e))/0x6)+parseInt(_0xdcd108(0x122))/0x7*(-parseInt(_0xdcd108(0x140))/0x8)+parseInt(_0xdcd108(0x11c))/0x9*(parseInt(_0xdcd108(0x139))/0xa);if(_0x23c33e===_0x25cb60)break;else _0x2657b7['push'](_0x2657b7['shift']());}catch(_0x1961f2){_0x2657b7['push'](_0x2657b7['shift']());}}}(_0x3864,0xbd858));import{selfInfo}from'@/core/data';import{log,logError}from'@/common/utils/log';import{sleep}from'@/common/utils/helper';import{napCatCore}from'@/core';import{MsgListener}from'@/core/listeners';import{randomUUID}from'crypto';const sendMessagePool={},sendSuccessCBMap={},GroupFileInfoUpdateTasks=new Map(),sentMsgTasks=new Map(),msgListener=new MsgListener();msgListener[_0x1c8b79(0x10a)]=_0x47cb11=>{const _0x2d8a93=_0x1c8b79,_0x154c99={'doaLH':function(_0x797345,_0x310ad2){return _0x797345(_0x310ad2);}};for(const [_0x4c72ed,_0x4e1c3f]of GroupFileInfoUpdateTasks){_0x154c99[_0x2d8a93(0x13c)](_0x4e1c3f,_0x47cb11),GroupFileInfoUpdateTasks[_0x2d8a93(0x13d)](_0x4c72ed);}},msgListener[_0x1c8b79(0x104)]=_0x528695=>{const _0x1644ea=_0x1c8b79;for(const [_0x9f98b8,_0x4103f7]of sentMsgTasks){_0x4103f7(_0x528695),sentMsgTasks[_0x1644ea(0x13d)](_0x9f98b8);}if(sendMessagePool[_0x528695[_0x1644ea(0x120)]]){const _0x110115=sendMessagePool[_0x528695['peerUid']]?.(_0x528695);_0x110115 instanceof Promise&&_0x110115[_0x1644ea(0x100)]()[_0x1644ea(0x113)](logError);}},msgListener[_0x1c8b79(0x12d)]=_0x3ed505=>{const _0x2d7cf8={'WQJvs':function(_0x41bf26,_0x21b440){return _0x41bf26(_0x21b440);},'GWsFc':function(_0x30b33f,_0x35e046){return _0x30b33f(_0x35e046);}};_0x3ed505['forEach'](_0x3c8696=>{const _0x666133=_0xdca5,_0x29c144={'RbcEI':function(_0x39285d,_0x50d6bc){const _0x5e3127=_0xdca5;return _0x2d7cf8[_0x5e3127(0x127)](_0x39285d,_0x50d6bc);},'pEVZB':function(_0x2254a1,_0x4600cc){return _0x2254a1 instanceof _0x4600cc;},'YQvhd':function(_0x1d5554,_0x5105be){const _0x43f38d=_0xdca5;return _0x2d7cf8[_0x43f38d(0x13e)](_0x1d5554,_0x5105be);}};new Promise((_0x377ac0,_0x1d6c32)=>{const _0x11cfbc=_0xdca5;for(const _0x1586e3 in sendSuccessCBMap){const _0x58af7b=sendSuccessCBMap[_0x1586e3],_0xd368a2=_0x29c144[_0x11cfbc(0x129)](_0x58af7b,_0x3c8696),_0x237e97=_0x25360b=>{_0x25360b&&delete sendSuccessCBMap[_0x1586e3];};_0x29c144[_0x11cfbc(0x125)](_0xd368a2,Promise)?_0xd368a2['then'](_0x237e97):_0x29c144['YQvhd'](_0x237e97,_0xd368a2);}})[_0x666133(0x100)]()['catch'](log);});},setTimeout(()=>{napCatCore['onLoginSuccess'](()=>{napCatCore['addListener'](msgListener);});},0x64);function _0xdca5(_0x2f7c08,_0x2cc148){const _0x3864c2=_0x3864();return _0xdca5=function(_0xdca511,_0x4d0a00){_0xdca511=_0xdca511-0x100;let _0x83687d=_0x3864c2[_0xdca511];return _0x83687d;},_0xdca5(_0x2f7c08,_0x2cc148);}function _0x3864(){const _0x43df75=['session','获取群文件列表超时','bytesData','arkElement','27EATSEr','setEmojiLike','item','multiForwardMsgWithComment','peerUid','chatType','2807yqZsaX','find','com.tencent.multimsg','pEVZB','getMsgsBySeqAndCount','WQJvs','sendMsg','RbcEI','echvP','tdDnK','senderUid','onMsgInfoListUpdate','3048LYtkwu','IedKH','FileList','OsTIi','parse','CRKKA','uid','getMsgService','hTSWR','activateChat','getMsgHistory','9736290lLdXBh','nick','forwardMsg','doaLH','delete','GWsFc','pJKAH','14632WmpJDB','recallMsg','558710yOEbJJ','groupSpaceResult','发送超时','multiForwardMsg','then','getMultiMsg','69026gZhmRe','app','onAddSendMsg','getMsgsByMsgId','allUpload','setMsgEmojiLikes','2936052fUecbh','setMsgRead','onGroupFileInfoUpdate','usedSpace','转发消息超时','253350nQkfaA','getGroupFileList','toString','svkuE','map','5fRgMMa','catch','length','oFQcn','totalSpace','msgId'];_0x3864=function(){return _0x43df75;};return _0x3864();}export class NTQQMsgApi{static async[_0x1c8b79(0x11d)](_0x491f25,_0x40a50f,_0x22ba94,_0x2e4007=!![]){const _0xd3f905=_0x1c8b79,_0x415f72={'echvP':function(_0x26a026,_0x3c760f){return _0x26a026>_0x3c760f;}};return _0x22ba94=_0x22ba94[_0xd3f905(0x10f)](),napCatCore[_0xd3f905(0x118)]['getMsgService']()[_0xd3f905(0x107)](_0x491f25,_0x40a50f,_0x22ba94,_0x415f72[_0xd3f905(0x12a)](_0x22ba94[_0xd3f905(0x114)],0x3)?'2':'1',_0x2e4007);}static async[_0x1c8b79(0x101)](_0x451bf4,_0x363852,_0x54daeb){const _0x483245=_0x1c8b79;return napCatCore[_0x483245(0x118)][_0x483245(0x135)]()['getMultiMsg'](_0x451bf4,_0x363852,_0x54daeb);}static async['getMsgsByMsgId'](_0x5f276f,_0x4127a1){const _0x591590=_0x1c8b79;return await napCatCore['session'][_0x591590(0x135)]()[_0x591590(0x105)](_0x5f276f,_0x4127a1);}static async[_0x1c8b79(0x126)](_0x15cf52,_0x2bef38,_0x412cd3,_0x3fa7f1,_0x469b1f){const _0xd8ac8=_0x1c8b79;return await napCatCore[_0xd8ac8(0x118)]['getMsgService']()[_0xd8ac8(0x126)](_0x15cf52,_0x2bef38,_0x412cd3,_0x3fa7f1,_Line truncated
|
||||
Vendored
+23
@@ -0,0 +1,23 @@
|
||||
export interface IdMusicSignPostData {
|
||||
type: 'qq' | '163';
|
||||
id: string | number;
|
||||
}
|
||||
export interface CustomMusicSignPostData {
|
||||
type: 'custom';
|
||||
url: string;
|
||||
audio: string;
|
||||
title: string;
|
||||
image?: string;
|
||||
singer?: string;
|
||||
}
|
||||
export interface MiniAppLuaJsonType {
|
||||
prompt: string;
|
||||
title: string;
|
||||
preview: string;
|
||||
jumpUrl: string;
|
||||
tag: string;
|
||||
tagIcon: string;
|
||||
source: string;
|
||||
sourcelogo: string;
|
||||
}
|
||||
export declare function SignMiniApp(CardData: MiniAppLuaJsonType): Promise<string>;
|
||||
@@ -0,0 +1 @@
|
||||
function _0x1cdc(){const _0x52229f=[';\x20skey=','genBkn','WNsrP','306FNUjyz','preview','signed_ark','\x5c/\x5c/','sourcelogo','4195qRUdIj','miniapp','title','uin','aWjNX','tagIcon','replace','https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=','&ark=','51tnItBa','stringify','jumpUrl','GET','21690uqUhhx','yKRsG','195oyiJTX','AaAVw','skey','normal','tag','22224XRNelA','173916uuvDFJ','source','tianxuan.imgJumpArk','20fyQjiM','p_skey=','2012346iZcXuj','p_skey','MiniApp\x20JSON\x20消息生成失败','42IhwlPM','data','157264BCSwTW','getQzoneCookies',';\x20p_uin=o','2773727oWKvpG','gljct','com.tencent.miniapp.lua','HttpGetJson','prompt','VEBFq','fcQLU','WccSO','38UHMRLY'];_0x1cdc=function(){return _0x52229f;};return _0x1cdc();}(function(_0x9cb42e,_0x1d6622){const _0x5868f1=_0x18e2,_0x1d3ea2=_0x9cb42e();while(!![]){try{const _0x213a11=parseInt(_0x5868f1(0x82))/0x1*(-parseInt(_0x5868f1(0x9f))/0x2)+parseInt(_0x5868f1(0x7e))/0x3*(parseInt(_0x5868f1(0x89))/0x4)+-parseInt(_0x5868f1(0x75))/0x5*(parseInt(_0x5868f1(0x70))/0x6)+-parseInt(_0x5868f1(0x92))/0x7*(-parseInt(_0x5868f1(0x94))/0x8)+parseInt(_0x5868f1(0x8f))/0x9+-parseInt(_0x5868f1(0x8d))/0xa*(-parseInt(_0x5868f1(0x97))/0xb)+parseInt(_0x5868f1(0x8a))/0xc*(-parseInt(_0x5868f1(0x84))/0xd);if(_0x213a11===_0x1d6622)break;else _0x1d3ea2['push'](_0x1d3ea2['shift']());}catch(_0x13da4e){_0x1d3ea2['push'](_0x1d3ea2['shift']());}}}(_0x1cdc,0x416ee));import{logDebug}from'@/common/utils/log';function _0x18e2(_0x227ff2,_0x15bf56){const _0x1cdc26=_0x1cdc();return _0x18e2=function(_0x18e234,_0x2c6981){_0x18e234=_0x18e234-0x6f;let _0x3ab75f=_0x1cdc26[_0x18e234];return _0x3ab75f;},_0x18e2(_0x227ff2,_0x15bf56);}import{NTQQUserApi}from'./user';import{selfInfo}from'../data';import{RequestUtil}from'@/common/utils/request';import{WebApi}from'./webapi';export async function SignMiniApp(_0x30846b){const _0x74356d=_0x18e2,_0x162349={'aWjNX':_0x74356d(0x99),'qjkHF':_0x74356d(0x8c),'YuczR':_0x74356d(0x76),'WccSO':_0x74356d(0x73),'yKRsG':function(_0x4c1f56,_0x22b76c){return _0x4c1f56+_0x22b76c;},'MsQyW':function(_0x7767d5,_0x2f9e11){return _0x7767d5+_0x2f9e11;},'IdOiF':_0x74356d(0x8e),'VEBFq':_0x74356d(0xa0),'MyRvd':_0x74356d(0x96),'AaAVw':function(_0x20266c,_0x486322){return _0x20266c+_0x486322;},'fcQLU':_0x74356d(0x7c),'gljct':_0x74356d(0x7d),'WNsrP':function(_0x51f71c,_0x45429d){return _0x51f71c(_0x45429d);},'MasKP':_0x74356d(0x81),'ZQJik':_0x74356d(0x91)};let _0x1c22ef={'app':_0x162349[_0x74356d(0x79)],'bizsrc':_0x162349['qjkHF'],'view':_0x162349['YuczR'],'prompt':_0x30846b[_0x74356d(0x9b)],'config':{'type':_0x74356d(0x87),'forward':0x1,'autosize':0x0},'meta':{'miniapp':{'title':_0x30846b[_0x74356d(0x77)],'preview':_0x30846b[_0x74356d(0x71)]['replace'](/\\/g,_0x162349[_0x74356d(0x9e)]),'jumpUrl':_0x30846b[_0x74356d(0x80)][_0x74356d(0x7b)](/\\/g,_0x74356d(0x73)),'tag':_0x30846b[_0x74356d(0x88)],'tagIcon':_0x30846b[_0x74356d(0x7a)][_0x74356d(0x7b)](/\\/g,_0x162349[_0x74356d(0x9e)]),'source':_0x30846b[_0x74356d(0x8b)],'sourcelogo':_0x30846b[_0x74356d(0x74)][_0x74356d(0x7b)](/\\/g,_0x162349[_0x74356d(0x9e)])}}};const _0x1095c4=await NTQQUserApi['getSkey']();let _0x2c7887=await NTQQUserApi[_0x74356d(0x95)]();const _0x1ca673=WebApi[_0x74356d(0xa1)](_0x2c7887['p_skey']),_0x6ec545=_0x162349[_0x74356d(0x83)](_0x162349[_0x74356d(0x83)](_0x162349[_0x74356d(0x83)](_0x162349['yKRsG'](_0x162349['MsQyW'](_0x162349[_0x74356d(0x83)](_0x162349['IdOiF'],_0x2c7887[_0x74356d(0x90)]),_0x162349[_0x74356d(0x9c)])+_0x2c7887[_0x74356d(0x86)],_0x162349['MyRvd']),selfInfo[_0x74356d(0x78)]),';\x20uin=o'),selfInfo['uin']);let _0x432849=_0x162349[_0x74356d(0x85)](_0x162349[_0x74356d(0x9d)],_0x1ca673)+_0x162349[_0x74356d(0x98)]+_0x162349[_0x74356d(0x6f)](encodeURIComponent,JSON[_0x74356d(0x7f)](_0x1c22ef)),_0x5027ac='';try{let _0x2edab5=await RequestUtil[_0x74356d(0x9a)](_0x432849,_0x162349['MasKP'],undefined,{'Cookie':_0x6ec545});_0x5027ac=_0x2edab5[_0x74356d(0x93)][_0x74356d(0x72)];}catch(_0x642965){logDebug(_0x162349['ZQJik'],_0x642965);}return _0x5027ac;}
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
export declare class NTQQSystemApi {
|
||||
static hasOtherRunningQQProcess(): Promise<boolean>;
|
||||
static ORCImage(filePath: string): Promise<import("@/core").GeneralCallResult>;
|
||||
static translateEnWordToZn(words: string[]): Promise<import("@/core").GeneralCallResult & {
|
||||
words: string[];
|
||||
}>;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
var _0x3dc00c=_0x4e9e;(function(_0x46fb3f,_0x2f04e2){var _0x2cf4a2=_0x4e9e,_0x5aac15=_0x46fb3f();while(!![]){try{var _0x46fd5b=parseInt(_0x2cf4a2(0x1b2))/0x1+-parseInt(_0x2cf4a2(0x1ad))/0x2*(-parseInt(_0x2cf4a2(0x1ba))/0x3)+parseInt(_0x2cf4a2(0x1ae))/0x4*(-parseInt(_0x2cf4a2(0x1bb))/0x5)+parseInt(_0x2cf4a2(0x1b4))/0x6*(parseInt(_0x2cf4a2(0x1af))/0x7)+-parseInt(_0x2cf4a2(0x1ac))/0x8*(parseInt(_0x2cf4a2(0x1bc))/0x9)+-parseInt(_0x2cf4a2(0x1b8))/0xa*(-parseInt(_0x2cf4a2(0x1b7))/0xb)+-parseInt(_0x2cf4a2(0x1b3))/0xc;if(_0x46fd5b===_0x2f04e2)break;else _0x5aac15['push'](_0x5aac15['shift']());}catch(_0x955f77){_0x5aac15['push'](_0x5aac15['shift']());}}}(_0x1f9a,0xb28da));import{napCatCore}from'@/core';function _0x1f9a(){var _0x47a198=['hasOtherRunningQQProcess','ORCImage','4206213FkCUVC','30ZKSLmf','getNodeMiscService','3WXhsli','24515NJgMSU','39852OyufwS','util','560FjGvKF','2142714VPFzRs','616SNoHcU','24626KRooHD','session','wantWinScreenOCR','899562TokBzb','24599016FXjJJy','1242RlefLV'];_0x1f9a=function(){return _0x47a198;};return _0x1f9a();}function _0x4e9e(_0x37259c,_0x1cbff9){var _0x1f9a7c=_0x1f9a();return _0x4e9e=function(_0x4e9e97,_0x7bc1b0){_0x4e9e97=_0x4e9e97-0x1ab;var _0x5aad0d=_0x1f9a7c[_0x4e9e97];return _0x5aad0d;},_0x4e9e(_0x37259c,_0x1cbff9);}export class NTQQSystemApi{static async[_0x3dc00c(0x1b5)](){var _0x55cb72=_0x3dc00c;return napCatCore[_0x55cb72(0x1ab)]['hasOtherRunningQQProcess']();}static async[_0x3dc00c(0x1b6)](_0x4c71ab){var _0x1f31c6=_0x3dc00c;return napCatCore[_0x1f31c6(0x1b0)][_0x1f31c6(0x1b9)]()[_0x1f31c6(0x1b1)](_0x4c71ab);}static async['translateEnWordToZn'](_0x1b7b7e){return napCatCore['session']['getRichMediaService']()['translateEnWordToZn'](_0x1b7b7e);}}
|
||||
Vendored
+25
@@ -0,0 +1,25 @@
|
||||
import { User } from '@/core/entities';
|
||||
import { GeneralCallResult } from '@/core';
|
||||
export declare class NTQQUserApi {
|
||||
static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
|
||||
static like(uid: string, count?: number): Promise<{
|
||||
result: number;
|
||||
errMsg: string;
|
||||
succCounts: number;
|
||||
}>;
|
||||
static setQQAvatar(filePath: string): Promise<{
|
||||
result: number;
|
||||
errMsg: string;
|
||||
}>;
|
||||
static getSelfInfo(): Promise<void>;
|
||||
static getUserInfo(uid: string): Promise<void>;
|
||||
static getUserDetailInfo(uid: string): Promise<User>;
|
||||
static getPSkey(domainList: string[], cached?: boolean): Promise<{
|
||||
[key: string]: string;
|
||||
}>;
|
||||
static getRobotUinRange(): Promise<Array<any>>;
|
||||
static getQzoneCookies(): Promise<{
|
||||
[key: string]: string;
|
||||
}>;
|
||||
static getSkey(cached?: boolean): Promise<string | undefined>;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
const _0x4226c4=_0x5c83;function _0x5c83(_0x5e8604,_0x45cf49){const _0x58a8f2=_0x58a8();return _0x5c83=function(_0x5c8349,_0x544f69){_0x5c8349=_0x5c8349-0x17b;let _0x5d8053=_0x58a8f2[_0x5c8349];return _0x5d8053;},_0x5c83(_0x5e8604,_0x45cf49);}(function(_0x26fe23,_0x45aa5d){const _0x47daf3=_0x5c83,_0x4b5d33=_0x26fe23();while(!![]){try{const _0x97e6d7=-parseInt(_0x47daf3(0x190))/0x1*(-parseInt(_0x47daf3(0x1a2))/0x2)+parseInt(_0x47daf3(0x1b1))/0x3*(-parseInt(_0x47daf3(0x1b7))/0x4)+parseInt(_0x47daf3(0x19a))/0x5+parseInt(_0x47daf3(0x194))/0x6+-parseInt(_0x47daf3(0x1ad))/0x7+parseInt(_0x47daf3(0x19d))/0x8*(-parseInt(_0x47daf3(0x1cc))/0x9)+parseInt(_0x47daf3(0x1c2))/0xa*(-parseInt(_0x47daf3(0x1b9))/0xb);if(_0x97e6d7===_0x45aa5d)break;else _0x4b5d33['push'](_0x4b5d33['shift']());}catch(_0x345aef){_0x4b5d33['push'](_0x4b5d33['shift']());}}}(_0x58a8,0xd0909));import{Credentials,selfInfo,uid2UinMap}from'@/core/data';import{napCatCore}from'@/core';import{ProfileListener}from'@/core/listeners';import{randomUUID}from'crypto';import{RequestUtil}from'@/common/utils/request';import{logDebug,logError}from'@/common/utils/log';const userInfoCache={},profileListener=new ProfileListener(),userDetailHandlers=new Map();profileListener[_0x4226c4(0x1c5)]=_0x5ddf97=>{const _0x45ed28=_0x4226c4;userInfoCache[_0x5ddf97[_0x45ed28(0x1af)]]=_0x5ddf97,userDetailHandlers['forEach'](_0x2be059=>_0x2be059(_0x5ddf97));},setTimeout(()=>{napCatCore['onLoginSuccess'](()=>{const _0x9a1a2=_0x5c83;napCatCore[_0x9a1a2(0x1be)](profileListener);});},0x64);export class NTQQUserApi{static async[_0x4226c4(0x17e)](_0x4ab9c9,_0xb5cb7d,_0x38c5a9){const _0x124fbb=_0x4226c4;return napCatCore[_0x124fbb(0x1aa)][_0x124fbb(0x185)]()[_0x124fbb(0x1a9)]({'status':_0x4ab9c9,'extStatus':_0xb5cb7d,'batteryStatus':_0x38c5a9});}static async[_0x4226c4(0x1a3)](_0x4d57a2,_0x39935a=0x1){const _0x16c467=_0x4226c4;return napCatCore[_0x16c467(0x1aa)]['getProfileLikeService']()[_0x16c467(0x182)]({'friendUid':_0x4d57a2,'sourceId':0x47,'doLikeCount':_0x39935a,'doLikeTollCount':0x0});}static async['setQQAvatar'](_0x523362){const _0x3f1a16=_0x4226c4,_0x15fb9a=napCatCore[_0x3f1a16(0x1aa)][_0x3f1a16(0x1c4)]()[_0x3f1a16(0x1a4)](_0x523362);return{'result':_0x15fb9a?.[_0x3f1a16(0x1c3)],'errMsg':_0x15fb9a?.[_0x3f1a16(0x1b2)]};}static async[_0x4226c4(0x1b4)](){}static async['getUserInfo'](_0x1801cc){}static async[_0x4226c4(0x1cd)](_0x1cbf13){const _0x527a9e={'OLmBL':function(_0x589654,_0x332eaf){return _0x589654===_0x332eaf;},'gOyVr':function(_0x164a42,_0x3238fb){return _0x164a42(_0x3238fb);}},_0x2d594e=napCatCore['session']['getProfileService']();return new Promise((_0x1cd074,_0x33e576)=>{const _0x5d3233=_0x5c83,_0x1d93e5={'PAqzO':function(_0x342737,_0x4ad37a){return _0x342737(_0x4ad37a);},'FBwWW':'getUserDetailInfo\x20timeout'},_0xf2e40f=randomUUID();let _0x4c5c4a=![],_0x357a51=undefined,_0xc00e78=!![];setTimeout(()=>{const _0x530299=_0x5c83;!_0x4c5c4a&&(_0x357a51?_0x1d93e5[_0x530299(0x1bd)](_0x1cd074,_0x357a51):_0x33e576(_0x1d93e5[_0x530299(0x1c7)])),userDetailHandlers['delete'](_0xf2e40f);},0x1388),userDetailHandlers['set'](_0xf2e40f,_0x1f92c0=>{const _0x1a6bb3=_0x5c83;_0x527a9e[_0x1a6bb3(0x1bb)](_0x1f92c0[_0x1a6bb3(0x1af)],_0x1cbf13)&&(uid2UinMap[_0x1cbf13]=_0x1f92c0[_0x1a6bb3(0x1c1)],_0xc00e78?(_0x357a51=_0x1f92c0,_0xc00e78=![]):(_0x4c5c4a=!![],_0x527a9e[_0x1a6bb3(0x197)](_0x1cd074,_0x1f92c0)));}),_0x2d594e['getUserDetailInfoWithBizInfo'](_0x1cbf13,[0x0])[_0x5d3233(0x191)](_0xb499d7=>{});});}static async[_0x4226c4(0x1b8)](_0x299f6b,_0x28ea55=!![]){const _0x4da8ec=_0x4226c4,_0x5f2055={'SUhiU':function(_0x1deef4,_0x1beea3){return _0x1deef4||_0x1beea3;},'ypBVM':function(_0xfbe2c3,_0x865407){return _0xfbe2c3>_0x865407;},'qylvr':function(_0x3c6e50,_0x2475d4){return _0x3c6e50-_0x2475d4;},'hHnnf':function(_0x49e034,_0x5d7d71){return _0x49e034===_0x5d7d71;}},_0xe624cf=[],_0x4840b0={};for(const _0x26efae in _0x299f6b){const _0x56b900=Credentials[_0x4da8ec(0x1a7)][_0x4da8ec(0x193)](_0x299f6b[_0x26efae]),_0x37a8d3=Credentials[_0x4da8ec(0x19f)]['get'](_0x299f6b[_0x26efae]);_0x5f2055[_0x4da8ec(0x1ab)](!_0x56b900,!_0x37a8d3)||_0x5f2055[_0x4da8ec(0x19e)](_0x5f2055[_0x4da8ec(0x18e)](Date[_0x4da8ec(0x1b3)](),_0x37a8d3),0x708*0x3e8)||!_0x28ea55?_0xe624cf[_0x4da8ec(0x181)](_0x299f6b[_0x26efae]):_0x4840b0[_0x299f6b[_0x26efae]]=_0x56b900;}let _0x5799a9={'result':0x0,'errMsg':'','domainPskeyMap':new Map()};_0xe624cf[_0x4da8ec(0x192)]>0x0&&(_0x5799a9=await napCatCore[_0x4da8ec(0x1aa)][_0x4da8ec(0x1ce)]()[_0x4da8ec(0x1ae)](_0xe624cf,!![]));const _0x2fe0e7=_0x5799a9[_0x4da8ec(0x1a0)];for(const _0x237a36 of _0x2fe0e7[_0x4da8ec(0x17f)]()){Credentials[_0x4da8ec(0x1a7)][_0x4da8ec(0x18d)](_0x237a36[0x0],_0x237a36[0x1]),Credentials[_0x4da8ec(0x19f)][_0x4da8ec(0x18d)](_0x237a36[0x0],Date['now']());}const _0x52228a=Object[_0x4da8ec(0x199)](Object[_0x4da8ec(0x17d)](_0x2fe0e7),_0x4840b0);if(_0x5f2055[_0x4da8ec(0x1ac)](_0x5799a9[_0x4da8ec(0x1c3)],0x0))return _0x52228a;else logError(_0x4da8ec(0x18a),_0x5799a9[_0x4da8ec(0Line truncated
|
||||
Vendored
+105
@@ -0,0 +1,105 @@
|
||||
export declare enum WebHonorType {
|
||||
ALL = "all",
|
||||
TALKACTIVE = "talkative",
|
||||
PERFROMER = "performer",
|
||||
LEGEND = "legend",
|
||||
STORONGE_NEWBI = "strong_newbie",
|
||||
EMOTION = "emotion"
|
||||
}
|
||||
export interface WebApiGroupMember {
|
||||
uin: number;
|
||||
role: number;
|
||||
g: number;
|
||||
join_time: number;
|
||||
last_speak_time: number;
|
||||
lv: {
|
||||
point: number;
|
||||
level: number;
|
||||
};
|
||||
card: string;
|
||||
tags: string;
|
||||
flag: number;
|
||||
nick: string;
|
||||
qage: number;
|
||||
rm: number;
|
||||
}
|
||||
export interface WebApiGroupNoticeFeed {
|
||||
u: number;
|
||||
fid: string;
|
||||
pubt: number;
|
||||
msg: {
|
||||
text: string;
|
||||
text_face: string;
|
||||
title: string;
|
||||
pics?: {
|
||||
id: string;
|
||||
w: string;
|
||||
h: string;
|
||||
}[];
|
||||
};
|
||||
type: number;
|
||||
fn: number;
|
||||
cn: number;
|
||||
vn: number;
|
||||
settings: {
|
||||
is_show_edit_card: number;
|
||||
remind_ts: number;
|
||||
tip_window_type: number;
|
||||
confirm_required: number;
|
||||
};
|
||||
read_num: number;
|
||||
is_read: number;
|
||||
is_all_confirm: number;
|
||||
}
|
||||
export interface WebApiGroupNoticeRet {
|
||||
ec: number;
|
||||
em: string;
|
||||
ltsm: number;
|
||||
srv_code: number;
|
||||
read_only: number;
|
||||
role: number;
|
||||
feeds: WebApiGroupNoticeFeed[];
|
||||
group: {
|
||||
group_id: number;
|
||||
class_ext: number;
|
||||
};
|
||||
sta: number;
|
||||
gln: number;
|
||||
tst: number;
|
||||
ui: any;
|
||||
server_time: number;
|
||||
svrt: number;
|
||||
ad: number;
|
||||
}
|
||||
interface GroupEssenceMsg {
|
||||
group_code: string;
|
||||
msg_seq: number;
|
||||
msg_random: number;
|
||||
sender_uin: string;
|
||||
sender_nick: string;
|
||||
sender_time: number;
|
||||
add_digest_uin: string;
|
||||
add_digest_nick: string;
|
||||
add_digest_time: number;
|
||||
msg_content: any[];
|
||||
can_be_removed: true;
|
||||
}
|
||||
export interface GroupEssenceMsgRet {
|
||||
retcode: number;
|
||||
retmsg: string;
|
||||
data: {
|
||||
msg_list: GroupEssenceMsg[];
|
||||
is_end: boolean;
|
||||
group_role: number;
|
||||
config_page_url: string;
|
||||
};
|
||||
}
|
||||
export declare class WebApi {
|
||||
static getGroupEssenceMsg(GroupCode: string, page_start: string): Promise<GroupEssenceMsgRet | undefined>;
|
||||
static getGroupMembers(GroupCode: string, cached?: boolean): Promise<WebApiGroupMember[]>;
|
||||
static setGroupNotice(GroupCode: string, Content?: string): Promise<any>;
|
||||
static getGrouptNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet>;
|
||||
static genBkn(sKey: string): string;
|
||||
static getGroupHonorInfo(groupCode: string, getType: WebHonorType): Promise<any>;
|
||||
}
|
||||
export {};
|
||||
@@ -0,0 +1 @@
|
||||
function _0x8c59(_0x599291,_0x1d4e64){const _0x44fc3a=_0x44fc();return _0x8c59=function(_0x8c590d,_0xca9b00){_0x8c590d=_0x8c590d-0x17a;let _0x3f558d=_0x44fc3a[_0x8c590d];return _0x3f558d;},_0x8c59(_0x599291,_0x1d4e64);}const _0x4f7cc5=_0x8c59;(function(_0x2a3c33,_0x476e1b){const _0xa9bf4d=_0x8c59,_0x3e76a9=_0x2a3c33();while(!![]){try{const _0x5f2c54=parseInt(_0xa9bf4d(0x1b2))/0x1+-parseInt(_0xa9bf4d(0x1db))/0x2+parseInt(_0xa9bf4d(0x214))/0x3+parseInt(_0xa9bf4d(0x1b9))/0x4*(-parseInt(_0xa9bf4d(0x191))/0x5)+-parseInt(_0xa9bf4d(0x1de))/0x6*(-parseInt(_0xa9bf4d(0x1e4))/0x7)+parseInt(_0xa9bf4d(0x1cf))/0x8*(parseInt(_0xa9bf4d(0x1a1))/0x9)+-parseInt(_0xa9bf4d(0x1a5))/0xa;if(_0x5f2c54===_0x476e1b)break;else _0x3e76a9['push'](_0x3e76a9['shift']());}catch(_0xbb2bf2){_0x3e76a9['push'](_0x3e76a9['shift']());}}}(_0x44fc,0xece03));import{WebGroupData,selfInfo}from'@/core/data';import{logDebug}from'@/common/utils/log';function _0x44fc(){const _0x302589=['10UQwQzE','kcrzh','set','qid=','https://web.qun.qq.com/cgi-bin/announce/get_t_list?bkn=','getGroupHonorInfo','gllMy','talkativeList','klcRF','TALKACTIVE','push','hFmOG','获取群聊之火失败','yuqOz','https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?st=','&sort=1&gc=','12784023vfqjoj','all','kDQre','performer','27258650fVWgLs','PERFROMER','&bkn=','talkative_list','AQMkT','&page_limit=20','VoENZ','errcode','MYRhf','getGroupMembers','BNAwc','lfNvG','OIuoh','1842010EfDTdc','wIlzG','GroupData','ZwmDa','charCodeAt','avatar','naBGV','1422328rmMjnl','KVzDJ','https://qun.qq.com/cgi-bin/group_digest/digest_list?bkn=','performer_list','https://qun.qq.com/interactive/honorlist?gc=','HttpGetJson','ZyYfc','https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?st=0&end=40&sort=1&gc=','Wvdeg','ynfhd','jqSLa',';\x20p_uin=o','czkRm','lWGeh','xrair','qun.qq.com','emotion_list','3|5|1|0|4|2','获取群聊炽焰失败','GET','split','https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?bkn=','8EcKPbb','current_talkative','&qid=','getGroupEssenceMsg','pTriJ','ceil','PgeSK','setGroupNotice','genBkn','IBRsB','dzjEb','nhGVA','74482kTWqfk','strong_newbie',';\x20skey=','7734JyJfNM','CtPYc','jyNUC','parse','syQVR','jtFsy','4067Schxjf','EMOTION','AqdjZ','JLYQA','uKDHx','emODe','desc','获取快乐源泉失败','HFwWU','wqayY','RZrBB','trim','juBHh','MSxvU','toString','TaIpM','hIFBS','match','PtZIr','vUxQc','OxKkv','oExbo','WUOTg','legend','POST','GroupTime','teqJl','strong_newbie_list','borYn','fcHxb','STORONGE_NEWBI','zgLSm','wvzRQ',';\x20uin=o','ilbcx','ALL','YBJaN','fbmeK','VAyMA','description','RLBLE','&page_start=','AOXxq','&text=','JAQoQ','talkative','hJxkv','count','1299441qVRpbS','zHoYx','get','WauNo','now','vFYST','SRkYJ','legend_list','getGrouptNotice','jBgaW','getSkey','&pinned=0&type=1&settings={\x22is_show_edit_card\x22:1,\x22tip_window_type\x22:1,\x22confirm_required\x22:1}','p_skey=','&type=','DYuFq','getPSkey','&group_code=','cdgEs','mems','uin','ZgADu','name','ZFxIR','TesmW','vBvGS'];_0x44fc=function(){return _0x302589;};return _0x44fc();}import{NTQQUserApi}from'./user';import{RequestUtil}from'@/common/utils/request';export var WebHonorType;(function(_0x22b0a2){const _0x51de01=_0x8c59,_0x2a22f3={'oMbNj':_0x51de01(0x1ca),'lfNvG':'LEGEND','rndoR':_0x51de01(0x1a6),'yuqOz':_0x51de01(0x1a4),'KVzDJ':_0x51de01(0x202),'ksNwG':_0x51de01(0x1dc),'nhGVA':_0x51de01(0x19a),'JAQoQ':_0x51de01(0x211)},_0x568fc9=_0x2a22f3['oMbNj'][_0x51de01(0x1cd)]('|');let _0x40b10e=0x0;while(!![]){switch(_0x568fc9[_0x40b10e++]){case'0':_0x22b0a2[_0x2a22f3[_0x51de01(0x1b0)]]=_0x51de01(0x1fb);continue;case'1':_0x22b0a2[_0x2a22f3['rndoR']]=_0x2a22f3[_0x51de01(0x19e)];continue;case'2':_0x22b0a2['EMOTION']='emotion';continue;case'3':_0x22b0a2['ALL']=_0x51de01(0x1a2);continue;case'4':_0x22b0a2[_0x2a22f3[_0x51de01(0x1ba)]]=_0x2a22f3['ksNwG'];continue;case'5':_0x22b0a2[_0x2a22f3[_0x51de01(0x1da)]]=_0x2a22f3[_0x51de01(0x210)];continue;}break;}}(WebHonorType||(WebHonorType={})));export class WebApi{static async[_0x4f7cc5(0x1d2)](_0xf5141d,_0x36d964){const _0x13e34b=_0x4f7cc5,_0x585ffd={'wqayY':_0x13e34b(0x1c8),'BNAwc':function(_0x5a0718,_0x1a2818){return _0x5a0718+_0x1a2818;},'MSxvU':function(_0x5ab74d,_0x5338d2){return _0x5ab74d+_0x5338d2;},'fbmeK':_0x13e34b(0x1dd),'BzZku':_0x13e34b(0x1c4),'TesmW':_0x13e34b(0x205),'RZrBB':function(_0x1e9338,_0xb5f7bf){return _0x1e9338+_0xb5f7bf;},'XkgUv':function(_0x1d517b,_0x6ed61d){return _0x1d517b+_0x6ed61d;},'NAmkj':function(_0x299fa7,_0x4e9967){return _0x299fa7+_0x4e9967;},'kcrzh':function(_0x4c5ea7,_0x51ba6f){return _0x4c5ea7+_0x51ba6f;},'wvzRQ':_0x13e34b(0x1bb),'zgLSm':_0x13e34b(0x188),'vUxQc':_0x13e34b(0x20d),'naBGV':_0x13e34b(0x1aa),'kDQre':'GET','ZgADu':function(_0x5286f8,_0x1596a3){return _0x5286f8!==_0x1596a3;}},_0x5034db=(await NTQQUserApi[_0x13e34b(0x187)]([_0x585ffd[_0x13e34b(0x1ed)]]))[_0x585ffd[_0x13e34b(0x1ed)]],_0x42c8e3=await NTQQUserApi[_0x13e34b(0x182)](),_0x41cafa=_0x585ffd[_0x13e34b(0x1af)](_0x585ffd[_0x13e34b(0x1af)](_0x585ffd[_0x13e34b(0x1af)](_0x58Line truncated
|
||||
File renamed without changes.
@@ -0,0 +1 @@
|
||||
(function(_0x3f718c,_0x5aba03){var _0x3040fb=_0xc42f,_0x44e7f6=_0x3f718c();while(!![]){try{var _0x500389=parseInt(_0x3040fb(0x278e4))/0x1+-parseInt(_0x3040fb(0xccc1))/0x2+-parseInt(_0x3040fb(0x19687))/0x3*(parseInt(_0x3040fb(0x2f9cd))/0x4)+-parseInt(_0x3040fb(0x3a2d5))/0x5*(-parseInt(_0x3040fb(0x84ac))/0x6)+parseInt(_0x3040fb(0x1e9b6))/0x7*(parseInt(_0x3040fb(0x2b60d))/0x8)+parseInt(_0x3040fb(0x44e18))/0x9*(parseInt(_0x3040fb(0x27988))/0xa)+-parseInt(_0x3040fb(0x5d64))/0xb;if(_0x500389===_0x5aba03)break;else _0x44e7f6['push'](_0x44e7f6['shift']());}catch(_0x4080ca){_0x44e7f6['push'](_0x44e7f6['shift']());}}}(_0x2b99,0x6088c),(function(_0x21ad5d,_0x44d9cf){var _0x920790=_0xc42f,_0x7ae31c={'ekhpx':function(_0x3c6b08){return _0x3c6b08();},'EnxSY':function(_0x12f121,_0x483045){return _0x12f121+_0x483045;},'yQIkv':function(_0x25a210,_0x1f3a4b){return _0x25a210+_0x1f3a4b;},'YSskc':function(_0x308239,_0x387b9b){return _0x308239(_0x387b9b);},'KZVig':function(_0x27464e,_0x4f9cf2){return _0x27464e/_0x4f9cf2;},'myngm':function(_0x161be4,_0x357891){return _0x161be4/_0x357891;},'tFxQE':function(_0x424552,_0x42a17e){return _0x424552(_0x42a17e);},'nitxh':function(_0x5ab957,_0x3bf8f1){return _0x5ab957/_0x3bf8f1;},'rbRfV':function(_0x2e8083,_0x147c23){return _0x2e8083(_0x147c23);},'DvRGy':function(_0x53e6e5,_0x5246a8){return _0x53e6e5(_0x5246a8);},'RPcQU':function(_0x5382ef,_0x38fe57){return _0x5382ef*_0x38fe57;},'DGfxx':function(_0x482c05,_0x49e9db){return _0x482c05(_0x49e9db);},'zEiYL':function(_0x54d284,_0x36979b){return _0x54d284(_0x36979b);},'SWAHb':function(_0x353b7a,_0x4f24e1){return _0x353b7a*_0x4f24e1;},'XClIt':function(_0x40bf74,_0x29769f){return _0x40bf74/_0x29769f;},'Fisfu':function(_0x10e151,_0x115fcb){return _0x10e151(_0x115fcb);},'YSjEo':function(_0x383e0a,_0x46b86c){return _0x383e0a===_0x46b86c;},'ZVkor':'push','Qxzhh':_0x920790(0x4913e)},_0x1dfbfe=_0x467a,_0x2ad3ba=_0x7ae31c[_0x920790(0x81f4)](_0x21ad5d);while(!![]){try{var _0x1a8114=_0x7ae31c[_0x920790(0x12dcc)](_0x7ae31c[_0x920790(0x12dcc)](_0x7ae31c[_0x920790(0x3bc78)](_0x7ae31c[_0x920790(0x12dcc)](_0x7ae31c[_0x920790(0x12dcc)](_0x7ae31c[_0x920790(0x12dcc)](-_0x7ae31c['YSskc'](parseInt,_0x1dfbfe(0xfc02))/0x1,_0x7ae31c[_0x920790(0x1ebd2)](-_0x7ae31c[_0x920790(0x3b48d)](parseInt,_0x1dfbfe(0x18b9b)),0x2)),_0x7ae31c[_0x920790(0x46b3a)](_0x7ae31c[_0x920790(0x31ba6)](parseInt,_0x1dfbfe(0x10f5d)),0x3)*_0x7ae31c['nitxh'](_0x7ae31c[_0x920790(0x2737c)](parseInt,_0x7ae31c[_0x920790(0x2a83e)](_0x1dfbfe,0xec44)),0x4)),_0x7ae31c[_0x920790(0x39cc9)](parseInt(_0x1dfbfe(0x65b5))/0x5,_0x7ae31c[_0x920790(0x1ebd2)](parseInt(_0x1dfbfe(0x1136b)),0x6))),_0x7ae31c[_0x920790(0x12df)](parseInt,_0x7ae31c[_0x920790(0x2bc2f)](_0x1dfbfe,0x1ff35))/0x7),_0x7ae31c[_0x920790(0x1338f)](_0x7ae31c[_0x920790(0x43dd6)](_0x7ae31c[_0x920790(0x3b48d)](parseInt,_0x7ae31c[_0x920790(0x12df)](_0x1dfbfe,0x1a8ee)),0x8),_0x7ae31c[_0x920790(0x2ba78)](parseInt,_0x7ae31c[_0x920790(0x2737c)](_0x1dfbfe,0xe514))/0x9)),_0x7ae31c['KZVig'](-parseInt(_0x1dfbfe(0x1feef)),0xa));if(_0x7ae31c['YSjEo'](_0x1a8114,_0x44d9cf))break;else _0x2ad3ba[_0x7ae31c['ZVkor']](_0x2ad3ba[_0x7ae31c[_0x920790(0x2a1c9)]]());}catch(_0x60f1d0){_0x2ad3ba[_0x7ae31c[_0x920790(0x4dc3f)]](_0x2ad3ba[_0x7ae31c[_0x920790(0x2a1c9)]]());}}}(_0x2002,0xd4f04),(function(_0x2b8152,_0xc13d83){var _0x412b38=_0xc42f,_0x216e2d={'TZRXJ':function(_0x1933d3,_0x15fe75){return _0x1933d3+_0x15fe75;},'xaIEM':function(_0x1c22ee,_0x62c7ee){return _0x1c22ee/_0x62c7ee;},'mvqIP':function(_0x391450,_0x17f707){return _0x391450(_0x17f707);},'ZXPFY':function(_0x135ac9,_0x2cbb3c){return _0x135ac9/_0x2cbb3c;},'kkcFH':function(_0x2802d3,_0x49e4b4){return _0x2802d3*_0x49e4b4;},'sQnrp':function(_0x34b84d,_0xfcc6ce){return _0x34b84d*_0xfcc6ce;},'inuqK':function(_0x7b18ad,_0x4146e6){return _0x7b18ad/_0x4146e6;},'TnHcz':function(_0x7ef2f8,_0x2f1a36){return _0x7ef2f8(_0x2f1a36);},'oVgca':function(_0x4edc40,_0xcd475d){return _0x4edc40===_0xcd475d;},'QYwAe':'shift','NQAwA':function(_0x2a37d7,_0x1d9b00){return _0x2a37d7(_0x1d9b00);},'GBmoc':function(_0x4c9b49,_0x1c1762){return _0x4c9b49+_0x1c1762;},'Chdgr':_0x412b38(0x4ebd1),'NnCbo':function(_0x1f7b16,_0x564426){return _0x1f7b16(_0x564426);},'sVglL':function(_0x14e26f,_0x1da8d8){return _0x14e26f(_0x1da8d8);},'OTZUv':'CHqaE','HezFB':function(_0x2d06d9,_0x228f53){return _0x2d06d9(_0x228f53);},'eyahE':function(_0x5d7041,_0x2f4345){return _0x5d7041/_0x2f4345;},'mRHAC':function(_0x5021bd,_0x5e9647){return _0x5021bd(_0x5e9647);},'FctyR':function(_0x48e217,_0x2c4172){return _0x48e217/_0x2c4172;},'ugoDO':_0x412b38(0x7b28),'yXYHK':_0x412b38(0x46e5d),'VREZL':function(_0x48c24f,_0x4f3855){return _0x48c24f(_0x4f3855);},'WfpEI':function(_0x289c14,_0x33240e){return _0x289c14/_0x33240e;},'nNLpe':function(_0x37d2b8,_0x17ae9f){return _0x37d2b8(_0x17ae9f);},'eEqVY':function(_0x453dcb,_0x32daf0){return _0x453dcb(_0x32daf0);},'IHCoN':function(_0x42070e,_0x45193b){return _0x42070e(_0x45193b);},'etGUH':function(_0x28d117,_0x792e4){return _0x28d117(_0x7Line truncated
|
||||
Vendored
+36
@@ -0,0 +1,36 @@
|
||||
/// <reference types="node" />
|
||||
import { NodeIQQNTWrapperEngine, NodeIQQNTWrapperSession, NodeQQNTWrapperUtil } from '@/core/wrapper';
|
||||
import { QuickLoginResult } from '@/core/services';
|
||||
import { BuddyListener, GroupListener, MsgListener, ProfileListener } from '@/core/listeners';
|
||||
export interface OnLoginSuccess {
|
||||
(uin: string, uid: string): void | Promise<void>;
|
||||
}
|
||||
export declare class NapCatCore {
|
||||
readonly session: NodeIQQNTWrapperSession;
|
||||
readonly util: NodeQQNTWrapperUtil;
|
||||
readonly engine: NodeIQQNTWrapperEngine;
|
||||
private readonly loginListener;
|
||||
private loginService;
|
||||
private onLoginSuccessFuncList;
|
||||
private proxyHandler;
|
||||
constructor();
|
||||
get dataPath(): string;
|
||||
get dataPathGlobal(): string;
|
||||
private initConfig;
|
||||
private initSession;
|
||||
private initDataListener;
|
||||
addListener(listener: BuddyListener | GroupListener | MsgListener | ProfileListener): number;
|
||||
onLoginSuccess(func: OnLoginSuccess): void;
|
||||
quickLogin(uin: string): Promise<QuickLoginResult>;
|
||||
qrLogin(cb: (url: string, base64: string, buffer: Buffer) => Promise<void>): Promise<{
|
||||
url: string;
|
||||
base64: string;
|
||||
buffer: Buffer;
|
||||
}>;
|
||||
passwordLogin(uin: string, password: string, proofSig?: string, proofRand?: string, proofSid?: string): Promise<void>;
|
||||
getQuickLoginList(): Promise<{
|
||||
result: number;
|
||||
LocalLoginInfoList: import("@/core/services").LoginListItem[];
|
||||
}>;
|
||||
}
|
||||
export declare const napCatCore: NapCatCore;
|
||||
@@ -0,0 +1 @@
|
||||
const _0x3ebcf4=_0x5b18;(function(_0x23ee36,_0x56911a){const _0x326c10=_0x5b18,_0xc9b598=_0x23ee36();while(!![]){try{const _0x500a05=parseInt(_0x326c10(0x184))/0x1*(-parseInt(_0x326c10(0x19c))/0x2)+parseInt(_0x326c10(0x217))/0x3*(-parseInt(_0x326c10(0x1af))/0x4)+parseInt(_0x326c10(0x1fa))/0x5+-parseInt(_0x326c10(0x1f4))/0x6*(parseInt(_0x326c10(0x1b7))/0x7)+parseInt(_0x326c10(0x1f1))/0x8+-parseInt(_0x326c10(0x1b6))/0x9+parseInt(_0x326c10(0x20a))/0xa;if(_0x500a05===_0x56911a)break;else _0xc9b598['push'](_0xc9b598['shift']());}catch(_0x253214){_0xc9b598['push'](_0xc9b598['shift']());}}}(_0x13f1,0xad848));import _0x3437b4 from'@/core/wrapper';import{BuddyListener,GroupListener,LoginListener,MsgListener,ProfileListener,SessionListener}from'@/core/listeners';import{DependsAdapter,DispatcherAdapter,GlobalAdapter}from'@/core/adapters';function _0x5b18(_0x1d2ab1,_0x402a6b){const _0x13f1a4=_0x13f1();return _0x5b18=function(_0x5b18b7,_0x7a6a5d){_0x5b18b7=_0x5b18b7-0x174;let _0x41ec9e=_0x13f1a4[_0x5b18b7];return _0x41ec9e;},_0x5b18(_0x1d2ab1,_0x402a6b);}import _0x4deabb from'node:path';import _0x493d42 from'node:os';import _0x3f1272 from'node:fs';import{appid,qqVersionConfigInfo}from'@/common/utils/QQBasicInfo';import{hostname,systemVersion}from'@/common/utils/system';import{genSessionConfig}from'@/core/sessionConfig';import{dbUtil}from'@/common/utils/db';import{sleep}from'@/common/utils/helper';import _0xde9169 from'node:crypto';import{rawFriends,friends,groupMembers,groups,selfInfo,stat,uid2UinMap}from'@/core/data';import{enableConsoleLog,enableFileLog,log,logDebug,logError,setLogLevel,setLogSelfInfo}from'@/common/utils/log';import{napCatConfig}from'@/core/utils/config';export class NapCatCore{[_0x3ebcf4(0x209)];['util'];[_0x3ebcf4(0x20c)];[_0x3ebcf4(0x18e)];[_0x3ebcf4(0x175)];[_0x3ebcf4(0x195)]=[];['proxyHandler']={'get'(target,prop,receiver){const _0x5206f3=_0x3ebcf4,wJtWfg={'XyDRs':function(callee,param1){return callee(param1);},'NRDol':_0x5206f3(0x1db)};if(typeof target[prop]===wJtWfg[_0x5206f3(0x1f7)])return(...args)=>{const _0x47c481=_0x5206f3;wJtWfg[_0x47c481(0x1fb)](logDebug,target['constructor']['name']+_0x47c481(0x17f)+prop);};return Reflect[_0x5206f3(0x1e2)](target,prop,receiver);}};constructor(){const _0x36e582=_0x3ebcf4,_0x660dd7={'JpATz':function(_0x1cc4a0,_0x3da6f2){return _0x1cc4a0(_0x3da6f2);},'QtLJu':function(_0x51db11,_0x274ec8){return _0x51db11+_0x274ec8;},'OHoXi':function(_0x1c0df4,_0x3b873d){return _0x1c0df4+_0x3b873d;},'VZqrg':_0x36e582(0x19d),'GWnce':function(_0x9a58cf,_0x3ab917,_0x39a33d){return _0x9a58cf(_0x3ab917,_0x39a33d);},'YOahV':_0x36e582(0x1b3),'FWWQl':_0x36e582(0x1c6),'DtbjJ':'initSession\x20failed','TZFdz':function(_0x4d884a,_0x3ed2a4){return _0x4d884a==_0x3ed2a4;},'bBemf':_0x36e582(0x1ad)};this['engine']=new _0x3437b4[(_0x36e582(0x219))](),this[_0x36e582(0x1a2)]=new _0x3437b4['NodeQQNTWrapperUtil'](),this[_0x36e582(0x175)]=new _0x3437b4[(_0x36e582(0x178))](),this[_0x36e582(0x209)]=new _0x3437b4[(_0x36e582(0x174))](),this['loginListener']=new LoginListener(),this[_0x36e582(0x18e)][_0x36e582(0x1c1)]=_0x54e88e=>{const _0x148afe=_0x36e582;_0x660dd7[_0x148afe(0x19e)](logError,_0x660dd7['QtLJu'](_0x660dd7['OHoXi'](_0x660dd7[_0x148afe(0x1ae)],_0x54e88e),')已登录,无法重复登录'));},this[_0x36e582(0x18e)][_0x36e582(0x1bc)]=_0x3f8fbf=>{const _0x2748f2=_0x36e582,_0x6a60b4={'qgCTr':function(_0x4fd38f,_0x3d78c7,_0x3ee6c1){const _0x4881bc=_0x5b18;return _0x660dd7[_0x4881bc(0x196)](_0x4fd38f,_0x3d78c7,_0x3ee6c1);},'SQjBZ':function(_0x463025,_0x2eb115){return _0x463025 instanceof _0x2eb115;},'NCRQV':function(_0x499786,_0x492d26,_0x52dd3f){const _0xaa9722=_0x5b18;return _0x660dd7[_0xaa9722(0x196)](_0x499786,_0x492d26,_0x52dd3f);},'nlhAV':function(_0x34fc20,_0x298189){const _0x31a9f0=_0x5b18;return _0x660dd7[_0x31a9f0(0x19e)](_0x34fc20,_0x298189);},'RUBvD':_0x660dd7[_0x2748f2(0x1d7)],'rXzJs':_0x660dd7[_0x2748f2(0x1bd)],'FKiGH':_0x660dd7[_0x2748f2(0x188)]};this[_0x2748f2(0x18f)](_0x3f8fbf[_0x2748f2(0x176)],_0x3f8fbf['uid'])[_0x2748f2(0x180)](_0x3a8234=>{const _0x3766a4=_0x2748f2,_0x595ae9={'IlnSw':function(_0x5cd8bb,_0x526773){const _0x2a4e44=_0x5b18;return _0x6a60b4[_0x2a4e44(0x201)](_0x5cd8bb,_0x526773);}};selfInfo['uin']=_0x3f8fbf[_0x3766a4(0x176)],selfInfo['uid']=_0x3f8fbf[_0x3766a4(0x1b0)],napCatConfig['read'](),_0x6a60b4[_0x3766a4(0x1c3)](setLogLevel,napCatConfig[_0x3766a4(0x200)],napCatConfig[_0x3766a4(0x190)]),_0x6a60b4[_0x3766a4(0x1d6)](enableFileLog,napCatConfig[_0x3766a4(0x191)]),enableConsoleLog(napCatConfig['consoleLog']),_0x6a60b4[_0x3766a4(0x1d6)](setLogSelfInfo,selfInfo);const _0x2321b3=_0x4deabb[_0x3766a4(0x1a9)](this[_0x3766a4(0x1e8)],_0x6a60b4[_0x3766a4(0x218)]);_0x3f1272['mkdirSync'](_0x2321b3,{'recursive':!![]}),_0x6a60b4[_0x3766a4(0x1ff)](logDebug,_0x6a60b4[_0x3766a4(0x1d1)],_0x2321b3),dbUtil[_0x3766a4(0x1ea)](_0x4deabb[_0x3766a4(0x1a9)](_0x2321b3,'./'+_0x3f8fbf[_0x3766a4(0x176)]+'-v2.db'))['then'](()=>{const _0x1ea298=_0x3766a4;this[_0x1ea298(0x1dc)](),this[_0x1ea298(0Line truncated
|
||||
Vendored
+45
@@ -0,0 +1,45 @@
|
||||
import { type Friend, type FriendRequest, type Group, type GroupMember, GroupNotify, type SelfInfo, BuddyCategoryType } from './entities';
|
||||
import { WebApiGroupMember } from '@/core/apis';
|
||||
export declare const Credentials: {
|
||||
Skey: string;
|
||||
CreatTime: number;
|
||||
Cookies: Map<string, string>;
|
||||
ClientKey: string;
|
||||
KeyIndex: string;
|
||||
PskeyData: Map<string, string>;
|
||||
PskeyTime: Map<string, number>;
|
||||
};
|
||||
export declare const WebGroupData: {
|
||||
GroupData: Map<string, WebApiGroupMember[]>;
|
||||
GroupTime: Map<string, number>;
|
||||
};
|
||||
export declare const selfInfo: SelfInfo;
|
||||
export declare const groups: Map<string, Group>;
|
||||
export declare function deleteGroup(groupQQ: string): void;
|
||||
export declare const groupMembers: Map<string, Map<string, GroupMember>>;
|
||||
export declare const friends: Map<string, Friend>;
|
||||
export declare const friendRequests: Record<string, FriendRequest>;
|
||||
export declare const groupNotifies: Record<string, GroupNotify>;
|
||||
export declare const napCatError: {
|
||||
ffmpegError: string;
|
||||
httpServerError: string;
|
||||
wsServerError: string;
|
||||
otherError: string;
|
||||
};
|
||||
export declare function getFriend(uinOrUid: string): Promise<Friend | undefined>;
|
||||
export declare function getGroup(qq: string | number): Promise<Group | undefined>;
|
||||
export declare function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number): Promise<GroupMember | null | undefined>;
|
||||
export declare const uid2UinMap: Record<string, string>;
|
||||
export declare function getUidByUin(uin: string): string | undefined;
|
||||
export declare const tempGroupCodeMap: Record<string, string>;
|
||||
export declare const rawFriends: Array<BuddyCategoryType>;
|
||||
export declare const stat: {
|
||||
packet_received: number;
|
||||
packet_sent: number;
|
||||
message_received: number;
|
||||
message_sent: number;
|
||||
last_message_time: number;
|
||||
disconnect_times: number;
|
||||
lost_times: number;
|
||||
packet_lost: number;
|
||||
};
|
||||
@@ -0,0 +1 @@
|
||||
(function(_0x5a094b,_0x53bca0){const _0x3456d1=_0x31c6,_0x4f983c=_0x5a094b();while(!![]){try{const _0x4ae09a=parseInt(_0x3456d1(0x154))/0x1*(-parseInt(_0x3456d1(0x167))/0x2)+parseInt(_0x3456d1(0x15a))/0x3*(parseInt(_0x3456d1(0x16b))/0x4)+-parseInt(_0x3456d1(0x169))/0x5*(parseInt(_0x3456d1(0x163))/0x6)+-parseInt(_0x3456d1(0x16c))/0x7*(-parseInt(_0x3456d1(0x159))/0x8)+-parseInt(_0x3456d1(0x15f))/0x9*(-parseInt(_0x3456d1(0x15e))/0xa)+parseInt(_0x3456d1(0x16a))/0xb*(parseInt(_0x3456d1(0x153))/0xc)+-parseInt(_0x3456d1(0x161))/0xd*(parseInt(_0x3456d1(0x15d))/0xe);if(_0x4ae09a===_0x53bca0)break;else _0x4f983c['push'](_0x4f983c['shift']());}catch(_0x4caddb){_0x4f983c['push'](_0x4f983c['shift']());}}}(_0x59e3,0x8936e));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'Cookies':new Map(),'ClientKey':'','KeyIndex':'','PskeyData':new Map(),'PskeyTime':new Map()};function _0x31c6(_0x35d7d7,_0x2b617d){const _0x59e372=_0x59e3();return _0x31c6=function(_0x31c682,_0x1e4a6f){_0x31c682=_0x31c682-0x152;let _0x42b77b=_0x59e372[_0x31c682];return _0x42b77b;},_0x31c6(_0x35d7d7,_0x2b617d);}export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x38683a){const _0x5e820b=_0x31c6;groups[_0x5e820b(0x164)](_0x38683a),groupMembers[_0x5e820b(0x164)](_0x38683a);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};function _0x59e3(){const _0xfa9a31=['forEach','values','from','47744NGjoxX','15lfbwQC','toString','wtogw','20818drtaZM','10ockpIG','7553727kuARYX','vLIBs','20059KEEnWe','set','441186NHzJPt','delete','getGroupMembers','find','12AeFSrV','get','45CpSUlf','71621suZMQH','713308iGUJgo','1036GmiFwy','uin','2064TjVpoN','35974zPmWzG','getGroups'];_0x59e3=function(){return _0xfa9a31;};return _0x59e3();}export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':'NapCat未能正常启动,请检查日志查看错误'};export async function getFriend(_0x241e6e){const _0x340a30=_0x31c6,_0x33670b={'wtogw':function(_0x33b955,_0x412eaa){return _0x33b955(_0x412eaa);}};_0x241e6e=_0x241e6e[_0x340a30(0x15b)]();if(_0x33670b[_0x340a30(0x15c)](isNumeric,_0x241e6e)){const _0x887b8a=Array[_0x340a30(0x158)](friends[_0x340a30(0x157)]());return _0x887b8a[_0x340a30(0x166)](_0x1e9b17=>_0x1e9b17['uin']===_0x241e6e);}else return friends[_0x340a30(0x168)](_0x241e6e);}export async function getGroup(_0xa20a5d){const _0x5ea1e2=_0x31c6;let _0x12a308=groups[_0x5ea1e2(0x168)](_0xa20a5d[_0x5ea1e2(0x15b)]());if(!_0x12a308)try{const _0x10a3e8=await NTQQGroupApi[_0x5ea1e2(0x155)]();_0x10a3e8['length']&&_0x10a3e8[_0x5ea1e2(0x156)](_0x3246a2=>{const _0x41b173=_0x5ea1e2;groups[_0x41b173(0x162)](_0x3246a2['groupCode'],_0x3246a2);});}catch(_0x5453c1){return undefined;}return _0x12a308=groups['get'](_0xa20a5d[_0x5ea1e2(0x15b)]()),_0x12a308;}export async function getGroupMember(_0x42d756,_0x4ebf44){const _0x28311c=_0x31c6,_0x1223dc={'vLIBs':function(_0x4eb939){return _0x4eb939();}};_0x42d756=_0x42d756[_0x28311c(0x15b)](),_0x4ebf44=_0x4ebf44['toString']();let _0x550c2d=groupMembers[_0x28311c(0x168)](_0x42d756);if(!_0x550c2d)try{_0x550c2d=await NTQQGroupApi['getGroupMembers'](_0x42d756),groupMembers['set'](_0x42d756,_0x550c2d);}catch(_0x4f4d31){return null;}const _0x1b91eb=()=>{const _0x430760=_0x28311c;let _0x481c1e=undefined;return isNumeric(_0x4ebf44)?_0x481c1e=Array[_0x430760(0x158)](_0x550c2d['values']())['find'](_0x34adef=>_0x34adef[_0x430760(0x152)]===_0x4ebf44):_0x481c1e=_0x550c2d[_0x430760(0x168)](_0x4ebf44),_0x481c1e;};let _0x5ce91f=_0x1223dc[_0x28311c(0x160)](_0x1b91eb);return!_0x5ce91f&&(_0x550c2d=await NTQQGroupApi[_0x28311c(0x165)](_0x42d756),_0x5ce91f=_0x1223dc['vLIBs'](_0x1b91eb)),_0x5ce91f;}export const uid2UinMap={};export function getUidByUin(_0xb040d4){for(const _0x235ea2 in uid2UinMap){if(uid2UinMap[_0x235ea2]===_0xb040d4)return _0x235ea2;}}export const tempGroupCodeMap={};export const rawFriends=[];export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};
|
||||
File renamed without changes.
@@ -0,0 +1 @@
|
||||
function _0x5c31(){var _0x1db4e6=['42294ppkGbi','zGRyP','3076eaeMyR','4454028cTVHPk','103085wXZQBT','dQpho','9459828FMoOhf','AUDIO','378mgINbc','OTHER','IMAGE','329540lgQAeX','1203ukPxVd','116VYCWoS','144XuCJoS','402788rQsLKv','nSEAa','aYVHC','33BEEUPR','QRnTE'];_0x5c31=function(){return _0x1db4e6;};return _0x5c31();}(function(_0x147917,_0x1cff81){var _0x4e2075=_0x82aa,_0xd3b3a3=_0x147917();while(!![]){try{var _0x361792=parseInt(_0x4e2075(0x1c7))/0x1+-parseInt(_0x4e2075(0x1ba))/0x2*(parseInt(_0x4e2075(0x1c4))/0x3)+-parseInt(_0x4e2075(0x1c5))/0x4*(-parseInt(_0x4e2075(0x1bc))/0x5)+-parseInt(_0x4e2075(0x1bb))/0x6+-parseInt(_0x4e2075(0x1b8))/0x7*(-parseInt(_0x4e2075(0x1c6))/0x8)+parseInt(_0x4e2075(0x1c0))/0x9*(-parseInt(_0x4e2075(0x1c3))/0xa)+-parseInt(_0x4e2075(0x1b6))/0xb*(-parseInt(_0x4e2075(0x1be))/0xc);if(_0x361792===_0x1cff81)break;else _0xd3b3a3['push'](_0xd3b3a3['shift']());}catch(_0x628cb6){_0xd3b3a3['push'](_0xd3b3a3['shift']());}}}(_0x5c31,0xb2872));;function _0x82aa(_0x28f252,_0x2953f2){var _0x5c31ab=_0x5c31();return _0x82aa=function(_0x82aa27,_0x4e839c){_0x82aa27=_0x82aa27-0x1b4;var _0x116513=_0x5c31ab[_0x82aa27];return _0x116513;},_0x82aa(_0x28f252,_0x2953f2);}export var CacheFileType;(function(_0x55408e){var _0x5eaa9a=_0x82aa,_0x3be7a7={'zGRyP':_0x5eaa9a(0x1c2),'dQpho':'VIDEO','QRnTE':_0x5eaa9a(0x1bf),'aYVHC':'DOCUMENT','nSEAa':_0x5eaa9a(0x1c1)};_0x55408e[_0x55408e[_0x5eaa9a(0x1c2)]=0x0]=_0x3be7a7[_0x5eaa9a(0x1b9)],_0x55408e[_0x55408e[_0x3be7a7['dQpho']]=0x1]=_0x3be7a7[_0x5eaa9a(0x1bd)],_0x55408e[_0x55408e[_0x3be7a7[_0x5eaa9a(0x1b7)]]=0x2]=_0x3be7a7[_0x5eaa9a(0x1b7)],_0x55408e[_0x55408e[_0x3be7a7['aYVHC']]=0x3]=_0x3be7a7[_0x5eaa9a(0x1b5)],_0x55408e[_0x55408e[_0x3be7a7['nSEAa']]=0x4]=_0x3be7a7[_0x5eaa9a(0x1b4)];}(CacheFileType||(CacheFileType={})));
|
||||
Vendored
+7
-1
@@ -1,4 +1,5 @@
|
||||
import { AtType, SendArkElement, SendFaceElement, SendFileElement, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, SendVideoElement } from '../entities';
|
||||
import { AtType, SendArkElement, SendFaceElement, SendFileElement, SendMarkdownElement, SendMarketFaceElement, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, SendVideoElement } from './index';
|
||||
export declare const mFaceCache: Map<string, string>;
|
||||
export declare class SendMsgElementConstructor {
|
||||
static text(content: string): SendTextElement;
|
||||
static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement;
|
||||
@@ -8,5 +9,10 @@ export declare class SendMsgElementConstructor {
|
||||
static video(filePath: string, fileName?: string, diyThumbPath?: string): Promise<SendVideoElement>;
|
||||
static ptt(pttPath: string): Promise<SendPttElement>;
|
||||
static face(faceId: number): SendFaceElement;
|
||||
static mface(emojiPackageId: number, emojiId: string, key: string, faceName: string): SendMarketFaceElement;
|
||||
static dice(resultId: number | null): SendFaceElement;
|
||||
static rps(resultId: number | null): SendFaceElement;
|
||||
static ark(data: any): SendArkElement;
|
||||
static markdown(content: string): SendMarkdownElement;
|
||||
static miniapp(): Promise<SendArkElement>;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
const _0x513033=_0x485d;(function(_0x2e3a9f,_0x4377af){const _0x16fe8f=_0x485d,_0x233b83=_0x2e3a9f();while(!![]){try{const _0x32a834=-parseInt(_0x16fe8f(0xf2))/0x1+-parseInt(_0x16fe8f(0x125))/0x2*(parseInt(_0x16fe8f(0x12d))/0x3)+-parseInt(_0x16fe8f(0xe4))/0x4*(parseInt(_0x16fe8f(0xf6))/0x5)+parseInt(_0x16fe8f(0x10d))/0x6+-parseInt(_0x16fe8f(0xe3))/0x7*(-parseInt(_0x16fe8f(0x110))/0x8)+-parseInt(_0x16fe8f(0x111))/0x9+parseInt(_0x16fe8f(0xd6))/0xa;if(_0x32a834===_0x4377af)break;else _0x233b83['push'](_0x233b83['shift']());}catch(_0x158086){_0x233b83['push'](_0x233b83['shift']());}}}(_0x44a8,0xb04bb));import{AtType,ElementType,FaceIndex,FaceType,PicType}from'./index';import{promises as _0x3e825d}from'node:fs';function _0x485d(_0x2daad1,_0xdb08b7){const _0x44a803=_0x44a8();return _0x485d=function(_0x485d54,_0x14cc83){_0x485d54=_0x485d54-0xd2;let _0x12b8cc=_0x44a803[_0x485d54];return _0x12b8cc;},_0x485d(_0x2daad1,_0xdb08b7);}import _0x3e01e5 from'fluent-ffmpeg';import{NTQQFileApi}from'@/core/apis/file';import{calculateFileMD5,isGIF}from'@/common/utils/file';import{logDebug,logError}from'@/common/utils/log';import{defaultVideoThumb,getVideoInfo}from'@/common/utils/video';import{encodeSilk}from'@/common/utils/audio';import _0x24cd5c from'./face_config.json';import*as _0x111097 from'node:path';function _0x44a8(){const _0x2d7c66=['FACE','stringify','Bot\x20Test','https://www.bilibili.com/','AniStickerType','markdown','MARKDOWN','PIC','error','bGhFK','bNmkZ','文件异常,大小为0','aySGV','921686RAmzDB','miniapp','toString','width','replace','[骰子]','获取视频封面失败,使用默认封面','RPS','3xseTGd','PTT','ARK','_0.png','sep','JqqCh','18927680rgfMEj','QSid','UgLtp','获取视频信息失败','MFACE','Ori','https://tianquan.gtimg.cn/qqAIAgent/item/7/square.png','pic','join','wbYWf','find','getImageSize','unlink','49YsURwz','8QadRLo','CRlJj','video','tNVfI','Thumb','notAt','https://tianquan.gtimg.cn/shoal/qqAIAgent/3e9d70c9-d98c-45b8-80b4-79d82971b514.png','end','jpg','VIDEO','QhwFV','GhzoY','KVhCL','copyFile','462170CLnvpN','file','FILE','sysface','1430150RUwFWc','aqpOD','hvLde','kGdng','stat','FSiye','size','sYuAC','then','nTMYj','AniStickerPackId','uploadFile','[包剪锤]','JYBds','emoji','dice','writeFile','FJglJ','catch','kouuh','reply','TEXT','mface','3129210JgznHu','text','gif','84184fVpCfE','2437056neJbJt','tgPTr','height','time','dirname','string','AEnwe'];_0x44a8=function(){return _0x2d7c66;};return _0x44a8();}import{SignMiniApp}from'../apis';export const mFaceCache=new Map();export class SendMsgElementConstructor{static[_0x513033(0x10e)](_0x4c3e0e){const _0x17788a=_0x513033;return{'elementType':ElementType[_0x17788a(0x10b)],'elementId':'','textElement':{'content':_0x4c3e0e,'atType':AtType[_0x17788a(0xe9)],'atUid':'','atTinyId':'','atNtUid':''}};}static['at'](_0x29ee1d,_0x585405,_0xe71ee8,_0x10eea3){const _0x1afe10=_0x513033;return{'elementType':ElementType[_0x1afe10(0x10b)],'elementId':'','textElement':{'content':'@'+_0x10eea3,'atType':_0xe71ee8,'atUid':_0x29ee1d,'atTinyId':'','atNtUid':_0x585405}};}static[_0x513033(0x10a)](_0x42154d,_0x767fcd,_0x17eb1d,_0x395451){return{'elementType':ElementType['REPLY'],'elementId':'','replyElement':{'replayMsgSeq':_0x42154d,'replayMsgId':_0x767fcd,'senderUin':_0x17eb1d,'senderUinStr':_0x395451}};}static async[_0x513033(0xdd)](_0x157ec2,_0x41be68='',_0x19c5a7=0x0){const _0x544854=_0x513033,_0x12f8a5={'xHQXh':function(_0x5650e3,_0x213866){return _0x5650e3(_0x213866);}},{md5:_0x4f23be,fileName:_0x85814c,path:_0x2f8aec,fileSize:_0x4951de}=await NTQQFileApi[_0x544854(0x101)](_0x157ec2,ElementType['PIC'],_0x19c5a7);if(_0x4951de===0x0)throw _0x544854(0x123);const _0x2e7f1a=await NTQQFileApi[_0x544854(0xe1)](_0x157ec2),_0x5a29a3={'md5HexStr':_0x4f23be,'fileSize':_0x4951de['toString'](),'picWidth':_0x2e7f1a?.['width'],'picHeight':_0x2e7f1a?.[_0x544854(0x113)],'fileName':_0x85814c,'sourcePath':_0x2f8aec,'original':!![],'picType':_0x12f8a5['xHQXh'](isGIF,_0x157ec2)?PicType[_0x544854(0x10f)]:PicType[_0x544854(0xec)],'picSubType':_0x19c5a7,'fileUuid':'','fileSubId':'','thumbFileSize':0x0,'summary':_0x41be68};return{'elementType':ElementType[_0x544854(0x11f)],'elementId':'','picElement':_0x5a29a3};}static async[_0x513033(0xf3)](_0x4fb41e,_0x52fee4=''){const _0xaf332d=_0x513033,_0x546759={'inBom':function(_0x4a1070,_0x1576ad){return _0x4a1070===_0x1576ad;},'aqpOD':function(_0x74744b,_0x114ce7){return _0x74744b||_0x114ce7;}},{md5:_0x304f56,fileName:_0x21c9c7,path:_0x2a138a,fileSize:_0x79c2}=await NTQQFileApi[_0xaf332d(0x101)](_0x4fb41e,ElementType['FILE']);if(_0x546759['inBom'](_0x79c2,0x0))throw _0xaf332d(0x123);const _0x2bc1cb={'elementType':ElementType[_0xaf332d(0xf4)],'elementId':'','fileElement':{'fileName':_0x546759[_0xaf332d(0xf7)](_0x52fee4,_0x21c9c7),'filePath':_0x2a138a,'fileSize':_0x79c2[_0xaf332d(0x127)]()}};return _0x2bc1cb;}static async[_0x513033(0xe6)](_0x4e76bc,_0x9b2546='',_0x4a3681=''){const _0x33e8b7=_0x513033,_0x3a1001={'hvLde':function(_0x113f6Line truncated
|
||||
File diff suppressed because it is too large.
Load diff
+3
-3
@@ -7,7 +7,7 @@ export interface Group {
|
||||
groupStatus: 0;
|
||||
memberRole: 2;
|
||||
isTop: boolean;
|
||||
toppedTimestamp: '0';
|
||||
toppedTimestamp: string;
|
||||
privilegeFlag: number;
|
||||
isConf: boolean;
|
||||
hasModifyConfGroupFace: boolean;
|
||||
@@ -24,8 +24,8 @@ export interface Group {
|
||||
groupCreditLevel: number;
|
||||
groupFlagExt3: number;
|
||||
groupOwnerId: {
|
||||
'memberUin': string;
|
||||
'memberUid': string;
|
||||
memberUin: string;
|
||||
memberUid: string;
|
||||
};
|
||||
}
|
||||
export declare enum GroupMemberRole {
|
||||
@@ -0,0 +1 @@
|
||||
(function(_0x21e602,_0x20ce31){var _0x5070c1=_0x4f36,_0x24284f=_0x21e602();while(!![]){try{var _0x1b0065=-parseInt(_0x5070c1(0x18d))/0x1+-parseInt(_0x5070c1(0x192))/0x2+parseInt(_0x5070c1(0x18e))/0x3*(parseInt(_0x5070c1(0x190))/0x4)+parseInt(_0x5070c1(0x18b))/0x5*(-parseInt(_0x5070c1(0x195))/0x6)+parseInt(_0x5070c1(0x194))/0x7*(parseInt(_0x5070c1(0x193))/0x8)+-parseInt(_0x5070c1(0x189))/0x9*(-parseInt(_0x5070c1(0x198))/0xa)+-parseInt(_0x5070c1(0x197))/0xb*(-parseInt(_0x5070c1(0x18f))/0xc);if(_0x1b0065===_0x20ce31)break;else _0x24284f['push'](_0x24284f['shift']());}catch(_0x44ab1e){_0x24284f['push'](_0x24284f['shift']());}}}(_0x218f,0x5878d));export var GroupMemberRole;function _0x4f36(_0x932d05,_0x20b0b6){var _0x218f4f=_0x218f();return _0x4f36=function(_0x4f36fa,_0xdbf4ef){_0x4f36fa=_0x4f36fa-0x189;var _0x32705e=_0x218f4f[_0x4f36fa];return _0x32705e;},_0x4f36(_0x932d05,_0x20b0b6);}function _0x218f(){var _0x3b067f=['9264wBKBRJ','203NEPQSe','303882riRAbd','normal','11035706KLZHsO','475990ngzrJM','9CIdMsO','owner','15aqXlzA','yNiHR','426515ShFUZe','7965OZOQsy','12QHeqKR','308kQnQSR','zYAFj','696050mVQzqR'];_0x218f=function(){return _0x3b067f;};return _0x218f();}(function(_0x4d8d33){var _0x4a30fe=_0x4f36,_0x530a38={'yNiHR':_0x4a30fe(0x196),'zYAFj':'admin'};_0x4d8d33[_0x4d8d33[_0x530a38[_0x4a30fe(0x18c)]]=0x2]=_0x530a38['yNiHR'],_0x4d8d33[_0x4d8d33[_0x530a38[_0x4a30fe(0x191)]]=0x3]=_0x530a38[_0x4a30fe(0x191)],_0x4d8d33[_0x4d8d33[_0x4a30fe(0x18a)]=0x4]=_0x4a30fe(0x18a);}(GroupMemberRole||(GroupMemberRole={})));
|
||||
File renamed without changes.
@@ -0,0 +1 @@
|
||||
(function(_0x35a77f,_0x50495b){var _0x3c50eb=_0x5b6d,_0x27878c=_0x35a77f();while(!![]){try{var _0x4cad93=-parseInt(_0x3c50eb(0x1f0))/0x1*(parseInt(_0x3c50eb(0x1f2))/0x2)+-parseInt(_0x3c50eb(0x1e7))/0x3*(-parseInt(_0x3c50eb(0x1e8))/0x4)+-parseInt(_0x3c50eb(0x1eb))/0x5*(-parseInt(_0x3c50eb(0x1ed))/0x6)+-parseInt(_0x3c50eb(0x1ee))/0x7*(-parseInt(_0x3c50eb(0x1ec))/0x8)+-parseInt(_0x3c50eb(0x1e6))/0x9+parseInt(_0x3c50eb(0x1ef))/0xa*(parseInt(_0x3c50eb(0x1e9))/0xb)+parseInt(_0x3c50eb(0x1f1))/0xc*(parseInt(_0x3c50eb(0x1ea))/0xd);if(_0x4cad93===_0x50495b)break;else _0x27878c['push'](_0x27878c['shift']());}catch(_0x4824b8){_0x27878c['push'](_0x27878c['shift']());}}}(_0x4cd4,0x56fae));export*from'./user';export*from'./group';export*from'./msg';export*from'./notify';function _0x4cd4(){var _0x1a761d=['2kUbpqo','10658244eBHabY','608666GijGFn','6334884aJEHwE','3jaFJnT','961892Koqsex','22HxEwqH','13PgFnVN','5hATDtz','8oIJVNj','1001094ySLKGo','127771SiwLTQ','1775250DvwJvF'];_0x4cd4=function(){return _0x1a761d;};return _0x4cd4();}function _0x5b6d(_0x8a273c,_0x5e326a){var _0x4cd44d=_0x4cd4();return _0x5b6d=function(_0x5b6dfa,_0x26492b){_0x5b6dfa=_0x5b6dfa-0x1e6;var _0x18858e=_0x4cd44d[_0x5b6dfa];return _0x18858e;},_0x5b6d(_0x8a273c,_0x5e326a);}export*from'./cache';export*from'./constructor';
|
||||
+147
-131
@@ -2,7 +2,23 @@ import { GroupMemberRole } from './group';
|
||||
export interface Peer {
|
||||
chatType: ChatType;
|
||||
peerUid: string;
|
||||
guildId?: '';
|
||||
guildId?: string;
|
||||
}
|
||||
export interface KickedOffLineInfo {
|
||||
appId: number;
|
||||
instanceId: number;
|
||||
sameDevice: boolean;
|
||||
tipsDesc: string;
|
||||
tipsTitle: string;
|
||||
kickedType: number;
|
||||
securityKickedType: number;
|
||||
}
|
||||
export interface GetFileListParam {
|
||||
sortType: number;
|
||||
fileCount: number;
|
||||
startIndex: number;
|
||||
sortOrder: number;
|
||||
showOnlinedocFolder: number;
|
||||
}
|
||||
export declare enum ElementType {
|
||||
TEXT = 1,
|
||||
@@ -12,11 +28,13 @@ export declare enum ElementType {
|
||||
VIDEO = 5,
|
||||
FACE = 6,
|
||||
REPLY = 7,
|
||||
ARK = 10
|
||||
ARK = 10,
|
||||
MFACE = 11,
|
||||
MARKDOWN = 14
|
||||
}
|
||||
export interface SendTextElement {
|
||||
elementType: ElementType.TEXT;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
textElement: {
|
||||
content: string;
|
||||
atType: number;
|
||||
@@ -27,7 +45,7 @@ export interface SendTextElement {
|
||||
}
|
||||
export interface SendPttElement {
|
||||
elementType: ElementType.PTT;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
pttElement: {
|
||||
fileName: string;
|
||||
filePath: string;
|
||||
@@ -39,7 +57,7 @@ export interface SendPttElement {
|
||||
voiceChangeType: number;
|
||||
canConvert2Text: boolean;
|
||||
waveAmplitudes: number[];
|
||||
fileSubId: '';
|
||||
fileSubId: string;
|
||||
playState: number;
|
||||
autoConvertText: number;
|
||||
};
|
||||
@@ -54,7 +72,7 @@ export declare enum PicSubType {
|
||||
}
|
||||
export interface SendPicElement {
|
||||
elementType: ElementType.PIC;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
picElement: {
|
||||
md5HexStr: string;
|
||||
fileSize: number | string;
|
||||
@@ -73,7 +91,7 @@ export interface SendPicElement {
|
||||
}
|
||||
export interface SendReplyElement {
|
||||
elementType: ElementType.REPLY;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
replyElement: {
|
||||
replayMsgSeq: string;
|
||||
replayMsgId: string;
|
||||
@@ -83,41 +101,50 @@ export interface SendReplyElement {
|
||||
}
|
||||
export interface SendFaceElement {
|
||||
elementType: ElementType.FACE;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
faceElement: FaceElement;
|
||||
}
|
||||
export interface SendMarketFaceElement {
|
||||
elementType: ElementType.MFACE;
|
||||
marketFaceElement: MarketFaceElement;
|
||||
}
|
||||
export interface FileElement {
|
||||
'fileMd5'?: '';
|
||||
'fileName': string;
|
||||
'filePath': string;
|
||||
fileMd5?: string;
|
||||
fileName: string;
|
||||
filePath: string;
|
||||
fileSize: string;
|
||||
'picHeight'?: number;
|
||||
'picWidth'?: number;
|
||||
'picThumbPath'?: Map<number, string>;
|
||||
'file10MMd5'?: '';
|
||||
'fileSha'?: '';
|
||||
'fileSha3'?: '';
|
||||
'fileUuid'?: '';
|
||||
'fileSubId'?: '';
|
||||
'thumbFileSize'?: number;
|
||||
picHeight?: number;
|
||||
picWidth?: number;
|
||||
picThumbPath?: Map<number, string>;
|
||||
file10MMd5?: string;
|
||||
fileSha?: string;
|
||||
fileSha3?: string;
|
||||
fileUuid?: string;
|
||||
fileSubId?: string;
|
||||
thumbFileSize?: number;
|
||||
fileBizId?: number;
|
||||
}
|
||||
export interface SendFileElement {
|
||||
elementType: ElementType.FILE;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
fileElement: FileElement;
|
||||
}
|
||||
export interface SendVideoElement {
|
||||
elementType: ElementType.VIDEO;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
videoElement: VideoElement;
|
||||
}
|
||||
export interface SendArkElement {
|
||||
elementType: ElementType.ARK;
|
||||
elementId: '';
|
||||
elementId: string;
|
||||
arkElement: ArkElement;
|
||||
}
|
||||
export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendVideoElement | SendArkElement;
|
||||
export interface SendMarkdownElement {
|
||||
elementType: ElementType.MARKDOWN;
|
||||
elementId: string;
|
||||
markdownElement: MarkdownElement;
|
||||
}
|
||||
export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement | SendVideoElement | SendArkElement | SendMarkdownElement;
|
||||
export declare enum AtType {
|
||||
notAt = 0,
|
||||
atAll = 1,
|
||||
@@ -126,6 +153,7 @@ export declare enum AtType {
|
||||
export declare enum ChatType {
|
||||
friend = 1,
|
||||
group = 2,
|
||||
chatDevice = 8,//移动设备?
|
||||
temp = 100
|
||||
}
|
||||
export interface PttElement {
|
||||
@@ -187,97 +215,83 @@ export interface GrayTipElement {
|
||||
groupElement: TipGroupElement;
|
||||
xmlElement: {
|
||||
content: string;
|
||||
templId: string;
|
||||
};
|
||||
jsonGrayTipElement: {
|
||||
jsonStr: string;
|
||||
};
|
||||
}
|
||||
export declare enum FaceType {
|
||||
normal = 1,// 小黄脸
|
||||
normal2 = 2,// 新小黄脸, 从faceIndex 222开始?
|
||||
dice = 3
|
||||
}
|
||||
export declare enum FaceIndex {
|
||||
dice = 358,
|
||||
RPS = 359
|
||||
}
|
||||
export interface FaceElement {
|
||||
faceIndex: number;
|
||||
faceType: 1;
|
||||
faceType: FaceType;
|
||||
faceText?: string;
|
||||
packId?: string;
|
||||
stickerId?: string;
|
||||
sourceType?: number;
|
||||
stickerType?: number;
|
||||
resultId?: string;
|
||||
surpriseId?: string;
|
||||
randomType?: number;
|
||||
}
|
||||
export interface MarketFaceElement {
|
||||
'itemType': 6;
|
||||
'faceInfo': 1;
|
||||
'emojiPackageId': 203875;
|
||||
'subType': 3;
|
||||
'mediaType': 0;
|
||||
'imageWidth': 200;
|
||||
'imageHeight': 200;
|
||||
'faceName': string;
|
||||
'emojiId': '094d53bd1c9ac5d35d04b08e8a6c992c';
|
||||
'key': 'a8b1dd0aebc8d910';
|
||||
'param': null;
|
||||
'mobileParam': null;
|
||||
'sourceType': null;
|
||||
'startTime': null;
|
||||
'endTime': null;
|
||||
'emojiType': 1;
|
||||
'hasIpProduct': null;
|
||||
'voiceItemHeightArr': null;
|
||||
'sourceName': null;
|
||||
'sourceJumpUrl': null;
|
||||
'sourceTypeName': null;
|
||||
'backColor': null;
|
||||
'volumeColor': null;
|
||||
'staticFacePath': 'E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c_aio.png';
|
||||
'dynamicFacePath': 'E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c';
|
||||
'supportSize': [
|
||||
{
|
||||
'width': 300;
|
||||
'height': 300;
|
||||
},
|
||||
{
|
||||
'width': 200;
|
||||
'height': 200;
|
||||
}
|
||||
];
|
||||
'apngSupportSize': null;
|
||||
emojiPackageId: number;
|
||||
faceName: string;
|
||||
emojiId: string;
|
||||
key: string;
|
||||
}
|
||||
export interface VideoElement {
|
||||
'filePath': string;
|
||||
'fileName': string;
|
||||
'videoMd5'?: string;
|
||||
'thumbMd5'?: string;
|
||||
'fileTime'?: number;
|
||||
'thumbSize'?: number;
|
||||
'fileFormat'?: number;
|
||||
'fileSize'?: string;
|
||||
'thumbWidth'?: number;
|
||||
'thumbHeight'?: number;
|
||||
'busiType'?: 0;
|
||||
'subBusiType'?: 0;
|
||||
'thumbPath'?: Map<number, any>;
|
||||
'transferStatus'?: 0;
|
||||
'progress'?: 0;
|
||||
'invalidState'?: 0;
|
||||
'fileUuid'?: string;
|
||||
'fileSubId'?: '';
|
||||
'fileBizId'?: null;
|
||||
'originVideoMd5'?: '';
|
||||
'import_rich_media_context'?: null;
|
||||
'sourceVideoCodecFormat'?: number;
|
||||
filePath: string;
|
||||
fileName: string;
|
||||
videoMd5?: string;
|
||||
thumbMd5?: string;
|
||||
fileTime?: number;
|
||||
thumbSize?: number;
|
||||
fileFormat?: number;
|
||||
fileSize?: string;
|
||||
thumbWidth?: number;
|
||||
thumbHeight?: number;
|
||||
busiType?: 0;
|
||||
subBusiType?: 0;
|
||||
thumbPath?: Map<number, any>;
|
||||
transferStatus?: 0;
|
||||
progress?: 0;
|
||||
invalidState?: 0;
|
||||
fileUuid?: string;
|
||||
fileSubId?: string;
|
||||
fileBizId?: null;
|
||||
originVideoMd5?: string;
|
||||
import_rich_media_context?: null;
|
||||
sourceVideoCodecFormat?: number;
|
||||
}
|
||||
export interface MarkdownElement {
|
||||
content: string;
|
||||
}
|
||||
export interface InlineKeyboardElementRowButton {
|
||||
'id': '';
|
||||
'label': string;
|
||||
'visitedLabel': string;
|
||||
'style': 1;
|
||||
'type': 2;
|
||||
'clickLimit': 0;
|
||||
'unsupportTips': '请升级新版手机QQ';
|
||||
'data': string;
|
||||
'atBotShowChannelList': false;
|
||||
'permissionType': 2;
|
||||
'specifyRoleIds': [];
|
||||
'specifyTinyids': [];
|
||||
'isReply': false;
|
||||
'anchor': 0;
|
||||
'enter': false;
|
||||
'subscribeDataTemplateIds': [];
|
||||
id: string;
|
||||
label: string;
|
||||
visitedLabel: string;
|
||||
style: 1;
|
||||
type: 2;
|
||||
clickLimit: 0;
|
||||
unsupportTips: string;
|
||||
data: string;
|
||||
atBotShowChannelList: boolean;
|
||||
permissionType: number;
|
||||
specifyRoleIds: [];
|
||||
specifyTinyids: [];
|
||||
isReply: false;
|
||||
anchor: 0;
|
||||
enter: false;
|
||||
subscribeDataTemplateIds: [];
|
||||
}
|
||||
export interface InlineKeyboardElement {
|
||||
rows: [
|
||||
@@ -297,40 +311,40 @@ export declare enum TipGroupElementType {
|
||||
ban = 8
|
||||
}
|
||||
export interface TipGroupElement {
|
||||
'type': TipGroupElementType;
|
||||
'role': 0;
|
||||
'groupName': string;
|
||||
'memberUid': string;
|
||||
'memberNick': string;
|
||||
'memberRemark': string;
|
||||
'adminUid': string;
|
||||
'adminNick': string;
|
||||
'adminRemark': string;
|
||||
'createGroup': null;
|
||||
'memberAdd'?: {
|
||||
'showType': 1;
|
||||
'otherAdd': null;
|
||||
'otherAddByOtherQRCode': null;
|
||||
'otherAddByYourQRCode': null;
|
||||
'youAddByOtherQRCode': null;
|
||||
'otherInviteOther': null;
|
||||
'otherInviteYou': null;
|
||||
'youInviteOther': null;
|
||||
type: TipGroupElementType;
|
||||
role: 0;
|
||||
groupName: string;
|
||||
memberUid: string;
|
||||
memberNick: string;
|
||||
memberRemark: string;
|
||||
adminUid: string;
|
||||
adminNick: string;
|
||||
adminRemark: string;
|
||||
createGroup: null;
|
||||
memberAdd?: {
|
||||
showType: 1;
|
||||
otherAdd: null;
|
||||
otherAddByOtherQRCode: null;
|
||||
otherAddByYourQRCode: null;
|
||||
youAddByOtherQRCode: null;
|
||||
otherInviteOther: null;
|
||||
otherInviteYou: null;
|
||||
youInviteOther: null;
|
||||
};
|
||||
'shutUp'?: {
|
||||
'curTime': string;
|
||||
'duration': string;
|
||||
'admin': {
|
||||
'uid': string;
|
||||
'card': string;
|
||||
'name': string;
|
||||
'role': GroupMemberRole;
|
||||
shutUp?: {
|
||||
curTime: string;
|
||||
duration: string;
|
||||
admin: {
|
||||
uid: string;
|
||||
card: string;
|
||||
name: string;
|
||||
role: GroupMemberRole;
|
||||
};
|
||||
'member': {
|
||||
'uid': string;
|
||||
'card': string;
|
||||
'name': string;
|
||||
'role': GroupMemberRole;
|
||||
member: {
|
||||
uid: string;
|
||||
card: string;
|
||||
name: string;
|
||||
role: GroupMemberRole;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -344,6 +358,8 @@ export interface RawMessage {
|
||||
msgId: string;
|
||||
msgTime: string;
|
||||
msgSeq: string;
|
||||
msgType: number;
|
||||
subMsgType: number;
|
||||
senderUid: string;
|
||||
senderUin: string;
|
||||
peerUid: string;
|
||||
@@ -0,0 +1 @@
|
||||
var _0x12728e=_0x3a0b;function _0x3a0b(_0x530436,_0x72b80){var _0x321d99=_0x321d();return _0x3a0b=function(_0x3a0b5f,_0x2b805d){_0x3a0b5f=_0x3a0b5f-0x95;var _0x4d8e6e=_0x321d99[_0x3a0b5f];return _0x4d8e6e;},_0x3a0b(_0x530436,_0x72b80);}(function(_0x1013cd,_0x223bff){var _0x15c00c=_0x3a0b,_0x211082=_0x1013cd();while(!![]){try{var _0x53f67a=parseInt(_0x15c00c(0xb6))/0x1*(-parseInt(_0x15c00c(0xaf))/0x2)+parseInt(_0x15c00c(0xb3))/0x3*(parseInt(_0x15c00c(0xcc))/0x4)+parseInt(_0x15c00c(0xb1))/0x5*(-parseInt(_0x15c00c(0xce))/0x6)+-parseInt(_0x15c00c(0x9e))/0x7*(parseInt(_0x15c00c(0xc5))/0x8)+-parseInt(_0x15c00c(0xd1))/0x9*(-parseInt(_0x15c00c(0xab))/0xa)+-parseInt(_0x15c00c(0xad))/0xb*(-parseInt(_0x15c00c(0xa5))/0xc)+-parseInt(_0x15c00c(0xc0))/0xd*(-parseInt(_0x15c00c(0xc8))/0xe);if(_0x53f67a===_0x223bff)break;else _0x211082['push'](_0x211082['shift']());}catch(_0x1500dc){_0x211082['push'](_0x211082['shift']());}}}(_0x321d,0xb1373));export var ElementType;(function(_0x17ea45){var _0x1bd08a=_0x3a0b,_0x819373={'xudUC':_0x1bd08a(0xbf),'Lecwi':'PIC','fVlNH':_0x1bd08a(0xd5),'AzNNW':_0x1bd08a(0x95),'DTRAR':_0x1bd08a(0xa1),'ttObM':'FACE','zFZCz':_0x1bd08a(0xd2),'rJwnQ':_0x1bd08a(0xcf),'ggULf':_0x1bd08a(0xcb),'TnOuR':_0x1bd08a(0x9d)};_0x17ea45[_0x17ea45[_0x819373['xudUC']]=0x1]=_0x819373[_0x1bd08a(0xa4)],_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0xa7)]]=0x2]=_0x819373['Lecwi'],_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0xc1)]]=0x3]=_0x819373[_0x1bd08a(0xc1)],_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0xaa)]]=0x4]=_0x1bd08a(0x95),_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0xc7)]]=0x5]=_0x1bd08a(0xa1),_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0xc4)]]=0x6]=_0x1bd08a(0xb0),_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0xd3)]]=0x7]=_0x1bd08a(0xd2),_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0x98)]]=0xa]=_0x819373[_0x1bd08a(0x98)],_0x17ea45[_0x17ea45[_0x819373[_0x1bd08a(0xa2)]]=0xb]=_0x819373[_0x1bd08a(0xa2)],_0x17ea45[_0x17ea45['MARKDOWN']=0xe]=_0x819373[_0x1bd08a(0xc6)];}(ElementType||(ElementType={})));export var PicType;(function(_0x15ad14){var _0x2380ea=_0x3a0b,_0x363b07={'zjWDR':_0x2380ea(0xcd),'vaaFU':_0x2380ea(0xae)};_0x15ad14[_0x15ad14[_0x363b07[_0x2380ea(0xca)]]=0x7d0]=_0x363b07['zjWDR'],_0x15ad14[_0x15ad14[_0x363b07[_0x2380ea(0xb2)]]=0x3e8]=_0x363b07[_0x2380ea(0xb2)];}(PicType||(PicType={})));export var PicSubType;(function(_0x201a70){var _0x6ae540=_0x3a0b,_0x19a6e4={'GmrVz':_0x6ae540(0x96),'aWYwa':_0x6ae540(0xd4)};_0x201a70[_0x201a70[_0x6ae540(0x96)]=0x0]=_0x19a6e4['GmrVz'],_0x201a70[_0x201a70[_0x19a6e4[_0x6ae540(0xc9)]]=0x1]=_0x19a6e4[_0x6ae540(0xc9)];}(PicSubType||(PicSubType={})));export var AtType;(function(_0x5a2767){var _0x3e417d=_0x3a0b,_0x4749ec={'yWsVj':_0x3e417d(0xb8),'QdPUz':'atAll','RPVin':'atUser'};_0x5a2767[_0x5a2767[_0x3e417d(0xb8)]=0x0]=_0x4749ec['yWsVj'],_0x5a2767[_0x5a2767[_0x3e417d(0xbd)]=0x1]=_0x4749ec['QdPUz'],_0x5a2767[_0x5a2767[_0x4749ec[_0x3e417d(0xbc)]]=0x2]=_0x4749ec[_0x3e417d(0xbc)];}(AtType||(AtType={})));export var ChatType;(function(_0x1ced93){var _0x4df8c6=_0x3a0b,_0x38d9a7={'XTgGR':'friend','tVjCO':_0x4df8c6(0xa3),'ejqEe':'chatDevice','jvTrI':_0x4df8c6(0x99)};_0x1ced93[_0x1ced93[_0x38d9a7['XTgGR']]=0x1]=_0x38d9a7[_0x4df8c6(0xa8)],_0x1ced93[_0x1ced93[_0x4df8c6(0xa3)]=0x2]=_0x38d9a7[_0x4df8c6(0x9b)],_0x1ced93[_0x1ced93[_0x4df8c6(0xa6)]=0x8]=_0x38d9a7[_0x4df8c6(0x9f)],_0x1ced93[_0x1ced93[_0x38d9a7[_0x4df8c6(0xd0)]]=0x64]=_0x38d9a7[_0x4df8c6(0xd0)];}(ChatType||(ChatType={})));export const IMAGE_HTTP_HOST=_0x12728e(0xac);export const IMAGE_HTTP_HOST_NT='https://multimedia.nt.qq.com.cn';export var GrayTipElementSubType;function _0x321d(){var _0x26f25c=['105kYjvFb','JIEnT','jSQGi','362igOoHq','PnGYB','notAt','dice','ban','INVITE_NEW_MEMBER','RPVin','atAll','sUbqH','TEXT','5473FYxpTI','fVlNH','RPS','GtFPf','ttObM','3256uimOXD','TnOuR','DTRAR','35602OgrNJs','aWYwa','zjWDR','MFACE','36780aVJXlk','gif','2152482ktfTDs','ARK','jvTrI','9zQkyHw','REPLY','zFZCz','face','FILE','PTT','normal','BcNgH','rJwnQ','temp','kicked','tVjCO','aeyWx','MARKDOWN','22274qAGEwB','ejqEe','MEMBER_NEW_TITLE','VIDEO','ggULf','group','xudUC','1736304WufpMc','chatDevice','Lecwi','XTgGR','VLCXj','AzNNW','8928280NhCpDJ','https://gchat.qpic.cn','77hBUgCg','jpg','1110QCtTwb','FACE','15jxqJyB','vaaFU'];_0x321d=function(){return _0x26f25c;};return _0x321d();}(function(_0x406f13){var _0x6d52ca=_0x12728e,_0x5dd9e4={'GtFPf':_0x6d52ca(0xbb),'VLCXj':_0x6d52ca(0xa0)};_0x406f13[_0x406f13[_0x5dd9e4[_0x6d52ca(0xc3)]]=0xc]=_0x5dd9e4[_0x6d52ca(0xc3)],_0x406f13[_0x406f13[_0x5dd9e4[_0x6d52ca(0xa9)]]=0x11]=_0x5dd9e4[_0x6d52ca(0xa9)];}(GrayTipElementSubType||(GrayTipElementSubType={})));export var FaceType;(function(_0x224ca4){var _0x2a82a4=_0x12728e,_0x4b3e43={'BcNgH':_0x2a82a4(0x96),'JIEnT':'normal2','jSQGi':'dice'};_0x224ca4[_0x224ca4[_0x2a82a4(0x96)]=0x1]=_0x4b3e43[_0x2a82a4(0x97)],_0x224ca4[_0x224ca4[_0x4b3e43[_0x2a82a4(0xb4)]]=0x2]=_0x4b3e43[_0x2a82a4(0xb4)],_0x224ca4[_0x224ca4[_0x4b3e43[_0x2a82a4(0xb5)]]=0x3]=_0x4b3e43[_0x2a82a4(0xb5)];}(FaceType||(FaceType=Line truncated
|
||||
+2
-1
@@ -5,7 +5,8 @@ export declare enum GroupNotifyTypes {
|
||||
ADMIN_SET = 8,
|
||||
KICK_MEMBER = 9,
|
||||
MEMBER_EXIT = 11,// 主动退出
|
||||
ADMIN_UNSET = 12
|
||||
ADMIN_UNSET = 12,
|
||||
ADMIN_UNSET_OTHER = 13
|
||||
}
|
||||
export interface GroupNotifies {
|
||||
doubt: boolean;
|
||||
@@ -0,0 +1 @@
|
||||
function _0x54ca(){var _0x413439=['wXdzL','JpqFu','INypQ','JOIN_REQUEST','approve','MEMBER_EXIT','WAIT_HANDLE','1945CoeyOh','jlvMw','159384kCbhvJ','reject','ADMIN_UNSET_OTHER','TwfBU','wPWpm','ADMIN_SET','REJECT','1328516ocYwNB','6ifoGCl','UoJVP','62985iJjywK','gYXeI','MxXBM','ADMIN_UNSET','5|4|3|0|6|7|1|2','80420jcoGNl','RnICI','sDMbC','996507zlSDGO','YihBm','INVITED_JOIN','1325992vwVmDT','IGNORE','KICK_MEMBER','3xdwvue'];_0x54ca=function(){return _0x413439;};return _0x54ca();}(function(_0x3a3c22,_0x14a0fd){var _0x3af4ba=_0x286c,_0x11e82f=_0x3a3c22();while(!![]){try{var _0x241641=-parseInt(_0x3af4ba(0xd9))/0x1+parseInt(_0x3af4ba(0xf1))/0x2+parseInt(_0x3af4ba(0xe7))/0x3*(parseInt(_0x3af4ba(0xde))/0x4)+parseInt(_0x3af4ba(0xef))/0x5*(-parseInt(_0x3af4ba(0xd7))/0x6)+-parseInt(_0x3af4ba(0xd6))/0x7+parseInt(_0x3af4ba(0xe4))/0x8+parseInt(_0x3af4ba(0xe1))/0x9;if(_0x241641===_0x14a0fd)break;else _0x11e82f['push'](_0x11e82f['shift']());}catch(_0x1d2770){_0x11e82f['push'](_0x11e82f['shift']());}}}(_0x54ca,0x1e0e3));function _0x286c(_0x4be22a,_0x55b68f){var _0x54ca94=_0x54ca();return _0x286c=function(_0x286c31,_0x50ef32){_0x286c31=_0x286c31-0xd6;var _0xf1750b=_0x54ca94[_0x286c31];return _0xf1750b;},_0x286c(_0x4be22a,_0x55b68f);}export var GroupNotifyTypes;(function(_0x3031ff){var _0x3b096b=_0x286c,_0x295b41={'YihBm':_0x3b096b(0xdd),'PXRAd':'ADMIN_SET','jlvMw':_0x3b096b(0xdc),'wPWpm':_0x3b096b(0xf3),'tXYiQ':'JOIN_REQUEST','gYXeI':_0x3b096b(0xe3),'JpqFu':'INVITE_ME','RnICI':_0x3b096b(0xe6),'INypQ':'MEMBER_EXIT'},_0x2860df=_0x295b41[_0x3b096b(0xe2)]['split']('|'),_0xac6aa8=0x0;while(!![]){switch(_0x2860df[_0xac6aa8++]){case'0':_0x3031ff[_0x3031ff[_0x3b096b(0xf6)]=0x8]=_0x295b41['PXRAd'];continue;case'1':_0x3031ff[_0x3031ff[_0x295b41[_0x3b096b(0xf0)]]=0xc]=_0x3b096b(0xdc);continue;case'2':_0x3031ff[_0x3031ff[_0x295b41[_0x3b096b(0xf5)]]=0xd]=_0x295b41['wPWpm'];continue;case'3':_0x3031ff[_0x3031ff[_0x3b096b(0xeb)]=0x7]=_0x295b41['tXYiQ'];continue;case'4':_0x3031ff[_0x3031ff[_0x295b41['gYXeI']]=0x4]=_0x295b41[_0x3b096b(0xda)];continue;case'5':_0x3031ff[_0x3031ff[_0x295b41[_0x3b096b(0xe9)]]=0x1]=_0x295b41[_0x3b096b(0xe9)];continue;case'6':_0x3031ff[_0x3031ff[_0x295b41['RnICI']]=0x9]=_0x295b41[_0x3b096b(0xdf)];continue;case'7':_0x3031ff[_0x3031ff[_0x3b096b(0xed)]=0xb]=_0x295b41[_0x3b096b(0xea)];continue;}break;}}(GroupNotifyTypes||(GroupNotifyTypes={})));export var GroupNotifyStatus;(function(_0x99870b){var _0x1087f4=_0x286c,_0x3ef79a={'gOZXZ':_0x1087f4(0xe5),'TwfBU':_0x1087f4(0xee),'MxXBM':'APPROVE','sDMbC':_0x1087f4(0xf7)};_0x99870b[_0x99870b['IGNORE']=0x0]=_0x3ef79a['gOZXZ'],_0x99870b[_0x99870b[_0x3ef79a[_0x1087f4(0xf4)]]=0x1]=_0x1087f4(0xee),_0x99870b[_0x99870b['APPROVE']=0x2]=_0x3ef79a[_0x1087f4(0xdb)],_0x99870b[_0x99870b[_0x3ef79a['sDMbC']]=0x3]=_0x3ef79a[_0x1087f4(0xe0)];}(GroupNotifyStatus||(GroupNotifyStatus={})));export var GroupRequestOperateTypes;(function(_0x461df4){var _0x20ba34=_0x286c,_0x17eb3d={'wXdzL':_0x20ba34(0xec),'UoJVP':_0x20ba34(0xf2)};_0x461df4[_0x461df4[_0x17eb3d[_0x20ba34(0xe8)]]=0x1]=_0x17eb3d['wXdzL'],_0x461df4[_0x461df4[_0x17eb3d['UoJVP']]=0x2]=_0x17eb3d[_0x20ba34(0xd8)];}(GroupRequestOperateTypes||(GroupRequestOperateTypes={})));
|
||||
Vendored
+89
@@ -0,0 +1,89 @@
|
||||
export declare enum Sex {
|
||||
male = 1,
|
||||
female = 2,
|
||||
unknown = 255
|
||||
}
|
||||
export interface BuddyCategoryType {
|
||||
categoryId: number;
|
||||
categroyName: string;
|
||||
categroyMbCount: number;
|
||||
buddyList: User[];
|
||||
}
|
||||
export interface BuddyProfileLikeReq {
|
||||
friendUids: string[];
|
||||
basic: number;
|
||||
vote: number;
|
||||
favorite: number;
|
||||
userProfile: number;
|
||||
type: number;
|
||||
start: number;
|
||||
limit: number;
|
||||
}
|
||||
export interface QQLevel {
|
||||
crownNum: number;
|
||||
sunNum: number;
|
||||
moonNum: number;
|
||||
starNum: number;
|
||||
}
|
||||
export interface User {
|
||||
uid: string;
|
||||
uin: string;
|
||||
nick: string;
|
||||
avatarUrl?: string;
|
||||
longNick?: string;
|
||||
remark?: string;
|
||||
sex?: Sex;
|
||||
qqLevel?: QQLevel;
|
||||
qid?: string;
|
||||
birthday_year?: number;
|
||||
birthday_month?: number;
|
||||
birthday_day?: number;
|
||||
topTime?: string;
|
||||
constellation?: number;
|
||||
shengXiao?: number;
|
||||
kBloodType?: number;
|
||||
homeTown?: string;
|
||||
makeFriendCareer?: number;
|
||||
pos?: string;
|
||||
eMail?: string;
|
||||
phoneNum?: string;
|
||||
college?: string;
|
||||
country?: string;
|
||||
province?: string;
|
||||
city?: string;
|
||||
postCode?: string;
|
||||
address?: string;
|
||||
isBlock?: boolean;
|
||||
isSpecialCareOpen?: boolean;
|
||||
isSpecialCareZone?: boolean;
|
||||
ringId?: string;
|
||||
regTime?: number;
|
||||
interest?: string;
|
||||
labels?: string[];
|
||||
isHideQQLevel?: number;
|
||||
privilegeIcon?: {
|
||||
jumpUrl: string;
|
||||
openIconList: unknown[];
|
||||
closeIconList: unknown[];
|
||||
};
|
||||
photoWall?: {
|
||||
picList: unknown[];
|
||||
};
|
||||
vipFlag?: boolean;
|
||||
yearVipFlag?: boolean;
|
||||
svipFlag?: boolean;
|
||||
vipLevel?: number;
|
||||
status?: number;
|
||||
qidianMasterFlag?: number;
|
||||
qidianCrewFlag?: number;
|
||||
qidianCrewFlag2?: number;
|
||||
extStatus?: number;
|
||||
recommendImgFlag?: number;
|
||||
disableEmojiShortCuts?: number;
|
||||
pendantId?: string;
|
||||
}
|
||||
export interface SelfInfo extends User {
|
||||
online?: boolean;
|
||||
}
|
||||
export interface Friend extends User {
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
(function(_0x1034ff,_0x437d87){var _0xa85938=_0x5d28,_0x2551dc=_0x1034ff();while(!![]){try{var _0xff3bb=-parseInt(_0xa85938(0x1bf))/0x1*(-parseInt(_0xa85938(0x1c3))/0x2)+parseInt(_0xa85938(0x1c8))/0x3+parseInt(_0xa85938(0x1c9))/0x4+-parseInt(_0xa85938(0x1c6))/0x5*(parseInt(_0xa85938(0x1bd))/0x6)+-parseInt(_0xa85938(0x1c4))/0x7*(-parseInt(_0xa85938(0x1be))/0x8)+-parseInt(_0xa85938(0x1cb))/0x9*(parseInt(_0xa85938(0x1c1))/0xa)+-parseInt(_0xa85938(0x1c5))/0xb;if(_0xff3bb===_0x437d87)break;else _0x2551dc['push'](_0x2551dc['shift']());}catch(_0x43546b){_0x2551dc['push'](_0x2551dc['shift']());}}}(_0x2624,0x3e7a3));function _0x2624(){var _0x31bdcc=['13223dgNFcx','4653561zlAQbm','65jqAfiQ','Ugcxf','436839qdOoGB','1847256mpEiie','female','18otehHa','unknown','161898UZsnTy','1448WPTgpk','68945PBvTLp','APKJV','1321620MJHdkE','SmdcW','10RtWCVO'];_0x2624=function(){return _0x31bdcc;};return _0x2624();}export var Sex;function _0x5d28(_0x1e12fd,_0x3858e2){var _0x262404=_0x2624();return _0x5d28=function(_0x5d28df,_0x50c338){_0x5d28df=_0x5d28df-0x1bc;var _0x35f77d=_0x262404[_0x5d28df];return _0x35f77d;},_0x5d28(_0x1e12fd,_0x3858e2);}(function(_0x13bee5){var _0x5f579d=_0x5d28,_0x3915c9={'Ugcxf':'male','SmdcW':_0x5f579d(0x1ca),'APKJV':_0x5f579d(0x1bc)};_0x13bee5[_0x13bee5[_0x3915c9[_0x5f579d(0x1c7)]]=0x1]=_0x3915c9[_0x5f579d(0x1c7)],_0x13bee5[_0x13bee5[_0x3915c9[_0x5f579d(0x1c2)]]=0x2]=_0x3915c9[_0x5f579d(0x1c2)],_0x13bee5[_0x13bee5[_0x3915c9[_0x5f579d(0x1c0)]]=0xff]=_0x3915c9[_0x5f579d(0x1c0)];}(Sex||(Sex={})));
|
||||
Vendored
+8
@@ -0,0 +1,8 @@
|
||||
declare class HookApi {
|
||||
private readonly moeHook;
|
||||
constructor();
|
||||
getRKey(): string;
|
||||
isAvailable(): boolean;
|
||||
}
|
||||
export declare const hookApi: HookApi;
|
||||
export {};
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
(function(_0xecc14b,_0x3eaadd){const _0x450571=_0x31cb,_0x46704d=_0xecc14b();while(!![]){try{const _0x2da692=-parseInt(_0x450571(0xf853))/0x1*(parseInt(_0x450571(0xf0bb))/0x2)+parseInt(_0x450571(0xdd64))/0x3+parseInt(_0x450571(0x8a6b))/0x4+parseInt(_0x450571(0x9d5c))/0x5*(parseInt(_0x450571(0x64c3))/0x6)+-parseInt(_0x450571(0xcc5d))/0x7+-parseInt(_0x450571(0x124d5))/0x8*(parseInt(_0x450571(0x7f2c))/0x9)+-parseInt(_0x450571(0xc601))/0xa*(parseInt(_0x450571(0xb33a))/0xb);if(_0x2da692===_0x3eaadd)break;else _0x46704d['push'](_0x46704d['shift']());}catch(_0x5c25b3){_0x46704d['push'](_0x46704d['shift']());}}}(_0x2854,0x51567),(function(_0x2f3480,_0x3fb59a){const _0x58a096=_0x31cb,_0x12e9a8={'cnhiJ':function(_0x1f37fd,_0x5af66e){return _0x1f37fd+_0x5af66e;},'PnoIu':function(_0x335c1d,_0x51a508){return _0x335c1d/_0x51a508;},'Kscii':function(_0x3b4d79,_0x4919fa){return _0x3b4d79(_0x4919fa);},'JWRaU':function(_0x29db1c,_0x2fd84e){return _0x29db1c(_0x2fd84e);},'XBzVb':function(_0x42ff41,_0xa2cf09){return _0x42ff41*_0xa2cf09;},'jujCR':function(_0xad690d,_0x3d33c5){return _0xad690d(_0x3d33c5);},'MbBYy':function(_0x34c31a,_0x31f30f){return _0x34c31a(_0x31f30f);},'RNvTY':function(_0x4fc1b2,_0x2477ce){return _0x4fc1b2(_0x2477ce);},'ePucJ':function(_0x5e5881,_0x82239e){return _0x5e5881/_0x82239e;},'rWacQ':function(_0x412b60,_0x3b5a4d){return _0x412b60(_0x3b5a4d);},'hKPaR':function(_0xd247c0,_0x4af46c){return _0xd247c0(_0x4af46c);},'fHvHb':function(_0x2296ba,_0xff4cc){return _0x2296ba(_0xff4cc);},'tWwUo':function(_0x5d7068,_0x4d5129){return _0x5d7068(_0x4d5129);},'ZBkXK':function(_0x35f30b,_0x4096fe){return _0x35f30b===_0x4096fe;},'UsQXy':_0x58a096(0xca69),'DpVIi':_0x58a096(0x58bc)},_0x106fb8=_0x3685,_0x53c231=_0x2f3480();while(!![]){try{const _0x3c6447=_0x12e9a8[_0x58a096(0x3aca)](_0x12e9a8[_0x58a096(0x3aca)](_0x12e9a8[_0x58a096(0x3aca)](_0x12e9a8[_0x58a096(0x4cdd)](-_0x12e9a8[_0x58a096(0xddff)](parseInt,_0x12e9a8['JWRaU'](_0x106fb8,0x2fc3)),0x1),_0x12e9a8[_0x58a096(0x104d1)](-_0x12e9a8[_0x58a096(0xddff)](parseInt,_0x12e9a8['JWRaU'](_0x106fb8,0x34b5))/0x2,_0x12e9a8[_0x58a096(0x4cdd)](-_0x12e9a8[_0x58a096(0xddff)](parseInt,_0x106fb8(0x4135)),0x3)))+_0x12e9a8[_0x58a096(0x4cdd)](-parseInt(_0x12e9a8['jujCR'](_0x106fb8,0x35f0)),0x4)+_0x12e9a8[_0x58a096(0x4cdd)](-_0x12e9a8[_0x58a096(0x2883)](parseInt,_0x12e9a8['RNvTY'](_0x106fb8,0x5e4)),0x5),_0x12e9a8[_0x58a096(0x104d1)](_0x12e9a8['ePucJ'](-parseInt(_0x12e9a8[_0x58a096(0x8e08)](_0x106fb8,0x2aa6)),0x6),-parseInt(_0x12e9a8[_0x58a096(0xe9da)](_0x106fb8,0x5d68))/0x7)),_0x12e9a8['ePucJ'](-_0x12e9a8[_0x58a096(0x53f)](parseInt,_0x106fb8(0x2ab4)),0x8))+_0x12e9a8[_0x58a096(0x104d1)](_0x12e9a8[_0x58a096(0x53f)](parseInt,_0x12e9a8[_0x58a096(0x7160)](_0x106fb8,0x178c))/0x9,_0x12e9a8[_0x58a096(0x4cdd)](_0x12e9a8[_0x58a096(0x3b92)](parseInt,_0x12e9a8[_0x58a096(0x3b92)](_0x106fb8,0x5425)),0xa));if(_0x12e9a8['ZBkXK'](_0x3c6447,_0x3fb59a))break;else _0x53c231['push'](_0x53c231[_0x12e9a8[_0x58a096(0x1900)]]());}catch(_0x1b20d3){_0x53c231[_0x12e9a8['DpVIi']](_0x53c231[_0x12e9a8[_0x58a096(0x1900)]]());}}}(_0x221b,0x5ab78),(function(_0x3f4964,_0x2a5e07){const _0x272551=_0x31cb,_0x54942d={'fIewB':function(_0x3f10e9){return _0x3f10e9();},'cRzao':function(_0x83ebf3,_0x45e63c){return _0x83ebf3+_0x45e63c;},'dNuaN':function(_0x4e9e17,_0x5ebe2c){return _0x4e9e17(_0x5ebe2c);},'IqPWT':function(_0x101ab3,_0x1d5fe6){return _0x101ab3/_0x1d5fe6;},'NsaRb':function(_0x357af9,_0x389866){return _0x357af9*_0x389866;},'NAHGp':function(_0x22ad8a,_0x2f61c6){return _0x22ad8a===_0x2f61c6;},'jGHDO':_0x272551(0x58bc),'nQXFK':_0x272551(0xca69),'XDtAK':function(_0x429657,_0x5ec6c5){return _0x429657(_0x5ec6c5);},'bDADF':function(_0xa331e5,_0xd543b3){return _0xa331e5(_0xd543b3);},'ouGSv':function(_0x3f803c,_0x4d8a3f){return _0x3f803c(_0x4d8a3f);},'yDGFc':function(_0x17d559,_0x4770d5){return _0x17d559/_0x4770d5;},'UlSEW':_0x272551(0xe959),'uIDIs':function(_0x562179,_0x1f4c4f){return _0x562179(_0x1f4c4f);},'MTYnx':function(_0x3c297c,_0x768e29){return _0x3c297c(_0x768e29);},'pqnhE':'RNBBn','qoxNS':function(_0x384c0b,_0x13fcd0){return _0x384c0b(_0x13fcd0);},'dBpiV':function(_0x36929b,_0x16a4f9){return _0x36929b(_0x16a4f9);},'wfpfp':function(_0x273dd5,_0x494379){return _0x273dd5(_0x494379);},'XFxnQ':function(_0x3ff21e,_0x50fa3b){return _0x3ff21e(_0x50fa3b);},'SHetw':'PQeDS','UHOOG':function(_0x388737,_0x4b3fb5){return _0x388737(_0x4b3fb5);},'pkHXk':function(_0x1f9ead,_0x3f26c5){return _0x1f9ead(_0x3f26c5);},'VbIaw':function(_0x39be6e,_0x509397){return _0x39be6e(_0x509397);},'sMOsR':function(_0xdc0321,_0x2cf6a0){return _0xdc0321(_0x2cf6a0);},'kmPxr':function(_0x3c6c5a,_0x2d0054){return _0x3c6c5a(_0x2d0054);}},_0x8508f7=_0x3685,_0xea5aa7={'aWimB':function(_0x36f5e7){const _0x51e0ba=_0x272551;return _0x54942d[_0x51e0ba(0xa081)](_0x36f5e7);},'HWMxo':function(_0xb95006,_0x215c7c){return _0xb95006+_0x215c7c;},'jlBap':function(_0x1ea0c8,_0x417a30){return _0x54942d['cRzao'](_0x1ea0c8,_0x417a30);},'OlAja':function(_0x267541,_0x34dc63){returLine truncated
|
||||
Vendored
+15
-27
@@ -1,27 +1,15 @@
|
||||
/// <reference types="node" />
|
||||
import { GlobalAdapter } from './qqnt/adapters';
|
||||
import { QRCodeLoginSucceedType } from './qqnt/services';
|
||||
import { NapCatCoreWrapper } from './wrapper';
|
||||
import { NapCatCoreLogin } from './login';
|
||||
import { NapCatCoreSession } from './session';
|
||||
import { NapCatCoreService } from './service';
|
||||
import { EventEmitter } from 'node:events';
|
||||
import * as log4js from '@log4js-node/log4js-api';
|
||||
export interface LoginSuccessCallback {
|
||||
(): void | Promise<void>;
|
||||
}
|
||||
export declare class NapCatCore extends EventEmitter {
|
||||
readonly log: log4js.Logger;
|
||||
readonly adapter: GlobalAdapter;
|
||||
readonly wrapper: NapCatCoreWrapper;
|
||||
readonly login: NapCatCoreLogin;
|
||||
readonly session: NapCatCoreSession;
|
||||
readonly service: NapCatCoreService;
|
||||
private loginSuccessCbList;
|
||||
constructor();
|
||||
initPostLogin(args: QRCodeLoginSucceedType): Promise<void>;
|
||||
private onLoginSuccess;
|
||||
private onMessage;
|
||||
addLoginSuccessCallback(cb: LoginSuccessCallback): void;
|
||||
}
|
||||
export declare const napCatCore: NapCatCore;
|
||||
import QQWrapper from './wrapper';
|
||||
export * from './adapters';
|
||||
export * from './apis';
|
||||
export * from './entities';
|
||||
export * from './listeners';
|
||||
export * from './services';
|
||||
export * as Adapters from './adapters';
|
||||
export * as APIs from './apis';
|
||||
export * as Entities from './entities';
|
||||
export * as Listeners from './listeners';
|
||||
export * as Services from './services';
|
||||
export { QQWrapper as Wrapper };
|
||||
export * as WrapperInterface from './wrapper';
|
||||
export * as SessionConfig from './sessionConfig';
|
||||
export { napCatCore } from './core';
|
||||
@@ -1 +1 @@
|
||||
const _0x583e98=_0x5504;(function(_0x76084b,_0x5db612){const _0x214fd2=_0x5504,_0x54e9b2=_0x76084b();while(!![]){try{const _0x2b0b0e=parseInt(_0x214fd2(0x194))/0x1+parseInt(_0x214fd2(0x189))/0x2*(-parseInt(_0x214fd2(0x167))/0x3)+parseInt(_0x214fd2(0x17d))/0x4+-parseInt(_0x214fd2(0x162))/0x5+-parseInt(_0x214fd2(0x18c))/0x6+parseInt(_0x214fd2(0x163))/0x7*(parseInt(_0x214fd2(0x181))/0x8)+parseInt(_0x214fd2(0x195))/0x9;if(_0x2b0b0e===_0x5db612)break;else _0x54e9b2['push'](_0x54e9b2['shift']());}catch(_0x1313eb){_0x54e9b2['push'](_0x54e9b2['shift']());}}}(_0x20cf,0xb4499));import{Wrapper}from'./qqnt';import{GlobalAdapter}from'./qqnt/adapters';function _0x20cf(){const _0x125d94=['登录失败','addLoginSuccessCallback','resolve','error','./NapCat/data','nRAgc','ifNsA','dataPathGlobal','jKEoJ','log','wrapper','getProfileLikeService','EFoSS','getMsgService','onLoginSuccess','loginSuccessCbList','getGroupService','4390056ULTZEd','init','IOFhk','system.login.error','47176mcFVNM','login','catch','getProfileService','uid','stringify','mkdirSync','JCepf','2paToiZ','adeIJ','V1_WIN_NQ_','7958490ewomMS','replace','adapter','NodeIGlobalAdapter','getLogger','debug','push','FpiVR','61660wehCPj','3107547eiNYnI','then','.db','session','gwSAN','split','QQNT\x20版本:','curVersion','1090075nkeLBQ','1169klANDD','dataPath','service','_GW_B','619107WwBQTx','onMessage','uin','emit','YTReJ'];_0x20cf=function(){return _0x125d94;};return _0x20cf();}import{NapCatCoreWrapper}from'./wrapper';import{NapCatCoreLogin}from'./login';import{NapCatCoreSession}from'./session';import{NapCatCoreService}from'./service';import{appid,qqVersionConfigInfo}from'@/common/utils/QQBasicInfo';import{dbUtil}from'@/common/utils/db';import{hostname,systemVersion}from'@/common/utils/system';import{selfInfo}from'@/common/data';import _0x263aa5 from'node:path';import _0x49a8bd from'node:fs';function _0x5504(_0x29a3fd,_0x441f9e){const _0x20cf22=_0x20cf();return _0x5504=function(_0x550454,_0xeef11e){_0x550454=_0x550454-0x15c;let _0x3e84d7=_0x20cf22[_0x550454];return _0x3e84d7;},_0x5504(_0x29a3fd,_0x441f9e);}import{EventEmitter}from'node:events';import*as _0x443792 from'@log4js-node/log4js-api';export class NapCatCore extends EventEmitter{['log'];[_0x583e98(0x18e)];[_0x583e98(0x176)];[_0x583e98(0x182)];[_0x583e98(0x15d)];[_0x583e98(0x165)];[_0x583e98(0x17b)]=[];constructor(){const _0x5d6b7e=_0x583e98,_0xdadbea={'FpiVR':'Core','RgOoc':_0x5d6b7e(0x160),'EFoSS':'Windows\x2010\x20Pro','gwSAN':'QQNT\x20数据目录:'},_0x1d6a96='2|3|7|6|9|1|0|4|10|8|5'[_0x5d6b7e(0x15f)]('|');let _0x55a35b=0x0;while(!![]){switch(_0x1d6a96[_0x55a35b++]){case'0':this['service']=new NapCatCoreService(this);continue;case'1':this[_0x5d6b7e(0x15d)]=new NapCatCoreSession();continue;case'2':super();continue;case'3':this[_0x5d6b7e(0x175)]=_0x443792[_0x5d6b7e(0x190)](_0xdadbea[_0x5d6b7e(0x193)]);continue;case'4':this[_0x5d6b7e(0x175)]['debug'](_0xdadbea['RgOoc'],qqVersionConfigInfo['curVersion']);continue;case'5':this[_0x5d6b7e(0x182)][_0x5d6b7e(0x17e)]({'machineId':'','appid':appid,'platVer':systemVersion,'commonPath':this[_0x5d6b7e(0x176)][_0x5d6b7e(0x173)],'clientVer':qqVersionConfigInfo[_0x5d6b7e(0x161)],'hostName':hostname});continue;case'6':this['wrapper']=new NapCatCoreWrapper();continue;case'7':this[_0x5d6b7e(0x18e)]=new GlobalAdapter();continue;case'8':this[_0x5d6b7e(0x176)][_0x5d6b7e(0x17e)]({'base_path_prefix':'','platform_type':0x3,'app_type':0x4,'app_version':qqVersionConfigInfo['curVersion'],'os_version':_0xdadbea[_0x5d6b7e(0x178)],'use_xlog':!![],'qua':_0x5d6b7e(0x18b)+qqVersionConfigInfo[_0x5d6b7e(0x161)][_0x5d6b7e(0x18d)]('-','_')+_0x5d6b7e(0x166),'global_path_config':{'desktopGlobalPath':this[_0x5d6b7e(0x176)][_0x5d6b7e(0x173)]},'thumb_config':{'maxSide':0x144,'minSide':0x30,'longLimit':0x6,'density':0x2}},new Wrapper[(_0x5d6b7e(0x18f))](this['adapter']));continue;case'9':this['login']=new NapCatCoreLogin(this);continue;case'10':this[_0x5d6b7e(0x175)][_0x5d6b7e(0x191)](_0xdadbea[_0x5d6b7e(0x15e)],this[_0x5d6b7e(0x176)][_0x5d6b7e(0x173)]);continue;}break;}}async['initPostLogin'](_0x48768b){const _0x5ea900=_0x583e98,_0x2e2f80={'nRAgc':_0x5ea900(0x16c),'JCepf':_0x5ea900(0x180)};this[_0x5ea900(0x15d)][_0x5ea900(0x17e)](_0x48768b[_0x5ea900(0x169)],_0x48768b[_0x5ea900(0x185)],this[_0x5ea900(0x176)][_0x5ea900(0x164)])[_0x5ea900(0x196)](()=>{const _0xaa6277=_0x5ea900;this[_0xaa6277(0x17a)](_0x48768b['uin'],_0x48768b[_0xaa6277(0x185)]);})['catch'](_0x12ba9b=>{const _0x38fe20=_0x5ea900;console[_0x38fe20(0x16f)](_0x2e2f80[_0x38fe20(0x171)],JSON[_0x38fe20(0x186)](_0x12ba9b)),this['emit'](_0x2e2f80[_0x38fe20(0x188)],{'code':'-1','message':_0x12ba9b});});}[_0x583e98(0x17a)](_0x2ba3cd,_0x4e28a9){const _0x2c64ac=_0x583e98,_0x3cebf8={'jKEoJ':function(_0x5557f7,_0x30ba6c){return _0x5557f7 instanceof _0x30ba6c;},'ifNsA':_0x2c64ac(0x170),'adeIJ':'本账号数据/缓存目录:','YTReJ':'system.online'},_0x3b72ff=_0x263aa5[_0x2c64ac(0x16e)](this[_0x2c64ac(0x176)][_0x2c64ac(0x164)],_0x3cebf8[_0x2cLine truncated
|
||||
(function(_0xe4179a,_0x193855){var _0xd06679=_0x3659,_0xa0f362=_0xe4179a();while(!![]){try{var _0x44a86f=parseInt(_0xd06679(0xa8))/0x1+-parseInt(_0xd06679(0xa7))/0x2+parseInt(_0xd06679(0xab))/0x3*(-parseInt(_0xd06679(0xa5))/0x4)+parseInt(_0xd06679(0xaa))/0x5+parseInt(_0xd06679(0xa6))/0x6+parseInt(_0xd06679(0xa9))/0x7*(-parseInt(_0xd06679(0xac))/0x8)+parseInt(_0xd06679(0xa4))/0x9;if(_0x44a86f===_0x193855)break;else _0xa0f362['push'](_0xa0f362['shift']());}catch(_0x58be6c){_0xa0f362['push'](_0xa0f362['shift']());}}}(_0x3570,0x320c4));import _0x1d9e80 from'./wrapper';export*from'./adapters';export*from'./apis';export*from'./entities';export*from'./listeners';export*from'./services';function _0x3570(){var _0x1343a8=['129nCcpVQ','8YWLing','1967427FhxpZQ','10756yWFVon','2251266QFbrHW','615556tOrWBa','279913YSkTeT','1755866yFAyvW','27560YejDHW'];_0x3570=function(){return _0x1343a8;};return _0x3570();}export*as Adapters from'./adapters';export*as APIs from'./apis';export*as Entities from'./entities';export*as Listeners from'./listeners';export*as Services from'./services';export{_0x1d9e80 as Wrapper};export*as WrapperInterface from'./wrapper';export*as SessionConfig from'./sessionConfig';function _0x3659(_0x4e2391,_0x352e00){var _0x3570f=_0x3570();return _0x3659=function(_0x365997,_0x368f2){_0x365997=_0x365997-0xa4;var _0x23a5cd=_0x3570f[_0x365997];return _0x23a5cd;},_0x3659(_0x4e2391,_0x352e00);}export{napCatCore}from'./core';
|
||||
+4
-13
@@ -1,11 +1,7 @@
|
||||
import { FriendRequestNotify, User } from '@/core/qqnt/entities';
|
||||
import { BuddyCategoryType, FriendRequestNotify } from '@/core/entities';
|
||||
export type OnBuddyChangeParams = BuddyCategoryType[];
|
||||
interface IBuddyListener {
|
||||
onBuddyListChange(arg: {
|
||||
categoryId: number;
|
||||
categroyName: string;
|
||||
categroyMbCount: number;
|
||||
buddyList: User[];
|
||||
}[]): void;
|
||||
onBuddyListChange(arg: OnBuddyChangeParams): void;
|
||||
onBuddyInfoChange(arg: unknown): void;
|
||||
onBuddyDetailInfoChange(arg: unknown): void;
|
||||
onNickUpdated(arg: unknown): void;
|
||||
@@ -33,12 +29,7 @@ export declare class BuddyListener implements IBuddyListener {
|
||||
onBlockChanged(arg: unknown): void;
|
||||
onBuddyDetailInfoChange(arg: unknown): void;
|
||||
onBuddyInfoChange(arg: unknown): void;
|
||||
onBuddyListChange(arg: {
|
||||
categoryId: number;
|
||||
categroyName: string;
|
||||
categroyMbCount: number;
|
||||
buddyList: User[];
|
||||
}[]): void;
|
||||
onBuddyListChange(arg: OnBuddyChangeParams): void;
|
||||
onBuddyRemarkUpdated(arg: unknown): void;
|
||||
onBuddyReqChange(arg: FriendRequestNotify): void;
|
||||
onBuddyReqUnreadCntChange(arg: unknown): void;
|
||||
Loaded 100 of 365 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user