Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
9494472c
Commit
9494472c
authored
Jul 07, 2020
by
mzdluo123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: uploadPttTosServer to HighwayHelper.kt
parent
038c9d1d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 additions
and
31 deletions
+60
-31
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
...et/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
+37
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PbSendMsg.kt
...work/protocol/packet/chat/receive/MessageSvc.PbSendMsg.kt
+2
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
...protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
+1
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/voice/PttStore.kt
.../qqandroid/network/protocol/packet/chat/voice/PttStore.kt
+20
-28
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
View file @
9494472c
...
...
@@ -12,7 +12,10 @@
package
net.mamoe.mirai.qqandroid.network.highway
import
io.ktor.client.HttpClient
import
io.ktor.client.request.parameter
import
io.ktor.client.request.port
import
io.ktor.client.request.post
import
io.ktor.client.request.url
import
io.ktor.http.ContentType
import
io.ktor.http.HttpStatusCode
import
io.ktor.http.URLProtocol
...
...
@@ -30,8 +33,8 @@ import net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.network.QQAndroidClient
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.CSDataHighwayHead
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Cmd0x388
import
net.mamoe.mirai.qqandroid.utils.*
import
net.mamoe.mirai.qqandroid.utils.PlatformSocket
import
net.mamoe.mirai.qqandroid.utils.SocketException
import
net.mamoe.mirai.qqandroid.utils.addSuppressedMirai
import
net.mamoe.mirai.qqandroid.utils.io.serialization.readProtoBuf
import
net.mamoe.mirai.qqandroid.utils.io.withUse
...
...
@@ -181,6 +184,39 @@ internal object HighwayHelper {
}
}
}
suspend
fun
uploadPttToServers
(
servers
:
List
<
Pair
<
Int
,
Int
>>,
content
:
ByteArray
,
md5
:
ByteArray
,
uKey
:
ByteArray
,
fileKey
:
ByteArray
)
{
servers
.
retryWithServers
(
10
*
1000
,
{
throw
IllegalStateException
(
"cannot upload ptt, failed on all servers."
,
it
)
},
{
s
:
String
,
i
:
Int
->
uploadPttToServer
(
s
,
i
,
content
,
md5
,
uKey
,
fileKey
)
})
}
private
suspend
fun
uploadPttToServer
(
serverIp
:
String
,
serverPort
:
Int
,
content
:
ByteArray
,
md5
:
ByteArray
,
uKey
:
ByteArray
,
fileKey
:
ByteArray
)
{
HttpClient
().
post
<
String
>
{
url
(
"http://$serverIp:$serverPort"
)
parameter
(
"ver"
,
4679
)
parameter
(
"ukey"
,
uKey
.
toUHexString
(
""
))
parameter
(
"filekey"
,
fileKey
.
toUHexString
(
""
))
parameter
(
"filesize"
,
content
.
size
)
parameter
(
"bmd5"
,
md5
.
toUHexString
(
""
))
parameter
(
"mType"
,
"pttDu"
)
parameter
(
"voice_encodec"
,
0
)
body
=
content
}
}
}
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PbSendMsg.kt
View file @
9494472c
...
...
@@ -148,7 +148,8 @@ internal object MessageSvcPbSendMsg : OutgoingPacketFactory<MessageSvcPbSendMsg.
fileType
=
4
,
// 不知道能不能解决tim无法收听的问题
reserve
=
"16 36 20 38 36 65 41 31 04 37 61 39 35 37 37 61 33 62 37 30 33 66 65 33 31 20 20 20 20 20 20 35 30 55 49 30 E3 3F 8F 9F FB CA 1D 79 60 6C F4 74 F2 35 35 34 39 33 30 45 33 33 46 38 46 39 46 46 42 43 41 31 44 37 39 36 30 36 43 46 34 37 34 46 32 2E 61 6D 72 41"
.
hexToBytes
(),
pbReserve
=
"08 00"
.
hexToBytes
()
pbReserve
=
"08 00"
.
hexToBytes
(),
time
=
2
)
}
)
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
View file @
9494472c
...
...
@@ -53,7 +53,7 @@ internal object OnlinePushPbPushGroupMsg : IncomingPacketFactory<Packet?>("Onlin
// 00 00 02 E4 0A D5 05 0A 4F 08 A2 FF 8C F0 03 10 DD F1 92 B7 07 18 52 20 00 28 BC 3D 30 8C 82 AB F1 05 38 D2 80 E0 8C 80 80 80 80 02 4A 21 08 E7 C1 AD B8 02 10 01 18 BA 05 22 09 48 69 6D 31 38 38 6D 6F 65 30 06 38 02 42 05 4D 69 72 61 69 50 01 58 01 60 00 88 01 08 12 06 08 01 10 00 18 00 1A F9 04 0A F6 04 0A 26 08 00 10 87 82 AB F1 05 18 B7 B4 BF 30 20 00 28 0C 30 00 38 86 01 40 22 4A 0C E5 BE AE E8 BD AF E9 9B 85 E9 BB 91 12 E6 03 42 E3 03 12 2A 7B 34 45 31 38 35 38 32 32 2D 30 45 37 42 2D 46 38 30 46 2D 43 35 42 31 2D 33 34 34 38 38 33 37 34 44 33 39 43 7D 2E 6A 70 67 22 00 2A 04 03 00 00 00 32 60 15 36 20 39 36 6B 45 31 41 38 35 32 32 39 64 63 36 39 38 34 37 39 37 37 62 20 20 20 20 20 20 35 30 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 7B 34 45 31 38 35 38 32 32 2D 30 45 37 42 2D 46 38 30 46 2D 43 35 42 31 2D 33 34 34 38 38 33 37 34 44 33 39 43 7D 2E 6A 70 67 31 32 31 32 41 38 C6 BB 8A A9 08 40 FB AE 9E C2 09 48 50 50 41 5A 00 60 01 6A 10 4E 18 58 22 0E 7B F8 0F C5 B1 34 48 83 74 D3 9C 72 59 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 31 39 38 3F 74 65 72 6D 3D 32 82 01 57 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 30 3F 74 65 72 6D 3D 32 B0 01 4D B8 01 2E C8 01 FF 05 D8 01 4D E0 01 2E FA 01 59 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 34 30 30 3F 74 65 72 6D 3D 32 80 02 4D 88 02 2E 12 45 AA 02 42 50 03 60 00 68 00 9A 01 39 08 09 20 BF 50 80 01 01 C8 01 00 F0 01 00 F8 01 00 90 02 00 98 03 00 A0 03 20 B0 03 00 C0 03 00 D0 03 00 E8 03 00 8A 04 04 08 02 08 01 90 04 80 80 80 10 B8 04 00 C0 04 00 12 06 4A 04 08 00 40 01 12 14 82 01 11 0A 09 48 69 6D 31 38 38 6D 6F 65 18 06 20 08 28 03 10 8A CA 9D A1 07 1A 00
if
(!
bot
.
firstLoginSucceed
)
return
null
val
pbPushMsg
=
readProtoBuf
(
MsgOnlinePush
.
PbPushMsg
.
serializer
())
bot
.
logger
.
debug
(
pbPushMsg
.
_miraiContentToString
())
//
bot.logger.debug(pbPushMsg._miraiContentToString())
if
(
pbPushMsg
.
msg
.
msgHead
.
fromUin
==
bot
.
id
)
{
return
SendGroupMessageReceipt
(
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/voice/PttStore.kt
View file @
9494472c
...
...
@@ -8,48 +8,31 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.proto.Cmd0x388
import
net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
import
net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
import
net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket
import
net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image.ImgStore
import
net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image.getRandomString
import
net.mamoe.mirai.qqandroid.utils._miraiContentToString
import
net.mamoe.mirai.qqandroid.utils.io.serialization.readProtoBuf
import
net.mamoe.mirai.qqandroid.utils.io.serialization.writeProtoBuf
import
net.mamoe.mirai.qqandroid.utils.toUHexString
internal
class
PttStore
{
object
GroupPttUp
:
OutgoingPacketFactory
<
GroupPttUp
.
Response
>(
"PttStore.GroupPttUp"
)
{
sealed
class
Response
:
Packet
{
class
Resp
(
val
resp
:
Cmd0x388
.
RspBody
class
RequireUpload
(
val
fileId
:
Long
,
val
uKey
:
ByteArray
,
val
uploadIpList
:
List
<
Int
>,
val
uploadPortList
:
List
<
Int
>,
val
fileKey
:
ByteArray
)
:
Response
()
{
override
fun
toString
():
String
{
return
resp
.
_miraiContentToString
()
return
"RequireUpload(fileId=$fileId, uKey=${uKey.contentToString()})"
}
}
}
/**
* 发语音
* 收到请求后可以通过下面的代码来上传到服务器
*
val up_rsp = response.resp.msgTryupPttRsp!![0]
if (!up_rsp.boolFileExit) {
val server = up_rsp.uint32UpIp!![0].toIpV4AddressString()
val port = up_rsp.uint32UpPort?.get(0)
val id = up_rsp.fileid
HttpClient().post<String> {
url("http://$server:$port")
parameter("ver", 4679)
parameter("ukey", up_rsp.upUkey.toUHexString(""))
parameter("filekey", up_rsp.fileKey.toUHexString(""))
parameter("filesize", size)
parameter("bmd5", md5)
parameter("mType", "pttDu")
parameter("voice_encodec", 0)
body = file.readBytes()
}
* */
@ExperimentalStdlibApi
operator
fun
invoke
(
...
...
@@ -71,7 +54,7 @@ internal class PttStore {
fileId
=
fileId
,
fileSize
=
size
,
fileMd5
=
md5
,
fileName
=
getRandomString
(
16
).
encodeToByteArray
()
,
fileName
=
md5
,
srcTerm
=
5
,
platformType
=
9
,
buType
=
4
,
...
...
@@ -92,7 +75,16 @@ internal class PttStore {
override
suspend
fun
ByteReadPacket
.
decode
(
bot
:
QQAndroidBot
):
Response
{
val
resp0
=
readProtoBuf
(
Cmd0x388
.
RspBody
.
serializer
())
return
Response
.
Resp
(
resp0
)
resp0
.
msgTryupPttRsp
?:
error
(
"cannot find `msgTryupPttRsp` from `Cmd0x388.RspBody`"
)
val
resp
=
resp0
.
msgTryupPttRsp
.
first
()
return
Response
.
RequireUpload
(
fileId
=
resp
.
fileid
,
uKey
=
resp
.
upUkey
,
uploadIpList
=
resp
.
uint32UpIp
!!
,
uploadPortList
=
resp
.
uint32UpPort
!!
,
fileKey
=
resp
.
fileKey
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment