feat: 多账户支持

project-yui · Oct 30, 2024 · 4946535 · 4946535
1 parent 64484a9
commit 4946535
Show file tree

Hide file tree

Showing 15 changed files with 4,153 additions and 203 deletions.
diff --git a/docs/function.md b/docs/function.md
diff --git a/docs/functions/func.log b/docs/functions/func.log
diff --git a/src/common/log.ts b/src/common/log.ts
@@ -52,7 +52,7 @@ interface LoggerConfigType {
  */
 type InterceptorFuncType = (config: LoggerConfigType) => void
 
-const isLogEnabled = process.env['YUKIHANA_LOG'] === 'true'
+const isLogEnabled = process.env['YUI_LOG'] === 'true'
 
 if (!isLogEnabled) {
   _console.info('================================日志打印已关闭！=======================================')

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,5 @@
 import { useLogger } from "./common/log"
 import { hook } from "./hook";
-import { initNative } from "./native/init";
 import { NTInitialize } from "./ntqq";
 import { initOnebot } from "./onebot/onebot";
 import { startServer } from "./server";
@@ -26,9 +25,6 @@ try {
     log.info('hookWrapper')
     hookWrapper()
   }
-
-  log.info('initNTQQ')
-  // initNative()
 
   log.info('initOnebot')
   initOnebot()

diff --git a/src/native/init.ts b/src/native/init.ts
@@ -3,7 +3,7 @@ import { useConfigStore } from '../store/config'
 import { useLogger } from '../common/log'
 
 const log = useLogger('NativeInit')
-export const initNative = () => {
+export const initNative = (name: string) => {
     // 获取函数签名
     const { getSignature } = useConfigStore()
     const sig = getSignature()
@@ -23,9 +23,21 @@ export const initNative = () => {
             sigData.hosts = sigArr
         }
     }
-    setTimeout(() => {
-        log.info('install:', sigData)
-        const result = install(sigData)
-        log.info('install result:', result)
-    }, 2000)
+    if (sig?.msf_task) {
+        const signature = sig?.msf_task
+        const sigArr = signature?.match(/[a-zA-Z0-9]{2}/g)?.map(e=>parseInt(`0x${e}`))
+        if (sigArr !== undefined) {
+            sigData.msf = sigArr
+        }
+    }
+    if (sig?.msf_resp) {
+        const signature = sig?.msf_resp
+        const sigArr = signature?.match(/[a-zA-Z0-9]{2}/g)?.map(e=>parseInt(`0x${e}`))
+        if (sigArr !== undefined) {
+            sigData.msf_resp = sigArr
+        }
+    }
+    log.info('install:', sigData)
+    const result = install(name, sigData)
+    log.info('install result:', result)
 }
diff --git a/src/ntqq/core/service/nt-wrapper.ts b/src/ntqq/core/service/nt-wrapper.ts
@@ -4,12 +4,9 @@ import { useNTUserStore } from "../../store/user"
 import { useLogger } from "../../../common/log";
 import EventEmitter from "events";
 import { CustomError } from "../../../server/error/custom-error";
+import { initNative } from "../../../native/init";
 
 const log = useLogger('NTWrapper')
-const wrapper = useWrapper(1)
-const loginService = new wrapper.NodeIKernelLoginService()
-const wrapperSession = new wrapper.NodeIQQNTWrapperSession()
-const wrapperEngine = new wrapper.NodeIQQNTWrapperEngine()
 export const useNTWrapper = () => {
     // QQ号索引处理
     const asyncStore = useAsyncStore()
@@ -34,10 +31,11 @@ export const useNTWrapper = () => {
                 userNick: ""
             },
             dispatcher: new EventEmitter(),
-            loginService,
-            wrapperSession,
-            wrapperEngine,
+            loginService: new wrapper.NodeIKernelLoginService(),
+            wrapperSession: new wrapper.NodeIQQNTWrapperSession(),
+            wrapperEngine: new wrapper.NodeIQQNTWrapperEngine(),
         }
+        initNative(`wrapper-${idx}.node`)
     }
     return useWrapper(userStore[uin].moduleIndex)
 }
