fix: #350

README.md

@@ -16,7 +16,7 @@
 
 ## 简介
 
-☘ 基于 Lsposed(**Non**-Riru) 实现 OneBot 标准的 QQ 机器人框架，原作者[**fuqiuluo**](https://github.com/fuqiuluo)已脱离开发，接下来由白池接手哦！本项目为OpenShamrock，不会有任何收费行为，欢迎大家的加入！
+☘ 基于 Lsposed(**Non**-Riru) 实现 OneBot 标准的 QQ 机器人框架！
 
 > 本项目仅提供学习与交流用途，请在24小时内删除。   
 > 本项目目的是研究 Xposed 和 LSPosed 框架的使用。 Epic 框架开发相关知识。  
@@ -27,6 +27,8 @@
 
 ## 兼容|迁移|替代 说明
 
+仅支持QQ9.0.70以上的版本，低版本问题将不再修复与处理。
+
 - 一键移植：本项目基于 go-cqhttp 的文档进行开发实现。
 - 平行部署：可多平台部署，未来将会支持 Docker 部署的教程。
   

app/build.gradle.kts

@@ -17,7 +17,7 @@ android {
         minSdk = 27
         targetSdk = 34
         versionCode = getVersionCode()
-        versionName = "1.0.9" + ".r${getGitCommitCount()}." + getVersionName()
+        versionName = "1.1.1.onebot" + ".r${getGitCommitCount()}." + getVersionName()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/cpp/shamrock.cpp

@@ -12,7 +12,8 @@
 
 extern "C"
 JNIEXPORT jstring JNICALL
-Java_moe_fuqiuluo_shamrock_xposed_hooks_PullConfig_testNativeLibrary(JNIEnv *env, jobject thiz) {
+Java_moe_fuqiuluo_shamrock_xposed_hooks_PullConfig_00024Companion_testNativeLibrary(JNIEnv *env,
+                                                                                    jobject thiz) {
     return env->NewStringUTF("加载Shamrock库成功~");
 }
 

app/src/main/java/moe/fuqiuluo/shamrock/MainActivity.kt

@@ -52,7 +52,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
@@ -64,6 +63,7 @@ import androidx.compose.ui.unit.sp
 import androidx.core.view.WindowCompat
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import moe.fuqiuluo.shamrock.ui.app.AppRuntime
 import moe.fuqiuluo.shamrock.ui.app.Logger
@@ -79,7 +79,7 @@ import moe.fuqiuluo.shamrock.ui.theme.RANDOM_SUB_TITLE
 import moe.fuqiuluo.shamrock.ui.theme.RANDOM_TITLE
 import moe.fuqiuluo.shamrock.ui.theme.ShamrockTheme
 import moe.fuqiuluo.shamrock.ui.tools.NoIndication
-import moe.fuqiuluo.shamrock.ui.tools.ShamrockTab
+import moe.fuqiuluo.shamrock.ui.tools.ShamrockTabV2
 import moe.fuqiuluo.shamrock.ui.tools.getShamrockVersion
 
 class MainActivity : ComponentActivity() {
@@ -87,6 +87,15 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
+            LaunchedEffect(Unit) {
+                while (true) {
+                    delay(5_000) // Delay in milliseconds
+                    broadcastToModule {
+                        putExtra("__cmd", "switch_status")
+                    }
+                }
+            }
+
             CompositionLocalProvider(
                 LocalIndication provides NoIndication
             ) {
@@ -336,7 +345,7 @@ private fun AnimatedTab(
         }
     }
 
-    ShamrockTab(
+    ShamrockTabV2(
         selected = curSelected,
         onClick = {
             scope.launch {

app/src/main/java/moe/fuqiuluo/shamrock/ui/service/handlers/ModuleHandler.kt

@@ -30,6 +30,7 @@ abstract class ModuleHandler {
                 }
             }
             putExtra("__hash", callbackId)
+            putExtra("__cmd", cmd)
         }
     }
 }

app/src/main/java/moe/fuqiuluo/shamrock/ui/service/internal/MultifunctionalProvider.kt

@@ -58,7 +58,7 @@ class MultifunctionalProvider: ContentProvider() {
 
 inline fun Context.broadcastToModule(intentBuilder: Intent.() -> Unit) {
     val intent = Intent()
-    intent.action = "moe.fuqiuluo.xqbot.dynamic"
+    intent.action = "moe.fuqiuluo.onebot.dynamic"
     intent.intentBuilder()
     sendBroadcast(intent)
 }

app/src/main/java/moe/fuqiuluo/shamrock/ui/tools/tabs.kt

@@ -242,13 +242,13 @@ private fun Placeable.PlacementScope.placeTextAndIcon(
 }
 
 @Composable
-fun ShamrockTab(
+fun ShamrockTabV2(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
-    text: @Composable (() -> Unit)? = null,
-    icon: @Composable (() -> Unit)? = null,
+    text: (@Composable (() -> Unit))? = null,
+    icon: (@Composable (() -> Unit))? = null,
     selectedContentColor: Color = GlobalColor.TabSelected,
     unselectedContentColor: Color = selectedContentColor,
     indication: Indication? = rememberRipple(bounded = true, color = selectedContentColor),
@@ -262,7 +262,7 @@ fun ShamrockTab(
             ProvideTextStyle(style, content = text)
         }
     }
-    ShamrockTab(
+    ShamrockTabV2(
         selected,
         onClick,
         modifier,
@@ -277,7 +277,7 @@ fun ShamrockTab(
 }
 
 @Composable
-fun ShamrockTab(
+fun ShamrockTabV2(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,

protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaReq.kt

@@ -94,7 +94,8 @@ data class DeleteReq(
 
 @Serializable
 data class DownloadRkeyReq(
-    @ProtoNumber(1) val types: List<Int>
+    @ProtoNumber(1) val types: List<Int>,
+    @ProtoNumber(2) val downloadType: Int
 )
 
 @Serializable

protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaRsp.kt

@@ -52,11 +52,11 @@ data class DownloadRkeyRsp(
 
 @Serializable
 data class RKeyInfo(
-    @ProtoNumber(1) val rkey: String?,
+    @ProtoNumber(1) val rkey: String,
     @ProtoNumber(2) val rkeyTtlSec: ULong?,
     @ProtoNumber(3) val storeId: UInt = 0u,
     @ProtoNumber(4) val rkeyCreateTime: UInt?,
-    @ProtoNumber(4) val type: UInt?,
+    @ProtoNumber(5) val type: UInt,
 )
 
 @Serializable

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopInfo.java

@@ -146,6 +146,7 @@ public class TroopInfo {
     public byte[] troopInfoExtByte;
     public String troopLevelMap;
     public String troopRemark;
+    @Deprecated
     public String troopcode;
     public short troopface;
     public String troopmemo;
@@ -154,6 +155,7 @@ public class TroopInfo {
     public int trooptype;
     public String troopuin;
     public long udwCmdUinRingtoneID;
+    @Deprecated
     public String uin;
     public int wClickBAFTipCount;
     public int wInsertBAFTipCount;

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberInfo.java

@@ -1,63 +1,92 @@
 package com.tencent.mobileqq.data.troop;
 
+import org.jetbrains.annotations.Nullable;
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole;
+
 public class TroopMemberInfo {
-    public long active_point;
+    public static final long VALUE_DISTANCE_TO_SELF_UNKOWN = -100;
+    protected static final int VALUE_INVALID = -100;
+    public static final long VALUE_MEMBER_CLOSE_SHARE_LBS = -1001;
+
     public int addState;
-    public byte age;
-    public String alias;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
     public String autoremark;
-    public long cmduinFlagEx3Grocery;
     public long credit_level;
-    public long datetime;
     public String displayedNamePinyinFirst;
-    public short faceid;
+
+    @Nullable
+    public TroopMemberInfoExt extInfo;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
     public String friendnick;
     public long gagTimeStamp;
     public String honorList;
+    public boolean isTroopFollowed;
+    public long join_time;
+    public long last_active_time;
+    public int level;
+    public int mBigClubVipType;
+    public byte mHonorRichFlag;
+    public boolean mIsShielded;
+    public int mVipType;
+    public String memberUid;
+    public String memberuin;
+    public int newRealLevel;
+    public TroopMemberNickInfo nickInfo;
+    public int realLevel;
+    public MemberRole role;
+
+    @Nullable
+    public TroopMemberSpecialTitleInfo specialTitleInfo;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
+    public String troopColorNick;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
+    public int troopColorNickId;
+
+    @Deprecated(since = "推荐使用TroopMemberNickInfo")
+    public String troopnick;
+    public String troopuin;
+    public int globalTroopLevel = VALUE_INVALID;
+    public int flagEx = 0;
+
+    // QQ OLD API DATA
+    public long active_point;
+    public byte age;
+    public String alias;
+    public long cmduinFlagEx3Grocery;
+    public long datetime;
+    public short faceid;
     public String hwCourse;
     public int hwIdentity;
     public String hwName;
     public int isShowQZone;
-    public boolean isTroopFollowed;
-    public long join_time;
     public long lastMsgUpdateHonorRichTime;
-    public long last_active_time;
-    public int level;
     public int mBigClubTemplateId;
     public int mBigClubVipLevel;
-    public int mBigClubVipType;
     public int mGlamourLevel;
-    public byte mHonorRichFlag;
     public int mIsHideBigClub;
-    public boolean mIsShielded;
     public String mUniqueTitle;
     public int mVipLevel;
     public int mVipTemplateId;
-    public int mVipType;
-    public String memberuin;
-    public int newRealLevel;
     public String pyAll_autoremark;
     public String pyAll_friendnick;
     public String pyAll_troopnick;
     public String pyFirst_autoremark;
     public String pyFirst_friendnick;
     public String pyFirst_troopnick;
-    public int realLevel;
     public String recommendRemark;
     public byte sex;
     public byte status;
     public int tribeLevel;
     public int tribePoint;
-    public String troopColorNick;
-    public int troopColorNickId;
-    public String troopnick;
     public String troopremark;
-    public String troopuin;
     public int qqVipInfo = 0;
     public int superQqInfo = 0;
     public int superVipInfo = 0;
     public int hotChatGlamourLevel = -100;
-    public int globalTroopLevel = -100;
     public int distance = 0;
     public long msgseq = -100;
     public double distanceToSelf = -100.0d;

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberInfoExt.java

@@ -0,0 +1,48 @@
+package com.tencent.mobileqq.data.troop;
+
+import org.jetbrains.annotations.Nullable;
+
+import kotlin.jvm.JvmField;
+
+public class TroopMemberInfoExt {
+    @JvmField
+    public int commonFrdCnt;
+
+    @JvmField
+    public long flagEx3;
+
+    @JvmField
+    public int hwIdentity;
+
+    @JvmField
+    public long lastMsgUpdateHonorRichTime;
+
+    @JvmField
+    @Nullable
+    public String memberUin;
+
+    @JvmField
+    @Nullable
+    public byte[] nickIconRepeatMsgBuffer;
+
+    @JvmField
+    @Nullable
+    public String recommendRemark;
+
+    @JvmField
+    @Nullable
+    public String showNameForPinyin;
+
+    @JvmField
+    @Nullable
+    public String showNamePinyinAll;
+
+    @JvmField
+    @Nullable
+    public String showNamePinyinFirst;
+
+    @JvmField
+    @Nullable
+    public String troopUin;
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberNickInfo.java

@@ -0,0 +1,54 @@
+package com.tencent.mobileqq.data.troop;
+
+import org.jetbrains.annotations.NotNull;
+
+public class TroopMemberNickInfo {
+    @NotNull
+    public final String getAutoRemark() {
+        return null;
+    }
+
+    @NotNull
+    public final String getColorNick() {
+        return null;
+    }
+
+    public final int getColorNickId() {
+        return 0;
+    }
+
+    @NotNull
+    public final String getFriendNick() {
+        return null;
+    }
+
+    @NotNull
+    public final String getHBShowName() {
+        return null;
+    }
+
+    @NotNull
+    public final String getRemarkFromFriend() {
+        return null;
+    }
+
+    @NotNull
+    public final String getRemarkFromFriendV2() {
+        return null;
+    }
+
+    @NotNull
+    public final String getShowName() {
+        return null;
+    }
+
+    @NotNull
+    public final String getTroopNick() {
+        return null;
+    }
+
+    @NotNull
+    public final String getTroopUin() {
+        return null;
+    }
+}

qqinterface/src/main/java/com/tencent/mobileqq/data/troop/TroopMemberSpecialTitleInfo.java

@@ -0,0 +1,29 @@
+package com.tencent.mobileqq.data.troop;
+
+import org.jetbrains.annotations.NotNull;
+
+public class TroopMemberSpecialTitleInfo {
+    public final int getExpireTimeSec() {
+        return 0;
+    }
+
+    @NotNull
+    public final String getFriendNick() {
+        return null;
+    }
+
+    @NotNull
+    public final String getSpecialTitle() {
+        return null;
+    }
+
+    @NotNull
+    public final String getTroopUin() {
+        return null;
+    }
+
+    @NotNull
+    public final String getUin() {
+        return null;
+    }
+}

qqinterface/src/main/java/com/tencent/mobileqq/msf/sdk/MsfMessagePair.java

@@ -0,0 +1,18 @@
+package com.tencent.mobileqq.msf.sdk;
+
+import com.tencent.qphone.base.remote.FromServiceMsg;
+import com.tencent.qphone.base.remote.ToServiceMsg;
+
+public class MsfMessagePair {
+    public FromServiceMsg fromServiceMsg;
+    public String sendProcess;
+    public ToServiceMsg toServiceMsg;
+
+    public MsfMessagePair(String str, ToServiceMsg toServiceMsg, FromServiceMsg fromServiceMsg) {
+
+    }
+
+    public MsfMessagePair(ToServiceMsg toServiceMsg, FromServiceMsg fromServiceMsg) {
+
+    }
+}

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/api/impl/GProSessionImpl.java

@@ -0,0 +1,11 @@
+package com.tencent.mobileqq.qqguildsdk.api.impl;
+
+import com.tencent.qqnt.kernelgpro.nativeinterface.IKernelGuildService;
+
+public class GProSessionImpl {
+    public IKernelGuildService getGuildService() {
+        return null;
+    }
+
+
+}

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/GProGuildInfo.java

@@ -1,20 +1,12 @@
 package com.tencent.mobileqq.qqguildsdk.data;
 
-import android.text.TextUtils;
-
-import com.tencent.mobileqq.qqguildsdk.data.genc.GGProMedalInfo;
-import com.tencent.mobileqq.qqguildsdk.data.genc.GGProNavigationInfo;
 import com.tencent.mobileqq.qqguildsdk.data.genc.IGProMedalInfo;
 import com.tencent.mobileqq.qqguildsdk.data.genc.IGProNavigationInfo;
-import com.tencent.qqnt.kernel.nativeinterface.GProGuild;
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildSpeakableThreshold;
-import com.tencent.qqnt.kernel.nativeinterface.GProMedalInfo;
-import com.tencent.qqnt.kernel.nativeinterface.GProNavigationInfo;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 
 
 public class GProGuildInfo implements IGProGuildInfo {

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/GProGuildRoleInfo.java

@@ -2,7 +2,7 @@ package com.tencent.mobileqq.qqguildsdk.data;
 
 import androidx.annotation.NonNull;
 
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
 
 import java.util.ArrayList;
 import java.util.Iterator;

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/GProRoleMemberListInfo.java

@@ -1,6 +1,6 @@
 package com.tencent.mobileqq.qqguildsdk.data;
 
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
 import com.tencent.qqnt.kernel.nativeinterface.GProUser;
 
 import java.util.ArrayList;

qqinterface/src/main/java/com/tencent/mobileqq/qqguildsdk/data/genc/GGProGuildMemberSearchResult.java

@@ -1,14 +1,9 @@
 package com.tencent.mobileqq.qqguildsdk.data.genc;
 
-import com.tencent.mobileqq.qqguildsdk.data.GProGuildRoleInfo;
-import com.tencent.mobileqq.qqguildsdk.data.GProUserInfo;
 import com.tencent.mobileqq.qqguildsdk.data.IGProGuildRoleInfo;
 import com.tencent.mobileqq.qqguildsdk.data.IGProUserInfo;
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole;
-import com.tencent.qqnt.kernel.nativeinterface.GProUser;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 
 public  class GGProGuildMemberSearchResult implements IGProGuildMemberSearchResult {
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/Contact.java

@@ -0,0 +1,51 @@
+package com.tencent.qqnt.kernel.nativeinterface;
+
+import java.io.Serializable;
+
+public final class Contact implements IKernelModel, Serializable {
+    int chatType;
+    String guildId;
+    String peerUid;
+    long serialVersionUID;
+
+    public Contact() {
+        this.serialVersionUID = 1L;
+        this.peerUid = "";
+        this.guildId = "";
+    }
+
+    public int getChatType() {
+        return this.chatType;
+    }
+
+    public String getGuildId() {
+        return this.guildId;
+    }
+
+    public String getPeerUid() {
+        return this.peerUid;
+    }
+
+    public void setChatType(int i2) {
+        this.chatType = i2;
+    }
+
+    public void setGuildId(String str) {
+        this.guildId = str;
+    }
+
+    public void setPeerUid(String str) {
+        this.peerUid = str;
+    }
+
+    public String toString() {
+        return "Contact{chatType=" + this.chatType + ",peerUid=" + this.peerUid + ",guildId=" + this.guildId + ",}";
+    }
+
+    public Contact(int i2, String str, String str2) {
+        this.serialVersionUID = 1L;
+        this.chatType = i2;
+        this.peerUid = str;
+        this.guildId = str2;
+    }
+}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProJoinGuildResult.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 public  final class GProJoinGuildResult {
     GProGuild guildInfo;
     GProGuildInit guildInit;

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProJoinGuildsResult.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 import java.io.Serializable;
 
 public  final class GProJoinGuildsResult implements Serializable {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProRoleMemberList.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public  final class GProRoleMemberList {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/GProSearchMemberAndRoleResult.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public  final class GProSearchMemberAndRoleResult {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchChannelInvisibleRoleListCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public interface IGProFetchChannelInvisibleRoleListCallback {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchChannelLiveableRoleListCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 
 public interface IGProFetchChannelLiveableRoleListCallback {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchGuildInfoCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 public interface IGProFetchGuildInfoCallback {
     void onFetchGuildInfo(int code, String reason, GProGuild gProGuild);
 }

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProFetchGuildListCallback.java

@@ -1,5 +1,7 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+
 import java.util.ArrayList;
 
 public interface IGProFetchGuildListCallback {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IGProResultCallback.java

@@ -1,5 +0,0 @@
-package com.tencent.qqnt.kernel.nativeinterface;
-
-public interface IGProResultCallback {
-    void onResult(int code, String msg, GProSecurityResult result);
-}

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelGuildListener.java

@@ -1,5 +1,8 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IKernelGuildService.java

@@ -1,5 +1,14 @@
 package com.tencent.qqnt.kernel.nativeinterface;
 
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild;
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProRoleCreateInfo;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProCreateRoleCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchMemberListWithRoleCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchMemberRolesCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchRoleListPermissionCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProFetchRolePermissionCallback;
+import com.tencent.qqnt.kernelgpro.nativeinterface.IGProResultCallback;
+
 import java.util.ArrayList;
 
 public interface IKernelGuildService {

qqinterface/src/main/java/com/tencent/qqnt/kernel/nativeinterface/IQQNTWrapperSession.java

@@ -19,11 +19,6 @@ public interface IQQNTWrapperSession {
             return null;
         }
 
-        @Override
-        public IKernelGuildService getGuildService() {
-            return null;
-        }
-
         @Override
         public IKernelMsgService getMsgService() {
             return null;
@@ -93,7 +88,7 @@ public interface IQQNTWrapperSession {
 
     //IKernelGroupService getGroupService();
 
-    IKernelGuildService getGuildService();
+    //IKernelGuildService getGuildService();
 
     IKernelMsgService getMsgService();
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/GProGuild.java

@@ -1,7 +1,9 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProCmdUinInfo;
+import com.tencent.qqnt.kernel.nativeinterface.GProGuildInfo;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 
 public final class GProGuild implements Serializable {
     GProCmdUinInfo cmdUinInfo;

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/GProGuildRole.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermission;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/GProRoleCreateInfo.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermission;
 
 public  final class GProRoleCreateInfo {
     boolean bHoist;

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProCreateRoleCallback.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProSecurityResult;
 
 public interface IGProCreateRoleCallback {
     void onCreateRoleResult(int code, String msg, GProSecurityResult result, GProGuildRole role);

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchMemberListWithRoleCallback.java

@@ -1,4 +1,6 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRoleMemberList;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchMemberRolesCallback.java

@@ -1,4 +1,4 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchRoleListPermissionCallback.java

@@ -1,4 +1,4 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProFetchRolePermissionCallback.java

@@ -1,4 +1,8 @@
-package com.tencent.qqnt.kernel.nativeinterface;
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermission;
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermissionCategory;
+import com.tencent.qqnt.kernel.nativeinterface.GProRolePermissionDesc;
 
 import java.util.ArrayList;
 

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IGProResultCallback.java

@@ -0,0 +1,7 @@
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProSecurityResult;
+
+public interface IGProResultCallback {
+    void onResult(int code, String msg, GProSecurityResult result);
+}

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IKernelGuildService.java

@@ -0,0 +1,90 @@
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+import com.tencent.qqnt.kernel.nativeinterface.GProFaceAuthInfo;
+import com.tencent.qqnt.kernel.nativeinterface.GProGuildReqInfo;
+import com.tencent.qqnt.kernel.nativeinterface.GProSimpleProfile;
+import com.tencent.qqnt.kernel.nativeinterface.IGProAddGuildInfoCallBack;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchChannelInvisibleRoleListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchChannelLiveableRoleListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchGuildInfoCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchGuildListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchRetentionGuildListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProFetchUserJoinedGuildListCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProGetMemberInfoByOpenIdCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IGProGetUserInfoCallback;
+import com.tencent.qqnt.kernel.nativeinterface.IKernelGuildListener;
+
+import java.util.ArrayList;
+
+public interface IKernelGuildService {
+    void refreshGuildList(boolean isForced); // 只刷新id，详细信息需要额外获取
+
+    //ArrayList<GProQQMsgListGuild> getQQMsgListGuilds(); 啥也拿不到
+
+    void fetchGuildList(ArrayList<GProGuildReqInfo> reqInfos, byte[] cookie, int i2, IGProFetchGuildListCallback iGProFetchGuildListCallback);
+
+    void fetchRetentionGuildList(int i2, int i3, byte[] cookie, long j2, IGProFetchRetentionGuildListCallback iGProFetchRetentionGuildListCallback);
+
+    void fetchUserJoinedGuildList(long guildId, long tinyId, String cookie, IGProFetchUserJoinedGuildListCallback cb);
+
+    void addKernelGuildListener(IKernelGuildListener iKernelGuildListener);
+
+    void GetMemberInfoByOpenId(String str, long j2, boolean z, boolean z2, IGProGetMemberInfoByOpenIdCallback iGProGetMemberInfoByOpenIdCallback);
+
+    ArrayList<GProGuild> getGroupGuildListFromCache();
+
+    ArrayList<GProGuild> getGuildListFromCache();
+
+    void fetchAddGuildInfo(int appId, long guildId, IGProAddGuildInfoCallBack iGProAddGuildInfoCallBack);
+
+    void fetchGuildInfo(long guildId, int seq, IGProFetchGuildInfoCallback iGProFetchGuildInfoCallback);
+
+    //void fetchGuildInfoByAppIdentity(GProGuildIdentity gProGuildIdentity, String str, String str2, IGProFetchGuildInfoByAppIdentityCallback iGProFetchGuildInfoByAppIdentityCallback);
+
+    void fetchGuildInfoForGuest(long guildId, int seq, IGProFetchGuildInfoCallback cb);
+
+    //void fetchGuestGuildInfoWithChannelList(String guildId, String str2, int i2, int seq, String str3,
+    //                                        IGProFetchGuestGuildInfoWithChannelListCallback iGProFetchGuestGuildInfoWithChannelListCallback);
+
+    GProGuild getGuildInfoFromCache(long guildId);
+
+    // 第一次请求: startIndex = 0 , roleIdIndex = 2
+    void fetchMemberListWithRole(long guildId, long channelId, long startIndex, long roleIndex, int count, int seq, IGProFetchMemberListWithRoleCallback cb);
+
+    void refreshGuildInfo(long guildId, boolean force, int seq);
+
+    void refreshGuildInfoOnly(long j2, boolean z, int i2);
+
+    void refreshGuildUserProfileInfo(long guildId, long tinyId, int seq);
+
+    void fetchUserInfo(long guildId, long channelId, ArrayList<Long> tinyIdList, int seq, IGProGetUserInfoCallback cb);
+
+    //@Deprecated(since = "QQ新版本不支持创建话题子频道")
+    //void fetchTopFeeds(long guildId, long channelId, IGProFetchTopFeedsCallback cb);
+
+    void fetchChannelInvisibleRoleList(long guildId, long channelId, IGProFetchChannelInvisibleRoleListCallback cb);
+
+    void fetchChannelLiveableRoleList(long guildId, long channelId, IGProFetchChannelLiveableRoleListCallback cb);
+
+    void fetchMemberRoles(long guildId, long channelId, long tinyId, int seq, IGProFetchMemberRolesCallback cb);
+
+    void fetchRoleListWithPermission(long guildId, int seq, IGProFetchRoleListPermissionCallback cb);
+
+    void fetchRoleWithPermission(long guildId, long roleId, int seq, IGProFetchRolePermissionCallback cb);
+
+    GProSimpleProfile getSimpleProfile(long guildId, long tinyId, int seq);
+
+    GProFaceAuthInfo getFaceAuthInfo();
+
+    String getGuildUserAvatarUrl(long guildId, long tinyId, int seq);
+
+    String getGuildUserNickname(long guildId);
+
+    void deleteRole(long guild, long role, IGProResultCallback cb);
+
+    void setMemberRoles(long guild, long u1, long u2, long tinyId, ArrayList<Long> addRoles, ArrayList<Long> removeRoles, IGProResultCallback cb);
+
+    void setRoleInfo(long guild, long role, GProRoleCreateInfo info, IGProResultCallback cb);
+
+    void createRole(long guildId, GProRoleCreateInfo info, ArrayList<Long> initialUsers, IGProCreateRoleCallback cb);
+}

qqinterface/src/main/java/com/tencent/qqnt/kernelgpro/nativeinterface/IQQGProWrapperSession.java

@@ -0,0 +1,9 @@
+package com.tencent.qqnt.kernelgpro.nativeinterface;
+
+public interface IQQGProWrapperSession {
+    IKernelGuildService getGuildService();
+
+    static class CppProxy {
+        public static native IQQGProWrapperSession getGProWrapperSession(String str);
+    }
+}

qqinterface/src/main/java/com/tencent/qqnt/ntstartup/nativeinterface/IQQNTStartupSessionWrapper.java

@@ -0,0 +1,11 @@
+package com.tencent.qqnt.ntstartup.nativeinterface;
+
+import java.util.HashMap;
+
+public interface IQQNTStartupSessionWrapper {
+    HashMap<String, String> getSessionIdList();
+
+    int start();
+
+    int stop();
+}

qqinterface/src/main/java/com/tencent/qqnt/trooplist/ITroopListRepoApi.java

@@ -0,0 +1,45 @@
+package com.tencent.qqnt.trooplist;
+
+import androidx.lifecycle.LifecycleOwner;
+
+import com.tencent.mobileqq.data.troop.TroopInfo;
+import com.tencent.mobileqq.qroute.QRouteApi;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+
+public interface ITroopListRepoApi extends QRouteApi {
+    void fetchTroopLevelInfo(@NotNull String str, boolean z);
+
+    void fetchTroopList(boolean z);
+
+    //@NotNull
+    //a<Boolean> getFetchTroopListResultLiveData();
+
+    @NotNull
+    List<TroopInfo> getSortedValidTopTroopInfoFromCache();
+
+    @NotNull
+    List<TroopInfo> getSortedValidTroopInfoFromCache();
+
+    @NotNull
+    List<TroopInfo> getTopTroopListFromCache();
+
+    @Nullable
+    TroopInfo getTroopInfoFromCache(@NotNull String str);
+
+    @NotNull
+    List<TroopInfo> getTroopListFromCache();
+
+    //@Nullable
+    //a<List<TroopInfo>> getTroopListLiveData();
+
+    void preloadTroopList();
+
+    void requestSetTroopTop(@NotNull LifecycleOwner lifecycleOwner, @NotNull String str, boolean z, @NotNull Function1<? super Boolean, Unit> function1);
+}

qqinterface/src/main/java/com/tencent/qqnt/troopmemberlist/ITroopMemberListRepoApi.java

@@ -0,0 +1,75 @@
+package com.tencent.qqnt.troopmemberlist;
+
+import androidx.lifecycle.LifecycleOwner;
+
+import com.tencent.mobileqq.data.troop.TroopMemberInfo;
+import com.tencent.mobileqq.data.troop.TroopMemberNickInfo;
+import com.tencent.mobileqq.qroute.QRouteApi;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+
+import kotlin.Deprecated;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+
+public interface ITroopMemberListRepoApi extends QRouteApi {
+    //void fetchGagTroopMemberInfo(@Nullable String str, @Nullable LifecycleOwner lifecycleOwner, boolean z, @NotNull String str2, @Nullable f fVar);
+
+    //void fetchTroopMemberInfo(@Nullable String str, @Nullable String str2, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    //void fetchTroopMemberInfoWithExtInfo(@Nullable String str, @Nullable String str2, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    //void fetchTroopMemberList(@Nullable String str, @Nullable LifecycleOwner lifecycleOwner, boolean z, @NotNull String str2, @Nullable f fVar);
+
+    //void fetchTroopMemberListWithExtInfo(@Nullable String str, @Nullable LifecycleOwner lifecycleOwner, boolean z, @NotNull String str2, @Nullable f fVar);
+
+
+
+    void fetchTroopMemberName(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable Function1<? super TroopMemberNickInfo, Unit> cb);
+
+    void fetchTroopMemberName(@Nullable String str, @Nullable String str2, @NotNull String str3, @Nullable Function1<? super TroopMemberNickInfo, Unit> cb);
+
+
+
+    void fetchTroopMemberUid(@Nullable String str, @NotNull Function2<? super Boolean, ? super String, Unit> function2);
+
+    void fetchTroopMemberUid(@NotNull List<String> list, @NotNull Function2<? super Boolean, ? super Map<String, String>, Unit> function2);
+
+    void fetchTroopMemberUin(@Nullable String str, @NotNull Function2<? super Boolean, ? super String, Unit> function2);
+
+    void fetchTroopMemberUin(@NotNull List<String> list, @NotNull Function2<? super Boolean, ? super Map<String, String>, Unit> function2);
+
+    //void fetchTroopMemberUinListInfo(@Nullable String str, @Nullable List<String> list, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str2, @Nullable f fVar);
+
+    //void fetchTroopMemberUinListInfoWithExtInfo(@Nullable String str, @Nullable List<String> list, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str2, @Nullable f fVar);
+
+    //@Nullable
+    //TroopMemberInfo getTroopMemberFromCacheOrFetchAsync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    int getTroopMemberInfoDBVersion();
+
+    @Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    @Nullable
+    TroopMemberInfo getTroopMemberInfoSync(@Nullable String groupId, @Nullable String userId, @Nullable LifecycleOwner lifecycleOwner, @NotNull String from);
+
+    //@Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    //@Nullable
+    //TroopMemberInfo getTroopMemberInfoSync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, long j);
+
+    //@Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    //@Nullable
+    //TroopMemberInfo getTroopMemberWithExtFromCacheOrFetchAsync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3, @Nullable g gVar);
+
+    //@Deprecated(message = "兼容旧逻辑，过渡用，新逻辑不要使用")
+    //@Nullable
+    //TroopMemberInfo getTroopMemberWithExtInfoSync(@Nullable String str, @Nullable String str2, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str3);
+
+    boolean isTroopMemberInfoDBInited(@NotNull String str);
+
+    //void preLoadTroopMemberUinListInfo(@Nullable String str, @Nullable List<String> list, boolean z, @Nullable LifecycleOwner lifecycleOwner, @NotNull String str2, @Nullable f fVar);
+}

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/BaseSvc.kt

@@ -1,203 +0,0 @@
-@file:OptIn(DelicateCoroutinesApi::class)
-
-package moe.fuqiuluo.qqinterface.servlet
-
-import android.os.Bundle
-import com.tencent.mobileqq.app.QQAppInterface
-import com.tencent.mobileqq.msf.core.MsfCore
-import com.tencent.mobileqq.msf.service.MsfService
-import com.tencent.mobileqq.pb.ByteStringMicro
-import com.tencent.qphone.base.remote.ToServiceMsg
-import com.tencent.qqnt.kernel.api.IKernelService
-import io.ktor.utils.io.core.BytePacketBuilder
-import io.ktor.utils.io.core.readBytes
-import io.ktor.utils.io.core.writeFully
-import io.ktor.utils.io.core.writeInt
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withTimeoutOrNull
-import kotlinx.serialization.encodeToByteArray
-
-import moe.fuqiuluo.shamrock.tools.slice
-import moe.fuqiuluo.shamrock.utils.DeflateTools
-import moe.fuqiuluo.shamrock.utils.PlatformUtils
-import moe.fuqiuluo.shamrock.xposed.helper.AppRuntimeFetcher
-import moe.fuqiuluo.shamrock.xposed.helper.internal.DynamicReceiver
-import moe.fuqiuluo.shamrock.xposed.helper.internal.IPCRequest
-import protobuf.oidb.TrpcOidb
-import mqq.app.MobileQQ
-import protobuf.auto.toByteArray
-import tencent.im.oidb.oidb_sso
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.resume
-
-internal abstract class BaseSvc {
-    companion object Default: CoroutineScope {
-        val currentUin: String
-            get() = app.currentAccountUin
-
-        val app: QQAppInterface
-            get() = AppRuntimeFetcher.appRuntime as QQAppInterface
-
-        fun createToServiceMsg(cmd: String): ToServiceMsg {
-            return ToServiceMsg("mobileqq.service", app.currentAccountUin, cmd)
-        }
-
-        suspend fun sendOidbAW(cmd: String, cmdId: Int, serviceId: Int, data: ByteArray, trpc: Boolean = false, timeout: Long = 5000L): ByteArray? {
-            val seq = MsfService.getCore().nextSeq
-            val buffer = withTimeoutOrNull(timeout) {
-                suspendCancellableCoroutine { continuation ->
-                    launch(Dispatchers.Default) {
-                        DynamicReceiver.register(IPCRequest(cmd, seq) {
-                            val buffer = it.getByteArrayExtra("buffer")!!
-                            continuation.resume(buffer)
-                        })
-                    }
-                    if (trpc) sendTrpcOidb(cmd, cmdId, serviceId, data, seq)
-                    else sendOidb(cmd, cmdId, serviceId, data, seq)
-                }
-            }.also {
-                if (it == null)
-                    DynamicReceiver.unregister(seq)
-            }?.copyOf()
-            try {
-                if (buffer != null && buffer.size >= 5 && buffer[4] == 120.toByte()) {
-                    val builder = BytePacketBuilder()
-                    val deBuffer = DeflateTools.uncompress(buffer.slice(4))
-                    builder.writeInt(deBuffer.size)
-                    builder.writeFully(deBuffer)
-                    return builder.build().readBytes()
-                }
-            } catch (_: Exception) { }
-            return buffer
-        }
-
-        suspend fun sendBufferAW(cmd: String, isPb: Boolean, data: ByteArray, timeout: Long = 5000L): ByteArray? {
-            val seq = MsfService.getCore().nextSeq
-            val buffer = withTimeoutOrNull<ByteArray?>(timeout) {
-                suspendCancellableCoroutine { continuation ->
-                    launch(Dispatchers.Default) {
-                        DynamicReceiver.register(IPCRequest(cmd, seq) {
-                            val buffer = it.getByteArrayExtra("buffer")!!
-                            continuation.resume(buffer)
-                        })
-                        sendBuffer(cmd, isPb, data, seq)
-                    }
-                }
-            }.also {
-                if (it == null)
-                    DynamicReceiver.unregister(seq)
-            }?.copyOf()
-            try {
-                if (buffer != null && buffer.size >= 5 && buffer[4] == 120.toByte()) {
-                    val builder = BytePacketBuilder()
-                    val deBuffer = DeflateTools.uncompress(buffer.slice(4))
-                    builder.writeInt(deBuffer.size)
-                    builder.writeFully(deBuffer)
-                    return builder.build().readBytes()
-                }
-            } catch (_: Exception) { }
-            return buffer
-        }
-
-        fun sendOidb(cmd: String, cmdId: Int, serviceId: Int, buffer: ByteArray, seq: Int = -1, trpc: Boolean = false) {
-            if (trpc) {
-                sendTrpcOidb(cmd, cmdId, serviceId, buffer, seq)
-                return
-            }
-            val to = createToServiceMsg(cmd)
-            val oidb = oidb_sso.OIDBSSOPkg()
-            oidb.uint32_command.set(cmdId)
-            oidb.uint32_service_type.set(serviceId)
-            oidb.bytes_bodybuffer.set(ByteStringMicro.copyFrom(buffer))
-            oidb.str_client_version.set(PlatformUtils.getClientVersion(MobileQQ.getContext()))
-            to.putWupBuffer(oidb.toByteArray())
-            to.addAttribute("req_pb_protocol_flag", true)
-            if (seq != -1) {
-                to.addAttribute("shamrock_seq", seq)
-            }
-            app.sendToService(to)
-        }
-
-        fun sendTrpcOidb(cmd: String, cmdId: Int, serviceId: Int, buffer: ByteArray, seq: Int = -1) {
-            val to = createToServiceMsg(cmd)
-
-            val oidb = TrpcOidb(
-                cmd = cmdId,
-                service = serviceId,
-                buffer = buffer,
-                flag = 1
-            )
-            to.putWupBuffer(oidb.toByteArray())
-
-            to.addAttribute("req_pb_protocol_flag", true)
-            if (seq != -1) {
-                to.addAttribute("shamrock_seq", seq)
-            }
-            app.sendToService(to)
-        }
-
-        fun sendBuffer(cmd: String, isPb: Boolean, buffer: ByteArray, seq: Int = MsfService.getCore().nextSeq) {
-            val toServiceMsg = ToServiceMsg("mobileqq.service", app.currentUin, cmd)
-            toServiceMsg.putWupBuffer(buffer)
-            toServiceMsg.addAttribute("req_pb_protocol_flag", isPb)
-            toServiceMsg.addAttribute("shamrock_seq", seq)
-            app.sendToService(toServiceMsg)
-        }
-
-        @OptIn(ExperimentalCoroutinesApi::class)
-        override val coroutineContext: CoroutineContext by lazy {
-            Dispatchers.IO.limitedParallelism(12)
-        }
-    }
-
-    protected fun send(toServiceMsg: ToServiceMsg) {
-        app.sendToService(toServiceMsg)
-    }
-
-    protected suspend fun sendAW(toServiceMsg: ToServiceMsg, timeout: Long = 5000L): ByteArray? {
-        val seq = MsfService.getCore().nextSeq
-        val buffer = withTimeoutOrNull<ByteArray?>(timeout) {
-            suspendCancellableCoroutine { continuation ->
-                launch(Dispatchers.Default) {
-                    DynamicReceiver.register(IPCRequest(toServiceMsg.serviceCmd, seq) {
-                        val buffer = it.getByteArrayExtra("buffer")!!
-                        continuation.resume(buffer)
-                    })
-                    toServiceMsg.addAttribute("shamrock_seq", seq)
-                    send(toServiceMsg)
-                }
-            }
-        }.also {
-            if (it == null) DynamicReceiver.unregister(seq)
-        }?.copyOf()
-        try {
-            if (buffer != null && buffer.size >= 5 && buffer[4] == 120.toByte()) {
-                val builder = BytePacketBuilder()
-                val deBuffer = DeflateTools.uncompress(buffer.slice(4))
-                builder.writeInt(deBuffer.size)
-                builder.writeFully(deBuffer)
-                return builder.build().readBytes()
-            }
-        } catch (_: Exception) { }
-        return buffer
-    }
-
-    protected fun sendExtra(cmd: String, builder: (Bundle) -> Unit) {
-        val toServiceMsg = createToServiceMsg(cmd)
-        builder(toServiceMsg.extraData)
-        app.sendToService(toServiceMsg)
-    }
-
-    protected fun sendPb(cmd: String, buffer: ByteArray, seq: Int) {
-        val toServiceMsg = createToServiceMsg(cmd)
-        toServiceMsg.putWupBuffer(buffer)
-        toServiceMsg.addAttribute("req_pb_protocol_flag", true)
-        toServiceMsg.addAttribute("shamrock_seq", seq)
-        app.sendToService(toServiceMsg)
-    }
-}

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/CardSvc.kt

@@ -21,12 +21,14 @@ import moe.fuqiuluo.shamrock.tools.json
 import moe.fuqiuluo.shamrock.tools.slice
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
+import moe.fuqiuluo.shamrock.tools.decodeToOidb
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.Packet
 import tencent.im.oidb.cmd0x11b2.oidb_0x11b2
 import tencent.im.oidb.oidb_sso
 import kotlin.coroutines.resume
 
-internal object CardSvc: BaseSvc() {
+internal object CardSvc: QQInterfaces() {
     private val GetModelShowLock by lazy {
         Mutex()
     }
@@ -46,7 +48,8 @@ internal object CardSvc: BaseSvc() {
 
             val resp = sendBufferAW("VipCustom.GetCustomOnlineStatus", false, uniPacket.encode())
                 ?: error("unable to fetch contact model_show")
-            Packet.decodePacket(resp, "rsp",  GetCustomOnlineStatusRsp()).sBuffer
+            val buffer = resp.wupBuffer
+            Packet.decodePacket(buffer, "rsp",  GetCustomOnlineStatusRsp()).sBuffer
         }
     }
 
@@ -79,10 +82,9 @@ internal object CardSvc: BaseSvc() {
         reqBody.uin.set(peerId)
         reqBody.jump_url.set("mqqapi://card/show_pslcard?src_type=internal&source=sharecard&version=1&uin=$peerId")
 
-        val buffer = sendOidbAW("OidbSvcTrpcTcp.0x11ca_0", 4790, 0, reqBody.toByteArray())
+        val fromServiceMsg = sendOidbAW("OidbSvcTrpcTcp.0x11ca_0", 4790, 0, reqBody.toByteArray())
             ?: error("unable to fetch contact ark_json_text")
-        val body = oidb_sso.OIDBSSOPkg()
-        body.mergeFrom(buffer.slice(4))
+        val body = fromServiceMsg.decodeToOidb()
         val rsp = oidb_0x11b2.BusinessCardV3Rsp()
         rsp.mergeFrom(body.bytes_bodybuffer.get().toByteArray())
         return rsp.signed_ark_msg.get()

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/ChatSvc.kt

@@ -1,11 +1,12 @@
 package moe.fuqiuluo.qqinterface.servlet
 
 import kotlinx.serialization.encodeToByteArray
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import protobuf.auto.toByteArray
 
 import protobuf.oidb.cmd0x9082.Oidb0x9082
 
-internal object ChatSvc: BaseSvc() {
+internal object ChatSvc: QQInterfaces() {
     fun setGroupMessageCommentFace(peer: Long, msgSeq: ULong, faceIndex: String, isSet: Boolean) {
         val serviceId = if (isSet) 1 else 2
         sendOidb("OidbSvcTrpcTcp.0x9082_$serviceId", 36994, serviceId, Oidb0x9082(

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FileSvc.kt

@@ -6,9 +6,11 @@ import moe.fuqiuluo.qqinterface.servlet.transfile.RichProtoSvc
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.tools.EMPTY_BYTE_ARRAY
+import moe.fuqiuluo.shamrock.tools.decodeToOidb
 import moe.fuqiuluo.shamrock.tools.slice
 import moe.fuqiuluo.shamrock.tools.toHexString
 import moe.fuqiuluo.shamrock.utils.DeflateTools
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.oidb.cmd0x6d7.CreateFolderReq
 import protobuf.oidb.cmd0x6d7.DeleteFolderReq
@@ -21,8 +23,10 @@ import tencent.im.oidb.cmd0x6d8.oidb_0x6d8
 import tencent.im.oidb.oidb_sso
 import protobuf.group_file_common.FolderInfo as GroupFileCommonFolderInfo
 import protobuf.auto.toByteArray
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
-internal object FileSvc: BaseSvc() {
+internal object FileSvc: QQInterfaces() {
     suspend fun createFileFolder(groupId: Long, folderName: String, parentFolderId: String = "/"): Result<GroupFileCommonFolderInfo> {
         val data = Oidb0x6d7ReqBody(
             createFolder = CreateFolderReq(
@@ -32,10 +36,9 @@ internal object FileSvc: BaseSvc() {
                 folderName = folderName
             )
         ).toByteArray()
-        val resultBuffer = sendOidbAW("OidbSvc.0x6d7_0", 1751, 0, data)
+        val fromServiceMsg = sendOidbAW("OidbSvc.0x6d7_0", 1751, 0, data)
             ?: return Result.failure(Exception("unable to fetch result"))
-        val oidbPkg = oidb_sso.OIDBSSOPkg()
-        oidbPkg.mergeFrom(resultBuffer.slice(4))
+        val oidbPkg = fromServiceMsg.decodeToOidb()
         val rsp = oidbPkg.bytes_bodybuffer.get()
             .toByteArray()
             .decodeProtobuf<Oidb0x6d7RespBody>()
@@ -46,21 +49,20 @@ internal object FileSvc: BaseSvc() {
     }
 
     suspend fun deleteGroupFolder(groupId: Long, folderUid: String): Boolean {
-        val buffer = sendOidbAW("OidbSvc.0x6d7_1", 1751, 1, Oidb0x6d7ReqBody(
+        val fromServiceMsg = sendOidbAW("OidbSvc.0x6d7_1", 1751, 1, Oidb0x6d7ReqBody(
             deleteFolder = DeleteFolderReq(
                 groupCode = groupId.toULong(),
                 appId = 3u,
                 folderId = folderUid
             )
         ).toByteArray()) ?: return false
-        val oidbPkg = oidb_sso.OIDBSSOPkg()
-        oidbPkg.mergeFrom(buffer.slice(4))
+        val oidbPkg = fromServiceMsg.decodeToOidb()
         val rsp = oidbPkg.bytes_bodybuffer.get().toByteArray().decodeProtobuf<Oidb0x6d7RespBody>()
         return rsp.deleteFolder?.retCode == 0
     }
 
     suspend fun moveGroupFolder(groupId: Long, folderUid: String, newParentFolderUid: String): Boolean {
-        val buffer = sendOidbAW("OidbSvc.0x6d7_2", 1751, 2, Oidb0x6d7ReqBody(
+        val fromServiceMsg = sendOidbAW("OidbSvc.0x6d7_2", 1751, 2, Oidb0x6d7ReqBody(
             moveFolder = MoveFolderReq(
                 groupCode = groupId.toULong(),
                 appId = 3u,
@@ -68,14 +70,13 @@ internal object FileSvc: BaseSvc() {
                 parentFolderId = "/"
             )
         ).toByteArray()) ?: return false
-        val oidbPkg = oidb_sso.OIDBSSOPkg()
-        oidbPkg.mergeFrom(buffer.slice(4))
+        val oidbPkg = fromServiceMsg.decodeToOidb()
         val rsp = oidbPkg.bytes_bodybuffer.get().toByteArray().decodeProtobuf<Oidb0x6d7RespBody>()
         return rsp.moveFolder?.retCode == 0
     }
 
     suspend fun renameFolder(groupId: Long, folderUid: String, name: String): Boolean {
-        val buffer = sendOidbAW("OidbSvc.0x6d7_3", 1751, 3, Oidb0x6d7ReqBody(
+        val fromServiceMsg = sendOidbAW("OidbSvc.0x6d7_3", 1751, 3, Oidb0x6d7ReqBody(
             renameFolder = RenameFolderReq(
                 groupCode = groupId.toULong(),
                 appId = 3u,
@@ -83,8 +84,7 @@ internal object FileSvc: BaseSvc() {
                 folderName = name
             )
         ).toByteArray()) ?: return false
-        val oidbPkg = oidb_sso.OIDBSSOPkg()
-        oidbPkg.mergeFrom(buffer.slice(4))
+        val oidbPkg = fromServiceMsg.decodeToOidb()
         val rsp = oidbPkg.bytes_bodybuffer.get().toByteArray().decodeProtobuf<Oidb0x6d7RespBody>()
         return rsp.renameFolder?.retCode == 0
     }
@@ -101,8 +101,7 @@ internal object FileSvc: BaseSvc() {
         }
         val result = sendOidbAW("OidbSvc.0x6d6_3", 1750, 3, oidb0x6d6ReqBody.toByteArray())
             ?: return false
-        val oidbPkg = oidb_sso.OIDBSSOPkg()
-        oidbPkg.mergeFrom(result.slice(4))
+        val oidbPkg = result.decodeToOidb()
         val rsp = oidb_0x6d6.RspBody().apply {
             mergeFrom(oidbPkg.bytes_bodybuffer.get().toByteArray())
         }
@@ -120,8 +119,8 @@ internal object FileSvc: BaseSvc() {
         val fileCnt: Int
         val limitCnt: Int
         if (rspGetFileCntBuffer != null) {
-            oidb_0x6d8.RspBody().mergeFrom(oidb_sso.OIDBSSOPkg()
-                .mergeFrom(rspGetFileCntBuffer.slice(4))
+            oidb_0x6d8.RspBody().mergeFrom(
+                rspGetFileCntBuffer.decodeToOidb()
                 .bytes_bodybuffer.get()
                 .toByteArray()
             ).group_file_cnt_rsp.apply {
@@ -141,8 +140,8 @@ internal object FileSvc: BaseSvc() {
         val totalSpace: Long
         val usedSpace: Long
         if (rspGetFileSpaceBuffer != null) {
-            oidb_0x6d8.RspBody().mergeFrom(oidb_sso.OIDBSSOPkg()
-                .mergeFrom(rspGetFileSpaceBuffer.slice(4))
+            oidb_0x6d8.RspBody().mergeFrom(
+                rspGetFileSpaceBuffer.decodeToOidb()
                 .bytes_bodybuffer.get()
                 .toByteArray()).group_space_rsp.apply {
                 totalSpace = uint64_total_space.get()
@@ -187,15 +186,13 @@ internal object FileSvc: BaseSvc() {
 
                 uint32_show_onlinedoc_folder.set(0)
             })
-        }.toByteArray(), timeout = 15_000L)
+        }.toByteArray(), timeout = 15.seconds)
 
         return kotlin.runCatching {
             val files = arrayListOf<FileInfo>()
             val dirs = arrayListOf<FolderInfo>()
             if (rspGetFileListBuffer != null) {
-                val oidb = oidb_sso.OIDBSSOPkg().mergeFrom(rspGetFileListBuffer.slice(4).let {
-                    if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
-                })
+                val oidb = rspGetFileListBuffer.decodeToOidb()
 
                 oidb_0x6d8.RspBody().mergeFrom(oidb.bytes_bodybuffer.get().toByteArray())
                     .file_list_info_rsp.apply {
@@ -242,7 +239,7 @@ internal object FileSvc: BaseSvc() {
 
             GroupFileList(files, dirs)
         }.onFailure {
-            LogCenter.log(it.message + ", buffer: ${rspGetFileListBuffer.toHexString()}", Level.ERROR)
+            LogCenter.log(it.message + ", buffer: ${rspGetFileListBuffer?.wupBuffer?.toHexString()}", Level.ERROR)
         }
     }
 }

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FriendSvc.kt

@@ -13,13 +13,15 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
+import moe.fuqiuluo.shamrock.tools.decodeToObject
 import moe.fuqiuluo.shamrock.tools.slice
 import moe.fuqiuluo.shamrock.xposed.helper.AppRuntimeFetcher
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.AppRuntime
 import tencent.mobileim.structmsg.structmsg
 import kotlin.coroutines.resume
 
-internal object FriendSvc: BaseSvc() {
+internal object FriendSvc: QQInterfaces() {
 
     suspend fun getFriendList(refresh: Boolean): Result<List<Friends>> {
         val runtime = AppRuntimeFetcher.appRuntime
@@ -91,8 +93,7 @@ internal object FriendSvc: BaseSvc() {
             ArrayList()
         } else {
             try {
-                val msg = structmsg.RspSystemMsgNew()
-                msg.mergeFrom(respBuffer.slice(4))
+                val msg = respBuffer.decodeToObject(structmsg.RspSystemMsgNew())
                 return msg.friendmsgs.get()
             } catch (err: Throwable) {
                 requestFriendSystemMsgNew(msgNum, latestFriendSeq, latestGroupSeq, retryCnt - 1)

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GProSvc.kt

@@ -3,10 +3,11 @@
 package moe.fuqiuluo.qqinterface.servlet
 
 import com.tencent.mobileqq.qqguildsdk.api.IGPSService
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole
-import com.tencent.qqnt.kernel.nativeinterface.GProRoleCreateInfo
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProRoleCreateInfo
 import com.tencent.qqnt.kernel.nativeinterface.GProRoleMemberList
 import com.tencent.qqnt.kernel.nativeinterface.GProRolePermission
+import com.tencent.qqnt.kernelgpro.nativeinterface.IQQGProWrapperSession
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -19,9 +20,11 @@ import moe.fuqiuluo.qqinterface.servlet.structures.SlowModeInfo
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.tools.EMPTY_BYTE_ARRAY
-import moe.fuqiuluo.shamrock.tools.slice
+import moe.fuqiuluo.shamrock.tools.decodeToObject
+import moe.fuqiuluo.shamrock.tools.decodeToOidb
 import moe.fuqiuluo.shamrock.utils.PlatformUtils
 import moe.fuqiuluo.shamrock.xposed.helper.NTServiceFetcher
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.auto.toByteArray
 import protobuf.guild.GetGuildFeedsReq
@@ -41,15 +44,18 @@ import protobuf.qweb.DEFAULT_DEVICE_INFO
 import protobuf.qweb.QWebExtInfo
 import protobuf.qweb.QWebReq
 import protobuf.qweb.QWebRsp
-import tencent.im.oidb.oidb_sso
 import kotlin.coroutines.resume
 
-internal object GProSvc: BaseSvc() {
+internal object GProSvc: QQInterfaces() {
     fun getSelfTinyId(): ULong {
         val service = app.getRuntimeService(IGPSService::class.java, "all")
         return service.selfTinyId.toULong()
     }
 
+    private fun getNTGProSessionId(): String? {
+        return NTServiceFetcher.startupSessionWrapper.sessionIdList["gpro"]
+    }
+
     suspend fun getGuildInfo(guildId: ULong): Result<Oidb0xf57MetaInfo> {
         val respBuffer = sendOidbAW("OidbSvcTrpcTcp.0xf57_9", 0xf57, 9, Oidb0xf57Req(
             filter = Oidb0xf57Filter(
@@ -57,12 +63,8 @@ internal object GProSvc: BaseSvc() {
                 u2 = Oidb0xf57U2(1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u)
             ),
             guildInfo = Oidb0xf57GuildInfo(guildId = guildId)
-        ).toByteArray())
-        val body = oidb_sso.OIDBSSOPkg()
-        if (respBuffer == null) {
-            return Result.failure(Exception("unable to send packet"))
-        }
-        body.mergeFrom(respBuffer.slice(4))
+        ).toByteArray()) ?: return Result.failure(Exception("unable to send packet"))
+        val body = respBuffer.decodeToOidb()
         return runCatching {
             body.bytes_bodybuffer.get()
                 .toByteArray()
@@ -71,7 +73,7 @@ internal object GProSvc: BaseSvc() {
     }
 
     suspend fun getGuildFeeds(guildId: ULong, channelId: ULong, startIndex: Int): Result<GetGuildFeedsRsp> {
-        val buffer = sendBufferAW("QChannelSvr.trpc.qchannel.commreader.ComReader.GetGuildFeeds", true, QWebReq(
+        val fromServiceMsg = sendBufferAW("QChannelSvr.trpc.qchannel.commreader.ComReader.GetGuildFeeds", true, QWebReq(
             seq = 10,
             qua = PlatformUtils.getQUA(),
             deviceInfo = DEFAULT_DEVICE_INFO,
@@ -92,7 +94,7 @@ internal object GProSvc: BaseSvc() {
                 QWebExtInfo("tiny_id", getSelfTinyId().toString()),
             )
         ).toByteArray()) ?: return Result.failure(Exception("unable to send packet"))
-        val webRsp = buffer.slice(4).decodeProtobuf<QWebRsp>()
+        val webRsp = fromServiceMsg.decodeToObject<QWebRsp>()
         if(webRsp.buffer == null) return Result.failure(Exception("server error"))
         val wupBuffer = webRsp.buffer!!
         val feeds = wupBuffer.decodeProtobuf<GetGuildFeedsRsp>()
@@ -133,7 +135,9 @@ internal object GProSvc: BaseSvc() {
     }
 
     fun refreshGuildInfo(guildId: ULong) {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
         kernelGProService.refreshGuildInfo(guildId.toLong(), true, 1)
     }
 
@@ -145,8 +149,8 @@ internal object GProSvc: BaseSvc() {
         fetchAll: Boolean = false,
         result: ArrayList<GProRoleMemberList> = arrayListOf()
     ): Result<Pair<GetGuildMemberListNextToken, ArrayList<GProRoleMemberList>>> {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
-
+        val kernelGProService =
+            IQQGProWrapperSession.CppProxy.getGProWrapperSession(getNTGProSessionId()).guildService
         val fetchGuildMemberListResult: Pair<GetGuildMemberListNextToken, ArrayList<GProRoleMemberList>> = (withTimeoutOrNull(5000) {
             suspendCancellableCoroutine {
                 kernelGProService.fetchMemberListWithRole(guildId.toLong(), 0, startIndex, roleIndex, count, 0) { code, reason, finish, nextIndex, nextRoleIdIndex, _, seq, roleList ->
@@ -188,12 +192,8 @@ internal object GProSvc: BaseSvc() {
             memberId = 0uL,
             tinyId = memberTinyId,
             guildId = guildId
-        ).toByteArray())
-        val body = oidb_sso.OIDBSSOPkg()
-        if (respBuffer == null) {
-            return Result.failure(Exception("unable to send packet"))
-        }
-        body.mergeFrom(respBuffer.slice(4))
+        ).toByteArray()) ?: return Result.failure(Exception("unable to send packet"))
+        val body = respBuffer.decodeToOidb()
         return runCatching {
             body.bytes_bodybuffer.get().toByteArray().decodeProtobuf<Oidb0xf88Rsp>().userInfo!!
         }
@@ -219,7 +219,8 @@ internal object GProSvc: BaseSvc() {
     }
 
     private fun getGuildListByNt(result: ArrayList<GuildInfo>) {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService =
+            IQQGProWrapperSession.CppProxy.getGProWrapperSession(getNTGProSessionId()).guildService
         kernelGProService.guildListFromCache.forEach {
             if (it.result != 0) return@forEach
             val guildInfo = it.guildInfo
@@ -241,7 +242,9 @@ internal object GProSvc: BaseSvc() {
     }
 
     suspend fun fetchGuildMemberRoles(guildId: ULong, tinyId: ULong, refresh: Boolean = false): Result<ArrayList<GProGuildRole>> {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
         if (refresh) {
             kernelGProService.refreshGuildUserProfileInfo(guildId.toLong(), tinyId.toLong(), 1)
         }
@@ -256,7 +259,9 @@ internal object GProSvc: BaseSvc() {
     }
 
     fun getGuildList(refresh: Boolean = false, forceOldApi: Boolean): ArrayList<GuildInfo> {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
         if (refresh) {
             kernelGProService.refreshGuildList(true)
             kernelGProService.guildListFromCache.forEach {
@@ -279,7 +284,10 @@ internal object GProSvc: BaseSvc() {
     }
 
     suspend fun getGuildRoles(guildId: ULong): Result<List<GProGuildRole>> {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
+
         val roles: List<GProGuildRole> = withTimeoutOrNull(5000) {
             suspendCancellableCoroutine {
                 kernelGProService.fetchRoleListWithPermission(guildId.toLong(), 1) { code, _, roles, _, _, _ ->
@@ -291,7 +299,10 @@ internal object GProSvc: BaseSvc() {
     }
 
     fun deleteGuildRole(guildId: ULong, roleId: ULong) {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
+
         kernelGProService.deleteRole(guildId.toLong(), roleId.toLong()) { code, msg, result ->
             if (code != 0) {
                 LogCenter.log("deleteGuildRole failed: $code($msg) => $result", Level.WARN)
@@ -300,7 +311,10 @@ internal object GProSvc: BaseSvc() {
     }
 
     fun setMemberRole(guildId: ULong, tinyId: ULong, roleId: ULong, isSet: Boolean) {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
+
         val addList = arrayListOf<Long>()
         val rmList = arrayListOf<Long>()
         (if (isSet) addList else rmList).add(roleId.toLong())
@@ -312,7 +326,10 @@ internal object GProSvc: BaseSvc() {
     }
 
     suspend fun getGuildRolePermission(guildId: ULong, roleId: ULong): Result<GProGuildRole> {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
+
         val role: GProGuildRole = withTimeoutOrNull(5000) {
             suspendCancellableCoroutine {
                 kernelGProService.fetchRoleWithPermission(guildId.toLong(), roleId.toLong(), 1) { code, msg, role, _, _, _ ->
@@ -330,8 +347,12 @@ internal object GProSvc: BaseSvc() {
         val oldInfo = getGuildRolePermission(guildId, roleId).onFailure {
             return Result.failure(it)
         }.getOrThrow()
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
-        val info = GProRoleCreateInfo(
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
+
+        val info =
+            GProRoleCreateInfo(
                 name, color, oldInfo.bHoist, oldInfo.rolePermissions
             )
         kernelGProService.setRoleInfo(guildId.toLong(), roleId.toLong(), info) { code, msg, result ->
@@ -343,9 +364,18 @@ internal object GProSvc: BaseSvc() {
     }
 
     suspend fun createGuildRole(guildId: ULong, name: String, color: Long, initialUsers: ArrayList<Long>): Result<GProGuildRole> {
-        val kernelGProService = NTServiceFetcher.kernelService.wrapperSession.guildService
+        val kernelGProService = IQQGProWrapperSession.CppProxy.getGProWrapperSession(
+            getNTGProSessionId()
+        ).guildService
+
         val permission = GProRolePermission(false, arrayListOf())
-        val info = GProRoleCreateInfo(name, color, false, permission)
+        val info =
+            GProRoleCreateInfo(
+                name,
+                color,
+                false,
+                permission
+            )
         val role: GProGuildRole = withTimeoutOrNull(5000) {
             suspendCancellableCoroutine {
                 kernelGProService.createRole(guildId.toLong(), info, initialUsers) { code, msg, result, role ->

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt

@@ -10,13 +10,17 @@ import com.tencent.mobileqq.app.BusinessHandlerFactory
 import com.tencent.mobileqq.app.QQAppInterface
 import com.tencent.mobileqq.data.troop.TroopInfo
 import com.tencent.mobileqq.data.troop.TroopMemberInfo
+import com.tencent.mobileqq.data.troop.TroopMemberNickInfo
 import com.tencent.mobileqq.pb.ByteStringMicro
+import com.tencent.mobileqq.qroute.QRoute
 import com.tencent.mobileqq.troop.api.ITroopInfoService
 import com.tencent.mobileqq.troop.api.ITroopMemberInfoService
 import com.tencent.protofile.join_group_link.join_group_link
 import com.tencent.qphone.base.remote.ToServiceMsg
 import com.tencent.qqnt.kernel.nativeinterface.MemberInfo
 import com.tencent.qqnt.kernel.nativeinterface.MsgConstant
+import com.tencent.qqnt.trooplist.ITroopListRepoApi
+import com.tencent.qqnt.troopmemberlist.ITroopMemberListRepoApi
 import friendlist.stUinInfo
 import io.ktor.client.call.body
 import io.ktor.client.request.forms.MultiPartFormDataContent
@@ -66,13 +70,18 @@ import moe.fuqiuluo.shamrock.tools.asJsonObject
 import moe.fuqiuluo.shamrock.tools.asLong
 import moe.fuqiuluo.shamrock.tools.asString
 import moe.fuqiuluo.shamrock.tools.asStringOrNull
+import moe.fuqiuluo.shamrock.tools.decodeToObject
+import moe.fuqiuluo.shamrock.tools.decodeToOidb
 import moe.fuqiuluo.shamrock.tools.ifNullOrEmpty
 import moe.fuqiuluo.shamrock.tools.putBuf32Long
-import moe.fuqiuluo.shamrock.tools.slice
 import moe.fuqiuluo.shamrock.utils.FileUtils
 import moe.fuqiuluo.shamrock.utils.PlatformUtils
+import moe.fuqiuluo.shamrock.utils.PlatformUtils.QQ_9_0_71_VER
+import moe.fuqiuluo.shamrock.utils.PlatformUtils.QQ_9_0_80_VER
+import moe.fuqiuluo.shamrock.utils.PlatformUtils.QQ_9_0_8_VER
 import moe.fuqiuluo.shamrock.xposed.helper.AppRuntimeFetcher
 import moe.fuqiuluo.shamrock.xposed.helper.NTServiceFetcher
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.MobileQQ
 import protobuf.auto.toByteArray
 import protobuf.oidb.cmd0xf16.Oidb0xf16
@@ -94,8 +103,9 @@ import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 import java.nio.ByteBuffer
 import kotlin.coroutines.resume
+import kotlin.time.Duration.Companion.seconds
 
-internal object GroupSvc: BaseSvc() {
+internal object GroupSvc: QQInterfaces() {
     private const val GET_MEMBER_ROLE_BY_NT = false
 
     private val RefreshTroopMemberInfoLock by lazy {
@@ -112,15 +122,14 @@ internal object GroupSvc: BaseSvc() {
     private lateinit var METHOD_REQ_MODIFY_GROUP_NAME: Method
 
     suspend fun getGroupRemainAtAllRemain (groupId: Long): Result<GroupAtAllRemainInfo> {
-        val buffer = sendOidbAW("OidbSvcTrpcTcp.0x8a7_0", 2215, 0, cmd0x8a7.ReqBody().apply {
+        val fromServiceMsg = sendOidbAW("OidbSvcTrpcTcp.0x8a7_0", 2215, 0, cmd0x8a7.ReqBody().apply {
             uint32_sub_cmd.set(1)
             uint32_limit_interval_type_for_uin.set(2)
             uint32_limit_interval_type_for_group.set(1)
             uint64_uin.set(getLongUin())
             uint64_group_code.set(groupId)
         }.toByteArray(), trpc = true) ?: return Result.failure(RuntimeException("[oidb] timeout"))
-        val body = oidb_sso.OIDBSSOPkg()
-        body.mergeFrom(buffer.slice(4))
+        val body = fromServiceMsg.decodeToOidb()
         if(body.uint32_result.get() != 0) {
             return Result.failure(RuntimeException(body.str_error_msg.get()))
         }
@@ -133,7 +142,7 @@ internal object GroupSvc: BaseSvc() {
         ))
     }
     suspend fun getProhibitedMemberList(groupId: Long): Result<List<ProhibitedMemberInfo>> {
-        val buffer = sendOidbAW("OidbSvc.0x899_0", 2201, 0, oidb_0x899.ReqBody().apply {
+        val fromServiceMsg = sendOidbAW("OidbSvc.0x899_0", 2201, 0, oidb_0x899.ReqBody().apply {
             uint64_group_code.set(groupId)
             uint64_start_uin.set(0)
             uint32_identify_flag.set(6)
@@ -142,8 +151,7 @@ internal object GroupSvc: BaseSvc() {
                 uint32_shutup_timestap.set(0)
             })
         }.toByteArray()) ?: return Result.failure(RuntimeException("[oidb] timeout"))
-        val body = oidb_sso.OIDBSSOPkg()
-        body.mergeFrom(buffer.slice(4))
+        val body = fromServiceMsg.decodeToOidb()
         if(body.uint32_result.get() != 0) {
             return Result.failure(RuntimeException(body.str_error_msg.get()))
         }
@@ -222,6 +230,7 @@ internal object GroupSvc: BaseSvc() {
     }
 
     suspend fun getGroupList(refresh: Boolean): Result<List<TroopInfo>> {
+        if (PlatformUtils.getQQVersionCode() <= QQ_9_0_80_VER) {
             val service = app.getRuntimeService(ITroopInfoService::class.java, "all")
 
             var troopList = service.allTroopList
@@ -233,6 +242,15 @@ internal object GroupSvc: BaseSvc() {
                 }
             }
             return Result.success(troopList)
+        } else {
+            val service = QRoute.api(ITroopListRepoApi::class.java)
+            val troopList = service.troopListFromCache
+            if (troopList == null || troopList.isEmpty() || refresh) {
+                service.fetchTroopList(true)
+                return Result.success(service.troopListFromCache)
+            }
+            return Result.success(troopList)
+        }
     }
 
     suspend fun getNotJoinedGroupInfo(groupId: Long): Result<NotJoinedGroupInfo> {
@@ -241,10 +259,10 @@ internal object GroupSvc: BaseSvc() {
             toServiceMsg.extraData.putLong("troop_code", groupId)
             toServiceMsg.extraData.putBoolean("is_admin", false)
             toServiceMsg.extraData.putInt("from", 0)
-            val buffer = sendAW(toServiceMsg)
+            val fromServiceMsg = sendToServiceMsgAW(toServiceMsg) ?: return@timeout Result.failure(Exception("获取群信息超时"))
             val uniPacket = UniPacket(true)
             uniPacket.encodeName = "utf-8"
-            uniPacket.decode(buffer)
+            uniPacket.decode(fromServiceMsg.wupBuffer)
             val respBatchProcess = uniPacket.getByClass("RespBatchProcess", RespBatchProcess())
             val batchRespInfo = oidb_0x88d.RspBody().mergeFrom(oidb_sso.OIDBSSOPkg()
                 .mergeFrom(respBatchProcess.batch_response_list.first().buffer)
@@ -280,14 +298,24 @@ internal object GroupSvc: BaseSvc() {
     }
 
     suspend fun setGroupUniqueTitle(groupId: Long, userId: Long, title: String) {
-        val localMemberInfo = getTroopMemberInfoByUin(groupId, userId, true).getOrThrow()
+        var nick = getTroopMemberInfoByUinV2(groupId, userId, true).getOrThrow().let {
+            it.troopnick.ifEmpty { it.troopremark.ifNullOrEmpty("") }
+        }
+        if (PlatformUtils.getQQVersionCode() > QQ_9_0_71_VER && nick == null) {
+            nick = getTroopMemberNickByUin(groupId, userId)?.let {
+                it.troopNick
+                    .ifNullOrEmpty(it.friendNick)
+                    .ifNullOrEmpty(it.showName)
+                    .ifNullOrEmpty(it.autoRemark)
+                    .ifNullOrEmpty(it.colorNick)
+            }
+        }
+
         val req = Oidb_0x8fc.ReqBody()
         req.uint64_group_code.set(groupId)
         val memberInfo = Oidb_0x8fc.MemberInfo()
         memberInfo.uint64_uin.set(userId)
-        memberInfo.bytes_uin_name.set(ByteStringMicro.copyFromUtf8(localMemberInfo.troopnick.ifEmpty {
-            localMemberInfo.troopremark.ifNullOrEmpty("")
-        }))
+        memberInfo.bytes_uin_name.set(ByteStringMicro.copyFromUtf8(nick))
         memberInfo.bytes_special_title.set(ByteStringMicro.copyFromUtf8(title))
         memberInfo.uint32_special_title_expire_time.set(-1)
         req.rpt_mem_level_info.add(memberInfo)
@@ -308,7 +336,7 @@ internal object GroupSvc: BaseSvc() {
         info.dwFlag = 1
         createToServiceMsg.extraData.putSerializable("vecUinInfo", arrayListOf(info))
         createToServiceMsg.extraData.putLong("dwNewSeq", 0L)
-        send(createToServiceMsg)
+        sendToServiceMsg(createToServiceMsg)
         return true
     }
 
@@ -324,13 +352,12 @@ internal object GroupSvc: BaseSvc() {
     }
 
     suspend fun setEssenceMessage(groupId: Long, seq: Long, rand: Long): Pair<Boolean, String> {
-        val buffer = sendOidbAW("OidbSvc.0xeac_1", 3756, 1, oidb_0xeac.ReqBody().apply {
+        val fromServiceMsg = sendOidbAW("OidbSvc.0xeac_1", 3756, 1, oidb_0xeac.ReqBody().apply {
             group_code.set(groupId)
             msg_seq.set(seq.toInt())
             msg_random.set(rand.toInt())
         }.toByteArray()) ?: return Pair(false, "unknown error")
-        val body = oidb_sso.OIDBSSOPkg()
-        body.mergeFrom(buffer.slice(4))
+        val body = fromServiceMsg.decodeToOidb()
         val result = oidb_0xeac.RspBody().mergeFrom(body.bytes_bodybuffer.get().toByteArray())
         return if (result.wording.has()) {
             LogCenter.log("设置群精华失败: ${result.wording.get()}")
@@ -342,16 +369,12 @@ internal object GroupSvc: BaseSvc() {
     }
 
     suspend fun deleteEssenceMessage(groupId: Long, seq: Long, rand: Long): Pair<Boolean, String> {
-        val buffer = sendOidbAW("OidbSvc.0xeac_2", 3756, 2, oidb_0xeac.ReqBody().apply {
+        val fromServiceMsg = sendOidbAW("OidbSvc.0xeac_2", 3756, 2, oidb_0xeac.ReqBody().apply {
             group_code.set(groupId)
             msg_seq.set(seq.toInt())
             msg_random.set(rand.toInt())
-        }.toByteArray())
-        val body = oidb_sso.OIDBSSOPkg()
-        if (buffer == null) {
-            return Pair(false, "unknown error")
-        }
-        body.mergeFrom(buffer.slice(4))
+        }.toByteArray()) ?: return Pair(false, "unknown error")
+        val body = fromServiceMsg.decodeToOidb()
         val result = oidb_0xeac.RspBody().mergeFrom(body.bytes_bodybuffer.get().toByteArray())
         return if (result.wording.has()) {
             LogCenter.log("移除群精华失败: ${result.wording.get()}")
@@ -465,12 +488,21 @@ internal object GroupSvc: BaseSvc() {
         return groupInfo.troopowneruin == app.account
     }
 
-    fun isAdmin(groupId: Long): Boolean {
+    suspend fun isAdmin(groupId: Long): Boolean {
+        if (PlatformUtils.getQQVersionCode() > QQ_9_0_71_VER) {
+            // 针对新版本api做的适配
+            val account = app.longAccountUin
+            getTroopMemberInfoByUinV2(groupId, account, false).onSuccess {
+                if (it.role == com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole.ADMIN
+                    || it.role == com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole.OWNER) {
+                    return true
+                }
+            }
+        }
+
         val service = app
             .getRuntimeService(ITroopInfoService::class.java, "all")
-
         val groupInfo = service.getTroopInfo(groupId.toString())
-
         return groupInfo.isAdmin || groupInfo.troopowneruin == app.account
     }
 
@@ -565,65 +597,38 @@ internal object GroupSvc: BaseSvc() {
         reqBody.get_ark.set(true)
         reqBody.type.set(1)
         reqBody.group_code.set(groupId)
-        val buffer = sendBufferAW("GroupSvc.JoinGroupLink", true, reqBody.toByteArray())
+        val fromServiceMsg = sendBufferAW("GroupSvc.JoinGroupLink", true, reqBody.toByteArray())
             ?: error("unable to fetch contact ark_json_text")
-        val body = join_group_link.RspBody()
-        body.mergeFrom(buffer.slice(4))
+        val body = fromServiceMsg.decodeToObject(join_group_link.RspBody())
         return body.signed_ark.get().toStringUtf8()
     }
 
-    suspend fun getTroopMemberInfoByUin(
+    fun getTroopMemberInfoByUinFromNt(
         groupId: Long,
-        uin: Long,
-        refresh: Boolean = false
+        uin: Long
     ): Result<TroopMemberInfo> {
-        val service = app.getRuntimeService(ITroopMemberInfoService::class.java, "all")
-        var info = service.getTroopMember(groupId.toString(), uin.toString())
-        if (refresh || !service.isMemberInCache(groupId.toString(), uin.toString()) || info == null || info.troopnick == null) {
-            info = requestTroopMemberInfo(service, groupId, uin).getOrNull()
+        return kotlin.runCatching {
+            val api = QRoute.api(ITroopMemberListRepoApi::class.java)
+            api.getTroopMemberInfoSync(groupId.toString(), uin.toString(), null, groupId.toString())
+                ?: throw Exception("获取群成员信息失败: NT兼容接口已废弃")
         }
-        if (info == null) {
-            info = getTroopMemberInfoByUinViaNt(groupId, uin).getOrNull()?.let {
-                TroopMemberInfo().apply {
-                    troopnick = it.cardName
-                    friendnick = it.nick
+    }
+
+    suspend fun getTroopMemberNickByUin(
+        groupId: Long,
+        uin: Long
+    ): TroopMemberNickInfo? {
+        if (PlatformUtils.getQQVersionCode() > QQ_9_0_71_VER) {
+            val api = QRoute.api(ITroopMemberListRepoApi::class.java)
+            return withTimeoutOrNull(5.seconds) {
+                suspendCancellableCoroutine<TroopMemberNickInfo> { continuation ->
+                    api.fetchTroopMemberName(groupId.toString(), uin.toString(), null, groupId.toString()) {
+                        continuation.resume(it)
                     }
                 }
             }
-        try {
-            if (info != null && (info.alias == null || info.alias.isBlank())) {
-                val req = group_member_info.ReqBody()
-                req.uint64_group_code.set(groupId)
-                req.uint64_uin.set(uin.toLong())
-                req.bool_new_client.set(true)
-                req.uint32_client_type.set(1)
-                req.uint32_rich_card_name_ver.set(1)
-                val respBuffer = sendBufferAW("group_member_card.get_group_member_card_info", true, req.toByteArray())
-                if (respBuffer != null) {
-                    val rsp = group_member_info.RspBody()
-                    rsp.mergeFrom(respBuffer.slice(4))
-                    if (rsp.msg_meminfo.str_location.has()) {
-                        info.alias = rsp.msg_meminfo.str_location.get().toStringUtf8()
-                    }
-                    if (rsp.msg_meminfo.uint32_age.has()) {
-                        info.age = rsp.msg_meminfo.uint32_age.get().toByte()
-                    }
-                    if (rsp.msg_meminfo.bytes_group_honor.has()) {
-                        val honorBytes = rsp.msg_meminfo.bytes_group_honor.get().toByteArray()
-                        val honor = troop_honor.GroupUserCardHonor()
-                        honor.mergeFrom(honorBytes)
-                        info.level = honor.level.get()
-                        // 10315: medal_id not real group level
-                    }
-                }
-            }
-        } catch (err: Throwable) {
-            LogCenter.log(err.stackTraceToString(), Level.WARN)
-        }
-        return if (info != null) {
-            Result.success(info)
         } else {
-            Result.failure(Exception("获取群成员信息失败"))
+            return null
         }
     }
 
@@ -632,11 +637,16 @@ internal object GroupSvc: BaseSvc() {
         uin: Long,
         refresh: Boolean = false
     ): Result<TroopMemberInfo> {
+        var info: TroopMemberInfo? = null
+        if (PlatformUtils.getQQVersionCode() <= QQ_9_0_71_VER) {
             val service = app.getRuntimeService(ITroopMemberInfoService::class.java, "all")
-        var info = service.getTroopMember(groupId.toString(), uin.toString())
+            info = service.getTroopMember(groupId.toString(), uin.toString())
             if (refresh || !service.isMemberInCache(groupId.toString(), uin.toString()) || info == null || info.troopnick == null) {
                 info = requestTroopMemberInfo(service, groupId, uin, timeout = 2000).getOrNull()
             }
+        } else {
+            info = getTroopMemberInfoByUinFromNt(groupId, uin).getOrNull()
+        }
         if (info == null) {
             info = getTroopMemberInfoByUinViaNt(groupId, uin, timeout = 2000L).getOrNull()?.let {
                 TroopMemberInfo().apply {
@@ -645,6 +655,7 @@ internal object GroupSvc: BaseSvc() {
                 }
             }
         }
+        if (PlatformUtils.getQQVersionCode() <= QQ_9_0_8_VER) {
             try {
                 if (info != null && (info.alias == null || info.alias.isBlank())) {
                     val req = group_member_info.ReqBody()
@@ -653,10 +664,9 @@ internal object GroupSvc: BaseSvc() {
                     req.bool_new_client.set(true)
                     req.uint32_client_type.set(1)
                     req.uint32_rich_card_name_ver.set(1)
-                val respBuffer = sendBufferAW("group_member_card.get_group_member_card_info", true, req.toByteArray(), timeout = 2000)
+                    val respBuffer = sendBufferAW("group_member_card.get_group_member_card_info", true, req.toByteArray(), timeout = 2.seconds)
                     if (respBuffer != null) {
-                    val rsp = group_member_info.RspBody()
-                    rsp.mergeFrom(respBuffer.slice(4))
+                        val rsp = respBuffer.decodeToObject(group_member_info.RspBody())
                         if (rsp.msg_meminfo.str_location.has()) {
                             info.alias = rsp.msg_meminfo.str_location.get().toStringUtf8()
                         }
@@ -675,6 +685,7 @@ internal object GroupSvc: BaseSvc() {
             } catch (err: Throwable) {
                 LogCenter.log(err.stackTraceToString(), Level.WARN)
             }
+        }
         return if (info != null) {
             Result.success(info)
         } else {
@@ -682,7 +693,7 @@ internal object GroupSvc: BaseSvc() {
         }
     }
 
-    suspend fun getTroopMemberInfoByUinViaNt(
+    private suspend fun getTroopMemberInfoByUinViaNt(
         groupId: Long,
         qq: Long,
         timeout: Long = 5000L
@@ -711,7 +722,7 @@ internal object GroupSvc: BaseSvc() {
             return if (info != null) {
                 Result.success(info)
             } else {
-                Result.failure(Exception("获取群成员信息失败"))
+                Result.failure(Exception("[NT]获取群成员信息失败"))
             }
         }
     }
@@ -933,7 +944,7 @@ internal object GroupSvc: BaseSvc() {
         }
         val respBuffer = sendBufferAW("ProfileService.Pb.ReqSystemMsgAction.Group", true, req.toByteArray())
             ?: return Result.failure(Exception("操作失败"))
-        val rsp = structmsg.RspSystemMsgAction().mergeFrom(respBuffer.slice(4))
+        val rsp = respBuffer.decodeToObject(structmsg.RspSystemMsgAction())
         return if (rsp.head.result.has()) {
             if (rsp.head.result.get() == 0) {
                 Result.success(rsp.msg_detail.get())
@@ -984,8 +995,7 @@ internal object GroupSvc: BaseSvc() {
             ArrayList()
         } else {
             try {
-                val msg = structmsg.RspSystemMsgNew()
-                msg.mergeFrom(respBuffer.slice(4))
+                val msg = respBuffer.decodeToObject(structmsg.RspSystemMsgNew())
                 return msg.groupmsgs.get().orEmpty()
             } catch (err: Throwable) {
                 requestGroupSystemMsgNew(msgNum, reqMsgType, latestFriendSeq, latestGroupSeq, retryCnt - 1)
@@ -1178,8 +1188,7 @@ internal object GroupSvc: BaseSvc() {
         return if (buffer == null) {
             Result.failure(Exception("操作失败"))
         } else {
-            val body = oidb_sso.OIDBSSOPkg()
-            body.mergeFrom(buffer.slice(4))
+            val body = buffer.decodeToOidb()
             val rsp = oidb_0xeb7.RspBody()
             rsp.mergeFrom(body.bytes_bodybuffer.get().toByteArray())
             val doneInfo = rsp.signInWriteRsp.doneInfo

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/LbsSvc.kt

@@ -6,10 +6,12 @@ import com.tencent.mobileqq.msf.service.MsfService
 import com.tencent.proto.lbsshare.LBSShare
 import com.tencent.qqnt.kernel.nativeinterface.MsgConstant
 import moe.fuqiuluo.shamrock.helper.IllegalParamsException
+import moe.fuqiuluo.shamrock.tools.decodeToObject
 import moe.fuqiuluo.shamrock.tools.slice
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import kotlin.math.roundToInt
 
-internal object LbsSvc: BaseSvc() {
+internal object LbsSvc: QQInterfaces() {
     suspend fun tryShareLocation(chatType: Int, peerId: Long, lat: Double, lon: Double): Result<Unit> {
         val req = LbsSendInfo.SendMessageReq()
         req.uint64_peer_account.set(peerId)
@@ -24,8 +26,8 @@ internal object LbsSvc: BaseSvc() {
         }.getOrNull())
         req.str_lat.set(lat.toString())
         req.str_lng.set(lon.toString())
-        sendPb("trpc.qq_lbs.qq_lbs_ark.LocationArk.SsoSendMessage", req.toByteArray(), MsfService.getCore().nextSeq)
-
+        sendBuffer("trpc.qq_lbs.qq_lbs_ark.LocationArk.SsoSendMessage", true, req.toByteArray())
+        //sendPb("trpc.qq_lbs.qq_lbs_ark.LocationArk.SsoSendMessage", req.toByteArray(), MsfService.getCore().nextSeq)
         return Result.success(Unit)
     }
 
@@ -50,8 +52,7 @@ internal object LbsSvc: BaseSvc() {
         req.imei.set("")
         val buffer = sendBufferAW("LbsShareSvr.location", true, req.toByteArray())
             ?: return Result.failure(Exception("获取位置失败"))
-        val resp = LBSShare.LocationResp()
-        resp.mergeFrom(buffer.slice(4))
+        val resp = buffer.decodeToObject(LBSShare.LocationResp())
         val location = resp.mylbs
         return Result.success(location.addr.get())
     }

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt

@@ -24,6 +24,7 @@ import moe.fuqiuluo.shamrock.remote.structures.SendMsgResult
 import moe.fuqiuluo.shamrock.tools.*
 import moe.fuqiuluo.shamrock.utils.DeflateTools
 import moe.fuqiuluo.shamrock.xposed.helper.NTServiceFetcher
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.shamrock.xposed.helper.msgService
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.auto.toByteArray
@@ -33,9 +34,10 @@ import java.util.*
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 import kotlin.random.Random
+import kotlin.time.Duration.Companion.seconds
 
-internal object MsgSvc : BaseSvc() {
-    private suspend fun prepareTempChatFromGroup(
+internal object MsgSvc : QQInterfaces() {
+    suspend fun prepareTempChatFromGroup(
         groupId: String,
         peerId: String
     ): Result<Unit> {
@@ -418,13 +420,9 @@ internal object MsgSvc : BaseSvc() {
             )
         ).toByteArray()
 
-        val buffer = sendBufferAW("trpc.group.long_msg_interface.MsgService.SsoSendLongMsg", true, req, timeout = 30_000)
+        val buffer = sendBufferAW("trpc.group.long_msg_interface.MsgService.SsoSendLongMsg", true, req, timeout = 30.seconds)
             ?: return Result.failure(Exception("unable to upload multi message, response timeout"))
-        val rsp = runCatching {
-            buffer.slice(4).decodeProtobuf<LongMsgRsp>()
-        }.getOrElse {
-            buffer.decodeProtobuf<LongMsgRsp>()
-        }
+        val rsp = buffer.decodeToObject<LongMsgRsp>()
         val resId = rsp.sendResult?.resId ?: return Result.failure(Exception("unable to upload multi message"))
         return Result.success(MessageSegment(
             type = "forward",
@@ -456,7 +454,7 @@ internal object MsgSvc : BaseSvc() {
             true,
             req.toByteArray()
         ) ?: return Result.failure(Exception("unable to get multi message"))
-        val rsp = buffer.slice(4).decodeProtobuf<LongMsgRsp>()
+        val rsp = buffer.decodeToObject<LongMsgRsp>()
         val zippedPayload = DeflateTools.ungzip(
             rsp.recvResult?.payload ?: return Result.failure(Exception("payload is empty"))
         )

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/PacketSvc.kt

@@ -13,6 +13,7 @@ import moe.fuqiuluo.qqinterface.servlet.msg.MessageTempHandler
 import moe.fuqiuluo.shamrock.remote.action.handlers.GetHistoryMsg
 import moe.fuqiuluo.shamrock.tools.broadcast
 import moe.fuqiuluo.shamrock.utils.DeflateTools
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.MobileQQ
 import protobuf.auto.toByteArray
 import protobuf.message.*
@@ -21,7 +22,7 @@ import protobuf.push.MessagePush
 import kotlin.coroutines.resume
 import kotlin.text.toByteArray
 
-internal object PacketSvc : BaseSvc() {
+internal object PacketSvc : QQInterfaces() {
     /**
      * 伪造收到Json卡片消息
      */

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/QFavSvc.kt

@@ -23,6 +23,7 @@ import moe.fuqiuluo.shamrock.tools.toHexString
 import moe.fuqiuluo.shamrock.utils.DeflateTools
 import moe.fuqiuluo.shamrock.utils.MD5
 import moe.fuqiuluo.shamrock.xposed.helper.AppRuntimeFetcher
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import protobuf.fav.WeiyunAddRichMediaReq
 import protobuf.fav.WeiyunAuthor
 import protobuf.fav.WeiyunCollectCommInfo
@@ -49,7 +50,7 @@ import kotlin.coroutines.resume
 /**
  * QQ收藏相关接口
  */
-internal object QFavSvc: BaseSvc() {
+internal object QFavSvc: QQInterfaces() {
     private val SERVER_LIST_COLLECTOR = listOf(ServerAddr().also {
         it.isIpv6 = false
         it.mIp = "collector.weiyun.com"
@@ -275,7 +276,7 @@ internal object QFavSvc: BaseSvc() {
 
                 override fun onUpdateProgeress(netReq: NetReq, curr: Long, final: Long) {}
             }
-            val vi = (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getA2(app.currentAccountUin)
+            val vi = ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getA2(app.currentAccountUin)
             //LogCenter.log(pSKey)
             httpNetReq.mHttpMethod = HttpNetReq.HTTP_POST
             httpNetReq.mSendData = BytePacketBuilder().apply {
@@ -381,7 +382,7 @@ internal object QFavSvc: BaseSvc() {
     }
 
     private fun getWeiYunPSKey(): String {
-        val pskey = (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager)
+        val pskey = ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager)
             .getPskey(app.currentAccountUin, 16L, arrayOf("weiyun.com"), WeiYunPSKeyPromise)
         return if (pskey != null) pskey.getPSkey("weiyun.com") else ""
     }

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/QSafeSvc.kt

@@ -4,12 +4,12 @@ import QQService.SvcDevLoginInfo
 import QQService.SvcReqGetDevLoginInfo
 import QQService.SvcRspGetDevLoginInfo
 import com.qq.jce.wup.UniPacket
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.MobileQQ
 import mqq.app.Packet
 import oicq.wlogin_sdk.tools.util
 
-internal object QSafeSvc: BaseSvc() {
+internal object QSafeSvc: QQInterfaces() {
 
     suspend fun getOnlineClients(): ArrayList<SvcDevLoginInfo>? {
         val req = SvcReqGetDevLoginInfo()
@@ -26,7 +26,7 @@ internal object QSafeSvc: BaseSvc() {
         val resp = sendBufferAW("StatSvc.GetDevLoginInfo", false, uniPacket.encode())
             ?: return null
 
-        return Packet.decodePacket(resp, "SvcRspGetDevLoginInfo",  SvcRspGetDevLoginInfo()).vecCurrentLoginDevInfo
+        return Packet.decodePacket(resp.wupBuffer, "SvcRspGetDevLoginInfo",  SvcRspGetDevLoginInfo()).vecCurrentLoginDevInfo
     }
 
 

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/TicketSvc.kt

@@ -8,13 +8,15 @@ import io.ktor.client.request.get
 import io.ktor.client.request.header
 import moe.fuqiuluo.shamrock.remote.service.data.BigDataTicket
 import moe.fuqiuluo.shamrock.tools.GlobalClientNoRedirect
+import moe.fuqiuluo.shamrock.tools.decodeToOidb
 import moe.fuqiuluo.shamrock.tools.slice
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.MobileQQ
 import mqq.manager.TicketManager
 import oicq.wlogin_sdk.request.Ticket
 import tencent.im.oidb.oidb_sso
 
-internal object TicketSvc: BaseSvc() {
+internal object TicketSvc: QQInterfaces() {
     object SigType {
         const val WLOGIN_A5 = 2
         const val WLOGIN_RESERVED = 16
@@ -109,23 +111,23 @@ internal object TicketSvc: BaseSvc() {
     }
 
     fun getTicket(uin: String, id: Int): Ticket? {
-        return (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getLocalTicket(uin, id)
+        return ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getLocalTicket(uin, id)
     }
 
     fun getStWeb(uin: String): String {
-        return (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getStweb(uin)
+        return ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getStweb(uin)
     }
 
     fun getSKey(uin: String): String {
-        return (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getSkey(uin)
+        return ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getSkey(uin)
     }
 
     fun getRealSkey(uin: String): String {
-        return (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getRealSkey(uin)
+        return ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getRealSkey(uin)
     }
 
     fun getPSKey(uin: String): String {
-        val manager = (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager)
+        val manager = ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager)
         manager.reloadCache(MobileQQ.getContext())
         return manager.getSuperkey(uin) ?: ""
     }
@@ -135,14 +137,13 @@ internal object TicketSvc: BaseSvc() {
         req.domains.set(domain.toList())
         val buffer = sendOidbAW("OidbSvcTcp.0x102a", 4138, 0, req.toByteArray())
             ?: return Result.failure(Exception("getLessPSKey failed"))
-        val body = oidb_sso.OIDBSSOPkg()
-        body.mergeFrom(buffer.slice(4))
+        val body = buffer.decodeToOidb()
         val rsp = oidb_cmd0x102a.GetPSkeyResponse().mergeFrom(body.bytes_bodybuffer.get().toByteArray())
         return Result.success(rsp.private_keys.get())
     }
 
     suspend fun getPSKey(uin: String, domain: String): String? {
-        return (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getPskey(uin, domain).let {
+        return ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getPskey(uin, domain).let {
             if (it.isNullOrBlank())
                 getLessPSKey(domain).getOrNull()?.firstOrNull()?.key?.get()
             else it
@@ -150,7 +151,7 @@ internal object TicketSvc: BaseSvc() {
     }
 
     fun getPt4Token(uin: String, domain: String): String? {
-        return (app.getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getPt4Token(uin, domain)
+        return ((app as QQAppInterface).getManager(QQAppInterface.TICKET_MANAGER) as TicketManager).getPt4Token(uin, domain)
     }
 
     suspend fun GetHttpCookies(appid: String, daid: String, jumpurl: String): String? {

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/VisitorSvc.kt

@@ -1,6 +1,8 @@
 package moe.fuqiuluo.qqinterface.servlet
 
-internal object VisitorSvc: BaseSvc() {
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
+
+internal object VisitorSvc: QQInterfaces() {
     const val FROM_C2C_AIO = 2
     const val FROM_CONDITION_SEARCH = 9
     const val FROM_CONTACTS_TAB = 5

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/ark/ArkMsgSvc.kt

@@ -1,11 +1,11 @@
 package moe.fuqiuluo.qqinterface.servlet.ark
 
 import com.tencent.qqnt.kernel.nativeinterface.MsgConstant
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.qqinterface.servlet.ark.data.ArkAppInfo
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import tencent.im.oidb.cmd0xb77.oidb_cmd0xb77
 
-internal object ArkMsgSvc: BaseSvc() {
+internal object ArkMsgSvc: QQInterfaces() {
     fun tryShareMusic(
         chatType: Int,
         peerId: Long,

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/ark/LightAppSvc.kt

@@ -1,8 +1,8 @@
 package moe.fuqiuluo.qqinterface.servlet.ark
 
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.qqinterface.servlet.ark.data.ArkAppInfo
 import moe.fuqiuluo.shamrock.utils.PlatformUtils
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.auto.toByteArray
 import protobuf.lightapp.AdaptShareInfoReq
@@ -11,7 +11,7 @@ import protobuf.qweb.DEFAULT_DEVICE_INFO
 import protobuf.qweb.QWebReq
 import protobuf.qweb.QWebRsp
 
-internal object LightAppSvc: BaseSvc() {
+internal object LightAppSvc: QQInterfaces() {
     suspend fun adaptShareJumpUrl(
         arkAppInfo: ArkAppInfo,
         coverUrl: String,
@@ -37,7 +37,7 @@ internal object LightAppSvc: BaseSvc() {
                 webURL = url,
             ).toByteArray(),
             traceId = app.account + "_0_0",
-        ).toByteArray())?.decodeProtobuf<QWebRsp>()?.buffer?.decodeProtobuf<AdaptShareInfoResp>()
+        ).toByteArray())?.wupBuffer?.decodeProtobuf<QWebRsp>()?.buffer?.decodeProtobuf<AdaptShareInfoResp>()
         if (rsp == null || rsp.json.isNullOrEmpty())
             return Result.failure(Exception("unable to adapt ShareInfo"))
         return Result.success(rsp.json!!)

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/converter/NtMsgElementConverter.kt

@@ -30,7 +30,7 @@ internal object NtMsgElementConverter {
         MsgConstant.KELEMTYPEMARKETFACE to NtMsgElementConverter::convertMarketFaceElem,
         MsgConstant.KELEMTYPEARKSTRUCT to NtMsgElementConverter::convertStructJsonElem,
         MsgConstant.KELEMTYPEREPLY to NtMsgElementConverter::convertReplyElem,
-        MsgConstant.KELEMTYPEGRAYTIP to NtMsgElementConverter::convertGrayTipsElem,
+        //MsgConstant.KELEMTYPEGRAYTIP to NtMsgElementConverter::convertGrayTipsElem,
         MsgConstant.KELEMTYPEFILE to NtMsgElementConverter::convertFileElem,
         MsgConstant.KELEMTYPEMARKDOWN to NtMsgElementConverter::convertMarkdownElem,
         //MsgConstant.KELEMTYPEMULTIFORWARD to MsgElementConverter::convertXmlMultiMsgElem,
@@ -182,48 +182,14 @@ internal object NtMsgElementConverter {
         /*
         PicElement{picSubType=0,fileName=A655FCDADABC40D0CEAF6F9AF92937CD.jpg,fileSize=142865,picWidth=886,picHeight=1920,original=false,md5HexStr=a655fcdadabc40d0ceaf6f9af92937cd,sourcePath=null,thumbPath=null,transferStatus=2,progress=0,picType=1000,invalidState=0,fileUuid=CgoxMDI5Mzc0MTE1EhTnucgrUbp3MJjjagUM2-VxSQ5V7hiR3Agg_goo9ZCZt-HNhANQgJqeAQ,fileSubId=,thumbFileSize=0,fileBizId=null,downloadIndex=null,summary=,emojiFrom=null,emojiWebUrl=null,emojiAd=EmojiAD{url=,desc=,},emojiMall=EmojiMall{packageId=0,emojiId=0,},emojiZplan=EmojiZPlan{actionId=0,actionName=,actionType=0,playerNumber=0,peerUid=0,bytesReserveInfo=,},originImageMd5=,originImageUrl=null,importRichMediaContext=null,isFlashPic=false,}
          */
+
+        val url = RichProtoSvc.getTempPicDownloadUrl(chatType, originalUrl, md5, image, storeId)
+
         return MessageSegment(
             type = "image",
             data = hashMapOf(
                 "file" to md5,
-                "url" to when (chatType) {
-                    MsgConstant.KCHATTYPEDISC, MsgConstant.KCHATTYPEGROUP -> RichProtoSvc.getGroupPicDownUrl(
-                        originalUrl = originalUrl,
-                        md5 = md5,
-                        fileId = image.fileUuid,
-                        width = image.picWidth.toUInt(),
-                        height = image.picHeight.toUInt(),
-                        sha = "",
-                        fileSize = image.fileSize.toULong(),
-                        peer = peerId
-                    )
-
-                    MsgConstant.KCHATTYPEC2C -> RichProtoSvc.getC2CPicDownUrl(
-                        originalUrl = originalUrl,
-                        md5 = md5,
-                        fileId = image.fileUuid,
-                        width = image.picWidth.toUInt(),
-                        height = image.picHeight.toUInt(),
-                        sha = "",
-                        fileSize = image.fileSize.toULong(),
-                        peer = peerId,
-                        storeId = storeId
-                    )
-
-                    MsgConstant.KCHATTYPEGUILD -> RichProtoSvc.getGuildPicDownUrl(
-                        originalUrl = originalUrl,
-                        md5 = md5,
-                        fileId = image.fileUuid,
-                        width = image.picWidth.toUInt(),
-                        height = image.picHeight.toUInt(),
-                        sha = "",
-                        fileSize = image.fileSize.toULong(),
-                        peer = peerId,
-                        subPeer = subPeer
-                    )
-
-                    else -> throw UnsupportedOperationException("Not supported chat type: $chatType")
-                },
+                "url" to url,
                 "subType" to image.picSubType,
                 "type" to if (image.isFlashPic == true) "flash" else if (image.original) "original" else "show"
             )

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt

@@ -124,11 +124,15 @@ internal class ElemMaker {
                     else -> {
                         qq = qqStr.toLong()
                         type = 0
-                        "@" + (data["name"].asStringOrNull ?: GroupSvc.getTroopMemberInfoByUinV2(
-                            peerId.toLong(),
-                            qq,
-                            true
-                        ).let {
+                        val name = (data["name"].asStringOrNull
+                            ?: GroupSvc.getTroopMemberNickByUin(peerId.toLong(), qq)?.let {
+                                it.troopNick
+                                    .ifNullOrEmpty(it.friendNick)
+                                    .ifNullOrEmpty(it.showName)
+                                    .ifNullOrEmpty(it.autoRemark)
+                                    .ifNullOrEmpty(it.colorNick)
+                            }
+                            ?: GroupSvc.getTroopMemberInfoByUinV2(peerId.toLong(), qq, true).let {
                                 val info = it.getOrNull()
                                 if (info == null)
                                     LogCenter.log("无法获取群成员信息: $qqStr", Level.ERROR)
@@ -136,6 +140,7 @@ internal class ElemMaker {
                                     .ifNullOrEmpty(info.friendnick)
                                     .ifNullOrEmpty(qqStr)
                             })
+                        "@$name"
                     }
                 }
 

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/NtMsgElementMaker.kt

@@ -856,7 +856,15 @@ internal object NtMsgElementMaker {
                                 .ifNullOrEmpty(qqStr)
                         }"
                     } else {
-                        at.content = "@$qqStr"
+                        at.content = "@${
+                            GroupSvc.getTroopMemberNickByUin(peerId.toLong(), qq)?.let {
+                                it.troopNick
+                                    .ifNullOrEmpty(it.friendNick)
+                                    .ifNullOrEmpty(it.showName)
+                                    .ifNullOrEmpty(it.autoRemark)
+                                    .ifNullOrEmpty(it.colorNick)
+                            } ?: qqStr
+                        }"
                     }
                 } else {
                     at.content = "@$name"

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/NtV2RichMediaSvc.kt

@@ -15,33 +15,38 @@ import com.tencent.qqnt.kernel.nativeinterface.VideoElement
 import com.tencent.qqnt.kernelpublic.nativeinterface.Contact
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.withTimeoutOrNull
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.qqinterface.servlet.TicketSvc
 import moe.fuqiuluo.qqinterface.servlet.transfile.data.TryUpPicData
 import moe.fuqiuluo.shamrock.helper.MessageHelper
 import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
+import moe.fuqiuluo.shamrock.tools.decodeToObject
+import moe.fuqiuluo.shamrock.tools.decodeToTrpcOidb
 import moe.fuqiuluo.shamrock.tools.hex2ByteArray
-import moe.fuqiuluo.shamrock.tools.slice
+import moe.fuqiuluo.shamrock.tools.toHexString
 import moe.fuqiuluo.shamrock.utils.AudioUtils
 import moe.fuqiuluo.shamrock.utils.FileUtils
 import moe.fuqiuluo.shamrock.utils.MediaType
 import moe.fuqiuluo.shamrock.xposed.helper.NTServiceFetcher
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.shamrock.xposed.helper.msgService
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.auto.toByteArray
-import protobuf.oidb.TrpcOidb
 import protobuf.oidb.cmd0x11c5.ClientMeta
 import protobuf.oidb.cmd0x11c5.CodecConfigReq
 import protobuf.oidb.cmd0x11c5.CommonHead
 import protobuf.oidb.cmd0x11c5.DownloadExt
 import protobuf.oidb.cmd0x11c5.DownloadReq
+import protobuf.oidb.cmd0x11c5.DownloadRkeyReq
+import protobuf.oidb.cmd0x11c5.DownloadRkeyRsp
 import protobuf.oidb.cmd0x11c5.FileInfo
 import protobuf.oidb.cmd0x11c5.FileType
 import protobuf.oidb.cmd0x11c5.IndexNode
 import protobuf.oidb.cmd0x11c5.MultiMediaReqHead
 import protobuf.oidb.cmd0x11c5.NtV2RichMediaReq
 import protobuf.oidb.cmd0x11c5.NtV2RichMediaRsp
+import protobuf.oidb.cmd0x11c5.RKeyInfo
 import protobuf.oidb.cmd0x11c5.SceneInfo
 import protobuf.oidb.cmd0x11c5.UploadInfo
 import protobuf.oidb.cmd0x11c5.UploadReq
@@ -57,8 +62,11 @@ import kotlin.random.Random
 import kotlin.random.nextUInt
 import kotlin.random.nextULong
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
-internal object NtV2RichMediaSvc: BaseSvc() {
+internal object NtV2RichMediaSvc: QQInterfaces() {
+    private lateinit var cacheRKeyInfo: DownloadRkeyRsp
+    private var lastRefreshRKeyTime = 0L
     private val requestIdSeq = atomic(2L)
 
     fun fetchGroupResUploadTo(): String {
@@ -320,6 +328,45 @@ internal object NtV2RichMediaSvc: BaseSvc() {
         return Result.success(result)
     }
 
+    suspend fun getTempNtRKey(): Result<DownloadRkeyRsp> {
+        if (System.currentTimeMillis() - lastRefreshRKeyTime < 60 * 60_000 && ::cacheRKeyInfo.isInitialized) {
+            return Result.success(cacheRKeyInfo)
+        }
+        runCatching {
+            val req = NtV2RichMediaReq(
+                head = MultiMediaReqHead(
+                    commonHead = CommonHead(
+                        requestId = requestIdSeq.incrementAndGet().toULong(),
+                        cmd = 202u
+                    ),
+                    sceneInfo = SceneInfo(
+                        requestType = 2u,
+                        businessType = 1u,
+                        sceneType = 0u,
+                    ),
+                    clientMeta = ClientMeta(2u)
+                ),
+                downloadRkey = DownloadRkeyReq(
+                    types = listOf(10, 20),
+                    downloadType = 2
+                )
+            ).toByteArray()
+            val fromServiceMsg = sendOidbAW("OidbSvcTrpcTcp.0x9067_202", 0x9067, 202, req, true)
+            if (fromServiceMsg == null || fromServiceMsg.wupBuffer == null) {
+                return Result.failure(Exception("failed to fetch NtTempRKey: ${fromServiceMsg?.wupBuffer?.toHexString()}"))
+            }
+            val trpc = fromServiceMsg.decodeToTrpcOidb()
+            trpc.buffer.decodeProtobuf<NtV2RichMediaRsp>().downloadRkeyRsp?.let {
+                cacheRKeyInfo = it
+                lastRefreshRKeyTime = System.currentTimeMillis()
+                return Result.success(it)
+            }
+        }.onFailure {
+            return Result.failure(it)
+        }
+        return Result.failure(Exception("failed to fetch NtTempRKey"))
+    }
+
     /**
      * 获取NT图片的RKEY
      */
@@ -386,8 +433,9 @@ internal object NtV2RichMediaSvc: BaseSvc() {
                     )
                 )
             ).toByteArray()
-            val buffer = sendOidbAW("OidbSvcTrpcTcp.0x11c5_200", 4549, 200, req, true)?.slice(4)
-            buffer?.decodeProtobuf<TrpcOidb>()?.buffer?.decodeProtobuf<NtV2RichMediaRsp>()?.download?.rkeyParam?.let {
+            val buffer = sendOidbAW("OidbSvcTrpcTcp.0x11c5_200", 4549, 200, req, true)
+                ?: return Result.failure(Exception("no response"))
+            buffer.decodeToTrpcOidb().buffer.decodeProtobuf<NtV2RichMediaRsp>().download?.rkeyParam?.let {
                 return Result.success(it)
             }
         }.onFailure {
@@ -470,17 +518,16 @@ internal object NtV2RichMediaSvc: BaseSvc() {
         ).toByteArray()
         val buffer = when (chatType) {
             MsgConstant.KCHATTYPEGROUP -> {
-                sendOidbAW("OidbSvcTrpcTcp.0x11c4_100", 4548, 100, req, true, timeout = 3_000)?.slice(4)
+                sendOidbAW("OidbSvcTrpcTcp.0x11c4_100", 4548, 100, req, true, timeout = 3.seconds)
                     ?: return Result.failure(Exception("no response: timeout"))
             }
             MsgConstant.KCHATTYPEC2C -> {
-                sendOidbAW("OidbSvcTrpcTcp.0x11c5_100", 4549, 100, req, true, timeout = 3_000)?.slice(4)
+                sendOidbAW("OidbSvcTrpcTcp.0x11c5_100", 4549, 100, req, true, timeout = 3.seconds)
                     ?: return Result.failure(Exception("no response: timeout"))
             }
-
             else -> return Result.failure(Exception("unknown chat type: $chatType"))
         }
-        val rspBuffer = buffer.decodeProtobuf<TrpcOidb>().buffer
+        val rspBuffer = buffer.decodeToTrpcOidb().buffer
         val rsp = rspBuffer.decodeProtobuf<NtV2RichMediaRsp>()
         if (rsp.upload == null) {
             return Result.failure(Exception("unable to request upload nt pic: ${rsp.head}"))
@@ -522,7 +569,7 @@ internal object NtV2RichMediaSvc: BaseSvc() {
                     )
                 ),
             ).toByteArray())!!
-            val rsp = rspBuffer.decodeProtobuf<Cmd0x388RspBody>()
+            val rsp = rspBuffer.decodeToObject<Cmd0x388RspBody>()
                 .msgTryUpImgRsp!!.first()
             TryUpPicData(
                 uKey = rsp.ukey,

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/RichProtoSvc.kt

@@ -6,18 +6,21 @@ import com.tencent.mobileqq.transfile.FileMsg
 import com.tencent.mobileqq.transfile.api.IProtoReqManager
 import com.tencent.mobileqq.transfile.protohandler.RichProto
 import com.tencent.mobileqq.transfile.protohandler.RichProtoProc
+import com.tencent.qqnt.kernel.nativeinterface.MsgConstant
+import com.tencent.qqnt.kernel.nativeinterface.PicElement
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.serialization.ExperimentalSerializationApi
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.qqinterface.servlet.transfile.NtV2RichMediaSvc.getNtPicRKey
+import moe.fuqiuluo.qqinterface.servlet.transfile.NtV2RichMediaSvc.getTempNtRKey
 import moe.fuqiuluo.shamrock.helper.ContactHelper
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
-import moe.fuqiuluo.shamrock.tools.hex2ByteArray
+import moe.fuqiuluo.shamrock.tools.decodeToOidb
 import moe.fuqiuluo.shamrock.tools.slice
 import moe.fuqiuluo.shamrock.tools.toHexString
 import moe.fuqiuluo.shamrock.utils.PlatformUtils
 import moe.fuqiuluo.shamrock.xposed.helper.AppRuntimeFetcher
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.symbols.decodeProtobuf
 import mqq.app.MobileQQ
 import protobuf.auto.toByteArray
@@ -38,7 +41,7 @@ private const val GPRO_PIC = "gchat.qpic.cn"
 private const val MULTIMEDIA_DOMAIN = "multimedia.nt.qq.com.cn"
 private const val C2C_PIC = "c2cpicdw.qpic.cn"
 
-internal object RichProtoSvc: BaseSvc() {
+internal object RichProtoSvc: QQInterfaces() {
     suspend fun getGuildFileDownUrl(peerId: String, channelId: String, fileId: String, bizId: Int): String {
         val buffer = sendOidbAW("OidbSvcTrpcTcp.0xfc2_0", 4034, 0, Oidb0xfc2ReqBody(
             msgCmd = 1200,
@@ -53,8 +56,7 @@ internal object RichProtoSvc: BaseSvc() {
                 supportEncrypt = 0
             )
         ).toByteArray()) ?: return ""
-        val body = oidb_sso.OIDBSSOPkg()
-        body.mergeFrom(buffer.slice(4))
+        val body = buffer.decodeToOidb()
         body.bytes_bodybuffer
             .get().toByteArray()
             .decodeProtobuf<Oidb0xfc2RspBody>()
@@ -79,8 +81,7 @@ internal object RichProtoSvc: BaseSvc() {
                 str_file_id.set(fileId)
             })
         }.toByteArray()) ?: return ""
-        val body = oidb_sso.OIDBSSOPkg()
-        body.mergeFrom(buffer.slice(4))
+        val body = buffer.decodeToOidb()
         val result = oidb_0x6d6.RspBody().mergeFrom(body.bytes_bodybuffer.get().toByteArray())
         if (body.uint32_result.get() != 0
             || result.download_file_rsp.int32_ret_code.get() != 0) {
@@ -128,8 +129,7 @@ internal object RichProtoSvc: BaseSvc() {
             }
             return ""
         } else {
-            val body = oidb_sso.OIDBSSOPkg()
-            body.mergeFrom(buffer.slice(4))
+            val body = buffer.decodeToOidb()
             val result = cmd0x346.RspBody().mergeFrom(cmd0xe37.Resp0xe37().mergeFrom(
                 body.bytes_bodybuffer.get().toByteArray()
             ).bytes_cmd_0x346_rsp_body.get().toByteArray())
@@ -150,6 +150,75 @@ internal object RichProtoSvc: BaseSvc() {
         }
     }
 
+    suspend fun getTempPicDownloadUrl(
+        chatType: Int,
+        originalUrl: String,
+        md5: String,
+        image: PicElement,
+        storeId: Int = 0,
+        peer: String? = null,
+        subPeer: String? = null,
+    ): String {
+        val isNtServer = originalUrl.startsWith("/download")
+        if (isNtServer) {
+            val tmpRKey = getTempNtRKey()
+            if (tmpRKey.isSuccess) {
+                val tmpRKeyRsp = tmpRKey.getOrThrow()
+                val tmpRKeyMap = hashMapOf<UInt, String>()
+                tmpRKeyRsp.rkeys?.forEach { rKeyInfo ->
+                    tmpRKeyMap[rKeyInfo.type] = rKeyInfo.rkey
+                }
+                val rkey = tmpRKeyMap[when(chatType) {
+                    MsgConstant.KCHATTYPEDISC, MsgConstant.KCHATTYPEGROUP -> 20u
+                    MsgConstant.KCHATTYPEC2C -> 10u
+                    MsgConstant.KCHATTYPEGUILD -> 20u
+                    else -> 20u
+                }]
+                if (rkey != null) {
+                    return "https://$MULTIMEDIA_DOMAIN$originalUrl$rkey"
+                }
+            }
+        }
+        return when (chatType) {
+            MsgConstant.KCHATTYPEDISC, MsgConstant.KCHATTYPEGROUP -> getGroupPicDownUrl(
+                originalUrl = originalUrl,
+                md5 = md5,
+                fileId = image.fileUuid,
+                width = image.picWidth.toUInt(),
+                height = image.picHeight.toUInt(),
+                sha = "",
+                fileSize = image.fileSize.toULong(),
+                peer = peer ?: "0"
+            )
+
+            MsgConstant.KCHATTYPEC2C -> getC2CPicDownUrl(
+                originalUrl = originalUrl,
+                md5 = md5,
+                fileId = image.fileUuid,
+                width = image.picWidth.toUInt(),
+                height = image.picHeight.toUInt(),
+                sha = "",
+                fileSize = image.fileSize.toULong(),
+                peer = peer ?: "0",
+                storeId = storeId
+            )
+
+            MsgConstant.KCHATTYPEGUILD -> getGuildPicDownUrl(
+                originalUrl = originalUrl,
+                md5 = md5,
+                fileId = image.fileUuid,
+                width = image.picWidth.toUInt(),
+                height = image.picHeight.toUInt(),
+                sha = "",
+                fileSize = image.fileSize.toULong(),
+                peer = peer ?: "0",
+                subPeer = subPeer ?: "0"
+            )
+
+            else -> throw UnsupportedOperationException("Not supported chat type: $chatType")
+        }
+    }
+
     suspend fun getGroupPicDownUrl(
         originalUrl: String,
         md5: String,
@@ -163,6 +232,23 @@ internal object RichProtoSvc: BaseSvc() {
         val isNtServer = originalUrl.startsWith("/download")
         val domain = if (isNtServer) MULTIMEDIA_DOMAIN else GPRO_PIC
         if (originalUrl.isNotEmpty()) {
+            // 高于QQ9.0.70，可以直接请求获取rkey
+            val tmpRKey = getTempNtRKey().onFailure {
+                LogCenter.log("getTempNtRKey: ${it.stackTraceToString()}", Level.WARN)
+            }
+            if (tmpRKey.isSuccess) {
+                val tmpRKeyRsp = tmpRKey.getOrThrow()
+                val tmpRKeyMap = hashMapOf<UInt, String>()
+                tmpRKeyRsp.rkeys?.forEach { rKeyInfo ->
+                    tmpRKeyMap[rKeyInfo.type] = rKeyInfo.rkey
+                }
+                val rkey = tmpRKeyMap[20u]
+                if (rkey != null) {
+                    return "https://$MULTIMEDIA_DOMAIN$originalUrl$rkey"
+                }
+            }
+
+            // 低于QQ9.0.70但是支持nt资源的客户端支持
             if (isNtServer && !originalUrl.contains("rkey=")) {
                 getNtPicRKey(
                     fileId = fileId,
@@ -199,6 +285,21 @@ internal object RichProtoSvc: BaseSvc() {
         val isNtServer = storeId == 1 || originalUrl.startsWith("/download")
         val domain = if (isNtServer) MULTIMEDIA_DOMAIN else C2C_PIC
         if (originalUrl.isNotEmpty()) {
+            // 高于QQ9.0.70，可以直接请求获取rkey
+            val tmpRKey = getTempNtRKey()
+            if (tmpRKey.isSuccess) {
+                val tmpRKeyRsp = tmpRKey.getOrThrow()
+                val tmpRKeyMap = hashMapOf<UInt, String>()
+                tmpRKeyRsp.rkeys?.forEach { rKeyInfo ->
+                    tmpRKeyMap[rKeyInfo.type] = rKeyInfo.rkey
+                }
+                val rkey = tmpRKeyMap[10u]
+                if (rkey != null) {
+                    return "https://$MULTIMEDIA_DOMAIN$originalUrl$rkey"
+                }
+            }
+
+            // 低于QQ9.0.70但是支持nt资源的客户端支持
             if (fileId.isNotEmpty()) getNtPicRKey(
                 fileId = fileId,
                 md5 = md5,

xposed/src/main/java/moe/fuqiuluo/shamrock/helper/LocalCacheHelper.kt

@@ -1,11 +1,11 @@
 package moe.fuqiuluo.shamrock.helper
 
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.shamrock.utils.FileUtils
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.MobileQQ
 import java.io.File
 
-internal object LocalCacheHelper: BaseSvc() {
+internal object LocalCacheHelper: QQInterfaces() {
     // 获取外部储存data目录
     private val dataDir = MobileQQ.getContext().getExternalFilesDir(null)!!
         .parentFile!!.resolve("Tencent")

xposed/src/main/java/moe/fuqiuluo/shamrock/helper/LogCenter.kt

@@ -9,8 +9,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
-import moe.fuqiuluo.shamrock.xposed.hooks.toast
-import moe.fuqiuluo.shamrock.xposed.helper.internal.DataRequester
+import moe.fuqiuluo.shamrock.tools.toast
+import moe.fuqiuluo.shamrock.xposed.helper.AppTalker
 import mqq.app.MobileQQ
 import java.io.File
 import java.util.Date
@@ -60,10 +60,10 @@ internal object LogCenter {
         }
         // 把日志广播到主进程
         GlobalScope.launch(Dispatchers.Default) {
-            DataRequester.request("send_message", bodyBuilder = {
+            AppTalker.talk("send_message") {
                 put("string", string)
                 put("level", level.id)
-            })
+            }
         }
 
         if (!LogFile.exists()) {
@@ -89,10 +89,10 @@ internal object LogCenter {
         }
         // 把日志广播到主进程
         GlobalScope.launch(Dispatchers.Default) {
-            DataRequester.request("send_message", bodyBuilder = {
+            AppTalker.talk("send_message") {
                 put("string", log)
                 put("level", level.id)
-            })
+            }
         }
 
         if (!LogFile.exists()) {

xposed/src/main/java/moe/fuqiuluo/shamrock/helper/MessageHelper.kt

@@ -1,9 +1,12 @@
 package moe.fuqiuluo.shamrock.helper
 
 import com.tencent.mobileqq.qroute.QRoute
+import com.tencent.qqnt.kernel.api.IKernelService
 import com.tencent.qqnt.kernel.nativeinterface.IOperateCallback
 import com.tencent.qqnt.kernel.nativeinterface.MsgConstant
 import com.tencent.qqnt.kernel.nativeinterface.MsgElement
+import com.tencent.qqnt.kernel.nativeinterface.MsgRecord
+import com.tencent.qqnt.kernel.nativeinterface.TempChatInfo
 import com.tencent.qqnt.kernelpublic.nativeinterface.Contact
 import com.tencent.qqnt.msg.api.IMsgService
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -16,12 +19,15 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonObject
 import moe.fuqiuluo.qqinterface.servlet.MsgSvc
+import moe.fuqiuluo.qqinterface.servlet.MsgSvc.prepareTempChatFromGroup
 import moe.fuqiuluo.qqinterface.servlet.msg.maker.ElemMaker
 import moe.fuqiuluo.qqinterface.servlet.msg.maker.NtMsgElementMaker
 import moe.fuqiuluo.shamrock.helper.db.MessageDB
 import moe.fuqiuluo.shamrock.helper.db.MessageMapping
 import moe.fuqiuluo.shamrock.remote.structures.SendMsgResult
 import moe.fuqiuluo.shamrock.tools.*
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces.Companion.app
+import moe.fuqiuluo.shamrock.xposed.helper.msgService
 import protobuf.message.RichText
 import kotlin.coroutines.resume
 import kotlin.math.abs
@@ -48,6 +54,28 @@ internal object MessageHelper {
         return sendMessageWithoutMsgId(chatType, peerId, msg, fromId, callback)
     }
 
+    suspend fun sendMessage(contact: Contact, msgs: ArrayList<MsgElement>, retry: Int, msgId: SendMsgResult): Result<SendMsgResult> {
+        if (contact.chatType == MsgConstant.KCHATTYPETEMPC2CFROMGROUP) {
+            prepareTempChatFromGroup(contact.guildId, contact.peerUid).getOrThrow()
+        }
+        return withTimeoutOrNull(5000) {
+            suspendCancellableCoroutine {
+                QRoute.api(IMsgService::class.java).sendMsg(contact, msgId.qqMsgId, msgs) { code: Int, msg: String ->
+                    if (code == 0) {
+                        it.resume(msgId.qqMsgId)
+                    } else {
+                        LogCenter.log("消息发送失败: $code:$msg", Level.WARN)
+                        it.resume(null)
+                    }
+                }
+            }
+        }?.let { Result.success(SendMsgResult(
+            msgHashId = msgId.msgHashId,
+            qqMsgId = it,
+            msgTime = System.currentTimeMillis()
+        )) } ?: resendMsg(contact, msgId.qqMsgId, retry, msgHashId = msgId.msgHashId)
+    }
+
     suspend fun resendMsg(
         chatType: Int,
         peerId: String,
@@ -246,6 +274,40 @@ internal object MessageHelper {
         }
     }
 
+    suspend fun getTempChatInfo(chatType: Int, uid: String): Result<TempChatInfo> {
+        val msgService = app.getRuntimeService(IKernelService::class.java, "all").msgService
+            ?: return Result.failure(Exception("获取消息服务失败"))
+        val info: TempChatInfo = withTimeoutOrNull(5000) {
+            suspendCancellableCoroutine {
+                msgService.getTempChatInfo(chatType, uid) { code, msg, tempChatInfo ->
+                    if (code == 0) {
+                        it.resume(tempChatInfo)
+                    } else {
+                        LogCenter.log("获取临时会话信息失败: $code:$msg", Level.ERROR)
+                        it.resume(null)
+                    }
+                }
+            }
+        } ?: return Result.failure(Exception("获取临时会话信息失败"))
+        return Result.success(info)
+    }
+
+    suspend fun generateContact(record: MsgRecord): Contact {
+        val peerId = when (record.chatType) {
+            MsgConstant.KCHATTYPEC2C, MsgConstant.KCHATTYPETEMPC2CFROMGROUP -> record.senderUid
+            MsgConstant.KCHATTYPEGUILD -> record.channelId
+            else -> record.peerUin.toString()
+        }
+        return Contact(record.chatType, peerId, if (record.chatType == MsgConstant.KCHATTYPEGUILD) {
+            record.guildId
+        } else if(record.chatType == MsgConstant.KCHATTYPETEMPC2CFROMGROUP) {
+            val tempInfo = getTempChatInfo(record.chatType, peerId).getOrThrow()
+            tempInfo.groupCode
+        } else {
+            null
+        })
+    }
+
     suspend fun generateContact(chatType: Int, id: String, subId: String = ""): Contact {
         val peerId = when (chatType) {
             MsgConstant.KCHATTYPEC2C, MsgConstant.KCHATTYPETEMPC2CFROMGROUP -> {

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/HTTPServer.kt

@@ -1,5 +1,6 @@
 package moe.fuqiuluo.shamrock.remote
 
+import com.tencent.mobileqq.app.QQAppInterface
 import io.ktor.server.application.Application
 import io.ktor.server.application.install
 import io.ktor.server.engine.ApplicationEngine
@@ -21,7 +22,9 @@ import moe.fuqiuluo.shamrock.remote.plugin.Auth
 import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
-import moe.fuqiuluo.shamrock.xposed.helper.internal.DataRequester
+import moe.fuqiuluo.shamrock.tools.ShamrockVersion
+import moe.fuqiuluo.shamrock.xposed.helper.AppTalker
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces.Companion.app
 import moe.fuqiuluo.shamrock.xposed.loader.NativeLoader
 import org.slf4j.LoggerFactory
 import java.security.KeyStore
@@ -138,10 +141,13 @@ internal object HTTPServer {
         isServiceStarted = true
         currServerPort = port
         LogCenter.log("Start HTTP Server: http://0.0.0.0:$currServerPort/")
-        DataRequester.request("success", values = mapOf(
-            "port" to currServerPort,
-            "voice" to NativeLoader.isVoiceLoaded
-        ))
+        AppTalker.talk("success") {
+            put("account", app.currentAccountUin)
+            put("nickname", if (app is QQAppInterface) (app.currentNickname ?: "unknown") else "unknown")
+            put("voice", NativeLoader.isVoiceLoaded)
+            put("core_version", ShamrockVersion)
+            put("port", currServerPort)
+        }
     }
 
     fun isActive(): Boolean {

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/BanTroopMember.kt

@@ -17,7 +17,7 @@ internal object BanTroopMember: IActionHandler() {
         return invoke(groupId, userId, duration, session.echo)
     }
 
-    operator fun invoke(
+    suspend operator fun invoke(
         groupId: Long,
         userId: Long,
         duration: Int = 30 * 60,

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetTroopMemberInfo.kt

@@ -1,13 +1,18 @@
 package moe.fuqiuluo.shamrock.remote.action.handlers
 
 import com.tencent.mobileqq.data.Card
+import com.tencent.mobileqq.data.troop.TroopMemberInfo
+import com.tencent.qqnt.kernelpublic.nativeinterface.MemberRole as NtMemberRole
 import kotlinx.serialization.json.JsonElement
 import moe.fuqiuluo.qqinterface.servlet.GroupSvc
 import moe.fuqiuluo.shamrock.remote.action.ActionSession
 import moe.fuqiuluo.shamrock.remote.action.IActionHandler
 import moe.fuqiuluo.shamrock.remote.service.data.SimpleTroopMemberInfo
+import moe.fuqiuluo.shamrock.remote.service.data.push.MemberRole
 import moe.fuqiuluo.shamrock.tools.EmptyJsonString
 import moe.fuqiuluo.shamrock.tools.ifNullOrEmpty
+import moe.fuqiuluo.shamrock.utils.PlatformUtils
+import moe.fuqiuluo.shamrock.utils.PlatformUtils.QQ_9_0_71_VER
 import moe.fuqiuluo.symbols.OneBotHandler
 
 @OneBotHandler("get_group_member_info")
@@ -26,17 +31,64 @@ internal object GetTroopMemberInfo : IActionHandler() {
         refresh: Boolean,
         echo: JsonElement = EmptyJsonString
     ): String {
-        val info = GroupSvc.getTroopMemberInfoByUin(groupId, userId, refresh).onFailure {
+        val info = GroupSvc.getTroopMemberInfoByUinV2(groupId, userId, refresh).onFailure {
             return error(it.message ?: "unknown error", echo)
         }.getOrThrow()
 
-        return ok(
-            SimpleTroopMemberInfo(
+        val code = PlatformUtils.getQQVersionCode()
+        return ok(when {
+            (code >= QQ_9_0_71_VER) -> ntQQApiData(groupId, userId, info)
+            else -> oldQQApiData(groupId, userId, info)
+        }, echo)
+    }
+
+    private suspend fun ntQQApiData(groupId: Long, userId: Long, info: TroopMemberInfo): SimpleTroopMemberInfo {
+        return SimpleTroopMemberInfo(
             uin = info.memberuin.toLong(),
             name = info.friendnick.ifNullOrEmpty(info.autoremark) ?: "",
             showName = info.troopnick.ifNullOrEmpty(info.troopColorNick),
             cardName = info.troopnick.ifNullOrEmpty(info.troopColorNick),
-                distance = info.distance,
+            distance = 0,
+            honor = GroupSvc.parseHonor(info.honorList),
+            joinTime = info.join_time,
+            lastActiveTime = info.last_active_time,
+            uniqueName = null,
+            groupId = groupId,
+            nick = info.friendnick.ifNullOrEmpty(info.autoremark) ?: "",
+            sex = "unknown",
+            area = "",
+            lastSentTime = info.last_active_time,
+            level = info.level,
+            role = when(info.role) {
+                NtMemberRole.UNSPECIFIED -> MemberRole.Unknown
+                NtMemberRole.STRANGER -> MemberRole.Stranger
+                NtMemberRole.MEMBER -> MemberRole.Member
+                NtMemberRole.ADMIN -> MemberRole.Admin
+                NtMemberRole.OWNER -> MemberRole.Owner
+                null -> MemberRole.Unknown
+            },
+            unfriendly = false,
+            title = "",
+            titleExpireTime = 0,
+            cardChangeable = info.role == NtMemberRole.OWNER || info.role == NtMemberRole.ADMIN,
+            age = 0,
+            shutUpTimestamp = 0L
+        ).also {
+            if (info.specialTitleInfo != null) {
+                it.uniqueName = info.specialTitleInfo?.specialTitle ?: ""
+                it.title = info.specialTitleInfo?.specialTitle ?: ""
+                it.titleExpireTime = info.specialTitleInfo?.expireTimeSec ?: 0
+            }
+        }
+    }
+
+    private suspend fun oldQQApiData(groupId: Long, userId: Long, info: TroopMemberInfo): SimpleTroopMemberInfo {
+        return SimpleTroopMemberInfo(
+            uin = info.memberuin.toLong(),
+            name = info.friendnick.ifNullOrEmpty(info.autoremark) ?: "",
+            showName = info.troopnick.ifNullOrEmpty(info.troopColorNick),
+            cardName = info.troopnick.ifNullOrEmpty(info.troopColorNick),
+            distance = 0,
             honor = GroupSvc.parseHonor(info.honorList),
             joinTime = info.join_time,
             lastActiveTime = info.last_active_time,
@@ -48,7 +100,7 @@ internal object GetTroopMemberInfo : IActionHandler() {
                 Card.MALE -> "male"
                 else -> "unknown"
             },
-                area = info.alias ?: "",
+            area = "",
             lastSentTime = info.last_active_time,
             level = info.level,
             role = GroupSvc.getMemberRole(groupId, userId),
@@ -58,8 +110,12 @@ internal object GetTroopMemberInfo : IActionHandler() {
             cardChangeable = GroupSvc.isAdmin(groupId),
             age = info.age.toInt(),
             shutUpTimestamp = 0L
-            ), echo
-        )
+        ).also {
+            if (PlatformUtils.getQQVersionCode() <= QQ_9_0_71_VER) {
+                it.distance = info.distance
+                it.area = info.alias
+            }
+        }
     }
 
     override val requiredParams: Array<String> = arrayOf("user_id", "group_id")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ModifyTroopMemberName.kt

@@ -17,7 +17,7 @@ internal object ModifyTroopMemberName: IActionHandler() {
         return invoke(groupId, userId, name, session.echo)
     }
 
-    operator fun invoke(groupId: Long, userId: Long, card: String, echo: JsonElement = EmptyJsonString): String {
+    suspend operator fun invoke(groupId: Long, userId: Long, card: String, echo: JsonElement = EmptyJsonString): String {
         if (!GroupSvc.isAdmin(groupId) && userId != TicketSvc.getUin().toLong()) {
             return logic("you are not admin", echo)
         }

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ModifyTroopName.kt

@@ -16,7 +16,7 @@ internal object ModifyTroopName: IActionHandler() {
         return invoke(groupId, groupName, session.echo)
     }
 
-    operator fun invoke(groupId: Long, name: String, echo: JsonElement = EmptyJsonString): String {
+    suspend operator fun invoke(groupId: Long, name: String, echo: JsonElement = EmptyJsonString): String {
         return if (GroupSvc.isAdmin(groupId)) {
             GroupSvc.modifyTroopName(groupId, name)
             ok("成功", echo)

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/OcrImage.kt

@@ -9,7 +9,6 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.remote.action.ActionSession
@@ -17,6 +16,7 @@ import moe.fuqiuluo.shamrock.remote.action.IActionHandler
 import moe.fuqiuluo.shamrock.tools.EmptyJsonString
 import moe.fuqiuluo.shamrock.utils.FileUtils
 import moe.fuqiuluo.shamrock.utils.MD5
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.symbols.OneBotHandler
 import java.io.File
 import kotlin.coroutines.resume
@@ -55,7 +55,7 @@ internal object OcrImage: IActionHandler() {
     }
 
     private suspend fun getOcrResult(file: File): Result<OcrResult> {
-        val ocrService = BaseSvc.app.getRuntimeService(IPicOcrService::class.java, "all")
+        val ocrService = QQInterfaces.app.getRuntimeService(IPicOcrService::class.java, "all")
             ?: return Result.failure(Error("获取OCR服务失败"))
         return withTimeoutOrNull(5000) {
             suspendCancellableCoroutine { continuation ->

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMsgByResid.kt

@@ -2,11 +2,10 @@ package moe.fuqiuluo.shamrock.remote.action.handlers
 
 import kotlinx.atomicfu.atomic
 import kotlinx.serialization.json.JsonElement
-
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.shamrock.remote.action.ActionSession
 import moe.fuqiuluo.shamrock.remote.action.IActionHandler
 import moe.fuqiuluo.shamrock.tools.EmptyJsonString
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import moe.fuqiuluo.symbols.OneBotHandler
 import protobuf.auto.toByteArray
 import protobuf.message.*
@@ -51,7 +50,7 @@ internal object SendMsgByResid : IActionHandler() {
             msgRand = Random.nextUInt(),
             msgVia = 0u
         )
-        BaseSvc.sendBufferAW("MessageSvc.PbSendMsg", true, req.toByteArray())
+        QQInterfaces.sendBufferAW("MessageSvc.PbSendMsg", true, req.toByteArray())
         return ok("ok", echo)
     }
 

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/GenerateQSign.kt

@@ -39,7 +39,6 @@ import moe.fuqiuluo.shamrock.tools.hex2ByteArray
 import moe.fuqiuluo.shamrock.tools.json
 import moe.fuqiuluo.shamrock.tools.respond
 import moe.fuqiuluo.shamrock.tools.toHexString
-import moe.fuqiuluo.shamrock.xposed.ipc.ShamrockIpc
 import moe.fuqiuluo.shamrock.xposed.ipc.bytedata.IByteData
 import moe.fuqiuluo.shamrock.xposed.ipc.qsign.IQSigner
 import mqq.app.MobileQQ
@@ -113,10 +112,7 @@ fun Routing.qsign() {
             return@get
         }
         if (signer == null || signer?.asBinder()?.isBinderAlive == false) {
-            if (!initSigner()) {
-                respond(false, Status.InternalHandlerError)
-                return@get
-            }
+            call.respond(OldApiResult(-2, "不支持的操作", null))
         }
         val list = signer!!.cmdWhiteList
         call.respond(OldApiResult(0, "success", list))
@@ -128,10 +124,7 @@ fun Routing.qsign() {
             return@getOrPost
         }
         if (signer == null || signer?.asBinder()?.isBinderAlive == false) {
-            if (!initSigner()) {
-                respond(false, Status.InternalHandlerError)
-                return@getOrPost
-            }
+            call.respond(OldApiResult(-2, "不支持的操作", null))
         }
 
         val uin = fetchOrThrow("uin")
@@ -213,43 +206,7 @@ fun Routing.qsign() {
     }
 
     get("/get_byte") {
-        if (!isMsfServiceAlive()) {
-            call.respond(OldApiResult(-2, "MSF服务未启动", null))
-            return@get
-        }
-        if (byteData == null || byteData?.asBinder()?.isBinderAlive == false) {
-            val binder = ShamrockIpc.get(ShamrockIpc.IPC_BYTEDATA)
-            if (binder == null) {
-                call.respond(OldApiResult(-2, "获取失败", null))
-                return@get
-            } else {
-                byteData = IByteData.Stub.asInterface(binder)
-                binder.linkToDeath({
-                    byteData = null
-                }, 0)
-            }
-        }
-
-        val data = fetchGetOrThrow("data")
-        if(!(data.startsWith("810_") || data.startsWith("812_"))) {
-            call.respond(OldApiResult(-2, "data参数不合法", null))
-            return@get
-        }
-
-        val uin = fetchOrThrow("uin")
-        val salt = fetchSalt(data, uin)
-        if (salt.isEmpty()) {
-            call.respond(OldApiResult(-2, "无法自动决断mode，请主动提供", null))
-            return@get
-        }
-
-        val sign = byteData!!.sign(uin, data, salt).sign
-
-        if (sign == null) {
-            call.respond(OldApiResult(-2, "获取失败", null))
-        } else {
-            call.respond(OldApiResult(0, "success", sign.toHexString()))
-        }
+        call.respond(OldApiResult(-2, "不支持的操作", null))
     }
 
     get("/friend_sign") {
@@ -258,10 +215,7 @@ fun Routing.qsign() {
             return@get
         }
         if (signer == null || signer?.asBinder()?.isBinderAlive == false) {
-            if (!initSigner()) {
-                respond(false, Status.InternalHandlerError)
-                return@get
-            }
+            call.respond(OldApiResult(-2, "不支持的操作", null))
         }
 
         val addUin = fetchOrThrow("add_uin")
@@ -286,10 +240,7 @@ fun Routing.qsign() {
             return@get
         }
         if (signer == null || signer?.asBinder()?.isBinderAlive == false) {
-            if (!initSigner()) {
-                respond(false, Status.InternalHandlerError)
-                return@get
-            }
+            call.respond(OldApiResult(-2, "不支持的操作", null))
         }
 
         val addUin = fetchOrThrow("group_uin")
@@ -387,23 +338,6 @@ private data class Sign(
     val requestCallback: List<Int>
 )
 
-private suspend fun initSigner(): Boolean {
-    if (!isMsfServiceAlive()) {
-        return false
-    }
-    val binder = ShamrockIpc.get(ShamrockIpc.IPC_QSIGN)
-    if (binder == null) {
-        //respond(false, Status.InternalHandlerError)
-        return false
-    } else {
-        signer = IQSigner.Stub.asInterface(binder)
-        binder.linkToDeath({
-            signer = null
-        }, 0)
-        return true
-    }
-}
-
 private suspend fun PipelineContext<Unit, ApplicationCall>.requestSign(
     cmd: String,
     uin: String,
@@ -415,10 +349,7 @@ private suspend fun PipelineContext<Unit, ApplicationCall>.requestSign(
         return
     }
     if (signer == null || signer?.asBinder()?.isBinderAlive == false) {
-        if (!initSigner()) {
-            respond(false, Status.InternalHandlerError)
-            return
-        }
+        call.respond(OldApiResult(-2, "不支持的操作", null))
     }
 
     val sign = withTimeoutOrNull(5000) {

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/ProtocolAction.kt

@@ -2,13 +2,13 @@ package moe.fuqiuluo.shamrock.remote.api
 
 import com.tencent.mobileqq.dt.model.FEBound
 import io.ktor.server.routing.Routing
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.shamrock.remote.structures.Protocol
 import moe.fuqiuluo.shamrock.remote.structures.QSignDtConfig
 import moe.fuqiuluo.shamrock.remote.structures.Status
 import moe.fuqiuluo.shamrock.tools.*
 import moe.fuqiuluo.shamrock.utils.MMKVFetcher
 import moe.fuqiuluo.shamrock.utils.PlatformUtils
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import mqq.app.MobileQQ
 import oicq.wlogin_sdk.tlv_type.tlv_t100
 import oicq.wlogin_sdk.tlv_type.tlv_t106
@@ -20,8 +20,8 @@ fun Routing.obtainProtocolData() {
         val cmd = fetchOrThrow("cmd")
         val isPb = fetchOrThrow("proto").toBooleanStrict()
         val buffer = fetchOrThrow("buffer").hex2ByteArray()
-        val resp = BaseSvc.sendBufferAW(cmd, isPb, buffer)
-        respond(true, Status.Ok, data = resp?.toHexString() ?: "null", msg = "成功")
+        val resp = QQInterfaces.sendBufferAW(cmd, isPb, buffer)
+        respond(true, Status.Ok, data = resp?.wupBuffer?.toHexString() ?: "null", msg = "成功")
     }
 
     getOrPost("/set_guid") {

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/TestAction.kt

@@ -10,9 +10,7 @@ import moe.fuqiuluo.qqinterface.servlet.TicketSvc
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.helper.MessageHelper
-import moe.fuqiuluo.shamrock.remote.action.handlers.SendMsgByResid
 import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
-import moe.fuqiuluo.shamrock.tools.fetchOrNull
 import moe.fuqiuluo.shamrock.tools.fetchOrThrow
 import moe.fuqiuluo.shamrock.tools.getOrPost
 import moe.fuqiuluo.shamrock.xposed.helper.NTServiceFetcher

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/plugin/Auth.kt

@@ -6,7 +6,6 @@ import io.ktor.server.application.createApplicationPlugin
 import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
 import moe.fuqiuluo.shamrock.tools.fetchOrNull
 import java.net.URLDecoder
-import java.nio.charset.Charset
 
 private suspend fun ApplicationCall.checkToken() {
     val token = ShamrockConfig.getToken()

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/PacketReceiver.kt

@@ -1,69 +0,0 @@
-@file:OptIn(DelicateCoroutinesApi::class)
-
-package moe.fuqiuluo.shamrock.remote.service
-
-import com.tencent.qphone.base.remote.FromServiceMsg
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import moe.fuqiuluo.shamrock.tools.broadcast
-import moe.fuqiuluo.shamrock.helper.Level
-import moe.fuqiuluo.shamrock.helper.LogCenter
-import moe.fuqiuluo.shamrock.xposed.helper.internal.DynamicReceiver
-import moe.fuqiuluo.shamrock.xposed.helper.internal.IPCRequest
-import mqq.app.MobileQQ
-
-internal object PacketReceiver {
-    private val allowCommandList: MutableSet<String> by lazy { mutableSetOf(
-        "trpc.msg.olpush.OlPushService.MsgPush",
-
-    ) } // 非动态注册，永久常驻的包
-    private val HandlerByIpcSet = hashSetOf<String>()
-
-    fun init() {
-        DynamicReceiver.register("register_handler_cmd", IPCRequest {
-            val cmd = it.getStringExtra("handler_cmd")!!
-            LogCenter.log({ "RegisterHandler(cmd = $cmd)" }, Level.DEBUG)
-            HandlerByIpcSet.add(cmd)
-        })
-        DynamicReceiver.register("unregister_handler_cmd", IPCRequest {
-            val cmd = it.getStringExtra("handler_cmd")!!
-            LogCenter.log({ "UnRegisterHandler(cmd = $cmd)" }, Level.DEBUG)
-            HandlerByIpcSet.remove(cmd)
-        })
-        MobileQQ.getContext().broadcast("xqbot") {
-            putExtra("__cmd", "msf_waiter")
-            LogCenter.log("MSF Packet Receiver running!")
-        }
-    }
-
-    private fun onReceive(from: FromServiceMsg) {
-        if (HandlerByIpcSet.contains(from.serviceCmd)
-            || allowCommandList.contains(from.serviceCmd)
-        ) {
-            LogCenter.log({ "ReceivePacket(cmd = ${from.serviceCmd})" }, Level.DEBUG)
-            MobileQQ.getContext().broadcast("xqbot") {
-                putExtra("__cmd", from.serviceCmd)
-                putExtra("buffer", from.wupBuffer)
-                putExtra("seq", from.requestSsoSeq)
-            }
-        } else {
-            val seq = if (from.appSeq == -1) from.requestSsoSeq else from.appSeq
-            val hash = (from.serviceCmd + seq).hashCode()
-            LogCenter.log({ "ReceivePacket[$hash](cmd = ${from.serviceCmd}, seq = $seq)" }, Level.DEBUG)
-            MobileQQ.getContext().broadcast("xqbot") {
-                putExtra("__hash", hash)
-                putExtra("buffer", from.wupBuffer)
-                putExtra("seq", seq)
-            }
-        }
-    }
-
-    fun internalOnReceive(from: FromServiceMsg?) {
-        if (from == null) return
-        GlobalScope.launch(Dispatchers.Default) {
-            onReceive(from)
-        }
-    }
-}

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt

@@ -9,7 +9,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
-import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.qqinterface.servlet.CardSvc
 import moe.fuqiuluo.qqinterface.servlet.GroupSvc
 import moe.fuqiuluo.qqinterface.servlet.msg.toSegments
@@ -35,9 +34,10 @@ import moe.fuqiuluo.shamrock.remote.service.data.push.Sender
 import moe.fuqiuluo.shamrock.remote.service.data.push.SignDetail
 import moe.fuqiuluo.shamrock.tools.ShamrockDsl
 import moe.fuqiuluo.shamrock.tools.json
+import moe.fuqiuluo.shamrock.xposed.helper.QQInterfaces
 import java.util.ArrayList
 
-internal object GlobalEventTransmitter: BaseSvc() {
+internal object GlobalEventTransmitter: QQInterfaces() {
     private val messageEventFlow by lazy {
         MutableSharedFlow<Pair<MsgRecord, MessageEvent>>()
     }

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/config/ShamrockConfig.kt

@@ -1,284 +1,13 @@
 package moe.fuqiuluo.shamrock.remote.service.config
 
 import android.content.Intent
-import com.tencent.mmkv.MMKV
 import de.robv.android.xposed.XposedBridge
 import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import moe.fuqiuluo.qqinterface.servlet.transfile.NtV2RichMediaSvc
-import moe.fuqiuluo.shamrock.helper.Level
-import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.tools.GlobalJson5
-import moe.fuqiuluo.shamrock.utils.MMKVFetcher
+import moe.fuqiuluo.shamrock.xposed.loader.LuoClassloader.moduleLoader
 import mqq.app.MobileQQ
-import java.io.File
+import java.util.Properties
 
-internal object ShamrockConfig {
-    private val ConfigDir = MobileQQ.getContext().getExternalFilesDir(null)!!
-        .parentFile!!.resolve("Tencent/Shamrock").also {
-            if (it.exists()) it.delete()
-            it.mkdirs()
-        }
-    private val config = kotlin.runCatching {
-        GlobalJson5.decodeFromString<ServiceConfig>(ConfigDir.resolve("config.json").also {
-            if (!it.exists()) it.writeText("{}")
-        }.readText())
-    }.onFailure {
-        LogCenter.log("您的配置文件出现错误: ${it.stackTraceToString()}", Level.ERROR)
-    }.getOrElse {
-        ServiceConfig()
-    }
+internal object ShamrockConfig: ShamrockConfigV0() {
 
-    fun isInit(): Boolean {
-        val mmkv = MMKVFetcher.mmkvWithId("shamrock_config")
-        return mmkv.getBoolean("isInit", false)
-    }
-
-    private fun updateConfig(config: ServiceConfig = this.config) {
-        ConfigDir.resolve("config.json").writeText(GlobalJson5.encodeToString(config))
-    }
-
-    fun updateConfig(intent: Intent) {
-        mmkv.apply {
-            if (!intent.getBooleanExtra("disable_auto_sync_setting", false)) {
-                putBoolean("tablet", intent.getBooleanExtra("tablet", false))                 // 强制平板模式
-                putInt("port", intent.getIntExtra("port", 5700))                        // 主动HTTP端口
-                putBoolean("ws", intent.getBooleanExtra("ws", false))                     // 主动WS开关
-                putBoolean("http", intent.getBooleanExtra("http", false))                   // HTTP回调开关
-                putString("http_addr", intent.getStringExtra("http_addr"))                                // WebHook回调地址
-                putBoolean("ws_client", intent.getBooleanExtra("ws_client", false))              // 被动WS开关
-                putBoolean("use_cqcode", intent.getBooleanExtra("use_cqcode", false))             // 使用CQ码
-                putBoolean("inject_packet", intent.getBooleanExtra("inject_packet", false))    // 拦截无用包
-                putBoolean("debug", intent.getBooleanExtra("debug", false))                  // 调试模式
-                putString(  "key_store",   intent.getStringExtra("key_store"))                                // 证书路径
-                putString(  "ssl_pwd",     intent.getStringExtra("ssl_pwd"))                                  // 证书密码
-                putString(  "ssl_private_pwd",   intent.getStringExtra("ssl_private_pwd"))                    // 证书私钥密码
-                putString(  "ssl_alias",   intent.getStringExtra("ssl_alias"))                                // 证书别名
-                putInt(     "ssl_port",    intent.getIntExtra("ssl_port", 5701))                    // 主动HTTP端口
-                putBoolean("alive_reply",   intent.getBooleanExtra("alive_reply", false))             // 自回复测试
-                putBoolean("enable_self_msg",    intent.getBooleanExtra("enable_self_msg", false))  // 推送自己发的消息
-                putBoolean("shell",        intent.getBooleanExtra("shell", false))                  // 开启Shell接口
-                putBoolean("enable_sync_msg_as_sent_msg", intent.getBooleanExtra("enable_sync_msg_as_sent_msg", false)) // 推送同步消息
-                putBoolean("forbid_useless_process", intent.getBooleanExtra("forbid_useless_process", false)) // 禁用QQ生成无用进程
-                putBoolean("enable_old_bdh", intent.getBooleanExtra("enable_old_bdh", false)) // 启用旧版BDH
-                intent.getStringExtra("up_res_group")?.let { putString("up_res_group", it) }
-            } else {
-                XposedBridge.log("[Shamrock] 已禁用自动同步配置")
-            }
-            config.defaultToken = intent.getStringExtra("token")
-            config.antiTrace = intent.getBooleanExtra("anti_qq_trace", true)
-            val wsPort = intent.getIntExtra("ws_port", 5800)
-            config.activeWebSocket = if (config.activeWebSocket == null) ConnectionConfig(
-                address = "0.0.0.0",
-                port = wsPort,
-            ) else config.activeWebSocket?.also {
-                it.port = wsPort
-            }
-            config.passiveWebSocket = intent.getStringExtra("ws_addr")?.split(",", "|", "，")?.filter { address ->
-                address.isNotBlank() && (address.startsWith("ws://") || address.startsWith("wss://"))
-            }?.map {
-                ConnectionConfig(address = it)
-            }?.toMutableList()
-            putBoolean("isInit", true)
-        }
-        if (!intent.getBooleanExtra("disable_auto_sync_setting", false)) {
-            updateConfig()
-        }
-    }
-
-    fun putDefaultSettings() {
-        val mmkv = MMKVFetcher.mmkvWithId("shamrock_config")
-        if ((!isInit()) && (!mmkv.getBoolean("isEmergencyInitBefore", false))){
-            mmkv.apply {
-                putBoolean("tablet", false)    // 强制平板模式
-                putInt("port", 5700)            // 主动HTTP端口
-                putBoolean("ws", false)        // 主动WS开关
-                putBoolean("http", false)      // HTTP回调开关
-                putString("http_addr", null)  // WebHook回调地址
-                putBoolean("ws_client", false) // 被动WS开关
-                putBoolean("use_cqcode", false) // 使用CQ码
-                putBoolean("inject_packet", false)    // 拦截无用包
-                putBoolean("debug", false)      // 调试模式
-                putString("key_store", null) // 证书路径
-                putString("ssl_pwd", null) // 证书密码
-                putString("ssl_private_pwd", null) // 证书私钥密码
-                putString("ssl_alias", null) // 证书别名
-                putInt("ssl_port", 5701) // 主动HTTP端口
-                putBoolean("alive_reply", true) // 自回复测试
-                putBoolean("enable_self_msg", false) // 推送自己发的消息
-                putBoolean("shell", false) // 开启Shell接口
-                putBoolean("enable_sync_msg_as_sent_msg", true) // 推送同步消息
-                putBoolean("forbid_useless_process", false) // 禁用QQ生成无用进程
-                putBoolean("enable_old_bdh", false) // 启用旧版BDH
-                putBoolean("antiTrace", false)
-                putBoolean("super_anti", true)
-                putString("up_res_group", "")
-
-                config.defaultToken = null
-                // config.antiTrace = true
-                val wsPort = 5800
-                config.activeWebSocket =
-                    if (config.activeWebSocket == null) ConnectionConfig(
-                        address = "0.0.0.0",
-                        port = wsPort,
-                    ) else config.activeWebSocket?.also {
-                        it.port = wsPort
-                    }
-                config.passiveWebSocket = null
-                putBoolean("isInit", true)
-                putBoolean("isEmergencyInitBefore", true)
-            }
-            XposedBridge.log("[Shamrock] 强制初始化配置完成,请重新打开QQ")
-        } else {
-            XposedBridge.log("[Shamrock] 程序逻辑错误或错误地多次强制初始化")
-            mmkv.putBoolean("isEmergencyInitBefore", false)
-            XposedBridge.log("[Shamrock] 如果执意要再次强制初始化,请重新执行程序")
-        }
-    }
-
-    private val mmkv: MMKV
-        get() = MMKVFetcher.mmkvWithId("shamrock_config")
-
-    fun getUpResGroup(): String {
-        return mmkv.getString("up_res_group", "") ?: ""
-    }
-
-    fun aliveReply(): Boolean {
-        return mmkv.getBoolean("alive_reply", false)
-    }
-
-    fun allowTempSession(): Boolean {
-        return config.allowTempSession
-    }
-
-    fun getGroupMsgRule(): GroupRule? {
-        return config.rules?.groupRule
-    }
-
-    fun getPrivateRule(): PrivateRule? {
-        return config.rules?.privateRule
-    }
-
-    fun enableSyncMsgAsSentMsg(): Boolean {
-        return mmkv.getBoolean("enable_sync_msg_as_sent_msg", false)
-    }
-
-    fun enableSelfMsg(): Boolean {
-        return mmkv.getBoolean("enable_self_msg", false)
-    }
-
-    fun forbidUselessProcess(): Boolean {
-        return mmkv.getBoolean("forbid_useless_process", false)
-    }
-
-    fun openWebSocketClient(): Boolean {
-        return mmkv.getBoolean("ws_client", false)
-    }
-
-    fun getWebSocketClientAddress(): List<ConnectionConfig> {
-        return config.passiveWebSocket ?: emptyList()
-    }
-
-    fun openWebSocket(): Boolean {
-        return mmkv.getBoolean("ws", false)
-    }
-
-    fun getActiveWebSocketConfig(): ConnectionConfig? {
-        return config.activeWebSocket
-    }
-
-    fun getToken(): String {
-        return config.defaultToken ?: ""
-    }
-
-    fun useCQ(): Boolean {
-        return mmkv.getBoolean("use_cqcode", false)
-    }
-
-    fun allowWebHook(): Boolean {
-        return mmkv.getBoolean("http", false)
-    }
-
-    fun getWebHookAddress(): String {
-        return mmkv.getString("http_addr", "") ?: ""
-    }
-
-    fun forceTablet(): Boolean {
-        return mmkv.getBoolean("tablet", true)
-    }
-
-    fun getPort(): Int {
-        return mmkv.getInt("port", 5700)
-    }
-
-    fun isInjectPacket(): Boolean {
-        return mmkv.getBoolean("inject_packet", false)
-    }
-
-    fun enableOldBDH(): Boolean {
-        return mmkv.getBoolean("enable_old_bdh", false)
-    }
-
-    fun isDebug(): Boolean {
-        return mmkv.getBoolean("debug", false)
-    }
-
-    fun ssl(): Boolean {
-        return getKeyStorePath()?.exists() == true
-    }
-
-    fun getKeyStorePath(): File? {
-        mmkv.getString("key_store", null)?.let {
-            return File(it)
-        }
-        return null
-    }
-
-    fun sslPwd(): CharArray? {
-        return mmkv.getString("ssl_pwd", null)?.toCharArray()
-    }
-
-    fun sslPrivatePwd(): String? {
-        return mmkv.getString("ssl_private_pwd", null)
-    }
-
-    fun sslAlias(): String? {
-        return mmkv.getString("ssl_alias", null)
-    }
-
-    fun getSslPort(): Int {
-        return mmkv.getInt("ssl_port", getPort())
-    }
-
-    fun isDev(): Boolean {
-        return mmkv.getBoolean("dev", false)
-    }
-
-    operator fun set(key: String, value: String) {
-        mmkv.putString(key, value)
-    }
-
-    operator fun set(key: String, value: Boolean) {
-        mmkv.putBoolean(key, value)
-    }
-
-    operator fun set(key: String, value: Int) {
-        mmkv.putInt(key, value)
-    }
-
-    operator fun set(key: String, value: Long) {
-        mmkv.putLong(key, value)
-    }
-
-    operator fun set(key: String, value: Float) {
-        mmkv.putFloat(key, value)
-    }
-
-    fun isAntiTrace(): Boolean {
-        return config.antiTrace
-    }
-
-    fun allowShell(): Boolean {
-        return mmkv.getBoolean("shell", false)
-    }
 }

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/config/ShamrockConfigV0.kt

@@ -0,0 +1,285 @@
+package moe.fuqiuluo.shamrock.remote.service.config
+
+import android.content.Intent
+import com.tencent.mmkv.MMKV
+import de.robv.android.xposed.XposedBridge
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import moe.fuqiuluo.shamrock.helper.Level
+import moe.fuqiuluo.shamrock.helper.LogCenter
+import moe.fuqiuluo.shamrock.tools.GlobalJson5
+import moe.fuqiuluo.shamrock.tools.toast
+import moe.fuqiuluo.shamrock.utils.MMKVFetcher
+import mqq.app.MobileQQ
+import java.io.File
+
+internal abstract class ShamrockConfigV0 {
+    private val configDir = MobileQQ.getContext().getExternalFilesDir(null)!!
+        .parentFile!!.resolve("Tencent/Shamrock").also {
+            if (it.exists()) it.delete()
+            it.mkdirs()
+        }
+    private val config = kotlin.runCatching {
+        GlobalJson5.decodeFromString<ServiceConfig>(configDir.resolve("config.json").also {
+            if (!it.exists()) it.writeText("{}")
+        }.readText())
+    }.onFailure {
+        LogCenter.log("您的配置文件出现错误: ${it.stackTraceToString()}", Level.ERROR)
+    }.getOrElse {
+        ServiceConfig()
+    }
+
+    fun isInit(): Boolean {
+        val mmkv = MMKVFetcher.mmkvWithId("shamrock_config")
+        return mmkv.getBoolean("isInit", false)
+    }
+
+    private fun updateConfig(config: ServiceConfig = this.config) {
+        configDir.resolve("config.json").writeText(GlobalJson5.encodeToString(config))
+    }
+
+    fun updateConfig(intent: Intent) {
+        MobileQQ.getContext().toast("同步配置数据解析中...")
+        mmkv.apply {
+            if (!intent.getBooleanExtra("disable_auto_sync_setting", false)) {
+                putBoolean("tablet", intent.getBooleanExtra("tablet", false))                 // 强制平板模式
+                putInt("port", intent.getIntExtra("port", 5700))                        // 主动HTTP端口
+                putBoolean("ws", intent.getBooleanExtra("ws", false))                     // 主动WS开关
+                putBoolean("http", intent.getBooleanExtra("http", false))                   // HTTP回调开关
+                putString("http_addr", intent.getStringExtra("http_addr"))                                // WebHook回调地址
+                putBoolean("ws_client", intent.getBooleanExtra("ws_client", false))              // 被动WS开关
+                putBoolean("use_cqcode", intent.getBooleanExtra("use_cqcode", false))             // 使用CQ码
+                putBoolean("inject_packet", intent.getBooleanExtra("inject_packet", false))    // 拦截无用包
+                putBoolean("debug", intent.getBooleanExtra("debug", false))                  // 调试模式
+                putString(  "key_store",   intent.getStringExtra("key_store"))                                // 证书路径
+                putString(  "ssl_pwd",     intent.getStringExtra("ssl_pwd"))                                  // 证书密码
+                putString(  "ssl_private_pwd",   intent.getStringExtra("ssl_private_pwd"))                    // 证书私钥密码
+                putString(  "ssl_alias",   intent.getStringExtra("ssl_alias"))                                // 证书别名
+                putInt(     "ssl_port",    intent.getIntExtra("ssl_port", 5701))                    // 主动HTTP端口
+                putBoolean("alive_reply",   intent.getBooleanExtra("alive_reply", false))             // 自回复测试
+                putBoolean("enable_self_msg",    intent.getBooleanExtra("enable_self_msg", false))  // 推送自己发的消息
+                putBoolean("shell",        intent.getBooleanExtra("shell", false))                  // 开启Shell接口
+                putBoolean("enable_sync_msg_as_sent_msg", intent.getBooleanExtra("enable_sync_msg_as_sent_msg", false)) // 推送同步消息
+                putBoolean("forbid_useless_process", intent.getBooleanExtra("forbid_useless_process", false)) // 禁用QQ生成无用进程
+                putBoolean("enable_old_bdh", intent.getBooleanExtra("enable_old_bdh", false)) // 启用旧版BDH
+                intent.getStringExtra("up_res_group")?.let { putString("up_res_group", it) }
+            } else {
+                XposedBridge.log("[Shamrock] 已禁用自动同步配置")
+            }
+            config.defaultToken = intent.getStringExtra("token")
+            config.antiTrace = intent.getBooleanExtra("anti_qq_trace", true)
+            val wsPort = intent.getIntExtra("ws_port", 5800)
+            config.activeWebSocket = if (config.activeWebSocket == null) ConnectionConfig(
+                address = "0.0.0.0",
+                port = wsPort,
+            ) else config.activeWebSocket?.also {
+                it.port = wsPort
+            }
+            config.passiveWebSocket = intent.getStringExtra("ws_addr")?.split(",", "|", "，")?.filter { address ->
+                address.isNotBlank() && (address.startsWith("ws://") || address.startsWith("wss://"))
+            }?.map {
+                ConnectionConfig(address = it)
+            }?.toMutableList()
+            putBoolean("isInit", true)
+        }
+        if (!intent.getBooleanExtra("disable_auto_sync_setting", false)) {
+            updateConfig()
+        }
+    }
+
+    fun putDefaultSettings() {
+        val mmkv = MMKVFetcher.mmkvWithId("shamrock_config")
+        if ((!isInit()) && (!mmkv.getBoolean("isEmergencyInitBefore", false))){
+            mmkv.apply {
+                putBoolean("tablet", false)    // 强制平板模式
+                putInt("port", 5700)            // 主动HTTP端口
+                putBoolean("ws", false)        // 主动WS开关
+                putBoolean("http", false)      // HTTP回调开关
+                putString("http_addr", null)  // WebHook回调地址
+                putBoolean("ws_client", false) // 被动WS开关
+                putBoolean("use_cqcode", false) // 使用CQ码
+                putBoolean("inject_packet", false)    // 拦截无用包
+                putBoolean("debug", false)      // 调试模式
+                putString("key_store", null) // 证书路径
+                putString("ssl_pwd", null) // 证书密码
+                putString("ssl_private_pwd", null) // 证书私钥密码
+                putString("ssl_alias", null) // 证书别名
+                putInt("ssl_port", 5701) // 主动HTTP端口
+                putBoolean("alive_reply", true) // 自回复测试
+                putBoolean("enable_self_msg", false) // 推送自己发的消息
+                putBoolean("shell", false) // 开启Shell接口
+                putBoolean("enable_sync_msg_as_sent_msg", true) // 推送同步消息
+                putBoolean("forbid_useless_process", false) // 禁用QQ生成无用进程
+                putBoolean("enable_old_bdh", false) // 启用旧版BDH
+                putBoolean("antiTrace", false)
+                putBoolean("super_anti", true)
+                putString("up_res_group", "")
+
+                config.defaultToken = null
+                // config.antiTrace = true
+                val wsPort = 5800
+                config.activeWebSocket =
+                    if (config.activeWebSocket == null) ConnectionConfig(
+                        address = "0.0.0.0",
+                        port = wsPort,
+                    ) else config.activeWebSocket?.also {
+                        it.port = wsPort
+                    }
+                config.passiveWebSocket = null
+                putBoolean("isInit", true)
+                putBoolean("isEmergencyInitBefore", true)
+            }
+            XposedBridge.log("[Shamrock] 强制初始化配置完成,请重新打开QQ")
+        } else {
+            XposedBridge.log("[Shamrock] 程序逻辑错误或错误地多次强制初始化")
+            mmkv.putBoolean("isEmergencyInitBefore", false)
+            XposedBridge.log("[Shamrock] 如果执意要再次强制初始化,请重新执行程序")
+        }
+    }
+
+    protected val mmkv: MMKV
+        get() = MMKVFetcher.mmkvWithId("shamrock_config")
+
+    fun getUpResGroup(): String {
+        return mmkv.getString("up_res_group", "") ?: ""
+    }
+
+    fun aliveReply(): Boolean {
+        return mmkv.getBoolean("alive_reply", false)
+    }
+
+    fun allowTempSession(): Boolean {
+        return config.allowTempSession
+    }
+
+    fun getGroupMsgRule(): GroupRule? {
+        return config.rules?.groupRule
+    }
+
+    fun getPrivateRule(): PrivateRule? {
+        return config.rules?.privateRule
+    }
+
+    fun enableSyncMsgAsSentMsg(): Boolean {
+        return mmkv.getBoolean("enable_sync_msg_as_sent_msg", false)
+    }
+
+    fun enableSelfMsg(): Boolean {
+        return mmkv.getBoolean("enable_self_msg", false)
+    }
+
+    fun forbidUselessProcess(): Boolean {
+        return mmkv.getBoolean("forbid_useless_process", false)
+    }
+
+    fun openWebSocketClient(): Boolean {
+        return mmkv.getBoolean("ws_client", false)
+    }
+
+    fun getWebSocketClientAddress(): List<ConnectionConfig> {
+        return config.passiveWebSocket ?: emptyList()
+    }
+
+    fun openWebSocket(): Boolean {
+        return mmkv.getBoolean("ws", false)
+    }
+
+    fun getActiveWebSocketConfig(): ConnectionConfig? {
+        return config.activeWebSocket
+    }
+
+    fun getToken(): String {
+        return config.defaultToken ?: ""
+    }
+
+    fun useCQ(): Boolean {
+        return mmkv.getBoolean("use_cqcode", false)
+    }
+
+    fun allowWebHook(): Boolean {
+        return mmkv.getBoolean("http", false)
+    }
+
+    fun getWebHookAddress(): String {
+        return mmkv.getString("http_addr", "") ?: ""
+    }
+
+    fun forceTablet(): Boolean {
+        return mmkv.getBoolean("tablet", true)
+    }
+
+    fun getPort(): Int {
+        return mmkv.getInt("port", 5700)
+    }
+
+    fun isInjectPacket(): Boolean {
+        return mmkv.getBoolean("inject_packet", false)
+    }
+
+    fun enableOldBDH(): Boolean {
+        return mmkv.getBoolean("enable_old_bdh", false)
+    }
+
+    fun isDebug(): Boolean {
+        return mmkv.getBoolean("debug", false)
+    }
+
+    fun ssl(): Boolean {
+        return getKeyStorePath()?.exists() == true
+    }
+
+    fun getKeyStorePath(): File? {
+        mmkv.getString("key_store", null)?.let {
+            return File(it)
+        }
+        return null
+    }
+
+    fun sslPwd(): CharArray? {
+        return mmkv.getString("ssl_pwd", null)?.toCharArray()
+    }
+
+    fun sslPrivatePwd(): String? {
+        return mmkv.getString("ssl_private_pwd", null)
+    }
+
+    fun sslAlias(): String? {
+        return mmkv.getString("ssl_alias", null)
+    }
+
+    fun getSslPort(): Int {
+        return mmkv.getInt("ssl_port", getPort())
+    }
+
+    fun isDev(): Boolean {
+        return mmkv.getBoolean("dev", false)
+    }
+
+    operator fun set(key: String, value: String) {
+        mmkv.putString(key, value)
+    }
+
+    operator fun set(key: String, value: Boolean) {
+        mmkv.putBoolean(key, value)
+    }
+
+    operator fun set(key: String, value: Int) {
+        mmkv.putInt(key, value)
+    }
+
+    operator fun set(key: String, value: Long) {
+        mmkv.putLong(key, value)
+    }
+
+    operator fun set(key: String, value: Float) {
+        mmkv.putFloat(key, value)
+    }
+
+    fun isAntiTrace(): Boolean {
+        return config.antiTrace
+    }
+
+    fun allowShell(): Boolean {
+        return mmkv.getBoolean("shell", false)
+    }
+}

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/TroopData.kt

@@ -27,18 +27,18 @@ internal data class SimpleTroopMemberInfo(
     @SerialName("user_name") val name: String,
     @SerialName("sex") val sex: String,
     @SerialName("age") val age: Int,
-    @SerialName("title") val title: String,
-    @SerialName("title_expire_time") val titleExpireTime: Int,
+    @SerialName("title") var title: String?,
+    @SerialName("title_expire_time") var titleExpireTime: Int,
     @SerialName("nickname") val nick: String,
     @SerialName("user_displayname") val showName: String?,
     @SerialName("card") val cardName: String?,
-    @SerialName("distance") val distance: Int,
+    @SerialName("distance") var distance: Int,
     @SerialName("honor") val honor: List<Int>,
     @SerialName("join_time") val joinTime: Long,
     @SerialName("last_active_time") val lastActiveTime: Long,
     @SerialName("last_sent_time") val lastSentTime: Long,
-    @SerialName("unique_name") val uniqueName: String?,
-    @SerialName("area") val area: String,
+    @SerialName("unique_name") var uniqueName: String?,
+    @SerialName("area") var area: String,
     @SerialName("level") val level: Int,
     @SerialName("role") val role: MemberRole,
     @SerialName("unfriendly") val unfriendly: Boolean,

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt

@@ -8,6 +8,7 @@ import com.tencent.qqnt.kernelpublic.nativeinterface.Contact
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import moe.fuqiuluo.qqinterface.servlet.GroupSvc
 import moe.fuqiuluo.qqinterface.servlet.MsgSvc
 import moe.fuqiuluo.qqinterface.servlet.TicketSvc
 import moe.fuqiuluo.qqinterface.servlet.msg.MessageTempHandler
@@ -21,8 +22,9 @@ import moe.fuqiuluo.shamrock.remote.service.api.GlobalEventTransmitter
 import moe.fuqiuluo.qqinterface.servlet.transfile.RichMediaUploadHandler
 import moe.fuqiuluo.shamrock.remote.service.data.push.MessageTempSource
 import moe.fuqiuluo.shamrock.remote.service.data.push.PostType
+import moe.fuqiuluo.shamrock.utils.PlatformUtils
+import moe.fuqiuluo.shamrock.utils.PlatformUtils.QQ_9_0_8_VER
 import java.util.ArrayList
-import java.util.Collections
 import kotlin.collections.HashMap
 
 internal object AioListener : IKernelMsgListener {
@@ -40,6 +42,7 @@ internal object AioListener : IKernelMsgListener {
         try {
             if (MessageTempHandler.notify(record)) return
             if (record.msgSeq < 0) return
+            if (record.chatType == MsgConstant.KCHATTYPETEMPPUBLICACCOUNT) return // 订阅号不处理
 
             val msgHash = MessageHelper.generateMsgIdHash(record.chatType, record.msgId)
 
@@ -63,7 +66,9 @@ internal object AioListener : IKernelMsgListener {
 
             if (ShamrockConfig.aliveReply() && rawMsg == "ping") {
                 MessageHelper.sendMessageWithoutMsgId(record.chatType, record.peerUin.toString(), "pong", { _, _ -> })
-            }
+            } /*else if (ShamrockConfig.aliveReply() && rawMsg == ".shamrock.at_me") {
+                MessageHelper.sendMessageWithoutMsgId(record.chatType, record.peerUin.toString(), "[CQ:at,qq=${record.senderUin}]", { _, _ -> })
+            }*/
 
 
             val postType = if (record.senderUin == TicketSvc.getLongUin() && ShamrockConfig.enableSyncMsgAsSentMsg()) {

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/KernelGuildListener.kt

@@ -12,12 +12,12 @@ import com.tencent.qqnt.kernel.nativeinterface.GProCreateGuildGuideInfo
 import com.tencent.qqnt.kernel.nativeinterface.GProDailyRecommendPush
 import com.tencent.qqnt.kernel.nativeinterface.GProDiscoveryStateChangedMsg
 import com.tencent.qqnt.kernel.nativeinterface.GProGlobalBanner
-import com.tencent.qqnt.kernel.nativeinterface.GProGuild
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuild
 import com.tencent.qqnt.kernel.nativeinterface.GProGuildData
 import com.tencent.qqnt.kernel.nativeinterface.GProGuildInit
 import com.tencent.qqnt.kernel.nativeinterface.GProGuildListSortInfo
 import com.tencent.qqnt.kernel.nativeinterface.GProGuildMemberCountInfo
-import com.tencent.qqnt.kernel.nativeinterface.GProGuildRole
+import com.tencent.qqnt.kernelgpro.nativeinterface.GProGuildRole
 import com.tencent.qqnt.kernel.nativeinterface.GProGuildSpeakableThreshold
 import com.tencent.qqnt.kernel.nativeinterface.GProGuildStateRspInfo
 import com.tencent.qqnt.kernel.nativeinterface.GProGuildUserProfile
@@ -49,7 +49,6 @@ import com.tencent.qqnt.kernel.nativeinterface.GProVoiceSmobaGameUserActionPush
 import com.tencent.qqnt.kernel.nativeinterface.GProWorldState
 import com.tencent.qqnt.kernel.nativeinterface.GProYLGameTeamInfo
 import com.tencent.qqnt.kernel.nativeinterface.IKernelGuildListener
-import moe.fuqiuluo.shamrock.helper.LogCenter
 import java.util.ArrayList
 import java.util.HashMap
 

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/PrimitiveListener.kt

@@ -1,5 +1,6 @@
 package moe.fuqiuluo.shamrock.remote.service.listener
 
+import com.tencent.qphone.base.remote.FromServiceMsg
 import com.tencent.qqnt.kernel.nativeinterface.MsgConstant
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -24,7 +25,6 @@ import moe.fuqiuluo.shamrock.tools.asJsonObject
 import moe.fuqiuluo.shamrock.tools.asString
 import moe.fuqiuluo.shamrock.tools.readBuf32Long
 import moe.fuqiuluo.shamrock.tools.slice
-import moe.fuqiuluo.shamrock.xposed.helper.PacketHandler
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.message.ContentHead
 import protobuf.message.MsgBody
@@ -32,18 +32,18 @@ import protobuf.message.ResponseHead
 import protobuf.push.*
 
 internal object PrimitiveListener {
-    fun registerListener() {
-        PacketHandler.register("trpc.msg.olpush.OlPushService.MsgPush") { _, buffer ->
-            GlobalScope.launch {
+    fun onPush(fromServiceMsg: FromServiceMsg) {
+        if (fromServiceMsg.wupBuffer == null) return
         try {
-                    val push = buffer.slice(4).decodeProtobuf<MessagePush>()
+            val push = fromServiceMsg.wupBuffer.slice(4)
+                .decodeProtobuf<MessagePush>()
+            GlobalScope.launch {
                 onMsgPush(push)
+            }
         } catch (e: Exception) {
             LogCenter.log(e.stackTraceToString(), Level.WARN)
         }
     }
-        }
-    }
 
     private suspend fun onMsgPush(push: MessagePush) {
         if (
@@ -188,6 +188,8 @@ internal object PrimitiveListener {
     }
 
     private suspend fun onGroupUniqueTitleChange(msgTime: Long, body: MsgBody) {
+        if (body.msgContent == null) return
+
         val event = runCatching {
             body.msgContent!!.decodeProtobuf<GroupCommonTipsEvent>()
         }.getOrElse {
@@ -200,6 +202,7 @@ internal object PrimitiveListener {
             }.decodeProtobuf<GroupCommonTipsEvent>()
         }
         val groupId = event.groupCode.toLong()
+        if (event.uniqueTitleChangeDetail == null) return
         val detail = event.uniqueTitleChangeDetail!!.first()
 
         //detail = if (detail[5] is ProtoList) {

xposed/src/main/java/moe/fuqiuluo/shamrock/tools/AndroidX.kt

@@ -0,0 +1,16 @@
+package moe.fuqiuluo.shamrock.tools
+
+import android.content.Context
+import android.os.Handler
+import android.widget.Toast
+import de.robv.android.xposed.XposedBridge
+
+lateinit var GlobalUi: Handler
+
+internal fun Context.toast(msg: String, flag: Int = Toast.LENGTH_SHORT) {
+    XposedBridge.log(msg)
+    if (!::GlobalUi.isInitialized) {
+        return
+    }
+    GlobalUi.post { Toast.makeText(this, msg, flag).show() }
+}

xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Trpc.kt

@@ -0,0 +1,59 @@
+package moe.fuqiuluo.shamrock.tools
+
+import com.tencent.mobileqq.pb.MessageMicro
+import com.tencent.qphone.base.remote.FromServiceMsg
+import moe.fuqiuluo.shamrock.helper.Level
+import moe.fuqiuluo.shamrock.helper.LogCenter
+import moe.fuqiuluo.shamrock.utils.DeflateTools
+import moe.fuqiuluo.symbols.Protobuf
+import moe.fuqiuluo.symbols.decodeProtobuf
+import protobuf.oidb.TrpcOidb
+import tencent.im.oidb.oidb_sso
+
+fun FromServiceMsg.decodeToOidb(): oidb_sso.OIDBSSOPkg {
+    return kotlin.runCatching {
+        oidb_sso.OIDBSSOPkg().mergeFrom(wupBuffer.slice(4).let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        })
+    }.getOrElse {
+        oidb_sso.OIDBSSOPkg().mergeFrom(wupBuffer.let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        })
+    }
+}
+
+fun FromServiceMsg.decodeToTrpcOidb(): TrpcOidb {
+    return kotlin.runCatching {
+        wupBuffer.slice(4).let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        }.decodeProtobuf<TrpcOidb>()
+    }.getOrElse {
+        wupBuffer.let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        }.decodeProtobuf<TrpcOidb>()
+    }
+}
+
+inline fun <reified T: Protobuf<T>> FromServiceMsg.decodeToObject(): T {
+    return kotlin.runCatching {
+        wupBuffer.slice(4).let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        }.decodeProtobuf<T>()
+    }.getOrElse {
+        wupBuffer.let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        }.decodeProtobuf<T>()
+    }
+}
+
+fun <T: MessageMicro<T>> FromServiceMsg.decodeToObject(self: T): T {
+    return kotlin.runCatching {
+        self.mergeFrom(wupBuffer.slice(4).let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        })
+    }.getOrElse {
+        self.mergeFrom(wupBuffer.let {
+            if (it[0] == 0x78.toByte()) DeflateTools.uncompress(it) else it
+        })
+    }
+}

xposed/src/main/java/moe/fuqiuluo/shamrock/utils/PlatformUtils.kt

@@ -17,6 +17,8 @@ import kotlin.random.Random
 
 internal object PlatformUtils {
     const val QQ_9_0_8_VER =  5540
+    const val QQ_9_0_71_VER = 6702
+    const val QQ_9_0_80_VER =  6869
 
     fun getQUA(): String {
         return "V1_AND_SQ_${getQQVersion(MobileQQ.getContext())}_${getQQVersionCode()}_YYB_D"

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/XposedEntry.kt

@@ -1,18 +1,19 @@
 package moe.fuqiuluo.shamrock.xposed
 
 import android.content.Context
+import android.os.Build
+import android.os.Handler
 import android.os.Process
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 import de.robv.android.xposed.XposedBridge.log
-import moe.fuqiuluo.shamrock.helper.Level
-import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
 import moe.fuqiuluo.shamrock.utils.MMKVFetcher
 import moe.fuqiuluo.shamrock.xposed.loader.KeepAlive
 import moe.fuqiuluo.shamrock.xposed.loader.LuoClassloader
 import moe.fuqiuluo.shamrock.tools.FuzzySearchClass
+import moe.fuqiuluo.shamrock.tools.GlobalUi
 import moe.fuqiuluo.shamrock.tools.afterHook
 import moe.fuqiuluo.shamrock.utils.PlatformUtils
 import moe.fuqiuluo.shamrock.xposed.hooks.runFirstActions
@@ -156,6 +157,13 @@ internal class XposedEntry: IXposedHookLoadPackage {
 
             log("Process Name = $processName")
 
+
+            GlobalUi = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                Handler.createAsync(ctx.mainLooper)
+            } else {
+                Handler(ctx.mainLooper)
+            }
+
             runFirstActions(ctx)
         }
     }

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/AppTalker.kt

@@ -6,8 +6,8 @@ import mqq.app.MobileQQ
 import kotlin.random.Random
 
 internal object AppTalker {
-    val uriName = "content://moe.fuqiuluo.108.provider" // 你是真的闲，这都上个检测
-    val URI = Uri.parse(uriName)
+    private const val uriName = "content://moe.fuqiuluo.108.provider" // 你是真的闲，这都上个检测
+    private val URI = Uri.parse(uriName)
 
     fun talk(values: ContentValues, onFailure: ((Throwable) -> Unit)? = null) {
         val ctx = MobileQQ.getContext()
@@ -17,4 +17,20 @@ internal object AppTalker {
             onFailure?.invoke(e)
         }
     }
+
+    fun talk(action: String, bodyBuilder: ContentValues.() -> Unit) {
+        val values = ContentValues()
+        values.put("__cmd", action)
+        values.put("__hash", 0)
+        bodyBuilder.invoke(values)
+        talk(values)
+    }
+
+    fun talk(action: String, onFailure: ((Throwable) -> Unit)? = null, bodyBuilder: ContentValues.() -> Unit = {}) {
+        val values = ContentValues()
+        values.put("__cmd", action)
+        values.put("__hash", 0)
+        bodyBuilder.invoke(values)
+        talk(values, onFailure)
+    }
 }

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/MSFHandler.kt

@@ -0,0 +1,74 @@
+package moe.fuqiuluo.shamrock.xposed.helper
+
+import com.tencent.qphone.base.remote.FromServiceMsg
+import com.tencent.qphone.base.remote.ToServiceMsg
+import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import moe.fuqiuluo.shamrock.helper.Level
+import moe.fuqiuluo.shamrock.helper.LogCenter
+import moe.fuqiuluo.shamrock.remote.service.listener.PrimitiveListener
+import kotlin.coroutines.resume
+
+typealias MsfPush = (FromServiceMsg) -> Unit
+typealias MsfResp = CancellableContinuation<Pair<ToServiceMsg, FromServiceMsg>>
+
+internal object MSFHandler {
+    private val mPushHandlers = hashMapOf<String, MsfPush>()
+    private val mRespHandler = hashMapOf<Int, MsfResp>()
+    private val mPushLock = Mutex()
+    private val mRespLock = Mutex()
+
+    private val seq = atomic(0)
+
+    fun nextSeq(): Int {
+        seq.compareAndSet(0xFFFFFFF, 0)
+        return seq.incrementAndGet()
+    }
+
+    suspend fun registerPush(cmd: String, push: MsfPush) {
+        mPushLock.withLock {
+            mPushHandlers[cmd] = push
+        }
+    }
+
+    suspend fun unregisterPush(cmd: String) {
+        mPushLock.withLock {
+            mPushHandlers.remove(cmd)
+        }
+    }
+
+    suspend fun registerResp(cmd: Int, resp: MsfResp) {
+        mRespLock.withLock {
+            mRespHandler[cmd] = resp
+        }
+    }
+
+    suspend fun unregisterResp(cmd: Int) {
+        mRespLock.withLock {
+            mRespHandler.remove(cmd)
+        }
+    }
+
+    fun onPush(fromServiceMsg: FromServiceMsg) {
+        val cmd = fromServiceMsg.serviceCmd
+        if (cmd == "trpc.msg.olpush.OlPushService.MsgPush") {
+            PrimitiveListener.onPush(fromServiceMsg)
+        } else {
+            val push = mPushHandlers[cmd]
+            push?.invoke(fromServiceMsg)
+        }
+    }
+
+    fun onResp(toServiceMsg: ToServiceMsg, fromServiceMsg: FromServiceMsg) {
+        runCatching {
+            val cmd = toServiceMsg.getAttribute("shamrock_uid") as? Int?
+                ?: return@runCatching
+            val resp = mRespHandler[cmd]
+            resp?.resume(toServiceMsg to fromServiceMsg)
+        }.onFailure {
+            LogCenter.log("MSF.onResp failed: ${it.message}", Level.ERROR)
+        }
+    }
+}

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/NTServiceFetcher.kt

@@ -1,14 +1,15 @@
 package moe.fuqiuluo.shamrock.xposed.helper
 
 import com.tencent.qqnt.kernel.api.IKernelService
+import com.tencent.qqnt.kernel.api.impl.KernelServiceImpl
 import com.tencent.qqnt.kernel.api.impl.MsgService
 import com.tencent.qqnt.kernel.nativeinterface.IOperateCallback
 import com.tencent.qqnt.kernel.nativeinterface.IQQNTWrapperSession
+import com.tencent.qqnt.ntstartup.nativeinterface.IQQNTStartupSessionWrapper
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
-import moe.fuqiuluo.shamrock.remote.service.PacketReceiver
 import moe.fuqiuluo.shamrock.remote.service.listener.AioListener
 import moe.fuqiuluo.shamrock.remote.service.listener.PrimitiveListener
 import moe.fuqiuluo.shamrock.tools.hookMethod
@@ -16,6 +17,7 @@ import moe.fuqiuluo.shamrock.utils.PlatformUtils
 
 internal object NTServiceFetcher {
     private lateinit var iKernelService: IKernelService
+    private lateinit var startupSession: IQQNTStartupSessionWrapper
     private val lock = Mutex()
     private var curKernelHash = 0
 
@@ -28,17 +30,19 @@ internal object NTServiceFetcher {
             val curHash = service.hashCode() + msgService.hashCode()
             if (isInitForNt(curHash)) return
 
-            PacketHandler.initPacketHandler()
-            PacketReceiver.init()
-
             LogCenter.log("Fetch kernel service successfully: $curKernelHash,$curHash,${PlatformUtils.isMainProcess()}")
             curKernelHash = curHash
             this.iKernelService = service
-
+            if (PlatformUtils.getQQVersionCode() >= PlatformUtils.QQ_9_0_71_VER) {
+                this.startupSession = KernelServiceImpl::class.java.declaredFields.first {
+                    it.type == IQQNTStartupSessionWrapper::class.java
+                }.also {
+                    it.isAccessible = true
+                }.get(service) as IQQNTStartupSessionWrapper
+            }
 
             initNTKernelListener(msgService)
             antiBackgroundMode(sessionService)
-            //hookGuildListener(sessionService)
         }
     }
 
@@ -70,7 +74,7 @@ internal object NTServiceFetcher {
             //groupService.addKernelGroupListener(GroupEventListener)
             //LogCenter.log("Register Group listener successfully.")
 
-            PrimitiveListener.registerListener()
+            //PrimitiveListener.registerListener()
         } catch (e: Throwable) {
             LogCenter.log(e.stackTraceToString(), Level.WARN)
         }
@@ -104,4 +108,6 @@ internal object NTServiceFetcher {
 
     val kernelService: IKernelService
         get() = iKernelService
+    val startupSessionWrapper: IQQNTStartupSessionWrapper
+        get() = startupSession
 }

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/PacketHandler.kt

@@ -1,59 +0,0 @@
-package moe.fuqiuluo.shamrock.xposed.helper
-
-import moe.fuqiuluo.shamrock.tools.broadcast
-import moe.fuqiuluo.shamrock.xposed.helper.internal.DynamicReceiver
-import moe.fuqiuluo.shamrock.xposed.helper.internal.IPCRequest
-import mqq.app.MobileQQ
-
-internal object PacketHandler {
-    /*
-    MSF 进程包处理是否就绪
-     */
-    var isInit = false
-
-    internal fun initPacketHandler() {
-        DynamicReceiver.register("msf_waiter", IPCRequest {
-            isInit = true
-        })
-    }
-
-    /**
-     * 注册常驻包处理器
-     */
-    fun register(cmd: String, callback: (Int, ByteArray) -> Unit) {
-        // 在本地广播接收器注册对应处理器
-        DynamicReceiver.register(cmd, IPCRequest {
-            val buffer = it.getByteArrayExtra("buffer")!!
-            val seq = it.getIntExtra("seq", 0)
-            callback(seq, buffer)
-        })
-        if (!isInit) return
-        // 向MSF进程广播要求添加处理器
-        MobileQQ.getContext().broadcast("msf") {
-            putExtra("__cmd", "register_handler_cmd")
-            putExtra("handler_cmd", cmd)
-        }
-    }
-
-    suspend fun registerLessHandler(cmd: String, seq: Int, callback: (Int, ByteArray) -> Unit): Int {
-        DynamicReceiver.register(IPCRequest(cmd, seq) {
-            val buffer = it.getByteArrayExtra("buffer")!!
-            val currSeq = it.getIntExtra("seq", 0)
-            callback(currSeq, buffer)
-        })
-        return seq
-    }
-
-    suspend fun unregisterLessHandler(seq: Int) {
-        DynamicReceiver.unregister(seq)
-    }
-
-    fun unregister(cmd: String) {
-        DynamicReceiver.unregister(cmd)
-        if (!isInit) return
-        MobileQQ.getContext().broadcast("msf") {
-            putExtra("__cmd", "unregister_handler_cmd")
-            putExtra("handler_cmd", cmd)
-        }
-    }
-}

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/QQInterfaces.kt

@@ -0,0 +1,145 @@
+package moe.fuqiuluo.shamrock.xposed.helper
+
+import android.os.Bundle
+import com.tencent.common.app.AppInterface
+import com.tencent.mobileqq.pb.ByteStringMicro
+import com.tencent.qphone.base.remote.FromServiceMsg
+import com.tencent.qphone.base.remote.ToServiceMsg
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
+import moe.fuqiuluo.shamrock.utils.PlatformUtils
+import mqq.app.MobileQQ
+import protobuf.auto.toByteArray
+import protobuf.oidb.TrpcOidb
+import tencent.im.oidb.oidb_sso
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+abstract class QQInterfaces {
+    companion object {
+        val app = (if (PlatformUtils.isMqqPackage())
+            MobileQQ.getMobileQQ().waitAppRuntime()
+        else
+            MobileQQ.getMobileQQ().waitAppRuntime(null)) as AppInterface
+
+        val currentUin: String
+            get() = app.currentAccountUin
+
+        fun sendToServiceMsg(to: ToServiceMsg) {
+            app.sendToService(to)
+        }
+
+        suspend fun sendToServiceMsgAW(
+            to: ToServiceMsg,
+            timeout: Duration = 30.seconds
+        ): FromServiceMsg? {
+            val seq = MSFHandler.nextSeq()
+            to.addAttribute("shamrock_uid", seq)
+            val resp: Pair<ToServiceMsg, FromServiceMsg>? = withTimeoutOrNull(timeout) {
+                suspendCancellableCoroutine { continuation ->
+                    GlobalScope.launch {
+                        MSFHandler.registerResp(seq, continuation)
+                        sendToServiceMsg(to)
+                    }
+                }
+            }
+            if (resp == null) {
+                MSFHandler.unregisterResp(seq)
+            }
+            return resp?.second
+        }
+
+        fun sendExtra(cmd: String, builder: (Bundle) -> Unit) {
+            val toServiceMsg = createToServiceMsg(cmd)
+            builder(toServiceMsg.extraData)
+            app.sendToService(toServiceMsg)
+        }
+
+        fun createToServiceMsg(cmd: String): ToServiceMsg {
+            return ToServiceMsg("mobileqq.service", app.currentAccountUin, cmd)
+        }
+
+        fun sendOidb(cmd: String, command: Int, service: Int, data: ByteArray, trpc: Boolean = false) {
+            val to = createToServiceMsg(cmd)
+            if (trpc) {
+                val oidb = TrpcOidb(
+                    cmd = command,
+                    service = service,
+                    buffer = data,
+                    flag = 1
+                )
+                to.putWupBuffer(oidb.toByteArray())
+            } else {
+                val oidb = oidb_sso.OIDBSSOPkg()
+                oidb.uint32_command.set(command)
+                oidb.uint32_service_type.set(service)
+                oidb.bytes_bodybuffer.set(ByteStringMicro.copyFrom(data))
+                oidb.str_client_version.set(PlatformUtils.getClientVersion(MobileQQ.getContext()))
+                to.putWupBuffer(oidb.toByteArray())
+            }
+            to.addAttribute("req_pb_protocol_flag", true)
+            to.addAttribute("im_shamrock", true)
+            app.sendToService(to)
+        }
+
+        fun sendBuffer(
+            cmd: String,
+            isProto: Boolean,
+            data: ByteArray,
+        ) {
+            val toServiceMsg = createToServiceMsg(cmd)
+            toServiceMsg.putWupBuffer(data)
+            toServiceMsg.addAttribute("req_pb_protocol_flag", isProto)
+            toServiceMsg.addAttribute("im_shamrock", true)
+            sendToServiceMsg(toServiceMsg)
+        }
+
+        @DelicateCoroutinesApi
+        suspend fun sendBufferAW(
+            cmd: String,
+            isProto: Boolean,
+            data: ByteArray,
+            timeout: Duration = 30.seconds
+        ): FromServiceMsg? {
+            val toServiceMsg = createToServiceMsg(cmd)
+            toServiceMsg.putWupBuffer(data)
+            toServiceMsg.addAttribute("req_pb_protocol_flag", isProto)
+            toServiceMsg.addAttribute("im_shamrock", true)
+            return sendToServiceMsgAW(toServiceMsg, timeout)
+        }
+
+        @DelicateCoroutinesApi
+        suspend fun sendOidbAW(
+            cmd: String,
+            command: Int,
+            service: Int,
+            data: ByteArray,
+            trpc: Boolean = false,
+            timeout: Duration = 30.seconds
+        ): FromServiceMsg? {
+            val to = createToServiceMsg(cmd)
+            if (trpc) {
+                val oidb = TrpcOidb(
+                    cmd = command,
+                    service = service,
+                    buffer = data,
+                    flag = 1
+                )
+                to.putWupBuffer(oidb.toByteArray())
+            } else {
+                val oidb = oidb_sso.OIDBSSOPkg()
+                oidb.uint32_command.set(command)
+                oidb.uint32_service_type.set(service)
+                oidb.bytes_bodybuffer.set(ByteStringMicro.copyFrom(data))
+                oidb.str_client_version.set(PlatformUtils.getClientVersion(MobileQQ.getContext()))
+                to.putWupBuffer(oidb.toByteArray())
+            }
+            to.addAttribute("req_pb_protocol_flag", true)
+            to.addAttribute("im_shamrock", true)
+            return sendToServiceMsgAW(to, timeout)
+        }
+    }
+}

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/internal/DataRequester.kt

@@ -1,113 +0,0 @@
-@file:OptIn(DelicateCoroutinesApi::class)
-
-package moe.fuqiuluo.shamrock.xposed.helper.internal
-
-import android.content.ContentValues
-import android.content.Intent
-import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import moe.fuqiuluo.shamrock.xposed.helper.AppTalker
-import java.util.Timer
-import kotlin.concurrent.timer
-
-/**
- * 数据请求中心
- * 支持应用内数据传递，以及外部向内部传入
- */
-object DataRequester {
-    private val seqFactory = atomic(0)
-    private val seq: Int
-        get() {
-            if (seqFactory.value > 1000000) {
-                seqFactory.lazySet(0)
-            }
-            return seqFactory.incrementAndGet()
-        }
-
-    suspend fun request(
-        cmd: String,
-        currSeq: Int = seq,
-        values: Map<String, Any>? = null,
-        onFailure: ((Throwable) -> Unit)? = null,
-        callback: ICallback? = null
-    ): Int {
-        return request(cmd, currSeq, bodyBuilder = {
-            values?.forEach { (key, value) ->
-                when (value) {
-                    is Int -> this.put(key, value)
-                    is Long -> this.put(key, value)
-                    is Short -> this.put(key, value)
-                    is Byte -> this.put(key, value)
-                    is String -> this.put(key, value)
-                    is ByteArray -> this.put(key, value)
-                    is Boolean -> this.put(key, value)
-                    is Float -> this.put(key, value)
-                    is Double -> this.put(key, value)
-                }
-            }
-        }, onFailure, callback)
-    }
-
-    suspend fun request(
-        cmd: String,
-        currentSeq: Int = seq,
-        bodyBuilder: (ContentValues.() -> Unit)? = null,
-        onFailure: ((Throwable) -> Unit)? = null,
-        callback: ICallback? = null
-    ): Int {
-        val values = ContentValues()
-        bodyBuilder?.invoke(values)
-        values.put("__hash", (cmd + currentSeq).hashCode())
-        values.put("__cmd", cmd)
-        AppTalker.talk(values, onFailure)
-        if (callback != null) {
-            val timer: Timer = timer(initialDelay = 3000L, period = 5000L) {
-                GlobalScope.launch(Dispatchers.Default) {
-                    DynamicReceiver.unregister(currentSeq)
-                    cancel()
-                }
-            }
-            val request = IPCRequest(cmd, currentSeq, values) {
-                try {
-                    timer.cancel()
-                } finally {
-                    callback.handle(it)
-                }
-            }
-            DynamicReceiver.register(request)
-        }
-        return currentSeq
-    }
-}
-
-fun interface ICallback {
-    suspend fun handle(intent: Intent)
-}
-
-data class IPCRequest(
-    val cmd: String = "",
-    val seq: Int = -1,
-    val values: ContentValues? = null,
-    var callback: ICallback? = null,
-) {
-    override fun hashCode(): Int {
-        return (cmd + seq).hashCode()
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as IPCRequest
-
-        if (cmd != other.cmd) return false
-        if (seq != other.seq) return false
-        if (values != other.values) return false
-        if (callback != other.callback) return false
-
-        return true
-    }
-}