Shamrock: add kritor metadata

xposed/src/main/java/kritor/client/KritorClient.kt

@@ -2,8 +2,15 @@
 package kritor.client
 
 import com.google.protobuf.ByteString
+import io.grpc.CallOptions
+import io.grpc.Channel
+import io.grpc.ClientCall
+import io.grpc.ClientInterceptor
+import io.grpc.ForwardingClientCall
+import io.grpc.Metadata
 import io.grpc.ManagedChannel
 import io.grpc.ManagedChannelBuilder
+import io.grpc.MethodDescriptor
 import io.kritor.common.Request
 import io.kritor.common.Response
 import io.kritor.event.EventServiceGrpcKt
@@ -23,6 +30,8 @@ import kritor.handlers.handleGrpc
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.internals.GlobalEventTransmitter
+import moe.fuqiuluo.shamrock.tools.ShamrockVersion
+import qq.service.ticket.TicketHelper
 import kotlin.time.Duration.Companion.seconds
 
 internal class KritorClient(
@@ -39,11 +48,26 @@ internal class KritorClient(
             if (::channel.isInitialized && isActive()){
                 channel.shutdown()
             }
+            val interceptor = object : ClientInterceptor {
+                override fun <ReqT, RespT> interceptCall(method: MethodDescriptor<ReqT, RespT>, callOptions: CallOptions, next: Channel): ClientCall<ReqT, RespT> {
+                    return object : ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+                        override fun start(responseListener: Listener<RespT>, headers: Metadata) {
+                            headers.merge(Metadata().apply {
+                                put(Metadata.Key.of("kritor-self-uin", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUin())
+                                put(Metadata.Key.of("kritor-self-uid", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUid())
+                                put(Metadata.Key.of("kritor-self-version", Metadata.ASCII_STRING_MARSHALLER), "OpenShamrock-$ShamrockVersion")
+                            })
+                            super.start(responseListener, headers)
+                        }
+                    }
+                }
+            }
             channel = ManagedChannelBuilder
                 .forAddress(host, port)
                 .usePlaintext()
                 .enableRetry() // 允许尝试
                 .executor(Dispatchers.IO.asExecutor()) // 使用协程的调度器
+                .intercept(interceptor)
                 .build()
         }.onFailure {
             LogCenter.log("KritorClient start failed: ${it.stackTraceToString()}", Level.ERROR)

xposed/src/main/java/kritor/server/KritorServer.kt

@@ -2,7 +2,12 @@
 package kritor.server
 
 import io.grpc.Grpc
+import io.grpc.Metadata
 import io.grpc.InsecureServerCredentials
+import io.grpc.ServerCall
+import io.grpc.ServerCallHandler
+import io.grpc.ServerInterceptor
+import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -10,14 +15,35 @@ import kotlinx.coroutines.asExecutor
 import kritor.auth.AuthInterceptor
 import kritor.service.*
 import moe.fuqiuluo.shamrock.helper.LogCenter
+import moe.fuqiuluo.shamrock.tools.ShamrockVersion
+import qq.service.ticket.TicketHelper
 import kotlin.coroutines.CoroutineContext
 
 class KritorServer(
     private val port: Int
 ): CoroutineScope {
+
+    private val serverInterceptor = object : ServerInterceptor {
+        override fun <ReqT, RespT> interceptCall(
+            call: ServerCall<ReqT, RespT>, headers: Metadata, next: ServerCallHandler<ReqT, RespT>
+        ): ServerCall.Listener<ReqT> {
+            return next.startCall(object : SimpleForwardingServerCall<ReqT, RespT>(call) {
+                override fun sendHeaders(headers: Metadata?) {
+                    headers?.apply {
+                        put(Metadata.Key.of("kritor-self-uin", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUin())
+                        put(Metadata.Key.of("kritor-self-uid", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUid())
+                        put(Metadata.Key.of("kritor-self-version", Metadata.ASCII_STRING_MARSHALLER), "OpenShamrock-$ShamrockVersion")
+                    }
+                    super.sendHeaders(headers)
+                }
+            }, headers)
+        }
+    }
+
     private val server = Grpc.newServerBuilderForPort(port, InsecureServerCredentials.create())
         .executor(Dispatchers.IO.asExecutor())
         .intercept(AuthInterceptor)
+        .intercept(serverInterceptor)
         .addService(AuthenticationService)
         .addService(CoreService)
         .addService(FriendService)

xposed/src/main/java/kritor/service/FriendService.kt

@@ -225,8 +225,8 @@ internal object FriendService : FriendServiceGrpcKt.FriendServiceCoroutineImplBa
     }
 
     @Grpc("FriendService", "GetUidByUin")
-    override suspend fun getUidByUin(request: GetUidRequest): GetUidResponse {
-        return GetUidResponse.newBuilder().apply {
+    override suspend fun getUidByUin(request: GetUidByUinRequest): GetUidByUinResponse {
+        return GetUidByUinResponse.newBuilder().apply {
             request.targetUinsList.forEach {
                 putUidMap(it, ContactHelper.getUidByUinAsync(it))
             }

xposed/src/main/java/kritor/service/MessageService.kt

@@ -463,7 +463,7 @@ internal object MessageService : MessageServiceGrpcKt.MessageServiceCoroutineImp
             request.contact.longPeer(),
             msg.msgSeq.toULong(),
             request.faceId.toString(),
-            request.isComment
+            request.isSet
         )
         return ReactMessageWithEmojiResponse.newBuilder().build()
     }

xposed/src/main/java/qq/service/msg/MsgConvertor.kt

@@ -401,10 +401,10 @@ private object MsgConvertor {
     suspend fun convertInlineKeyboard(record: MsgRecord, element: MsgElement): Result<Element> {
         val inlineKeyboard = element.inlineKeyboardElement
         val elem = Element.newBuilder()
-        elem.type = ElementType.BUTTON
-        elem.setButton(ButtonElement.newBuilder().apply {
+        elem.type = ElementType.KEYBOARD
+        elem.setKeyboard(KeyboardElement.newBuilder().apply {
             inlineKeyboard.rows.forEach { row ->
-                this.addRows(ButtonRow.newBuilder().apply {
+                    this.addRows(KeyboardRow.newBuilder().apply {
                     row.buttons.forEach buttonsLoop@{ button ->
                         if (button == null) return@buttonsLoop
                         this.addButtons(Button.newBuilder().apply {

xposed/src/main/java/qq/service/msg/MultiConvertor.kt

@@ -227,9 +227,9 @@ suspend fun List<Elem>.toKritorResponseMessages(contact: Contact): ArrayList<Ele
                 46 -> {
                     val buttonExtra = commonElem.elem!!.decodeProtobuf<ButtonExtra>()
                     kritorMessages.add(
-                        Element.newBuilder().setButton(ButtonElement.newBuilder().apply {
+                        Element.newBuilder().setKeyboard(KeyboardElement.newBuilder().apply {
                             this.addAllRows(buttonExtra.field1!!.rows!!.map { row ->
-                                ButtonRow.newBuilder().apply {
+                                KeyboardRow.newBuilder().apply {
                                     this.addAllButtons(row.buttons!!.map { button ->
                                         Button.newBuilder().apply {
                                             this.id = button.id

xposed/src/main/java/qq/service/msg/NtMsgConvertor.kt

@@ -97,7 +97,7 @@ object NtMsgConvertor {
         ElementType.JSON to ::jsonConvertor,
         ElementType.FORWARD to ::forwardConvertor,
         ElementType.MARKDOWN to ::markdownConvertor,
-        ElementType.BUTTON to ::buttonConvertor,
+        ElementType.KEYBOARD to ::buttonConvertor,
     )
 
     suspend fun convertToNtMsgs(contact: Contact, msgId: Long, msgs: Messages): ArrayList<MsgElement> {
@@ -848,7 +848,7 @@ object NtMsgConvertor {
         elem.elementType = MsgConstant.KELEMTYPEINLINEKEYBOARD
         val rows = arrayListOf<InlineKeyboardRow>()
 
-        val keyboard = sourceButton.button
+        val keyboard = sourceButton.keyboard
         keyboard.rowsList.forEach { row ->
             val buttons = arrayListOf<InlineKeyboardButton>()
             row.buttonsList.forEach { button ->

xposed/src/main/java/qq/service/msg/ReqMessageConvertor.kt

@@ -366,9 +366,9 @@ private object ReqMsgConvertor {
     suspend fun convertInlineKeyboard(contact: Contact, element: MsgElement): Result<Element> {
         val inlineKeyboard = element.inlineKeyboardElement
         val elem = Element.newBuilder()
-        elem.setButton(ButtonElement.newBuilder().apply {
+        elem.setKeyboard(KeyboardElement.newBuilder().apply {
             this.addAllRows(inlineKeyboard.rows.map { row ->
-                ButtonRow.newBuilder().apply {
+                KeyboardRow.newBuilder().apply {
                     this.addAllButtons(row.buttons.map { button ->
                         Button.newBuilder().apply {
                             this.id = button.id

xposed/src/main/java/qq/service/msg/ReqMultiConvertor.kt

@@ -511,13 +511,13 @@ suspend fun List<Element>.toRichText(contact: Contact): Result<Pair<String, Rich
                     elems.add(elem)
                     summary.append("[Markdown消息]")
                 }
-                Element.ElementType.BUTTON -> {
+                Element.ElementType.KEYBOARD -> {
                     val elem = Elem(
                         commonElem = CommonElem(
                             serviceType = 46,
                             elem = ButtonExtra(
                                 field1 = Object1(
-                                    rows = it.button.rowsList.map { row ->
+                                    rows = it.keyboard.rowsList.map { row ->
                                         Row(buttons = row.buttonsList.map { button ->
                                             val renderData = button.renderData
                                             val action = button.action
@@ -544,7 +544,7 @@ suspend fun List<Element>.toRichText(contact: Contact): Result<Pair<String, Rich
                                             )
                                         })
                                     },
-                                    appid = it.button.botAppid.toULong()
+                                    appid = it.keyboard.botAppid.toULong()
                                 )
                             ).toByteArray(),
                             businessType = 1