diff --git a/src/ntqq/types/native.d.ts b/src/ntqq/types/native.d.ts
@@ -7,15 +7,18 @@ declare namespace YuiNativeWrapper {
          * 
          * @param signature 函数签名
          */
-        const install: (signature: SignatureType) => Record<string, boolean>
+        const install: (name: string, signature: SignatureType) => Record<string, boolean>
         /**
          * 添加消息
          */
         const addMsg: (msg: AddMsgType) => boolean
+        const test: () => boolean
     }
     interface SignatureType {
       sqlite3_stmt?: number[]
       hosts?: number[]
+      msf?: number[]
+      msf_resp?: number[]
     }
     interface AddMsgType {
         msgId: `${number}`

diff --git a/src/ntqq/types/wrapper.d.ts b/src/ntqq/types/wrapper.d.ts
@@ -70,13 +70,24 @@ declare namespace NTNativeWrapper {
     vendorType: 0
   }
 
+  interface SSOFilter {
+    ssoRetCode: number
+    trpcRetCode: number
+    trpcFuncCode: number
+    errorMsg: string
+    pbBuffer: string
+    rpcMap: {
+      entries: () => void
+      next: () => void
+    }
+  }
   class NodeIQQNTWrapperEngine {
     constructor()
     getDeviceInfo(): any
     getECDHService(): import('./services/NodeIKernelECDHService').NodeIKernelECDHService
     initWithDeskTopConfig(config: NodeIQQNTWrapperEngineType.Init, adapter: import("./adapters/NodeIGlobalAdapter").NodeIGlobalAdapter): boolean
     initWithMobileConfig(config: NodeIQQNTWrapperEngineType.Init, adapter: import("./adapters/NodeIGlobalAdapter").NodeIGlobalAdapter): boolean
-    // onSendSSOReply(cb: NodeISendECDHRequestCallback): void
+    onSendSSOReply(a: number, a2: number, a3: number, a4: number, a5: SSOFilter): void
   }
 
   // #endregion

diff --git a/src/onebot/event/message.ts b/src/onebot/event/message.ts
@@ -31,7 +31,12 @@ const onRecvMsg = () => {
       // 频道消息暂不处理
       if (msg.chatType === 4) continue
 
-      const senderUserInfo = await getUserInfoByUid(msg.senderUid)
+      let uin: number = 0
+      if (msg.senderUid)
+      {
+        const senderUserInfo = await getUserInfoByUid(msg.senderUid)
+        uin = parseInt(senderUserInfo.uin)
+      }
       const ret: EventDataType<BotMessageData> = {
         self: {
           id: parseInt(user.uin),
@@ -46,7 +51,7 @@ const onRecvMsg = () => {
           messageSeq: msg.msgSeq,
           groupId: 0,
           groupName: '',
-          senderId: parseInt(senderUserInfo.uin),
+          senderId: uin,
           senderUid: msg.senderUid,
           senderMemberName: msg.sendMemberName,
           time: parseInt(msg.msgTime),

diff --git a/src/store/config-type.d.ts b/src/store/config-type.d.ts
@@ -21,4 +21,6 @@ export interface YuiConfig {
 export interface SingatureInfo {
     sqlite3_stmt: string
     get_ip_by_domain: string
+    msf_task: string
+    msf_resp: string
 }
diff --git a/src/test/test.ts b/src/test/test.ts
@@ -11,25 +11,23 @@ import vm from 'vm'
 import v8 from 'v8'
 import events from 'events'
 import { app } from 'electron'
+import { test as ttt} from 'yui-native'
 
 
 const { registerActionHandle } = useStore()
 const log = useLogger('Test')
 
-const testSendMsg = async (p: any): Promise<BotActionResponse<any>> => {
+const testSendMsg = async (p: any): Promise<any> => {
   log.info('testSendMsg')
   const { getWrapperEngine } = useNTCore()
   const engine = getWrapperEngine()
   const ecdh = engine.getECDHService()
-  // ecdh.sendSSORequest()
-  const resp: BotActionResponse = {
-    id: "",
-    status: "ok",
-    retcode: 0,
-    data: {},
-    message: ""
-  }
-  return Promise.resolve(resp)
+
+  log.info('test:', p)
+  const ret = await (ecdh as any)[p.method](...p.args)
+  // if (p.test)
+  //   ttt()
+  return ret
 }
 
 class ScriptHook extends Script{
@@ -271,6 +269,7 @@ import async_hooks from 'node:async_hooks';
 import { stdout } from 'node:process';
 import { useNTCore } from "../ntqq/core/core"
 import { DESTRUCTION } from "dns"
+import { useNTWrapper } from "../ntqq/core/service/nt-wrapper"
 const hookAsync = () => {
   const { fd } = stdout;
 
@@ -465,5 +464,7 @@ export const test = (m: NodeModule) => {
     log.error('error:', err)
     process.exit(1)
   }
+  const wrapper = useNTCore()
+  // wrapper.getWrapperEngine().onSendSSOReply
   registerActionHandle('test', testSendMsg)
 }
diff --git a/tools/dev.cjs b/tools/dev.cjs
@@ -130,11 +130,11 @@ const ActionHandle = {
                         stdio: 'inherit',
                         env: {
                             ...process.env,
-                            YUKIHANA_LOG: true,
+                            YUI_LOG: true,
                             // ELECTRON_RUN_AS_NODE: '1',
                             // ELECTRON_ATTACH_CONSOLE: '1',
-                            YUKIHANA_ACTION: 'ui',
-                            YUKIHANA_NATIVE: "D:/GitHub/Yui-native/build/nt_native.node",
+                            YUI_ACTION: 'ui',
+                            YUI_NATIVE: "D:/GitHub/Yui-native/build/nt_native.node",
                             QQV8BytecodeDebug: '1'
                         },
                         cwd: path.resolve(__dirname, '../program'),
@@ -153,11 +153,11 @@ const ActionHandle = {
                         stdio: 'inherit',
                         env: {
                             ...process.env,
-                            YUKIHANA_LOG: true,
+                            YUI_LOG: true,
                             // ELECTRON_RUN_AS_NODE: true,
-                            YUKIHANA_ACTION: 'dev',
+                            YUI_ACTION: 'dev',
                             ELECTRON_ATTACH_CONSOLE: '1',
-                            YUKIHANA_NATIVE: "D:/GitHub/Yui-native/build/nt_native.node",
+                            YUI_NATIVE: "D:/GitHub/Yui-native/build/nt_native.node",
                             QQV8BytecodeDebug: '1',
                         },
                         cwd: path.resolve(__dirname, '../program')

diff --git a/tools/gen-function.cjs b/tools/gen-function.cjs
@@ -0,0 +1,44 @@
+const fs = require('fs')
+const path = require('path')
+let data = fs.readFileSync(path.resolve(__dirname, '../docs/functions/func.log')).toString()
+data = data.split('\n')
+console.log(data.length)
+const allFuncs = data.filter(e => e && e.length > 0).map(e => {
+    let a=e.split(' ')
+    const [service, func] = a[5].split('::')
+    return {
+        service,
+        func: func,
+        count: parseInt(a[7])
+    }
+})
+const _exports = {}
+for(const func of allFuncs)
+{
+    if (_exports[func.service])
+    {
+        _exports[func.service].push(func)
+    }
+    else
+    {
+        _exports[func.service] = [func]
+    }
+}
+
+let markdown = ''
+// 遍历类
+for (const serviceName in _exports) {
+    console.info('serviceName:', serviceName)
+    const service = _exports[serviceName]
+    console.info('service:', service)
+    const funcs = service
+    markdown += `## ${serviceName}\n\n`
+    markdown += '| 方法名 | 参数数量 |\n'
+    markdown += '|-------|-----|\n'
+    // 遍历方法
+    for (const func of funcs) {
+        markdown += `| ${func.func} | ${func.count} |\n`
+    }
+    markdown += '\n'
+}
+fs.writeFileSync(path.resolve(__dirname, '../docs/function.md'), markdown)
diff --git a/tools/prepend.js b/tools/prepend.js
@@ -46,7 +46,7 @@ global.asyncLocalStorage = asyncLocalStorage;
           {
             throw new Error('use wrapper: idx error')
           }
-          const targetPath = wrapperPath //.replace('wrapper.node', `wrapper-${idx}.node`)
+          const targetPath = wrapperPath.replace('wrapper.node', `wrapper-${idx}.node`)
           if (!fs.existsSync(targetPath))
           {
             fs.cpSync(wrapperPath, targetPath)
@@ -58,9 +58,9 @@ global.asyncLocalStorage = asyncLocalStorage;
     'yui-native': (t) => {
       /**  @type {import('path')} */
       const path = orgi_require('path')
-      let wrapperPath = path.resolve(__dirname, `./native.node`)
-      if (process.env['YUKIHANA_NATIVE']) {
-        wrapperPath = process.env['YUKIHANA_NATIVE']
+      let wrapperPath = path.resolve(__dirname, `./nt_native.node`)
+      if (process.env['YUI_NATIVE']) {
+        wrapperPath = process.env['YUI_NATIVE']
       }
       return orgi_require.apply(t, [wrapperPath])
     }

diff --git a/yui.yaml b/yui.yaml
@@ -27,11 +27,15 @@ yui:
         sqlite3_stmt: 48895C2420564883EC20488BD933F6E8EC
         # 获取方法：ida 搜索 DebugGetIPByDomain，所处函数开头
         get_ip_by_domain: 40555356574154415541564157488D6C24D84881EC28010000488B05F021
-      # 9.9.15-26909:
-      #   # ida 搜索 65F883，找有for循环的
-      #   sqlite3_stmt: 4156565755534883EC204889CFE80E01000085C07414B9000300004883C4205B
-      #   # 获取方法：ida 搜索 DebugGetIPByDomain，所处函数开头
-      #   get_ip_by_domain: 5541574156415541545657534881ECF8000000488DAC248000000048C74570
+      9.9.15-28498:
+        # ida 搜索 65F883，找有for循环的
+        # sqlite3_stmt: 4156565755534883EC204889CFE8FE00000085C07414B9000300004883C4205B
+        # 获取方法：ida 搜索 DebugGetIPByDomain，所处函数开头
+        # get_ip_by_domain: 5541574156415541545657534881ECF8000000488DAC248000000048C74570FEFFFFFF4C89CF4489456C4889552048894D
+        # 获取方法：ida 搜索 MSF task pushed seq，所处函数开头
+        msf_task: 5541574156415541545657534881EC08010000488DAC248000000048C78580000000FEFFFFFF4989CE48895578488B0AE824070000488D4D
+        # 获取方法：ida 搜索 MSF recv，所处函数开头
+        msf_resp: 5541574156415541545657534881ECF8000000488DAC248000000048C74570FEFFFFFF4489C748833A0048895560
     linux:
       3.2.5-21357:
         # 获取方法：ida 搜索 DebugGetIPByDomain，所处函数开头